10 #include "run-command.h"
11 #include "argv-array.h"
14 #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;
589 dir.untracked = the_index.untracked;
590 setup_standard_excludes(&dir);
592 fill_directory(&dir, &s->pathspec);
594 for (i = 0; i < dir.nr; i++) {
595 struct dir_entry *ent = dir.entries[i];
596 if (cache_name_is_other(ent->name, ent->len) &&
597 dir_path_match(ent, &s->pathspec, 0, NULL))
598 string_list_insert(&s->untracked, ent->name);
602 for (i = 0; i < dir.ignored_nr; i++) {
603 struct dir_entry *ent = dir.ignored[i];
604 if (cache_name_is_other(ent->name, ent->len) &&
605 dir_path_match(ent, &s->pathspec, 0, NULL))
606 string_list_insert(&s->ignored, ent->name);
612 clear_directory(&dir);
614 if (advice_status_u_option)
615 s->untracked_in_ms = (getnanotime() - t_begin) / 1000000;
618 void wt_status_collect(struct wt_status *s)
620 wt_status_collect_changes_worktree(s);
623 wt_status_collect_changes_initial(s);
625 wt_status_collect_changes_index(s);
626 wt_status_collect_untracked(s);
629 static void wt_status_print_unmerged(struct wt_status *s)
631 int shown_header = 0;
634 for (i = 0; i < s->change.nr; i++) {
635 struct wt_status_change_data *d;
636 struct string_list_item *it;
637 it = &(s->change.items[i]);
642 wt_status_print_unmerged_header(s);
645 wt_status_print_unmerged_data(s, it);
648 wt_status_print_trailer(s);
652 static void wt_status_print_updated(struct wt_status *s)
654 int shown_header = 0;
657 for (i = 0; i < s->change.nr; i++) {
658 struct wt_status_change_data *d;
659 struct string_list_item *it;
660 it = &(s->change.items[i]);
662 if (!d->index_status ||
663 d->index_status == DIFF_STATUS_UNMERGED)
666 wt_status_print_cached_header(s);
670 wt_status_print_change_data(s, WT_STATUS_UPDATED, it);
673 wt_status_print_trailer(s);
679 * 1 : some change but no delete
681 static int wt_status_check_worktree_changes(struct wt_status *s,
682 int *dirty_submodules)
687 *dirty_submodules = 0;
689 for (i = 0; i < s->change.nr; i++) {
690 struct wt_status_change_data *d;
691 d = s->change.items[i].util;
692 if (!d->worktree_status ||
693 d->worktree_status == DIFF_STATUS_UNMERGED)
697 if (d->dirty_submodule)
698 *dirty_submodules = 1;
699 if (d->worktree_status == DIFF_STATUS_DELETED)
705 static void wt_status_print_changed(struct wt_status *s)
707 int i, dirty_submodules;
708 int worktree_changes = wt_status_check_worktree_changes(s, &dirty_submodules);
710 if (!worktree_changes)
713 wt_status_print_dirty_header(s, worktree_changes < 0, dirty_submodules);
715 for (i = 0; i < s->change.nr; i++) {
716 struct wt_status_change_data *d;
717 struct string_list_item *it;
718 it = &(s->change.items[i]);
720 if (!d->worktree_status ||
721 d->worktree_status == DIFF_STATUS_UNMERGED)
723 wt_status_print_change_data(s, WT_STATUS_CHANGED, it);
725 wt_status_print_trailer(s);
728 static void wt_status_print_submodule_summary(struct wt_status *s, int uncommitted)
730 struct child_process sm_summary = CHILD_PROCESS_INIT;
731 struct strbuf cmd_stdout = STRBUF_INIT;
732 struct strbuf summary = STRBUF_INIT;
733 char *summary_content;
735 argv_array_pushf(&sm_summary.env_array, "GIT_INDEX_FILE=%s",
738 argv_array_push(&sm_summary.args, "submodule");
739 argv_array_push(&sm_summary.args, "summary");
740 argv_array_push(&sm_summary.args, uncommitted ? "--files" : "--cached");
741 argv_array_push(&sm_summary.args, "--for-status");
742 argv_array_push(&sm_summary.args, "--summary-limit");
743 argv_array_pushf(&sm_summary.args, "%d", s->submodule_summary);
745 argv_array_push(&sm_summary.args, s->amend ? "HEAD^" : "HEAD");
747 sm_summary.git_cmd = 1;
748 sm_summary.no_stdin = 1;
750 capture_command(&sm_summary, &cmd_stdout, 1024);
752 /* prepend header, only if there's an actual output */
753 if (cmd_stdout.len) {
755 strbuf_addstr(&summary, _("Submodules changed but not updated:"));
757 strbuf_addstr(&summary, _("Submodule changes to be committed:"));
758 strbuf_addstr(&summary, "\n\n");
760 strbuf_addbuf(&summary, &cmd_stdout);
761 strbuf_release(&cmd_stdout);
763 if (s->display_comment_prefix) {
765 summary_content = strbuf_detach(&summary, &len);
766 strbuf_add_commented_lines(&summary, summary_content, len);
767 free(summary_content);
770 fputs(summary.buf, s->fp);
771 strbuf_release(&summary);
774 static void wt_status_print_other(struct wt_status *s,
775 struct string_list *l,
780 struct strbuf buf = STRBUF_INIT;
781 static struct string_list output = STRING_LIST_INIT_DUP;
782 struct column_options copts;
787 wt_status_print_other_header(s, what, how);
789 for (i = 0; i < l->nr; i++) {
790 struct string_list_item *it;
793 path = quote_path(it->string, s->prefix, &buf);
794 if (column_active(s->colopts)) {
795 string_list_append(&output, path);
798 status_printf(s, color(WT_STATUS_HEADER, s), "\t");
799 status_printf_more(s, color(WT_STATUS_UNTRACKED, s),
803 strbuf_release(&buf);
804 if (!column_active(s->colopts))
807 strbuf_addf(&buf, "%s%s\t%s",
808 color(WT_STATUS_HEADER, s),
809 s->display_comment_prefix ? "#" : "",
810 color(WT_STATUS_UNTRACKED, s));
811 memset(&copts, 0, sizeof(copts));
813 copts.indent = buf.buf;
814 if (want_color(s->use_color))
815 copts.nl = GIT_COLOR_RESET "\n";
816 print_columns(&output, s->colopts, &copts);
817 string_list_clear(&output, 0);
818 strbuf_release(&buf);
820 status_printf_ln(s, GIT_COLOR_NORMAL, "%s", "");
823 void wt_status_truncate_message_at_cut_line(struct strbuf *buf)
826 struct strbuf pattern = STRBUF_INIT;
828 strbuf_addf(&pattern, "\n%c %s", comment_line_char, cut_line);
829 if (starts_with(buf->buf, pattern.buf + 1))
830 strbuf_setlen(buf, 0);
831 else if ((p = strstr(buf->buf, pattern.buf)))
832 strbuf_setlen(buf, p - buf->buf + 1);
833 strbuf_release(&pattern);
836 void wt_status_add_cut_line(FILE *fp)
838 const char *explanation = _("Do not touch the line above.\nEverything below will be removed.");
839 struct strbuf buf = STRBUF_INIT;
841 fprintf(fp, "%c %s", comment_line_char, cut_line);
842 strbuf_add_commented_lines(&buf, explanation, strlen(explanation));
844 strbuf_release(&buf);
847 static void wt_status_print_verbose(struct wt_status *s)
850 struct setup_revision_opt opt;
851 int dirty_submodules;
852 const char *c = color(WT_STATUS_HEADER, s);
854 init_revisions(&rev, NULL);
855 DIFF_OPT_SET(&rev.diffopt, ALLOW_TEXTCONV);
857 memset(&opt, 0, sizeof(opt));
858 opt.def = s->is_initial ? EMPTY_TREE_SHA1_HEX : s->reference;
859 setup_revisions(0, NULL, &rev, &opt);
861 rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
862 rev.diffopt.detect_rename = 1;
863 rev.diffopt.file = s->fp;
864 rev.diffopt.close_file = 0;
866 * If we're not going to stdout, then we definitely don't
867 * want color, since we are going to the commit message
868 * file (and even the "auto" setting won't work, since it
869 * will have checked isatty on stdout). But we then do want
870 * to insert the scissor line here to reliably remove the
871 * diff before committing.
873 if (s->fp != stdout) {
874 rev.diffopt.use_color = 0;
875 wt_status_add_cut_line(s->fp);
877 if (s->verbose > 1 && s->commitable) {
878 /* print_updated() printed a header, so do we */
880 wt_status_print_trailer(s);
881 status_printf_ln(s, c, _("Changes to be committed:"));
882 rev.diffopt.a_prefix = "c/";
883 rev.diffopt.b_prefix = "i/";
884 } /* else use prefix as per user config */
885 run_diff_index(&rev, 1);
886 if (s->verbose > 1 &&
887 wt_status_check_worktree_changes(s, &dirty_submodules)) {
888 status_printf_ln(s, c,
889 "--------------------------------------------------");
890 status_printf_ln(s, c, _("Changes not staged for commit:"));
892 rev.diffopt.a_prefix = "i/";
893 rev.diffopt.b_prefix = "w/";
894 run_diff_files(&rev, 0);
898 static void wt_status_print_tracking(struct wt_status *s)
900 struct strbuf sb = STRBUF_INIT;
901 const char *cp, *ep, *branch_name;
902 struct branch *branch;
903 char comment_line_string[3];
906 assert(s->branch && !s->is_initial);
907 if (!skip_prefix(s->branch, "refs/heads/", &branch_name))
909 branch = branch_get(branch_name);
910 if (!format_tracking_info(branch, &sb))
914 if (s->display_comment_prefix) {
915 comment_line_string[i++] = comment_line_char;
916 comment_line_string[i++] = ' ';
918 comment_line_string[i] = '\0';
920 for (cp = sb.buf; (ep = strchr(cp, '\n')) != NULL; cp = ep + 1)
921 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s),
922 "%s%.*s", comment_line_string,
924 if (s->display_comment_prefix)
925 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s), "%c",
931 static int has_unmerged(struct wt_status *s)
935 for (i = 0; i < s->change.nr; i++) {
936 struct wt_status_change_data *d;
937 d = s->change.items[i].util;
944 static void show_merge_in_progress(struct wt_status *s,
945 struct wt_status_state *state,
948 if (has_unmerged(s)) {
949 status_printf_ln(s, color, _("You have unmerged paths."));
951 status_printf_ln(s, color,
952 _(" (fix conflicts and run \"git commit\")"));
954 status_printf_ln(s, color,
955 _("All conflicts fixed but you are still merging."));
957 status_printf_ln(s, color,
958 _(" (use \"git commit\" to conclude merge)"));
960 wt_status_print_trailer(s);
963 static void show_am_in_progress(struct wt_status *s,
964 struct wt_status_state *state,
967 status_printf_ln(s, color,
968 _("You are in the middle of an am session."));
969 if (state->am_empty_patch)
970 status_printf_ln(s, color,
971 _("The current patch is empty."));
973 if (!state->am_empty_patch)
974 status_printf_ln(s, color,
975 _(" (fix conflicts and then run \"git am --continue\")"));
976 status_printf_ln(s, color,
977 _(" (use \"git am --skip\" to skip this patch)"));
978 status_printf_ln(s, color,
979 _(" (use \"git am --abort\" to restore the original branch)"));
981 wt_status_print_trailer(s);
984 static char *read_line_from_git_path(const char *filename)
986 struct strbuf buf = STRBUF_INIT;
987 FILE *fp = fopen(git_path("%s", filename), "r");
989 strbuf_release(&buf);
992 strbuf_getline_lf(&buf, fp);
994 return strbuf_detach(&buf, NULL);
996 strbuf_release(&buf);
1001 static int split_commit_in_progress(struct wt_status *s)
1003 int split_in_progress = 0;
1004 char *head = read_line_from_git_path("HEAD");
1005 char *orig_head = read_line_from_git_path("ORIG_HEAD");
1006 char *rebase_amend = read_line_from_git_path("rebase-merge/amend");
1007 char *rebase_orig_head = read_line_from_git_path("rebase-merge/orig-head");
1009 if (!head || !orig_head || !rebase_amend || !rebase_orig_head ||
1010 !s->branch || strcmp(s->branch, "HEAD"))
1011 return split_in_progress;
1013 if (!strcmp(rebase_amend, rebase_orig_head)) {
1014 if (strcmp(head, rebase_amend))
1015 split_in_progress = 1;
1016 } else if (strcmp(orig_head, rebase_orig_head)) {
1017 split_in_progress = 1;
1020 if (!s->amend && !s->nowarn && !s->workdir_dirty)
1021 split_in_progress = 0;
1026 free(rebase_orig_head);
1027 return split_in_progress;
1032 * "pick d6a2f0303e897ec257dd0e0a39a5ccb709bc2047 some message"
1034 * "pick d6a2f03 some message"
1036 * The function assumes that the line does not contain useless spaces
1037 * before or after the command.
1039 static void abbrev_sha1_in_line(struct strbuf *line)
1041 struct strbuf **split;
1044 if (starts_with(line->buf, "exec ") ||
1045 starts_with(line->buf, "x "))
1048 split = strbuf_split_max(line, ' ', 3);
1049 if (split[0] && split[1]) {
1050 unsigned char sha1[20];
1054 * strbuf_split_max left a space. Trim it and re-add
1055 * it after abbreviation.
1057 strbuf_trim(split[1]);
1058 if (!get_sha1(split[1]->buf, sha1)) {
1059 abbrev = find_unique_abbrev(sha1, DEFAULT_ABBREV);
1060 strbuf_reset(split[1]);
1061 strbuf_addf(split[1], "%s ", abbrev);
1063 for (i = 0; split[i]; i++)
1064 strbuf_addf(line, "%s", split[i]->buf);
1067 strbuf_list_free(split);
1070 static void read_rebase_todolist(const char *fname, struct string_list *lines)
1072 struct strbuf line = STRBUF_INIT;
1073 FILE *f = fopen(git_path("%s", fname), "r");
1076 die_errno("Could not open file %s for reading",
1077 git_path("%s", fname));
1078 while (!strbuf_getline_lf(&line, f)) {
1079 if (line.len && line.buf[0] == comment_line_char)
1084 abbrev_sha1_in_line(&line);
1085 string_list_append(lines, line.buf);
1089 static void show_rebase_information(struct wt_status *s,
1090 struct wt_status_state *state,
1093 if (state->rebase_interactive_in_progress) {
1095 int nr_lines_to_show = 2;
1097 struct string_list have_done = STRING_LIST_INIT_DUP;
1098 struct string_list yet_to_do = STRING_LIST_INIT_DUP;
1100 read_rebase_todolist("rebase-merge/done", &have_done);
1101 read_rebase_todolist("rebase-merge/git-rebase-todo", &yet_to_do);
1103 if (have_done.nr == 0)
1104 status_printf_ln(s, color, _("No commands done."));
1106 status_printf_ln(s, color,
1107 Q_("Last command done (%d command done):",
1108 "Last commands done (%d commands done):",
1111 for (i = (have_done.nr > nr_lines_to_show)
1112 ? have_done.nr - nr_lines_to_show : 0;
1115 status_printf_ln(s, color, " %s", have_done.items[i].string);
1116 if (have_done.nr > nr_lines_to_show && s->hints)
1117 status_printf_ln(s, color,
1118 _(" (see more in file %s)"), git_path("rebase-merge/done"));
1121 if (yet_to_do.nr == 0)
1122 status_printf_ln(s, color,
1123 _("No commands remaining."));
1125 status_printf_ln(s, color,
1126 Q_("Next command to do (%d remaining command):",
1127 "Next commands to do (%d remaining commands):",
1130 for (i = 0; i < nr_lines_to_show && i < yet_to_do.nr; i++)
1131 status_printf_ln(s, color, " %s", yet_to_do.items[i].string);
1133 status_printf_ln(s, color,
1134 _(" (use \"git rebase --edit-todo\" to view and edit)"));
1136 string_list_clear(&yet_to_do, 0);
1137 string_list_clear(&have_done, 0);
1141 static void print_rebase_state(struct wt_status *s,
1142 struct wt_status_state *state,
1146 status_printf_ln(s, color,
1147 _("You are currently rebasing branch '%s' on '%s'."),
1151 status_printf_ln(s, color,
1152 _("You are currently rebasing."));
1155 static void show_rebase_in_progress(struct wt_status *s,
1156 struct wt_status_state *state,
1161 show_rebase_information(s, state, color);
1162 if (has_unmerged(s)) {
1163 print_rebase_state(s, state, color);
1165 status_printf_ln(s, color,
1166 _(" (fix conflicts and then run \"git rebase --continue\")"));
1167 status_printf_ln(s, color,
1168 _(" (use \"git rebase --skip\" to skip this patch)"));
1169 status_printf_ln(s, color,
1170 _(" (use \"git rebase --abort\" to check out the original branch)"));
1172 } else if (state->rebase_in_progress || !stat(git_path_merge_msg(), &st)) {
1173 print_rebase_state(s, state, color);
1175 status_printf_ln(s, color,
1176 _(" (all conflicts fixed: run \"git rebase --continue\")"));
1177 } else if (split_commit_in_progress(s)) {
1179 status_printf_ln(s, color,
1180 _("You are currently splitting a commit while rebasing branch '%s' on '%s'."),
1184 status_printf_ln(s, color,
1185 _("You are currently splitting a commit during a rebase."));
1187 status_printf_ln(s, color,
1188 _(" (Once your working directory is clean, run \"git rebase --continue\")"));
1191 status_printf_ln(s, color,
1192 _("You are currently editing a commit while rebasing branch '%s' on '%s'."),
1196 status_printf_ln(s, color,
1197 _("You are currently editing a commit during a rebase."));
1198 if (s->hints && !s->amend) {
1199 status_printf_ln(s, color,
1200 _(" (use \"git commit --amend\" to amend the current commit)"));
1201 status_printf_ln(s, color,
1202 _(" (use \"git rebase --continue\" once you are satisfied with your changes)"));
1205 wt_status_print_trailer(s);
1208 static void show_cherry_pick_in_progress(struct wt_status *s,
1209 struct wt_status_state *state,
1212 status_printf_ln(s, color, _("You are currently cherry-picking commit %s."),
1213 find_unique_abbrev(state->cherry_pick_head_sha1, DEFAULT_ABBREV));
1215 if (has_unmerged(s))
1216 status_printf_ln(s, color,
1217 _(" (fix conflicts and run \"git cherry-pick --continue\")"));
1219 status_printf_ln(s, color,
1220 _(" (all conflicts fixed: run \"git cherry-pick --continue\")"));
1221 status_printf_ln(s, color,
1222 _(" (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"));
1224 wt_status_print_trailer(s);
1227 static void show_revert_in_progress(struct wt_status *s,
1228 struct wt_status_state *state,
1231 status_printf_ln(s, color, _("You are currently reverting commit %s."),
1232 find_unique_abbrev(state->revert_head_sha1, DEFAULT_ABBREV));
1234 if (has_unmerged(s))
1235 status_printf_ln(s, color,
1236 _(" (fix conflicts and run \"git revert --continue\")"));
1238 status_printf_ln(s, color,
1239 _(" (all conflicts fixed: run \"git revert --continue\")"));
1240 status_printf_ln(s, color,
1241 _(" (use \"git revert --abort\" to cancel the revert operation)"));
1243 wt_status_print_trailer(s);
1246 static void show_bisect_in_progress(struct wt_status *s,
1247 struct wt_status_state *state,
1251 status_printf_ln(s, color,
1252 _("You are currently bisecting, started from branch '%s'."),
1255 status_printf_ln(s, color,
1256 _("You are currently bisecting."));
1258 status_printf_ln(s, color,
1259 _(" (use \"git bisect reset\" to get back to the original branch)"));
1260 wt_status_print_trailer(s);
1264 * Extract branch information from rebase/bisect
1266 static char *get_branch(const struct worktree *wt, const char *path)
1268 struct strbuf sb = STRBUF_INIT;
1269 unsigned char sha1[20];
1270 const char *branch_name;
1272 if (strbuf_read_file(&sb, worktree_git_path(wt, "%s", path), 0) <= 0)
1275 while (sb.len && sb.buf[sb.len - 1] == '\n')
1276 strbuf_setlen(&sb, sb.len - 1);
1279 if (skip_prefix(sb.buf, "refs/heads/", &branch_name))
1280 strbuf_remove(&sb, 0, branch_name - sb.buf);
1281 else if (starts_with(sb.buf, "refs/"))
1283 else if (!get_sha1_hex(sb.buf, sha1)) {
1285 abbrev = find_unique_abbrev(sha1, DEFAULT_ABBREV);
1287 strbuf_addstr(&sb, abbrev);
1288 } else if (!strcmp(sb.buf, "detached HEAD")) /* rebase */
1292 return strbuf_detach(&sb, NULL);
1295 strbuf_release(&sb);
1299 static char *read_and_strip_branch(const char *path)
1301 return get_branch(NULL, path);
1304 struct grab_1st_switch_cbdata {
1306 unsigned char nsha1[20];
1309 static int grab_1st_switch(unsigned char *osha1, unsigned char *nsha1,
1310 const char *email, unsigned long timestamp, int tz,
1311 const char *message, void *cb_data)
1313 struct grab_1st_switch_cbdata *cb = cb_data;
1314 const char *target = NULL, *end;
1316 if (!skip_prefix(message, "checkout: moving from ", &message))
1318 target = strstr(message, " to ");
1321 target += strlen(" to ");
1322 strbuf_reset(&cb->buf);
1323 hashcpy(cb->nsha1, nsha1);
1324 end = strchrnul(target, '\n');
1325 strbuf_add(&cb->buf, target, end - target);
1326 if (!strcmp(cb->buf.buf, "HEAD")) {
1327 /* HEAD is relative. Resolve it to the right reflog entry. */
1328 strbuf_reset(&cb->buf);
1329 strbuf_addstr(&cb->buf,
1330 find_unique_abbrev(nsha1, DEFAULT_ABBREV));
1335 static void wt_status_get_detached_from(struct wt_status_state *state)
1337 struct grab_1st_switch_cbdata cb;
1338 struct commit *commit;
1339 unsigned char sha1[20];
1342 strbuf_init(&cb.buf, 0);
1343 if (for_each_reflog_ent_reverse("HEAD", grab_1st_switch, &cb) <= 0) {
1344 strbuf_release(&cb.buf);
1348 if (dwim_ref(cb.buf.buf, cb.buf.len, sha1, &ref) == 1 &&
1349 /* sha1 is a commit? match without further lookup */
1350 (!hashcmp(cb.nsha1, sha1) ||
1351 /* perhaps sha1 is a tag, try to dereference to a commit */
1352 ((commit = lookup_commit_reference_gently(sha1, 1)) != NULL &&
1353 !hashcmp(cb.nsha1, commit->object.oid.hash)))) {
1354 const char *from = ref;
1355 if (!skip_prefix(from, "refs/tags/", &from))
1356 skip_prefix(from, "refs/remotes/", &from);
1357 state->detached_from = xstrdup(from);
1359 state->detached_from =
1360 xstrdup(find_unique_abbrev(cb.nsha1, DEFAULT_ABBREV));
1361 hashcpy(state->detached_sha1, cb.nsha1);
1362 state->detached_at = !get_sha1("HEAD", sha1) &&
1363 !hashcmp(sha1, state->detached_sha1);
1366 strbuf_release(&cb.buf);
1369 int wt_status_check_rebase(const struct worktree *wt,
1370 struct wt_status_state *state)
1374 if (!stat(worktree_git_path(wt, "rebase-apply"), &st)) {
1375 if (!stat(worktree_git_path(wt, "rebase-apply/applying"), &st)) {
1376 state->am_in_progress = 1;
1377 if (!stat(worktree_git_path(wt, "rebase-apply/patch"), &st) && !st.st_size)
1378 state->am_empty_patch = 1;
1380 state->rebase_in_progress = 1;
1381 state->branch = get_branch(wt, "rebase-apply/head-name");
1382 state->onto = get_branch(wt, "rebase-apply/onto");
1384 } else if (!stat(worktree_git_path(wt, "rebase-merge"), &st)) {
1385 if (!stat(worktree_git_path(wt, "rebase-merge/interactive"), &st))
1386 state->rebase_interactive_in_progress = 1;
1388 state->rebase_in_progress = 1;
1389 state->branch = get_branch(wt, "rebase-merge/head-name");
1390 state->onto = get_branch(wt, "rebase-merge/onto");
1396 void wt_status_get_state(struct wt_status_state *state,
1397 int get_detached_from)
1400 unsigned char sha1[20];
1402 if (!stat(git_path_merge_head(), &st)) {
1403 state->merge_in_progress = 1;
1404 } else if (wt_status_check_rebase(NULL, state)) {
1406 } else if (!stat(git_path_cherry_pick_head(), &st) &&
1407 !get_sha1("CHERRY_PICK_HEAD", sha1)) {
1408 state->cherry_pick_in_progress = 1;
1409 hashcpy(state->cherry_pick_head_sha1, sha1);
1411 if (!stat(git_path("BISECT_LOG"), &st)) {
1412 state->bisect_in_progress = 1;
1413 state->branch = read_and_strip_branch("BISECT_START");
1415 if (!stat(git_path_revert_head(), &st) &&
1416 !get_sha1("REVERT_HEAD", sha1)) {
1417 state->revert_in_progress = 1;
1418 hashcpy(state->revert_head_sha1, sha1);
1421 if (get_detached_from)
1422 wt_status_get_detached_from(state);
1425 static void wt_status_print_state(struct wt_status *s,
1426 struct wt_status_state *state)
1428 const char *state_color = color(WT_STATUS_HEADER, s);
1429 if (state->merge_in_progress)
1430 show_merge_in_progress(s, state, state_color);
1431 else if (state->am_in_progress)
1432 show_am_in_progress(s, state, state_color);
1433 else if (state->rebase_in_progress || state->rebase_interactive_in_progress)
1434 show_rebase_in_progress(s, state, state_color);
1435 else if (state->cherry_pick_in_progress)
1436 show_cherry_pick_in_progress(s, state, state_color);
1437 else if (state->revert_in_progress)
1438 show_revert_in_progress(s, state, state_color);
1439 if (state->bisect_in_progress)
1440 show_bisect_in_progress(s, state, state_color);
1443 void wt_status_print(struct wt_status *s)
1445 const char *branch_color = color(WT_STATUS_ONBRANCH, s);
1446 const char *branch_status_color = color(WT_STATUS_HEADER, s);
1447 struct wt_status_state state;
1449 memset(&state, 0, sizeof(state));
1450 wt_status_get_state(&state,
1451 s->branch && !strcmp(s->branch, "HEAD"));
1454 const char *on_what = _("On branch ");
1455 const char *branch_name = s->branch;
1456 if (!strcmp(branch_name, "HEAD")) {
1457 branch_status_color = color(WT_STATUS_NOBRANCH, s);
1458 if (state.rebase_in_progress || state.rebase_interactive_in_progress) {
1459 if (state.rebase_interactive_in_progress)
1460 on_what = _("interactive rebase in progress; onto ");
1462 on_what = _("rebase in progress; onto ");
1463 branch_name = state.onto;
1464 } else if (state.detached_from) {
1465 branch_name = state.detached_from;
1466 if (state.detached_at)
1467 on_what = _("HEAD detached at ");
1469 on_what = _("HEAD detached from ");
1472 on_what = _("Not currently on any branch.");
1475 skip_prefix(branch_name, "refs/heads/", &branch_name);
1476 status_printf(s, color(WT_STATUS_HEADER, s), "%s", "");
1477 status_printf_more(s, branch_status_color, "%s", on_what);
1478 status_printf_more(s, branch_color, "%s\n", branch_name);
1480 wt_status_print_tracking(s);
1483 wt_status_print_state(s, &state);
1486 free(state.detached_from);
1488 if (s->is_initial) {
1489 status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", "");
1490 status_printf_ln(s, color(WT_STATUS_HEADER, s), _("Initial commit"));
1491 status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", "");
1494 wt_status_print_updated(s);
1495 wt_status_print_unmerged(s);
1496 wt_status_print_changed(s);
1497 if (s->submodule_summary &&
1498 (!s->ignore_submodule_arg ||
1499 strcmp(s->ignore_submodule_arg, "all"))) {
1500 wt_status_print_submodule_summary(s, 0); /* staged */
1501 wt_status_print_submodule_summary(s, 1); /* unstaged */
1503 if (s->show_untracked_files) {
1504 wt_status_print_other(s, &s->untracked, _("Untracked files"), "add");
1505 if (s->show_ignored_files)
1506 wt_status_print_other(s, &s->ignored, _("Ignored files"), "add -f");
1507 if (advice_status_u_option && 2000 < s->untracked_in_ms) {
1508 status_printf_ln(s, GIT_COLOR_NORMAL, "%s", "");
1509 status_printf_ln(s, GIT_COLOR_NORMAL,
1510 _("It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1511 "may speed it up, but you have to be careful not to forget to add\n"
1512 "new files yourself (see 'git help status')."),
1513 s->untracked_in_ms / 1000.0);
1515 } else if (s->commitable)
1516 status_printf_ln(s, GIT_COLOR_NORMAL, _("Untracked files not listed%s"),
1518 ? _(" (use -u option to show untracked files)") : "");
1521 wt_status_print_verbose(s);
1522 if (!s->commitable) {
1524 status_printf_ln(s, GIT_COLOR_NORMAL, _("No changes"));
1527 else if (s->workdir_dirty) {
1529 printf(_("no changes added to commit "
1530 "(use \"git add\" and/or \"git commit -a\")\n"));
1532 printf(_("no changes added to commit\n"));
1533 } else if (s->untracked.nr) {
1535 printf(_("nothing added to commit but untracked files "
1536 "present (use \"git add\" to track)\n"));
1538 printf(_("nothing added to commit but untracked files present\n"));
1539 } else if (s->is_initial) {
1541 printf(_("nothing to commit (create/copy files "
1542 "and use \"git add\" to track)\n"));
1544 printf(_("nothing to commit\n"));
1545 } else if (!s->show_untracked_files) {
1547 printf(_("nothing to commit (use -u to show untracked files)\n"));
1549 printf(_("nothing to commit\n"));
1551 printf(_("nothing to commit, working directory clean\n"));
1555 static void wt_shortstatus_unmerged(struct string_list_item *it,
1556 struct wt_status *s)
1558 struct wt_status_change_data *d = it->util;
1559 const char *how = "??";
1561 switch (d->stagemask) {
1562 case 1: how = "DD"; break; /* both deleted */
1563 case 2: how = "AU"; break; /* added by us */
1564 case 3: how = "UD"; break; /* deleted by them */
1565 case 4: how = "UA"; break; /* added by them */
1566 case 5: how = "DU"; break; /* deleted by us */
1567 case 6: how = "AA"; break; /* both added */
1568 case 7: how = "UU"; break; /* both modified */
1570 color_fprintf(s->fp, color(WT_STATUS_UNMERGED, s), "%s", how);
1571 if (s->null_termination) {
1572 fprintf(stdout, " %s%c", it->string, 0);
1574 struct strbuf onebuf = STRBUF_INIT;
1576 one = quote_path(it->string, s->prefix, &onebuf);
1577 printf(" %s\n", one);
1578 strbuf_release(&onebuf);
1582 static void wt_shortstatus_status(struct string_list_item *it,
1583 struct wt_status *s)
1585 struct wt_status_change_data *d = it->util;
1587 if (d->index_status)
1588 color_fprintf(s->fp, color(WT_STATUS_UPDATED, s), "%c", d->index_status);
1591 if (d->worktree_status)
1592 color_fprintf(s->fp, color(WT_STATUS_CHANGED, s), "%c", d->worktree_status);
1596 if (s->null_termination) {
1597 fprintf(stdout, "%s%c", it->string, 0);
1599 fprintf(stdout, "%s%c", d->head_path, 0);
1601 struct strbuf onebuf = STRBUF_INIT;
1604 one = quote_path(d->head_path, s->prefix, &onebuf);
1605 if (*one != '"' && strchr(one, ' ') != NULL) {
1607 strbuf_addch(&onebuf, '"');
1610 printf("%s -> ", one);
1611 strbuf_release(&onebuf);
1613 one = quote_path(it->string, s->prefix, &onebuf);
1614 if (*one != '"' && strchr(one, ' ') != NULL) {
1616 strbuf_addch(&onebuf, '"');
1619 printf("%s\n", one);
1620 strbuf_release(&onebuf);
1624 static void wt_shortstatus_other(struct string_list_item *it,
1625 struct wt_status *s, const char *sign)
1627 if (s->null_termination) {
1628 fprintf(stdout, "%s %s%c", sign, it->string, 0);
1630 struct strbuf onebuf = STRBUF_INIT;
1632 one = quote_path(it->string, s->prefix, &onebuf);
1633 color_fprintf(s->fp, color(WT_STATUS_UNTRACKED, s), "%s", sign);
1634 printf(" %s\n", one);
1635 strbuf_release(&onebuf);
1639 static void wt_shortstatus_print_tracking(struct wt_status *s)
1641 struct branch *branch;
1642 const char *header_color = color(WT_STATUS_HEADER, s);
1643 const char *branch_color_local = color(WT_STATUS_LOCAL_BRANCH, s);
1644 const char *branch_color_remote = color(WT_STATUS_REMOTE_BRANCH, s);
1647 const char *branch_name;
1648 int num_ours, num_theirs;
1649 int upstream_is_gone = 0;
1651 color_fprintf(s->fp, color(WT_STATUS_HEADER, s), "## ");
1655 branch_name = s->branch;
1658 color_fprintf(s->fp, header_color, _("Initial commit on "));
1660 if (!strcmp(s->branch, "HEAD")) {
1661 color_fprintf(s->fp, color(WT_STATUS_NOBRANCH, s), "%s",
1662 _("HEAD (no branch)"));
1666 skip_prefix(branch_name, "refs/heads/", &branch_name);
1668 branch = branch_get(branch_name);
1670 color_fprintf(s->fp, branch_color_local, "%s", branch_name);
1672 if (stat_tracking_info(branch, &num_ours, &num_theirs, &base) < 0) {
1676 upstream_is_gone = 1;
1679 base = shorten_unambiguous_ref(base, 0);
1680 color_fprintf(s->fp, header_color, "...");
1681 color_fprintf(s->fp, branch_color_remote, "%s", base);
1684 if (!upstream_is_gone && !num_ours && !num_theirs)
1687 #define LABEL(string) (s->no_gettext ? (string) : _(string))
1689 color_fprintf(s->fp, header_color, " [");
1690 if (upstream_is_gone) {
1691 color_fprintf(s->fp, header_color, LABEL(N_("gone")));
1692 } else if (!num_ours) {
1693 color_fprintf(s->fp, header_color, LABEL(N_("behind ")));
1694 color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
1695 } else if (!num_theirs) {
1696 color_fprintf(s->fp, header_color, LABEL(N_("ahead ")));
1697 color_fprintf(s->fp, branch_color_local, "%d", num_ours);
1699 color_fprintf(s->fp, header_color, LABEL(N_("ahead ")));
1700 color_fprintf(s->fp, branch_color_local, "%d", num_ours);
1701 color_fprintf(s->fp, header_color, ", %s", LABEL(N_("behind ")));
1702 color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
1705 color_fprintf(s->fp, header_color, "]");
1707 fputc(s->null_termination ? '\0' : '\n', s->fp);
1710 void wt_shortstatus_print(struct wt_status *s)
1715 wt_shortstatus_print_tracking(s);
1717 for (i = 0; i < s->change.nr; i++) {
1718 struct wt_status_change_data *d;
1719 struct string_list_item *it;
1721 it = &(s->change.items[i]);
1724 wt_shortstatus_unmerged(it, s);
1726 wt_shortstatus_status(it, s);
1728 for (i = 0; i < s->untracked.nr; i++) {
1729 struct string_list_item *it;
1731 it = &(s->untracked.items[i]);
1732 wt_shortstatus_other(it, s, "??");
1734 for (i = 0; i < s->ignored.nr; i++) {
1735 struct string_list_item *it;
1737 it = &(s->ignored.items[i]);
1738 wt_shortstatus_other(it, s, "!!");
1742 void wt_porcelain_print(struct wt_status *s)
1745 s->relative_paths = 0;
1748 wt_shortstatus_print(s);