10 #include "run-command.h"
11 #include "argv-array.h"
14 #include "submodule.h"
19 static const char cut_line
[] =
20 "------------------------ >8 ------------------------\n";
22 static char default_wt_status_colors
[][COLOR_MAXLEN
] = {
23 GIT_COLOR_NORMAL
, /* WT_STATUS_HEADER */
24 GIT_COLOR_GREEN
, /* WT_STATUS_UPDATED */
25 GIT_COLOR_RED
, /* WT_STATUS_CHANGED */
26 GIT_COLOR_RED
, /* WT_STATUS_UNTRACKED */
27 GIT_COLOR_RED
, /* WT_STATUS_NOBRANCH */
28 GIT_COLOR_RED
, /* WT_STATUS_UNMERGED */
29 GIT_COLOR_GREEN
, /* WT_STATUS_LOCAL_BRANCH */
30 GIT_COLOR_RED
, /* WT_STATUS_REMOTE_BRANCH */
31 GIT_COLOR_NIL
, /* WT_STATUS_ONBRANCH */
34 static const char *color(int slot
, struct wt_status
*s
)
37 if (want_color(s
->use_color
))
38 c
= s
->color_palette
[slot
];
39 if (slot
== WT_STATUS_ONBRANCH
&& color_is_nil(c
))
40 c
= s
->color_palette
[WT_STATUS_HEADER
];
44 static void status_vprintf(struct wt_status
*s
, int at_bol
, const char *color
,
45 const char *fmt
, va_list ap
, const char *trail
)
47 struct strbuf sb
= STRBUF_INIT
;
48 struct strbuf linebuf
= STRBUF_INIT
;
49 const char *line
, *eol
;
51 strbuf_vaddf(&sb
, fmt
, ap
);
53 if (s
->display_comment_prefix
) {
54 strbuf_addch(&sb
, comment_line_char
);
56 strbuf_addch(&sb
, ' ');
58 color_print_strbuf(s
->fp
, color
, &sb
);
60 fprintf(s
->fp
, "%s", trail
);
64 for (line
= sb
.buf
; *line
; line
= eol
+ 1) {
65 eol
= strchr(line
, '\n');
67 strbuf_reset(&linebuf
);
68 if (at_bol
&& s
->display_comment_prefix
) {
69 strbuf_addch(&linebuf
, comment_line_char
);
70 if (*line
!= '\n' && *line
!= '\t')
71 strbuf_addch(&linebuf
, ' ');
74 strbuf_add(&linebuf
, line
, eol
- line
);
76 strbuf_addstr(&linebuf
, line
);
77 color_print_strbuf(s
->fp
, color
, &linebuf
);
85 fprintf(s
->fp
, "%s", trail
);
86 strbuf_release(&linebuf
);
90 void status_printf_ln(struct wt_status
*s
, const char *color
,
96 status_vprintf(s
, 1, color
, fmt
, ap
, "\n");
100 void status_printf(struct wt_status
*s
, const char *color
,
101 const char *fmt
, ...)
106 status_vprintf(s
, 1, color
, fmt
, ap
, NULL
);
110 static void status_printf_more(struct wt_status
*s
, const char *color
,
111 const char *fmt
, ...)
116 status_vprintf(s
, 0, color
, fmt
, ap
, NULL
);
120 void wt_status_prepare(struct wt_status
*s
)
122 unsigned char sha1
[20];
124 memset(s
, 0, sizeof(*s
));
125 memcpy(s
->color_palette
, default_wt_status_colors
,
126 sizeof(default_wt_status_colors
));
127 s
->show_untracked_files
= SHOW_NORMAL_UNTRACKED_FILES
;
129 s
->relative_paths
= 1;
130 s
->branch
= resolve_refdup("HEAD", 0, sha1
, NULL
);
131 s
->reference
= "HEAD";
133 s
->index_file
= get_index_file();
134 s
->change
.strdup_strings
= 1;
135 s
->untracked
.strdup_strings
= 1;
136 s
->ignored
.strdup_strings
= 1;
137 s
->show_branch
= -1; /* unspecified */
138 s
->display_comment_prefix
= 0;
141 static void wt_status_print_unmerged_header(struct wt_status
*s
)
144 int del_mod_conflict
= 0;
145 int both_deleted
= 0;
147 const char *c
= color(WT_STATUS_HEADER
, s
);
149 status_printf_ln(s
, c
, _("Unmerged paths:"));
151 for (i
= 0; i
< s
->change
.nr
; i
++) {
152 struct string_list_item
*it
= &(s
->change
.items
[i
]);
153 struct wt_status_change_data
*d
= it
->util
;
155 switch (d
->stagemask
) {
163 del_mod_conflict
= 1;
173 if (s
->whence
!= FROM_COMMIT
)
175 else if (!s
->is_initial
)
176 status_printf_ln(s
, c
, _(" (use \"git reset %s <file>...\" to unstage)"), s
->reference
);
178 status_printf_ln(s
, c
, _(" (use \"git rm --cached <file>...\" to unstage)"));
181 if (!del_mod_conflict
)
182 status_printf_ln(s
, c
, _(" (use \"git add <file>...\" to mark resolution)"));
184 status_printf_ln(s
, c
, _(" (use \"git add/rm <file>...\" as appropriate to mark resolution)"));
185 } else if (!del_mod_conflict
&& !not_deleted
) {
186 status_printf_ln(s
, c
, _(" (use \"git rm <file>...\" to mark resolution)"));
188 status_printf_ln(s
, c
, _(" (use \"git add/rm <file>...\" as appropriate to mark resolution)"));
190 status_printf_ln(s
, c
, "%s", "");
193 static void wt_status_print_cached_header(struct wt_status
*s
)
195 const char *c
= color(WT_STATUS_HEADER
, s
);
197 status_printf_ln(s
, c
, _("Changes to be committed:"));
200 if (s
->whence
!= FROM_COMMIT
)
201 ; /* NEEDSWORK: use "git reset --unresolve"??? */
202 else if (!s
->is_initial
)
203 status_printf_ln(s
, c
, _(" (use \"git reset %s <file>...\" to unstage)"), s
->reference
);
205 status_printf_ln(s
, c
, _(" (use \"git rm --cached <file>...\" to unstage)"));
206 status_printf_ln(s
, c
, "%s", "");
209 static void wt_status_print_dirty_header(struct wt_status
*s
,
211 int has_dirty_submodules
)
213 const char *c
= color(WT_STATUS_HEADER
, s
);
215 status_printf_ln(s
, c
, _("Changes not staged for commit:"));
219 status_printf_ln(s
, c
, _(" (use \"git add <file>...\" to update what will be committed)"));
221 status_printf_ln(s
, c
, _(" (use \"git add/rm <file>...\" to update what will be committed)"));
222 status_printf_ln(s
, c
, _(" (use \"git checkout -- <file>...\" to discard changes in working directory)"));
223 if (has_dirty_submodules
)
224 status_printf_ln(s
, c
, _(" (commit or discard the untracked or modified content in submodules)"));
225 status_printf_ln(s
, c
, "%s", "");
228 static void wt_status_print_other_header(struct wt_status
*s
,
232 const char *c
= color(WT_STATUS_HEADER
, s
);
233 status_printf_ln(s
, c
, "%s:", what
);
236 status_printf_ln(s
, c
, _(" (use \"git %s <file>...\" to include in what will be committed)"), how
);
237 status_printf_ln(s
, c
, "%s", "");
240 static void wt_status_print_trailer(struct wt_status
*s
)
242 status_printf_ln(s
, color(WT_STATUS_HEADER
, s
), "%s", "");
245 #define quote_path quote_path_relative
247 static const char *wt_status_unmerged_status_string(int stagemask
)
251 return _("both deleted:");
253 return _("added by us:");
255 return _("deleted by them:");
257 return _("added by them:");
259 return _("deleted by us:");
261 return _("both added:");
263 return _("both modified:");
265 die(_("bug: unhandled unmerged status %x"), stagemask
);
269 static const char *wt_status_diff_status_string(int status
)
272 case DIFF_STATUS_ADDED
:
273 return _("new file:");
274 case DIFF_STATUS_COPIED
:
276 case DIFF_STATUS_DELETED
:
277 return _("deleted:");
278 case DIFF_STATUS_MODIFIED
:
279 return _("modified:");
280 case DIFF_STATUS_RENAMED
:
281 return _("renamed:");
282 case DIFF_STATUS_TYPE_CHANGED
:
283 return _("typechange:");
284 case DIFF_STATUS_UNKNOWN
:
285 return _("unknown:");
286 case DIFF_STATUS_UNMERGED
:
287 return _("unmerged:");
293 static int maxwidth(const char *(*label
)(int), int minval
, int maxval
)
297 for (i
= minval
; i
<= maxval
; i
++) {
298 const char *s
= label(i
);
299 int len
= s
? utf8_strwidth(s
) : 0;
306 static void wt_status_print_unmerged_data(struct wt_status
*s
,
307 struct string_list_item
*it
)
309 const char *c
= color(WT_STATUS_UNMERGED
, s
);
310 struct wt_status_change_data
*d
= it
->util
;
311 struct strbuf onebuf
= STRBUF_INIT
;
312 static char *padding
;
313 static int label_width
;
314 const char *one
, *how
;
318 label_width
= maxwidth(wt_status_unmerged_status_string
, 1, 7);
319 label_width
+= strlen(" ");
320 padding
= xmallocz(label_width
);
321 memset(padding
, ' ', label_width
);
324 one
= quote_path(it
->string
, s
->prefix
, &onebuf
);
325 status_printf(s
, color(WT_STATUS_HEADER
, s
), "\t");
327 how
= wt_status_unmerged_status_string(d
->stagemask
);
328 len
= label_width
- utf8_strwidth(how
);
329 status_printf_more(s
, c
, "%s%.*s%s\n", how
, len
, padding
, one
);
330 strbuf_release(&onebuf
);
333 static void wt_status_print_change_data(struct wt_status
*s
,
335 struct string_list_item
*it
)
337 struct wt_status_change_data
*d
= it
->util
;
338 const char *c
= color(change_type
, s
);
342 const char *one
, *two
;
343 struct strbuf onebuf
= STRBUF_INIT
, twobuf
= STRBUF_INIT
;
344 struct strbuf extra
= STRBUF_INIT
;
345 static char *padding
;
346 static int label_width
;
351 /* If DIFF_STATUS_* uses outside the range [A..Z], we're in trouble */
352 label_width
= maxwidth(wt_status_diff_status_string
, 'A', 'Z');
353 label_width
+= strlen(" ");
354 padding
= xmallocz(label_width
);
355 memset(padding
, ' ', label_width
);
358 one_name
= two_name
= it
->string
;
359 switch (change_type
) {
360 case WT_STATUS_UPDATED
:
361 status
= d
->index_status
;
363 one_name
= d
->head_path
;
365 case WT_STATUS_CHANGED
:
366 if (d
->new_submodule_commits
|| d
->dirty_submodule
) {
367 strbuf_addstr(&extra
, " (");
368 if (d
->new_submodule_commits
)
369 strbuf_addf(&extra
, _("new commits, "));
370 if (d
->dirty_submodule
& DIRTY_SUBMODULE_MODIFIED
)
371 strbuf_addf(&extra
, _("modified content, "));
372 if (d
->dirty_submodule
& DIRTY_SUBMODULE_UNTRACKED
)
373 strbuf_addf(&extra
, _("untracked content, "));
374 strbuf_setlen(&extra
, extra
.len
- 2);
375 strbuf_addch(&extra
, ')');
377 status
= d
->worktree_status
;
380 die("BUG: unhandled change_type %d in wt_status_print_change_data",
384 one
= quote_path(one_name
, s
->prefix
, &onebuf
);
385 two
= quote_path(two_name
, s
->prefix
, &twobuf
);
387 status_printf(s
, color(WT_STATUS_HEADER
, s
), "\t");
388 what
= wt_status_diff_status_string(status
);
390 die(_("bug: unhandled diff status %c"), status
);
391 len
= label_width
- utf8_strwidth(what
);
393 if (status
== DIFF_STATUS_COPIED
|| status
== DIFF_STATUS_RENAMED
)
394 status_printf_more(s
, c
, "%s%.*s%s -> %s",
395 what
, len
, padding
, one
, two
);
397 status_printf_more(s
, c
, "%s%.*s%s",
398 what
, len
, padding
, one
);
400 status_printf_more(s
, color(WT_STATUS_HEADER
, s
), "%s", extra
.buf
);
401 strbuf_release(&extra
);
403 status_printf_more(s
, GIT_COLOR_NORMAL
, "\n");
404 strbuf_release(&onebuf
);
405 strbuf_release(&twobuf
);
408 static void wt_status_collect_changed_cb(struct diff_queue_struct
*q
,
409 struct diff_options
*options
,
412 struct wt_status
*s
= data
;
417 s
->workdir_dirty
= 1;
418 for (i
= 0; i
< q
->nr
; i
++) {
419 struct diff_filepair
*p
;
420 struct string_list_item
*it
;
421 struct wt_status_change_data
*d
;
424 it
= string_list_insert(&s
->change
, p
->one
->path
);
427 d
= xcalloc(1, sizeof(*d
));
430 if (!d
->worktree_status
)
431 d
->worktree_status
= p
->status
;
432 d
->dirty_submodule
= p
->two
->dirty_submodule
;
433 if (S_ISGITLINK(p
->two
->mode
))
434 d
->new_submodule_commits
= !!hashcmp(p
->one
->sha1
, p
->two
->sha1
);
438 static int unmerged_mask(const char *path
)
441 const struct cache_entry
*ce
;
443 pos
= cache_name_pos(path
, strlen(path
));
449 while (pos
< active_nr
) {
450 ce
= active_cache
[pos
++];
451 if (strcmp(ce
->name
, path
) || !ce_stage(ce
))
453 mask
|= (1 << (ce_stage(ce
) - 1));
458 static void wt_status_collect_updated_cb(struct diff_queue_struct
*q
,
459 struct diff_options
*options
,
462 struct wt_status
*s
= data
;
465 for (i
= 0; i
< q
->nr
; i
++) {
466 struct diff_filepair
*p
;
467 struct string_list_item
*it
;
468 struct wt_status_change_data
*d
;
471 it
= string_list_insert(&s
->change
, p
->two
->path
);
474 d
= xcalloc(1, sizeof(*d
));
477 if (!d
->index_status
)
478 d
->index_status
= p
->status
;
480 case DIFF_STATUS_COPIED
:
481 case DIFF_STATUS_RENAMED
:
482 d
->head_path
= xstrdup(p
->one
->path
);
484 case DIFF_STATUS_UNMERGED
:
485 d
->stagemask
= unmerged_mask(p
->two
->path
);
491 static void wt_status_collect_changes_worktree(struct wt_status
*s
)
495 init_revisions(&rev
, NULL
);
496 setup_revisions(0, NULL
, &rev
, NULL
);
497 rev
.diffopt
.output_format
|= DIFF_FORMAT_CALLBACK
;
498 DIFF_OPT_SET(&rev
.diffopt
, DIRTY_SUBMODULES
);
499 if (!s
->show_untracked_files
)
500 DIFF_OPT_SET(&rev
.diffopt
, IGNORE_UNTRACKED_IN_SUBMODULES
);
501 if (s
->ignore_submodule_arg
) {
502 DIFF_OPT_SET(&rev
.diffopt
, OVERRIDE_SUBMODULE_CONFIG
);
503 handle_ignore_submodules_arg(&rev
.diffopt
, s
->ignore_submodule_arg
);
505 rev
.diffopt
.format_callback
= wt_status_collect_changed_cb
;
506 rev
.diffopt
.format_callback_data
= s
;
507 copy_pathspec(&rev
.prune_data
, &s
->pathspec
);
508 run_diff_files(&rev
, 0);
511 static void wt_status_collect_changes_index(struct wt_status
*s
)
514 struct setup_revision_opt opt
;
516 init_revisions(&rev
, NULL
);
517 memset(&opt
, 0, sizeof(opt
));
518 opt
.def
= s
->is_initial
? EMPTY_TREE_SHA1_HEX
: s
->reference
;
519 setup_revisions(0, NULL
, &rev
, &opt
);
521 DIFF_OPT_SET(&rev
.diffopt
, OVERRIDE_SUBMODULE_CONFIG
);
522 if (s
->ignore_submodule_arg
) {
523 handle_ignore_submodules_arg(&rev
.diffopt
, s
->ignore_submodule_arg
);
526 * Unless the user did explicitly request a submodule ignore
527 * mode by passing a command line option we do not ignore any
528 * changed submodule SHA-1s when comparing index and HEAD, no
529 * matter what is configured. Otherwise the user won't be
530 * shown any submodules she manually added (and which are
531 * staged to be committed), which would be really confusing.
533 handle_ignore_submodules_arg(&rev
.diffopt
, "dirty");
536 rev
.diffopt
.output_format
|= DIFF_FORMAT_CALLBACK
;
537 rev
.diffopt
.format_callback
= wt_status_collect_updated_cb
;
538 rev
.diffopt
.format_callback_data
= s
;
539 rev
.diffopt
.detect_rename
= 1;
540 rev
.diffopt
.rename_limit
= 200;
541 rev
.diffopt
.break_opt
= 0;
542 copy_pathspec(&rev
.prune_data
, &s
->pathspec
);
543 run_diff_index(&rev
, 1);
546 static void wt_status_collect_changes_initial(struct wt_status
*s
)
550 for (i
= 0; i
< active_nr
; i
++) {
551 struct string_list_item
*it
;
552 struct wt_status_change_data
*d
;
553 const struct cache_entry
*ce
= active_cache
[i
];
555 if (!ce_path_match(ce
, &s
->pathspec
, NULL
))
557 it
= string_list_insert(&s
->change
, ce
->name
);
560 d
= xcalloc(1, sizeof(*d
));
564 d
->index_status
= DIFF_STATUS_UNMERGED
;
565 d
->stagemask
|= (1 << (ce_stage(ce
) - 1));
568 d
->index_status
= DIFF_STATUS_ADDED
;
572 static void wt_status_collect_untracked(struct wt_status
*s
)
575 struct dir_struct dir
;
576 uint64_t t_begin
= getnanotime();
578 if (!s
->show_untracked_files
)
581 memset(&dir
, 0, sizeof(dir
));
582 if (s
->show_untracked_files
!= SHOW_ALL_UNTRACKED_FILES
)
584 DIR_SHOW_OTHER_DIRECTORIES
| DIR_HIDE_EMPTY_DIRECTORIES
;
585 if (s
->show_ignored_files
)
586 dir
.flags
|= DIR_SHOW_IGNORED_TOO
;
587 setup_standard_excludes(&dir
);
589 fill_directory(&dir
, &s
->pathspec
);
591 for (i
= 0; i
< dir
.nr
; i
++) {
592 struct dir_entry
*ent
= dir
.entries
[i
];
593 if (cache_name_is_other(ent
->name
, ent
->len
) &&
594 dir_path_match(ent
, &s
->pathspec
, 0, NULL
))
595 string_list_insert(&s
->untracked
, ent
->name
);
599 for (i
= 0; i
< dir
.ignored_nr
; i
++) {
600 struct dir_entry
*ent
= dir
.ignored
[i
];
601 if (cache_name_is_other(ent
->name
, ent
->len
) &&
602 dir_path_match(ent
, &s
->pathspec
, 0, NULL
))
603 string_list_insert(&s
->ignored
, ent
->name
);
609 clear_directory(&dir
);
611 if (advice_status_u_option
)
612 s
->untracked_in_ms
= (getnanotime() - t_begin
) / 1000000;
615 void wt_status_collect(struct wt_status
*s
)
617 wt_status_collect_changes_worktree(s
);
620 wt_status_collect_changes_initial(s
);
622 wt_status_collect_changes_index(s
);
623 wt_status_collect_untracked(s
);
626 static void wt_status_print_unmerged(struct wt_status
*s
)
628 int shown_header
= 0;
631 for (i
= 0; i
< s
->change
.nr
; i
++) {
632 struct wt_status_change_data
*d
;
633 struct string_list_item
*it
;
634 it
= &(s
->change
.items
[i
]);
639 wt_status_print_unmerged_header(s
);
642 wt_status_print_unmerged_data(s
, it
);
645 wt_status_print_trailer(s
);
649 static void wt_status_print_updated(struct wt_status
*s
)
651 int shown_header
= 0;
654 for (i
= 0; i
< s
->change
.nr
; i
++) {
655 struct wt_status_change_data
*d
;
656 struct string_list_item
*it
;
657 it
= &(s
->change
.items
[i
]);
659 if (!d
->index_status
||
660 d
->index_status
== DIFF_STATUS_UNMERGED
)
663 wt_status_print_cached_header(s
);
667 wt_status_print_change_data(s
, WT_STATUS_UPDATED
, it
);
670 wt_status_print_trailer(s
);
676 * 1 : some change but no delete
678 static int wt_status_check_worktree_changes(struct wt_status
*s
,
679 int *dirty_submodules
)
684 *dirty_submodules
= 0;
686 for (i
= 0; i
< s
->change
.nr
; i
++) {
687 struct wt_status_change_data
*d
;
688 d
= s
->change
.items
[i
].util
;
689 if (!d
->worktree_status
||
690 d
->worktree_status
== DIFF_STATUS_UNMERGED
)
694 if (d
->dirty_submodule
)
695 *dirty_submodules
= 1;
696 if (d
->worktree_status
== DIFF_STATUS_DELETED
)
702 static void wt_status_print_changed(struct wt_status
*s
)
704 int i
, dirty_submodules
;
705 int worktree_changes
= wt_status_check_worktree_changes(s
, &dirty_submodules
);
707 if (!worktree_changes
)
710 wt_status_print_dirty_header(s
, worktree_changes
< 0, dirty_submodules
);
712 for (i
= 0; i
< s
->change
.nr
; i
++) {
713 struct wt_status_change_data
*d
;
714 struct string_list_item
*it
;
715 it
= &(s
->change
.items
[i
]);
717 if (!d
->worktree_status
||
718 d
->worktree_status
== DIFF_STATUS_UNMERGED
)
720 wt_status_print_change_data(s
, WT_STATUS_CHANGED
, it
);
722 wt_status_print_trailer(s
);
725 static void wt_status_print_submodule_summary(struct wt_status
*s
, int uncommitted
)
727 struct child_process sm_summary
= CHILD_PROCESS_INIT
;
728 struct strbuf cmd_stdout
= STRBUF_INIT
;
729 struct strbuf summary
= STRBUF_INIT
;
730 char *summary_content
;
732 argv_array_pushf(&sm_summary
.env_array
, "GIT_INDEX_FILE=%s",
735 argv_array_push(&sm_summary
.args
, "submodule");
736 argv_array_push(&sm_summary
.args
, "summary");
737 argv_array_push(&sm_summary
.args
, uncommitted
? "--files" : "--cached");
738 argv_array_push(&sm_summary
.args
, "--for-status");
739 argv_array_push(&sm_summary
.args
, "--summary-limit");
740 argv_array_pushf(&sm_summary
.args
, "%d", s
->submodule_summary
);
742 argv_array_push(&sm_summary
.args
, s
->amend
? "HEAD^" : "HEAD");
744 sm_summary
.git_cmd
= 1;
745 sm_summary
.no_stdin
= 1;
747 capture_command(&sm_summary
, &cmd_stdout
, 1024);
749 /* prepend header, only if there's an actual output */
750 if (cmd_stdout
.len
) {
752 strbuf_addstr(&summary
, _("Submodules changed but not updated:"));
754 strbuf_addstr(&summary
, _("Submodule changes to be committed:"));
755 strbuf_addstr(&summary
, "\n\n");
757 strbuf_addbuf(&summary
, &cmd_stdout
);
758 strbuf_release(&cmd_stdout
);
760 if (s
->display_comment_prefix
) {
762 summary_content
= strbuf_detach(&summary
, &len
);
763 strbuf_add_commented_lines(&summary
, summary_content
, len
);
764 free(summary_content
);
767 fputs(summary
.buf
, s
->fp
);
768 strbuf_release(&summary
);
771 static void wt_status_print_other(struct wt_status
*s
,
772 struct string_list
*l
,
777 struct strbuf buf
= STRBUF_INIT
;
778 static struct string_list output
= STRING_LIST_INIT_DUP
;
779 struct column_options copts
;
784 wt_status_print_other_header(s
, what
, how
);
786 for (i
= 0; i
< l
->nr
; i
++) {
787 struct string_list_item
*it
;
790 path
= quote_path(it
->string
, s
->prefix
, &buf
);
791 if (column_active(s
->colopts
)) {
792 string_list_append(&output
, path
);
795 status_printf(s
, color(WT_STATUS_HEADER
, s
), "\t");
796 status_printf_more(s
, color(WT_STATUS_UNTRACKED
, s
),
800 strbuf_release(&buf
);
801 if (!column_active(s
->colopts
))
804 strbuf_addf(&buf
, "%s%s\t%s",
805 color(WT_STATUS_HEADER
, s
),
806 s
->display_comment_prefix
? "#" : "",
807 color(WT_STATUS_UNTRACKED
, s
));
808 memset(&copts
, 0, sizeof(copts
));
810 copts
.indent
= buf
.buf
;
811 if (want_color(s
->use_color
))
812 copts
.nl
= GIT_COLOR_RESET
"\n";
813 print_columns(&output
, s
->colopts
, &copts
);
814 string_list_clear(&output
, 0);
815 strbuf_release(&buf
);
817 status_printf_ln(s
, GIT_COLOR_NORMAL
, "%s", "");
820 void wt_status_truncate_message_at_cut_line(struct strbuf
*buf
)
823 struct strbuf pattern
= STRBUF_INIT
;
825 strbuf_addf(&pattern
, "\n%c %s", comment_line_char
, cut_line
);
826 if (starts_with(buf
->buf
, pattern
.buf
+ 1))
827 strbuf_setlen(buf
, 0);
828 else if ((p
= strstr(buf
->buf
, pattern
.buf
)))
829 strbuf_setlen(buf
, p
- buf
->buf
+ 1);
830 strbuf_release(&pattern
);
833 void wt_status_add_cut_line(FILE *fp
)
835 const char *explanation
= _("Do not touch the line above.\nEverything below will be removed.");
836 struct strbuf buf
= STRBUF_INIT
;
838 fprintf(fp
, "%c %s", comment_line_char
, cut_line
);
839 strbuf_add_commented_lines(&buf
, explanation
, strlen(explanation
));
841 strbuf_release(&buf
);
844 static void wt_status_print_verbose(struct wt_status
*s
)
847 struct setup_revision_opt opt
;
848 int dirty_submodules
;
849 const char *c
= color(WT_STATUS_HEADER
, s
);
851 init_revisions(&rev
, NULL
);
852 DIFF_OPT_SET(&rev
.diffopt
, ALLOW_TEXTCONV
);
854 memset(&opt
, 0, sizeof(opt
));
855 opt
.def
= s
->is_initial
? EMPTY_TREE_SHA1_HEX
: s
->reference
;
856 setup_revisions(0, NULL
, &rev
, &opt
);
858 rev
.diffopt
.output_format
|= DIFF_FORMAT_PATCH
;
859 rev
.diffopt
.detect_rename
= 1;
860 rev
.diffopt
.file
= s
->fp
;
861 rev
.diffopt
.close_file
= 0;
863 * If we're not going to stdout, then we definitely don't
864 * want color, since we are going to the commit message
865 * file (and even the "auto" setting won't work, since it
866 * will have checked isatty on stdout). But we then do want
867 * to insert the scissor line here to reliably remove the
868 * diff before committing.
870 if (s
->fp
!= stdout
) {
871 rev
.diffopt
.use_color
= 0;
872 wt_status_add_cut_line(s
->fp
);
874 if (s
->verbose
> 1 && s
->commitable
) {
875 /* print_updated() printed a header, so do we */
877 wt_status_print_trailer(s
);
878 status_printf_ln(s
, c
, _("Changes to be committed:"));
879 rev
.diffopt
.a_prefix
= "c/";
880 rev
.diffopt
.b_prefix
= "i/";
881 } /* else use prefix as per user config */
882 run_diff_index(&rev
, 1);
883 if (s
->verbose
> 1 &&
884 wt_status_check_worktree_changes(s
, &dirty_submodules
)) {
885 status_printf_ln(s
, c
,
886 "--------------------------------------------------");
887 status_printf_ln(s
, c
, _("Changes not staged for commit:"));
889 rev
.diffopt
.a_prefix
= "i/";
890 rev
.diffopt
.b_prefix
= "w/";
891 run_diff_files(&rev
, 0);
895 static void wt_status_print_tracking(struct wt_status
*s
)
897 struct strbuf sb
= STRBUF_INIT
;
899 struct branch
*branch
;
900 char comment_line_string
[3];
903 assert(s
->branch
&& !s
->is_initial
);
904 if (!starts_with(s
->branch
, "refs/heads/"))
906 branch
= branch_get(s
->branch
+ 11);
907 if (!format_tracking_info(branch
, &sb
))
911 if (s
->display_comment_prefix
) {
912 comment_line_string
[i
++] = comment_line_char
;
913 comment_line_string
[i
++] = ' ';
915 comment_line_string
[i
] = '\0';
917 for (cp
= sb
.buf
; (ep
= strchr(cp
, '\n')) != NULL
; cp
= ep
+ 1)
918 color_fprintf_ln(s
->fp
, color(WT_STATUS_HEADER
, s
),
919 "%s%.*s", comment_line_string
,
921 if (s
->display_comment_prefix
)
922 color_fprintf_ln(s
->fp
, color(WT_STATUS_HEADER
, s
), "%c",
928 static int has_unmerged(struct wt_status
*s
)
932 for (i
= 0; i
< s
->change
.nr
; i
++) {
933 struct wt_status_change_data
*d
;
934 d
= s
->change
.items
[i
].util
;
941 static void show_merge_in_progress(struct wt_status
*s
,
942 struct wt_status_state
*state
,
945 if (has_unmerged(s
)) {
946 status_printf_ln(s
, color
, _("You have unmerged paths."));
948 status_printf_ln(s
, color
,
949 _(" (fix conflicts and run \"git commit\")"));
951 status_printf_ln(s
, color
,
952 _("All conflicts fixed but you are still merging."));
954 status_printf_ln(s
, color
,
955 _(" (use \"git commit\" to conclude merge)"));
957 wt_status_print_trailer(s
);
960 static void show_am_in_progress(struct wt_status
*s
,
961 struct wt_status_state
*state
,
964 status_printf_ln(s
, color
,
965 _("You are in the middle of an am session."));
966 if (state
->am_empty_patch
)
967 status_printf_ln(s
, color
,
968 _("The current patch is empty."));
970 if (!state
->am_empty_patch
)
971 status_printf_ln(s
, color
,
972 _(" (fix conflicts and then run \"git am --continue\")"));
973 status_printf_ln(s
, color
,
974 _(" (use \"git am --skip\" to skip this patch)"));
975 status_printf_ln(s
, color
,
976 _(" (use \"git am --abort\" to restore the original branch)"));
978 wt_status_print_trailer(s
);
981 static char *read_line_from_git_path(const char *filename
)
983 struct strbuf buf
= STRBUF_INIT
;
984 FILE *fp
= fopen(git_path("%s", filename
), "r");
986 strbuf_release(&buf
);
989 strbuf_getline(&buf
, fp
, '\n');
991 return strbuf_detach(&buf
, NULL
);
993 strbuf_release(&buf
);
998 static int split_commit_in_progress(struct wt_status
*s
)
1000 int split_in_progress
= 0;
1001 char *head
= read_line_from_git_path("HEAD");
1002 char *orig_head
= read_line_from_git_path("ORIG_HEAD");
1003 char *rebase_amend
= read_line_from_git_path("rebase-merge/amend");
1004 char *rebase_orig_head
= read_line_from_git_path("rebase-merge/orig-head");
1006 if (!head
|| !orig_head
|| !rebase_amend
|| !rebase_orig_head
||
1007 !s
->branch
|| strcmp(s
->branch
, "HEAD"))
1008 return split_in_progress
;
1010 if (!strcmp(rebase_amend
, rebase_orig_head
)) {
1011 if (strcmp(head
, rebase_amend
))
1012 split_in_progress
= 1;
1013 } else if (strcmp(orig_head
, rebase_orig_head
)) {
1014 split_in_progress
= 1;
1017 if (!s
->amend
&& !s
->nowarn
&& !s
->workdir_dirty
)
1018 split_in_progress
= 0;
1023 free(rebase_orig_head
);
1024 return split_in_progress
;
1027 static void show_rebase_in_progress(struct wt_status
*s
,
1028 struct wt_status_state
*state
,
1033 if (has_unmerged(s
)) {
1035 status_printf_ln(s
, color
,
1036 _("You are currently rebasing branch '%s' on '%s'."),
1040 status_printf_ln(s
, color
,
1041 _("You are currently rebasing."));
1043 status_printf_ln(s
, color
,
1044 _(" (fix conflicts and then run \"git rebase --continue\")"));
1045 status_printf_ln(s
, color
,
1046 _(" (use \"git rebase --skip\" to skip this patch)"));
1047 status_printf_ln(s
, color
,
1048 _(" (use \"git rebase --abort\" to check out the original branch)"));
1050 } else if (state
->rebase_in_progress
|| !stat(git_path("MERGE_MSG"), &st
)) {
1052 status_printf_ln(s
, color
,
1053 _("You are currently rebasing branch '%s' on '%s'."),
1057 status_printf_ln(s
, color
,
1058 _("You are currently rebasing."));
1060 status_printf_ln(s
, color
,
1061 _(" (all conflicts fixed: run \"git rebase --continue\")"));
1062 } else if (split_commit_in_progress(s
)) {
1064 status_printf_ln(s
, color
,
1065 _("You are currently splitting a commit while rebasing branch '%s' on '%s'."),
1069 status_printf_ln(s
, color
,
1070 _("You are currently splitting a commit during a rebase."));
1072 status_printf_ln(s
, color
,
1073 _(" (Once your working directory is clean, run \"git rebase --continue\")"));
1076 status_printf_ln(s
, color
,
1077 _("You are currently editing a commit while rebasing branch '%s' on '%s'."),
1081 status_printf_ln(s
, color
,
1082 _("You are currently editing a commit during a rebase."));
1083 if (s
->hints
&& !s
->amend
) {
1084 status_printf_ln(s
, color
,
1085 _(" (use \"git commit --amend\" to amend the current commit)"));
1086 status_printf_ln(s
, color
,
1087 _(" (use \"git rebase --continue\" once you are satisfied with your changes)"));
1090 wt_status_print_trailer(s
);
1093 static void show_cherry_pick_in_progress(struct wt_status
*s
,
1094 struct wt_status_state
*state
,
1097 status_printf_ln(s
, color
, _("You are currently cherry-picking commit %s."),
1098 find_unique_abbrev(state
->cherry_pick_head_sha1
, DEFAULT_ABBREV
));
1100 if (has_unmerged(s
))
1101 status_printf_ln(s
, color
,
1102 _(" (fix conflicts and run \"git cherry-pick --continue\")"));
1104 status_printf_ln(s
, color
,
1105 _(" (all conflicts fixed: run \"git cherry-pick --continue\")"));
1106 status_printf_ln(s
, color
,
1107 _(" (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"));
1109 wt_status_print_trailer(s
);
1112 static void show_revert_in_progress(struct wt_status
*s
,
1113 struct wt_status_state
*state
,
1116 status_printf_ln(s
, color
, _("You are currently reverting commit %s."),
1117 find_unique_abbrev(state
->revert_head_sha1
, DEFAULT_ABBREV
));
1119 if (has_unmerged(s
))
1120 status_printf_ln(s
, color
,
1121 _(" (fix conflicts and run \"git revert --continue\")"));
1123 status_printf_ln(s
, color
,
1124 _(" (all conflicts fixed: run \"git revert --continue\")"));
1125 status_printf_ln(s
, color
,
1126 _(" (use \"git revert --abort\" to cancel the revert operation)"));
1128 wt_status_print_trailer(s
);
1131 static void show_bisect_in_progress(struct wt_status
*s
,
1132 struct wt_status_state
*state
,
1136 status_printf_ln(s
, color
,
1137 _("You are currently bisecting, started from branch '%s'."),
1140 status_printf_ln(s
, color
,
1141 _("You are currently bisecting."));
1143 status_printf_ln(s
, color
,
1144 _(" (use \"git bisect reset\" to get back to the original branch)"));
1145 wt_status_print_trailer(s
);
1149 * Extract branch information from rebase/bisect
1151 static char *read_and_strip_branch(const char *path
)
1153 struct strbuf sb
= STRBUF_INIT
;
1154 unsigned char sha1
[20];
1156 if (strbuf_read_file(&sb
, git_path("%s", path
), 0) <= 0)
1159 while (sb
.len
&& sb
.buf
[sb
.len
- 1] == '\n')
1160 strbuf_setlen(&sb
, sb
.len
- 1);
1163 if (starts_with(sb
.buf
, "refs/heads/"))
1164 strbuf_remove(&sb
,0, strlen("refs/heads/"));
1165 else if (starts_with(sb
.buf
, "refs/"))
1167 else if (!get_sha1_hex(sb
.buf
, sha1
)) {
1169 abbrev
= find_unique_abbrev(sha1
, DEFAULT_ABBREV
);
1171 strbuf_addstr(&sb
, abbrev
);
1172 } else if (!strcmp(sb
.buf
, "detached HEAD")) /* rebase */
1176 return strbuf_detach(&sb
, NULL
);
1179 strbuf_release(&sb
);
1183 struct grab_1st_switch_cbdata
{
1185 unsigned char nsha1
[20];
1188 static int grab_1st_switch(unsigned char *osha1
, unsigned char *nsha1
,
1189 const char *email
, unsigned long timestamp
, int tz
,
1190 const char *message
, void *cb_data
)
1192 struct grab_1st_switch_cbdata
*cb
= cb_data
;
1193 const char *target
= NULL
, *end
;
1195 if (!starts_with(message
, "checkout: moving from "))
1197 message
+= strlen("checkout: moving from ");
1198 target
= strstr(message
, " to ");
1201 target
+= strlen(" to ");
1202 strbuf_reset(&cb
->buf
);
1203 hashcpy(cb
->nsha1
, nsha1
);
1204 for (end
= target
; *end
&& *end
!= '\n'; end
++)
1206 strbuf_add(&cb
->buf
, target
, end
- target
);
1210 static void wt_status_get_detached_from(struct wt_status_state
*state
)
1212 struct grab_1st_switch_cbdata cb
;
1213 struct commit
*commit
;
1214 unsigned char sha1
[20];
1217 strbuf_init(&cb
.buf
, 0);
1218 if (for_each_reflog_ent_reverse("HEAD", grab_1st_switch
, &cb
) <= 0) {
1219 strbuf_release(&cb
.buf
);
1223 if (dwim_ref(cb
.buf
.buf
, cb
.buf
.len
, sha1
, &ref
) == 1 &&
1224 /* sha1 is a commit? match without further lookup */
1225 (!hashcmp(cb
.nsha1
, sha1
) ||
1226 /* perhaps sha1 is a tag, try to dereference to a commit */
1227 ((commit
= lookup_commit_reference_gently(sha1
, 1)) != NULL
&&
1228 !hashcmp(cb
.nsha1
, commit
->object
.sha1
)))) {
1230 if (starts_with(ref
, "refs/tags/"))
1231 ofs
= strlen("refs/tags/");
1232 else if (starts_with(ref
, "refs/remotes/"))
1233 ofs
= strlen("refs/remotes/");
1236 state
->detached_from
= xstrdup(ref
+ ofs
);
1238 state
->detached_from
=
1239 xstrdup(find_unique_abbrev(cb
.nsha1
, DEFAULT_ABBREV
));
1240 hashcpy(state
->detached_sha1
, cb
.nsha1
);
1241 state
->detached_at
= !get_sha1("HEAD", sha1
) &&
1242 !hashcmp(sha1
, state
->detached_sha1
);
1245 strbuf_release(&cb
.buf
);
1248 void wt_status_get_state(struct wt_status_state
*state
,
1249 int get_detached_from
)
1252 unsigned char sha1
[20];
1254 if (!stat(git_path("MERGE_HEAD"), &st
)) {
1255 state
->merge_in_progress
= 1;
1256 } else if (!stat(git_path("rebase-apply"), &st
)) {
1257 if (!stat(git_path("rebase-apply/applying"), &st
)) {
1258 state
->am_in_progress
= 1;
1259 if (!stat(git_path("rebase-apply/patch"), &st
) && !st
.st_size
)
1260 state
->am_empty_patch
= 1;
1262 state
->rebase_in_progress
= 1;
1263 state
->branch
= read_and_strip_branch("rebase-apply/head-name");
1264 state
->onto
= read_and_strip_branch("rebase-apply/onto");
1266 } else if (!stat(git_path("rebase-merge"), &st
)) {
1267 if (!stat(git_path("rebase-merge/interactive"), &st
))
1268 state
->rebase_interactive_in_progress
= 1;
1270 state
->rebase_in_progress
= 1;
1271 state
->branch
= read_and_strip_branch("rebase-merge/head-name");
1272 state
->onto
= read_and_strip_branch("rebase-merge/onto");
1273 } else if (!stat(git_path("CHERRY_PICK_HEAD"), &st
) &&
1274 !get_sha1("CHERRY_PICK_HEAD", sha1
)) {
1275 state
->cherry_pick_in_progress
= 1;
1276 hashcpy(state
->cherry_pick_head_sha1
, sha1
);
1278 if (!stat(git_path("BISECT_LOG"), &st
)) {
1279 state
->bisect_in_progress
= 1;
1280 state
->branch
= read_and_strip_branch("BISECT_START");
1282 if (!stat(git_path("REVERT_HEAD"), &st
) &&
1283 !get_sha1("REVERT_HEAD", sha1
)) {
1284 state
->revert_in_progress
= 1;
1285 hashcpy(state
->revert_head_sha1
, sha1
);
1288 if (get_detached_from
)
1289 wt_status_get_detached_from(state
);
1292 static void wt_status_print_state(struct wt_status
*s
,
1293 struct wt_status_state
*state
)
1295 const char *state_color
= color(WT_STATUS_HEADER
, s
);
1296 if (state
->merge_in_progress
)
1297 show_merge_in_progress(s
, state
, state_color
);
1298 else if (state
->am_in_progress
)
1299 show_am_in_progress(s
, state
, state_color
);
1300 else if (state
->rebase_in_progress
|| state
->rebase_interactive_in_progress
)
1301 show_rebase_in_progress(s
, state
, state_color
);
1302 else if (state
->cherry_pick_in_progress
)
1303 show_cherry_pick_in_progress(s
, state
, state_color
);
1304 else if (state
->revert_in_progress
)
1305 show_revert_in_progress(s
, state
, state_color
);
1306 if (state
->bisect_in_progress
)
1307 show_bisect_in_progress(s
, state
, state_color
);
1310 void wt_status_print(struct wt_status
*s
)
1312 const char *branch_color
= color(WT_STATUS_ONBRANCH
, s
);
1313 const char *branch_status_color
= color(WT_STATUS_HEADER
, s
);
1314 struct wt_status_state state
;
1316 memset(&state
, 0, sizeof(state
));
1317 wt_status_get_state(&state
,
1318 s
->branch
&& !strcmp(s
->branch
, "HEAD"));
1321 const char *on_what
= _("On branch ");
1322 const char *branch_name
= s
->branch
;
1323 if (starts_with(branch_name
, "refs/heads/"))
1325 else if (!strcmp(branch_name
, "HEAD")) {
1326 branch_status_color
= color(WT_STATUS_NOBRANCH
, s
);
1327 if (state
.rebase_in_progress
|| state
.rebase_interactive_in_progress
) {
1328 on_what
= _("rebase in progress; onto ");
1329 branch_name
= state
.onto
;
1330 } else if (state
.detached_from
) {
1331 branch_name
= state
.detached_from
;
1332 if (state
.detached_at
)
1333 on_what
= _("HEAD detached at ");
1335 on_what
= _("HEAD detached from ");
1338 on_what
= _("Not currently on any branch.");
1341 status_printf(s
, color(WT_STATUS_HEADER
, s
), "%s", "");
1342 status_printf_more(s
, branch_status_color
, "%s", on_what
);
1343 status_printf_more(s
, branch_color
, "%s\n", branch_name
);
1345 wt_status_print_tracking(s
);
1348 wt_status_print_state(s
, &state
);
1351 free(state
.detached_from
);
1353 if (s
->is_initial
) {
1354 status_printf_ln(s
, color(WT_STATUS_HEADER
, s
), "%s", "");
1355 status_printf_ln(s
, color(WT_STATUS_HEADER
, s
), _("Initial commit"));
1356 status_printf_ln(s
, color(WT_STATUS_HEADER
, s
), "%s", "");
1359 wt_status_print_updated(s
);
1360 wt_status_print_unmerged(s
);
1361 wt_status_print_changed(s
);
1362 if (s
->submodule_summary
&&
1363 (!s
->ignore_submodule_arg
||
1364 strcmp(s
->ignore_submodule_arg
, "all"))) {
1365 wt_status_print_submodule_summary(s
, 0); /* staged */
1366 wt_status_print_submodule_summary(s
, 1); /* unstaged */
1368 if (s
->show_untracked_files
) {
1369 wt_status_print_other(s
, &s
->untracked
, _("Untracked files"), "add");
1370 if (s
->show_ignored_files
)
1371 wt_status_print_other(s
, &s
->ignored
, _("Ignored files"), "add -f");
1372 if (advice_status_u_option
&& 2000 < s
->untracked_in_ms
) {
1373 status_printf_ln(s
, GIT_COLOR_NORMAL
, "%s", "");
1374 status_printf_ln(s
, GIT_COLOR_NORMAL
,
1375 _("It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1376 "may speed it up, but you have to be careful not to forget to add\n"
1377 "new files yourself (see 'git help status')."),
1378 s
->untracked_in_ms
/ 1000.0);
1380 } else if (s
->commitable
)
1381 status_printf_ln(s
, GIT_COLOR_NORMAL
, _("Untracked files not listed%s"),
1383 ? _(" (use -u option to show untracked files)") : "");
1386 wt_status_print_verbose(s
);
1387 if (!s
->commitable
) {
1389 status_printf_ln(s
, GIT_COLOR_NORMAL
, _("No changes"));
1392 else if (s
->workdir_dirty
) {
1394 printf(_("no changes added to commit "
1395 "(use \"git add\" and/or \"git commit -a\")\n"));
1397 printf(_("no changes added to commit\n"));
1398 } else if (s
->untracked
.nr
) {
1400 printf(_("nothing added to commit but untracked files "
1401 "present (use \"git add\" to track)\n"));
1403 printf(_("nothing added to commit but untracked files present\n"));
1404 } else if (s
->is_initial
) {
1406 printf(_("nothing to commit (create/copy files "
1407 "and use \"git add\" to track)\n"));
1409 printf(_("nothing to commit\n"));
1410 } else if (!s
->show_untracked_files
) {
1412 printf(_("nothing to commit (use -u to show untracked files)\n"));
1414 printf(_("nothing to commit\n"));
1416 printf(_("nothing to commit, working directory clean\n"));
1420 static void wt_shortstatus_unmerged(struct string_list_item
*it
,
1421 struct wt_status
*s
)
1423 struct wt_status_change_data
*d
= it
->util
;
1424 const char *how
= "??";
1426 switch (d
->stagemask
) {
1427 case 1: how
= "DD"; break; /* both deleted */
1428 case 2: how
= "AU"; break; /* added by us */
1429 case 3: how
= "UD"; break; /* deleted by them */
1430 case 4: how
= "UA"; break; /* added by them */
1431 case 5: how
= "DU"; break; /* deleted by us */
1432 case 6: how
= "AA"; break; /* both added */
1433 case 7: how
= "UU"; break; /* both modified */
1435 color_fprintf(s
->fp
, color(WT_STATUS_UNMERGED
, s
), "%s", how
);
1436 if (s
->null_termination
) {
1437 fprintf(stdout
, " %s%c", it
->string
, 0);
1439 struct strbuf onebuf
= STRBUF_INIT
;
1441 one
= quote_path(it
->string
, s
->prefix
, &onebuf
);
1442 printf(" %s\n", one
);
1443 strbuf_release(&onebuf
);
1447 static void wt_shortstatus_status(struct string_list_item
*it
,
1448 struct wt_status
*s
)
1450 struct wt_status_change_data
*d
= it
->util
;
1452 if (d
->index_status
)
1453 color_fprintf(s
->fp
, color(WT_STATUS_UPDATED
, s
), "%c", d
->index_status
);
1456 if (d
->worktree_status
)
1457 color_fprintf(s
->fp
, color(WT_STATUS_CHANGED
, s
), "%c", d
->worktree_status
);
1461 if (s
->null_termination
) {
1462 fprintf(stdout
, "%s%c", it
->string
, 0);
1464 fprintf(stdout
, "%s%c", d
->head_path
, 0);
1466 struct strbuf onebuf
= STRBUF_INIT
;
1469 one
= quote_path(d
->head_path
, s
->prefix
, &onebuf
);
1470 if (*one
!= '"' && strchr(one
, ' ') != NULL
) {
1472 strbuf_addch(&onebuf
, '"');
1475 printf("%s -> ", one
);
1476 strbuf_release(&onebuf
);
1478 one
= quote_path(it
->string
, s
->prefix
, &onebuf
);
1479 if (*one
!= '"' && strchr(one
, ' ') != NULL
) {
1481 strbuf_addch(&onebuf
, '"');
1484 printf("%s\n", one
);
1485 strbuf_release(&onebuf
);
1489 static void wt_shortstatus_other(struct string_list_item
*it
,
1490 struct wt_status
*s
, const char *sign
)
1492 if (s
->null_termination
) {
1493 fprintf(stdout
, "%s %s%c", sign
, it
->string
, 0);
1495 struct strbuf onebuf
= STRBUF_INIT
;
1497 one
= quote_path(it
->string
, s
->prefix
, &onebuf
);
1498 color_fprintf(s
->fp
, color(WT_STATUS_UNTRACKED
, s
), "%s", sign
);
1499 printf(" %s\n", one
);
1500 strbuf_release(&onebuf
);
1504 static void wt_shortstatus_print_tracking(struct wt_status
*s
)
1506 struct branch
*branch
;
1507 const char *header_color
= color(WT_STATUS_HEADER
, s
);
1508 const char *branch_color_local
= color(WT_STATUS_LOCAL_BRANCH
, s
);
1509 const char *branch_color_remote
= color(WT_STATUS_REMOTE_BRANCH
, s
);
1512 const char *branch_name
;
1513 int num_ours
, num_theirs
;
1514 int upstream_is_gone
= 0;
1516 color_fprintf(s
->fp
, color(WT_STATUS_HEADER
, s
), "## ");
1520 branch_name
= s
->branch
;
1522 if (starts_with(branch_name
, "refs/heads/"))
1524 else if (!strcmp(branch_name
, "HEAD")) {
1525 branch_name
= _("HEAD (no branch)");
1526 branch_color_local
= color(WT_STATUS_NOBRANCH
, s
);
1529 branch
= branch_get(s
->branch
+ 11);
1531 color_fprintf(s
->fp
, header_color
, _("Initial commit on "));
1533 color_fprintf(s
->fp
, branch_color_local
, "%s", branch_name
);
1535 switch (stat_tracking_info(branch
, &num_ours
, &num_theirs
)) {
1538 fputc(s
->null_termination
? '\0' : '\n', s
->fp
);
1541 /* with "gone" base */
1542 upstream_is_gone
= 1;
1549 base
= branch
->merge
[0]->dst
;
1550 base
= shorten_unambiguous_ref(base
, 0);
1551 color_fprintf(s
->fp
, header_color
, "...");
1552 color_fprintf(s
->fp
, branch_color_remote
, "%s", base
);
1555 if (!upstream_is_gone
&& !num_ours
&& !num_theirs
) {
1556 fputc(s
->null_termination
? '\0' : '\n', s
->fp
);
1560 #define LABEL(string) (s->no_gettext ? (string) : _(string))
1562 color_fprintf(s
->fp
, header_color
, " [");
1563 if (upstream_is_gone
) {
1564 color_fprintf(s
->fp
, header_color
, LABEL(N_("gone")));
1565 } else if (!num_ours
) {
1566 color_fprintf(s
->fp
, header_color
, LABEL(N_("behind ")));
1567 color_fprintf(s
->fp
, branch_color_remote
, "%d", num_theirs
);
1568 } else if (!num_theirs
) {
1569 color_fprintf(s
->fp
, header_color
, LABEL(N_(("ahead "))));
1570 color_fprintf(s
->fp
, branch_color_local
, "%d", num_ours
);
1572 color_fprintf(s
->fp
, header_color
, LABEL(N_(("ahead "))));
1573 color_fprintf(s
->fp
, branch_color_local
, "%d", num_ours
);
1574 color_fprintf(s
->fp
, header_color
, ", %s", LABEL(N_("behind ")));
1575 color_fprintf(s
->fp
, branch_color_remote
, "%d", num_theirs
);
1578 color_fprintf(s
->fp
, header_color
, "]");
1579 fputc(s
->null_termination
? '\0' : '\n', s
->fp
);
1582 void wt_shortstatus_print(struct wt_status
*s
)
1587 wt_shortstatus_print_tracking(s
);
1589 for (i
= 0; i
< s
->change
.nr
; i
++) {
1590 struct wt_status_change_data
*d
;
1591 struct string_list_item
*it
;
1593 it
= &(s
->change
.items
[i
]);
1596 wt_shortstatus_unmerged(it
, s
);
1598 wt_shortstatus_status(it
, s
);
1600 for (i
= 0; i
< s
->untracked
.nr
; i
++) {
1601 struct string_list_item
*it
;
1603 it
= &(s
->untracked
.items
[i
]);
1604 wt_shortstatus_other(it
, s
, "??");
1606 for (i
= 0; i
< s
->ignored
.nr
; i
++) {
1607 struct string_list_item
*it
;
1609 it
= &(s
->ignored
.items
[i
]);
1610 wt_shortstatus_other(it
, s
, "!!");
1614 void wt_porcelain_print(struct wt_status
*s
)
1617 s
->relative_paths
= 0;
1620 wt_shortstatus_print(s
);