10 #include "run-command.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 static const char *wt_status_unmerged_status_string(int stagemask)
266 return _("both deleted:");
268 return _("added by us:");
270 return _("deleted by them:");
272 return _("added by them:");
274 return _("deleted by us:");
276 return _("both added:");
278 return _("both modified:");
280 BUG("unhandled unmerged status %x", stagemask);
284 static const char *wt_status_diff_status_string(int status)
287 case DIFF_STATUS_ADDED:
288 return _("new file:");
289 case DIFF_STATUS_COPIED:
291 case DIFF_STATUS_DELETED:
292 return _("deleted:");
293 case DIFF_STATUS_MODIFIED:
294 return _("modified:");
295 case DIFF_STATUS_RENAMED:
296 return _("renamed:");
297 case DIFF_STATUS_TYPE_CHANGED:
298 return _("typechange:");
299 case DIFF_STATUS_UNKNOWN:
300 return _("unknown:");
301 case DIFF_STATUS_UNMERGED:
302 return _("unmerged:");
308 static int maxwidth(const char *(*label)(int), int minval, int maxval)
312 for (i = minval; i <= maxval; i++) {
313 const char *s = label(i);
314 int len = s ? utf8_strwidth(s) : 0;
321 static void wt_longstatus_print_unmerged_data(struct wt_status *s,
322 struct string_list_item *it)
324 const char *c = color(WT_STATUS_UNMERGED, s);
325 struct wt_status_change_data *d = it->util;
326 struct strbuf onebuf = STRBUF_INIT;
327 static char *padding;
328 static int label_width;
329 const char *one, *how;
333 label_width = maxwidth(wt_status_unmerged_status_string, 1, 7);
334 label_width += strlen(" ");
335 padding = xmallocz(label_width);
336 memset(padding, ' ', label_width);
339 one = quote_path(it->string, s->prefix, &onebuf, 0);
340 status_printf(s, color(WT_STATUS_HEADER, s), "\t");
342 how = wt_status_unmerged_status_string(d->stagemask);
343 len = label_width - utf8_strwidth(how);
344 status_printf_more(s, c, "%s%.*s%s\n", how, len, padding, one);
345 strbuf_release(&onebuf);
348 static void wt_longstatus_print_change_data(struct wt_status *s,
350 struct string_list_item *it)
352 struct wt_status_change_data *d = it->util;
353 const char *c = color(change_type, s);
357 const char *one, *two;
358 struct strbuf onebuf = STRBUF_INIT, twobuf = STRBUF_INIT;
359 struct strbuf extra = STRBUF_INIT;
360 static char *padding;
361 static int label_width;
366 /* If DIFF_STATUS_* uses outside the range [A..Z], we're in trouble */
367 label_width = maxwidth(wt_status_diff_status_string, 'A', 'Z');
368 label_width += strlen(" ");
369 padding = xmallocz(label_width);
370 memset(padding, ' ', label_width);
373 one_name = two_name = it->string;
374 switch (change_type) {
375 case WT_STATUS_UPDATED:
376 status = d->index_status;
378 case WT_STATUS_CHANGED:
379 if (d->new_submodule_commits || d->dirty_submodule) {
380 strbuf_addstr(&extra, " (");
381 if (d->new_submodule_commits)
382 strbuf_addstr(&extra, _("new commits, "));
383 if (d->dirty_submodule & DIRTY_SUBMODULE_MODIFIED)
384 strbuf_addstr(&extra, _("modified content, "));
385 if (d->dirty_submodule & DIRTY_SUBMODULE_UNTRACKED)
386 strbuf_addstr(&extra, _("untracked content, "));
387 strbuf_setlen(&extra, extra.len - 2);
388 strbuf_addch(&extra, ')');
390 status = d->worktree_status;
393 BUG("unhandled change_type %d in wt_longstatus_print_change_data",
398 * Only pick up the rename it's relevant. If the rename is for
399 * the changed section and we're printing the updated section,
402 if (d->rename_status == status)
403 one_name = d->rename_source;
405 one = quote_path(one_name, s->prefix, &onebuf, 0);
406 two = quote_path(two_name, s->prefix, &twobuf, 0);
408 status_printf(s, color(WT_STATUS_HEADER, s), "\t");
409 what = wt_status_diff_status_string(status);
411 BUG("unhandled diff status %c", status);
412 len = label_width - utf8_strwidth(what);
414 if (one_name != two_name)
415 status_printf_more(s, c, "%s%.*s%s -> %s",
416 what, len, padding, one, two);
418 status_printf_more(s, c, "%s%.*s%s",
419 what, len, padding, one);
421 status_printf_more(s, color(WT_STATUS_HEADER, s), "%s", extra.buf);
422 strbuf_release(&extra);
424 status_printf_more(s, GIT_COLOR_NORMAL, "\n");
425 strbuf_release(&onebuf);
426 strbuf_release(&twobuf);
429 static char short_submodule_status(struct wt_status_change_data *d)
431 if (d->new_submodule_commits)
433 if (d->dirty_submodule & DIRTY_SUBMODULE_MODIFIED)
435 if (d->dirty_submodule & DIRTY_SUBMODULE_UNTRACKED)
437 return d->worktree_status;
440 static void wt_status_collect_changed_cb(struct diff_queue_struct *q,
441 struct diff_options *options,
444 struct wt_status *s = data;
449 s->workdir_dirty = 1;
450 for (i = 0; i < q->nr; i++) {
451 struct diff_filepair *p;
452 struct string_list_item *it;
453 struct wt_status_change_data *d;
456 it = string_list_insert(&s->change, p->two->path);
462 if (!d->worktree_status)
463 d->worktree_status = p->status;
464 if (S_ISGITLINK(p->two->mode)) {
465 d->dirty_submodule = p->two->dirty_submodule;
466 d->new_submodule_commits = !oideq(&p->one->oid,
468 if (s->status_format == STATUS_FORMAT_SHORT)
469 d->worktree_status = short_submodule_status(d);
473 case DIFF_STATUS_ADDED:
474 d->mode_worktree = p->two->mode;
477 case DIFF_STATUS_DELETED:
478 d->mode_index = p->one->mode;
479 oidcpy(&d->oid_index, &p->one->oid);
480 /* mode_worktree is zero for a delete. */
483 case DIFF_STATUS_COPIED:
484 case DIFF_STATUS_RENAMED:
485 if (d->rename_status)
486 BUG("multiple renames on the same target? how?");
487 d->rename_source = xstrdup(p->one->path);
488 d->rename_score = p->score * 100 / MAX_SCORE;
489 d->rename_status = p->status;
491 case DIFF_STATUS_MODIFIED:
492 case DIFF_STATUS_TYPE_CHANGED:
493 case DIFF_STATUS_UNMERGED:
494 d->mode_index = p->one->mode;
495 d->mode_worktree = p->two->mode;
496 oidcpy(&d->oid_index, &p->one->oid);
500 BUG("unhandled diff-files status '%c'", p->status);
507 static int unmerged_mask(struct index_state *istate, const char *path)
510 const struct cache_entry *ce;
512 pos = index_name_pos(istate, path, strlen(path));
518 while (pos < istate->cache_nr) {
519 ce = istate->cache[pos++];
520 if (strcmp(ce->name, path) || !ce_stage(ce))
522 mask |= (1 << (ce_stage(ce) - 1));
527 static void wt_status_collect_updated_cb(struct diff_queue_struct *q,
528 struct diff_options *options,
531 struct wt_status *s = data;
534 for (i = 0; i < q->nr; i++) {
535 struct diff_filepair *p;
536 struct string_list_item *it;
537 struct wt_status_change_data *d;
540 it = string_list_insert(&s->change, p->two->path);
546 if (!d->index_status)
547 d->index_status = p->status;
549 case DIFF_STATUS_ADDED:
550 /* Leave {mode,oid}_head zero for an add. */
551 d->mode_index = p->two->mode;
552 oidcpy(&d->oid_index, &p->two->oid);
555 case DIFF_STATUS_DELETED:
556 d->mode_head = p->one->mode;
557 oidcpy(&d->oid_head, &p->one->oid);
559 /* Leave {mode,oid}_index zero for a delete. */
562 case DIFF_STATUS_COPIED:
563 case DIFF_STATUS_RENAMED:
564 if (d->rename_status)
565 BUG("multiple renames on the same target? how?");
566 d->rename_source = xstrdup(p->one->path);
567 d->rename_score = p->score * 100 / MAX_SCORE;
568 d->rename_status = p->status;
570 case DIFF_STATUS_MODIFIED:
571 case DIFF_STATUS_TYPE_CHANGED:
572 d->mode_head = p->one->mode;
573 d->mode_index = p->two->mode;
574 oidcpy(&d->oid_head, &p->one->oid);
575 oidcpy(&d->oid_index, &p->two->oid);
578 case DIFF_STATUS_UNMERGED:
579 d->stagemask = unmerged_mask(s->repo->index,
582 * Don't bother setting {mode,oid}_{head,index} since the print
583 * code will output the stage values directly and not use the
584 * values in these fields.
589 BUG("unhandled diff-index status '%c'", p->status);
595 static void wt_status_collect_changes_worktree(struct wt_status *s)
599 repo_init_revisions(s->repo, &rev, NULL);
600 setup_revisions(0, NULL, &rev, NULL);
601 rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
602 rev.diffopt.flags.dirty_submodules = 1;
603 rev.diffopt.ita_invisible_in_index = 1;
604 if (!s->show_untracked_files)
605 rev.diffopt.flags.ignore_untracked_in_submodules = 1;
606 if (s->ignore_submodule_arg) {
607 rev.diffopt.flags.override_submodule_config = 1;
608 handle_ignore_submodules_arg(&rev.diffopt, s->ignore_submodule_arg);
609 } else if (!rev.diffopt.flags.ignore_submodule_set &&
610 s->show_untracked_files != SHOW_NO_UNTRACKED_FILES)
611 handle_ignore_submodules_arg(&rev.diffopt, "none");
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 int add_file_to_list(const struct object_id *oid,
658 struct strbuf *base, const char *path,
659 unsigned int mode, void *context)
661 struct string_list_item *it;
662 struct wt_status_change_data *d;
663 struct wt_status *s = context;
667 return READ_TREE_RECURSIVE;
669 full_name = xstrfmt("%s%s", base->buf, path);
670 it = string_list_insert(&s->change, full_name);
677 d->index_status = DIFF_STATUS_ADDED;
678 /* Leave {mode,oid}_head zero for adds. */
679 d->mode_index = mode;
680 oidcpy(&d->oid_index, oid);
685 static void wt_status_collect_changes_initial(struct wt_status *s)
687 struct index_state *istate = s->repo->index;
690 for (i = 0; i < istate->cache_nr; i++) {
691 struct string_list_item *it;
692 struct wt_status_change_data *d;
693 const struct cache_entry *ce = istate->cache[i];
695 if (!ce_path_match(istate, ce, &s->pathspec, NULL))
697 if (ce_intent_to_add(ce))
699 if (S_ISSPARSEDIR(ce->ce_mode)) {
701 * This is a sparse directory entry, so we want to collect all
702 * of the added files within the tree. This requires recursively
703 * expanding the trees to find the elements that are new in this
704 * tree and marking them with DIFF_STATUS_ADDED.
706 struct strbuf base = STRBUF_INIT;
708 struct tree *tree = lookup_tree(istate->repo, &ce->oid);
710 memset(&ps, 0, sizeof(ps));
715 strbuf_add(&base, ce->name, ce->ce_namelen);
716 read_tree_at(istate->repo, tree, &base, &ps,
717 add_file_to_list, s);
721 it = string_list_insert(&s->change, ce->name);
728 d->index_status = DIFF_STATUS_UNMERGED;
729 d->stagemask |= (1 << (ce_stage(ce) - 1));
731 * Don't bother setting {mode,oid}_{head,index} since the print
732 * code will output the stage values directly and not use the
733 * values in these fields.
737 d->index_status = DIFF_STATUS_ADDED;
738 /* Leave {mode,oid}_head zero for adds. */
739 d->mode_index = ce->ce_mode;
740 oidcpy(&d->oid_index, &ce->oid);
746 static void wt_status_collect_untracked(struct wt_status *s)
749 struct dir_struct dir;
750 uint64_t t_begin = getnanotime();
751 struct index_state *istate = s->repo->index;
753 if (!s->show_untracked_files)
757 if (s->show_untracked_files != SHOW_ALL_UNTRACKED_FILES)
759 DIR_SHOW_OTHER_DIRECTORIES | DIR_HIDE_EMPTY_DIRECTORIES;
760 if (s->show_ignored_mode) {
761 dir.flags |= DIR_SHOW_IGNORED_TOO;
763 if (s->show_ignored_mode == SHOW_MATCHING_IGNORED)
764 dir.flags |= DIR_SHOW_IGNORED_TOO_MODE_MATCHING;
766 dir.untracked = istate->untracked;
769 setup_standard_excludes(&dir);
771 fill_directory(&dir, istate, &s->pathspec);
773 for (i = 0; i < dir.nr; i++) {
774 struct dir_entry *ent = dir.entries[i];
775 if (index_name_is_other(istate, ent->name, ent->len))
776 string_list_insert(&s->untracked, ent->name);
779 for (i = 0; i < dir.ignored_nr; i++) {
780 struct dir_entry *ent = dir.ignored[i];
781 if (index_name_is_other(istate, ent->name, ent->len))
782 string_list_insert(&s->ignored, ent->name);
787 if (advice_status_u_option)
788 s->untracked_in_ms = (getnanotime() - t_begin) / 1000000;
791 static int has_unmerged(struct wt_status *s)
795 for (i = 0; i < s->change.nr; i++) {
796 struct wt_status_change_data *d;
797 d = s->change.items[i].util;
804 void wt_status_collect(struct wt_status *s)
806 trace2_region_enter("status", "worktrees", s->repo);
807 wt_status_collect_changes_worktree(s);
808 trace2_region_leave("status", "worktrees", s->repo);
811 trace2_region_enter("status", "initial", s->repo);
812 wt_status_collect_changes_initial(s);
813 trace2_region_leave("status", "initial", s->repo);
815 trace2_region_enter("status", "index", s->repo);
816 wt_status_collect_changes_index(s);
817 trace2_region_leave("status", "index", s->repo);
820 trace2_region_enter("status", "untracked", s->repo);
821 wt_status_collect_untracked(s);
822 trace2_region_leave("status", "untracked", s->repo);
824 wt_status_get_state(s->repo, &s->state, s->branch && !strcmp(s->branch, "HEAD"));
825 if (s->state.merge_in_progress && !has_unmerged(s))
829 void wt_status_collect_free_buffers(struct wt_status *s)
831 wt_status_state_free_buffers(&s->state);
834 void wt_status_state_free_buffers(struct wt_status_state *state)
836 FREE_AND_NULL(state->branch);
837 FREE_AND_NULL(state->onto);
838 FREE_AND_NULL(state->detached_from);
841 static void wt_longstatus_print_unmerged(struct wt_status *s)
843 int shown_header = 0;
846 for (i = 0; i < s->change.nr; i++) {
847 struct wt_status_change_data *d;
848 struct string_list_item *it;
849 it = &(s->change.items[i]);
854 wt_longstatus_print_unmerged_header(s);
857 wt_longstatus_print_unmerged_data(s, it);
860 wt_longstatus_print_trailer(s);
864 static void wt_longstatus_print_updated(struct wt_status *s)
866 int shown_header = 0;
869 for (i = 0; i < s->change.nr; i++) {
870 struct wt_status_change_data *d;
871 struct string_list_item *it;
872 it = &(s->change.items[i]);
874 if (!d->index_status ||
875 d->index_status == DIFF_STATUS_UNMERGED)
878 wt_longstatus_print_cached_header(s);
881 wt_longstatus_print_change_data(s, WT_STATUS_UPDATED, it);
884 wt_longstatus_print_trailer(s);
890 * 1 : some change but no delete
892 static int wt_status_check_worktree_changes(struct wt_status *s,
893 int *dirty_submodules)
898 *dirty_submodules = 0;
900 for (i = 0; i < s->change.nr; i++) {
901 struct wt_status_change_data *d;
902 d = s->change.items[i].util;
903 if (!d->worktree_status ||
904 d->worktree_status == DIFF_STATUS_UNMERGED)
908 if (d->dirty_submodule)
909 *dirty_submodules = 1;
910 if (d->worktree_status == DIFF_STATUS_DELETED)
916 static void wt_longstatus_print_changed(struct wt_status *s)
918 int i, dirty_submodules;
919 int worktree_changes = wt_status_check_worktree_changes(s, &dirty_submodules);
921 if (!worktree_changes)
924 wt_longstatus_print_dirty_header(s, worktree_changes < 0, dirty_submodules);
926 for (i = 0; i < s->change.nr; i++) {
927 struct wt_status_change_data *d;
928 struct string_list_item *it;
929 it = &(s->change.items[i]);
931 if (!d->worktree_status ||
932 d->worktree_status == DIFF_STATUS_UNMERGED)
934 wt_longstatus_print_change_data(s, WT_STATUS_CHANGED, it);
936 wt_longstatus_print_trailer(s);
939 static int stash_count_refs(struct object_id *ooid, struct object_id *noid,
940 const char *email, timestamp_t timestamp, int tz,
941 const char *message, void *cb_data)
948 static void wt_longstatus_print_stash_summary(struct wt_status *s)
952 for_each_reflog_ent("refs/stash", stash_count_refs, &stash_count);
954 status_printf_ln(s, GIT_COLOR_NORMAL,
955 Q_("Your stash currently has %d entry",
956 "Your stash currently has %d entries", stash_count),
960 static void wt_longstatus_print_submodule_summary(struct wt_status *s, int uncommitted)
962 struct child_process sm_summary = CHILD_PROCESS_INIT;
963 struct strbuf cmd_stdout = STRBUF_INIT;
964 struct strbuf summary = STRBUF_INIT;
965 char *summary_content;
967 strvec_pushf(&sm_summary.env_array, "GIT_INDEX_FILE=%s", s->index_file);
969 strvec_push(&sm_summary.args, "submodule");
970 strvec_push(&sm_summary.args, "summary");
971 strvec_push(&sm_summary.args, uncommitted ? "--files" : "--cached");
972 strvec_push(&sm_summary.args, "--for-status");
973 strvec_push(&sm_summary.args, "--summary-limit");
974 strvec_pushf(&sm_summary.args, "%d", s->submodule_summary);
976 strvec_push(&sm_summary.args, s->amend ? "HEAD^" : "HEAD");
978 sm_summary.git_cmd = 1;
979 sm_summary.no_stdin = 1;
981 capture_command(&sm_summary, &cmd_stdout, 1024);
983 /* prepend header, only if there's an actual output */
984 if (cmd_stdout.len) {
986 strbuf_addstr(&summary, _("Submodules changed but not updated:"));
988 strbuf_addstr(&summary, _("Submodule changes to be committed:"));
989 strbuf_addstr(&summary, "\n\n");
991 strbuf_addbuf(&summary, &cmd_stdout);
992 strbuf_release(&cmd_stdout);
994 if (s->display_comment_prefix) {
996 summary_content = strbuf_detach(&summary, &len);
997 strbuf_add_commented_lines(&summary, summary_content, len);
998 free(summary_content);
1001 fputs(summary.buf, s->fp);
1002 strbuf_release(&summary);
1005 static void wt_longstatus_print_other(struct wt_status *s,
1006 struct string_list *l,
1011 struct strbuf buf = STRBUF_INIT;
1012 static struct string_list output = STRING_LIST_INIT_DUP;
1013 struct column_options copts;
1018 wt_longstatus_print_other_header(s, what, how);
1020 for (i = 0; i < l->nr; i++) {
1021 struct string_list_item *it;
1023 it = &(l->items[i]);
1024 path = quote_path(it->string, s->prefix, &buf, 0);
1025 if (column_active(s->colopts)) {
1026 string_list_append(&output, path);
1029 status_printf(s, color(WT_STATUS_HEADER, s), "\t");
1030 status_printf_more(s, color(WT_STATUS_UNTRACKED, s),
1034 strbuf_release(&buf);
1035 if (!column_active(s->colopts))
1038 strbuf_addf(&buf, "%s%s\t%s",
1039 color(WT_STATUS_HEADER, s),
1040 s->display_comment_prefix ? "#" : "",
1041 color(WT_STATUS_UNTRACKED, s));
1042 memset(&copts, 0, sizeof(copts));
1044 copts.indent = buf.buf;
1045 if (want_color(s->use_color))
1046 copts.nl = GIT_COLOR_RESET "\n";
1047 print_columns(&output, s->colopts, &copts);
1048 string_list_clear(&output, 0);
1049 strbuf_release(&buf);
1051 status_printf_ln(s, GIT_COLOR_NORMAL, "%s", "");
1054 size_t wt_status_locate_end(const char *s, size_t len)
1057 struct strbuf pattern = STRBUF_INIT;
1059 strbuf_addf(&pattern, "\n%c %s", comment_line_char, cut_line);
1060 if (starts_with(s, pattern.buf + 1))
1062 else if ((p = strstr(s, pattern.buf)))
1064 strbuf_release(&pattern);
1068 void wt_status_append_cut_line(struct strbuf *buf)
1070 const char *explanation = _("Do not modify or remove the line above.\nEverything below it will be ignored.");
1072 strbuf_commented_addf(buf, "%s", cut_line);
1073 strbuf_add_commented_lines(buf, explanation, strlen(explanation));
1076 void wt_status_add_cut_line(FILE *fp)
1078 struct strbuf buf = STRBUF_INIT;
1080 wt_status_append_cut_line(&buf);
1082 strbuf_release(&buf);
1085 static void wt_longstatus_print_verbose(struct wt_status *s)
1087 struct rev_info rev;
1088 struct setup_revision_opt opt;
1089 int dirty_submodules;
1090 const char *c = color(WT_STATUS_HEADER, s);
1092 repo_init_revisions(s->repo, &rev, NULL);
1093 rev.diffopt.flags.allow_textconv = 1;
1094 rev.diffopt.ita_invisible_in_index = 1;
1096 memset(&opt, 0, sizeof(opt));
1097 opt.def = s->is_initial ? empty_tree_oid_hex() : s->reference;
1098 setup_revisions(0, NULL, &rev, &opt);
1100 rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
1101 rev.diffopt.detect_rename = s->detect_rename >= 0 ? s->detect_rename : rev.diffopt.detect_rename;
1102 rev.diffopt.rename_limit = s->rename_limit >= 0 ? s->rename_limit : rev.diffopt.rename_limit;
1103 rev.diffopt.rename_score = s->rename_score >= 0 ? s->rename_score : rev.diffopt.rename_score;
1104 rev.diffopt.file = s->fp;
1105 rev.diffopt.close_file = 0;
1107 * If we're not going to stdout, then we definitely don't
1108 * want color, since we are going to the commit message
1109 * file (and even the "auto" setting won't work, since it
1110 * will have checked isatty on stdout). But we then do want
1111 * to insert the scissor line here to reliably remove the
1112 * diff before committing.
1114 if (s->fp != stdout) {
1115 rev.diffopt.use_color = 0;
1116 wt_status_add_cut_line(s->fp);
1118 if (s->verbose > 1 && s->committable) {
1119 /* print_updated() printed a header, so do we */
1120 if (s->fp != stdout)
1121 wt_longstatus_print_trailer(s);
1122 status_printf_ln(s, c, _("Changes to be committed:"));
1123 rev.diffopt.a_prefix = "c/";
1124 rev.diffopt.b_prefix = "i/";
1125 } /* else use prefix as per user config */
1126 run_diff_index(&rev, 1);
1127 if (s->verbose > 1 &&
1128 wt_status_check_worktree_changes(s, &dirty_submodules)) {
1129 status_printf_ln(s, c,
1130 "--------------------------------------------------");
1131 status_printf_ln(s, c, _("Changes not staged for commit:"));
1133 rev.diffopt.a_prefix = "i/";
1134 rev.diffopt.b_prefix = "w/";
1135 run_diff_files(&rev, 0);
1139 static void wt_longstatus_print_tracking(struct wt_status *s)
1141 struct strbuf sb = STRBUF_INIT;
1142 const char *cp, *ep, *branch_name;
1143 struct branch *branch;
1144 char comment_line_string[3];
1146 uint64_t t_begin = 0;
1148 assert(s->branch && !s->is_initial);
1149 if (!skip_prefix(s->branch, "refs/heads/", &branch_name))
1151 branch = branch_get(branch_name);
1153 t_begin = getnanotime();
1155 if (!format_tracking_info(branch, &sb, s->ahead_behind_flags))
1158 if (advice_status_ahead_behind_warning &&
1159 s->ahead_behind_flags == AHEAD_BEHIND_FULL) {
1160 uint64_t t_delta_in_ms = (getnanotime() - t_begin) / 1000000;
1161 if (t_delta_in_ms > AB_DELAY_WARNING_IN_MS) {
1162 strbuf_addf(&sb, _("\n"
1163 "It took %.2f seconds to compute the branch ahead/behind values.\n"
1164 "You can use '--no-ahead-behind' to avoid this.\n"),
1165 t_delta_in_ms / 1000.0);
1170 if (s->display_comment_prefix) {
1171 comment_line_string[i++] = comment_line_char;
1172 comment_line_string[i++] = ' ';
1174 comment_line_string[i] = '\0';
1176 for (cp = sb.buf; (ep = strchr(cp, '\n')) != NULL; cp = ep + 1)
1177 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s),
1178 "%s%.*s", comment_line_string,
1179 (int)(ep - cp), cp);
1180 if (s->display_comment_prefix)
1181 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s), "%c",
1185 strbuf_release(&sb);
1188 static void show_merge_in_progress(struct wt_status *s,
1191 if (has_unmerged(s)) {
1192 status_printf_ln(s, color, _("You have unmerged paths."));
1194 status_printf_ln(s, color,
1195 _(" (fix conflicts and run \"git commit\")"));
1196 status_printf_ln(s, color,
1197 _(" (use \"git merge --abort\" to abort the merge)"));
1200 status_printf_ln(s, color,
1201 _("All conflicts fixed but you are still merging."));
1203 status_printf_ln(s, color,
1204 _(" (use \"git commit\" to conclude merge)"));
1206 wt_longstatus_print_trailer(s);
1209 static void show_am_in_progress(struct wt_status *s,
1212 status_printf_ln(s, color,
1213 _("You are in the middle of an am session."));
1214 if (s->state.am_empty_patch)
1215 status_printf_ln(s, color,
1216 _("The current patch is empty."));
1218 if (!s->state.am_empty_patch)
1219 status_printf_ln(s, color,
1220 _(" (fix conflicts and then run \"git am --continue\")"));
1221 status_printf_ln(s, color,
1222 _(" (use \"git am --skip\" to skip this patch)"));
1223 status_printf_ln(s, color,
1224 _(" (use \"git am --abort\" to restore the original branch)"));
1226 wt_longstatus_print_trailer(s);
1229 static char *read_line_from_git_path(const char *filename)
1231 struct strbuf buf = STRBUF_INIT;
1232 FILE *fp = fopen_or_warn(git_path("%s", filename), "r");
1235 strbuf_release(&buf);
1238 strbuf_getline_lf(&buf, fp);
1240 return strbuf_detach(&buf, NULL);
1242 strbuf_release(&buf);
1247 static int split_commit_in_progress(struct wt_status *s)
1249 int split_in_progress = 0;
1250 char *head, *orig_head, *rebase_amend, *rebase_orig_head;
1252 if ((!s->amend && !s->nowarn && !s->workdir_dirty) ||
1253 !s->branch || strcmp(s->branch, "HEAD"))
1256 head = read_line_from_git_path("HEAD");
1257 orig_head = read_line_from_git_path("ORIG_HEAD");
1258 rebase_amend = read_line_from_git_path("rebase-merge/amend");
1259 rebase_orig_head = read_line_from_git_path("rebase-merge/orig-head");
1261 if (!head || !orig_head || !rebase_amend || !rebase_orig_head)
1262 ; /* fall through, no split in progress */
1263 else if (!strcmp(rebase_amend, rebase_orig_head))
1264 split_in_progress = !!strcmp(head, rebase_amend);
1265 else if (strcmp(orig_head, rebase_orig_head))
1266 split_in_progress = 1;
1271 free(rebase_orig_head);
1273 return split_in_progress;
1278 * "pick d6a2f0303e897ec257dd0e0a39a5ccb709bc2047 some message"
1280 * "pick d6a2f03 some message"
1282 * The function assumes that the line does not contain useless spaces
1283 * before or after the command.
1285 static void abbrev_oid_in_line(struct strbuf *line)
1287 struct strbuf **split;
1290 if (starts_with(line->buf, "exec ") ||
1291 starts_with(line->buf, "x ") ||
1292 starts_with(line->buf, "label ") ||
1293 starts_with(line->buf, "l "))
1296 split = strbuf_split_max(line, ' ', 3);
1297 if (split[0] && split[1]) {
1298 struct object_id oid;
1301 * strbuf_split_max left a space. Trim it and re-add
1302 * it after abbreviation.
1304 strbuf_trim(split[1]);
1305 if (!get_oid(split[1]->buf, &oid)) {
1306 strbuf_reset(split[1]);
1307 strbuf_add_unique_abbrev(split[1], &oid,
1309 strbuf_addch(split[1], ' ');
1311 for (i = 0; split[i]; i++)
1312 strbuf_addbuf(line, split[i]);
1315 strbuf_list_free(split);
1318 static int read_rebase_todolist(const char *fname, struct string_list *lines)
1320 struct strbuf line = STRBUF_INIT;
1321 FILE *f = fopen(git_path("%s", fname), "r");
1324 if (errno == ENOENT)
1326 die_errno("Could not open file %s for reading",
1327 git_path("%s", fname));
1329 while (!strbuf_getline_lf(&line, f)) {
1330 if (line.len && line.buf[0] == comment_line_char)
1335 abbrev_oid_in_line(&line);
1336 string_list_append(lines, line.buf);
1339 strbuf_release(&line);
1343 static void show_rebase_information(struct wt_status *s,
1346 if (s->state.rebase_interactive_in_progress) {
1348 int nr_lines_to_show = 2;
1350 struct string_list have_done = STRING_LIST_INIT_DUP;
1351 struct string_list yet_to_do = STRING_LIST_INIT_DUP;
1353 read_rebase_todolist("rebase-merge/done", &have_done);
1354 if (read_rebase_todolist("rebase-merge/git-rebase-todo",
1356 status_printf_ln(s, color,
1357 _("git-rebase-todo is missing."));
1358 if (have_done.nr == 0)
1359 status_printf_ln(s, color, _("No commands done."));
1361 status_printf_ln(s, color,
1362 Q_("Last command done (%d command done):",
1363 "Last commands done (%d commands done):",
1366 for (i = (have_done.nr > nr_lines_to_show)
1367 ? have_done.nr - nr_lines_to_show : 0;
1370 status_printf_ln(s, color, " %s", have_done.items[i].string);
1371 if (have_done.nr > nr_lines_to_show && s->hints)
1372 status_printf_ln(s, color,
1373 _(" (see more in file %s)"), git_path("rebase-merge/done"));
1376 if (yet_to_do.nr == 0)
1377 status_printf_ln(s, color,
1378 _("No commands remaining."));
1380 status_printf_ln(s, color,
1381 Q_("Next command to do (%d remaining command):",
1382 "Next commands to do (%d remaining commands):",
1385 for (i = 0; i < nr_lines_to_show && i < yet_to_do.nr; i++)
1386 status_printf_ln(s, color, " %s", yet_to_do.items[i].string);
1388 status_printf_ln(s, color,
1389 _(" (use \"git rebase --edit-todo\" to view and edit)"));
1391 string_list_clear(&yet_to_do, 0);
1392 string_list_clear(&have_done, 0);
1396 static void print_rebase_state(struct wt_status *s,
1399 if (s->state.branch)
1400 status_printf_ln(s, color,
1401 _("You are currently rebasing branch '%s' on '%s'."),
1405 status_printf_ln(s, color,
1406 _("You are currently rebasing."));
1409 static void show_rebase_in_progress(struct wt_status *s,
1414 show_rebase_information(s, color);
1415 if (has_unmerged(s)) {
1416 print_rebase_state(s, color);
1418 status_printf_ln(s, color,
1419 _(" (fix conflicts and then run \"git rebase --continue\")"));
1420 status_printf_ln(s, color,
1421 _(" (use \"git rebase --skip\" to skip this patch)"));
1422 status_printf_ln(s, color,
1423 _(" (use \"git rebase --abort\" to check out the original branch)"));
1425 } else if (s->state.rebase_in_progress ||
1426 !stat(git_path_merge_msg(s->repo), &st)) {
1427 print_rebase_state(s, color);
1429 status_printf_ln(s, color,
1430 _(" (all conflicts fixed: run \"git rebase --continue\")"));
1431 } else if (split_commit_in_progress(s)) {
1432 if (s->state.branch)
1433 status_printf_ln(s, color,
1434 _("You are currently splitting a commit while rebasing branch '%s' on '%s'."),
1438 status_printf_ln(s, color,
1439 _("You are currently splitting a commit during a rebase."));
1441 status_printf_ln(s, color,
1442 _(" (Once your working directory is clean, run \"git rebase --continue\")"));
1444 if (s->state.branch)
1445 status_printf_ln(s, color,
1446 _("You are currently editing a commit while rebasing branch '%s' on '%s'."),
1450 status_printf_ln(s, color,
1451 _("You are currently editing a commit during a rebase."));
1452 if (s->hints && !s->amend) {
1453 status_printf_ln(s, color,
1454 _(" (use \"git commit --amend\" to amend the current commit)"));
1455 status_printf_ln(s, color,
1456 _(" (use \"git rebase --continue\" once you are satisfied with your changes)"));
1459 wt_longstatus_print_trailer(s);
1462 static void show_cherry_pick_in_progress(struct wt_status *s,
1465 if (is_null_oid(&s->state.cherry_pick_head_oid))
1466 status_printf_ln(s, color,
1467 _("Cherry-pick currently in progress."));
1469 status_printf_ln(s, color,
1470 _("You are currently cherry-picking commit %s."),
1471 find_unique_abbrev(&s->state.cherry_pick_head_oid,
1475 if (has_unmerged(s))
1476 status_printf_ln(s, color,
1477 _(" (fix conflicts and run \"git cherry-pick --continue\")"));
1478 else if (is_null_oid(&s->state.cherry_pick_head_oid))
1479 status_printf_ln(s, color,
1480 _(" (run \"git cherry-pick --continue\" to continue)"));
1482 status_printf_ln(s, color,
1483 _(" (all conflicts fixed: run \"git cherry-pick --continue\")"));
1484 status_printf_ln(s, color,
1485 _(" (use \"git cherry-pick --skip\" to skip this patch)"));
1486 status_printf_ln(s, color,
1487 _(" (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"));
1489 wt_longstatus_print_trailer(s);
1492 static void show_revert_in_progress(struct wt_status *s,
1495 if (is_null_oid(&s->state.revert_head_oid))
1496 status_printf_ln(s, color,
1497 _("Revert currently in progress."));
1499 status_printf_ln(s, color,
1500 _("You are currently reverting commit %s."),
1501 find_unique_abbrev(&s->state.revert_head_oid,
1504 if (has_unmerged(s))
1505 status_printf_ln(s, color,
1506 _(" (fix conflicts and run \"git revert --continue\")"));
1507 else if (is_null_oid(&s->state.revert_head_oid))
1508 status_printf_ln(s, color,
1509 _(" (run \"git revert --continue\" to continue)"));
1511 status_printf_ln(s, color,
1512 _(" (all conflicts fixed: run \"git revert --continue\")"));
1513 status_printf_ln(s, color,
1514 _(" (use \"git revert --skip\" to skip this patch)"));
1515 status_printf_ln(s, color,
1516 _(" (use \"git revert --abort\" to cancel the revert operation)"));
1518 wt_longstatus_print_trailer(s);
1521 static void show_bisect_in_progress(struct wt_status *s,
1524 if (s->state.branch)
1525 status_printf_ln(s, color,
1526 _("You are currently bisecting, started from branch '%s'."),
1529 status_printf_ln(s, color,
1530 _("You are currently bisecting."));
1532 status_printf_ln(s, color,
1533 _(" (use \"git bisect reset\" to get back to the original branch)"));
1534 wt_longstatus_print_trailer(s);
1537 static void show_sparse_checkout_in_use(struct wt_status *s,
1540 if (s->state.sparse_checkout_percentage == SPARSE_CHECKOUT_DISABLED)
1543 if (s->state.sparse_checkout_percentage == SPARSE_CHECKOUT_SPARSE_INDEX)
1544 status_printf_ln(s, color, _("You are in a sparse checkout."));
1546 status_printf_ln(s, color,
1547 _("You are in a sparse checkout with %d%% of tracked files present."),
1548 s->state.sparse_checkout_percentage);
1549 wt_longstatus_print_trailer(s);
1553 * Extract branch information from rebase/bisect
1555 static char *get_branch(const struct worktree *wt, const char *path)
1557 struct strbuf sb = STRBUF_INIT;
1558 struct object_id oid;
1559 const char *branch_name;
1561 if (strbuf_read_file(&sb, worktree_git_path(wt, "%s", path), 0) <= 0)
1564 while (sb.len && sb.buf[sb.len - 1] == '\n')
1565 strbuf_setlen(&sb, sb.len - 1);
1568 if (skip_prefix(sb.buf, "refs/heads/", &branch_name))
1569 strbuf_remove(&sb, 0, branch_name - sb.buf);
1570 else if (starts_with(sb.buf, "refs/"))
1572 else if (!get_oid_hex(sb.buf, &oid)) {
1574 strbuf_add_unique_abbrev(&sb, &oid, DEFAULT_ABBREV);
1575 } else if (!strcmp(sb.buf, "detached HEAD")) /* rebase */
1579 return strbuf_detach(&sb, NULL);
1582 strbuf_release(&sb);
1586 struct grab_1st_switch_cbdata {
1588 struct object_id noid;
1591 static int grab_1st_switch(struct object_id *ooid, struct object_id *noid,
1592 const char *email, timestamp_t timestamp, int tz,
1593 const char *message, void *cb_data)
1595 struct grab_1st_switch_cbdata *cb = cb_data;
1596 const char *target = NULL, *end;
1598 if (!skip_prefix(message, "checkout: moving from ", &message))
1600 target = strstr(message, " to ");
1603 target += strlen(" to ");
1604 strbuf_reset(&cb->buf);
1605 oidcpy(&cb->noid, noid);
1606 end = strchrnul(target, '\n');
1607 strbuf_add(&cb->buf, target, end - target);
1608 if (!strcmp(cb->buf.buf, "HEAD")) {
1609 /* HEAD is relative. Resolve it to the right reflog entry. */
1610 strbuf_reset(&cb->buf);
1611 strbuf_add_unique_abbrev(&cb->buf, noid, DEFAULT_ABBREV);
1616 static void wt_status_get_detached_from(struct repository *r,
1617 struct wt_status_state *state)
1619 struct grab_1st_switch_cbdata cb;
1620 struct commit *commit;
1621 struct object_id oid;
1624 strbuf_init(&cb.buf, 0);
1625 if (for_each_reflog_ent_reverse("HEAD", grab_1st_switch, &cb) <= 0) {
1626 strbuf_release(&cb.buf);
1630 if (dwim_ref(cb.buf.buf, cb.buf.len, &oid, &ref, 1) == 1 &&
1631 /* oid is a commit? match without further lookup */
1632 (oideq(&cb.noid, &oid) ||
1633 /* perhaps oid is a tag, try to dereference to a commit */
1634 ((commit = lookup_commit_reference_gently(r, &oid, 1)) != NULL &&
1635 oideq(&cb.noid, &commit->object.oid)))) {
1636 const char *from = ref;
1637 if (!skip_prefix(from, "refs/tags/", &from))
1638 skip_prefix(from, "refs/remotes/", &from);
1639 state->detached_from = xstrdup(from);
1641 state->detached_from =
1642 xstrdup(find_unique_abbrev(&cb.noid, DEFAULT_ABBREV));
1643 oidcpy(&state->detached_oid, &cb.noid);
1644 state->detached_at = !get_oid("HEAD", &oid) &&
1645 oideq(&oid, &state->detached_oid);
1648 strbuf_release(&cb.buf);
1651 int wt_status_check_rebase(const struct worktree *wt,
1652 struct wt_status_state *state)
1656 if (!stat(worktree_git_path(wt, "rebase-apply"), &st)) {
1657 if (!stat(worktree_git_path(wt, "rebase-apply/applying"), &st)) {
1658 state->am_in_progress = 1;
1659 if (!stat(worktree_git_path(wt, "rebase-apply/patch"), &st) && !st.st_size)
1660 state->am_empty_patch = 1;
1662 state->rebase_in_progress = 1;
1663 state->branch = get_branch(wt, "rebase-apply/head-name");
1664 state->onto = get_branch(wt, "rebase-apply/onto");
1666 } else if (!stat(worktree_git_path(wt, "rebase-merge"), &st)) {
1667 if (!stat(worktree_git_path(wt, "rebase-merge/interactive"), &st))
1668 state->rebase_interactive_in_progress = 1;
1670 state->rebase_in_progress = 1;
1671 state->branch = get_branch(wt, "rebase-merge/head-name");
1672 state->onto = get_branch(wt, "rebase-merge/onto");
1678 int wt_status_check_bisect(const struct worktree *wt,
1679 struct wt_status_state *state)
1683 if (!stat(worktree_git_path(wt, "BISECT_LOG"), &st)) {
1684 state->bisect_in_progress = 1;
1685 state->branch = get_branch(wt, "BISECT_START");
1691 static void wt_status_check_sparse_checkout(struct repository *r,
1692 struct wt_status_state *state)
1694 int skip_worktree = 0;
1697 if (!core_apply_sparse_checkout || r->index->cache_nr == 0) {
1699 * Don't compute percentage of checked out files if we
1700 * aren't in a sparse checkout or would get division by 0.
1702 state->sparse_checkout_percentage = SPARSE_CHECKOUT_DISABLED;
1706 if (r->index->sparse_index) {
1707 state->sparse_checkout_percentage = SPARSE_CHECKOUT_SPARSE_INDEX;
1711 for (i = 0; i < r->index->cache_nr; i++) {
1712 struct cache_entry *ce = r->index->cache[i];
1713 if (ce_skip_worktree(ce))
1717 state->sparse_checkout_percentage =
1718 100 - (100 * skip_worktree)/r->index->cache_nr;
1721 void wt_status_get_state(struct repository *r,
1722 struct wt_status_state *state,
1723 int get_detached_from)
1726 struct object_id oid;
1727 enum replay_action action;
1729 if (!stat(git_path_merge_head(r), &st)) {
1730 wt_status_check_rebase(NULL, state);
1731 state->merge_in_progress = 1;
1732 } else if (wt_status_check_rebase(NULL, state)) {
1734 } else if (refs_ref_exists(get_main_ref_store(r), "CHERRY_PICK_HEAD") &&
1735 !get_oid("CHERRY_PICK_HEAD", &oid)) {
1736 state->cherry_pick_in_progress = 1;
1737 oidcpy(&state->cherry_pick_head_oid, &oid);
1739 wt_status_check_bisect(NULL, state);
1740 if (refs_ref_exists(get_main_ref_store(r), "REVERT_HEAD") &&
1741 !get_oid("REVERT_HEAD", &oid)) {
1742 state->revert_in_progress = 1;
1743 oidcpy(&state->revert_head_oid, &oid);
1745 if (!sequencer_get_last_command(r, &action)) {
1746 if (action == REPLAY_PICK) {
1747 state->cherry_pick_in_progress = 1;
1748 oidcpy(&state->cherry_pick_head_oid, &null_oid);
1750 state->revert_in_progress = 1;
1751 oidcpy(&state->revert_head_oid, &null_oid);
1754 if (get_detached_from)
1755 wt_status_get_detached_from(r, state);
1756 wt_status_check_sparse_checkout(r, state);
1759 static void wt_longstatus_print_state(struct wt_status *s)
1761 const char *state_color = color(WT_STATUS_HEADER, s);
1762 struct wt_status_state *state = &s->state;
1764 if (state->merge_in_progress) {
1765 if (state->rebase_interactive_in_progress) {
1766 show_rebase_information(s, state_color);
1769 show_merge_in_progress(s, state_color);
1770 } else if (state->am_in_progress)
1771 show_am_in_progress(s, state_color);
1772 else if (state->rebase_in_progress || state->rebase_interactive_in_progress)
1773 show_rebase_in_progress(s, state_color);
1774 else if (state->cherry_pick_in_progress)
1775 show_cherry_pick_in_progress(s, state_color);
1776 else if (state->revert_in_progress)
1777 show_revert_in_progress(s, state_color);
1778 if (state->bisect_in_progress)
1779 show_bisect_in_progress(s, state_color);
1781 if (state->sparse_checkout_percentage != SPARSE_CHECKOUT_DISABLED)
1782 show_sparse_checkout_in_use(s, state_color);
1785 static void wt_longstatus_print(struct wt_status *s)
1787 const char *branch_color = color(WT_STATUS_ONBRANCH, s);
1788 const char *branch_status_color = color(WT_STATUS_HEADER, s);
1791 const char *on_what = _("On branch ");
1792 const char *branch_name = s->branch;
1793 if (!strcmp(branch_name, "HEAD")) {
1794 branch_status_color = color(WT_STATUS_NOBRANCH, s);
1795 if (s->state.rebase_in_progress ||
1796 s->state.rebase_interactive_in_progress) {
1797 if (s->state.rebase_interactive_in_progress)
1798 on_what = _("interactive rebase in progress; onto ");
1800 on_what = _("rebase in progress; onto ");
1801 branch_name = s->state.onto;
1802 } else if (s->state.detached_from) {
1803 branch_name = s->state.detached_from;
1804 if (s->state.detached_at)
1805 on_what = _("HEAD detached at ");
1807 on_what = _("HEAD detached from ");
1810 on_what = _("Not currently on any branch.");
1813 skip_prefix(branch_name, "refs/heads/", &branch_name);
1814 status_printf(s, color(WT_STATUS_HEADER, s), "%s", "");
1815 status_printf_more(s, branch_status_color, "%s", on_what);
1816 status_printf_more(s, branch_color, "%s\n", branch_name);
1818 wt_longstatus_print_tracking(s);
1821 wt_longstatus_print_state(s);
1823 if (s->is_initial) {
1824 status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", "");
1825 status_printf_ln(s, color(WT_STATUS_HEADER, s),
1827 ? _("Initial commit")
1828 : _("No commits yet"));
1829 status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", "");
1832 wt_longstatus_print_updated(s);
1833 wt_longstatus_print_unmerged(s);
1834 wt_longstatus_print_changed(s);
1835 if (s->submodule_summary &&
1836 (!s->ignore_submodule_arg ||
1837 strcmp(s->ignore_submodule_arg, "all"))) {
1838 wt_longstatus_print_submodule_summary(s, 0); /* staged */
1839 wt_longstatus_print_submodule_summary(s, 1); /* unstaged */
1841 if (s->show_untracked_files) {
1842 wt_longstatus_print_other(s, &s->untracked, _("Untracked files"), "add");
1843 if (s->show_ignored_mode)
1844 wt_longstatus_print_other(s, &s->ignored, _("Ignored files"), "add -f");
1845 if (advice_status_u_option && 2000 < s->untracked_in_ms) {
1846 status_printf_ln(s, GIT_COLOR_NORMAL, "%s", "");
1847 status_printf_ln(s, GIT_COLOR_NORMAL,
1848 _("It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1849 "may speed it up, but you have to be careful not to forget to add\n"
1850 "new files yourself (see 'git help status')."),
1851 s->untracked_in_ms / 1000.0);
1853 } else if (s->committable)
1854 status_printf_ln(s, GIT_COLOR_NORMAL, _("Untracked files not listed%s"),
1856 ? _(" (use -u option to show untracked files)") : "");
1859 wt_longstatus_print_verbose(s);
1860 if (!s->committable) {
1862 status_printf_ln(s, GIT_COLOR_NORMAL, _("No changes"));
1865 else if (s->workdir_dirty) {
1867 fprintf(s->fp, _("no changes added to commit "
1868 "(use \"git add\" and/or "
1869 "\"git commit -a\")\n"));
1871 fprintf(s->fp, _("no changes added to "
1873 } else if (s->untracked.nr) {
1875 fprintf(s->fp, _("nothing added to commit but "
1876 "untracked files present (use "
1877 "\"git add\" to track)\n"));
1879 fprintf(s->fp, _("nothing added to commit but "
1880 "untracked files present\n"));
1881 } else if (s->is_initial) {
1883 fprintf(s->fp, _("nothing to commit (create/"
1884 "copy files and use \"git "
1885 "add\" to track)\n"));
1887 fprintf(s->fp, _("nothing to commit\n"));
1888 } else if (!s->show_untracked_files) {
1890 fprintf(s->fp, _("nothing to commit (use -u to "
1891 "show untracked files)\n"));
1893 fprintf(s->fp, _("nothing to commit\n"));
1895 fprintf(s->fp, _("nothing to commit, working tree "
1899 wt_longstatus_print_stash_summary(s);
1902 static void wt_shortstatus_unmerged(struct string_list_item *it,
1903 struct wt_status *s)
1905 struct wt_status_change_data *d = it->util;
1906 const char *how = "??";
1908 switch (d->stagemask) {
1909 case 1: how = "DD"; break; /* both deleted */
1910 case 2: how = "AU"; break; /* added by us */
1911 case 3: how = "UD"; break; /* deleted by them */
1912 case 4: how = "UA"; break; /* added by them */
1913 case 5: how = "DU"; break; /* deleted by us */
1914 case 6: how = "AA"; break; /* both added */
1915 case 7: how = "UU"; break; /* both modified */
1917 color_fprintf(s->fp, color(WT_STATUS_UNMERGED, s), "%s", how);
1918 if (s->null_termination) {
1919 fprintf(s->fp, " %s%c", it->string, 0);
1921 struct strbuf onebuf = STRBUF_INIT;
1923 one = quote_path(it->string, s->prefix, &onebuf, QUOTE_PATH_QUOTE_SP);
1924 fprintf(s->fp, " %s\n", one);
1925 strbuf_release(&onebuf);
1929 static void wt_shortstatus_status(struct string_list_item *it,
1930 struct wt_status *s)
1932 struct wt_status_change_data *d = it->util;
1934 if (d->index_status)
1935 color_fprintf(s->fp, color(WT_STATUS_UPDATED, s), "%c", d->index_status);
1938 if (d->worktree_status)
1939 color_fprintf(s->fp, color(WT_STATUS_CHANGED, s), "%c", d->worktree_status);
1943 if (s->null_termination) {
1944 fprintf(s->fp, "%s%c", it->string, 0);
1945 if (d->rename_source)
1946 fprintf(s->fp, "%s%c", d->rename_source, 0);
1948 struct strbuf onebuf = STRBUF_INIT;
1951 if (d->rename_source) {
1952 one = quote_path(d->rename_source, s->prefix, &onebuf,
1953 QUOTE_PATH_QUOTE_SP);
1954 fprintf(s->fp, "%s -> ", one);
1955 strbuf_release(&onebuf);
1957 one = quote_path(it->string, s->prefix, &onebuf, QUOTE_PATH_QUOTE_SP);
1958 fprintf(s->fp, "%s\n", one);
1959 strbuf_release(&onebuf);
1963 static void wt_shortstatus_other(struct string_list_item *it,
1964 struct wt_status *s, const char *sign)
1966 if (s->null_termination) {
1967 fprintf(s->fp, "%s %s%c", sign, it->string, 0);
1969 struct strbuf onebuf = STRBUF_INIT;
1971 one = quote_path(it->string, s->prefix, &onebuf, QUOTE_PATH_QUOTE_SP);
1972 color_fprintf(s->fp, color(WT_STATUS_UNTRACKED, s), "%s", sign);
1973 fprintf(s->fp, " %s\n", one);
1974 strbuf_release(&onebuf);
1978 static void wt_shortstatus_print_tracking(struct wt_status *s)
1980 struct branch *branch;
1981 const char *header_color = color(WT_STATUS_HEADER, s);
1982 const char *branch_color_local = color(WT_STATUS_LOCAL_BRANCH, s);
1983 const char *branch_color_remote = color(WT_STATUS_REMOTE_BRANCH, s);
1987 const char *branch_name;
1988 int num_ours, num_theirs, sti;
1989 int upstream_is_gone = 0;
1991 color_fprintf(s->fp, color(WT_STATUS_HEADER, s), "## ");
1995 branch_name = s->branch;
1997 #define LABEL(string) (s->no_gettext ? (string) : _(string))
2000 color_fprintf(s->fp, header_color, LABEL(N_("No commits yet on ")));
2002 if (!strcmp(s->branch, "HEAD")) {
2003 color_fprintf(s->fp, color(WT_STATUS_NOBRANCH, s), "%s",
2004 LABEL(N_("HEAD (no branch)")));
2008 skip_prefix(branch_name, "refs/heads/", &branch_name);
2010 branch = branch_get(branch_name);
2012 color_fprintf(s->fp, branch_color_local, "%s", branch_name);
2014 sti = stat_tracking_info(branch, &num_ours, &num_theirs, &base,
2015 0, s->ahead_behind_flags);
2020 upstream_is_gone = 1;
2023 short_base = shorten_unambiguous_ref(base, 0);
2024 color_fprintf(s->fp, header_color, "...");
2025 color_fprintf(s->fp, branch_color_remote, "%s", short_base);
2028 if (!upstream_is_gone && !sti)
2031 color_fprintf(s->fp, header_color, " [");
2032 if (upstream_is_gone) {
2033 color_fprintf(s->fp, header_color, LABEL(N_("gone")));
2034 } else if (s->ahead_behind_flags == AHEAD_BEHIND_QUICK) {
2035 color_fprintf(s->fp, header_color, LABEL(N_("different")));
2036 } else if (!num_ours) {
2037 color_fprintf(s->fp, header_color, LABEL(N_("behind ")));
2038 color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
2039 } else if (!num_theirs) {
2040 color_fprintf(s->fp, header_color, LABEL(N_("ahead ")));
2041 color_fprintf(s->fp, branch_color_local, "%d", num_ours);
2043 color_fprintf(s->fp, header_color, LABEL(N_("ahead ")));
2044 color_fprintf(s->fp, branch_color_local, "%d", num_ours);
2045 color_fprintf(s->fp, header_color, ", %s", LABEL(N_("behind ")));
2046 color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
2049 color_fprintf(s->fp, header_color, "]");
2051 fputc(s->null_termination ? '\0' : '\n', s->fp);
2054 static void wt_shortstatus_print(struct wt_status *s)
2056 struct string_list_item *it;
2059 wt_shortstatus_print_tracking(s);
2061 for_each_string_list_item(it, &s->change) {
2062 struct wt_status_change_data *d = it->util;
2065 wt_shortstatus_unmerged(it, s);
2067 wt_shortstatus_status(it, s);
2069 for_each_string_list_item(it, &s->untracked)
2070 wt_shortstatus_other(it, s, "??");
2072 for_each_string_list_item(it, &s->ignored)
2073 wt_shortstatus_other(it, s, "!!");
2076 static void wt_porcelain_print(struct wt_status *s)
2079 s->relative_paths = 0;
2082 wt_shortstatus_print(s);
2086 * Print branch information for porcelain v2 output. These lines
2087 * are printed when the '--branch' parameter is given.
2089 * # branch.oid <commit><eol>
2090 * # branch.head <head><eol>
2091 * [# branch.upstream <upstream><eol>
2092 * [# branch.ab +<ahead> -<behind><eol>]]
2094 * <commit> ::= the current commit hash or the literal
2095 * "(initial)" to indicate an initialized repo
2098 * <head> ::= <branch_name> the current branch name or
2099 * "(detached)" literal when detached head or
2100 * "(unknown)" when something is wrong.
2102 * <upstream> ::= the upstream branch name, when set.
2104 * <ahead> ::= integer ahead value or '?'.
2106 * <behind> ::= integer behind value or '?'.
2108 * The end-of-line is defined by the -z flag.
2110 * <eol> ::= NUL when -z,
2113 * When an upstream is set and present, the 'branch.ab' line will
2114 * be printed with the ahead/behind counts for the branch and the
2115 * upstream. When AHEAD_BEHIND_QUICK is requested and the branches
2116 * are different, '?' will be substituted for the actual count.
2118 static void wt_porcelain_v2_print_tracking(struct wt_status *s)
2120 struct branch *branch;
2122 const char *branch_name;
2123 int ab_info, nr_ahead, nr_behind;
2124 char eol = s->null_termination ? '\0' : '\n';
2126 fprintf(s->fp, "# branch.oid %s%c",
2127 (s->is_initial ? "(initial)" : oid_to_hex(&s->oid_commit)),
2131 fprintf(s->fp, "# branch.head %s%c", "(unknown)", eol);
2133 if (!strcmp(s->branch, "HEAD")) {
2134 fprintf(s->fp, "# branch.head %s%c", "(detached)", eol);
2136 if (s->state.rebase_in_progress ||
2137 s->state.rebase_interactive_in_progress)
2138 branch_name = s->state.onto;
2139 else if (s->state.detached_from)
2140 branch_name = s->state.detached_from;
2145 skip_prefix(s->branch, "refs/heads/", &branch_name);
2147 fprintf(s->fp, "# branch.head %s%c", branch_name, eol);
2150 /* Lookup stats on the upstream tracking branch, if set. */
2151 branch = branch_get(branch_name);
2153 ab_info = stat_tracking_info(branch, &nr_ahead, &nr_behind,
2154 &base, 0, s->ahead_behind_flags);
2156 base = shorten_unambiguous_ref(base, 0);
2157 fprintf(s->fp, "# branch.upstream %s%c", base, eol);
2162 if (nr_ahead || nr_behind)
2163 fprintf(s->fp, "# branch.ab +%d -%d%c",
2164 nr_ahead, nr_behind, eol);
2166 fprintf(s->fp, "# branch.ab +? -?%c",
2168 } else if (!ab_info) {
2170 fprintf(s->fp, "# branch.ab +0 -0%c", eol);
2177 * Convert various submodule status values into a
2178 * fixed-length string of characters in the buffer provided.
2180 static void wt_porcelain_v2_submodule_state(
2181 struct wt_status_change_data *d,
2184 if (S_ISGITLINK(d->mode_head) ||
2185 S_ISGITLINK(d->mode_index) ||
2186 S_ISGITLINK(d->mode_worktree)) {
2188 sub[1] = d->new_submodule_commits ? 'C' : '.';
2189 sub[2] = (d->dirty_submodule & DIRTY_SUBMODULE_MODIFIED) ? 'M' : '.';
2190 sub[3] = (d->dirty_submodule & DIRTY_SUBMODULE_UNTRACKED) ? 'U' : '.';
2201 * Fix-up changed entries before we print them.
2203 static void wt_porcelain_v2_fix_up_changed(struct string_list_item *it)
2205 struct wt_status_change_data *d = it->util;
2207 if (!d->index_status) {
2209 * This entry is unchanged in the index (relative to the head).
2210 * Therefore, the collect_updated_cb was never called for this
2211 * entry (during the head-vs-index scan) and so the head column
2212 * fields were never set.
2214 * We must have data for the index column (from the
2215 * index-vs-worktree scan (otherwise, this entry should not be
2216 * in the list of changes)).
2218 * Copy index column fields to the head column, so that our
2219 * output looks complete.
2221 assert(d->mode_head == 0);
2222 d->mode_head = d->mode_index;
2223 oidcpy(&d->oid_head, &d->oid_index);
2226 if (!d->worktree_status) {
2228 * This entry is unchanged in the worktree (relative to the index).
2229 * Therefore, the collect_changed_cb was never called for this entry
2230 * (during the index-vs-worktree scan) and so the worktree column
2231 * fields were never set.
2233 * We must have data for the index column (from the head-vs-index
2236 * Copy the index column fields to the worktree column so that
2237 * our output looks complete.
2239 * Note that we only have a mode field in the worktree column
2240 * because the scan code tries really hard to not have to compute it.
2242 assert(d->mode_worktree == 0);
2243 d->mode_worktree = d->mode_index;
2248 * Print porcelain v2 info for tracked entries with changes.
2250 static void wt_porcelain_v2_print_changed_entry(
2251 struct string_list_item *it,
2252 struct wt_status *s)
2254 struct wt_status_change_data *d = it->util;
2255 struct strbuf buf = STRBUF_INIT;
2256 struct strbuf buf_from = STRBUF_INIT;
2257 const char *path = NULL;
2258 const char *path_from = NULL;
2260 char submodule_token[5];
2261 char sep_char, eol_char;
2263 wt_porcelain_v2_fix_up_changed(it);
2264 wt_porcelain_v2_submodule_state(d, submodule_token);
2266 key[0] = d->index_status ? d->index_status : '.';
2267 key[1] = d->worktree_status ? d->worktree_status : '.';
2270 if (s->null_termination) {
2272 * In -z mode, we DO NOT C-quote pathnames. Current path is ALWAYS first.
2273 * A single NUL character separates them.
2278 path_from = d->rename_source;
2281 * Path(s) are C-quoted if necessary. Current path is ALWAYS first.
2282 * The source path is only present when necessary.
2283 * A single TAB separates them (because paths can contain spaces
2284 * which are not escaped and C-quoting does escape TAB characters).
2288 path = quote_path(it->string, s->prefix, &buf, 0);
2289 if (d->rename_source)
2290 path_from = quote_path(d->rename_source, s->prefix, &buf_from, 0);
2294 fprintf(s->fp, "2 %s %s %06o %06o %06o %s %s %c%d %s%c%s%c",
2295 key, submodule_token,
2296 d->mode_head, d->mode_index, d->mode_worktree,
2297 oid_to_hex(&d->oid_head), oid_to_hex(&d->oid_index),
2298 d->rename_status, d->rename_score,
2299 path, sep_char, path_from, eol_char);
2301 fprintf(s->fp, "1 %s %s %06o %06o %06o %s %s %s%c",
2302 key, submodule_token,
2303 d->mode_head, d->mode_index, d->mode_worktree,
2304 oid_to_hex(&d->oid_head), oid_to_hex(&d->oid_index),
2307 strbuf_release(&buf);
2308 strbuf_release(&buf_from);
2312 * Print porcelain v2 status info for unmerged entries.
2314 static void wt_porcelain_v2_print_unmerged_entry(
2315 struct string_list_item *it,
2316 struct wt_status *s)
2318 struct wt_status_change_data *d = it->util;
2319 struct index_state *istate = s->repo->index;
2320 const struct cache_entry *ce;
2321 struct strbuf buf_index = STRBUF_INIT;
2322 const char *path_index = NULL;
2323 int pos, stage, sum;
2326 struct object_id oid;
2329 char submodule_token[5];
2330 char unmerged_prefix = 'u';
2331 char eol_char = s->null_termination ? '\0' : '\n';
2333 wt_porcelain_v2_submodule_state(d, submodule_token);
2335 switch (d->stagemask) {
2336 case 1: key = "DD"; break; /* both deleted */
2337 case 2: key = "AU"; break; /* added by us */
2338 case 3: key = "UD"; break; /* deleted by them */
2339 case 4: key = "UA"; break; /* added by them */
2340 case 5: key = "DU"; break; /* deleted by us */
2341 case 6: key = "AA"; break; /* both added */
2342 case 7: key = "UU"; break; /* both modified */
2344 BUG("unhandled unmerged status %x", d->stagemask);
2348 * Disregard d.aux.porcelain_v2 data that we accumulated
2349 * for the head and index columns during the scans and
2350 * replace with the actual stage data.
2352 * Note that this is a last-one-wins for each the individual
2353 * stage [123] columns in the event of multiple cache entries
2356 memset(stages, 0, sizeof(stages));
2358 pos = index_name_pos(istate, it->string, strlen(it->string));
2361 while (pos < istate->cache_nr) {
2362 ce = istate->cache[pos++];
2363 stage = ce_stage(ce);
2364 if (strcmp(ce->name, it->string) || !stage)
2366 stages[stage - 1].mode = ce->ce_mode;
2367 oidcpy(&stages[stage - 1].oid, &ce->oid);
2368 sum |= (1 << (stage - 1));
2370 if (sum != d->stagemask)
2371 BUG("observed stagemask 0x%x != expected stagemask 0x%x", sum, d->stagemask);
2373 if (s->null_termination)
2374 path_index = it->string;
2376 path_index = quote_path(it->string, s->prefix, &buf_index, 0);
2378 fprintf(s->fp, "%c %s %s %06o %06o %06o %06o %s %s %s %s%c",
2379 unmerged_prefix, key, submodule_token,
2380 stages[0].mode, /* stage 1 */
2381 stages[1].mode, /* stage 2 */
2382 stages[2].mode, /* stage 3 */
2384 oid_to_hex(&stages[0].oid), /* stage 1 */
2385 oid_to_hex(&stages[1].oid), /* stage 2 */
2386 oid_to_hex(&stages[2].oid), /* stage 3 */
2390 strbuf_release(&buf_index);
2394 * Print porcelain V2 status info for untracked and ignored entries.
2396 static void wt_porcelain_v2_print_other(
2397 struct string_list_item *it,
2398 struct wt_status *s,
2401 struct strbuf buf = STRBUF_INIT;
2405 if (s->null_termination) {
2409 path = quote_path(it->string, s->prefix, &buf, 0);
2413 fprintf(s->fp, "%c %s%c", prefix, path, eol_char);
2415 strbuf_release(&buf);
2419 * Print porcelain V2 status.
2422 * [<v2_changed_items>]*
2423 * [<v2_unmerged_items>]*
2424 * [<v2_untracked_items>]*
2425 * [<v2_ignored_items>]*
2428 static void wt_porcelain_v2_print(struct wt_status *s)
2430 struct wt_status_change_data *d;
2431 struct string_list_item *it;
2435 wt_porcelain_v2_print_tracking(s);
2437 for (i = 0; i < s->change.nr; i++) {
2438 it = &(s->change.items[i]);
2441 wt_porcelain_v2_print_changed_entry(it, s);
2444 for (i = 0; i < s->change.nr; i++) {
2445 it = &(s->change.items[i]);
2448 wt_porcelain_v2_print_unmerged_entry(it, s);
2451 for (i = 0; i < s->untracked.nr; i++) {
2452 it = &(s->untracked.items[i]);
2453 wt_porcelain_v2_print_other(it, s, '?');
2456 for (i = 0; i < s->ignored.nr; i++) {
2457 it = &(s->ignored.items[i]);
2458 wt_porcelain_v2_print_other(it, s, '!');
2462 void wt_status_print(struct wt_status *s)
2464 trace2_data_intmax("status", s->repo, "count/changed", s->change.nr);
2465 trace2_data_intmax("status", s->repo, "count/untracked",
2467 trace2_data_intmax("status", s->repo, "count/ignored", s->ignored.nr);
2469 trace2_region_enter("status", "print", s->repo);
2471 switch (s->status_format) {
2472 case STATUS_FORMAT_SHORT:
2473 wt_shortstatus_print(s);
2475 case STATUS_FORMAT_PORCELAIN:
2476 wt_porcelain_print(s);
2478 case STATUS_FORMAT_PORCELAIN_V2:
2479 wt_porcelain_v2_print(s);
2481 case STATUS_FORMAT_UNSPECIFIED:
2482 BUG("finalize_deferred_config() should have been called");
2484 case STATUS_FORMAT_NONE:
2485 case STATUS_FORMAT_LONG:
2486 wt_longstatus_print(s);
2490 trace2_region_leave("status", "print", s->repo);
2494 * Returns 1 if there are unstaged changes, 0 otherwise.
2496 int has_unstaged_changes(struct repository *r, int ignore_submodules)
2498 struct rev_info rev_info;
2501 repo_init_revisions(r, &rev_info, NULL);
2502 if (ignore_submodules) {
2503 rev_info.diffopt.flags.ignore_submodules = 1;
2504 rev_info.diffopt.flags.override_submodule_config = 1;
2506 rev_info.diffopt.flags.quick = 1;
2507 diff_setup_done(&rev_info.diffopt);
2508 result = run_diff_files(&rev_info, 0);
2509 return diff_result_code(&rev_info.diffopt, result);
2513 * Returns 1 if there are uncommitted changes, 0 otherwise.
2515 int has_uncommitted_changes(struct repository *r,
2516 int ignore_submodules)
2518 struct rev_info rev_info;
2521 if (is_index_unborn(r->index))
2524 repo_init_revisions(r, &rev_info, NULL);
2525 if (ignore_submodules)
2526 rev_info.diffopt.flags.ignore_submodules = 1;
2527 rev_info.diffopt.flags.quick = 1;
2529 add_head_to_pending(&rev_info);
2530 if (!rev_info.pending.nr) {
2532 * We have no head (or it's corrupt); use the empty tree,
2533 * which will complain if the index is non-empty.
2535 struct tree *tree = lookup_tree(r, the_hash_algo->empty_tree);
2536 add_pending_object(&rev_info, &tree->object, "");
2539 diff_setup_done(&rev_info.diffopt);
2540 result = run_diff_index(&rev_info, 1);
2541 return diff_result_code(&rev_info.diffopt, result);
2545 * If the work tree has unstaged or uncommitted changes, dies with the
2546 * appropriate message.
2548 int require_clean_work_tree(struct repository *r,
2551 int ignore_submodules,
2554 struct lock_file lock_file = LOCK_INIT;
2557 fd = repo_hold_locked_index(r, &lock_file, 0);
2558 refresh_index(r->index, REFRESH_QUIET, NULL, NULL, NULL);
2560 repo_update_index_if_able(r, &lock_file);
2561 rollback_lock_file(&lock_file);
2563 if (has_unstaged_changes(r, ignore_submodules)) {
2564 /* TRANSLATORS: the action is e.g. "pull with rebase" */
2565 error(_("cannot %s: You have unstaged changes."), _(action));
2569 if (has_uncommitted_changes(r, ignore_submodules)) {
2571 error(_("additionally, your index contains uncommitted changes."));
2573 error(_("cannot %s: Your index contains uncommitted changes."),