Merge branch 'maint'
[git.git] / wt-status.c
blob85f3fcb8a2f55b362268e00c5bb67434e38382b0
1 #include "cache.h"
2 #include "wt-status.h"
3 #include "object.h"
4 #include "dir.h"
5 #include "commit.h"
6 #include "diff.h"
7 #include "revision.h"
8 #include "diffcore.h"
9 #include "quote.h"
10 #include "run-command.h"
11 #include "remote.h"
13 static char default_wt_status_colors[][COLOR_MAXLEN] = {
14 GIT_COLOR_NORMAL, /* WT_STATUS_HEADER */
15 GIT_COLOR_GREEN, /* WT_STATUS_UPDATED */
16 GIT_COLOR_RED, /* WT_STATUS_CHANGED */
17 GIT_COLOR_RED, /* WT_STATUS_UNTRACKED */
18 GIT_COLOR_RED, /* WT_STATUS_NOBRANCH */
19 GIT_COLOR_RED, /* WT_STATUS_UNMERGED */
22 static const char *color(int slot, struct wt_status *s)
24 return s->use_color > 0 ? s->color_palette[slot] : "";
27 void wt_status_prepare(struct wt_status *s)
29 unsigned char sha1[20];
30 const char *head;
32 memset(s, 0, sizeof(*s));
33 memcpy(s->color_palette, default_wt_status_colors,
34 sizeof(default_wt_status_colors));
35 s->show_untracked_files = SHOW_NORMAL_UNTRACKED_FILES;
36 s->use_color = -1;
37 s->relative_paths = 1;
38 head = resolve_ref("HEAD", sha1, 0, NULL);
39 s->branch = head ? xstrdup(head) : NULL;
40 s->reference = "HEAD";
41 s->fp = stdout;
42 s->index_file = get_index_file();
43 s->change.strdup_strings = 1;
44 s->untracked.strdup_strings = 1;
47 static void wt_status_print_unmerged_header(struct wt_status *s)
49 const char *c = color(WT_STATUS_HEADER, s);
50 color_fprintf_ln(s->fp, c, "# Unmerged paths:");
51 if (!s->is_initial)
52 color_fprintf_ln(s->fp, c, "# (use \"git reset %s <file>...\" to unstage)", s->reference);
53 else
54 color_fprintf_ln(s->fp, c, "# (use \"git rm --cached <file>...\" to unstage)");
55 color_fprintf_ln(s->fp, c, "# (use \"git add <file>...\" to mark resolution)");
56 color_fprintf_ln(s->fp, c, "#");
59 static void wt_status_print_cached_header(struct wt_status *s)
61 const char *c = color(WT_STATUS_HEADER, s);
62 color_fprintf_ln(s->fp, c, "# Changes to be committed:");
63 if (!s->is_initial) {
64 color_fprintf_ln(s->fp, c, "# (use \"git reset %s <file>...\" to unstage)", s->reference);
65 } else {
66 color_fprintf_ln(s->fp, c, "# (use \"git rm --cached <file>...\" to unstage)");
68 color_fprintf_ln(s->fp, c, "#");
71 static void wt_status_print_dirty_header(struct wt_status *s,
72 int has_deleted)
74 const char *c = color(WT_STATUS_HEADER, s);
75 color_fprintf_ln(s->fp, c, "# Changed but not updated:");
76 if (!has_deleted)
77 color_fprintf_ln(s->fp, c, "# (use \"git add <file>...\" to update what will be committed)");
78 else
79 color_fprintf_ln(s->fp, c, "# (use \"git add/rm <file>...\" to update what will be committed)");
80 color_fprintf_ln(s->fp, c, "# (use \"git checkout -- <file>...\" to discard changes in working directory)");
81 color_fprintf_ln(s->fp, c, "#");
84 static void wt_status_print_untracked_header(struct wt_status *s)
86 const char *c = color(WT_STATUS_HEADER, s);
87 color_fprintf_ln(s->fp, c, "# Untracked files:");
88 color_fprintf_ln(s->fp, c, "# (use \"git add <file>...\" to include in what will be committed)");
89 color_fprintf_ln(s->fp, c, "#");
92 static void wt_status_print_trailer(struct wt_status *s)
94 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s), "#");
97 #define quote_path quote_path_relative
99 static void wt_status_print_unmerged_data(struct wt_status *s,
100 struct string_list_item *it)
102 const char *c = color(WT_STATUS_UNMERGED, s);
103 struct wt_status_change_data *d = it->util;
104 struct strbuf onebuf = STRBUF_INIT;
105 const char *one, *how = "bug";
107 one = quote_path(it->string, -1, &onebuf, s->prefix);
108 color_fprintf(s->fp, color(WT_STATUS_HEADER, s), "#\t");
109 switch (d->stagemask) {
110 case 1: how = "both deleted:"; break;
111 case 2: how = "added by us:"; break;
112 case 3: how = "deleted by them:"; break;
113 case 4: how = "added by them:"; break;
114 case 5: how = "deleted by us:"; break;
115 case 6: how = "both added:"; break;
116 case 7: how = "both modified:"; break;
118 color_fprintf(s->fp, c, "%-20s%s\n", how, one);
119 strbuf_release(&onebuf);
122 static void wt_status_print_change_data(struct wt_status *s,
123 int change_type,
124 struct string_list_item *it)
126 struct wt_status_change_data *d = it->util;
127 const char *c = color(change_type, s);
128 int status = status;
129 char *one_name;
130 char *two_name;
131 const char *one, *two;
132 struct strbuf onebuf = STRBUF_INIT, twobuf = STRBUF_INIT;
134 one_name = two_name = it->string;
135 switch (change_type) {
136 case WT_STATUS_UPDATED:
137 status = d->index_status;
138 if (d->head_path)
139 one_name = d->head_path;
140 break;
141 case WT_STATUS_CHANGED:
142 status = d->worktree_status;
143 break;
146 one = quote_path(one_name, -1, &onebuf, s->prefix);
147 two = quote_path(two_name, -1, &twobuf, s->prefix);
149 color_fprintf(s->fp, color(WT_STATUS_HEADER, s), "#\t");
150 switch (status) {
151 case DIFF_STATUS_ADDED:
152 color_fprintf(s->fp, c, "new file: %s", one);
153 break;
154 case DIFF_STATUS_COPIED:
155 color_fprintf(s->fp, c, "copied: %s -> %s", one, two);
156 break;
157 case DIFF_STATUS_DELETED:
158 color_fprintf(s->fp, c, "deleted: %s", one);
159 break;
160 case DIFF_STATUS_MODIFIED:
161 color_fprintf(s->fp, c, "modified: %s", one);
162 break;
163 case DIFF_STATUS_RENAMED:
164 color_fprintf(s->fp, c, "renamed: %s -> %s", one, two);
165 break;
166 case DIFF_STATUS_TYPE_CHANGED:
167 color_fprintf(s->fp, c, "typechange: %s", one);
168 break;
169 case DIFF_STATUS_UNKNOWN:
170 color_fprintf(s->fp, c, "unknown: %s", one);
171 break;
172 case DIFF_STATUS_UNMERGED:
173 color_fprintf(s->fp, c, "unmerged: %s", one);
174 break;
175 default:
176 die("bug: unhandled diff status %c", status);
178 fprintf(s->fp, "\n");
179 strbuf_release(&onebuf);
180 strbuf_release(&twobuf);
183 static void wt_status_collect_changed_cb(struct diff_queue_struct *q,
184 struct diff_options *options,
185 void *data)
187 struct wt_status *s = data;
188 int i;
190 if (!q->nr)
191 return;
192 s->workdir_dirty = 1;
193 for (i = 0; i < q->nr; i++) {
194 struct diff_filepair *p;
195 struct string_list_item *it;
196 struct wt_status_change_data *d;
198 p = q->queue[i];
199 it = string_list_insert(p->one->path, &s->change);
200 d = it->util;
201 if (!d) {
202 d = xcalloc(1, sizeof(*d));
203 it->util = d;
205 if (!d->worktree_status)
206 d->worktree_status = p->status;
210 static int unmerged_mask(const char *path)
212 int pos, mask;
213 struct cache_entry *ce;
215 pos = cache_name_pos(path, strlen(path));
216 if (0 <= pos)
217 return 0;
219 mask = 0;
220 pos = -pos-1;
221 while (pos < active_nr) {
222 ce = active_cache[pos++];
223 if (strcmp(ce->name, path) || !ce_stage(ce))
224 break;
225 mask |= (1 << (ce_stage(ce) - 1));
227 return mask;
230 static void wt_status_collect_updated_cb(struct diff_queue_struct *q,
231 struct diff_options *options,
232 void *data)
234 struct wt_status *s = data;
235 int i;
237 for (i = 0; i < q->nr; i++) {
238 struct diff_filepair *p;
239 struct string_list_item *it;
240 struct wt_status_change_data *d;
242 p = q->queue[i];
243 it = string_list_insert(p->two->path, &s->change);
244 d = it->util;
245 if (!d) {
246 d = xcalloc(1, sizeof(*d));
247 it->util = d;
249 if (!d->index_status)
250 d->index_status = p->status;
251 switch (p->status) {
252 case DIFF_STATUS_COPIED:
253 case DIFF_STATUS_RENAMED:
254 d->head_path = xstrdup(p->one->path);
255 break;
256 case DIFF_STATUS_UNMERGED:
257 d->stagemask = unmerged_mask(p->two->path);
258 break;
263 static void wt_status_collect_changes_worktree(struct wt_status *s)
265 struct rev_info rev;
267 init_revisions(&rev, NULL);
268 setup_revisions(0, NULL, &rev, NULL);
269 rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
270 rev.diffopt.format_callback = wt_status_collect_changed_cb;
271 rev.diffopt.format_callback_data = s;
272 run_diff_files(&rev, 0);
275 static void wt_status_collect_changes_index(struct wt_status *s)
277 struct rev_info rev;
279 init_revisions(&rev, NULL);
280 setup_revisions(0, NULL, &rev,
281 s->is_initial ? EMPTY_TREE_SHA1_HEX : s->reference);
282 rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
283 rev.diffopt.format_callback = wt_status_collect_updated_cb;
284 rev.diffopt.format_callback_data = s;
285 rev.diffopt.detect_rename = 1;
286 rev.diffopt.rename_limit = 200;
287 rev.diffopt.break_opt = 0;
288 run_diff_index(&rev, 1);
291 static void wt_status_collect_changes_initial(struct wt_status *s)
293 int i;
295 for (i = 0; i < active_nr; i++) {
296 struct string_list_item *it;
297 struct wt_status_change_data *d;
298 struct cache_entry *ce = active_cache[i];
300 it = string_list_insert(ce->name, &s->change);
301 d = it->util;
302 if (!d) {
303 d = xcalloc(1, sizeof(*d));
304 it->util = d;
306 if (ce_stage(ce)) {
307 d->index_status = DIFF_STATUS_UNMERGED;
308 d->stagemask |= (1 << (ce_stage(ce) - 1));
310 else
311 d->index_status = DIFF_STATUS_ADDED;
315 static void wt_status_collect_untracked(struct wt_status *s)
317 int i;
318 struct dir_struct dir;
320 if (!s->show_untracked_files)
321 return;
322 memset(&dir, 0, sizeof(dir));
323 if (s->show_untracked_files != SHOW_ALL_UNTRACKED_FILES)
324 dir.flags |=
325 DIR_SHOW_OTHER_DIRECTORIES | DIR_HIDE_EMPTY_DIRECTORIES;
326 setup_standard_excludes(&dir);
328 fill_directory(&dir, NULL);
329 for (i = 0; i < dir.nr; i++) {
330 struct dir_entry *ent = dir.entries[i];
331 if (!cache_name_is_other(ent->name, ent->len))
332 continue;
333 s->workdir_untracked = 1;
334 string_list_insert(ent->name, &s->untracked);
338 void wt_status_collect(struct wt_status *s)
340 wt_status_collect_changes_worktree(s);
342 if (s->is_initial)
343 wt_status_collect_changes_initial(s);
344 else
345 wt_status_collect_changes_index(s);
346 wt_status_collect_untracked(s);
349 static void wt_status_print_unmerged(struct wt_status *s)
351 int shown_header = 0;
352 int i;
354 for (i = 0; i < s->change.nr; i++) {
355 struct wt_status_change_data *d;
356 struct string_list_item *it;
357 it = &(s->change.items[i]);
358 d = it->util;
359 if (!d->stagemask)
360 continue;
361 if (!shown_header) {
362 wt_status_print_unmerged_header(s);
363 shown_header = 1;
365 wt_status_print_unmerged_data(s, it);
367 if (shown_header)
368 wt_status_print_trailer(s);
372 static void wt_status_print_updated(struct wt_status *s)
374 int shown_header = 0;
375 int i;
377 for (i = 0; i < s->change.nr; i++) {
378 struct wt_status_change_data *d;
379 struct string_list_item *it;
380 it = &(s->change.items[i]);
381 d = it->util;
382 if (!d->index_status ||
383 d->index_status == DIFF_STATUS_UNMERGED)
384 continue;
385 if (!shown_header) {
386 wt_status_print_cached_header(s);
387 s->commitable = 1;
388 shown_header = 1;
390 wt_status_print_change_data(s, WT_STATUS_UPDATED, it);
392 if (shown_header)
393 wt_status_print_trailer(s);
397 * -1 : has delete
398 * 0 : no change
399 * 1 : some change but no delete
401 static int wt_status_check_worktree_changes(struct wt_status *s)
403 int i;
404 int changes = 0;
406 for (i = 0; i < s->change.nr; i++) {
407 struct wt_status_change_data *d;
408 d = s->change.items[i].util;
409 if (!d->worktree_status ||
410 d->worktree_status == DIFF_STATUS_UNMERGED)
411 continue;
412 changes = 1;
413 if (d->worktree_status == DIFF_STATUS_DELETED)
414 return -1;
416 return changes;
419 static void wt_status_print_changed(struct wt_status *s)
421 int i;
422 int worktree_changes = wt_status_check_worktree_changes(s);
424 if (!worktree_changes)
425 return;
427 wt_status_print_dirty_header(s, worktree_changes < 0);
429 for (i = 0; i < s->change.nr; i++) {
430 struct wt_status_change_data *d;
431 struct string_list_item *it;
432 it = &(s->change.items[i]);
433 d = it->util;
434 if (!d->worktree_status ||
435 d->worktree_status == DIFF_STATUS_UNMERGED)
436 continue;
437 wt_status_print_change_data(s, WT_STATUS_CHANGED, it);
439 wt_status_print_trailer(s);
442 static void wt_status_print_submodule_summary(struct wt_status *s)
444 struct child_process sm_summary;
445 char summary_limit[64];
446 char index[PATH_MAX];
447 const char *env[] = { index, NULL };
448 const char *argv[] = {
449 "submodule",
450 "summary",
451 "--cached",
452 "--for-status",
453 "--summary-limit",
454 summary_limit,
455 s->amend ? "HEAD^" : "HEAD",
456 NULL
459 sprintf(summary_limit, "%d", s->submodule_summary);
460 snprintf(index, sizeof(index), "GIT_INDEX_FILE=%s", s->index_file);
462 memset(&sm_summary, 0, sizeof(sm_summary));
463 sm_summary.argv = argv;
464 sm_summary.env = env;
465 sm_summary.git_cmd = 1;
466 sm_summary.no_stdin = 1;
467 fflush(s->fp);
468 sm_summary.out = dup(fileno(s->fp)); /* run_command closes it */
469 run_command(&sm_summary);
472 static void wt_status_print_untracked(struct wt_status *s)
474 int i;
475 struct strbuf buf = STRBUF_INIT;
477 if (!s->untracked.nr)
478 return;
480 wt_status_print_untracked_header(s);
481 for (i = 0; i < s->untracked.nr; i++) {
482 struct string_list_item *it;
483 it = &(s->untracked.items[i]);
484 color_fprintf(s->fp, color(WT_STATUS_HEADER, s), "#\t");
485 color_fprintf_ln(s->fp, color(WT_STATUS_UNTRACKED, s), "%s",
486 quote_path(it->string, strlen(it->string),
487 &buf, s->prefix));
489 strbuf_release(&buf);
492 static void wt_status_print_verbose(struct wt_status *s)
494 struct rev_info rev;
496 init_revisions(&rev, NULL);
497 DIFF_OPT_SET(&rev.diffopt, ALLOW_TEXTCONV);
498 setup_revisions(0, NULL, &rev,
499 s->is_initial ? EMPTY_TREE_SHA1_HEX : s->reference);
500 rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
501 rev.diffopt.detect_rename = 1;
502 rev.diffopt.file = s->fp;
503 rev.diffopt.close_file = 0;
505 * If we're not going to stdout, then we definitely don't
506 * want color, since we are going to the commit message
507 * file (and even the "auto" setting won't work, since it
508 * will have checked isatty on stdout).
510 if (s->fp != stdout)
511 DIFF_OPT_CLR(&rev.diffopt, COLOR_DIFF);
512 run_diff_index(&rev, 1);
515 static void wt_status_print_tracking(struct wt_status *s)
517 struct strbuf sb = STRBUF_INIT;
518 const char *cp, *ep;
519 struct branch *branch;
521 assert(s->branch && !s->is_initial);
522 if (prefixcmp(s->branch, "refs/heads/"))
523 return;
524 branch = branch_get(s->branch + 11);
525 if (!format_tracking_info(branch, &sb))
526 return;
528 for (cp = sb.buf; (ep = strchr(cp, '\n')) != NULL; cp = ep + 1)
529 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s),
530 "# %.*s", (int)(ep - cp), cp);
531 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s), "#");
534 void wt_status_print(struct wt_status *s)
536 unsigned char sha1[20];
537 const char *branch_color = color(WT_STATUS_HEADER, s);
539 s->is_initial = get_sha1(s->reference, sha1) ? 1 : 0;
540 if (s->branch) {
541 const char *on_what = "On branch ";
542 const char *branch_name = s->branch;
543 if (!prefixcmp(branch_name, "refs/heads/"))
544 branch_name += 11;
545 else if (!strcmp(branch_name, "HEAD")) {
546 branch_name = "";
547 branch_color = color(WT_STATUS_NOBRANCH, s);
548 on_what = "Not currently on any branch.";
550 color_fprintf(s->fp, color(WT_STATUS_HEADER, s), "# ");
551 color_fprintf_ln(s->fp, branch_color, "%s%s", on_what, branch_name);
552 if (!s->is_initial)
553 wt_status_print_tracking(s);
556 wt_status_collect(s);
558 if (s->is_initial) {
559 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s), "#");
560 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s), "# Initial commit");
561 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s), "#");
564 wt_status_print_updated(s);
565 wt_status_print_unmerged(s);
566 wt_status_print_changed(s);
567 if (s->submodule_summary)
568 wt_status_print_submodule_summary(s);
569 if (s->show_untracked_files)
570 wt_status_print_untracked(s);
571 else if (s->commitable)
572 fprintf(s->fp, "# Untracked files not listed (use -u option to show untracked files)\n");
574 if (s->verbose)
575 wt_status_print_verbose(s);
576 if (!s->commitable) {
577 if (s->amend)
578 fprintf(s->fp, "# No changes\n");
579 else if (s->nowarn)
580 ; /* nothing */
581 else if (s->workdir_dirty)
582 printf("no changes added to commit (use \"git add\" and/or \"git commit -a\")\n");
583 else if (s->untracked.nr)
584 printf("nothing added to commit but untracked files present (use \"git add\" to track)\n");
585 else if (s->is_initial)
586 printf("nothing to commit (create/copy files and use \"git add\" to track)\n");
587 else if (!s->show_untracked_files)
588 printf("nothing to commit (use -u to show untracked files)\n");
589 else
590 printf("nothing to commit (working directory clean)\n");