11 #include "run-command.h"
12 #include "argv-array.h"
15 #include "submodule.h"
20 static const char cut_line[] =
21 "------------------------ >8 ------------------------\n";
23 static char default_wt_status_colors[][COLOR_MAXLEN] = {
24 GIT_COLOR_NORMAL, /* WT_STATUS_HEADER */
25 GIT_COLOR_GREEN, /* WT_STATUS_UPDATED */
26 GIT_COLOR_RED, /* WT_STATUS_CHANGED */
27 GIT_COLOR_RED, /* WT_STATUS_UNTRACKED */
28 GIT_COLOR_RED, /* WT_STATUS_NOBRANCH */
29 GIT_COLOR_RED, /* WT_STATUS_UNMERGED */
30 GIT_COLOR_GREEN, /* WT_STATUS_LOCAL_BRANCH */
31 GIT_COLOR_RED, /* WT_STATUS_REMOTE_BRANCH */
32 GIT_COLOR_NIL, /* WT_STATUS_ONBRANCH */
35 static const char *color(int slot, struct wt_status *s)
38 if (want_color(s->use_color))
39 c = s->color_palette[slot];
40 if (slot == WT_STATUS_ONBRANCH && color_is_nil(c))
41 c = s->color_palette[WT_STATUS_HEADER];
45 static void status_vprintf(struct wt_status *s, int at_bol, const char *color,
46 const char *fmt, va_list ap, const char *trail)
48 struct strbuf sb = STRBUF_INIT;
49 struct strbuf linebuf = STRBUF_INIT;
50 const char *line, *eol;
52 strbuf_vaddf(&sb, fmt, ap);
54 if (s->display_comment_prefix) {
55 strbuf_addch(&sb, comment_line_char);
57 strbuf_addch(&sb, ' ');
59 color_print_strbuf(s->fp, color, &sb);
61 fprintf(s->fp, "%s", trail);
65 for (line = sb.buf; *line; line = eol + 1) {
66 eol = strchr(line, '\n');
68 strbuf_reset(&linebuf);
69 if (at_bol && s->display_comment_prefix) {
70 strbuf_addch(&linebuf, comment_line_char);
71 if (*line != '\n' && *line != '\t')
72 strbuf_addch(&linebuf, ' ');
75 strbuf_add(&linebuf, line, eol - line);
77 strbuf_addstr(&linebuf, line);
78 color_print_strbuf(s->fp, color, &linebuf);
86 fprintf(s->fp, "%s", trail);
87 strbuf_release(&linebuf);
91 void status_printf_ln(struct wt_status *s, const char *color,
97 status_vprintf(s, 1, color, fmt, ap, "\n");
101 void status_printf(struct wt_status *s, const char *color,
102 const char *fmt, ...)
107 status_vprintf(s, 1, color, fmt, ap, NULL);
111 static void status_printf_more(struct wt_status *s, const char *color,
112 const char *fmt, ...)
117 status_vprintf(s, 0, color, fmt, ap, NULL);
121 void wt_status_prepare(struct wt_status *s)
123 unsigned char sha1[20];
125 memset(s, 0, sizeof(*s));
126 memcpy(s->color_palette, default_wt_status_colors,
127 sizeof(default_wt_status_colors));
128 s->show_untracked_files = SHOW_NORMAL_UNTRACKED_FILES;
130 s->relative_paths = 1;
131 s->branch = resolve_refdup("HEAD", 0, sha1, NULL);
132 s->reference = "HEAD";
134 s->index_file = get_index_file();
135 s->change.strdup_strings = 1;
136 s->untracked.strdup_strings = 1;
137 s->ignored.strdup_strings = 1;
138 s->show_branch = -1; /* unspecified */
139 s->display_comment_prefix = 0;
142 static void wt_status_print_unmerged_header(struct wt_status *s)
145 int del_mod_conflict = 0;
146 int both_deleted = 0;
148 const char *c = color(WT_STATUS_HEADER, s);
150 status_printf_ln(s, c, _("Unmerged paths:"));
152 for (i = 0; i < s->change.nr; i++) {
153 struct string_list_item *it = &(s->change.items[i]);
154 struct wt_status_change_data *d = it->util;
156 switch (d->stagemask) {
164 del_mod_conflict = 1;
174 if (s->whence != FROM_COMMIT)
176 else if (!s->is_initial)
177 status_printf_ln(s, c, _(" (use \"git reset %s <file>...\" to unstage)"), s->reference);
179 status_printf_ln(s, c, _(" (use \"git rm --cached <file>...\" to unstage)"));
182 if (!del_mod_conflict)
183 status_printf_ln(s, c, _(" (use \"git add <file>...\" to mark resolution)"));
185 status_printf_ln(s, c, _(" (use \"git add/rm <file>...\" as appropriate to mark resolution)"));
186 } else if (!del_mod_conflict && !not_deleted) {
187 status_printf_ln(s, c, _(" (use \"git rm <file>...\" to mark resolution)"));
189 status_printf_ln(s, c, _(" (use \"git add/rm <file>...\" as appropriate to mark resolution)"));
191 status_printf_ln(s, c, "%s", "");
194 static void wt_status_print_cached_header(struct wt_status *s)
196 const char *c = color(WT_STATUS_HEADER, s);
198 status_printf_ln(s, c, _("Changes to be committed:"));
201 if (s->whence != FROM_COMMIT)
202 ; /* NEEDSWORK: use "git reset --unresolve"??? */
203 else if (!s->is_initial)
204 status_printf_ln(s, c, _(" (use \"git reset %s <file>...\" to unstage)"), s->reference);
206 status_printf_ln(s, c, _(" (use \"git rm --cached <file>...\" to unstage)"));
207 status_printf_ln(s, c, "%s", "");
210 static void wt_status_print_dirty_header(struct wt_status *s,
212 int has_dirty_submodules)
214 const char *c = color(WT_STATUS_HEADER, s);
216 status_printf_ln(s, c, _("Changes not staged for commit:"));
220 status_printf_ln(s, c, _(" (use \"git add <file>...\" to update what will be committed)"));
222 status_printf_ln(s, c, _(" (use \"git add/rm <file>...\" to update what will be committed)"));
223 status_printf_ln(s, c, _(" (use \"git checkout -- <file>...\" to discard changes in working directory)"));
224 if (has_dirty_submodules)
225 status_printf_ln(s, c, _(" (commit or discard the untracked or modified content in submodules)"));
226 status_printf_ln(s, c, "%s", "");
229 static void wt_status_print_other_header(struct wt_status *s,
233 const char *c = color(WT_STATUS_HEADER, s);
234 status_printf_ln(s, c, "%s:", what);
237 status_printf_ln(s, c, _(" (use \"git %s <file>...\" to include in what will be committed)"), how);
238 status_printf_ln(s, c, "%s", "");
241 static void wt_status_print_trailer(struct wt_status *s)
243 status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", "");
246 #define quote_path quote_path_relative
248 static const char *wt_status_unmerged_status_string(int stagemask)
252 return _("both deleted:");
254 return _("added by us:");
256 return _("deleted by them:");
258 return _("added by them:");
260 return _("deleted by us:");
262 return _("both added:");
264 return _("both modified:");
266 die(_("bug: unhandled unmerged status %x"), stagemask);
270 static const char *wt_status_diff_status_string(int status)
273 case DIFF_STATUS_ADDED:
274 return _("new file:");
275 case DIFF_STATUS_COPIED:
277 case DIFF_STATUS_DELETED:
278 return _("deleted:");
279 case DIFF_STATUS_MODIFIED:
280 return _("modified:");
281 case DIFF_STATUS_RENAMED:
282 return _("renamed:");
283 case DIFF_STATUS_TYPE_CHANGED:
284 return _("typechange:");
285 case DIFF_STATUS_UNKNOWN:
286 return _("unknown:");
287 case DIFF_STATUS_UNMERGED:
288 return _("unmerged:");
294 static int maxwidth(const char *(*label)(int), int minval, int maxval)
298 for (i = minval; i <= maxval; i++) {
299 const char *s = label(i);
300 int len = s ? utf8_strwidth(s) : 0;
307 static void wt_status_print_unmerged_data(struct wt_status *s,
308 struct string_list_item *it)
310 const char *c = color(WT_STATUS_UNMERGED, s);
311 struct wt_status_change_data *d = it->util;
312 struct strbuf onebuf = STRBUF_INIT;
313 static char *padding;
314 static int label_width;
315 const char *one, *how;
319 label_width = maxwidth(wt_status_unmerged_status_string, 1, 7);
320 label_width += strlen(" ");
321 padding = xmallocz(label_width);
322 memset(padding, ' ', label_width);
325 one = quote_path(it->string, s->prefix, &onebuf);
326 status_printf(s, color(WT_STATUS_HEADER, s), "\t");
328 how = wt_status_unmerged_status_string(d->stagemask);
329 len = label_width - utf8_strwidth(how);
330 status_printf_more(s, c, "%s%.*s%s\n", how, len, padding, one);
331 strbuf_release(&onebuf);
334 static void wt_status_print_change_data(struct wt_status *s,
336 struct string_list_item *it)
338 struct wt_status_change_data *d = it->util;
339 const char *c = color(change_type, s);
343 const char *one, *two;
344 struct strbuf onebuf = STRBUF_INIT, twobuf = STRBUF_INIT;
345 struct strbuf extra = STRBUF_INIT;
346 static char *padding;
347 static int label_width;
352 /* If DIFF_STATUS_* uses outside the range [A..Z], we're in trouble */
353 label_width = maxwidth(wt_status_diff_status_string, 'A', 'Z');
354 label_width += strlen(" ");
355 padding = xmallocz(label_width);
356 memset(padding, ' ', label_width);
359 one_name = two_name = it->string;
360 switch (change_type) {
361 case WT_STATUS_UPDATED:
362 status = d->index_status;
364 one_name = d->head_path;
366 case WT_STATUS_CHANGED:
367 if (d->new_submodule_commits || d->dirty_submodule) {
368 strbuf_addstr(&extra, " (");
369 if (d->new_submodule_commits)
370 strbuf_addf(&extra, _("new commits, "));
371 if (d->dirty_submodule & DIRTY_SUBMODULE_MODIFIED)
372 strbuf_addf(&extra, _("modified content, "));
373 if (d->dirty_submodule & DIRTY_SUBMODULE_UNTRACKED)
374 strbuf_addf(&extra, _("untracked content, "));
375 strbuf_setlen(&extra, extra.len - 2);
376 strbuf_addch(&extra, ')');
378 status = d->worktree_status;
381 die("BUG: unhandled change_type %d in wt_status_print_change_data",
385 one = quote_path(one_name, s->prefix, &onebuf);
386 two = quote_path(two_name, s->prefix, &twobuf);
388 status_printf(s, color(WT_STATUS_HEADER, s), "\t");
389 what = wt_status_diff_status_string(status);
391 die(_("bug: unhandled diff status %c"), status);
392 len = label_width - utf8_strwidth(what);
394 if (status == DIFF_STATUS_COPIED || status == DIFF_STATUS_RENAMED)
395 status_printf_more(s, c, "%s%.*s%s -> %s",
396 what, len, padding, one, two);
398 status_printf_more(s, c, "%s%.*s%s",
399 what, len, padding, one);
401 status_printf_more(s, color(WT_STATUS_HEADER, s), "%s", extra.buf);
402 strbuf_release(&extra);
404 status_printf_more(s, GIT_COLOR_NORMAL, "\n");
405 strbuf_release(&onebuf);
406 strbuf_release(&twobuf);
409 static void wt_status_collect_changed_cb(struct diff_queue_struct *q,
410 struct diff_options *options,
413 struct wt_status *s = data;
418 s->workdir_dirty = 1;
419 for (i = 0; i < q->nr; i++) {
420 struct diff_filepair *p;
421 struct string_list_item *it;
422 struct wt_status_change_data *d;
425 it = string_list_insert(&s->change, p->one->path);
428 d = xcalloc(1, sizeof(*d));
431 if (!d->worktree_status)
432 d->worktree_status = p->status;
433 d->dirty_submodule = p->two->dirty_submodule;
434 if (S_ISGITLINK(p->two->mode))
435 d->new_submodule_commits = !!hashcmp(p->one->sha1, p->two->sha1);
439 static int unmerged_mask(const char *path)
442 const struct cache_entry *ce;
444 pos = cache_name_pos(path, strlen(path));
450 while (pos < active_nr) {
451 ce = active_cache[pos++];
452 if (strcmp(ce->name, path) || !ce_stage(ce))
454 mask |= (1 << (ce_stage(ce) - 1));
459 static void wt_status_collect_updated_cb(struct diff_queue_struct *q,
460 struct diff_options *options,
463 struct wt_status *s = data;
466 for (i = 0; i < q->nr; i++) {
467 struct diff_filepair *p;
468 struct string_list_item *it;
469 struct wt_status_change_data *d;
472 it = string_list_insert(&s->change, p->two->path);
475 d = xcalloc(1, sizeof(*d));
478 if (!d->index_status)
479 d->index_status = p->status;
481 case DIFF_STATUS_COPIED:
482 case DIFF_STATUS_RENAMED:
483 d->head_path = xstrdup(p->one->path);
485 case DIFF_STATUS_UNMERGED:
486 d->stagemask = unmerged_mask(p->two->path);
492 static void wt_status_collect_changes_worktree(struct wt_status *s)
496 init_revisions(&rev, NULL);
497 setup_revisions(0, NULL, &rev, NULL);
498 rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
499 DIFF_OPT_SET(&rev.diffopt, DIRTY_SUBMODULES);
500 if (!s->show_untracked_files)
501 DIFF_OPT_SET(&rev.diffopt, IGNORE_UNTRACKED_IN_SUBMODULES);
502 if (s->ignore_submodule_arg) {
503 DIFF_OPT_SET(&rev.diffopt, OVERRIDE_SUBMODULE_CONFIG);
504 handle_ignore_submodules_arg(&rev.diffopt, s->ignore_submodule_arg);
506 rev.diffopt.format_callback = wt_status_collect_changed_cb;
507 rev.diffopt.format_callback_data = s;
508 copy_pathspec(&rev.prune_data, &s->pathspec);
509 run_diff_files(&rev, 0);
512 static void wt_status_collect_changes_index(struct wt_status *s)
515 struct setup_revision_opt opt;
517 init_revisions(&rev, NULL);
518 memset(&opt, 0, sizeof(opt));
519 opt.def = s->is_initial ? EMPTY_TREE_SHA1_HEX : s->reference;
520 setup_revisions(0, NULL, &rev, &opt);
522 DIFF_OPT_SET(&rev.diffopt, OVERRIDE_SUBMODULE_CONFIG);
523 if (s->ignore_submodule_arg) {
524 handle_ignore_submodules_arg(&rev.diffopt, s->ignore_submodule_arg);
527 * Unless the user did explicitly request a submodule ignore
528 * mode by passing a command line option we do not ignore any
529 * changed submodule SHA-1s when comparing index and HEAD, no
530 * matter what is configured. Otherwise the user won't be
531 * shown any submodules she manually added (and which are
532 * staged to be committed), which would be really confusing.
534 handle_ignore_submodules_arg(&rev.diffopt, "dirty");
537 rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
538 rev.diffopt.format_callback = wt_status_collect_updated_cb;
539 rev.diffopt.format_callback_data = s;
540 rev.diffopt.detect_rename = 1;
541 rev.diffopt.rename_limit = 200;
542 rev.diffopt.break_opt = 0;
543 copy_pathspec(&rev.prune_data, &s->pathspec);
544 run_diff_index(&rev, 1);
547 static void wt_status_collect_changes_initial(struct wt_status *s)
551 for (i = 0; i < active_nr; i++) {
552 struct string_list_item *it;
553 struct wt_status_change_data *d;
554 const struct cache_entry *ce = active_cache[i];
556 if (!ce_path_match(ce, &s->pathspec, NULL))
558 it = string_list_insert(&s->change, ce->name);
561 d = xcalloc(1, sizeof(*d));
565 d->index_status = DIFF_STATUS_UNMERGED;
566 d->stagemask |= (1 << (ce_stage(ce) - 1));
569 d->index_status = DIFF_STATUS_ADDED;
573 static void wt_status_collect_untracked(struct wt_status *s)
576 struct dir_struct dir;
577 uint64_t t_begin = getnanotime();
579 if (!s->show_untracked_files)
582 memset(&dir, 0, sizeof(dir));
583 if (s->show_untracked_files != SHOW_ALL_UNTRACKED_FILES)
585 DIR_SHOW_OTHER_DIRECTORIES | DIR_HIDE_EMPTY_DIRECTORIES;
586 if (s->show_ignored_files)
587 dir.flags |= DIR_SHOW_IGNORED_TOO;
588 setup_standard_excludes(&dir);
590 fill_directory(&dir, &s->pathspec);
592 for (i = 0; i < dir.nr; i++) {
593 struct dir_entry *ent = dir.entries[i];
594 if (cache_name_is_other(ent->name, ent->len) &&
595 dir_path_match(ent, &s->pathspec, 0, NULL))
596 string_list_insert(&s->untracked, ent->name);
600 for (i = 0; i < dir.ignored_nr; i++) {
601 struct dir_entry *ent = dir.ignored[i];
602 if (cache_name_is_other(ent->name, ent->len) &&
603 dir_path_match(ent, &s->pathspec, 0, NULL))
604 string_list_insert(&s->ignored, ent->name);
610 clear_directory(&dir);
612 if (advice_status_u_option)
613 s->untracked_in_ms = (getnanotime() - t_begin) / 1000000;
616 void wt_status_collect(struct wt_status *s)
618 wt_status_collect_changes_worktree(s);
621 wt_status_collect_changes_initial(s);
623 wt_status_collect_changes_index(s);
624 wt_status_collect_untracked(s);
627 static void wt_status_print_unmerged(struct wt_status *s)
629 int shown_header = 0;
632 for (i = 0; i < s->change.nr; i++) {
633 struct wt_status_change_data *d;
634 struct string_list_item *it;
635 it = &(s->change.items[i]);
640 wt_status_print_unmerged_header(s);
643 wt_status_print_unmerged_data(s, it);
646 wt_status_print_trailer(s);
650 static void wt_status_print_updated(struct wt_status *s)
652 int shown_header = 0;
655 for (i = 0; i < s->change.nr; i++) {
656 struct wt_status_change_data *d;
657 struct string_list_item *it;
658 it = &(s->change.items[i]);
660 if (!d->index_status ||
661 d->index_status == DIFF_STATUS_UNMERGED)
664 wt_status_print_cached_header(s);
668 wt_status_print_change_data(s, WT_STATUS_UPDATED, it);
671 wt_status_print_trailer(s);
677 * 1 : some change but no delete
679 static int wt_status_check_worktree_changes(struct wt_status *s,
680 int *dirty_submodules)
685 *dirty_submodules = 0;
687 for (i = 0; i < s->change.nr; i++) {
688 struct wt_status_change_data *d;
689 d = s->change.items[i].util;
690 if (!d->worktree_status ||
691 d->worktree_status == DIFF_STATUS_UNMERGED)
695 if (d->dirty_submodule)
696 *dirty_submodules = 1;
697 if (d->worktree_status == DIFF_STATUS_DELETED)
703 static void wt_status_print_changed(struct wt_status *s)
705 int i, dirty_submodules;
706 int worktree_changes = wt_status_check_worktree_changes(s, &dirty_submodules);
708 if (!worktree_changes)
711 wt_status_print_dirty_header(s, worktree_changes < 0, dirty_submodules);
713 for (i = 0; i < s->change.nr; i++) {
714 struct wt_status_change_data *d;
715 struct string_list_item *it;
716 it = &(s->change.items[i]);
718 if (!d->worktree_status ||
719 d->worktree_status == DIFF_STATUS_UNMERGED)
721 wt_status_print_change_data(s, WT_STATUS_CHANGED, it);
723 wt_status_print_trailer(s);
726 static void wt_status_print_submodule_summary(struct wt_status *s, int uncommitted)
728 struct child_process sm_summary = CHILD_PROCESS_INIT;
729 struct strbuf cmd_stdout = STRBUF_INIT;
730 struct strbuf summary = STRBUF_INIT;
731 char *summary_content;
733 argv_array_pushf(&sm_summary.env_array, "GIT_INDEX_FILE=%s",
736 argv_array_push(&sm_summary.args, "submodule");
737 argv_array_push(&sm_summary.args, "summary");
738 argv_array_push(&sm_summary.args, uncommitted ? "--files" : "--cached");
739 argv_array_push(&sm_summary.args, "--for-status");
740 argv_array_push(&sm_summary.args, "--summary-limit");
741 argv_array_pushf(&sm_summary.args, "%d", s->submodule_summary);
743 argv_array_push(&sm_summary.args, s->amend ? "HEAD^" : "HEAD");
745 sm_summary.git_cmd = 1;
746 sm_summary.no_stdin = 1;
748 capture_command(&sm_summary, &cmd_stdout, 1024);
750 /* prepend header, only if there's an actual output */
751 if (cmd_stdout.len) {
753 strbuf_addstr(&summary, _("Submodules changed but not updated:"));
755 strbuf_addstr(&summary, _("Submodule changes to be committed:"));
756 strbuf_addstr(&summary, "\n\n");
758 strbuf_addbuf(&summary, &cmd_stdout);
759 strbuf_release(&cmd_stdout);
761 if (s->display_comment_prefix) {
763 summary_content = strbuf_detach(&summary, &len);
764 strbuf_add_commented_lines(&summary, summary_content, len);
765 free(summary_content);
768 fputs(summary.buf, s->fp);
769 strbuf_release(&summary);
772 static void wt_status_print_other(struct wt_status *s,
773 struct string_list *l,
778 struct strbuf buf = STRBUF_INIT;
779 static struct string_list output = STRING_LIST_INIT_DUP;
780 struct column_options copts;
785 wt_status_print_other_header(s, what, how);
787 for (i = 0; i < l->nr; i++) {
788 struct string_list_item *it;
791 path = quote_path(it->string, s->prefix, &buf);
792 if (column_active(s->colopts)) {
793 string_list_append(&output, path);
796 status_printf(s, color(WT_STATUS_HEADER, s), "\t");
797 status_printf_more(s, color(WT_STATUS_UNTRACKED, s),
801 strbuf_release(&buf);
802 if (!column_active(s->colopts))
805 strbuf_addf(&buf, "%s%s\t%s",
806 color(WT_STATUS_HEADER, s),
807 s->display_comment_prefix ? "#" : "",
808 color(WT_STATUS_UNTRACKED, s));
809 memset(&copts, 0, sizeof(copts));
811 copts.indent = buf.buf;
812 if (want_color(s->use_color))
813 copts.nl = GIT_COLOR_RESET "\n";
814 print_columns(&output, s->colopts, &copts);
815 string_list_clear(&output, 0);
816 strbuf_release(&buf);
818 status_printf_ln(s, GIT_COLOR_NORMAL, "%s", "");
821 void wt_status_truncate_message_at_cut_line(struct strbuf *buf)
824 struct strbuf pattern = STRBUF_INIT;
826 strbuf_addf(&pattern, "%c %s", comment_line_char, cut_line);
827 p = strstr(buf->buf, pattern.buf);
828 if (p && (p == buf->buf || p[-1] == '\n'))
829 strbuf_setlen(buf, p - buf->buf);
830 strbuf_release(&pattern);
833 void wt_status_add_cut_line(FILE *fp)
835 const char *explanation = _("Do not touch the line above.\nEverything below will be removed.");
836 struct strbuf buf = STRBUF_INIT;
838 fprintf(fp, "%c %s", comment_line_char, cut_line);
839 strbuf_add_commented_lines(&buf, explanation, strlen(explanation));
841 strbuf_release(&buf);
844 static void wt_status_print_verbose(struct wt_status *s)
847 struct setup_revision_opt opt;
849 init_revisions(&rev, NULL);
850 DIFF_OPT_SET(&rev.diffopt, ALLOW_TEXTCONV);
852 memset(&opt, 0, sizeof(opt));
853 opt.def = s->is_initial ? EMPTY_TREE_SHA1_HEX : s->reference;
854 setup_revisions(0, NULL, &rev, &opt);
856 rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
857 rev.diffopt.detect_rename = 1;
858 rev.diffopt.file = s->fp;
859 rev.diffopt.close_file = 0;
861 * If we're not going to stdout, then we definitely don't
862 * want color, since we are going to the commit message
863 * file (and even the "auto" setting won't work, since it
864 * will have checked isatty on stdout). But we then do want
865 * to insert the scissor line here to reliably remove the
866 * diff before committing.
868 if (s->fp != stdout) {
869 rev.diffopt.use_color = 0;
870 wt_status_add_cut_line(s->fp);
872 run_diff_index(&rev, 1);
875 static void wt_status_print_tracking(struct wt_status *s)
877 struct strbuf sb = STRBUF_INIT;
879 struct branch *branch;
880 char comment_line_string[3];
883 assert(s->branch && !s->is_initial);
884 if (!starts_with(s->branch, "refs/heads/"))
886 branch = branch_get(s->branch + 11);
887 if (!format_tracking_info(branch, &sb))
891 if (s->display_comment_prefix) {
892 comment_line_string[i++] = comment_line_char;
893 comment_line_string[i++] = ' ';
895 comment_line_string[i] = '\0';
897 for (cp = sb.buf; (ep = strchr(cp, '\n')) != NULL; cp = ep + 1)
898 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s),
899 "%s%.*s", comment_line_string,
901 if (s->display_comment_prefix)
902 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s), "%c",
908 static int has_unmerged(struct wt_status *s)
912 for (i = 0; i < s->change.nr; i++) {
913 struct wt_status_change_data *d;
914 d = s->change.items[i].util;
921 static void show_merge_in_progress(struct wt_status *s,
922 struct wt_status_state *state,
925 if (has_unmerged(s)) {
926 status_printf_ln(s, color, _("You have unmerged paths."));
928 status_printf_ln(s, color,
929 _(" (fix conflicts and run \"git commit\")"));
931 status_printf_ln(s, color,
932 _("All conflicts fixed but you are still merging."));
934 status_printf_ln(s, color,
935 _(" (use \"git commit\" to conclude merge)"));
937 wt_status_print_trailer(s);
940 static void show_am_in_progress(struct wt_status *s,
941 struct wt_status_state *state,
944 status_printf_ln(s, color,
945 _("You are in the middle of an am session."));
946 if (state->am_empty_patch)
947 status_printf_ln(s, color,
948 _("The current patch is empty."));
950 if (!state->am_empty_patch)
951 status_printf_ln(s, color,
952 _(" (fix conflicts and then run \"git am --continue\")"));
953 status_printf_ln(s, color,
954 _(" (use \"git am --skip\" to skip this patch)"));
955 status_printf_ln(s, color,
956 _(" (use \"git am --abort\" to restore the original branch)"));
958 wt_status_print_trailer(s);
961 static char *read_line_from_git_path(const char *filename)
963 struct strbuf buf = STRBUF_INIT;
964 FILE *fp = fopen(git_path("%s", filename), "r");
966 strbuf_release(&buf);
969 strbuf_getline(&buf, fp, '\n');
971 return strbuf_detach(&buf, NULL);
973 strbuf_release(&buf);
978 static int split_commit_in_progress(struct wt_status *s)
980 int split_in_progress = 0;
981 char *head = read_line_from_git_path("HEAD");
982 char *orig_head = read_line_from_git_path("ORIG_HEAD");
983 char *rebase_amend = read_line_from_git_path("rebase-merge/amend");
984 char *rebase_orig_head = read_line_from_git_path("rebase-merge/orig-head");
986 if (!head || !orig_head || !rebase_amend || !rebase_orig_head ||
987 !s->branch || strcmp(s->branch, "HEAD"))
988 return split_in_progress;
990 if (!strcmp(rebase_amend, rebase_orig_head)) {
991 if (strcmp(head, rebase_amend))
992 split_in_progress = 1;
993 } else if (strcmp(orig_head, rebase_orig_head)) {
994 split_in_progress = 1;
997 if (!s->amend && !s->nowarn && !s->workdir_dirty)
998 split_in_progress = 0;
1003 free(rebase_orig_head);
1004 return split_in_progress;
1007 static void show_rebase_in_progress(struct wt_status *s,
1008 struct wt_status_state *state,
1013 if (has_unmerged(s)) {
1015 status_printf_ln(s, color,
1016 _("You are currently rebasing branch '%s' on '%s'."),
1020 status_printf_ln(s, color,
1021 _("You are currently rebasing."));
1023 status_printf_ln(s, color,
1024 _(" (fix conflicts and then run \"git rebase --continue\")"));
1025 status_printf_ln(s, color,
1026 _(" (use \"git rebase --skip\" to skip this patch)"));
1027 status_printf_ln(s, color,
1028 _(" (use \"git rebase --abort\" to check out the original branch)"));
1030 } else if (state->rebase_in_progress || !stat(git_path("MERGE_MSG"), &st)) {
1032 status_printf_ln(s, color,
1033 _("You are currently rebasing branch '%s' on '%s'."),
1037 status_printf_ln(s, color,
1038 _("You are currently rebasing."));
1040 status_printf_ln(s, color,
1041 _(" (all conflicts fixed: run \"git rebase --continue\")"));
1042 } else if (split_commit_in_progress(s)) {
1044 status_printf_ln(s, color,
1045 _("You are currently splitting a commit while rebasing branch '%s' on '%s'."),
1049 status_printf_ln(s, color,
1050 _("You are currently splitting a commit during a rebase."));
1052 status_printf_ln(s, color,
1053 _(" (Once your working directory is clean, run \"git rebase --continue\")"));
1056 status_printf_ln(s, color,
1057 _("You are currently editing a commit while rebasing branch '%s' on '%s'."),
1061 status_printf_ln(s, color,
1062 _("You are currently editing a commit during a rebase."));
1063 if (s->hints && !s->amend) {
1064 status_printf_ln(s, color,
1065 _(" (use \"git commit --amend\" to amend the current commit)"));
1066 status_printf_ln(s, color,
1067 _(" (use \"git rebase --continue\" once you are satisfied with your changes)"));
1070 wt_status_print_trailer(s);
1073 static void show_cherry_pick_in_progress(struct wt_status *s,
1074 struct wt_status_state *state,
1077 status_printf_ln(s, color, _("You are currently cherry-picking commit %s."),
1078 find_unique_abbrev(state->cherry_pick_head_sha1, DEFAULT_ABBREV));
1080 if (has_unmerged(s))
1081 status_printf_ln(s, color,
1082 _(" (fix conflicts and run \"git cherry-pick --continue\")"));
1084 status_printf_ln(s, color,
1085 _(" (all conflicts fixed: run \"git cherry-pick --continue\")"));
1086 status_printf_ln(s, color,
1087 _(" (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"));
1089 wt_status_print_trailer(s);
1092 static void show_revert_in_progress(struct wt_status *s,
1093 struct wt_status_state *state,
1096 status_printf_ln(s, color, _("You are currently reverting commit %s."),
1097 find_unique_abbrev(state->revert_head_sha1, DEFAULT_ABBREV));
1099 if (has_unmerged(s))
1100 status_printf_ln(s, color,
1101 _(" (fix conflicts and run \"git revert --continue\")"));
1103 status_printf_ln(s, color,
1104 _(" (all conflicts fixed: run \"git revert --continue\")"));
1105 status_printf_ln(s, color,
1106 _(" (use \"git revert --abort\" to cancel the revert operation)"));
1108 wt_status_print_trailer(s);
1111 static void show_bisect_in_progress(struct wt_status *s,
1112 struct wt_status_state *state,
1116 status_printf_ln(s, color,
1117 _("You are currently bisecting, started from branch '%s'."),
1120 status_printf_ln(s, color,
1121 _("You are currently bisecting."));
1123 status_printf_ln(s, color,
1124 _(" (use \"git bisect reset\" to get back to the original branch)"));
1125 wt_status_print_trailer(s);
1129 * Extract branch information from rebase/bisect
1131 static char *read_and_strip_branch(const char *path)
1133 struct strbuf sb = STRBUF_INIT;
1134 unsigned char sha1[20];
1136 if (strbuf_read_file(&sb, git_path("%s", path), 0) <= 0)
1139 while (sb.len && sb.buf[sb.len - 1] == '\n')
1140 strbuf_setlen(&sb, sb.len - 1);
1143 if (starts_with(sb.buf, "refs/heads/"))
1144 strbuf_remove(&sb,0, strlen("refs/heads/"));
1145 else if (starts_with(sb.buf, "refs/"))
1147 else if (!get_sha1_hex(sb.buf, sha1)) {
1149 abbrev = find_unique_abbrev(sha1, DEFAULT_ABBREV);
1151 strbuf_addstr(&sb, abbrev);
1152 } else if (!strcmp(sb.buf, "detached HEAD")) /* rebase */
1156 return strbuf_detach(&sb, NULL);
1159 strbuf_release(&sb);
1163 struct grab_1st_switch_cbdata {
1165 unsigned char nsha1[20];
1168 static int grab_1st_switch(unsigned char *osha1, unsigned char *nsha1,
1169 const char *email, unsigned long timestamp, int tz,
1170 const char *message, void *cb_data)
1172 struct grab_1st_switch_cbdata *cb = cb_data;
1173 const char *target = NULL, *end;
1175 if (!starts_with(message, "checkout: moving from "))
1177 message += strlen("checkout: moving from ");
1178 target = strstr(message, " to ");
1181 target += strlen(" to ");
1182 strbuf_reset(&cb->buf);
1183 hashcpy(cb->nsha1, nsha1);
1184 for (end = target; *end && *end != '\n'; end++)
1186 strbuf_add(&cb->buf, target, end - target);
1190 static void wt_status_get_detached_from(struct wt_status_state *state)
1192 struct grab_1st_switch_cbdata cb;
1193 struct commit *commit;
1194 unsigned char sha1[20];
1197 strbuf_init(&cb.buf, 0);
1198 if (for_each_reflog_ent_reverse("HEAD", grab_1st_switch, &cb) <= 0) {
1199 strbuf_release(&cb.buf);
1203 if (dwim_ref(cb.buf.buf, cb.buf.len, sha1, &ref) == 1 &&
1204 /* sha1 is a commit? match without further lookup */
1205 (!hashcmp(cb.nsha1, sha1) ||
1206 /* perhaps sha1 is a tag, try to dereference to a commit */
1207 ((commit = lookup_commit_reference_gently(sha1, 1)) != NULL &&
1208 !hashcmp(cb.nsha1, commit->object.sha1)))) {
1210 if (starts_with(ref, "refs/tags/"))
1211 ofs = strlen("refs/tags/");
1212 else if (starts_with(ref, "refs/remotes/"))
1213 ofs = strlen("refs/remotes/");
1216 state->detached_from = xstrdup(ref + ofs);
1218 state->detached_from =
1219 xstrdup(find_unique_abbrev(cb.nsha1, DEFAULT_ABBREV));
1220 hashcpy(state->detached_sha1, cb.nsha1);
1223 strbuf_release(&cb.buf);
1226 void wt_status_get_state(struct wt_status_state *state,
1227 int get_detached_from)
1230 unsigned char sha1[20];
1232 if (!stat(git_path("MERGE_HEAD"), &st)) {
1233 state->merge_in_progress = 1;
1234 } else if (!stat(git_path("rebase-apply"), &st)) {
1235 if (!stat(git_path("rebase-apply/applying"), &st)) {
1236 state->am_in_progress = 1;
1237 if (!stat(git_path("rebase-apply/patch"), &st) && !st.st_size)
1238 state->am_empty_patch = 1;
1240 state->rebase_in_progress = 1;
1241 state->branch = read_and_strip_branch("rebase-apply/head-name");
1242 state->onto = read_and_strip_branch("rebase-apply/onto");
1244 } else if (!stat(git_path("rebase-merge"), &st)) {
1245 if (!stat(git_path("rebase-merge/interactive"), &st))
1246 state->rebase_interactive_in_progress = 1;
1248 state->rebase_in_progress = 1;
1249 state->branch = read_and_strip_branch("rebase-merge/head-name");
1250 state->onto = read_and_strip_branch("rebase-merge/onto");
1251 } else if (!stat(git_path("CHERRY_PICK_HEAD"), &st) &&
1252 !get_sha1("CHERRY_PICK_HEAD", sha1)) {
1253 state->cherry_pick_in_progress = 1;
1254 hashcpy(state->cherry_pick_head_sha1, sha1);
1256 if (!stat(git_path("BISECT_LOG"), &st)) {
1257 state->bisect_in_progress = 1;
1258 state->branch = read_and_strip_branch("BISECT_START");
1260 if (!stat(git_path("REVERT_HEAD"), &st) &&
1261 !get_sha1("REVERT_HEAD", sha1)) {
1262 state->revert_in_progress = 1;
1263 hashcpy(state->revert_head_sha1, sha1);
1266 if (get_detached_from)
1267 wt_status_get_detached_from(state);
1270 static void wt_status_print_state(struct wt_status *s,
1271 struct wt_status_state *state)
1273 const char *state_color = color(WT_STATUS_HEADER, s);
1274 if (state->merge_in_progress)
1275 show_merge_in_progress(s, state, state_color);
1276 else if (state->am_in_progress)
1277 show_am_in_progress(s, state, state_color);
1278 else if (state->rebase_in_progress || state->rebase_interactive_in_progress)
1279 show_rebase_in_progress(s, state, state_color);
1280 else if (state->cherry_pick_in_progress)
1281 show_cherry_pick_in_progress(s, state, state_color);
1282 else if (state->revert_in_progress)
1283 show_revert_in_progress(s, state, state_color);
1284 if (state->bisect_in_progress)
1285 show_bisect_in_progress(s, state, state_color);
1288 void wt_status_print(struct wt_status *s)
1290 const char *branch_color = color(WT_STATUS_ONBRANCH, s);
1291 const char *branch_status_color = color(WT_STATUS_HEADER, s);
1292 struct wt_status_state state;
1294 memset(&state, 0, sizeof(state));
1295 wt_status_get_state(&state,
1296 s->branch && !strcmp(s->branch, "HEAD"));
1299 const char *on_what = _("On branch ");
1300 const char *branch_name = s->branch;
1301 if (starts_with(branch_name, "refs/heads/"))
1303 else if (!strcmp(branch_name, "HEAD")) {
1304 branch_status_color = color(WT_STATUS_NOBRANCH, s);
1305 if (state.rebase_in_progress || state.rebase_interactive_in_progress) {
1306 on_what = _("rebase in progress; onto ");
1307 branch_name = state.onto;
1308 } else if (state.detached_from) {
1309 unsigned char sha1[20];
1310 branch_name = state.detached_from;
1311 if (!get_sha1("HEAD", sha1) &&
1312 !hashcmp(sha1, state.detached_sha1))
1313 on_what = _("HEAD detached at ");
1315 on_what = _("HEAD detached from ");
1318 on_what = _("Not currently on any branch.");
1321 status_printf(s, color(WT_STATUS_HEADER, s), "%s", "");
1322 status_printf_more(s, branch_status_color, "%s", on_what);
1323 status_printf_more(s, branch_color, "%s\n", branch_name);
1325 wt_status_print_tracking(s);
1328 wt_status_print_state(s, &state);
1331 free(state.detached_from);
1333 if (s->is_initial) {
1334 status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", "");
1335 status_printf_ln(s, color(WT_STATUS_HEADER, s), _("Initial commit"));
1336 status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", "");
1339 wt_status_print_updated(s);
1340 wt_status_print_unmerged(s);
1341 wt_status_print_changed(s);
1342 if (s->submodule_summary &&
1343 (!s->ignore_submodule_arg ||
1344 strcmp(s->ignore_submodule_arg, "all"))) {
1345 wt_status_print_submodule_summary(s, 0); /* staged */
1346 wt_status_print_submodule_summary(s, 1); /* unstaged */
1348 if (s->show_untracked_files) {
1349 wt_status_print_other(s, &s->untracked, _("Untracked files"), "add");
1350 if (s->show_ignored_files)
1351 wt_status_print_other(s, &s->ignored, _("Ignored files"), "add -f");
1352 if (advice_status_u_option && 2000 < s->untracked_in_ms) {
1353 status_printf_ln(s, GIT_COLOR_NORMAL, "%s", "");
1354 status_printf_ln(s, GIT_COLOR_NORMAL,
1355 _("It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1356 "may speed it up, but you have to be careful not to forget to add\n"
1357 "new files yourself (see 'git help status')."),
1358 s->untracked_in_ms / 1000.0);
1360 } else if (s->commitable)
1361 status_printf_ln(s, GIT_COLOR_NORMAL, _("Untracked files not listed%s"),
1363 ? _(" (use -u option to show untracked files)") : "");
1366 wt_status_print_verbose(s);
1367 if (!s->commitable) {
1369 status_printf_ln(s, GIT_COLOR_NORMAL, _("No changes"));
1372 else if (s->workdir_dirty) {
1374 printf(_("no changes added to commit "
1375 "(use \"git add\" and/or \"git commit -a\")\n"));
1377 printf(_("no changes added to commit\n"));
1378 } else if (s->untracked.nr) {
1380 printf(_("nothing added to commit but untracked files "
1381 "present (use \"git add\" to track)\n"));
1383 printf(_("nothing added to commit but untracked files present\n"));
1384 } else if (s->is_initial) {
1386 printf(_("nothing to commit (create/copy files "
1387 "and use \"git add\" to track)\n"));
1389 printf(_("nothing to commit\n"));
1390 } else if (!s->show_untracked_files) {
1392 printf(_("nothing to commit (use -u to show untracked files)\n"));
1394 printf(_("nothing to commit\n"));
1396 printf(_("nothing to commit, working directory clean\n"));
1400 static void wt_shortstatus_unmerged(struct string_list_item *it,
1401 struct wt_status *s)
1403 struct wt_status_change_data *d = it->util;
1404 const char *how = "??";
1406 switch (d->stagemask) {
1407 case 1: how = "DD"; break; /* both deleted */
1408 case 2: how = "AU"; break; /* added by us */
1409 case 3: how = "UD"; break; /* deleted by them */
1410 case 4: how = "UA"; break; /* added by them */
1411 case 5: how = "DU"; break; /* deleted by us */
1412 case 6: how = "AA"; break; /* both added */
1413 case 7: how = "UU"; break; /* both modified */
1415 color_fprintf(s->fp, color(WT_STATUS_UNMERGED, s), "%s", how);
1416 if (s->null_termination) {
1417 fprintf(stdout, " %s%c", it->string, 0);
1419 struct strbuf onebuf = STRBUF_INIT;
1421 one = quote_path(it->string, s->prefix, &onebuf);
1422 printf(" %s\n", one);
1423 strbuf_release(&onebuf);
1427 static void wt_shortstatus_status(struct string_list_item *it,
1428 struct wt_status *s)
1430 struct wt_status_change_data *d = it->util;
1432 if (d->index_status)
1433 color_fprintf(s->fp, color(WT_STATUS_UPDATED, s), "%c", d->index_status);
1436 if (d->worktree_status)
1437 color_fprintf(s->fp, color(WT_STATUS_CHANGED, s), "%c", d->worktree_status);
1441 if (s->null_termination) {
1442 fprintf(stdout, "%s%c", it->string, 0);
1444 fprintf(stdout, "%s%c", d->head_path, 0);
1446 struct strbuf onebuf = STRBUF_INIT;
1449 one = quote_path(d->head_path, s->prefix, &onebuf);
1450 if (*one != '"' && strchr(one, ' ') != NULL) {
1452 strbuf_addch(&onebuf, '"');
1455 printf("%s -> ", one);
1456 strbuf_release(&onebuf);
1458 one = quote_path(it->string, s->prefix, &onebuf);
1459 if (*one != '"' && strchr(one, ' ') != NULL) {
1461 strbuf_addch(&onebuf, '"');
1464 printf("%s\n", one);
1465 strbuf_release(&onebuf);
1469 static void wt_shortstatus_other(struct string_list_item *it,
1470 struct wt_status *s, const char *sign)
1472 if (s->null_termination) {
1473 fprintf(stdout, "%s %s%c", sign, it->string, 0);
1475 struct strbuf onebuf = STRBUF_INIT;
1477 one = quote_path(it->string, s->prefix, &onebuf);
1478 color_fprintf(s->fp, color(WT_STATUS_UNTRACKED, s), "%s", sign);
1479 printf(" %s\n", one);
1480 strbuf_release(&onebuf);
1484 static void wt_shortstatus_print_tracking(struct wt_status *s)
1486 struct branch *branch;
1487 const char *header_color = color(WT_STATUS_HEADER, s);
1488 const char *branch_color_local = color(WT_STATUS_LOCAL_BRANCH, s);
1489 const char *branch_color_remote = color(WT_STATUS_REMOTE_BRANCH, s);
1492 const char *branch_name;
1493 int num_ours, num_theirs;
1494 int upstream_is_gone = 0;
1496 color_fprintf(s->fp, color(WT_STATUS_HEADER, s), "## ");
1500 branch_name = s->branch;
1502 if (starts_with(branch_name, "refs/heads/"))
1504 else if (!strcmp(branch_name, "HEAD")) {
1505 branch_name = _("HEAD (no branch)");
1506 branch_color_local = color(WT_STATUS_NOBRANCH, s);
1509 branch = branch_get(s->branch + 11);
1511 color_fprintf(s->fp, header_color, _("Initial commit on "));
1513 color_fprintf(s->fp, branch_color_local, "%s", branch_name);
1515 switch (stat_tracking_info(branch, &num_ours, &num_theirs)) {
1518 fputc(s->null_termination ? '\0' : '\n', s->fp);
1521 /* with "gone" base */
1522 upstream_is_gone = 1;
1529 base = branch->merge[0]->dst;
1530 base = shorten_unambiguous_ref(base, 0);
1531 color_fprintf(s->fp, header_color, "...");
1532 color_fprintf(s->fp, branch_color_remote, "%s", base);
1534 if (!upstream_is_gone && !num_ours && !num_theirs) {
1535 fputc(s->null_termination ? '\0' : '\n', s->fp);
1539 #define LABEL(string) (s->no_gettext ? (string) : _(string))
1541 color_fprintf(s->fp, header_color, " [");
1542 if (upstream_is_gone) {
1543 color_fprintf(s->fp, header_color, LABEL(N_("gone")));
1544 } else if (!num_ours) {
1545 color_fprintf(s->fp, header_color, LABEL(N_("behind ")));
1546 color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
1547 } else if (!num_theirs) {
1548 color_fprintf(s->fp, header_color, LABEL(N_(("ahead "))));
1549 color_fprintf(s->fp, branch_color_local, "%d", num_ours);
1551 color_fprintf(s->fp, header_color, LABEL(N_(("ahead "))));
1552 color_fprintf(s->fp, branch_color_local, "%d", num_ours);
1553 color_fprintf(s->fp, header_color, ", %s", LABEL(N_("behind ")));
1554 color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
1557 color_fprintf(s->fp, header_color, "]");
1558 fputc(s->null_termination ? '\0' : '\n', s->fp);
1561 void wt_shortstatus_print(struct wt_status *s)
1566 wt_shortstatus_print_tracking(s);
1568 for (i = 0; i < s->change.nr; i++) {
1569 struct wt_status_change_data *d;
1570 struct string_list_item *it;
1572 it = &(s->change.items[i]);
1575 wt_shortstatus_unmerged(it, s);
1577 wt_shortstatus_status(it, s);
1579 for (i = 0; i < s->untracked.nr; i++) {
1580 struct string_list_item *it;
1582 it = &(s->untracked.items[i]);
1583 wt_shortstatus_other(it, s, "??");
1585 for (i = 0; i < s->ignored.nr; i++) {
1586 struct string_list_item *it;
1588 it = &(s->ignored.items[i]);
1589 wt_shortstatus_other(it, s, "!!");
1593 void wt_porcelain_print(struct wt_status *s)
1596 s->relative_paths = 0;
1599 wt_shortstatus_print(s);