10 #include "run-command.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];
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;
37 s->relative_paths = 1;
38 head = resolve_ref("HEAD", sha1, 0, NULL);
39 s->branch = head ? xstrdup(head) : NULL;
40 s->reference = "HEAD";
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);
51 color_fprintf_ln(s->fp, c, "# Unmerged paths:");
52 if (!advice_status_hints)
56 else if (!s->is_initial)
57 color_fprintf_ln(s->fp, c, "# (use \"git reset %s <file>...\" to unstage)", s->reference);
59 color_fprintf_ln(s->fp, c, "# (use \"git rm --cached <file>...\" to unstage)");
60 color_fprintf_ln(s->fp, c, "# (use \"git add/rm <file>...\" as appropriate to mark resolution)");
61 color_fprintf_ln(s->fp, c, "#");
64 static void wt_status_print_cached_header(struct wt_status *s)
66 const char *c = color(WT_STATUS_HEADER, s);
68 color_fprintf_ln(s->fp, c, "# Changes to be committed:");
69 if (!advice_status_hints)
72 ; /* NEEDSWORK: use "git reset --unresolve"??? */
73 else if (!s->is_initial)
74 color_fprintf_ln(s->fp, c, "# (use \"git reset %s <file>...\" to unstage)", s->reference);
76 color_fprintf_ln(s->fp, c, "# (use \"git rm --cached <file>...\" to unstage)");
77 color_fprintf_ln(s->fp, c, "#");
80 static void wt_status_print_dirty_header(struct wt_status *s,
82 int has_dirty_submodules)
84 const char *c = color(WT_STATUS_HEADER, s);
86 color_fprintf_ln(s->fp, c, "# Changed but not updated:");
87 if (!advice_status_hints)
90 color_fprintf_ln(s->fp, c, "# (use \"git add <file>...\" to update what will be committed)");
92 color_fprintf_ln(s->fp, c, "# (use \"git add/rm <file>...\" to update what will be committed)");
93 color_fprintf_ln(s->fp, c, "# (use \"git checkout -- <file>...\" to discard changes in working directory)");
94 if (has_dirty_submodules)
95 color_fprintf_ln(s->fp, c, "# (commit or discard the untracked or modified content in submodules)");
96 color_fprintf_ln(s->fp, c, "#");
99 static void wt_status_print_untracked_header(struct wt_status *s)
101 const char *c = color(WT_STATUS_HEADER, s);
102 color_fprintf_ln(s->fp, c, "# Untracked files:");
103 if (!advice_status_hints)
105 color_fprintf_ln(s->fp, c, "# (use \"git add <file>...\" to include in what will be committed)");
106 color_fprintf_ln(s->fp, c, "#");
109 static void wt_status_print_trailer(struct wt_status *s)
111 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s), "#");
114 #define quote_path quote_path_relative
116 static void wt_status_print_unmerged_data(struct wt_status *s,
117 struct string_list_item *it)
119 const char *c = color(WT_STATUS_UNMERGED, s);
120 struct wt_status_change_data *d = it->util;
121 struct strbuf onebuf = STRBUF_INIT;
122 const char *one, *how = "bug";
124 one = quote_path(it->string, -1, &onebuf, s->prefix);
125 color_fprintf(s->fp, color(WT_STATUS_HEADER, s), "#\t");
126 switch (d->stagemask) {
127 case 1: how = "both deleted:"; break;
128 case 2: how = "added by us:"; break;
129 case 3: how = "deleted by them:"; break;
130 case 4: how = "added by them:"; break;
131 case 5: how = "deleted by us:"; break;
132 case 6: how = "both added:"; break;
133 case 7: how = "both modified:"; break;
135 color_fprintf(s->fp, c, "%-20s%s\n", how, one);
136 strbuf_release(&onebuf);
139 static void wt_status_print_change_data(struct wt_status *s,
141 struct string_list_item *it)
143 struct wt_status_change_data *d = it->util;
144 const char *c = color(change_type, s);
148 const char *one, *two;
149 struct strbuf onebuf = STRBUF_INIT, twobuf = STRBUF_INIT;
150 struct strbuf extra = STRBUF_INIT;
152 one_name = two_name = it->string;
153 switch (change_type) {
154 case WT_STATUS_UPDATED:
155 status = d->index_status;
157 one_name = d->head_path;
159 case WT_STATUS_CHANGED:
160 if (d->new_submodule_commits || d->dirty_submodule) {
161 strbuf_addstr(&extra, " (");
162 if (d->new_submodule_commits)
163 strbuf_addf(&extra, "new commits, ");
164 if (d->dirty_submodule & DIRTY_SUBMODULE_MODIFIED)
165 strbuf_addf(&extra, "modified content, ");
166 if (d->dirty_submodule & DIRTY_SUBMODULE_UNTRACKED)
167 strbuf_addf(&extra, "untracked content, ");
168 strbuf_setlen(&extra, extra.len - 2);
169 strbuf_addch(&extra, ')');
171 status = d->worktree_status;
175 one = quote_path(one_name, -1, &onebuf, s->prefix);
176 two = quote_path(two_name, -1, &twobuf, s->prefix);
178 color_fprintf(s->fp, color(WT_STATUS_HEADER, s), "#\t");
180 case DIFF_STATUS_ADDED:
181 color_fprintf(s->fp, c, "new file: %s", one);
183 case DIFF_STATUS_COPIED:
184 color_fprintf(s->fp, c, "copied: %s -> %s", one, two);
186 case DIFF_STATUS_DELETED:
187 color_fprintf(s->fp, c, "deleted: %s", one);
189 case DIFF_STATUS_MODIFIED:
190 color_fprintf(s->fp, c, "modified: %s", one);
192 case DIFF_STATUS_RENAMED:
193 color_fprintf(s->fp, c, "renamed: %s -> %s", one, two);
195 case DIFF_STATUS_TYPE_CHANGED:
196 color_fprintf(s->fp, c, "typechange: %s", one);
198 case DIFF_STATUS_UNKNOWN:
199 color_fprintf(s->fp, c, "unknown: %s", one);
201 case DIFF_STATUS_UNMERGED:
202 color_fprintf(s->fp, c, "unmerged: %s", one);
205 die("bug: unhandled diff status %c", status);
208 color_fprintf(s->fp, color(WT_STATUS_HEADER, s), "%s", extra.buf);
209 strbuf_release(&extra);
211 fprintf(s->fp, "\n");
212 strbuf_release(&onebuf);
213 strbuf_release(&twobuf);
216 static void wt_status_collect_changed_cb(struct diff_queue_struct *q,
217 struct diff_options *options,
220 struct wt_status *s = data;
225 s->workdir_dirty = 1;
226 for (i = 0; i < q->nr; i++) {
227 struct diff_filepair *p;
228 struct string_list_item *it;
229 struct wt_status_change_data *d;
232 it = string_list_insert(p->one->path, &s->change);
235 d = xcalloc(1, sizeof(*d));
238 if (!d->worktree_status)
239 d->worktree_status = p->status;
240 d->dirty_submodule = p->two->dirty_submodule;
241 if (S_ISGITLINK(p->two->mode))
242 d->new_submodule_commits = !!hashcmp(p->one->sha1, p->two->sha1);
246 static int unmerged_mask(const char *path)
249 struct cache_entry *ce;
251 pos = cache_name_pos(path, strlen(path));
257 while (pos < active_nr) {
258 ce = active_cache[pos++];
259 if (strcmp(ce->name, path) || !ce_stage(ce))
261 mask |= (1 << (ce_stage(ce) - 1));
266 static void wt_status_collect_updated_cb(struct diff_queue_struct *q,
267 struct diff_options *options,
270 struct wt_status *s = data;
273 for (i = 0; i < q->nr; i++) {
274 struct diff_filepair *p;
275 struct string_list_item *it;
276 struct wt_status_change_data *d;
279 it = string_list_insert(p->two->path, &s->change);
282 d = xcalloc(1, sizeof(*d));
285 if (!d->index_status)
286 d->index_status = p->status;
288 case DIFF_STATUS_COPIED:
289 case DIFF_STATUS_RENAMED:
290 d->head_path = xstrdup(p->one->path);
292 case DIFF_STATUS_UNMERGED:
293 d->stagemask = unmerged_mask(p->two->path);
299 static void wt_status_collect_changes_worktree(struct wt_status *s)
303 init_revisions(&rev, NULL);
304 setup_revisions(0, NULL, &rev, NULL);
305 rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
306 DIFF_OPT_SET(&rev.diffopt, DIRTY_SUBMODULES);
307 if (!s->show_untracked_files)
308 DIFF_OPT_SET(&rev.diffopt, IGNORE_UNTRACKED_IN_SUBMODULES);
309 rev.diffopt.format_callback = wt_status_collect_changed_cb;
310 rev.diffopt.format_callback_data = s;
311 rev.prune_data = s->pathspec;
312 run_diff_files(&rev, 0);
315 static void wt_status_collect_changes_index(struct wt_status *s)
318 struct setup_revision_opt opt;
320 init_revisions(&rev, NULL);
321 memset(&opt, 0, sizeof(opt));
322 opt.def = s->is_initial ? EMPTY_TREE_SHA1_HEX : s->reference;
323 setup_revisions(0, NULL, &rev, &opt);
325 rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
326 rev.diffopt.format_callback = wt_status_collect_updated_cb;
327 rev.diffopt.format_callback_data = s;
328 rev.diffopt.detect_rename = 1;
329 rev.diffopt.rename_limit = 200;
330 rev.diffopt.break_opt = 0;
331 rev.prune_data = s->pathspec;
332 run_diff_index(&rev, 1);
335 static void wt_status_collect_changes_initial(struct wt_status *s)
339 for (i = 0; i < active_nr; i++) {
340 struct string_list_item *it;
341 struct wt_status_change_data *d;
342 struct cache_entry *ce = active_cache[i];
344 if (!ce_path_match(ce, s->pathspec))
346 it = string_list_insert(ce->name, &s->change);
349 d = xcalloc(1, sizeof(*d));
353 d->index_status = DIFF_STATUS_UNMERGED;
354 d->stagemask |= (1 << (ce_stage(ce) - 1));
357 d->index_status = DIFF_STATUS_ADDED;
361 static void wt_status_collect_untracked(struct wt_status *s)
364 struct dir_struct dir;
366 if (!s->show_untracked_files)
368 memset(&dir, 0, sizeof(dir));
369 if (s->show_untracked_files != SHOW_ALL_UNTRACKED_FILES)
371 DIR_SHOW_OTHER_DIRECTORIES | DIR_HIDE_EMPTY_DIRECTORIES;
372 setup_standard_excludes(&dir);
374 fill_directory(&dir, s->pathspec);
375 for (i = 0; i < dir.nr; i++) {
376 struct dir_entry *ent = dir.entries[i];
377 if (!cache_name_is_other(ent->name, ent->len))
379 if (!match_pathspec(s->pathspec, ent->name, ent->len, 0, NULL))
381 s->workdir_untracked = 1;
382 string_list_insert(ent->name, &s->untracked);
386 void wt_status_collect(struct wt_status *s)
388 wt_status_collect_changes_worktree(s);
391 wt_status_collect_changes_initial(s);
393 wt_status_collect_changes_index(s);
394 wt_status_collect_untracked(s);
397 static void wt_status_print_unmerged(struct wt_status *s)
399 int shown_header = 0;
402 for (i = 0; i < s->change.nr; i++) {
403 struct wt_status_change_data *d;
404 struct string_list_item *it;
405 it = &(s->change.items[i]);
410 wt_status_print_unmerged_header(s);
413 wt_status_print_unmerged_data(s, it);
416 wt_status_print_trailer(s);
420 static void wt_status_print_updated(struct wt_status *s)
422 int shown_header = 0;
425 for (i = 0; i < s->change.nr; i++) {
426 struct wt_status_change_data *d;
427 struct string_list_item *it;
428 it = &(s->change.items[i]);
430 if (!d->index_status ||
431 d->index_status == DIFF_STATUS_UNMERGED)
434 wt_status_print_cached_header(s);
438 wt_status_print_change_data(s, WT_STATUS_UPDATED, it);
441 wt_status_print_trailer(s);
447 * 1 : some change but no delete
449 static int wt_status_check_worktree_changes(struct wt_status *s,
450 int *dirty_submodules)
455 *dirty_submodules = 0;
457 for (i = 0; i < s->change.nr; i++) {
458 struct wt_status_change_data *d;
459 d = s->change.items[i].util;
460 if (!d->worktree_status ||
461 d->worktree_status == DIFF_STATUS_UNMERGED)
465 if (d->dirty_submodule)
466 *dirty_submodules = 1;
467 if (d->worktree_status == DIFF_STATUS_DELETED)
473 static void wt_status_print_changed(struct wt_status *s)
475 int i, dirty_submodules;
476 int worktree_changes = wt_status_check_worktree_changes(s, &dirty_submodules);
478 if (!worktree_changes)
481 wt_status_print_dirty_header(s, worktree_changes < 0, dirty_submodules);
483 for (i = 0; i < s->change.nr; i++) {
484 struct wt_status_change_data *d;
485 struct string_list_item *it;
486 it = &(s->change.items[i]);
488 if (!d->worktree_status ||
489 d->worktree_status == DIFF_STATUS_UNMERGED)
491 wt_status_print_change_data(s, WT_STATUS_CHANGED, it);
493 wt_status_print_trailer(s);
496 static void wt_status_print_submodule_summary(struct wt_status *s, int uncommitted)
498 struct child_process sm_summary;
499 char summary_limit[64];
500 char index[PATH_MAX];
501 const char *env[] = { index, NULL };
502 const char *argv[] = {
505 uncommitted ? "--files" : "--cached",
509 uncommitted ? NULL : (s->amend ? "HEAD^" : "HEAD"),
513 sprintf(summary_limit, "%d", s->submodule_summary);
514 snprintf(index, sizeof(index), "GIT_INDEX_FILE=%s", s->index_file);
516 memset(&sm_summary, 0, sizeof(sm_summary));
517 sm_summary.argv = argv;
518 sm_summary.env = env;
519 sm_summary.git_cmd = 1;
520 sm_summary.no_stdin = 1;
522 sm_summary.out = dup(fileno(s->fp)); /* run_command closes it */
523 run_command(&sm_summary);
526 static void wt_status_print_untracked(struct wt_status *s)
529 struct strbuf buf = STRBUF_INIT;
531 if (!s->untracked.nr)
534 wt_status_print_untracked_header(s);
535 for (i = 0; i < s->untracked.nr; i++) {
536 struct string_list_item *it;
537 it = &(s->untracked.items[i]);
538 color_fprintf(s->fp, color(WT_STATUS_HEADER, s), "#\t");
539 color_fprintf_ln(s->fp, color(WT_STATUS_UNTRACKED, s), "%s",
540 quote_path(it->string, strlen(it->string),
543 strbuf_release(&buf);
546 static void wt_status_print_verbose(struct wt_status *s)
549 struct setup_revision_opt opt;
551 init_revisions(&rev, NULL);
552 DIFF_OPT_SET(&rev.diffopt, ALLOW_TEXTCONV);
554 memset(&opt, 0, sizeof(opt));
555 opt.def = s->is_initial ? EMPTY_TREE_SHA1_HEX : s->reference;
556 setup_revisions(0, NULL, &rev, &opt);
558 rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
559 rev.diffopt.detect_rename = 1;
560 rev.diffopt.file = s->fp;
561 rev.diffopt.close_file = 0;
563 * If we're not going to stdout, then we definitely don't
564 * want color, since we are going to the commit message
565 * file (and even the "auto" setting won't work, since it
566 * will have checked isatty on stdout).
569 DIFF_OPT_CLR(&rev.diffopt, COLOR_DIFF);
570 run_diff_index(&rev, 1);
573 static void wt_status_print_tracking(struct wt_status *s)
575 struct strbuf sb = STRBUF_INIT;
577 struct branch *branch;
579 assert(s->branch && !s->is_initial);
580 if (prefixcmp(s->branch, "refs/heads/"))
582 branch = branch_get(s->branch + 11);
583 if (!format_tracking_info(branch, &sb))
586 for (cp = sb.buf; (ep = strchr(cp, '\n')) != NULL; cp = ep + 1)
587 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s),
588 "# %.*s", (int)(ep - cp), cp);
589 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s), "#");
592 void wt_status_print(struct wt_status *s)
594 const char *branch_color = color(WT_STATUS_HEADER, s);
597 const char *on_what = "On branch ";
598 const char *branch_name = s->branch;
599 if (!prefixcmp(branch_name, "refs/heads/"))
601 else if (!strcmp(branch_name, "HEAD")) {
603 branch_color = color(WT_STATUS_NOBRANCH, s);
604 on_what = "Not currently on any branch.";
606 color_fprintf(s->fp, color(WT_STATUS_HEADER, s), "# ");
607 color_fprintf_ln(s->fp, branch_color, "%s%s", on_what, branch_name);
609 wt_status_print_tracking(s);
613 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s), "#");
614 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s), "# Initial commit");
615 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s), "#");
618 wt_status_print_updated(s);
619 wt_status_print_unmerged(s);
620 wt_status_print_changed(s);
621 if (s->submodule_summary) {
622 wt_status_print_submodule_summary(s, 0); /* staged */
623 wt_status_print_submodule_summary(s, 1); /* unstaged */
625 if (s->show_untracked_files)
626 wt_status_print_untracked(s);
627 else if (s->commitable)
628 fprintf(s->fp, "# Untracked files not listed%s\n",
630 ? " (use -u option to show untracked files)" : "");
633 wt_status_print_verbose(s);
634 if (!s->commitable) {
636 fprintf(s->fp, "# No changes\n");
639 else if (s->workdir_dirty)
640 printf("no changes added to commit%s\n",
642 ? " (use \"git add\" and/or \"git commit -a\")" : "");
643 else if (s->untracked.nr)
644 printf("nothing added to commit but untracked files present%s\n",
646 ? " (use \"git add\" to track)" : "");
647 else if (s->is_initial)
648 printf("nothing to commit%s\n", advice_status_hints
649 ? " (create/copy files and use \"git add\" to track)" : "");
650 else if (!s->show_untracked_files)
651 printf("nothing to commit%s\n", advice_status_hints
652 ? " (use -u to show untracked files)" : "");
654 printf("nothing to commit%s\n", advice_status_hints
655 ? " (working directory clean)" : "");
659 static void wt_shortstatus_unmerged(int null_termination, struct string_list_item *it,
662 struct wt_status_change_data *d = it->util;
663 const char *how = "??";
665 switch (d->stagemask) {
666 case 1: how = "DD"; break; /* both deleted */
667 case 2: how = "AU"; break; /* added by us */
668 case 3: how = "UD"; break; /* deleted by them */
669 case 4: how = "UA"; break; /* added by them */
670 case 5: how = "DU"; break; /* deleted by us */
671 case 6: how = "AA"; break; /* both added */
672 case 7: how = "UU"; break; /* both modified */
674 color_fprintf(s->fp, color(WT_STATUS_UNMERGED, s), "%s", how);
675 if (null_termination) {
676 fprintf(stdout, " %s%c", it->string, 0);
678 struct strbuf onebuf = STRBUF_INIT;
680 one = quote_path(it->string, -1, &onebuf, s->prefix);
681 printf(" %s\n", one);
682 strbuf_release(&onebuf);
686 static void wt_shortstatus_status(int null_termination, struct string_list_item *it,
689 struct wt_status_change_data *d = it->util;
692 color_fprintf(s->fp, color(WT_STATUS_UPDATED, s), "%c", d->index_status);
695 if (d->worktree_status)
696 color_fprintf(s->fp, color(WT_STATUS_CHANGED, s), "%c", d->worktree_status);
700 if (null_termination) {
701 fprintf(stdout, "%s%c", it->string, 0);
703 fprintf(stdout, "%s%c", d->head_path, 0);
705 struct strbuf onebuf = STRBUF_INIT;
708 one = quote_path(d->head_path, -1, &onebuf, s->prefix);
709 printf("%s -> ", one);
710 strbuf_release(&onebuf);
712 one = quote_path(it->string, -1, &onebuf, s->prefix);
714 strbuf_release(&onebuf);
718 static void wt_shortstatus_untracked(int null_termination, struct string_list_item *it,
721 if (null_termination) {
722 fprintf(stdout, "?? %s%c", it->string, 0);
724 struct strbuf onebuf = STRBUF_INIT;
726 one = quote_path(it->string, -1, &onebuf, s->prefix);
727 color_fprintf(s->fp, color(WT_STATUS_UNTRACKED, s), "??");
728 printf(" %s\n", one);
729 strbuf_release(&onebuf);
733 void wt_shortstatus_print(struct wt_status *s, int null_termination)
736 for (i = 0; i < s->change.nr; i++) {
737 struct wt_status_change_data *d;
738 struct string_list_item *it;
740 it = &(s->change.items[i]);
743 wt_shortstatus_unmerged(null_termination, it, s);
745 wt_shortstatus_status(null_termination, it, s);
747 for (i = 0; i < s->untracked.nr; i++) {
748 struct string_list_item *it;
750 it = &(s->untracked.items[i]);
751 wt_shortstatus_untracked(null_termination, it, s);
755 void wt_porcelain_print(struct wt_status *s, int null_termination)
758 s->relative_paths = 0;
760 wt_shortstatus_print(s, null_termination);