10 #include "run-command.h"
11 #include "argv-array.h"
14 #include "submodule.h"
18 static char default_wt_status_colors[][COLOR_MAXLEN] = {
19 GIT_COLOR_NORMAL, /* WT_STATUS_HEADER */
20 GIT_COLOR_GREEN, /* WT_STATUS_UPDATED */
21 GIT_COLOR_RED, /* WT_STATUS_CHANGED */
22 GIT_COLOR_RED, /* WT_STATUS_UNTRACKED */
23 GIT_COLOR_RED, /* WT_STATUS_NOBRANCH */
24 GIT_COLOR_RED, /* WT_STATUS_UNMERGED */
25 GIT_COLOR_GREEN, /* WT_STATUS_LOCAL_BRANCH */
26 GIT_COLOR_RED, /* WT_STATUS_REMOTE_BRANCH */
27 GIT_COLOR_NIL, /* WT_STATUS_ONBRANCH */
30 static const char *color(int slot, struct wt_status *s)
33 if (want_color(s->use_color))
34 c = s->color_palette[slot];
35 if (slot == WT_STATUS_ONBRANCH && color_is_nil(c))
36 c = s->color_palette[WT_STATUS_HEADER];
40 static void status_vprintf(struct wt_status *s, int at_bol, const char *color,
41 const char *fmt, va_list ap, const char *trail)
43 struct strbuf sb = STRBUF_INIT;
44 struct strbuf linebuf = STRBUF_INIT;
45 const char *line, *eol;
47 strbuf_vaddf(&sb, fmt, ap);
49 strbuf_addch(&sb, comment_line_char);
51 strbuf_addch(&sb, ' ');
52 color_print_strbuf(s->fp, color, &sb);
54 fprintf(s->fp, "%s", trail);
58 for (line = sb.buf; *line; line = eol + 1) {
59 eol = strchr(line, '\n');
61 strbuf_reset(&linebuf);
63 strbuf_addch(&linebuf, comment_line_char);
64 if (*line != '\n' && *line != '\t')
65 strbuf_addch(&linebuf, ' ');
68 strbuf_add(&linebuf, line, eol - line);
70 strbuf_addstr(&linebuf, line);
71 color_print_strbuf(s->fp, color, &linebuf);
79 fprintf(s->fp, "%s", trail);
80 strbuf_release(&linebuf);
84 void status_printf_ln(struct wt_status *s, const char *color,
90 status_vprintf(s, 1, color, fmt, ap, "\n");
94 void status_printf(struct wt_status *s, const char *color,
100 status_vprintf(s, 1, color, fmt, ap, NULL);
104 static void status_printf_more(struct wt_status *s, const char *color,
105 const char *fmt, ...)
110 status_vprintf(s, 0, color, fmt, ap, NULL);
114 void wt_status_prepare(struct wt_status *s)
116 unsigned char sha1[20];
118 memset(s, 0, sizeof(*s));
119 memcpy(s->color_palette, default_wt_status_colors,
120 sizeof(default_wt_status_colors));
121 s->show_untracked_files = SHOW_NORMAL_UNTRACKED_FILES;
123 s->relative_paths = 1;
124 s->branch = resolve_refdup("HEAD", sha1, 0, NULL);
125 s->reference = "HEAD";
127 s->index_file = get_index_file();
128 s->change.strdup_strings = 1;
129 s->untracked.strdup_strings = 1;
130 s->ignored.strdup_strings = 1;
131 s->show_branch = -1; /* unspecified */
134 static void wt_status_print_unmerged_header(struct wt_status *s)
137 int del_mod_conflict = 0;
138 int both_deleted = 0;
140 const char *c = color(WT_STATUS_HEADER, s);
142 status_printf_ln(s, c, _("Unmerged paths:"));
144 for (i = 0; i < s->change.nr; i++) {
145 struct string_list_item *it = &(s->change.items[i]);
146 struct wt_status_change_data *d = it->util;
148 switch (d->stagemask) {
156 del_mod_conflict = 1;
164 if (!advice_status_hints)
166 if (s->whence != FROM_COMMIT)
168 else if (!s->is_initial)
169 status_printf_ln(s, c, _(" (use \"git reset %s <file>...\" to unstage)"), s->reference);
171 status_printf_ln(s, c, _(" (use \"git rm --cached <file>...\" to unstage)"));
174 if (!del_mod_conflict)
175 status_printf_ln(s, c, _(" (use \"git add <file>...\" to mark resolution)"));
177 status_printf_ln(s, c, _(" (use \"git add/rm <file>...\" as appropriate to mark resolution)"));
178 } else if (!del_mod_conflict && !not_deleted) {
179 status_printf_ln(s, c, _(" (use \"git rm <file>...\" to mark resolution)"));
181 status_printf_ln(s, c, _(" (use \"git add/rm <file>...\" as appropriate to mark resolution)"));
183 status_printf_ln(s, c, "");
186 static void wt_status_print_cached_header(struct wt_status *s)
188 const char *c = color(WT_STATUS_HEADER, s);
190 status_printf_ln(s, c, _("Changes to be committed:"));
191 if (!advice_status_hints)
193 if (s->whence != FROM_COMMIT)
194 ; /* NEEDSWORK: use "git reset --unresolve"??? */
195 else if (!s->is_initial)
196 status_printf_ln(s, c, _(" (use \"git reset %s <file>...\" to unstage)"), s->reference);
198 status_printf_ln(s, c, _(" (use \"git rm --cached <file>...\" to unstage)"));
199 status_printf_ln(s, c, "");
202 static void wt_status_print_dirty_header(struct wt_status *s,
204 int has_dirty_submodules)
206 const char *c = color(WT_STATUS_HEADER, s);
208 status_printf_ln(s, c, _("Changes not staged for commit:"));
209 if (!advice_status_hints)
212 status_printf_ln(s, c, _(" (use \"git add <file>...\" to update what will be committed)"));
214 status_printf_ln(s, c, _(" (use \"git add/rm <file>...\" to update what will be committed)"));
215 status_printf_ln(s, c, _(" (use \"git checkout -- <file>...\" to discard changes in working directory)"));
216 if (has_dirty_submodules)
217 status_printf_ln(s, c, _(" (commit or discard the untracked or modified content in submodules)"));
218 status_printf_ln(s, c, "");
221 static void wt_status_print_other_header(struct wt_status *s,
225 const char *c = color(WT_STATUS_HEADER, s);
226 status_printf_ln(s, c, "%s:", what);
227 if (!advice_status_hints)
229 status_printf_ln(s, c, _(" (use \"git %s <file>...\" to include in what will be committed)"), how);
230 status_printf_ln(s, c, "");
233 static void wt_status_print_trailer(struct wt_status *s)
235 status_printf_ln(s, color(WT_STATUS_HEADER, s), "");
238 #define quote_path quote_path_relative
240 static void wt_status_print_unmerged_data(struct wt_status *s,
241 struct string_list_item *it)
243 const char *c = color(WT_STATUS_UNMERGED, s);
244 struct wt_status_change_data *d = it->util;
245 struct strbuf onebuf = STRBUF_INIT;
246 const char *one, *how = _("bug");
248 one = quote_path(it->string, s->prefix, &onebuf);
249 status_printf(s, color(WT_STATUS_HEADER, s), "\t");
250 switch (d->stagemask) {
251 case 1: how = _("both deleted:"); break;
252 case 2: how = _("added by us:"); break;
253 case 3: how = _("deleted by them:"); break;
254 case 4: how = _("added by them:"); break;
255 case 5: how = _("deleted by us:"); break;
256 case 6: how = _("both added:"); break;
257 case 7: how = _("both modified:"); break;
259 status_printf_more(s, c, "%-20s%s\n", how, one);
260 strbuf_release(&onebuf);
263 static void wt_status_print_change_data(struct wt_status *s,
265 struct string_list_item *it)
267 struct wt_status_change_data *d = it->util;
268 const char *c = color(change_type, s);
272 const char *one, *two;
273 struct strbuf onebuf = STRBUF_INIT, twobuf = STRBUF_INIT;
274 struct strbuf extra = STRBUF_INIT;
276 one_name = two_name = it->string;
277 switch (change_type) {
278 case WT_STATUS_UPDATED:
279 status = d->index_status;
281 one_name = d->head_path;
283 case WT_STATUS_CHANGED:
284 if (d->new_submodule_commits || d->dirty_submodule) {
285 strbuf_addstr(&extra, " (");
286 if (d->new_submodule_commits)
287 strbuf_addf(&extra, _("new commits, "));
288 if (d->dirty_submodule & DIRTY_SUBMODULE_MODIFIED)
289 strbuf_addf(&extra, _("modified content, "));
290 if (d->dirty_submodule & DIRTY_SUBMODULE_UNTRACKED)
291 strbuf_addf(&extra, _("untracked content, "));
292 strbuf_setlen(&extra, extra.len - 2);
293 strbuf_addch(&extra, ')');
295 status = d->worktree_status;
298 die("BUG: unhandled change_type %d in wt_status_print_change_data",
302 one = quote_path(one_name, s->prefix, &onebuf);
303 two = quote_path(two_name, s->prefix, &twobuf);
305 status_printf(s, color(WT_STATUS_HEADER, s), "\t");
307 case DIFF_STATUS_ADDED:
308 status_printf_more(s, c, _("new file: %s"), one);
310 case DIFF_STATUS_COPIED:
311 status_printf_more(s, c, _("copied: %s -> %s"), one, two);
313 case DIFF_STATUS_DELETED:
314 status_printf_more(s, c, _("deleted: %s"), one);
316 case DIFF_STATUS_MODIFIED:
317 status_printf_more(s, c, _("modified: %s"), one);
319 case DIFF_STATUS_RENAMED:
320 status_printf_more(s, c, _("renamed: %s -> %s"), one, two);
322 case DIFF_STATUS_TYPE_CHANGED:
323 status_printf_more(s, c, _("typechange: %s"), one);
325 case DIFF_STATUS_UNKNOWN:
326 status_printf_more(s, c, _("unknown: %s"), one);
328 case DIFF_STATUS_UNMERGED:
329 status_printf_more(s, c, _("unmerged: %s"), one);
332 die(_("bug: unhandled diff status %c"), status);
335 status_printf_more(s, color(WT_STATUS_HEADER, s), "%s", extra.buf);
336 strbuf_release(&extra);
338 status_printf_more(s, GIT_COLOR_NORMAL, "\n");
339 strbuf_release(&onebuf);
340 strbuf_release(&twobuf);
343 static void wt_status_collect_changed_cb(struct diff_queue_struct *q,
344 struct diff_options *options,
347 struct wt_status *s = data;
352 s->workdir_dirty = 1;
353 for (i = 0; i < q->nr; i++) {
354 struct diff_filepair *p;
355 struct string_list_item *it;
356 struct wt_status_change_data *d;
359 it = string_list_insert(&s->change, p->one->path);
362 d = xcalloc(1, sizeof(*d));
365 if (!d->worktree_status)
366 d->worktree_status = p->status;
367 d->dirty_submodule = p->two->dirty_submodule;
368 if (S_ISGITLINK(p->two->mode))
369 d->new_submodule_commits = !!hashcmp(p->one->sha1, p->two->sha1);
373 static int unmerged_mask(const char *path)
376 const struct cache_entry *ce;
378 pos = cache_name_pos(path, strlen(path));
384 while (pos < active_nr) {
385 ce = active_cache[pos++];
386 if (strcmp(ce->name, path) || !ce_stage(ce))
388 mask |= (1 << (ce_stage(ce) - 1));
393 static void wt_status_collect_updated_cb(struct diff_queue_struct *q,
394 struct diff_options *options,
397 struct wt_status *s = data;
400 for (i = 0; i < q->nr; i++) {
401 struct diff_filepair *p;
402 struct string_list_item *it;
403 struct wt_status_change_data *d;
406 it = string_list_insert(&s->change, p->two->path);
409 d = xcalloc(1, sizeof(*d));
412 if (!d->index_status)
413 d->index_status = p->status;
415 case DIFF_STATUS_COPIED:
416 case DIFF_STATUS_RENAMED:
417 d->head_path = xstrdup(p->one->path);
419 case DIFF_STATUS_UNMERGED:
420 d->stagemask = unmerged_mask(p->two->path);
426 static void wt_status_collect_changes_worktree(struct wt_status *s)
430 init_revisions(&rev, NULL);
431 setup_revisions(0, NULL, &rev, NULL);
432 rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
433 DIFF_OPT_SET(&rev.diffopt, DIRTY_SUBMODULES);
434 if (!s->show_untracked_files)
435 DIFF_OPT_SET(&rev.diffopt, IGNORE_UNTRACKED_IN_SUBMODULES);
436 if (s->ignore_submodule_arg) {
437 DIFF_OPT_SET(&rev.diffopt, OVERRIDE_SUBMODULE_CONFIG);
438 handle_ignore_submodules_arg(&rev.diffopt, s->ignore_submodule_arg);
440 rev.diffopt.format_callback = wt_status_collect_changed_cb;
441 rev.diffopt.format_callback_data = s;
442 init_pathspec(&rev.prune_data, s->pathspec);
443 run_diff_files(&rev, 0);
446 static void wt_status_collect_changes_index(struct wt_status *s)
449 struct setup_revision_opt opt;
451 init_revisions(&rev, NULL);
452 memset(&opt, 0, sizeof(opt));
453 opt.def = s->is_initial ? EMPTY_TREE_SHA1_HEX : s->reference;
454 setup_revisions(0, NULL, &rev, &opt);
456 if (s->ignore_submodule_arg) {
457 DIFF_OPT_SET(&rev.diffopt, OVERRIDE_SUBMODULE_CONFIG);
458 handle_ignore_submodules_arg(&rev.diffopt, s->ignore_submodule_arg);
461 rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
462 rev.diffopt.format_callback = wt_status_collect_updated_cb;
463 rev.diffopt.format_callback_data = s;
464 rev.diffopt.detect_rename = 1;
465 rev.diffopt.rename_limit = 200;
466 rev.diffopt.break_opt = 0;
467 init_pathspec(&rev.prune_data, s->pathspec);
468 run_diff_index(&rev, 1);
471 static void wt_status_collect_changes_initial(struct wt_status *s)
473 struct pathspec pathspec;
476 init_pathspec(&pathspec, s->pathspec);
477 for (i = 0; i < active_nr; i++) {
478 struct string_list_item *it;
479 struct wt_status_change_data *d;
480 const struct cache_entry *ce = active_cache[i];
482 if (!ce_path_match(ce, &pathspec))
484 it = string_list_insert(&s->change, ce->name);
487 d = xcalloc(1, sizeof(*d));
491 d->index_status = DIFF_STATUS_UNMERGED;
492 d->stagemask |= (1 << (ce_stage(ce) - 1));
495 d->index_status = DIFF_STATUS_ADDED;
497 free_pathspec(&pathspec);
500 static void wt_status_collect_untracked(struct wt_status *s)
503 struct dir_struct dir;
504 struct timeval t_begin;
506 if (!s->show_untracked_files)
509 if (advice_status_u_option)
510 gettimeofday(&t_begin, NULL);
512 memset(&dir, 0, sizeof(dir));
513 if (s->show_untracked_files != SHOW_ALL_UNTRACKED_FILES)
515 DIR_SHOW_OTHER_DIRECTORIES | DIR_HIDE_EMPTY_DIRECTORIES;
516 if (s->show_ignored_files)
517 dir.flags |= DIR_SHOW_IGNORED_TOO;
518 setup_standard_excludes(&dir);
520 fill_directory(&dir, s->pathspec);
522 for (i = 0; i < dir.nr; i++) {
523 struct dir_entry *ent = dir.entries[i];
524 if (cache_name_is_other(ent->name, ent->len) &&
525 match_pathspec(s->pathspec, ent->name, ent->len, 0, NULL))
526 string_list_insert(&s->untracked, ent->name);
530 for (i = 0; i < dir.ignored_nr; i++) {
531 struct dir_entry *ent = dir.ignored[i];
532 if (cache_name_is_other(ent->name, ent->len) &&
533 match_pathspec(s->pathspec, ent->name, ent->len, 0, NULL))
534 string_list_insert(&s->ignored, ent->name);
540 clear_directory(&dir);
542 if (advice_status_u_option) {
543 struct timeval t_end;
544 gettimeofday(&t_end, NULL);
546 (uint64_t)t_end.tv_sec * 1000 + t_end.tv_usec / 1000 -
547 ((uint64_t)t_begin.tv_sec * 1000 + t_begin.tv_usec / 1000);
551 void wt_status_collect(struct wt_status *s)
553 wt_status_collect_changes_worktree(s);
556 wt_status_collect_changes_initial(s);
558 wt_status_collect_changes_index(s);
559 wt_status_collect_untracked(s);
562 static void wt_status_print_unmerged(struct wt_status *s)
564 int shown_header = 0;
567 for (i = 0; i < s->change.nr; i++) {
568 struct wt_status_change_data *d;
569 struct string_list_item *it;
570 it = &(s->change.items[i]);
575 wt_status_print_unmerged_header(s);
578 wt_status_print_unmerged_data(s, it);
581 wt_status_print_trailer(s);
585 static void wt_status_print_updated(struct wt_status *s)
587 int shown_header = 0;
590 for (i = 0; i < s->change.nr; i++) {
591 struct wt_status_change_data *d;
592 struct string_list_item *it;
593 it = &(s->change.items[i]);
595 if (!d->index_status ||
596 d->index_status == DIFF_STATUS_UNMERGED)
599 wt_status_print_cached_header(s);
603 wt_status_print_change_data(s, WT_STATUS_UPDATED, it);
606 wt_status_print_trailer(s);
612 * 1 : some change but no delete
614 static int wt_status_check_worktree_changes(struct wt_status *s,
615 int *dirty_submodules)
620 *dirty_submodules = 0;
622 for (i = 0; i < s->change.nr; i++) {
623 struct wt_status_change_data *d;
624 d = s->change.items[i].util;
625 if (!d->worktree_status ||
626 d->worktree_status == DIFF_STATUS_UNMERGED)
630 if (d->dirty_submodule)
631 *dirty_submodules = 1;
632 if (d->worktree_status == DIFF_STATUS_DELETED)
638 static void wt_status_print_changed(struct wt_status *s)
640 int i, dirty_submodules;
641 int worktree_changes = wt_status_check_worktree_changes(s, &dirty_submodules);
643 if (!worktree_changes)
646 wt_status_print_dirty_header(s, worktree_changes < 0, dirty_submodules);
648 for (i = 0; i < s->change.nr; i++) {
649 struct wt_status_change_data *d;
650 struct string_list_item *it;
651 it = &(s->change.items[i]);
653 if (!d->worktree_status ||
654 d->worktree_status == DIFF_STATUS_UNMERGED)
656 wt_status_print_change_data(s, WT_STATUS_CHANGED, it);
658 wt_status_print_trailer(s);
661 static void wt_status_print_submodule_summary(struct wt_status *s, int uncommitted)
663 struct child_process sm_summary;
664 char summary_limit[64];
665 char index[PATH_MAX];
666 const char *env[] = { NULL, NULL };
667 struct argv_array argv = ARGV_ARRAY_INIT;
669 sprintf(summary_limit, "%d", s->submodule_summary);
670 snprintf(index, sizeof(index), "GIT_INDEX_FILE=%s", s->index_file);
673 argv_array_push(&argv, "submodule");
674 argv_array_push(&argv, "summary");
675 argv_array_push(&argv, uncommitted ? "--files" : "--cached");
676 argv_array_push(&argv, "--for-status");
677 argv_array_push(&argv, "--summary-limit");
678 argv_array_push(&argv, summary_limit);
680 argv_array_push(&argv, s->amend ? "HEAD^" : "HEAD");
682 memset(&sm_summary, 0, sizeof(sm_summary));
683 sm_summary.argv = argv.argv;
684 sm_summary.env = env;
685 sm_summary.git_cmd = 1;
686 sm_summary.no_stdin = 1;
688 sm_summary.out = dup(fileno(s->fp)); /* run_command closes it */
689 run_command(&sm_summary);
690 argv_array_clear(&argv);
693 static void wt_status_print_other(struct wt_status *s,
694 struct string_list *l,
699 struct strbuf buf = STRBUF_INIT;
700 static struct string_list output = STRING_LIST_INIT_DUP;
701 struct column_options copts;
706 wt_status_print_other_header(s, what, how);
708 for (i = 0; i < l->nr; i++) {
709 struct string_list_item *it;
712 path = quote_path(it->string, s->prefix, &buf);
713 if (column_active(s->colopts)) {
714 string_list_append(&output, path);
717 status_printf(s, color(WT_STATUS_HEADER, s), "\t");
718 status_printf_more(s, color(WT_STATUS_UNTRACKED, s),
722 strbuf_release(&buf);
723 if (!column_active(s->colopts))
726 strbuf_addf(&buf, "%s#\t%s",
727 color(WT_STATUS_HEADER, s),
728 color(WT_STATUS_UNTRACKED, s));
729 memset(&copts, 0, sizeof(copts));
731 copts.indent = buf.buf;
732 if (want_color(s->use_color))
733 copts.nl = GIT_COLOR_RESET "\n";
734 print_columns(&output, s->colopts, &copts);
735 string_list_clear(&output, 0);
736 strbuf_release(&buf);
739 static void wt_status_print_verbose(struct wt_status *s)
742 struct setup_revision_opt opt;
744 init_revisions(&rev, NULL);
745 DIFF_OPT_SET(&rev.diffopt, ALLOW_TEXTCONV);
747 memset(&opt, 0, sizeof(opt));
748 opt.def = s->is_initial ? EMPTY_TREE_SHA1_HEX : s->reference;
749 setup_revisions(0, NULL, &rev, &opt);
751 rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
752 rev.diffopt.detect_rename = 1;
753 rev.diffopt.file = s->fp;
754 rev.diffopt.close_file = 0;
756 * If we're not going to stdout, then we definitely don't
757 * want color, since we are going to the commit message
758 * file (and even the "auto" setting won't work, since it
759 * will have checked isatty on stdout).
762 rev.diffopt.use_color = 0;
763 run_diff_index(&rev, 1);
766 static void wt_status_print_tracking(struct wt_status *s)
768 struct strbuf sb = STRBUF_INIT;
770 struct branch *branch;
772 assert(s->branch && !s->is_initial);
773 if (prefixcmp(s->branch, "refs/heads/"))
775 branch = branch_get(s->branch + 11);
776 if (!format_tracking_info(branch, &sb))
779 for (cp = sb.buf; (ep = strchr(cp, '\n')) != NULL; cp = ep + 1)
780 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s),
781 "%c %.*s", comment_line_char,
783 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s), "%c",
787 static int has_unmerged(struct wt_status *s)
791 for (i = 0; i < s->change.nr; i++) {
792 struct wt_status_change_data *d;
793 d = s->change.items[i].util;
800 static void show_merge_in_progress(struct wt_status *s,
801 struct wt_status_state *state,
804 if (has_unmerged(s)) {
805 status_printf_ln(s, color, _("You have unmerged paths."));
806 if (advice_status_hints)
807 status_printf_ln(s, color,
808 _(" (fix conflicts and run \"git commit\")"));
810 status_printf_ln(s, color,
811 _("All conflicts fixed but you are still merging."));
812 if (advice_status_hints)
813 status_printf_ln(s, color,
814 _(" (use \"git commit\" to conclude merge)"));
816 wt_status_print_trailer(s);
819 static void show_am_in_progress(struct wt_status *s,
820 struct wt_status_state *state,
823 status_printf_ln(s, color,
824 _("You are in the middle of an am session."));
825 if (state->am_empty_patch)
826 status_printf_ln(s, color,
827 _("The current patch is empty."));
828 if (advice_status_hints) {
829 if (!state->am_empty_patch)
830 status_printf_ln(s, color,
831 _(" (fix conflicts and then run \"git am --continue\")"));
832 status_printf_ln(s, color,
833 _(" (use \"git am --skip\" to skip this patch)"));
834 status_printf_ln(s, color,
835 _(" (use \"git am --abort\" to restore the original branch)"));
837 wt_status_print_trailer(s);
840 static char *read_line_from_git_path(const char *filename)
842 struct strbuf buf = STRBUF_INIT;
843 FILE *fp = fopen(git_path("%s", filename), "r");
845 strbuf_release(&buf);
848 strbuf_getline(&buf, fp, '\n');
850 return strbuf_detach(&buf, NULL);
852 strbuf_release(&buf);
857 static int split_commit_in_progress(struct wt_status *s)
859 int split_in_progress = 0;
860 char *head = read_line_from_git_path("HEAD");
861 char *orig_head = read_line_from_git_path("ORIG_HEAD");
862 char *rebase_amend = read_line_from_git_path("rebase-merge/amend");
863 char *rebase_orig_head = read_line_from_git_path("rebase-merge/orig-head");
865 if (!head || !orig_head || !rebase_amend || !rebase_orig_head ||
866 !s->branch || strcmp(s->branch, "HEAD"))
867 return split_in_progress;
869 if (!strcmp(rebase_amend, rebase_orig_head)) {
870 if (strcmp(head, rebase_amend))
871 split_in_progress = 1;
872 } else if (strcmp(orig_head, rebase_orig_head)) {
873 split_in_progress = 1;
876 if (!s->amend && !s->nowarn && !s->workdir_dirty)
877 split_in_progress = 0;
882 free(rebase_orig_head);
883 return split_in_progress;
886 static void show_rebase_in_progress(struct wt_status *s,
887 struct wt_status_state *state,
892 if (has_unmerged(s)) {
894 status_printf_ln(s, color,
895 _("You are currently rebasing branch '%s' on '%s'."),
899 status_printf_ln(s, color,
900 _("You are currently rebasing."));
901 if (advice_status_hints) {
902 status_printf_ln(s, color,
903 _(" (fix conflicts and then run \"git rebase --continue\")"));
904 status_printf_ln(s, color,
905 _(" (use \"git rebase --skip\" to skip this patch)"));
906 status_printf_ln(s, color,
907 _(" (use \"git rebase --abort\" to check out the original branch)"));
909 } else if (state->rebase_in_progress || !stat(git_path("MERGE_MSG"), &st)) {
911 status_printf_ln(s, color,
912 _("You are currently rebasing branch '%s' on '%s'."),
916 status_printf_ln(s, color,
917 _("You are currently rebasing."));
918 if (advice_status_hints)
919 status_printf_ln(s, color,
920 _(" (all conflicts fixed: run \"git rebase --continue\")"));
921 } else if (split_commit_in_progress(s)) {
923 status_printf_ln(s, color,
924 _("You are currently splitting a commit while rebasing branch '%s' on '%s'."),
928 status_printf_ln(s, color,
929 _("You are currently splitting a commit during a rebase."));
930 if (advice_status_hints)
931 status_printf_ln(s, color,
932 _(" (Once your working directory is clean, run \"git rebase --continue\")"));
935 status_printf_ln(s, color,
936 _("You are currently editing a commit while rebasing branch '%s' on '%s'."),
940 status_printf_ln(s, color,
941 _("You are currently editing a commit during a rebase."));
942 if (advice_status_hints && !s->amend) {
943 status_printf_ln(s, color,
944 _(" (use \"git commit --amend\" to amend the current commit)"));
945 status_printf_ln(s, color,
946 _(" (use \"git rebase --continue\" once you are satisfied with your changes)"));
949 wt_status_print_trailer(s);
952 static void show_cherry_pick_in_progress(struct wt_status *s,
953 struct wt_status_state *state,
956 status_printf_ln(s, color, _("You are currently cherry-picking."));
957 if (advice_status_hints) {
959 status_printf_ln(s, color,
960 _(" (fix conflicts and run \"git cherry-pick --continue\")"));
962 status_printf_ln(s, color,
963 _(" (all conflicts fixed: run \"git cherry-pick --continue\")"));
964 status_printf_ln(s, color,
965 _(" (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"));
967 wt_status_print_trailer(s);
970 static void show_revert_in_progress(struct wt_status *s,
971 struct wt_status_state *state,
974 status_printf_ln(s, color, _("You are currently reverting commit %s."),
975 find_unique_abbrev(state->revert_head_sha1, DEFAULT_ABBREV));
976 if (advice_status_hints) {
978 status_printf_ln(s, color,
979 _(" (fix conflicts and run \"git revert --continue\")"));
981 status_printf_ln(s, color,
982 _(" (all conflicts fixed: run \"git revert --continue\")"));
983 status_printf_ln(s, color,
984 _(" (use \"git revert --abort\" to cancel the revert operation)"));
986 wt_status_print_trailer(s);
989 static void show_bisect_in_progress(struct wt_status *s,
990 struct wt_status_state *state,
994 status_printf_ln(s, color,
995 _("You are currently bisecting, started from branch '%s'."),
998 status_printf_ln(s, color,
999 _("You are currently bisecting."));
1000 if (advice_status_hints)
1001 status_printf_ln(s, color,
1002 _(" (use \"git bisect reset\" to get back to the original branch)"));
1003 wt_status_print_trailer(s);
1007 * Extract branch information from rebase/bisect
1009 static char *read_and_strip_branch(const char *path)
1011 struct strbuf sb = STRBUF_INIT;
1012 unsigned char sha1[20];
1014 if (strbuf_read_file(&sb, git_path("%s", path), 0) <= 0)
1017 while (&sb.len && sb.buf[sb.len - 1] == '\n')
1018 strbuf_setlen(&sb, sb.len - 1);
1021 if (!prefixcmp(sb.buf, "refs/heads/"))
1022 strbuf_remove(&sb,0, strlen("refs/heads/"));
1023 else if (!prefixcmp(sb.buf, "refs/"))
1025 else if (!get_sha1_hex(sb.buf, sha1)) {
1027 abbrev = find_unique_abbrev(sha1, DEFAULT_ABBREV);
1029 strbuf_addstr(&sb, abbrev);
1030 } else if (!strcmp(sb.buf, "detached HEAD")) /* rebase */
1034 return strbuf_detach(&sb, NULL);
1037 strbuf_release(&sb);
1041 struct grab_1st_switch_cbdata {
1043 unsigned char nsha1[20];
1046 static int grab_1st_switch(unsigned char *osha1, unsigned char *nsha1,
1047 const char *email, unsigned long timestamp, int tz,
1048 const char *message, void *cb_data)
1050 struct grab_1st_switch_cbdata *cb = cb_data;
1051 const char *target = NULL, *end;
1053 if (prefixcmp(message, "checkout: moving from "))
1055 message += strlen("checkout: moving from ");
1056 target = strstr(message, " to ");
1059 target += strlen(" to ");
1060 strbuf_reset(&cb->buf);
1061 hashcpy(cb->nsha1, nsha1);
1062 for (end = target; *end && *end != '\n'; end++)
1064 strbuf_add(&cb->buf, target, end - target);
1068 static void wt_status_get_detached_from(struct wt_status_state *state)
1070 struct grab_1st_switch_cbdata cb;
1071 struct commit *commit;
1072 unsigned char sha1[20];
1075 strbuf_init(&cb.buf, 0);
1076 if (for_each_reflog_ent_reverse("HEAD", grab_1st_switch, &cb) <= 0) {
1077 strbuf_release(&cb.buf);
1081 if (dwim_ref(cb.buf.buf, cb.buf.len, sha1, &ref) == 1 &&
1082 /* sha1 is a commit? match without further lookup */
1083 (!hashcmp(cb.nsha1, sha1) ||
1084 /* perhaps sha1 is a tag, try to dereference to a commit */
1085 ((commit = lookup_commit_reference_gently(sha1, 1)) != NULL &&
1086 !hashcmp(cb.nsha1, commit->object.sha1)))) {
1088 if (!prefixcmp(ref, "refs/tags/"))
1089 ofs = strlen("refs/tags/");
1090 else if (!prefixcmp(ref, "refs/remotes/"))
1091 ofs = strlen("refs/remotes/");
1094 state->detached_from = xstrdup(ref + ofs);
1096 state->detached_from =
1097 xstrdup(find_unique_abbrev(cb.nsha1, DEFAULT_ABBREV));
1098 hashcpy(state->detached_sha1, cb.nsha1);
1101 strbuf_release(&cb.buf);
1104 void wt_status_get_state(struct wt_status_state *state,
1105 int get_detached_from)
1108 unsigned char sha1[20];
1110 if (!stat(git_path("MERGE_HEAD"), &st)) {
1111 state->merge_in_progress = 1;
1112 } else if (!stat(git_path("rebase-apply"), &st)) {
1113 if (!stat(git_path("rebase-apply/applying"), &st)) {
1114 state->am_in_progress = 1;
1115 if (!stat(git_path("rebase-apply/patch"), &st) && !st.st_size)
1116 state->am_empty_patch = 1;
1118 state->rebase_in_progress = 1;
1119 state->branch = read_and_strip_branch("rebase-apply/head-name");
1120 state->onto = read_and_strip_branch("rebase-apply/onto");
1122 } else if (!stat(git_path("rebase-merge"), &st)) {
1123 if (!stat(git_path("rebase-merge/interactive"), &st))
1124 state->rebase_interactive_in_progress = 1;
1126 state->rebase_in_progress = 1;
1127 state->branch = read_and_strip_branch("rebase-merge/head-name");
1128 state->onto = read_and_strip_branch("rebase-merge/onto");
1129 } else if (!stat(git_path("CHERRY_PICK_HEAD"), &st)) {
1130 state->cherry_pick_in_progress = 1;
1132 if (!stat(git_path("BISECT_LOG"), &st)) {
1133 state->bisect_in_progress = 1;
1134 state->branch = read_and_strip_branch("BISECT_START");
1136 if (!stat(git_path("REVERT_HEAD"), &st) &&
1137 !get_sha1("REVERT_HEAD", sha1)) {
1138 state->revert_in_progress = 1;
1139 hashcpy(state->revert_head_sha1, sha1);
1142 if (get_detached_from)
1143 wt_status_get_detached_from(state);
1146 static void wt_status_print_state(struct wt_status *s,
1147 struct wt_status_state *state)
1149 const char *state_color = color(WT_STATUS_HEADER, s);
1150 if (state->merge_in_progress)
1151 show_merge_in_progress(s, state, state_color);
1152 else if (state->am_in_progress)
1153 show_am_in_progress(s, state, state_color);
1154 else if (state->rebase_in_progress || state->rebase_interactive_in_progress)
1155 show_rebase_in_progress(s, state, state_color);
1156 else if (state->cherry_pick_in_progress)
1157 show_cherry_pick_in_progress(s, state, state_color);
1158 else if (state->revert_in_progress)
1159 show_revert_in_progress(s, state, state_color);
1160 if (state->bisect_in_progress)
1161 show_bisect_in_progress(s, state, state_color);
1164 void wt_status_print(struct wt_status *s)
1166 const char *branch_color = color(WT_STATUS_ONBRANCH, s);
1167 const char *branch_status_color = color(WT_STATUS_HEADER, s);
1168 struct wt_status_state state;
1170 memset(&state, 0, sizeof(state));
1171 wt_status_get_state(&state,
1172 s->branch && !strcmp(s->branch, "HEAD"));
1175 const char *on_what = _("On branch ");
1176 const char *branch_name = s->branch;
1177 if (!prefixcmp(branch_name, "refs/heads/"))
1179 else if (!strcmp(branch_name, "HEAD")) {
1180 branch_status_color = color(WT_STATUS_NOBRANCH, s);
1181 if (state.rebase_in_progress || state.rebase_interactive_in_progress) {
1182 on_what = _("rebase in progress; onto ");
1183 branch_name = state.onto;
1184 } else if (state.detached_from) {
1185 unsigned char sha1[20];
1186 branch_name = state.detached_from;
1187 if (!get_sha1("HEAD", sha1) &&
1188 !hashcmp(sha1, state.detached_sha1))
1189 on_what = _("HEAD detached at ");
1191 on_what = _("HEAD detached from ");
1194 on_what = _("Not currently on any branch.");
1197 status_printf(s, color(WT_STATUS_HEADER, s), "");
1198 status_printf_more(s, branch_status_color, "%s", on_what);
1199 status_printf_more(s, branch_color, "%s\n", branch_name);
1201 wt_status_print_tracking(s);
1204 wt_status_print_state(s, &state);
1207 free(state.detached_from);
1209 if (s->is_initial) {
1210 status_printf_ln(s, color(WT_STATUS_HEADER, s), "");
1211 status_printf_ln(s, color(WT_STATUS_HEADER, s), _("Initial commit"));
1212 status_printf_ln(s, color(WT_STATUS_HEADER, s), "");
1215 wt_status_print_updated(s);
1216 wt_status_print_unmerged(s);
1217 wt_status_print_changed(s);
1218 if (s->submodule_summary &&
1219 (!s->ignore_submodule_arg ||
1220 strcmp(s->ignore_submodule_arg, "all"))) {
1221 wt_status_print_submodule_summary(s, 0); /* staged */
1222 wt_status_print_submodule_summary(s, 1); /* unstaged */
1224 if (s->show_untracked_files) {
1225 wt_status_print_other(s, &s->untracked, _("Untracked files"), "add");
1226 if (s->show_ignored_files)
1227 wt_status_print_other(s, &s->ignored, _("Ignored files"), "add -f");
1228 if (advice_status_u_option && 2000 < s->untracked_in_ms) {
1229 status_printf_ln(s, GIT_COLOR_NORMAL, "");
1230 status_printf_ln(s, GIT_COLOR_NORMAL,
1231 _("It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1232 "may speed it up, but you have to be careful not to forget to add\n"
1233 "new files yourself (see 'git help status')."),
1234 s->untracked_in_ms / 1000.0);
1236 } else if (s->commitable)
1237 status_printf_ln(s, GIT_COLOR_NORMAL, _("Untracked files not listed%s"),
1239 ? _(" (use -u option to show untracked files)") : "");
1242 wt_status_print_verbose(s);
1243 if (!s->commitable) {
1245 status_printf_ln(s, GIT_COLOR_NORMAL, _("No changes"));
1248 else if (s->workdir_dirty) {
1249 if (advice_status_hints)
1250 printf(_("no changes added to commit "
1251 "(use \"git add\" and/or \"git commit -a\")\n"));
1253 printf(_("no changes added to commit\n"));
1254 } else if (s->untracked.nr) {
1255 if (advice_status_hints)
1256 printf(_("nothing added to commit but untracked files "
1257 "present (use \"git add\" to track)\n"));
1259 printf(_("nothing added to commit but untracked files present\n"));
1260 } else if (s->is_initial) {
1261 if (advice_status_hints)
1262 printf(_("nothing to commit (create/copy files "
1263 "and use \"git add\" to track)\n"));
1265 printf(_("nothing to commit\n"));
1266 } else if (!s->show_untracked_files) {
1267 if (advice_status_hints)
1268 printf(_("nothing to commit (use -u to show untracked files)\n"));
1270 printf(_("nothing to commit\n"));
1272 printf(_("nothing to commit, working directory clean\n"));
1276 static void wt_shortstatus_unmerged(struct string_list_item *it,
1277 struct wt_status *s)
1279 struct wt_status_change_data *d = it->util;
1280 const char *how = "??";
1282 switch (d->stagemask) {
1283 case 1: how = "DD"; break; /* both deleted */
1284 case 2: how = "AU"; break; /* added by us */
1285 case 3: how = "UD"; break; /* deleted by them */
1286 case 4: how = "UA"; break; /* added by them */
1287 case 5: how = "DU"; break; /* deleted by us */
1288 case 6: how = "AA"; break; /* both added */
1289 case 7: how = "UU"; break; /* both modified */
1291 color_fprintf(s->fp, color(WT_STATUS_UNMERGED, s), "%s", how);
1292 if (s->null_termination) {
1293 fprintf(stdout, " %s%c", it->string, 0);
1295 struct strbuf onebuf = STRBUF_INIT;
1297 one = quote_path(it->string, s->prefix, &onebuf);
1298 printf(" %s\n", one);
1299 strbuf_release(&onebuf);
1303 static void wt_shortstatus_status(struct string_list_item *it,
1304 struct wt_status *s)
1306 struct wt_status_change_data *d = it->util;
1308 if (d->index_status)
1309 color_fprintf(s->fp, color(WT_STATUS_UPDATED, s), "%c", d->index_status);
1312 if (d->worktree_status)
1313 color_fprintf(s->fp, color(WT_STATUS_CHANGED, s), "%c", d->worktree_status);
1317 if (s->null_termination) {
1318 fprintf(stdout, "%s%c", it->string, 0);
1320 fprintf(stdout, "%s%c", d->head_path, 0);
1322 struct strbuf onebuf = STRBUF_INIT;
1325 one = quote_path(d->head_path, s->prefix, &onebuf);
1326 if (*one != '"' && strchr(one, ' ') != NULL) {
1328 strbuf_addch(&onebuf, '"');
1331 printf("%s -> ", one);
1332 strbuf_release(&onebuf);
1334 one = quote_path(it->string, s->prefix, &onebuf);
1335 if (*one != '"' && strchr(one, ' ') != NULL) {
1337 strbuf_addch(&onebuf, '"');
1340 printf("%s\n", one);
1341 strbuf_release(&onebuf);
1345 static void wt_shortstatus_other(struct string_list_item *it,
1346 struct wt_status *s, const char *sign)
1348 if (s->null_termination) {
1349 fprintf(stdout, "%s %s%c", sign, it->string, 0);
1351 struct strbuf onebuf = STRBUF_INIT;
1353 one = quote_path(it->string, s->prefix, &onebuf);
1354 color_fprintf(s->fp, color(WT_STATUS_UNTRACKED, s), "%s", sign);
1355 printf(" %s\n", one);
1356 strbuf_release(&onebuf);
1360 static void wt_shortstatus_print_tracking(struct wt_status *s)
1362 struct branch *branch;
1363 const char *header_color = color(WT_STATUS_HEADER, s);
1364 const char *branch_color_local = color(WT_STATUS_LOCAL_BRANCH, s);
1365 const char *branch_color_remote = color(WT_STATUS_REMOTE_BRANCH, s);
1368 const char *branch_name;
1369 int num_ours, num_theirs;
1371 color_fprintf(s->fp, color(WT_STATUS_HEADER, s), "## ");
1375 branch_name = s->branch;
1377 if (!prefixcmp(branch_name, "refs/heads/"))
1379 else if (!strcmp(branch_name, "HEAD")) {
1380 branch_name = _("HEAD (no branch)");
1381 branch_color_local = color(WT_STATUS_NOBRANCH, s);
1384 branch = branch_get(s->branch + 11);
1386 color_fprintf(s->fp, header_color, _("Initial commit on "));
1387 if (!stat_tracking_info(branch, &num_ours, &num_theirs)) {
1388 color_fprintf(s->fp, branch_color_local, "%s", branch_name);
1389 fputc(s->null_termination ? '\0' : '\n', s->fp);
1393 base = branch->merge[0]->dst;
1394 base = shorten_unambiguous_ref(base, 0);
1395 color_fprintf(s->fp, branch_color_local, "%s", branch_name);
1396 color_fprintf(s->fp, header_color, "...");
1397 color_fprintf(s->fp, branch_color_remote, "%s", base);
1399 color_fprintf(s->fp, header_color, " [");
1401 color_fprintf(s->fp, header_color, _("behind "));
1402 color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
1403 } else if (!num_theirs) {
1404 color_fprintf(s->fp, header_color, _("ahead "));
1405 color_fprintf(s->fp, branch_color_local, "%d", num_ours);
1407 color_fprintf(s->fp, header_color, _("ahead "));
1408 color_fprintf(s->fp, branch_color_local, "%d", num_ours);
1409 color_fprintf(s->fp, header_color, _(", behind "));
1410 color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
1413 color_fprintf(s->fp, header_color, "]");
1414 fputc(s->null_termination ? '\0' : '\n', s->fp);
1417 void wt_shortstatus_print(struct wt_status *s)
1422 wt_shortstatus_print_tracking(s);
1424 for (i = 0; i < s->change.nr; i++) {
1425 struct wt_status_change_data *d;
1426 struct string_list_item *it;
1428 it = &(s->change.items[i]);
1431 wt_shortstatus_unmerged(it, s);
1433 wt_shortstatus_status(it, s);
1435 for (i = 0; i < s->untracked.nr; i++) {
1436 struct string_list_item *it;
1438 it = &(s->untracked.items[i]);
1439 wt_shortstatus_other(it, s, "??");
1441 for (i = 0; i < s->ignored.nr; i++) {
1442 struct string_list_item *it;
1444 it = &(s->ignored.items[i]);
1445 wt_shortstatus_other(it, s, "!!");
1449 void wt_porcelain_print(struct wt_status *s)
1452 s->relative_paths = 0;
1454 wt_shortstatus_print(s);