10 #include "run-command.h"
11 #include "argv-array.h"
14 #include "submodule.h"
20 #include "sequencer.h"
22 #define AB_DELAY_WARNING_IN_MS (2 * 1000)
24 static const char cut_line[] =
25 "------------------------ >8 ------------------------\n";
27 static char default_wt_status_colors[][COLOR_MAXLEN] = {
28 GIT_COLOR_NORMAL, /* WT_STATUS_HEADER */
29 GIT_COLOR_GREEN, /* WT_STATUS_UPDATED */
30 GIT_COLOR_RED, /* WT_STATUS_CHANGED */
31 GIT_COLOR_RED, /* WT_STATUS_UNTRACKED */
32 GIT_COLOR_RED, /* WT_STATUS_NOBRANCH */
33 GIT_COLOR_RED, /* WT_STATUS_UNMERGED */
34 GIT_COLOR_GREEN, /* WT_STATUS_LOCAL_BRANCH */
35 GIT_COLOR_RED, /* WT_STATUS_REMOTE_BRANCH */
36 GIT_COLOR_NIL, /* WT_STATUS_ONBRANCH */
39 static const char *color(int slot, struct wt_status *s)
42 if (want_color(s->use_color))
43 c = s->color_palette[slot];
44 if (slot == WT_STATUS_ONBRANCH && color_is_nil(c))
45 c = s->color_palette[WT_STATUS_HEADER];
49 static void status_vprintf(struct wt_status *s, int at_bol, const char *color,
50 const char *fmt, va_list ap, const char *trail)
52 struct strbuf sb = STRBUF_INIT;
53 struct strbuf linebuf = STRBUF_INIT;
54 const char *line, *eol;
56 strbuf_vaddf(&sb, fmt, ap);
58 if (s->display_comment_prefix) {
59 strbuf_addch(&sb, comment_line_char);
61 strbuf_addch(&sb, ' ');
63 color_print_strbuf(s->fp, color, &sb);
65 fprintf(s->fp, "%s", trail);
69 for (line = sb.buf; *line; line = eol + 1) {
70 eol = strchr(line, '\n');
72 strbuf_reset(&linebuf);
73 if (at_bol && s->display_comment_prefix) {
74 strbuf_addch(&linebuf, comment_line_char);
75 if (*line != '\n' && *line != '\t')
76 strbuf_addch(&linebuf, ' ');
79 strbuf_add(&linebuf, line, eol - line);
81 strbuf_addstr(&linebuf, line);
82 color_print_strbuf(s->fp, color, &linebuf);
90 fprintf(s->fp, "%s", trail);
91 strbuf_release(&linebuf);
95 void status_printf_ln(struct wt_status *s, const char *color,
101 status_vprintf(s, 1, color, fmt, ap, "\n");
105 void status_printf(struct wt_status *s, const char *color,
106 const char *fmt, ...)
111 status_vprintf(s, 1, color, fmt, ap, NULL);
115 static void status_printf_more(struct wt_status *s, const char *color,
116 const char *fmt, ...)
121 status_vprintf(s, 0, color, fmt, ap, NULL);
125 void wt_status_prepare(struct repository *r, struct wt_status *s)
127 memset(s, 0, sizeof(*s));
129 memcpy(s->color_palette, default_wt_status_colors,
130 sizeof(default_wt_status_colors));
131 s->show_untracked_files = SHOW_NORMAL_UNTRACKED_FILES;
133 s->relative_paths = 1;
134 s->branch = resolve_refdup("HEAD", 0, NULL, NULL);
135 s->reference = "HEAD";
137 s->index_file = get_index_file();
138 s->change.strdup_strings = 1;
139 s->untracked.strdup_strings = 1;
140 s->ignored.strdup_strings = 1;
141 s->show_branch = -1; /* unspecified */
143 s->ahead_behind_flags = AHEAD_BEHIND_UNSPECIFIED;
144 s->display_comment_prefix = 0;
145 s->detect_rename = -1;
146 s->rename_score = -1;
147 s->rename_limit = -1;
150 static void wt_longstatus_print_unmerged_header(struct wt_status *s)
153 int del_mod_conflict = 0;
154 int both_deleted = 0;
156 const char *c = color(WT_STATUS_HEADER, s);
158 status_printf_ln(s, c, _("Unmerged paths:"));
160 for (i = 0; i < s->change.nr; i++) {
161 struct string_list_item *it = &(s->change.items[i]);
162 struct wt_status_change_data *d = it->util;
164 switch (d->stagemask) {
172 del_mod_conflict = 1;
182 if (s->whence != FROM_COMMIT)
184 else if (!s->is_initial) {
185 if (!strcmp(s->reference, "HEAD"))
186 status_printf_ln(s, c,
187 _(" (use \"git restore --staged <file>...\" to unstage)"));
189 status_printf_ln(s, c,
190 _(" (use \"git restore --source=%s --staged <file>...\" to unstage)"),
193 status_printf_ln(s, c, _(" (use \"git rm --cached <file>...\" to unstage)"));
196 if (!del_mod_conflict)
197 status_printf_ln(s, c, _(" (use \"git add <file>...\" to mark resolution)"));
199 status_printf_ln(s, c, _(" (use \"git add/rm <file>...\" as appropriate to mark resolution)"));
200 } else if (!del_mod_conflict && !not_deleted) {
201 status_printf_ln(s, c, _(" (use \"git rm <file>...\" to mark resolution)"));
203 status_printf_ln(s, c, _(" (use \"git add/rm <file>...\" as appropriate to mark resolution)"));
207 static void wt_longstatus_print_cached_header(struct wt_status *s)
209 const char *c = color(WT_STATUS_HEADER, s);
211 status_printf_ln(s, c, _("Changes to be committed:"));
214 if (s->whence != FROM_COMMIT)
215 ; /* NEEDSWORK: use "git reset --unresolve"??? */
216 else if (!s->is_initial) {
217 if (!strcmp(s->reference, "HEAD"))
218 status_printf_ln(s, c
219 , _(" (use \"git restore --staged <file>...\" to unstage)"));
221 status_printf_ln(s, c,
222 _(" (use \"git restore --source=%s --staged <file>...\" to unstage)"),
225 status_printf_ln(s, c, _(" (use \"git rm --cached <file>...\" to unstage)"));
228 static void wt_longstatus_print_dirty_header(struct wt_status *s,
230 int has_dirty_submodules)
232 const char *c = color(WT_STATUS_HEADER, s);
234 status_printf_ln(s, c, _("Changes not staged for commit:"));
238 status_printf_ln(s, c, _(" (use \"git add <file>...\" to update what will be committed)"));
240 status_printf_ln(s, c, _(" (use \"git add/rm <file>...\" to update what will be committed)"));
241 status_printf_ln(s, c, _(" (use \"git restore <file>...\" to discard changes in working directory)"));
242 if (has_dirty_submodules)
243 status_printf_ln(s, c, _(" (commit or discard the untracked or modified content in submodules)"));
246 static void wt_longstatus_print_other_header(struct wt_status *s,
250 const char *c = color(WT_STATUS_HEADER, s);
251 status_printf_ln(s, c, "%s:", what);
254 status_printf_ln(s, c, _(" (use \"git %s <file>...\" to include in what will be committed)"), how);
257 static void wt_longstatus_print_trailer(struct wt_status *s)
259 status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", "");
262 #define quote_path quote_path_relative
264 static const char *wt_status_unmerged_status_string(int stagemask)
268 return _("both deleted:");
270 return _("added by us:");
272 return _("deleted by them:");
274 return _("added by them:");
276 return _("deleted by us:");
278 return _("both added:");
280 return _("both modified:");
282 BUG("unhandled unmerged status %x", stagemask);
286 static const char *wt_status_diff_status_string(int status)
289 case DIFF_STATUS_ADDED:
290 return _("new file:");
291 case DIFF_STATUS_COPIED:
293 case DIFF_STATUS_DELETED:
294 return _("deleted:");
295 case DIFF_STATUS_MODIFIED:
296 return _("modified:");
297 case DIFF_STATUS_RENAMED:
298 return _("renamed:");
299 case DIFF_STATUS_TYPE_CHANGED:
300 return _("typechange:");
301 case DIFF_STATUS_UNKNOWN:
302 return _("unknown:");
303 case DIFF_STATUS_UNMERGED:
304 return _("unmerged:");
310 static int maxwidth(const char *(*label)(int), int minval, int maxval)
314 for (i = minval; i <= maxval; i++) {
315 const char *s = label(i);
316 int len = s ? utf8_strwidth(s) : 0;
323 static void wt_longstatus_print_unmerged_data(struct wt_status *s,
324 struct string_list_item *it)
326 const char *c = color(WT_STATUS_UNMERGED, s);
327 struct wt_status_change_data *d = it->util;
328 struct strbuf onebuf = STRBUF_INIT;
329 static char *padding;
330 static int label_width;
331 const char *one, *how;
335 label_width = maxwidth(wt_status_unmerged_status_string, 1, 7);
336 label_width += strlen(" ");
337 padding = xmallocz(label_width);
338 memset(padding, ' ', label_width);
341 one = quote_path(it->string, s->prefix, &onebuf);
342 status_printf(s, color(WT_STATUS_HEADER, s), "\t");
344 how = wt_status_unmerged_status_string(d->stagemask);
345 len = label_width - utf8_strwidth(how);
346 status_printf_more(s, c, "%s%.*s%s\n", how, len, padding, one);
347 strbuf_release(&onebuf);
350 static void wt_longstatus_print_change_data(struct wt_status *s,
352 struct string_list_item *it)
354 struct wt_status_change_data *d = it->util;
355 const char *c = color(change_type, s);
359 const char *one, *two;
360 struct strbuf onebuf = STRBUF_INIT, twobuf = STRBUF_INIT;
361 struct strbuf extra = STRBUF_INIT;
362 static char *padding;
363 static int label_width;
368 /* If DIFF_STATUS_* uses outside the range [A..Z], we're in trouble */
369 label_width = maxwidth(wt_status_diff_status_string, 'A', 'Z');
370 label_width += strlen(" ");
371 padding = xmallocz(label_width);
372 memset(padding, ' ', label_width);
375 one_name = two_name = it->string;
376 switch (change_type) {
377 case WT_STATUS_UPDATED:
378 status = d->index_status;
380 case WT_STATUS_CHANGED:
381 if (d->new_submodule_commits || d->dirty_submodule) {
382 strbuf_addstr(&extra, " (");
383 if (d->new_submodule_commits)
384 strbuf_addstr(&extra, _("new commits, "));
385 if (d->dirty_submodule & DIRTY_SUBMODULE_MODIFIED)
386 strbuf_addstr(&extra, _("modified content, "));
387 if (d->dirty_submodule & DIRTY_SUBMODULE_UNTRACKED)
388 strbuf_addstr(&extra, _("untracked content, "));
389 strbuf_setlen(&extra, extra.len - 2);
390 strbuf_addch(&extra, ')');
392 status = d->worktree_status;
395 BUG("unhandled change_type %d in wt_longstatus_print_change_data",
400 * Only pick up the rename it's relevant. If the rename is for
401 * the changed section and we're printing the updated section,
404 if (d->rename_status == status)
405 one_name = d->rename_source;
407 one = quote_path(one_name, s->prefix, &onebuf);
408 two = quote_path(two_name, s->prefix, &twobuf);
410 status_printf(s, color(WT_STATUS_HEADER, s), "\t");
411 what = wt_status_diff_status_string(status);
413 BUG("unhandled diff status %c", status);
414 len = label_width - utf8_strwidth(what);
416 if (one_name != two_name)
417 status_printf_more(s, c, "%s%.*s%s -> %s",
418 what, len, padding, one, two);
420 status_printf_more(s, c, "%s%.*s%s",
421 what, len, padding, one);
423 status_printf_more(s, color(WT_STATUS_HEADER, s), "%s", extra.buf);
424 strbuf_release(&extra);
426 status_printf_more(s, GIT_COLOR_NORMAL, "\n");
427 strbuf_release(&onebuf);
428 strbuf_release(&twobuf);
431 static char short_submodule_status(struct wt_status_change_data *d)
433 if (d->new_submodule_commits)
435 if (d->dirty_submodule & DIRTY_SUBMODULE_MODIFIED)
437 if (d->dirty_submodule & DIRTY_SUBMODULE_UNTRACKED)
439 return d->worktree_status;
442 static void wt_status_collect_changed_cb(struct diff_queue_struct *q,
443 struct diff_options *options,
446 struct wt_status *s = data;
451 s->workdir_dirty = 1;
452 for (i = 0; i < q->nr; i++) {
453 struct diff_filepair *p;
454 struct string_list_item *it;
455 struct wt_status_change_data *d;
458 it = string_list_insert(&s->change, p->two->path);
461 d = xcalloc(1, sizeof(*d));
464 if (!d->worktree_status)
465 d->worktree_status = p->status;
466 if (S_ISGITLINK(p->two->mode)) {
467 d->dirty_submodule = p->two->dirty_submodule;
468 d->new_submodule_commits = !oideq(&p->one->oid,
470 if (s->status_format == STATUS_FORMAT_SHORT)
471 d->worktree_status = short_submodule_status(d);
475 case DIFF_STATUS_ADDED:
476 d->mode_worktree = p->two->mode;
479 case DIFF_STATUS_DELETED:
480 d->mode_index = p->one->mode;
481 oidcpy(&d->oid_index, &p->one->oid);
482 /* mode_worktree is zero for a delete. */
485 case DIFF_STATUS_COPIED:
486 case DIFF_STATUS_RENAMED:
487 if (d->rename_status)
488 BUG("multiple renames on the same target? how?");
489 d->rename_source = xstrdup(p->one->path);
490 d->rename_score = p->score * 100 / MAX_SCORE;
491 d->rename_status = p->status;
493 case DIFF_STATUS_MODIFIED:
494 case DIFF_STATUS_TYPE_CHANGED:
495 case DIFF_STATUS_UNMERGED:
496 d->mode_index = p->one->mode;
497 d->mode_worktree = p->two->mode;
498 oidcpy(&d->oid_index, &p->one->oid);
502 BUG("unhandled diff-files status '%c'", p->status);
509 static int unmerged_mask(struct index_state *istate, const char *path)
512 const struct cache_entry *ce;
514 pos = index_name_pos(istate, path, strlen(path));
520 while (pos < istate->cache_nr) {
521 ce = istate->cache[pos++];
522 if (strcmp(ce->name, path) || !ce_stage(ce))
524 mask |= (1 << (ce_stage(ce) - 1));
529 static void wt_status_collect_updated_cb(struct diff_queue_struct *q,
530 struct diff_options *options,
533 struct wt_status *s = data;
536 for (i = 0; i < q->nr; i++) {
537 struct diff_filepair *p;
538 struct string_list_item *it;
539 struct wt_status_change_data *d;
542 it = string_list_insert(&s->change, p->two->path);
545 d = xcalloc(1, sizeof(*d));
548 if (!d->index_status)
549 d->index_status = p->status;
551 case DIFF_STATUS_ADDED:
552 /* Leave {mode,oid}_head zero for an add. */
553 d->mode_index = p->two->mode;
554 oidcpy(&d->oid_index, &p->two->oid);
557 case DIFF_STATUS_DELETED:
558 d->mode_head = p->one->mode;
559 oidcpy(&d->oid_head, &p->one->oid);
561 /* Leave {mode,oid}_index zero for a delete. */
564 case DIFF_STATUS_COPIED:
565 case DIFF_STATUS_RENAMED:
566 if (d->rename_status)
567 BUG("multiple renames on the same target? how?");
568 d->rename_source = xstrdup(p->one->path);
569 d->rename_score = p->score * 100 / MAX_SCORE;
570 d->rename_status = p->status;
572 case DIFF_STATUS_MODIFIED:
573 case DIFF_STATUS_TYPE_CHANGED:
574 d->mode_head = p->one->mode;
575 d->mode_index = p->two->mode;
576 oidcpy(&d->oid_head, &p->one->oid);
577 oidcpy(&d->oid_index, &p->two->oid);
580 case DIFF_STATUS_UNMERGED:
581 d->stagemask = unmerged_mask(s->repo->index,
584 * Don't bother setting {mode,oid}_{head,index} since the print
585 * code will output the stage values directly and not use the
586 * values in these fields.
591 BUG("unhandled diff-index status '%c'", p->status);
597 static void wt_status_collect_changes_worktree(struct wt_status *s)
601 repo_init_revisions(s->repo, &rev, NULL);
602 setup_revisions(0, NULL, &rev, NULL);
603 rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
604 rev.diffopt.flags.dirty_submodules = 1;
605 rev.diffopt.ita_invisible_in_index = 1;
606 if (!s->show_untracked_files)
607 rev.diffopt.flags.ignore_untracked_in_submodules = 1;
608 if (s->ignore_submodule_arg) {
609 rev.diffopt.flags.override_submodule_config = 1;
610 handle_ignore_submodules_arg(&rev.diffopt, s->ignore_submodule_arg);
612 rev.diffopt.format_callback = wt_status_collect_changed_cb;
613 rev.diffopt.format_callback_data = s;
614 rev.diffopt.detect_rename = s->detect_rename >= 0 ? s->detect_rename : rev.diffopt.detect_rename;
615 rev.diffopt.rename_limit = s->rename_limit >= 0 ? s->rename_limit : rev.diffopt.rename_limit;
616 rev.diffopt.rename_score = s->rename_score >= 0 ? s->rename_score : rev.diffopt.rename_score;
617 copy_pathspec(&rev.prune_data, &s->pathspec);
618 run_diff_files(&rev, 0);
621 static void wt_status_collect_changes_index(struct wt_status *s)
624 struct setup_revision_opt opt;
626 repo_init_revisions(s->repo, &rev, NULL);
627 memset(&opt, 0, sizeof(opt));
628 opt.def = s->is_initial ? empty_tree_oid_hex() : s->reference;
629 setup_revisions(0, NULL, &rev, &opt);
631 rev.diffopt.flags.override_submodule_config = 1;
632 rev.diffopt.ita_invisible_in_index = 1;
633 if (s->ignore_submodule_arg) {
634 handle_ignore_submodules_arg(&rev.diffopt, s->ignore_submodule_arg);
637 * Unless the user did explicitly request a submodule ignore
638 * mode by passing a command line option we do not ignore any
639 * changed submodule SHA-1s when comparing index and HEAD, no
640 * matter what is configured. Otherwise the user won't be
641 * shown any submodules she manually added (and which are
642 * staged to be committed), which would be really confusing.
644 handle_ignore_submodules_arg(&rev.diffopt, "dirty");
647 rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
648 rev.diffopt.format_callback = wt_status_collect_updated_cb;
649 rev.diffopt.format_callback_data = s;
650 rev.diffopt.detect_rename = s->detect_rename >= 0 ? s->detect_rename : rev.diffopt.detect_rename;
651 rev.diffopt.rename_limit = s->rename_limit >= 0 ? s->rename_limit : rev.diffopt.rename_limit;
652 rev.diffopt.rename_score = s->rename_score >= 0 ? s->rename_score : rev.diffopt.rename_score;
653 copy_pathspec(&rev.prune_data, &s->pathspec);
654 run_diff_index(&rev, 1);
657 static void wt_status_collect_changes_initial(struct wt_status *s)
659 struct index_state *istate = s->repo->index;
662 for (i = 0; i < istate->cache_nr; i++) {
663 struct string_list_item *it;
664 struct wt_status_change_data *d;
665 const struct cache_entry *ce = istate->cache[i];
667 if (!ce_path_match(istate, ce, &s->pathspec, NULL))
669 if (ce_intent_to_add(ce))
671 it = string_list_insert(&s->change, ce->name);
674 d = xcalloc(1, sizeof(*d));
678 d->index_status = DIFF_STATUS_UNMERGED;
679 d->stagemask |= (1 << (ce_stage(ce) - 1));
681 * Don't bother setting {mode,oid}_{head,index} since the print
682 * code will output the stage values directly and not use the
683 * values in these fields.
687 d->index_status = DIFF_STATUS_ADDED;
688 /* Leave {mode,oid}_head zero for adds. */
689 d->mode_index = ce->ce_mode;
690 oidcpy(&d->oid_index, &ce->oid);
696 static void wt_status_collect_untracked(struct wt_status *s)
699 struct dir_struct dir;
700 uint64_t t_begin = getnanotime();
701 struct index_state *istate = s->repo->index;
703 if (!s->show_untracked_files)
706 memset(&dir, 0, sizeof(dir));
707 if (s->show_untracked_files != SHOW_ALL_UNTRACKED_FILES)
709 DIR_SHOW_OTHER_DIRECTORIES | DIR_HIDE_EMPTY_DIRECTORIES;
710 if (s->show_ignored_mode) {
711 dir.flags |= DIR_SHOW_IGNORED_TOO;
713 if (s->show_ignored_mode == SHOW_MATCHING_IGNORED)
714 dir.flags |= DIR_SHOW_IGNORED_TOO_MODE_MATCHING;
716 dir.untracked = istate->untracked;
719 setup_standard_excludes(&dir);
721 fill_directory(&dir, istate, &s->pathspec);
723 for (i = 0; i < dir.nr; i++) {
724 struct dir_entry *ent = dir.entries[i];
725 if (index_name_is_other(istate, ent->name, ent->len) &&
726 dir_path_match(istate, ent, &s->pathspec, 0, NULL))
727 string_list_insert(&s->untracked, ent->name);
731 for (i = 0; i < dir.ignored_nr; i++) {
732 struct dir_entry *ent = dir.ignored[i];
733 if (index_name_is_other(istate, ent->name, ent->len) &&
734 dir_path_match(istate, ent, &s->pathspec, 0, NULL))
735 string_list_insert(&s->ignored, ent->name);
741 clear_directory(&dir);
743 if (advice_status_u_option)
744 s->untracked_in_ms = (getnanotime() - t_begin) / 1000000;
747 static int has_unmerged(struct wt_status *s)
751 for (i = 0; i < s->change.nr; i++) {
752 struct wt_status_change_data *d;
753 d = s->change.items[i].util;
760 void wt_status_collect(struct wt_status *s)
762 trace2_region_enter("status", "worktrees", s->repo);
763 wt_status_collect_changes_worktree(s);
764 trace2_region_leave("status", "worktrees", s->repo);
767 trace2_region_enter("status", "initial", s->repo);
768 wt_status_collect_changes_initial(s);
769 trace2_region_leave("status", "initial", s->repo);
771 trace2_region_enter("status", "index", s->repo);
772 wt_status_collect_changes_index(s);
773 trace2_region_leave("status", "index", s->repo);
776 trace2_region_enter("status", "untracked", s->repo);
777 wt_status_collect_untracked(s);
778 trace2_region_leave("status", "untracked", s->repo);
780 wt_status_get_state(s->repo, &s->state, s->branch && !strcmp(s->branch, "HEAD"));
781 if (s->state.merge_in_progress && !has_unmerged(s))
785 void wt_status_collect_free_buffers(struct wt_status *s)
787 free(s->state.branch);
789 free(s->state.detached_from);
792 static void wt_longstatus_print_unmerged(struct wt_status *s)
794 int shown_header = 0;
797 for (i = 0; i < s->change.nr; i++) {
798 struct wt_status_change_data *d;
799 struct string_list_item *it;
800 it = &(s->change.items[i]);
805 wt_longstatus_print_unmerged_header(s);
808 wt_longstatus_print_unmerged_data(s, it);
811 wt_longstatus_print_trailer(s);
815 static void wt_longstatus_print_updated(struct wt_status *s)
817 int shown_header = 0;
820 for (i = 0; i < s->change.nr; i++) {
821 struct wt_status_change_data *d;
822 struct string_list_item *it;
823 it = &(s->change.items[i]);
825 if (!d->index_status ||
826 d->index_status == DIFF_STATUS_UNMERGED)
829 wt_longstatus_print_cached_header(s);
832 wt_longstatus_print_change_data(s, WT_STATUS_UPDATED, it);
835 wt_longstatus_print_trailer(s);
841 * 1 : some change but no delete
843 static int wt_status_check_worktree_changes(struct wt_status *s,
844 int *dirty_submodules)
849 *dirty_submodules = 0;
851 for (i = 0; i < s->change.nr; i++) {
852 struct wt_status_change_data *d;
853 d = s->change.items[i].util;
854 if (!d->worktree_status ||
855 d->worktree_status == DIFF_STATUS_UNMERGED)
859 if (d->dirty_submodule)
860 *dirty_submodules = 1;
861 if (d->worktree_status == DIFF_STATUS_DELETED)
867 static void wt_longstatus_print_changed(struct wt_status *s)
869 int i, dirty_submodules;
870 int worktree_changes = wt_status_check_worktree_changes(s, &dirty_submodules);
872 if (!worktree_changes)
875 wt_longstatus_print_dirty_header(s, worktree_changes < 0, dirty_submodules);
877 for (i = 0; i < s->change.nr; i++) {
878 struct wt_status_change_data *d;
879 struct string_list_item *it;
880 it = &(s->change.items[i]);
882 if (!d->worktree_status ||
883 d->worktree_status == DIFF_STATUS_UNMERGED)
885 wt_longstatus_print_change_data(s, WT_STATUS_CHANGED, it);
887 wt_longstatus_print_trailer(s);
890 static int stash_count_refs(struct object_id *ooid, struct object_id *noid,
891 const char *email, timestamp_t timestamp, int tz,
892 const char *message, void *cb_data)
899 static void wt_longstatus_print_stash_summary(struct wt_status *s)
903 for_each_reflog_ent("refs/stash", stash_count_refs, &stash_count);
905 status_printf_ln(s, GIT_COLOR_NORMAL,
906 Q_("Your stash currently has %d entry",
907 "Your stash currently has %d entries", stash_count),
911 static void wt_longstatus_print_submodule_summary(struct wt_status *s, int uncommitted)
913 struct child_process sm_summary = CHILD_PROCESS_INIT;
914 struct strbuf cmd_stdout = STRBUF_INIT;
915 struct strbuf summary = STRBUF_INIT;
916 char *summary_content;
918 argv_array_pushf(&sm_summary.env_array, "GIT_INDEX_FILE=%s",
921 argv_array_push(&sm_summary.args, "submodule");
922 argv_array_push(&sm_summary.args, "summary");
923 argv_array_push(&sm_summary.args, uncommitted ? "--files" : "--cached");
924 argv_array_push(&sm_summary.args, "--for-status");
925 argv_array_push(&sm_summary.args, "--summary-limit");
926 argv_array_pushf(&sm_summary.args, "%d", s->submodule_summary);
928 argv_array_push(&sm_summary.args, s->amend ? "HEAD^" : "HEAD");
930 sm_summary.git_cmd = 1;
931 sm_summary.no_stdin = 1;
933 capture_command(&sm_summary, &cmd_stdout, 1024);
935 /* prepend header, only if there's an actual output */
936 if (cmd_stdout.len) {
938 strbuf_addstr(&summary, _("Submodules changed but not updated:"));
940 strbuf_addstr(&summary, _("Submodule changes to be committed:"));
941 strbuf_addstr(&summary, "\n\n");
943 strbuf_addbuf(&summary, &cmd_stdout);
944 strbuf_release(&cmd_stdout);
946 if (s->display_comment_prefix) {
948 summary_content = strbuf_detach(&summary, &len);
949 strbuf_add_commented_lines(&summary, summary_content, len);
950 free(summary_content);
953 fputs(summary.buf, s->fp);
954 strbuf_release(&summary);
957 static void wt_longstatus_print_other(struct wt_status *s,
958 struct string_list *l,
963 struct strbuf buf = STRBUF_INIT;
964 static struct string_list output = STRING_LIST_INIT_DUP;
965 struct column_options copts;
970 wt_longstatus_print_other_header(s, what, how);
972 for (i = 0; i < l->nr; i++) {
973 struct string_list_item *it;
976 path = quote_path(it->string, s->prefix, &buf);
977 if (column_active(s->colopts)) {
978 string_list_append(&output, path);
981 status_printf(s, color(WT_STATUS_HEADER, s), "\t");
982 status_printf_more(s, color(WT_STATUS_UNTRACKED, s),
986 strbuf_release(&buf);
987 if (!column_active(s->colopts))
990 strbuf_addf(&buf, "%s%s\t%s",
991 color(WT_STATUS_HEADER, s),
992 s->display_comment_prefix ? "#" : "",
993 color(WT_STATUS_UNTRACKED, s));
994 memset(&copts, 0, sizeof(copts));
996 copts.indent = buf.buf;
997 if (want_color(s->use_color))
998 copts.nl = GIT_COLOR_RESET "\n";
999 print_columns(&output, s->colopts, &copts);
1000 string_list_clear(&output, 0);
1001 strbuf_release(&buf);
1003 status_printf_ln(s, GIT_COLOR_NORMAL, "%s", "");
1006 size_t wt_status_locate_end(const char *s, size_t len)
1009 struct strbuf pattern = STRBUF_INIT;
1011 strbuf_addf(&pattern, "\n%c %s", comment_line_char, cut_line);
1012 if (starts_with(s, pattern.buf + 1))
1014 else if ((p = strstr(s, pattern.buf)))
1016 strbuf_release(&pattern);
1020 void wt_status_append_cut_line(struct strbuf *buf)
1022 const char *explanation = _("Do not modify or remove the line above.\nEverything below it will be ignored.");
1024 strbuf_commented_addf(buf, "%s", cut_line);
1025 strbuf_add_commented_lines(buf, explanation, strlen(explanation));
1028 void wt_status_add_cut_line(FILE *fp)
1030 struct strbuf buf = STRBUF_INIT;
1032 wt_status_append_cut_line(&buf);
1034 strbuf_release(&buf);
1037 static void wt_longstatus_print_verbose(struct wt_status *s)
1039 struct rev_info rev;
1040 struct setup_revision_opt opt;
1041 int dirty_submodules;
1042 const char *c = color(WT_STATUS_HEADER, s);
1044 repo_init_revisions(s->repo, &rev, NULL);
1045 rev.diffopt.flags.allow_textconv = 1;
1046 rev.diffopt.ita_invisible_in_index = 1;
1048 memset(&opt, 0, sizeof(opt));
1049 opt.def = s->is_initial ? empty_tree_oid_hex() : s->reference;
1050 setup_revisions(0, NULL, &rev, &opt);
1052 rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
1053 rev.diffopt.detect_rename = s->detect_rename >= 0 ? s->detect_rename : rev.diffopt.detect_rename;
1054 rev.diffopt.rename_limit = s->rename_limit >= 0 ? s->rename_limit : rev.diffopt.rename_limit;
1055 rev.diffopt.rename_score = s->rename_score >= 0 ? s->rename_score : rev.diffopt.rename_score;
1056 rev.diffopt.file = s->fp;
1057 rev.diffopt.close_file = 0;
1059 * If we're not going to stdout, then we definitely don't
1060 * want color, since we are going to the commit message
1061 * file (and even the "auto" setting won't work, since it
1062 * will have checked isatty on stdout). But we then do want
1063 * to insert the scissor line here to reliably remove the
1064 * diff before committing.
1066 if (s->fp != stdout) {
1067 rev.diffopt.use_color = 0;
1068 wt_status_add_cut_line(s->fp);
1070 if (s->verbose > 1 && s->committable) {
1071 /* print_updated() printed a header, so do we */
1072 if (s->fp != stdout)
1073 wt_longstatus_print_trailer(s);
1074 status_printf_ln(s, c, _("Changes to be committed:"));
1075 rev.diffopt.a_prefix = "c/";
1076 rev.diffopt.b_prefix = "i/";
1077 } /* else use prefix as per user config */
1078 run_diff_index(&rev, 1);
1079 if (s->verbose > 1 &&
1080 wt_status_check_worktree_changes(s, &dirty_submodules)) {
1081 status_printf_ln(s, c,
1082 "--------------------------------------------------");
1083 status_printf_ln(s, c, _("Changes not staged for commit:"));
1085 rev.diffopt.a_prefix = "i/";
1086 rev.diffopt.b_prefix = "w/";
1087 run_diff_files(&rev, 0);
1091 static void wt_longstatus_print_tracking(struct wt_status *s)
1093 struct strbuf sb = STRBUF_INIT;
1094 const char *cp, *ep, *branch_name;
1095 struct branch *branch;
1096 char comment_line_string[3];
1098 uint64_t t_begin = 0;
1100 assert(s->branch && !s->is_initial);
1101 if (!skip_prefix(s->branch, "refs/heads/", &branch_name))
1103 branch = branch_get(branch_name);
1105 t_begin = getnanotime();
1107 if (!format_tracking_info(branch, &sb, s->ahead_behind_flags))
1110 if (advice_status_ahead_behind_warning &&
1111 s->ahead_behind_flags == AHEAD_BEHIND_FULL) {
1112 uint64_t t_delta_in_ms = (getnanotime() - t_begin) / 1000000;
1113 if (t_delta_in_ms > AB_DELAY_WARNING_IN_MS) {
1114 strbuf_addf(&sb, _("\n"
1115 "It took %.2f seconds to compute the branch ahead/behind values.\n"
1116 "You can use '--no-ahead-behind' to avoid this.\n"),
1117 t_delta_in_ms / 1000.0);
1122 if (s->display_comment_prefix) {
1123 comment_line_string[i++] = comment_line_char;
1124 comment_line_string[i++] = ' ';
1126 comment_line_string[i] = '\0';
1128 for (cp = sb.buf; (ep = strchr(cp, '\n')) != NULL; cp = ep + 1)
1129 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s),
1130 "%s%.*s", comment_line_string,
1131 (int)(ep - cp), cp);
1132 if (s->display_comment_prefix)
1133 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s), "%c",
1137 strbuf_release(&sb);
1140 static void show_merge_in_progress(struct wt_status *s,
1143 if (has_unmerged(s)) {
1144 status_printf_ln(s, color, _("You have unmerged paths."));
1146 status_printf_ln(s, color,
1147 _(" (fix conflicts and run \"git commit\")"));
1148 status_printf_ln(s, color,
1149 _(" (use \"git merge --abort\" to abort the merge)"));
1152 status_printf_ln(s, color,
1153 _("All conflicts fixed but you are still merging."));
1155 status_printf_ln(s, color,
1156 _(" (use \"git commit\" to conclude merge)"));
1158 wt_longstatus_print_trailer(s);
1161 static void show_am_in_progress(struct wt_status *s,
1164 status_printf_ln(s, color,
1165 _("You are in the middle of an am session."));
1166 if (s->state.am_empty_patch)
1167 status_printf_ln(s, color,
1168 _("The current patch is empty."));
1170 if (!s->state.am_empty_patch)
1171 status_printf_ln(s, color,
1172 _(" (fix conflicts and then run \"git am --continue\")"));
1173 status_printf_ln(s, color,
1174 _(" (use \"git am --skip\" to skip this patch)"));
1175 status_printf_ln(s, color,
1176 _(" (use \"git am --abort\" to restore the original branch)"));
1178 wt_longstatus_print_trailer(s);
1181 static char *read_line_from_git_path(const char *filename)
1183 struct strbuf buf = STRBUF_INIT;
1184 FILE *fp = fopen_or_warn(git_path("%s", filename), "r");
1187 strbuf_release(&buf);
1190 strbuf_getline_lf(&buf, fp);
1192 return strbuf_detach(&buf, NULL);
1194 strbuf_release(&buf);
1199 static int split_commit_in_progress(struct wt_status *s)
1201 int split_in_progress = 0;
1202 char *head, *orig_head, *rebase_amend, *rebase_orig_head;
1204 if ((!s->amend && !s->nowarn && !s->workdir_dirty) ||
1205 !s->branch || strcmp(s->branch, "HEAD"))
1208 head = read_line_from_git_path("HEAD");
1209 orig_head = read_line_from_git_path("ORIG_HEAD");
1210 rebase_amend = read_line_from_git_path("rebase-merge/amend");
1211 rebase_orig_head = read_line_from_git_path("rebase-merge/orig-head");
1213 if (!head || !orig_head || !rebase_amend || !rebase_orig_head)
1214 ; /* fall through, no split in progress */
1215 else if (!strcmp(rebase_amend, rebase_orig_head))
1216 split_in_progress = !!strcmp(head, rebase_amend);
1217 else if (strcmp(orig_head, rebase_orig_head))
1218 split_in_progress = 1;
1223 free(rebase_orig_head);
1225 return split_in_progress;
1230 * "pick d6a2f0303e897ec257dd0e0a39a5ccb709bc2047 some message"
1232 * "pick d6a2f03 some message"
1234 * The function assumes that the line does not contain useless spaces
1235 * before or after the command.
1237 static void abbrev_sha1_in_line(struct strbuf *line)
1239 struct strbuf **split;
1242 if (starts_with(line->buf, "exec ") ||
1243 starts_with(line->buf, "x ") ||
1244 starts_with(line->buf, "label ") ||
1245 starts_with(line->buf, "l "))
1248 split = strbuf_split_max(line, ' ', 3);
1249 if (split[0] && split[1]) {
1250 struct object_id oid;
1253 * strbuf_split_max left a space. Trim it and re-add
1254 * it after abbreviation.
1256 strbuf_trim(split[1]);
1257 if (!get_oid(split[1]->buf, &oid)) {
1258 strbuf_reset(split[1]);
1259 strbuf_add_unique_abbrev(split[1], &oid,
1261 strbuf_addch(split[1], ' ');
1263 for (i = 0; split[i]; i++)
1264 strbuf_addbuf(line, split[i]);
1267 strbuf_list_free(split);
1270 static int read_rebase_todolist(const char *fname, struct string_list *lines)
1272 struct strbuf line = STRBUF_INIT;
1273 FILE *f = fopen(git_path("%s", fname), "r");
1276 if (errno == ENOENT)
1278 die_errno("Could not open file %s for reading",
1279 git_path("%s", fname));
1281 while (!strbuf_getline_lf(&line, f)) {
1282 if (line.len && line.buf[0] == comment_line_char)
1287 abbrev_sha1_in_line(&line);
1288 string_list_append(lines, line.buf);
1291 strbuf_release(&line);
1295 static void show_rebase_information(struct wt_status *s,
1298 if (s->state.rebase_interactive_in_progress) {
1300 int nr_lines_to_show = 2;
1302 struct string_list have_done = STRING_LIST_INIT_DUP;
1303 struct string_list yet_to_do = STRING_LIST_INIT_DUP;
1305 read_rebase_todolist("rebase-merge/done", &have_done);
1306 if (read_rebase_todolist("rebase-merge/git-rebase-todo",
1308 status_printf_ln(s, color,
1309 _("git-rebase-todo is missing."));
1310 if (have_done.nr == 0)
1311 status_printf_ln(s, color, _("No commands done."));
1313 status_printf_ln(s, color,
1314 Q_("Last command done (%d command done):",
1315 "Last commands done (%d commands done):",
1318 for (i = (have_done.nr > nr_lines_to_show)
1319 ? have_done.nr - nr_lines_to_show : 0;
1322 status_printf_ln(s, color, " %s", have_done.items[i].string);
1323 if (have_done.nr > nr_lines_to_show && s->hints)
1324 status_printf_ln(s, color,
1325 _(" (see more in file %s)"), git_path("rebase-merge/done"));
1328 if (yet_to_do.nr == 0)
1329 status_printf_ln(s, color,
1330 _("No commands remaining."));
1332 status_printf_ln(s, color,
1333 Q_("Next command to do (%d remaining command):",
1334 "Next commands to do (%d remaining commands):",
1337 for (i = 0; i < nr_lines_to_show && i < yet_to_do.nr; i++)
1338 status_printf_ln(s, color, " %s", yet_to_do.items[i].string);
1340 status_printf_ln(s, color,
1341 _(" (use \"git rebase --edit-todo\" to view and edit)"));
1343 string_list_clear(&yet_to_do, 0);
1344 string_list_clear(&have_done, 0);
1348 static void print_rebase_state(struct wt_status *s,
1351 if (s->state.branch)
1352 status_printf_ln(s, color,
1353 _("You are currently rebasing branch '%s' on '%s'."),
1357 status_printf_ln(s, color,
1358 _("You are currently rebasing."));
1361 static void show_rebase_in_progress(struct wt_status *s,
1366 show_rebase_information(s, color);
1367 if (has_unmerged(s)) {
1368 print_rebase_state(s, color);
1370 status_printf_ln(s, color,
1371 _(" (fix conflicts and then run \"git rebase --continue\")"));
1372 status_printf_ln(s, color,
1373 _(" (use \"git rebase --skip\" to skip this patch)"));
1374 status_printf_ln(s, color,
1375 _(" (use \"git rebase --abort\" to check out the original branch)"));
1377 } else if (s->state.rebase_in_progress ||
1378 !stat(git_path_merge_msg(s->repo), &st)) {
1379 print_rebase_state(s, color);
1381 status_printf_ln(s, color,
1382 _(" (all conflicts fixed: run \"git rebase --continue\")"));
1383 } else if (split_commit_in_progress(s)) {
1384 if (s->state.branch)
1385 status_printf_ln(s, color,
1386 _("You are currently splitting a commit while rebasing branch '%s' on '%s'."),
1390 status_printf_ln(s, color,
1391 _("You are currently splitting a commit during a rebase."));
1393 status_printf_ln(s, color,
1394 _(" (Once your working directory is clean, run \"git rebase --continue\")"));
1396 if (s->state.branch)
1397 status_printf_ln(s, color,
1398 _("You are currently editing a commit while rebasing branch '%s' on '%s'."),
1402 status_printf_ln(s, color,
1403 _("You are currently editing a commit during a rebase."));
1404 if (s->hints && !s->amend) {
1405 status_printf_ln(s, color,
1406 _(" (use \"git commit --amend\" to amend the current commit)"));
1407 status_printf_ln(s, color,
1408 _(" (use \"git rebase --continue\" once you are satisfied with your changes)"));
1411 wt_longstatus_print_trailer(s);
1414 static void show_cherry_pick_in_progress(struct wt_status *s,
1417 if (is_null_oid(&s->state.cherry_pick_head_oid))
1418 status_printf_ln(s, color,
1419 _("Cherry-pick currently in progress."));
1421 status_printf_ln(s, color,
1422 _("You are currently cherry-picking commit %s."),
1423 find_unique_abbrev(&s->state.cherry_pick_head_oid,
1427 if (has_unmerged(s))
1428 status_printf_ln(s, color,
1429 _(" (fix conflicts and run \"git cherry-pick --continue\")"));
1430 else if (is_null_oid(&s->state.cherry_pick_head_oid))
1431 status_printf_ln(s, color,
1432 _(" (run \"git cherry-pick --continue\" to continue)"));
1434 status_printf_ln(s, color,
1435 _(" (all conflicts fixed: run \"git cherry-pick --continue\")"));
1436 status_printf_ln(s, color,
1437 _(" (use \"git cherry-pick --skip\" to skip this patch)"));
1438 status_printf_ln(s, color,
1439 _(" (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"));
1441 wt_longstatus_print_trailer(s);
1444 static void show_revert_in_progress(struct wt_status *s,
1447 if (is_null_oid(&s->state.revert_head_oid))
1448 status_printf_ln(s, color,
1449 _("Revert currently in progress."));
1451 status_printf_ln(s, color,
1452 _("You are currently reverting commit %s."),
1453 find_unique_abbrev(&s->state.revert_head_oid,
1456 if (has_unmerged(s))
1457 status_printf_ln(s, color,
1458 _(" (fix conflicts and run \"git revert --continue\")"));
1459 else if (is_null_oid(&s->state.revert_head_oid))
1460 status_printf_ln(s, color,
1461 _(" (run \"git revert --continue\" to continue)"));
1463 status_printf_ln(s, color,
1464 _(" (all conflicts fixed: run \"git revert --continue\")"));
1465 status_printf_ln(s, color,
1466 _(" (use \"git revert --skip\" to skip this patch)"));
1467 status_printf_ln(s, color,
1468 _(" (use \"git revert --abort\" to cancel the revert operation)"));
1470 wt_longstatus_print_trailer(s);
1473 static void show_bisect_in_progress(struct wt_status *s,
1476 if (s->state.branch)
1477 status_printf_ln(s, color,
1478 _("You are currently bisecting, started from branch '%s'."),
1481 status_printf_ln(s, color,
1482 _("You are currently bisecting."));
1484 status_printf_ln(s, color,
1485 _(" (use \"git bisect reset\" to get back to the original branch)"));
1486 wt_longstatus_print_trailer(s);
1490 * Extract branch information from rebase/bisect
1492 static char *get_branch(const struct worktree *wt, const char *path)
1494 struct strbuf sb = STRBUF_INIT;
1495 struct object_id oid;
1496 const char *branch_name;
1498 if (strbuf_read_file(&sb, worktree_git_path(wt, "%s", path), 0) <= 0)
1501 while (sb.len && sb.buf[sb.len - 1] == '\n')
1502 strbuf_setlen(&sb, sb.len - 1);
1505 if (skip_prefix(sb.buf, "refs/heads/", &branch_name))
1506 strbuf_remove(&sb, 0, branch_name - sb.buf);
1507 else if (starts_with(sb.buf, "refs/"))
1509 else if (!get_oid_hex(sb.buf, &oid)) {
1511 strbuf_add_unique_abbrev(&sb, &oid, DEFAULT_ABBREV);
1512 } else if (!strcmp(sb.buf, "detached HEAD")) /* rebase */
1516 return strbuf_detach(&sb, NULL);
1519 strbuf_release(&sb);
1523 struct grab_1st_switch_cbdata {
1525 struct object_id noid;
1528 static int grab_1st_switch(struct object_id *ooid, struct object_id *noid,
1529 const char *email, timestamp_t timestamp, int tz,
1530 const char *message, void *cb_data)
1532 struct grab_1st_switch_cbdata *cb = cb_data;
1533 const char *target = NULL, *end;
1535 if (!skip_prefix(message, "checkout: moving from ", &message))
1537 target = strstr(message, " to ");
1540 target += strlen(" to ");
1541 strbuf_reset(&cb->buf);
1542 oidcpy(&cb->noid, noid);
1543 end = strchrnul(target, '\n');
1544 strbuf_add(&cb->buf, target, end - target);
1545 if (!strcmp(cb->buf.buf, "HEAD")) {
1546 /* HEAD is relative. Resolve it to the right reflog entry. */
1547 strbuf_reset(&cb->buf);
1548 strbuf_add_unique_abbrev(&cb->buf, noid, DEFAULT_ABBREV);
1553 static void wt_status_get_detached_from(struct repository *r,
1554 struct wt_status_state *state)
1556 struct grab_1st_switch_cbdata cb;
1557 struct commit *commit;
1558 struct object_id oid;
1561 strbuf_init(&cb.buf, 0);
1562 if (for_each_reflog_ent_reverse("HEAD", grab_1st_switch, &cb) <= 0) {
1563 strbuf_release(&cb.buf);
1567 if (dwim_ref(cb.buf.buf, cb.buf.len, &oid, &ref) == 1 &&
1568 /* sha1 is a commit? match without further lookup */
1569 (oideq(&cb.noid, &oid) ||
1570 /* perhaps sha1 is a tag, try to dereference to a commit */
1571 ((commit = lookup_commit_reference_gently(r, &oid, 1)) != NULL &&
1572 oideq(&cb.noid, &commit->object.oid)))) {
1573 const char *from = ref;
1574 if (!skip_prefix(from, "refs/tags/", &from))
1575 skip_prefix(from, "refs/remotes/", &from);
1576 state->detached_from = xstrdup(from);
1578 state->detached_from =
1579 xstrdup(find_unique_abbrev(&cb.noid, DEFAULT_ABBREV));
1580 oidcpy(&state->detached_oid, &cb.noid);
1581 state->detached_at = !get_oid("HEAD", &oid) &&
1582 oideq(&oid, &state->detached_oid);
1585 strbuf_release(&cb.buf);
1588 int wt_status_check_rebase(const struct worktree *wt,
1589 struct wt_status_state *state)
1593 if (!stat(worktree_git_path(wt, "rebase-apply"), &st)) {
1594 if (!stat(worktree_git_path(wt, "rebase-apply/applying"), &st)) {
1595 state->am_in_progress = 1;
1596 if (!stat(worktree_git_path(wt, "rebase-apply/patch"), &st) && !st.st_size)
1597 state->am_empty_patch = 1;
1599 state->rebase_in_progress = 1;
1600 state->branch = get_branch(wt, "rebase-apply/head-name");
1601 state->onto = get_branch(wt, "rebase-apply/onto");
1603 } else if (!stat(worktree_git_path(wt, "rebase-merge"), &st)) {
1604 if (!stat(worktree_git_path(wt, "rebase-merge/interactive"), &st))
1605 state->rebase_interactive_in_progress = 1;
1607 state->rebase_in_progress = 1;
1608 state->branch = get_branch(wt, "rebase-merge/head-name");
1609 state->onto = get_branch(wt, "rebase-merge/onto");
1615 int wt_status_check_bisect(const struct worktree *wt,
1616 struct wt_status_state *state)
1620 if (!stat(worktree_git_path(wt, "BISECT_LOG"), &st)) {
1621 state->bisect_in_progress = 1;
1622 state->branch = get_branch(wt, "BISECT_START");
1628 void wt_status_get_state(struct repository *r,
1629 struct wt_status_state *state,
1630 int get_detached_from)
1633 struct object_id oid;
1634 enum replay_action action;
1636 if (!stat(git_path_merge_head(r), &st)) {
1637 wt_status_check_rebase(NULL, state);
1638 state->merge_in_progress = 1;
1639 } else if (wt_status_check_rebase(NULL, state)) {
1641 } else if (!stat(git_path_cherry_pick_head(r), &st) &&
1642 !get_oid("CHERRY_PICK_HEAD", &oid)) {
1643 state->cherry_pick_in_progress = 1;
1644 oidcpy(&state->cherry_pick_head_oid, &oid);
1646 wt_status_check_bisect(NULL, state);
1647 if (!stat(git_path_revert_head(r), &st) &&
1648 !get_oid("REVERT_HEAD", &oid)) {
1649 state->revert_in_progress = 1;
1650 oidcpy(&state->revert_head_oid, &oid);
1652 if (!sequencer_get_last_command(r, &action)) {
1653 if (action == REPLAY_PICK) {
1654 state->cherry_pick_in_progress = 1;
1655 oidcpy(&state->cherry_pick_head_oid, &null_oid);
1657 state->revert_in_progress = 1;
1658 oidcpy(&state->revert_head_oid, &null_oid);
1661 if (get_detached_from)
1662 wt_status_get_detached_from(r, state);
1665 static void wt_longstatus_print_state(struct wt_status *s)
1667 const char *state_color = color(WT_STATUS_HEADER, s);
1668 struct wt_status_state *state = &s->state;
1670 if (state->merge_in_progress) {
1671 if (state->rebase_interactive_in_progress) {
1672 show_rebase_information(s, state_color);
1675 show_merge_in_progress(s, state_color);
1676 } else if (state->am_in_progress)
1677 show_am_in_progress(s, state_color);
1678 else if (state->rebase_in_progress || state->rebase_interactive_in_progress)
1679 show_rebase_in_progress(s, state_color);
1680 else if (state->cherry_pick_in_progress)
1681 show_cherry_pick_in_progress(s, state_color);
1682 else if (state->revert_in_progress)
1683 show_revert_in_progress(s, state_color);
1684 if (state->bisect_in_progress)
1685 show_bisect_in_progress(s, state_color);
1688 static void wt_longstatus_print(struct wt_status *s)
1690 const char *branch_color = color(WT_STATUS_ONBRANCH, s);
1691 const char *branch_status_color = color(WT_STATUS_HEADER, s);
1694 const char *on_what = _("On branch ");
1695 const char *branch_name = s->branch;
1696 if (!strcmp(branch_name, "HEAD")) {
1697 branch_status_color = color(WT_STATUS_NOBRANCH, s);
1698 if (s->state.rebase_in_progress ||
1699 s->state.rebase_interactive_in_progress) {
1700 if (s->state.rebase_interactive_in_progress)
1701 on_what = _("interactive rebase in progress; onto ");
1703 on_what = _("rebase in progress; onto ");
1704 branch_name = s->state.onto;
1705 } else if (s->state.detached_from) {
1706 branch_name = s->state.detached_from;
1707 if (s->state.detached_at)
1708 on_what = HEAD_DETACHED_AT;
1710 on_what = HEAD_DETACHED_FROM;
1713 on_what = _("Not currently on any branch.");
1716 skip_prefix(branch_name, "refs/heads/", &branch_name);
1717 status_printf(s, color(WT_STATUS_HEADER, s), "%s", "");
1718 status_printf_more(s, branch_status_color, "%s", on_what);
1719 status_printf_more(s, branch_color, "%s\n", branch_name);
1721 wt_longstatus_print_tracking(s);
1724 wt_longstatus_print_state(s);
1726 if (s->is_initial) {
1727 status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", "");
1728 status_printf_ln(s, color(WT_STATUS_HEADER, s),
1730 ? _("Initial commit")
1731 : _("No commits yet"));
1732 status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", "");
1735 wt_longstatus_print_updated(s);
1736 wt_longstatus_print_unmerged(s);
1737 wt_longstatus_print_changed(s);
1738 if (s->submodule_summary &&
1739 (!s->ignore_submodule_arg ||
1740 strcmp(s->ignore_submodule_arg, "all"))) {
1741 wt_longstatus_print_submodule_summary(s, 0); /* staged */
1742 wt_longstatus_print_submodule_summary(s, 1); /* unstaged */
1744 if (s->show_untracked_files) {
1745 wt_longstatus_print_other(s, &s->untracked, _("Untracked files"), "add");
1746 if (s->show_ignored_mode)
1747 wt_longstatus_print_other(s, &s->ignored, _("Ignored files"), "add -f");
1748 if (advice_status_u_option && 2000 < s->untracked_in_ms) {
1749 status_printf_ln(s, GIT_COLOR_NORMAL, "%s", "");
1750 status_printf_ln(s, GIT_COLOR_NORMAL,
1751 _("It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1752 "may speed it up, but you have to be careful not to forget to add\n"
1753 "new files yourself (see 'git help status')."),
1754 s->untracked_in_ms / 1000.0);
1756 } else if (s->committable)
1757 status_printf_ln(s, GIT_COLOR_NORMAL, _("Untracked files not listed%s"),
1759 ? _(" (use -u option to show untracked files)") : "");
1762 wt_longstatus_print_verbose(s);
1763 if (!s->committable) {
1765 status_printf_ln(s, GIT_COLOR_NORMAL, _("No changes"));
1768 else if (s->workdir_dirty) {
1770 printf(_("no changes added to commit "
1771 "(use \"git add\" and/or \"git commit -a\")\n"));
1773 printf(_("no changes added to commit\n"));
1774 } else if (s->untracked.nr) {
1776 printf(_("nothing added to commit but untracked files "
1777 "present (use \"git add\" to track)\n"));
1779 printf(_("nothing added to commit but untracked files present\n"));
1780 } else if (s->is_initial) {
1782 printf(_("nothing to commit (create/copy files "
1783 "and use \"git add\" to track)\n"));
1785 printf(_("nothing to commit\n"));
1786 } else if (!s->show_untracked_files) {
1788 printf(_("nothing to commit (use -u to show untracked files)\n"));
1790 printf(_("nothing to commit\n"));
1792 printf(_("nothing to commit, working tree clean\n"));
1795 wt_longstatus_print_stash_summary(s);
1798 static void wt_shortstatus_unmerged(struct string_list_item *it,
1799 struct wt_status *s)
1801 struct wt_status_change_data *d = it->util;
1802 const char *how = "??";
1804 switch (d->stagemask) {
1805 case 1: how = "DD"; break; /* both deleted */
1806 case 2: how = "AU"; break; /* added by us */
1807 case 3: how = "UD"; break; /* deleted by them */
1808 case 4: how = "UA"; break; /* added by them */
1809 case 5: how = "DU"; break; /* deleted by us */
1810 case 6: how = "AA"; break; /* both added */
1811 case 7: how = "UU"; break; /* both modified */
1813 color_fprintf(s->fp, color(WT_STATUS_UNMERGED, s), "%s", how);
1814 if (s->null_termination) {
1815 fprintf(stdout, " %s%c", it->string, 0);
1817 struct strbuf onebuf = STRBUF_INIT;
1819 one = quote_path(it->string, s->prefix, &onebuf);
1820 printf(" %s\n", one);
1821 strbuf_release(&onebuf);
1825 static void wt_shortstatus_status(struct string_list_item *it,
1826 struct wt_status *s)
1828 struct wt_status_change_data *d = it->util;
1830 if (d->index_status)
1831 color_fprintf(s->fp, color(WT_STATUS_UPDATED, s), "%c", d->index_status);
1834 if (d->worktree_status)
1835 color_fprintf(s->fp, color(WT_STATUS_CHANGED, s), "%c", d->worktree_status);
1839 if (s->null_termination) {
1840 fprintf(stdout, "%s%c", it->string, 0);
1841 if (d->rename_source)
1842 fprintf(stdout, "%s%c", d->rename_source, 0);
1844 struct strbuf onebuf = STRBUF_INIT;
1847 if (d->rename_source) {
1848 one = quote_path(d->rename_source, s->prefix, &onebuf);
1849 if (*one != '"' && strchr(one, ' ') != NULL) {
1851 strbuf_addch(&onebuf, '"');
1854 printf("%s -> ", one);
1855 strbuf_release(&onebuf);
1857 one = quote_path(it->string, s->prefix, &onebuf);
1858 if (*one != '"' && strchr(one, ' ') != NULL) {
1860 strbuf_addch(&onebuf, '"');
1863 printf("%s\n", one);
1864 strbuf_release(&onebuf);
1868 static void wt_shortstatus_other(struct string_list_item *it,
1869 struct wt_status *s, const char *sign)
1871 if (s->null_termination) {
1872 fprintf(stdout, "%s %s%c", sign, it->string, 0);
1874 struct strbuf onebuf = STRBUF_INIT;
1876 one = quote_path(it->string, s->prefix, &onebuf);
1877 color_fprintf(s->fp, color(WT_STATUS_UNTRACKED, s), "%s", sign);
1878 printf(" %s\n", one);
1879 strbuf_release(&onebuf);
1883 static void wt_shortstatus_print_tracking(struct wt_status *s)
1885 struct branch *branch;
1886 const char *header_color = color(WT_STATUS_HEADER, s);
1887 const char *branch_color_local = color(WT_STATUS_LOCAL_BRANCH, s);
1888 const char *branch_color_remote = color(WT_STATUS_REMOTE_BRANCH, s);
1892 const char *branch_name;
1893 int num_ours, num_theirs, sti;
1894 int upstream_is_gone = 0;
1896 color_fprintf(s->fp, color(WT_STATUS_HEADER, s), "## ");
1900 branch_name = s->branch;
1902 #define LABEL(string) (s->no_gettext ? (string) : _(string))
1905 color_fprintf(s->fp, header_color, LABEL(N_("No commits yet on ")));
1907 if (!strcmp(s->branch, "HEAD")) {
1908 color_fprintf(s->fp, color(WT_STATUS_NOBRANCH, s), "%s",
1909 LABEL(N_("HEAD (no branch)")));
1913 skip_prefix(branch_name, "refs/heads/", &branch_name);
1915 branch = branch_get(branch_name);
1917 color_fprintf(s->fp, branch_color_local, "%s", branch_name);
1919 sti = stat_tracking_info(branch, &num_ours, &num_theirs, &base,
1920 0, s->ahead_behind_flags);
1925 upstream_is_gone = 1;
1928 short_base = shorten_unambiguous_ref(base, 0);
1929 color_fprintf(s->fp, header_color, "...");
1930 color_fprintf(s->fp, branch_color_remote, "%s", short_base);
1933 if (!upstream_is_gone && !sti)
1936 color_fprintf(s->fp, header_color, " [");
1937 if (upstream_is_gone) {
1938 color_fprintf(s->fp, header_color, LABEL(N_("gone")));
1939 } else if (s->ahead_behind_flags == AHEAD_BEHIND_QUICK) {
1940 color_fprintf(s->fp, header_color, LABEL(N_("different")));
1941 } else if (!num_ours) {
1942 color_fprintf(s->fp, header_color, LABEL(N_("behind ")));
1943 color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
1944 } else if (!num_theirs) {
1945 color_fprintf(s->fp, header_color, LABEL(N_("ahead ")));
1946 color_fprintf(s->fp, branch_color_local, "%d", num_ours);
1948 color_fprintf(s->fp, header_color, LABEL(N_("ahead ")));
1949 color_fprintf(s->fp, branch_color_local, "%d", num_ours);
1950 color_fprintf(s->fp, header_color, ", %s", LABEL(N_("behind ")));
1951 color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
1954 color_fprintf(s->fp, header_color, "]");
1956 fputc(s->null_termination ? '\0' : '\n', s->fp);
1959 static void wt_shortstatus_print(struct wt_status *s)
1961 struct string_list_item *it;
1964 wt_shortstatus_print_tracking(s);
1966 for_each_string_list_item(it, &s->change) {
1967 struct wt_status_change_data *d = it->util;
1970 wt_shortstatus_unmerged(it, s);
1972 wt_shortstatus_status(it, s);
1974 for_each_string_list_item(it, &s->untracked)
1975 wt_shortstatus_other(it, s, "??");
1977 for_each_string_list_item(it, &s->ignored)
1978 wt_shortstatus_other(it, s, "!!");
1981 static void wt_porcelain_print(struct wt_status *s)
1984 s->relative_paths = 0;
1987 wt_shortstatus_print(s);
1991 * Print branch information for porcelain v2 output. These lines
1992 * are printed when the '--branch' parameter is given.
1994 * # branch.oid <commit><eol>
1995 * # branch.head <head><eol>
1996 * [# branch.upstream <upstream><eol>
1997 * [# branch.ab +<ahead> -<behind><eol>]]
1999 * <commit> ::= the current commit hash or the the literal
2000 * "(initial)" to indicate an initialized repo
2003 * <head> ::= <branch_name> the current branch name or
2004 * "(detached)" literal when detached head or
2005 * "(unknown)" when something is wrong.
2007 * <upstream> ::= the upstream branch name, when set.
2009 * <ahead> ::= integer ahead value or '?'.
2011 * <behind> ::= integer behind value or '?'.
2013 * The end-of-line is defined by the -z flag.
2015 * <eol> ::= NUL when -z,
2018 * When an upstream is set and present, the 'branch.ab' line will
2019 * be printed with the ahead/behind counts for the branch and the
2020 * upstream. When AHEAD_BEHIND_QUICK is requested and the branches
2021 * are different, '?' will be substituted for the actual count.
2023 static void wt_porcelain_v2_print_tracking(struct wt_status *s)
2025 struct branch *branch;
2027 const char *branch_name;
2028 int ab_info, nr_ahead, nr_behind;
2029 char eol = s->null_termination ? '\0' : '\n';
2031 fprintf(s->fp, "# branch.oid %s%c",
2032 (s->is_initial ? "(initial)" : oid_to_hex(&s->oid_commit)),
2036 fprintf(s->fp, "# branch.head %s%c", "(unknown)", eol);
2038 if (!strcmp(s->branch, "HEAD")) {
2039 fprintf(s->fp, "# branch.head %s%c", "(detached)", eol);
2041 if (s->state.rebase_in_progress ||
2042 s->state.rebase_interactive_in_progress)
2043 branch_name = s->state.onto;
2044 else if (s->state.detached_from)
2045 branch_name = s->state.detached_from;
2050 skip_prefix(s->branch, "refs/heads/", &branch_name);
2052 fprintf(s->fp, "# branch.head %s%c", branch_name, eol);
2055 /* Lookup stats on the upstream tracking branch, if set. */
2056 branch = branch_get(branch_name);
2058 ab_info = stat_tracking_info(branch, &nr_ahead, &nr_behind,
2059 &base, 0, s->ahead_behind_flags);
2061 base = shorten_unambiguous_ref(base, 0);
2062 fprintf(s->fp, "# branch.upstream %s%c", base, eol);
2067 if (nr_ahead || nr_behind)
2068 fprintf(s->fp, "# branch.ab +%d -%d%c",
2069 nr_ahead, nr_behind, eol);
2071 fprintf(s->fp, "# branch.ab +? -?%c",
2073 } else if (!ab_info) {
2075 fprintf(s->fp, "# branch.ab +0 -0%c", eol);
2082 * Convert various submodule status values into a
2083 * fixed-length string of characters in the buffer provided.
2085 static void wt_porcelain_v2_submodule_state(
2086 struct wt_status_change_data *d,
2089 if (S_ISGITLINK(d->mode_head) ||
2090 S_ISGITLINK(d->mode_index) ||
2091 S_ISGITLINK(d->mode_worktree)) {
2093 sub[1] = d->new_submodule_commits ? 'C' : '.';
2094 sub[2] = (d->dirty_submodule & DIRTY_SUBMODULE_MODIFIED) ? 'M' : '.';
2095 sub[3] = (d->dirty_submodule & DIRTY_SUBMODULE_UNTRACKED) ? 'U' : '.';
2106 * Fix-up changed entries before we print them.
2108 static void wt_porcelain_v2_fix_up_changed(struct string_list_item *it)
2110 struct wt_status_change_data *d = it->util;
2112 if (!d->index_status) {
2114 * This entry is unchanged in the index (relative to the head).
2115 * Therefore, the collect_updated_cb was never called for this
2116 * entry (during the head-vs-index scan) and so the head column
2117 * fields were never set.
2119 * We must have data for the index column (from the
2120 * index-vs-worktree scan (otherwise, this entry should not be
2121 * in the list of changes)).
2123 * Copy index column fields to the head column, so that our
2124 * output looks complete.
2126 assert(d->mode_head == 0);
2127 d->mode_head = d->mode_index;
2128 oidcpy(&d->oid_head, &d->oid_index);
2131 if (!d->worktree_status) {
2133 * This entry is unchanged in the worktree (relative to the index).
2134 * Therefore, the collect_changed_cb was never called for this entry
2135 * (during the index-vs-worktree scan) and so the worktree column
2136 * fields were never set.
2138 * We must have data for the index column (from the head-vs-index
2141 * Copy the index column fields to the worktree column so that
2142 * our output looks complete.
2144 * Note that we only have a mode field in the worktree column
2145 * because the scan code tries really hard to not have to compute it.
2147 assert(d->mode_worktree == 0);
2148 d->mode_worktree = d->mode_index;
2153 * Print porcelain v2 info for tracked entries with changes.
2155 static void wt_porcelain_v2_print_changed_entry(
2156 struct string_list_item *it,
2157 struct wt_status *s)
2159 struct wt_status_change_data *d = it->util;
2160 struct strbuf buf = STRBUF_INIT;
2161 struct strbuf buf_from = STRBUF_INIT;
2162 const char *path = NULL;
2163 const char *path_from = NULL;
2165 char submodule_token[5];
2166 char sep_char, eol_char;
2168 wt_porcelain_v2_fix_up_changed(it);
2169 wt_porcelain_v2_submodule_state(d, submodule_token);
2171 key[0] = d->index_status ? d->index_status : '.';
2172 key[1] = d->worktree_status ? d->worktree_status : '.';
2175 if (s->null_termination) {
2177 * In -z mode, we DO NOT C-quote pathnames. Current path is ALWAYS first.
2178 * A single NUL character separates them.
2183 path_from = d->rename_source;
2186 * Path(s) are C-quoted if necessary. Current path is ALWAYS first.
2187 * The source path is only present when necessary.
2188 * A single TAB separates them (because paths can contain spaces
2189 * which are not escaped and C-quoting does escape TAB characters).
2193 path = quote_path(it->string, s->prefix, &buf);
2194 if (d->rename_source)
2195 path_from = quote_path(d->rename_source, s->prefix, &buf_from);
2199 fprintf(s->fp, "2 %s %s %06o %06o %06o %s %s %c%d %s%c%s%c",
2200 key, submodule_token,
2201 d->mode_head, d->mode_index, d->mode_worktree,
2202 oid_to_hex(&d->oid_head), oid_to_hex(&d->oid_index),
2203 d->rename_status, d->rename_score,
2204 path, sep_char, path_from, eol_char);
2206 fprintf(s->fp, "1 %s %s %06o %06o %06o %s %s %s%c",
2207 key, submodule_token,
2208 d->mode_head, d->mode_index, d->mode_worktree,
2209 oid_to_hex(&d->oid_head), oid_to_hex(&d->oid_index),
2212 strbuf_release(&buf);
2213 strbuf_release(&buf_from);
2217 * Print porcelain v2 status info for unmerged entries.
2219 static void wt_porcelain_v2_print_unmerged_entry(
2220 struct string_list_item *it,
2221 struct wt_status *s)
2223 struct wt_status_change_data *d = it->util;
2224 struct index_state *istate = s->repo->index;
2225 const struct cache_entry *ce;
2226 struct strbuf buf_index = STRBUF_INIT;
2227 const char *path_index = NULL;
2228 int pos, stage, sum;
2231 struct object_id oid;
2234 char submodule_token[5];
2235 char unmerged_prefix = 'u';
2236 char eol_char = s->null_termination ? '\0' : '\n';
2238 wt_porcelain_v2_submodule_state(d, submodule_token);
2240 switch (d->stagemask) {
2241 case 1: key = "DD"; break; /* both deleted */
2242 case 2: key = "AU"; break; /* added by us */
2243 case 3: key = "UD"; break; /* deleted by them */
2244 case 4: key = "UA"; break; /* added by them */
2245 case 5: key = "DU"; break; /* deleted by us */
2246 case 6: key = "AA"; break; /* both added */
2247 case 7: key = "UU"; break; /* both modified */
2249 BUG("unhandled unmerged status %x", d->stagemask);
2253 * Disregard d.aux.porcelain_v2 data that we accumulated
2254 * for the head and index columns during the scans and
2255 * replace with the actual stage data.
2257 * Note that this is a last-one-wins for each the individual
2258 * stage [123] columns in the event of multiple cache entries
2261 memset(stages, 0, sizeof(stages));
2263 pos = index_name_pos(istate, it->string, strlen(it->string));
2266 while (pos < istate->cache_nr) {
2267 ce = istate->cache[pos++];
2268 stage = ce_stage(ce);
2269 if (strcmp(ce->name, it->string) || !stage)
2271 stages[stage - 1].mode = ce->ce_mode;
2272 oidcpy(&stages[stage - 1].oid, &ce->oid);
2273 sum |= (1 << (stage - 1));
2275 if (sum != d->stagemask)
2276 BUG("observed stagemask 0x%x != expected stagemask 0x%x", sum, d->stagemask);
2278 if (s->null_termination)
2279 path_index = it->string;
2281 path_index = quote_path(it->string, s->prefix, &buf_index);
2283 fprintf(s->fp, "%c %s %s %06o %06o %06o %06o %s %s %s %s%c",
2284 unmerged_prefix, key, submodule_token,
2285 stages[0].mode, /* stage 1 */
2286 stages[1].mode, /* stage 2 */
2287 stages[2].mode, /* stage 3 */
2289 oid_to_hex(&stages[0].oid), /* stage 1 */
2290 oid_to_hex(&stages[1].oid), /* stage 2 */
2291 oid_to_hex(&stages[2].oid), /* stage 3 */
2295 strbuf_release(&buf_index);
2299 * Print porcelain V2 status info for untracked and ignored entries.
2301 static void wt_porcelain_v2_print_other(
2302 struct string_list_item *it,
2303 struct wt_status *s,
2306 struct strbuf buf = STRBUF_INIT;
2310 if (s->null_termination) {
2314 path = quote_path(it->string, s->prefix, &buf);
2318 fprintf(s->fp, "%c %s%c", prefix, path, eol_char);
2320 strbuf_release(&buf);
2324 * Print porcelain V2 status.
2327 * [<v2_changed_items>]*
2328 * [<v2_unmerged_items>]*
2329 * [<v2_untracked_items>]*
2330 * [<v2_ignored_items>]*
2333 static void wt_porcelain_v2_print(struct wt_status *s)
2335 struct wt_status_change_data *d;
2336 struct string_list_item *it;
2340 wt_porcelain_v2_print_tracking(s);
2342 for (i = 0; i < s->change.nr; i++) {
2343 it = &(s->change.items[i]);
2346 wt_porcelain_v2_print_changed_entry(it, s);
2349 for (i = 0; i < s->change.nr; i++) {
2350 it = &(s->change.items[i]);
2353 wt_porcelain_v2_print_unmerged_entry(it, s);
2356 for (i = 0; i < s->untracked.nr; i++) {
2357 it = &(s->untracked.items[i]);
2358 wt_porcelain_v2_print_other(it, s, '?');
2361 for (i = 0; i < s->ignored.nr; i++) {
2362 it = &(s->ignored.items[i]);
2363 wt_porcelain_v2_print_other(it, s, '!');
2367 void wt_status_print(struct wt_status *s)
2369 trace2_data_intmax("status", s->repo, "count/changed", s->change.nr);
2370 trace2_data_intmax("status", s->repo, "count/untracked",
2372 trace2_data_intmax("status", s->repo, "count/ignored", s->ignored.nr);
2374 trace2_region_enter("status", "print", s->repo);
2376 switch (s->status_format) {
2377 case STATUS_FORMAT_SHORT:
2378 wt_shortstatus_print(s);
2380 case STATUS_FORMAT_PORCELAIN:
2381 wt_porcelain_print(s);
2383 case STATUS_FORMAT_PORCELAIN_V2:
2384 wt_porcelain_v2_print(s);
2386 case STATUS_FORMAT_UNSPECIFIED:
2387 BUG("finalize_deferred_config() should have been called");
2389 case STATUS_FORMAT_NONE:
2390 case STATUS_FORMAT_LONG:
2391 wt_longstatus_print(s);
2395 trace2_region_leave("status", "print", s->repo);
2399 * Returns 1 if there are unstaged changes, 0 otherwise.
2401 int has_unstaged_changes(struct repository *r, int ignore_submodules)
2403 struct rev_info rev_info;
2406 repo_init_revisions(r, &rev_info, NULL);
2407 if (ignore_submodules) {
2408 rev_info.diffopt.flags.ignore_submodules = 1;
2409 rev_info.diffopt.flags.override_submodule_config = 1;
2411 rev_info.diffopt.flags.quick = 1;
2412 diff_setup_done(&rev_info.diffopt);
2413 result = run_diff_files(&rev_info, 0);
2414 return diff_result_code(&rev_info.diffopt, result);
2418 * Returns 1 if there are uncommitted changes, 0 otherwise.
2420 int has_uncommitted_changes(struct repository *r,
2421 int ignore_submodules)
2423 struct rev_info rev_info;
2426 if (is_index_unborn(r->index))
2429 repo_init_revisions(r, &rev_info, NULL);
2430 if (ignore_submodules)
2431 rev_info.diffopt.flags.ignore_submodules = 1;
2432 rev_info.diffopt.flags.quick = 1;
2434 add_head_to_pending(&rev_info);
2435 if (!rev_info.pending.nr) {
2437 * We have no head (or it's corrupt); use the empty tree,
2438 * which will complain if the index is non-empty.
2440 struct tree *tree = lookup_tree(r, the_hash_algo->empty_tree);
2441 add_pending_object(&rev_info, &tree->object, "");
2444 diff_setup_done(&rev_info.diffopt);
2445 result = run_diff_index(&rev_info, 1);
2446 return diff_result_code(&rev_info.diffopt, result);
2450 * If the work tree has unstaged or uncommitted changes, dies with the
2451 * appropriate message.
2453 int require_clean_work_tree(struct repository *r,
2456 int ignore_submodules,
2459 struct lock_file lock_file = LOCK_INIT;
2462 fd = repo_hold_locked_index(r, &lock_file, 0);
2463 refresh_index(r->index, REFRESH_QUIET, NULL, NULL, NULL);
2465 repo_update_index_if_able(r, &lock_file);
2466 rollback_lock_file(&lock_file);
2468 if (has_unstaged_changes(r, ignore_submodules)) {
2469 /* TRANSLATORS: the action is e.g. "pull with rebase" */
2470 error(_("cannot %s: You have unstaged changes."), _(action));
2474 if (has_uncommitted_changes(r, ignore_submodules)) {
2476 error(_("additionally, your index contains uncommitted changes."));
2478 error(_("cannot %s: Your index contains uncommitted changes."),