10 #include "run-command.h"
13 #include "submodule.h"
17 static char default_wt_status_colors
[][COLOR_MAXLEN
] = {
18 GIT_COLOR_NORMAL
, /* WT_STATUS_HEADER */
19 GIT_COLOR_GREEN
, /* WT_STATUS_UPDATED */
20 GIT_COLOR_RED
, /* WT_STATUS_CHANGED */
21 GIT_COLOR_RED
, /* WT_STATUS_UNTRACKED */
22 GIT_COLOR_RED
, /* WT_STATUS_NOBRANCH */
23 GIT_COLOR_RED
, /* WT_STATUS_UNMERGED */
24 GIT_COLOR_GREEN
, /* WT_STATUS_LOCAL_BRANCH */
25 GIT_COLOR_RED
, /* WT_STATUS_REMOTE_BRANCH */
26 GIT_COLOR_NIL
, /* WT_STATUS_ONBRANCH */
29 static const char *color(int slot
, struct wt_status
*s
)
32 if (want_color(s
->use_color
))
33 c
= s
->color_palette
[slot
];
34 if (slot
== WT_STATUS_ONBRANCH
&& color_is_nil(c
))
35 c
= s
->color_palette
[WT_STATUS_HEADER
];
39 static void status_vprintf(struct wt_status
*s
, int at_bol
, const char *color
,
40 const char *fmt
, va_list ap
, const char *trail
)
42 struct strbuf sb
= STRBUF_INIT
;
43 struct strbuf linebuf
= STRBUF_INIT
;
44 const char *line
, *eol
;
46 strbuf_vaddf(&sb
, fmt
, ap
);
48 strbuf_addch(&sb
, '#');
50 strbuf_addch(&sb
, ' ');
51 color_print_strbuf(s
->fp
, color
, &sb
);
53 fprintf(s
->fp
, "%s", trail
);
57 for (line
= sb
.buf
; *line
; line
= eol
+ 1) {
58 eol
= strchr(line
, '\n');
60 strbuf_reset(&linebuf
);
62 strbuf_addch(&linebuf
, '#');
63 if (*line
!= '\n' && *line
!= '\t')
64 strbuf_addch(&linebuf
, ' ');
67 strbuf_add(&linebuf
, line
, eol
- line
);
69 strbuf_addstr(&linebuf
, line
);
70 color_print_strbuf(s
->fp
, color
, &linebuf
);
78 fprintf(s
->fp
, "%s", trail
);
79 strbuf_release(&linebuf
);
83 void status_printf_ln(struct wt_status
*s
, const char *color
,
89 status_vprintf(s
, 1, color
, fmt
, ap
, "\n");
93 void status_printf(struct wt_status
*s
, const char *color
,
99 status_vprintf(s
, 1, color
, fmt
, ap
, NULL
);
103 static void status_printf_more(struct wt_status
*s
, const char *color
,
104 const char *fmt
, ...)
109 status_vprintf(s
, 0, color
, fmt
, ap
, NULL
);
113 void wt_status_prepare(struct wt_status
*s
)
115 unsigned char sha1
[20];
117 memset(s
, 0, sizeof(*s
));
118 memcpy(s
->color_palette
, default_wt_status_colors
,
119 sizeof(default_wt_status_colors
));
120 s
->show_untracked_files
= SHOW_NORMAL_UNTRACKED_FILES
;
122 s
->relative_paths
= 1;
123 s
->branch
= resolve_refdup("HEAD", sha1
, 0, NULL
);
124 s
->reference
= "HEAD";
126 s
->index_file
= get_index_file();
127 s
->change
.strdup_strings
= 1;
128 s
->untracked
.strdup_strings
= 1;
129 s
->ignored
.strdup_strings
= 1;
132 static void wt_status_print_unmerged_header(struct wt_status
*s
)
135 int del_mod_conflict
= 0;
136 int both_deleted
= 0;
138 const char *c
= color(WT_STATUS_HEADER
, s
);
140 status_printf_ln(s
, c
, _("Unmerged paths:"));
142 for (i
= 0; i
< s
->change
.nr
; i
++) {
143 struct string_list_item
*it
= &(s
->change
.items
[i
]);
144 struct wt_status_change_data
*d
= it
->util
;
146 switch (d
->stagemask
) {
154 del_mod_conflict
= 1;
162 if (!advice_status_hints
)
164 if (s
->whence
!= FROM_COMMIT
)
166 else if (!s
->is_initial
)
167 status_printf_ln(s
, c
, _(" (use \"git reset %s <file>...\" to unstage)"), s
->reference
);
169 status_printf_ln(s
, c
, _(" (use \"git rm --cached <file>...\" to unstage)"));
172 if (!del_mod_conflict
)
173 status_printf_ln(s
, c
, _(" (use \"git add <file>...\" to mark resolution)"));
175 status_printf_ln(s
, c
, _(" (use \"git add/rm <file>...\" as appropriate to mark resolution)"));
176 } else if (!del_mod_conflict
&& !not_deleted
) {
177 status_printf_ln(s
, c
, _(" (use \"git rm <file>...\" to mark resolution)"));
179 status_printf_ln(s
, c
, _(" (use \"git add/rm <file>...\" as appropriate to mark resolution)"));
181 status_printf_ln(s
, c
, "");
184 static void wt_status_print_cached_header(struct wt_status
*s
)
186 const char *c
= color(WT_STATUS_HEADER
, s
);
188 status_printf_ln(s
, c
, _("Changes to be committed:"));
189 if (!advice_status_hints
)
191 if (s
->whence
!= FROM_COMMIT
)
192 ; /* NEEDSWORK: use "git reset --unresolve"??? */
193 else if (!s
->is_initial
)
194 status_printf_ln(s
, c
, _(" (use \"git reset %s <file>...\" to unstage)"), s
->reference
);
196 status_printf_ln(s
, c
, _(" (use \"git rm --cached <file>...\" to unstage)"));
197 status_printf_ln(s
, c
, "");
200 static void wt_status_print_dirty_header(struct wt_status
*s
,
202 int has_dirty_submodules
)
204 const char *c
= color(WT_STATUS_HEADER
, s
);
206 status_printf_ln(s
, c
, _("Changes not staged for commit:"));
207 if (!advice_status_hints
)
210 status_printf_ln(s
, c
, _(" (use \"git add <file>...\" to update what will be committed)"));
212 status_printf_ln(s
, c
, _(" (use \"git add/rm <file>...\" to update what will be committed)"));
213 status_printf_ln(s
, c
, _(" (use \"git checkout -- <file>...\" to discard changes in working directory)"));
214 if (has_dirty_submodules
)
215 status_printf_ln(s
, c
, _(" (commit or discard the untracked or modified content in submodules)"));
216 status_printf_ln(s
, c
, "");
219 static void wt_status_print_other_header(struct wt_status
*s
,
223 const char *c
= color(WT_STATUS_HEADER
, s
);
224 status_printf_ln(s
, c
, "%s:", what
);
225 if (!advice_status_hints
)
227 status_printf_ln(s
, c
, _(" (use \"git %s <file>...\" to include in what will be committed)"), how
);
228 status_printf_ln(s
, c
, "");
231 static void wt_status_print_trailer(struct wt_status
*s
)
233 status_printf_ln(s
, color(WT_STATUS_HEADER
, s
), "");
236 #define quote_path quote_path_relative
238 static void wt_status_print_unmerged_data(struct wt_status
*s
,
239 struct string_list_item
*it
)
241 const char *c
= color(WT_STATUS_UNMERGED
, s
);
242 struct wt_status_change_data
*d
= it
->util
;
243 struct strbuf onebuf
= STRBUF_INIT
;
244 const char *one
, *how
= _("bug");
246 one
= quote_path(it
->string
, -1, &onebuf
, s
->prefix
);
247 status_printf(s
, color(WT_STATUS_HEADER
, s
), "\t");
248 switch (d
->stagemask
) {
249 case 1: how
= _("both deleted:"); break;
250 case 2: how
= _("added by us:"); break;
251 case 3: how
= _("deleted by them:"); break;
252 case 4: how
= _("added by them:"); break;
253 case 5: how
= _("deleted by us:"); break;
254 case 6: how
= _("both added:"); break;
255 case 7: how
= _("both modified:"); break;
257 status_printf_more(s
, c
, "%-20s%s\n", how
, one
);
258 strbuf_release(&onebuf
);
261 static void wt_status_print_change_data(struct wt_status
*s
,
263 struct string_list_item
*it
)
265 struct wt_status_change_data
*d
= it
->util
;
266 const char *c
= color(change_type
, s
);
270 const char *one
, *two
;
271 struct strbuf onebuf
= STRBUF_INIT
, twobuf
= STRBUF_INIT
;
272 struct strbuf extra
= STRBUF_INIT
;
274 one_name
= two_name
= it
->string
;
275 switch (change_type
) {
276 case WT_STATUS_UPDATED
:
277 status
= d
->index_status
;
279 one_name
= d
->head_path
;
281 case WT_STATUS_CHANGED
:
282 if (d
->new_submodule_commits
|| d
->dirty_submodule
) {
283 strbuf_addstr(&extra
, " (");
284 if (d
->new_submodule_commits
)
285 strbuf_addf(&extra
, _("new commits, "));
286 if (d
->dirty_submodule
& DIRTY_SUBMODULE_MODIFIED
)
287 strbuf_addf(&extra
, _("modified content, "));
288 if (d
->dirty_submodule
& DIRTY_SUBMODULE_UNTRACKED
)
289 strbuf_addf(&extra
, _("untracked content, "));
290 strbuf_setlen(&extra
, extra
.len
- 2);
291 strbuf_addch(&extra
, ')');
293 status
= d
->worktree_status
;
297 one
= quote_path(one_name
, -1, &onebuf
, s
->prefix
);
298 two
= quote_path(two_name
, -1, &twobuf
, s
->prefix
);
300 status_printf(s
, color(WT_STATUS_HEADER
, s
), "\t");
302 case DIFF_STATUS_ADDED
:
303 status_printf_more(s
, c
, _("new file: %s"), one
);
305 case DIFF_STATUS_COPIED
:
306 status_printf_more(s
, c
, _("copied: %s -> %s"), one
, two
);
308 case DIFF_STATUS_DELETED
:
309 status_printf_more(s
, c
, _("deleted: %s"), one
);
311 case DIFF_STATUS_MODIFIED
:
312 status_printf_more(s
, c
, _("modified: %s"), one
);
314 case DIFF_STATUS_RENAMED
:
315 status_printf_more(s
, c
, _("renamed: %s -> %s"), one
, two
);
317 case DIFF_STATUS_TYPE_CHANGED
:
318 status_printf_more(s
, c
, _("typechange: %s"), one
);
320 case DIFF_STATUS_UNKNOWN
:
321 status_printf_more(s
, c
, _("unknown: %s"), one
);
323 case DIFF_STATUS_UNMERGED
:
324 status_printf_more(s
, c
, _("unmerged: %s"), one
);
327 die(_("bug: unhandled diff status %c"), status
);
330 status_printf_more(s
, color(WT_STATUS_HEADER
, s
), "%s", extra
.buf
);
331 strbuf_release(&extra
);
333 status_printf_more(s
, GIT_COLOR_NORMAL
, "\n");
334 strbuf_release(&onebuf
);
335 strbuf_release(&twobuf
);
338 static void wt_status_collect_changed_cb(struct diff_queue_struct
*q
,
339 struct diff_options
*options
,
342 struct wt_status
*s
= data
;
347 s
->workdir_dirty
= 1;
348 for (i
= 0; i
< q
->nr
; i
++) {
349 struct diff_filepair
*p
;
350 struct string_list_item
*it
;
351 struct wt_status_change_data
*d
;
354 it
= string_list_insert(&s
->change
, p
->one
->path
);
357 d
= xcalloc(1, sizeof(*d
));
360 if (!d
->worktree_status
)
361 d
->worktree_status
= p
->status
;
362 d
->dirty_submodule
= p
->two
->dirty_submodule
;
363 if (S_ISGITLINK(p
->two
->mode
))
364 d
->new_submodule_commits
= !!hashcmp(p
->one
->sha1
, p
->two
->sha1
);
368 static int unmerged_mask(const char *path
)
371 struct cache_entry
*ce
;
373 pos
= cache_name_pos(path
, strlen(path
));
379 while (pos
< active_nr
) {
380 ce
= active_cache
[pos
++];
381 if (strcmp(ce
->name
, path
) || !ce_stage(ce
))
383 mask
|= (1 << (ce_stage(ce
) - 1));
388 static void wt_status_collect_updated_cb(struct diff_queue_struct
*q
,
389 struct diff_options
*options
,
392 struct wt_status
*s
= data
;
395 for (i
= 0; i
< q
->nr
; i
++) {
396 struct diff_filepair
*p
;
397 struct string_list_item
*it
;
398 struct wt_status_change_data
*d
;
401 it
= string_list_insert(&s
->change
, p
->two
->path
);
404 d
= xcalloc(1, sizeof(*d
));
407 if (!d
->index_status
)
408 d
->index_status
= p
->status
;
410 case DIFF_STATUS_COPIED
:
411 case DIFF_STATUS_RENAMED
:
412 d
->head_path
= xstrdup(p
->one
->path
);
414 case DIFF_STATUS_UNMERGED
:
415 d
->stagemask
= unmerged_mask(p
->two
->path
);
421 static void wt_status_collect_changes_worktree(struct wt_status
*s
)
425 init_revisions(&rev
, NULL
);
426 setup_revisions(0, NULL
, &rev
, NULL
);
427 rev
.diffopt
.output_format
|= DIFF_FORMAT_CALLBACK
;
428 DIFF_OPT_SET(&rev
.diffopt
, DIRTY_SUBMODULES
);
429 if (!s
->show_untracked_files
)
430 DIFF_OPT_SET(&rev
.diffopt
, IGNORE_UNTRACKED_IN_SUBMODULES
);
431 if (s
->ignore_submodule_arg
) {
432 DIFF_OPT_SET(&rev
.diffopt
, OVERRIDE_SUBMODULE_CONFIG
);
433 handle_ignore_submodules_arg(&rev
.diffopt
, s
->ignore_submodule_arg
);
435 rev
.diffopt
.format_callback
= wt_status_collect_changed_cb
;
436 rev
.diffopt
.format_callback_data
= s
;
437 init_pathspec(&rev
.prune_data
, s
->pathspec
);
438 run_diff_files(&rev
, 0);
441 static void wt_status_collect_changes_index(struct wt_status
*s
)
444 struct setup_revision_opt opt
;
446 init_revisions(&rev
, NULL
);
447 memset(&opt
, 0, sizeof(opt
));
448 opt
.def
= s
->is_initial
? EMPTY_TREE_SHA1_HEX
: s
->reference
;
449 setup_revisions(0, NULL
, &rev
, &opt
);
451 if (s
->ignore_submodule_arg
) {
452 DIFF_OPT_SET(&rev
.diffopt
, OVERRIDE_SUBMODULE_CONFIG
);
453 handle_ignore_submodules_arg(&rev
.diffopt
, s
->ignore_submodule_arg
);
456 rev
.diffopt
.output_format
|= DIFF_FORMAT_CALLBACK
;
457 rev
.diffopt
.format_callback
= wt_status_collect_updated_cb
;
458 rev
.diffopt
.format_callback_data
= s
;
459 rev
.diffopt
.detect_rename
= 1;
460 rev
.diffopt
.rename_limit
= 200;
461 rev
.diffopt
.break_opt
= 0;
462 init_pathspec(&rev
.prune_data
, s
->pathspec
);
463 run_diff_index(&rev
, 1);
466 static void wt_status_collect_changes_initial(struct wt_status
*s
)
468 struct pathspec pathspec
;
471 init_pathspec(&pathspec
, s
->pathspec
);
472 for (i
= 0; i
< active_nr
; i
++) {
473 struct string_list_item
*it
;
474 struct wt_status_change_data
*d
;
475 struct cache_entry
*ce
= active_cache
[i
];
477 if (!ce_path_match(ce
, &pathspec
))
479 it
= string_list_insert(&s
->change
, ce
->name
);
482 d
= xcalloc(1, sizeof(*d
));
486 d
->index_status
= DIFF_STATUS_UNMERGED
;
487 d
->stagemask
|= (1 << (ce_stage(ce
) - 1));
490 d
->index_status
= DIFF_STATUS_ADDED
;
492 free_pathspec(&pathspec
);
495 static void wt_status_collect_untracked(struct wt_status
*s
)
498 struct dir_struct dir
;
500 if (!s
->show_untracked_files
)
502 memset(&dir
, 0, sizeof(dir
));
503 if (s
->show_untracked_files
!= SHOW_ALL_UNTRACKED_FILES
)
505 DIR_SHOW_OTHER_DIRECTORIES
| DIR_HIDE_EMPTY_DIRECTORIES
;
506 setup_standard_excludes(&dir
);
508 fill_directory(&dir
, s
->pathspec
);
509 for (i
= 0; i
< dir
.nr
; i
++) {
510 struct dir_entry
*ent
= dir
.entries
[i
];
511 if (cache_name_is_other(ent
->name
, ent
->len
) &&
512 match_pathspec(s
->pathspec
, ent
->name
, ent
->len
, 0, NULL
))
513 string_list_insert(&s
->untracked
, ent
->name
);
517 if (s
->show_ignored_files
) {
519 dir
.flags
= DIR_SHOW_IGNORED
;
520 if (s
->show_untracked_files
!= SHOW_ALL_UNTRACKED_FILES
)
521 dir
.flags
|= DIR_SHOW_OTHER_DIRECTORIES
;
522 fill_directory(&dir
, s
->pathspec
);
523 for (i
= 0; i
< dir
.nr
; i
++) {
524 struct dir_entry
*ent
= dir
.entries
[i
];
525 if (cache_name_is_other(ent
->name
, ent
->len
) &&
526 match_pathspec(s
->pathspec
, ent
->name
, ent
->len
, 0, NULL
))
527 string_list_insert(&s
->ignored
, ent
->name
);
535 void wt_status_collect(struct wt_status
*s
)
537 wt_status_collect_changes_worktree(s
);
540 wt_status_collect_changes_initial(s
);
542 wt_status_collect_changes_index(s
);
543 wt_status_collect_untracked(s
);
546 static void wt_status_print_unmerged(struct wt_status
*s
)
548 int shown_header
= 0;
551 for (i
= 0; i
< s
->change
.nr
; i
++) {
552 struct wt_status_change_data
*d
;
553 struct string_list_item
*it
;
554 it
= &(s
->change
.items
[i
]);
559 wt_status_print_unmerged_header(s
);
562 wt_status_print_unmerged_data(s
, it
);
565 wt_status_print_trailer(s
);
569 static void wt_status_print_updated(struct wt_status
*s
)
571 int shown_header
= 0;
574 for (i
= 0; i
< s
->change
.nr
; i
++) {
575 struct wt_status_change_data
*d
;
576 struct string_list_item
*it
;
577 it
= &(s
->change
.items
[i
]);
579 if (!d
->index_status
||
580 d
->index_status
== DIFF_STATUS_UNMERGED
)
583 wt_status_print_cached_header(s
);
587 wt_status_print_change_data(s
, WT_STATUS_UPDATED
, it
);
590 wt_status_print_trailer(s
);
596 * 1 : some change but no delete
598 static int wt_status_check_worktree_changes(struct wt_status
*s
,
599 int *dirty_submodules
)
604 *dirty_submodules
= 0;
606 for (i
= 0; i
< s
->change
.nr
; i
++) {
607 struct wt_status_change_data
*d
;
608 d
= s
->change
.items
[i
].util
;
609 if (!d
->worktree_status
||
610 d
->worktree_status
== DIFF_STATUS_UNMERGED
)
614 if (d
->dirty_submodule
)
615 *dirty_submodules
= 1;
616 if (d
->worktree_status
== DIFF_STATUS_DELETED
)
622 static void wt_status_print_changed(struct wt_status
*s
)
624 int i
, dirty_submodules
;
625 int worktree_changes
= wt_status_check_worktree_changes(s
, &dirty_submodules
);
627 if (!worktree_changes
)
630 wt_status_print_dirty_header(s
, worktree_changes
< 0, dirty_submodules
);
632 for (i
= 0; i
< s
->change
.nr
; i
++) {
633 struct wt_status_change_data
*d
;
634 struct string_list_item
*it
;
635 it
= &(s
->change
.items
[i
]);
637 if (!d
->worktree_status
||
638 d
->worktree_status
== DIFF_STATUS_UNMERGED
)
640 wt_status_print_change_data(s
, WT_STATUS_CHANGED
, it
);
642 wt_status_print_trailer(s
);
645 static void wt_status_print_submodule_summary(struct wt_status
*s
, int uncommitted
)
647 struct child_process sm_summary
;
648 char summary_limit
[64];
649 char index
[PATH_MAX
];
650 const char *env
[] = { NULL
, NULL
};
654 argv
[0] = "submodule";
656 argv
[2] = uncommitted
? "--files" : "--cached";
657 argv
[3] = "--for-status";
658 argv
[4] = "--summary-limit";
659 argv
[5] = summary_limit
;
660 argv
[6] = uncommitted
? NULL
: (s
->amend
? "HEAD^" : "HEAD");
663 sprintf(summary_limit
, "%d", s
->submodule_summary
);
664 snprintf(index
, sizeof(index
), "GIT_INDEX_FILE=%s", s
->index_file
);
666 memset(&sm_summary
, 0, sizeof(sm_summary
));
667 sm_summary
.argv
= argv
;
668 sm_summary
.env
= env
;
669 sm_summary
.git_cmd
= 1;
670 sm_summary
.no_stdin
= 1;
672 sm_summary
.out
= dup(fileno(s
->fp
)); /* run_command closes it */
673 run_command(&sm_summary
);
676 static void wt_status_print_other(struct wt_status
*s
,
677 struct string_list
*l
,
682 struct strbuf buf
= STRBUF_INIT
;
683 static struct string_list output
= STRING_LIST_INIT_DUP
;
684 struct column_options copts
;
689 wt_status_print_other_header(s
, what
, how
);
691 for (i
= 0; i
< l
->nr
; i
++) {
692 struct string_list_item
*it
;
695 path
= quote_path(it
->string
, strlen(it
->string
),
697 if (column_active(s
->colopts
)) {
698 string_list_append(&output
, path
);
701 status_printf(s
, color(WT_STATUS_HEADER
, s
), "\t");
702 status_printf_more(s
, color(WT_STATUS_UNTRACKED
, s
),
706 strbuf_release(&buf
);
707 if (!column_active(s
->colopts
))
710 strbuf_addf(&buf
, "%s#\t%s",
711 color(WT_STATUS_HEADER
, s
),
712 color(WT_STATUS_UNTRACKED
, s
));
713 memset(&copts
, 0, sizeof(copts
));
715 copts
.indent
= buf
.buf
;
716 if (want_color(s
->use_color
))
717 copts
.nl
= GIT_COLOR_RESET
"\n";
718 print_columns(&output
, s
->colopts
, &copts
);
719 string_list_clear(&output
, 0);
720 strbuf_release(&buf
);
723 static void wt_status_print_verbose(struct wt_status
*s
)
726 struct setup_revision_opt opt
;
728 init_revisions(&rev
, NULL
);
729 DIFF_OPT_SET(&rev
.diffopt
, ALLOW_TEXTCONV
);
731 memset(&opt
, 0, sizeof(opt
));
732 opt
.def
= s
->is_initial
? EMPTY_TREE_SHA1_HEX
: s
->reference
;
733 setup_revisions(0, NULL
, &rev
, &opt
);
735 rev
.diffopt
.output_format
|= DIFF_FORMAT_PATCH
;
736 rev
.diffopt
.detect_rename
= 1;
737 rev
.diffopt
.file
= s
->fp
;
738 rev
.diffopt
.close_file
= 0;
740 * If we're not going to stdout, then we definitely don't
741 * want color, since we are going to the commit message
742 * file (and even the "auto" setting won't work, since it
743 * will have checked isatty on stdout).
746 rev
.diffopt
.use_color
= 0;
747 run_diff_index(&rev
, 1);
750 static void wt_status_print_tracking(struct wt_status
*s
)
752 struct strbuf sb
= STRBUF_INIT
;
754 struct branch
*branch
;
756 assert(s
->branch
&& !s
->is_initial
);
757 if (prefixcmp(s
->branch
, "refs/heads/"))
759 branch
= branch_get(s
->branch
+ 11);
760 if (!format_tracking_info(branch
, &sb
))
763 for (cp
= sb
.buf
; (ep
= strchr(cp
, '\n')) != NULL
; cp
= ep
+ 1)
764 color_fprintf_ln(s
->fp
, color(WT_STATUS_HEADER
, s
),
765 "# %.*s", (int)(ep
- cp
), cp
);
766 color_fprintf_ln(s
->fp
, color(WT_STATUS_HEADER
, s
), "#");
769 static int has_unmerged(struct wt_status
*s
)
773 for (i
= 0; i
< s
->change
.nr
; i
++) {
774 struct wt_status_change_data
*d
;
775 d
= s
->change
.items
[i
].util
;
782 static void show_merge_in_progress(struct wt_status
*s
,
783 struct wt_status_state
*state
,
786 if (has_unmerged(s
)) {
787 status_printf_ln(s
, color
, _("You have unmerged paths."));
788 if (advice_status_hints
)
789 status_printf_ln(s
, color
,
790 _(" (fix conflicts and run \"git commit\")"));
792 status_printf_ln(s
, color
,
793 _("All conflicts fixed but you are still merging."));
794 if (advice_status_hints
)
795 status_printf_ln(s
, color
,
796 _(" (use \"git commit\" to conclude merge)"));
798 wt_status_print_trailer(s
);
801 static void show_am_in_progress(struct wt_status
*s
,
802 struct wt_status_state
*state
,
805 status_printf_ln(s
, color
,
806 _("You are in the middle of an am session."));
807 if (state
->am_empty_patch
)
808 status_printf_ln(s
, color
,
809 _("The current patch is empty."));
810 if (advice_status_hints
) {
811 if (!state
->am_empty_patch
)
812 status_printf_ln(s
, color
,
813 _(" (fix conflicts and then run \"git am --resolved\")"));
814 status_printf_ln(s
, color
,
815 _(" (use \"git am --skip\" to skip this patch)"));
816 status_printf_ln(s
, color
,
817 _(" (use \"git am --abort\" to restore the original branch)"));
819 wt_status_print_trailer(s
);
822 static char *read_line_from_git_path(const char *filename
)
824 struct strbuf buf
= STRBUF_INIT
;
825 FILE *fp
= fopen(git_path("%s", filename
), "r");
827 strbuf_release(&buf
);
830 strbuf_getline(&buf
, fp
, '\n');
832 return strbuf_detach(&buf
, NULL
);
834 strbuf_release(&buf
);
839 static int split_commit_in_progress(struct wt_status
*s
)
841 int split_in_progress
= 0;
842 char *head
= read_line_from_git_path("HEAD");
843 char *orig_head
= read_line_from_git_path("ORIG_HEAD");
844 char *rebase_amend
= read_line_from_git_path("rebase-merge/amend");
845 char *rebase_orig_head
= read_line_from_git_path("rebase-merge/orig-head");
847 if (!head
|| !orig_head
|| !rebase_amend
|| !rebase_orig_head
||
848 !s
->branch
|| strcmp(s
->branch
, "HEAD"))
849 return split_in_progress
;
851 if (!strcmp(rebase_amend
, rebase_orig_head
)) {
852 if (strcmp(head
, rebase_amend
))
853 split_in_progress
= 1;
854 } else if (strcmp(orig_head
, rebase_orig_head
)) {
855 split_in_progress
= 1;
858 if (!s
->amend
&& !s
->nowarn
&& !s
->workdir_dirty
)
859 split_in_progress
= 0;
864 free(rebase_orig_head
);
865 return split_in_progress
;
868 static void show_rebase_in_progress(struct wt_status
*s
,
869 struct wt_status_state
*state
,
874 if (has_unmerged(s
)) {
875 status_printf_ln(s
, color
, _("You are currently rebasing."));
876 if (advice_status_hints
) {
877 status_printf_ln(s
, color
,
878 _(" (fix conflicts and then run \"git rebase --continue\")"));
879 status_printf_ln(s
, color
,
880 _(" (use \"git rebase --skip\" to skip this patch)"));
881 status_printf_ln(s
, color
,
882 _(" (use \"git rebase --abort\" to check out the original branch)"));
884 } else if (state
->rebase_in_progress
|| !stat(git_path("MERGE_MSG"), &st
)) {
885 status_printf_ln(s
, color
, _("You are currently rebasing."));
886 if (advice_status_hints
)
887 status_printf_ln(s
, color
,
888 _(" (all conflicts fixed: run \"git rebase --continue\")"));
889 } else if (split_commit_in_progress(s
)) {
890 status_printf_ln(s
, color
, _("You are currently splitting a commit during a rebase."));
891 if (advice_status_hints
)
892 status_printf_ln(s
, color
,
893 _(" (Once your working directory is clean, run \"git rebase --continue\")"));
895 status_printf_ln(s
, color
, _("You are currently editing a commit during a rebase."));
896 if (advice_status_hints
&& !s
->amend
) {
897 status_printf_ln(s
, color
,
898 _(" (use \"git commit --amend\" to amend the current commit)"));
899 status_printf_ln(s
, color
,
900 _(" (use \"git rebase --continue\" once you are satisfied with your changes)"));
903 wt_status_print_trailer(s
);
906 static void show_cherry_pick_in_progress(struct wt_status
*s
,
907 struct wt_status_state
*state
,
910 status_printf_ln(s
, color
, _("You are currently cherry-picking."));
911 if (advice_status_hints
) {
913 status_printf_ln(s
, color
,
914 _(" (fix conflicts and run \"git commit\")"));
916 status_printf_ln(s
, color
,
917 _(" (all conflicts fixed: run \"git commit\")"));
919 wt_status_print_trailer(s
);
922 static void show_bisect_in_progress(struct wt_status
*s
,
923 struct wt_status_state
*state
,
926 status_printf_ln(s
, color
, _("You are currently bisecting."));
927 if (advice_status_hints
)
928 status_printf_ln(s
, color
,
929 _(" (use \"git bisect reset\" to get back to the original branch)"));
930 wt_status_print_trailer(s
);
933 static void wt_status_print_state(struct wt_status
*s
)
935 const char *state_color
= color(WT_STATUS_HEADER
, s
);
936 struct wt_status_state state
;
939 memset(&state
, 0, sizeof(state
));
941 if (!stat(git_path("MERGE_HEAD"), &st
)) {
942 state
.merge_in_progress
= 1;
943 } else if (!stat(git_path("rebase-apply"), &st
)) {
944 if (!stat(git_path("rebase-apply/applying"), &st
)) {
945 state
.am_in_progress
= 1;
946 if (!stat(git_path("rebase-apply/patch"), &st
) && !st
.st_size
)
947 state
.am_empty_patch
= 1;
949 state
.rebase_in_progress
= 1;
951 } else if (!stat(git_path("rebase-merge"), &st
)) {
952 if (!stat(git_path("rebase-merge/interactive"), &st
))
953 state
.rebase_interactive_in_progress
= 1;
955 state
.rebase_in_progress
= 1;
956 } else if (!stat(git_path("CHERRY_PICK_HEAD"), &st
)) {
957 state
.cherry_pick_in_progress
= 1;
959 if (!stat(git_path("BISECT_LOG"), &st
))
960 state
.bisect_in_progress
= 1;
962 if (state
.merge_in_progress
)
963 show_merge_in_progress(s
, &state
, state_color
);
964 else if (state
.am_in_progress
)
965 show_am_in_progress(s
, &state
, state_color
);
966 else if (state
.rebase_in_progress
|| state
.rebase_interactive_in_progress
)
967 show_rebase_in_progress(s
, &state
, state_color
);
968 else if (state
.cherry_pick_in_progress
)
969 show_cherry_pick_in_progress(s
, &state
, state_color
);
970 if (state
.bisect_in_progress
)
971 show_bisect_in_progress(s
, &state
, state_color
);
974 void wt_status_print(struct wt_status
*s
)
976 const char *branch_color
= color(WT_STATUS_ONBRANCH
, s
);
977 const char *branch_status_color
= color(WT_STATUS_HEADER
, s
);
980 const char *on_what
= _("On branch ");
981 const char *branch_name
= s
->branch
;
982 if (!prefixcmp(branch_name
, "refs/heads/"))
984 else if (!strcmp(branch_name
, "HEAD")) {
986 branch_status_color
= color(WT_STATUS_NOBRANCH
, s
);
987 on_what
= _("Not currently on any branch.");
989 status_printf(s
, color(WT_STATUS_HEADER
, s
), "");
990 status_printf_more(s
, branch_status_color
, "%s", on_what
);
991 status_printf_more(s
, branch_color
, "%s\n", branch_name
);
993 wt_status_print_tracking(s
);
996 wt_status_print_state(s
);
998 status_printf_ln(s
, color(WT_STATUS_HEADER
, s
), "");
999 status_printf_ln(s
, color(WT_STATUS_HEADER
, s
), _("Initial commit"));
1000 status_printf_ln(s
, color(WT_STATUS_HEADER
, s
), "");
1003 wt_status_print_updated(s
);
1004 wt_status_print_unmerged(s
);
1005 wt_status_print_changed(s
);
1006 if (s
->submodule_summary
&&
1007 (!s
->ignore_submodule_arg
||
1008 strcmp(s
->ignore_submodule_arg
, "all"))) {
1009 wt_status_print_submodule_summary(s
, 0); /* staged */
1010 wt_status_print_submodule_summary(s
, 1); /* unstaged */
1012 if (s
->show_untracked_files
) {
1013 wt_status_print_other(s
, &s
->untracked
, _("Untracked files"), "add");
1014 if (s
->show_ignored_files
)
1015 wt_status_print_other(s
, &s
->ignored
, _("Ignored files"), "add -f");
1016 } else if (s
->commitable
)
1017 status_printf_ln(s
, GIT_COLOR_NORMAL
, _("Untracked files not listed%s"),
1019 ? _(" (use -u option to show untracked files)") : "");
1022 wt_status_print_verbose(s
);
1023 if (!s
->commitable
) {
1025 status_printf_ln(s
, GIT_COLOR_NORMAL
, _("No changes"));
1028 else if (s
->workdir_dirty
) {
1029 if (advice_status_hints
)
1030 printf(_("no changes added to commit "
1031 "(use \"git add\" and/or \"git commit -a\")\n"));
1033 printf(_("no changes added to commit\n"));
1034 } else if (s
->untracked
.nr
) {
1035 if (advice_status_hints
)
1036 printf(_("nothing added to commit but untracked files "
1037 "present (use \"git add\" to track)\n"));
1039 printf(_("nothing added to commit but untracked files present\n"));
1040 } else if (s
->is_initial
) {
1041 if (advice_status_hints
)
1042 printf(_("nothing to commit (create/copy files "
1043 "and use \"git add\" to track)\n"));
1045 printf(_("nothing to commit\n"));
1046 } else if (!s
->show_untracked_files
) {
1047 if (advice_status_hints
)
1048 printf(_("nothing to commit (use -u to show untracked files)\n"));
1050 printf(_("nothing to commit\n"));
1052 printf(_("nothing to commit, working directory clean\n"));
1056 static void wt_shortstatus_unmerged(struct string_list_item
*it
,
1057 struct wt_status
*s
)
1059 struct wt_status_change_data
*d
= it
->util
;
1060 const char *how
= "??";
1062 switch (d
->stagemask
) {
1063 case 1: how
= "DD"; break; /* both deleted */
1064 case 2: how
= "AU"; break; /* added by us */
1065 case 3: how
= "UD"; break; /* deleted by them */
1066 case 4: how
= "UA"; break; /* added by them */
1067 case 5: how
= "DU"; break; /* deleted by us */
1068 case 6: how
= "AA"; break; /* both added */
1069 case 7: how
= "UU"; break; /* both modified */
1071 color_fprintf(s
->fp
, color(WT_STATUS_UNMERGED
, s
), "%s", how
);
1072 if (s
->null_termination
) {
1073 fprintf(stdout
, " %s%c", it
->string
, 0);
1075 struct strbuf onebuf
= STRBUF_INIT
;
1077 one
= quote_path(it
->string
, -1, &onebuf
, s
->prefix
);
1078 printf(" %s\n", one
);
1079 strbuf_release(&onebuf
);
1083 static void wt_shortstatus_status(struct string_list_item
*it
,
1084 struct wt_status
*s
)
1086 struct wt_status_change_data
*d
= it
->util
;
1088 if (d
->index_status
)
1089 color_fprintf(s
->fp
, color(WT_STATUS_UPDATED
, s
), "%c", d
->index_status
);
1092 if (d
->worktree_status
)
1093 color_fprintf(s
->fp
, color(WT_STATUS_CHANGED
, s
), "%c", d
->worktree_status
);
1097 if (s
->null_termination
) {
1098 fprintf(stdout
, "%s%c", it
->string
, 0);
1100 fprintf(stdout
, "%s%c", d
->head_path
, 0);
1102 struct strbuf onebuf
= STRBUF_INIT
;
1105 one
= quote_path(d
->head_path
, -1, &onebuf
, s
->prefix
);
1106 if (*one
!= '"' && strchr(one
, ' ') != NULL
) {
1108 strbuf_addch(&onebuf
, '"');
1111 printf("%s -> ", one
);
1112 strbuf_release(&onebuf
);
1114 one
= quote_path(it
->string
, -1, &onebuf
, s
->prefix
);
1115 if (*one
!= '"' && strchr(one
, ' ') != NULL
) {
1117 strbuf_addch(&onebuf
, '"');
1120 printf("%s\n", one
);
1121 strbuf_release(&onebuf
);
1125 static void wt_shortstatus_other(struct string_list_item
*it
,
1126 struct wt_status
*s
, const char *sign
)
1128 if (s
->null_termination
) {
1129 fprintf(stdout
, "%s %s%c", sign
, it
->string
, 0);
1131 struct strbuf onebuf
= STRBUF_INIT
;
1133 one
= quote_path(it
->string
, -1, &onebuf
, s
->prefix
);
1134 color_fprintf(s
->fp
, color(WT_STATUS_UNTRACKED
, s
), "%s", sign
);
1135 printf(" %s\n", one
);
1136 strbuf_release(&onebuf
);
1140 static void wt_shortstatus_print_tracking(struct wt_status
*s
)
1142 struct branch
*branch
;
1143 const char *header_color
= color(WT_STATUS_HEADER
, s
);
1144 const char *branch_color_local
= color(WT_STATUS_LOCAL_BRANCH
, s
);
1145 const char *branch_color_remote
= color(WT_STATUS_REMOTE_BRANCH
, s
);
1148 const char *branch_name
;
1149 int num_ours
, num_theirs
;
1151 color_fprintf(s
->fp
, color(WT_STATUS_HEADER
, s
), "## ");
1155 branch_name
= s
->branch
;
1157 if (!prefixcmp(branch_name
, "refs/heads/"))
1159 else if (!strcmp(branch_name
, "HEAD")) {
1160 branch_name
= _("HEAD (no branch)");
1161 branch_color_local
= color(WT_STATUS_NOBRANCH
, s
);
1164 branch
= branch_get(s
->branch
+ 11);
1166 color_fprintf(s
->fp
, header_color
, _("Initial commit on "));
1167 if (!stat_tracking_info(branch
, &num_ours
, &num_theirs
)) {
1168 color_fprintf(s
->fp
, branch_color_local
, "%s", branch_name
);
1169 fputc(s
->null_termination
? '\0' : '\n', s
->fp
);
1173 base
= branch
->merge
[0]->dst
;
1174 base
= shorten_unambiguous_ref(base
, 0);
1175 color_fprintf(s
->fp
, branch_color_local
, "%s", branch_name
);
1176 color_fprintf(s
->fp
, header_color
, "...");
1177 color_fprintf(s
->fp
, branch_color_remote
, "%s", base
);
1179 color_fprintf(s
->fp
, header_color
, " [");
1181 color_fprintf(s
->fp
, header_color
, _("behind "));
1182 color_fprintf(s
->fp
, branch_color_remote
, "%d", num_theirs
);
1183 } else if (!num_theirs
) {
1184 color_fprintf(s
->fp
, header_color
, _("ahead "));
1185 color_fprintf(s
->fp
, branch_color_local
, "%d", num_ours
);
1187 color_fprintf(s
->fp
, header_color
, _("ahead "));
1188 color_fprintf(s
->fp
, branch_color_local
, "%d", num_ours
);
1189 color_fprintf(s
->fp
, header_color
, _(", behind "));
1190 color_fprintf(s
->fp
, branch_color_remote
, "%d", num_theirs
);
1193 color_fprintf(s
->fp
, header_color
, "]");
1194 fputc(s
->null_termination
? '\0' : '\n', s
->fp
);
1197 void wt_shortstatus_print(struct wt_status
*s
)
1202 wt_shortstatus_print_tracking(s
);
1204 for (i
= 0; i
< s
->change
.nr
; i
++) {
1205 struct wt_status_change_data
*d
;
1206 struct string_list_item
*it
;
1208 it
= &(s
->change
.items
[i
]);
1211 wt_shortstatus_unmerged(it
, s
);
1213 wt_shortstatus_status(it
, s
);
1215 for (i
= 0; i
< s
->untracked
.nr
; i
++) {
1216 struct string_list_item
*it
;
1218 it
= &(s
->untracked
.items
[i
]);
1219 wt_shortstatus_other(it
, s
, "??");
1221 for (i
= 0; i
< s
->ignored
.nr
; i
++) {
1222 struct string_list_item
*it
;
1224 it
= &(s
->ignored
.items
[i
]);
1225 wt_shortstatus_other(it
, s
, "!!");
1229 void wt_porcelain_print(struct wt_status
*s
)
1232 s
->relative_paths
= 0;
1234 wt_shortstatus_print(s
);