11 #include "run-command.h"
12 #include "argv-array.h"
15 #include "submodule.h"
20 static const char cut_line
[] =
21 "------------------------ >8 ------------------------\n";
23 static char default_wt_status_colors
[][COLOR_MAXLEN
] = {
24 GIT_COLOR_NORMAL
, /* WT_STATUS_HEADER */
25 GIT_COLOR_GREEN
, /* WT_STATUS_UPDATED */
26 GIT_COLOR_RED
, /* WT_STATUS_CHANGED */
27 GIT_COLOR_RED
, /* WT_STATUS_UNTRACKED */
28 GIT_COLOR_RED
, /* WT_STATUS_NOBRANCH */
29 GIT_COLOR_RED
, /* WT_STATUS_UNMERGED */
30 GIT_COLOR_GREEN
, /* WT_STATUS_LOCAL_BRANCH */
31 GIT_COLOR_RED
, /* WT_STATUS_REMOTE_BRANCH */
32 GIT_COLOR_NIL
, /* WT_STATUS_ONBRANCH */
35 static const char *color(int slot
, struct wt_status
*s
)
38 if (want_color(s
->use_color
))
39 c
= s
->color_palette
[slot
];
40 if (slot
== WT_STATUS_ONBRANCH
&& color_is_nil(c
))
41 c
= s
->color_palette
[WT_STATUS_HEADER
];
45 static void status_vprintf(struct wt_status
*s
, int at_bol
, const char *color
,
46 const char *fmt
, va_list ap
, const char *trail
)
48 struct strbuf sb
= STRBUF_INIT
;
49 struct strbuf linebuf
= STRBUF_INIT
;
50 const char *line
, *eol
;
52 strbuf_vaddf(&sb
, fmt
, ap
);
54 if (s
->display_comment_prefix
) {
55 strbuf_addch(&sb
, comment_line_char
);
57 strbuf_addch(&sb
, ' ');
59 color_print_strbuf(s
->fp
, color
, &sb
);
61 fprintf(s
->fp
, "%s", trail
);
65 for (line
= sb
.buf
; *line
; line
= eol
+ 1) {
66 eol
= strchr(line
, '\n');
68 strbuf_reset(&linebuf
);
69 if (at_bol
&& s
->display_comment_prefix
) {
70 strbuf_addch(&linebuf
, comment_line_char
);
71 if (*line
!= '\n' && *line
!= '\t')
72 strbuf_addch(&linebuf
, ' ');
75 strbuf_add(&linebuf
, line
, eol
- line
);
77 strbuf_addstr(&linebuf
, line
);
78 color_print_strbuf(s
->fp
, color
, &linebuf
);
86 fprintf(s
->fp
, "%s", trail
);
87 strbuf_release(&linebuf
);
91 void status_printf_ln(struct wt_status
*s
, const char *color
,
97 status_vprintf(s
, 1, color
, fmt
, ap
, "\n");
101 void status_printf(struct wt_status
*s
, const char *color
,
102 const char *fmt
, ...)
107 status_vprintf(s
, 1, color
, fmt
, ap
, NULL
);
111 static void status_printf_more(struct wt_status
*s
, const char *color
,
112 const char *fmt
, ...)
117 status_vprintf(s
, 0, color
, fmt
, ap
, NULL
);
121 void wt_status_prepare(struct wt_status
*s
)
123 unsigned char sha1
[20];
125 memset(s
, 0, sizeof(*s
));
126 memcpy(s
->color_palette
, default_wt_status_colors
,
127 sizeof(default_wt_status_colors
));
128 s
->show_untracked_files
= SHOW_NORMAL_UNTRACKED_FILES
;
130 s
->relative_paths
= 1;
131 s
->branch
= resolve_refdup("HEAD", sha1
, 0, NULL
);
132 s
->reference
= "HEAD";
134 s
->index_file
= get_index_file();
135 s
->change
.strdup_strings
= 1;
136 s
->untracked
.strdup_strings
= 1;
137 s
->ignored
.strdup_strings
= 1;
138 s
->show_branch
= -1; /* unspecified */
139 s
->display_comment_prefix
= 0;
142 static void wt_status_print_unmerged_header(struct wt_status
*s
)
145 int del_mod_conflict
= 0;
146 int both_deleted
= 0;
148 const char *c
= color(WT_STATUS_HEADER
, s
);
150 status_printf_ln(s
, c
, _("Unmerged paths:"));
152 for (i
= 0; i
< s
->change
.nr
; i
++) {
153 struct string_list_item
*it
= &(s
->change
.items
[i
]);
154 struct wt_status_change_data
*d
= it
->util
;
156 switch (d
->stagemask
) {
164 del_mod_conflict
= 1;
174 if (s
->whence
!= FROM_COMMIT
)
176 else if (!s
->is_initial
)
177 status_printf_ln(s
, c
, _(" (use \"git reset %s <file>...\" to unstage)"), s
->reference
);
179 status_printf_ln(s
, c
, _(" (use \"git rm --cached <file>...\" to unstage)"));
182 if (!del_mod_conflict
)
183 status_printf_ln(s
, c
, _(" (use \"git add <file>...\" to mark resolution)"));
185 status_printf_ln(s
, c
, _(" (use \"git add/rm <file>...\" as appropriate to mark resolution)"));
186 } else if (!del_mod_conflict
&& !not_deleted
) {
187 status_printf_ln(s
, c
, _(" (use \"git rm <file>...\" to mark resolution)"));
189 status_printf_ln(s
, c
, _(" (use \"git add/rm <file>...\" as appropriate to mark resolution)"));
191 status_printf_ln(s
, c
, "%s", "");
194 static void wt_status_print_cached_header(struct wt_status
*s
)
196 const char *c
= color(WT_STATUS_HEADER
, s
);
198 status_printf_ln(s
, c
, _("Changes to be committed:"));
201 if (s
->whence
!= FROM_COMMIT
)
202 ; /* NEEDSWORK: use "git reset --unresolve"??? */
203 else if (!s
->is_initial
)
204 status_printf_ln(s
, c
, _(" (use \"git reset %s <file>...\" to unstage)"), s
->reference
);
206 status_printf_ln(s
, c
, _(" (use \"git rm --cached <file>...\" to unstage)"));
207 status_printf_ln(s
, c
, "%s", "");
210 static void wt_status_print_dirty_header(struct wt_status
*s
,
212 int has_dirty_submodules
)
214 const char *c
= color(WT_STATUS_HEADER
, s
);
216 status_printf_ln(s
, c
, _("Changes not staged for commit:"));
220 status_printf_ln(s
, c
, _(" (use \"git add <file>...\" to update what will be committed)"));
222 status_printf_ln(s
, c
, _(" (use \"git add/rm <file>...\" to update what will be committed)"));
223 status_printf_ln(s
, c
, _(" (use \"git checkout -- <file>...\" to discard changes in working directory)"));
224 if (has_dirty_submodules
)
225 status_printf_ln(s
, c
, _(" (commit or discard the untracked or modified content in submodules)"));
226 status_printf_ln(s
, c
, "%s", "");
229 static void wt_status_print_other_header(struct wt_status
*s
,
233 const char *c
= color(WT_STATUS_HEADER
, s
);
234 status_printf_ln(s
, c
, "%s:", what
);
237 status_printf_ln(s
, c
, _(" (use \"git %s <file>...\" to include in what will be committed)"), how
);
238 status_printf_ln(s
, c
, "%s", "");
241 static void wt_status_print_trailer(struct wt_status
*s
)
243 status_printf_ln(s
, color(WT_STATUS_HEADER
, s
), "%s", "");
246 #define quote_path quote_path_relative
248 static const char *wt_status_unmerged_status_string(int stagemask
)
252 return _("both deleted:");
254 return _("added by us:");
256 return _("deleted by them:");
258 return _("added by them:");
260 return _("deleted by us:");
262 return _("both added:");
264 return _("both modified:");
266 die(_("bug: unhandled unmerged status %x"), stagemask
);
270 static const char *wt_status_diff_status_string(int status
)
273 case DIFF_STATUS_ADDED
:
274 return _("new file:");
275 case DIFF_STATUS_COPIED
:
277 case DIFF_STATUS_DELETED
:
278 return _("deleted:");
279 case DIFF_STATUS_MODIFIED
:
280 return _("modified:");
281 case DIFF_STATUS_RENAMED
:
282 return _("renamed:");
283 case DIFF_STATUS_TYPE_CHANGED
:
284 return _("typechange:");
285 case DIFF_STATUS_UNKNOWN
:
286 return _("unknown:");
287 case DIFF_STATUS_UNMERGED
:
288 return _("unmerged:");
294 static int maxwidth(const char *(*label
)(int), int minval
, int maxval
)
298 for (i
= minval
; i
<= maxval
; i
++) {
299 const char *s
= label(i
);
300 int len
= s
? utf8_strwidth(s
) : 0;
307 static void wt_status_print_unmerged_data(struct wt_status
*s
,
308 struct string_list_item
*it
)
310 const char *c
= color(WT_STATUS_UNMERGED
, s
);
311 struct wt_status_change_data
*d
= it
->util
;
312 struct strbuf onebuf
= STRBUF_INIT
;
313 static char *padding
;
314 static int label_width
;
315 const char *one
, *how
;
319 label_width
= maxwidth(wt_status_unmerged_status_string
, 1, 7);
320 label_width
+= strlen(" ");
321 padding
= xmallocz(label_width
);
322 memset(padding
, ' ', label_width
);
325 one
= quote_path(it
->string
, s
->prefix
, &onebuf
);
326 status_printf(s
, color(WT_STATUS_HEADER
, s
), "\t");
328 how
= wt_status_unmerged_status_string(d
->stagemask
);
329 len
= label_width
- utf8_strwidth(how
);
330 status_printf_more(s
, c
, "%s%.*s%s\n", how
, len
, padding
, one
);
331 strbuf_release(&onebuf
);
334 static void wt_status_print_change_data(struct wt_status
*s
,
336 struct string_list_item
*it
)
338 struct wt_status_change_data
*d
= it
->util
;
339 const char *c
= color(change_type
, s
);
343 const char *one
, *two
;
344 struct strbuf onebuf
= STRBUF_INIT
, twobuf
= STRBUF_INIT
;
345 struct strbuf extra
= STRBUF_INIT
;
346 static char *padding
;
347 static int label_width
;
352 /* If DIFF_STATUS_* uses outside the range [A..Z], we're in trouble */
353 label_width
= maxwidth(wt_status_diff_status_string
, 'A', 'Z');
354 label_width
+= strlen(" ");
355 padding
= xmallocz(label_width
);
356 memset(padding
, ' ', label_width
);
359 one_name
= two_name
= it
->string
;
360 switch (change_type
) {
361 case WT_STATUS_UPDATED
:
362 status
= d
->index_status
;
364 one_name
= d
->head_path
;
366 case WT_STATUS_CHANGED
:
367 if (d
->new_submodule_commits
|| d
->dirty_submodule
) {
368 strbuf_addstr(&extra
, " (");
369 if (d
->new_submodule_commits
)
370 strbuf_addf(&extra
, _("new commits, "));
371 if (d
->dirty_submodule
& DIRTY_SUBMODULE_MODIFIED
)
372 strbuf_addf(&extra
, _("modified content, "));
373 if (d
->dirty_submodule
& DIRTY_SUBMODULE_UNTRACKED
)
374 strbuf_addf(&extra
, _("untracked content, "));
375 strbuf_setlen(&extra
, extra
.len
- 2);
376 strbuf_addch(&extra
, ')');
378 status
= d
->worktree_status
;
381 die("BUG: unhandled change_type %d in wt_status_print_change_data",
385 one
= quote_path(one_name
, s
->prefix
, &onebuf
);
386 two
= quote_path(two_name
, s
->prefix
, &twobuf
);
388 status_printf(s
, color(WT_STATUS_HEADER
, s
), "\t");
389 what
= wt_status_diff_status_string(status
);
391 die(_("bug: unhandled diff status %c"), status
);
392 len
= label_width
- utf8_strwidth(what
);
394 if (status
== DIFF_STATUS_COPIED
|| status
== DIFF_STATUS_RENAMED
)
395 status_printf_more(s
, c
, "%s%.*s%s -> %s",
396 what
, len
, padding
, one
, two
);
398 status_printf_more(s
, c
, "%s%.*s%s",
399 what
, len
, padding
, one
);
401 status_printf_more(s
, color(WT_STATUS_HEADER
, s
), "%s", extra
.buf
);
402 strbuf_release(&extra
);
404 status_printf_more(s
, GIT_COLOR_NORMAL
, "\n");
405 strbuf_release(&onebuf
);
406 strbuf_release(&twobuf
);
409 static void wt_status_collect_changed_cb(struct diff_queue_struct
*q
,
410 struct diff_options
*options
,
413 struct wt_status
*s
= data
;
418 s
->workdir_dirty
= 1;
419 for (i
= 0; i
< q
->nr
; i
++) {
420 struct diff_filepair
*p
;
421 struct string_list_item
*it
;
422 struct wt_status_change_data
*d
;
425 it
= string_list_insert(&s
->change
, p
->one
->path
);
428 d
= xcalloc(1, sizeof(*d
));
431 if (!d
->worktree_status
)
432 d
->worktree_status
= p
->status
;
433 d
->dirty_submodule
= p
->two
->dirty_submodule
;
434 if (S_ISGITLINK(p
->two
->mode
))
435 d
->new_submodule_commits
= !!hashcmp(p
->one
->sha1
, p
->two
->sha1
);
439 static int unmerged_mask(const char *path
)
442 const struct cache_entry
*ce
;
444 pos
= cache_name_pos(path
, strlen(path
));
450 while (pos
< active_nr
) {
451 ce
= active_cache
[pos
++];
452 if (strcmp(ce
->name
, path
) || !ce_stage(ce
))
454 mask
|= (1 << (ce_stage(ce
) - 1));
459 static void wt_status_collect_updated_cb(struct diff_queue_struct
*q
,
460 struct diff_options
*options
,
463 struct wt_status
*s
= data
;
466 for (i
= 0; i
< q
->nr
; i
++) {
467 struct diff_filepair
*p
;
468 struct string_list_item
*it
;
469 struct wt_status_change_data
*d
;
472 it
= string_list_insert(&s
->change
, p
->two
->path
);
475 d
= xcalloc(1, sizeof(*d
));
478 if (!d
->index_status
)
479 d
->index_status
= p
->status
;
481 case DIFF_STATUS_COPIED
:
482 case DIFF_STATUS_RENAMED
:
483 d
->head_path
= xstrdup(p
->one
->path
);
485 case DIFF_STATUS_UNMERGED
:
486 d
->stagemask
= unmerged_mask(p
->two
->path
);
492 static void wt_status_collect_changes_worktree(struct wt_status
*s
)
496 init_revisions(&rev
, NULL
);
497 setup_revisions(0, NULL
, &rev
, NULL
);
498 rev
.diffopt
.output_format
|= DIFF_FORMAT_CALLBACK
;
499 DIFF_OPT_SET(&rev
.diffopt
, DIRTY_SUBMODULES
);
500 if (!s
->show_untracked_files
)
501 DIFF_OPT_SET(&rev
.diffopt
, IGNORE_UNTRACKED_IN_SUBMODULES
);
502 if (s
->ignore_submodule_arg
) {
503 DIFF_OPT_SET(&rev
.diffopt
, OVERRIDE_SUBMODULE_CONFIG
);
504 handle_ignore_submodules_arg(&rev
.diffopt
, s
->ignore_submodule_arg
);
506 rev
.diffopt
.format_callback
= wt_status_collect_changed_cb
;
507 rev
.diffopt
.format_callback_data
= s
;
508 copy_pathspec(&rev
.prune_data
, &s
->pathspec
);
509 run_diff_files(&rev
, 0);
512 static void wt_status_collect_changes_index(struct wt_status
*s
)
515 struct setup_revision_opt opt
;
517 init_revisions(&rev
, NULL
);
518 memset(&opt
, 0, sizeof(opt
));
519 opt
.def
= s
->is_initial
? EMPTY_TREE_SHA1_HEX
: s
->reference
;
520 setup_revisions(0, NULL
, &rev
, &opt
);
522 DIFF_OPT_SET(&rev
.diffopt
, OVERRIDE_SUBMODULE_CONFIG
);
523 if (s
->ignore_submodule_arg
) {
524 handle_ignore_submodules_arg(&rev
.diffopt
, s
->ignore_submodule_arg
);
527 * Unless the user did explicitly request a submodule ignore
528 * mode by passing a command line option we do not ignore any
529 * changed submodule SHA-1s when comparing index and HEAD, no
530 * matter what is configured. Otherwise the user won't be
531 * shown any submodules she manually added (and which are
532 * staged to be committed), which would be really confusing.
534 handle_ignore_submodules_arg(&rev
.diffopt
, "dirty");
537 rev
.diffopt
.output_format
|= DIFF_FORMAT_CALLBACK
;
538 rev
.diffopt
.format_callback
= wt_status_collect_updated_cb
;
539 rev
.diffopt
.format_callback_data
= s
;
540 rev
.diffopt
.detect_rename
= 1;
541 rev
.diffopt
.rename_limit
= 200;
542 rev
.diffopt
.break_opt
= 0;
543 copy_pathspec(&rev
.prune_data
, &s
->pathspec
);
544 run_diff_index(&rev
, 1);
547 static void wt_status_collect_changes_initial(struct wt_status
*s
)
551 for (i
= 0; i
< active_nr
; i
++) {
552 struct string_list_item
*it
;
553 struct wt_status_change_data
*d
;
554 const struct cache_entry
*ce
= active_cache
[i
];
556 if (!ce_path_match(ce
, &s
->pathspec
, NULL
))
558 it
= string_list_insert(&s
->change
, ce
->name
);
561 d
= xcalloc(1, sizeof(*d
));
565 d
->index_status
= DIFF_STATUS_UNMERGED
;
566 d
->stagemask
|= (1 << (ce_stage(ce
) - 1));
569 d
->index_status
= DIFF_STATUS_ADDED
;
573 static void wt_status_collect_untracked(struct wt_status
*s
)
576 struct dir_struct dir
;
577 uint64_t t_begin
= getnanotime();
579 if (!s
->show_untracked_files
)
582 memset(&dir
, 0, sizeof(dir
));
583 if (s
->show_untracked_files
!= SHOW_ALL_UNTRACKED_FILES
)
585 DIR_SHOW_OTHER_DIRECTORIES
| DIR_HIDE_EMPTY_DIRECTORIES
;
586 if (s
->show_ignored_files
)
587 dir
.flags
|= DIR_SHOW_IGNORED_TOO
;
588 setup_standard_excludes(&dir
);
590 fill_directory(&dir
, &s
->pathspec
);
592 for (i
= 0; i
< dir
.nr
; i
++) {
593 struct dir_entry
*ent
= dir
.entries
[i
];
594 if (cache_name_is_other(ent
->name
, ent
->len
) &&
595 dir_path_match(ent
, &s
->pathspec
, 0, NULL
))
596 string_list_insert(&s
->untracked
, ent
->name
);
600 for (i
= 0; i
< dir
.ignored_nr
; i
++) {
601 struct dir_entry
*ent
= dir
.ignored
[i
];
602 if (cache_name_is_other(ent
->name
, ent
->len
) &&
603 dir_path_match(ent
, &s
->pathspec
, 0, NULL
))
604 string_list_insert(&s
->ignored
, ent
->name
);
610 clear_directory(&dir
);
612 if (advice_status_u_option
)
613 s
->untracked_in_ms
= (getnanotime() - t_begin
) / 1000000;
616 void wt_status_collect(struct wt_status
*s
)
618 wt_status_collect_changes_worktree(s
);
621 wt_status_collect_changes_initial(s
);
623 wt_status_collect_changes_index(s
);
624 wt_status_collect_untracked(s
);
627 static void wt_status_print_unmerged(struct wt_status
*s
)
629 int shown_header
= 0;
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
]);
640 wt_status_print_unmerged_header(s
);
643 wt_status_print_unmerged_data(s
, it
);
646 wt_status_print_trailer(s
);
650 static void wt_status_print_updated(struct wt_status
*s
)
652 int shown_header
= 0;
655 for (i
= 0; i
< s
->change
.nr
; i
++) {
656 struct wt_status_change_data
*d
;
657 struct string_list_item
*it
;
658 it
= &(s
->change
.items
[i
]);
660 if (!d
->index_status
||
661 d
->index_status
== DIFF_STATUS_UNMERGED
)
664 wt_status_print_cached_header(s
);
668 wt_status_print_change_data(s
, WT_STATUS_UPDATED
, it
);
671 wt_status_print_trailer(s
);
677 * 1 : some change but no delete
679 static int wt_status_check_worktree_changes(struct wt_status
*s
,
680 int *dirty_submodules
)
685 *dirty_submodules
= 0;
687 for (i
= 0; i
< s
->change
.nr
; i
++) {
688 struct wt_status_change_data
*d
;
689 d
= s
->change
.items
[i
].util
;
690 if (!d
->worktree_status
||
691 d
->worktree_status
== DIFF_STATUS_UNMERGED
)
695 if (d
->dirty_submodule
)
696 *dirty_submodules
= 1;
697 if (d
->worktree_status
== DIFF_STATUS_DELETED
)
703 static void wt_status_print_changed(struct wt_status
*s
)
705 int i
, dirty_submodules
;
706 int worktree_changes
= wt_status_check_worktree_changes(s
, &dirty_submodules
);
708 if (!worktree_changes
)
711 wt_status_print_dirty_header(s
, worktree_changes
< 0, dirty_submodules
);
713 for (i
= 0; i
< s
->change
.nr
; i
++) {
714 struct wt_status_change_data
*d
;
715 struct string_list_item
*it
;
716 it
= &(s
->change
.items
[i
]);
718 if (!d
->worktree_status
||
719 d
->worktree_status
== DIFF_STATUS_UNMERGED
)
721 wt_status_print_change_data(s
, WT_STATUS_CHANGED
, it
);
723 wt_status_print_trailer(s
);
726 static void wt_status_print_submodule_summary(struct wt_status
*s
, int uncommitted
)
728 struct child_process sm_summary
;
729 char summary_limit
[64];
730 char index
[PATH_MAX
];
731 const char *env
[] = { NULL
, NULL
};
732 struct argv_array argv
= ARGV_ARRAY_INIT
;
733 struct strbuf cmd_stdout
= STRBUF_INIT
;
734 struct strbuf summary
= STRBUF_INIT
;
735 char *summary_content
;
738 sprintf(summary_limit
, "%d", s
->submodule_summary
);
739 snprintf(index
, sizeof(index
), "GIT_INDEX_FILE=%s", s
->index_file
);
742 argv_array_push(&argv
, "submodule");
743 argv_array_push(&argv
, "summary");
744 argv_array_push(&argv
, uncommitted
? "--files" : "--cached");
745 argv_array_push(&argv
, "--for-status");
746 argv_array_push(&argv
, "--summary-limit");
747 argv_array_push(&argv
, summary_limit
);
749 argv_array_push(&argv
, s
->amend
? "HEAD^" : "HEAD");
751 memset(&sm_summary
, 0, sizeof(sm_summary
));
752 sm_summary
.argv
= argv
.argv
;
753 sm_summary
.env
= env
;
754 sm_summary
.git_cmd
= 1;
755 sm_summary
.no_stdin
= 1;
759 run_command(&sm_summary
);
760 argv_array_clear(&argv
);
762 len
= strbuf_read(&cmd_stdout
, sm_summary
.out
, 1024);
764 /* prepend header, only if there's an actual output */
767 strbuf_addstr(&summary
, _("Submodules changed but not updated:"));
769 strbuf_addstr(&summary
, _("Submodule changes to be committed:"));
770 strbuf_addstr(&summary
, "\n\n");
772 strbuf_addbuf(&summary
, &cmd_stdout
);
773 strbuf_release(&cmd_stdout
);
775 if (s
->display_comment_prefix
) {
776 summary_content
= strbuf_detach(&summary
, &len
);
777 strbuf_add_commented_lines(&summary
, summary_content
, len
);
778 free(summary_content
);
781 fputs(summary
.buf
, s
->fp
);
782 strbuf_release(&summary
);
785 static void wt_status_print_other(struct wt_status
*s
,
786 struct string_list
*l
,
791 struct strbuf buf
= STRBUF_INIT
;
792 static struct string_list output
= STRING_LIST_INIT_DUP
;
793 struct column_options copts
;
798 wt_status_print_other_header(s
, what
, how
);
800 for (i
= 0; i
< l
->nr
; i
++) {
801 struct string_list_item
*it
;
804 path
= quote_path(it
->string
, s
->prefix
, &buf
);
805 if (column_active(s
->colopts
)) {
806 string_list_append(&output
, path
);
809 status_printf(s
, color(WT_STATUS_HEADER
, s
), "\t");
810 status_printf_more(s
, color(WT_STATUS_UNTRACKED
, s
),
814 strbuf_release(&buf
);
815 if (!column_active(s
->colopts
))
818 strbuf_addf(&buf
, "%s%s\t%s",
819 color(WT_STATUS_HEADER
, s
),
820 s
->display_comment_prefix
? "#" : "",
821 color(WT_STATUS_UNTRACKED
, s
));
822 memset(&copts
, 0, sizeof(copts
));
824 copts
.indent
= buf
.buf
;
825 if (want_color(s
->use_color
))
826 copts
.nl
= GIT_COLOR_RESET
"\n";
827 print_columns(&output
, s
->colopts
, &copts
);
828 string_list_clear(&output
, 0);
829 strbuf_release(&buf
);
831 status_printf_ln(s
, GIT_COLOR_NORMAL
, "%s", "");
834 void wt_status_truncate_message_at_cut_line(struct strbuf
*buf
)
837 struct strbuf pattern
= STRBUF_INIT
;
839 strbuf_addf(&pattern
, "%c %s", comment_line_char
, cut_line
);
840 p
= strstr(buf
->buf
, pattern
.buf
);
841 if (p
&& (p
== buf
->buf
|| p
[-1] == '\n'))
842 strbuf_setlen(buf
, p
- buf
->buf
);
843 strbuf_release(&pattern
);
846 void wt_status_add_cut_line(FILE *fp
)
848 const char *explanation
= _("Do not touch the line above.\nEverything below will be removed.");
849 struct strbuf buf
= STRBUF_INIT
;
851 fprintf(fp
, "%c %s", comment_line_char
, cut_line
);
852 strbuf_add_commented_lines(&buf
, explanation
, strlen(explanation
));
854 strbuf_release(&buf
);
857 static void wt_status_print_verbose(struct wt_status
*s
)
860 struct setup_revision_opt opt
;
862 init_revisions(&rev
, NULL
);
863 DIFF_OPT_SET(&rev
.diffopt
, ALLOW_TEXTCONV
);
865 memset(&opt
, 0, sizeof(opt
));
866 opt
.def
= s
->is_initial
? EMPTY_TREE_SHA1_HEX
: s
->reference
;
867 setup_revisions(0, NULL
, &rev
, &opt
);
869 rev
.diffopt
.output_format
|= DIFF_FORMAT_PATCH
;
870 rev
.diffopt
.detect_rename
= 1;
871 rev
.diffopt
.file
= s
->fp
;
872 rev
.diffopt
.close_file
= 0;
874 * If we're not going to stdout, then we definitely don't
875 * want color, since we are going to the commit message
876 * file (and even the "auto" setting won't work, since it
877 * will have checked isatty on stdout). But we then do want
878 * to insert the scissor line here to reliably remove the
879 * diff before committing.
881 if (s
->fp
!= stdout
) {
882 rev
.diffopt
.use_color
= 0;
883 wt_status_add_cut_line(s
->fp
);
885 run_diff_index(&rev
, 1);
888 static void wt_status_print_tracking(struct wt_status
*s
)
890 struct strbuf sb
= STRBUF_INIT
;
892 struct branch
*branch
;
893 char comment_line_string
[3];
896 assert(s
->branch
&& !s
->is_initial
);
897 if (!starts_with(s
->branch
, "refs/heads/"))
899 branch
= branch_get(s
->branch
+ 11);
900 if (!format_tracking_info(branch
, &sb
))
904 if (s
->display_comment_prefix
) {
905 comment_line_string
[i
++] = comment_line_char
;
906 comment_line_string
[i
++] = ' ';
908 comment_line_string
[i
] = '\0';
910 for (cp
= sb
.buf
; (ep
= strchr(cp
, '\n')) != NULL
; cp
= ep
+ 1)
911 color_fprintf_ln(s
->fp
, color(WT_STATUS_HEADER
, s
),
912 "%s%.*s", comment_line_string
,
914 if (s
->display_comment_prefix
)
915 color_fprintf_ln(s
->fp
, color(WT_STATUS_HEADER
, s
), "%c",
921 static int has_unmerged(struct wt_status
*s
)
925 for (i
= 0; i
< s
->change
.nr
; i
++) {
926 struct wt_status_change_data
*d
;
927 d
= s
->change
.items
[i
].util
;
934 static void show_merge_in_progress(struct wt_status
*s
,
935 struct wt_status_state
*state
,
938 if (has_unmerged(s
)) {
939 status_printf_ln(s
, color
, _("You have unmerged paths."));
941 status_printf_ln(s
, color
,
942 _(" (fix conflicts and run \"git commit\")"));
944 status_printf_ln(s
, color
,
945 _("All conflicts fixed but you are still merging."));
947 status_printf_ln(s
, color
,
948 _(" (use \"git commit\" to conclude merge)"));
950 wt_status_print_trailer(s
);
953 static void show_am_in_progress(struct wt_status
*s
,
954 struct wt_status_state
*state
,
957 status_printf_ln(s
, color
,
958 _("You are in the middle of an am session."));
959 if (state
->am_empty_patch
)
960 status_printf_ln(s
, color
,
961 _("The current patch is empty."));
963 if (!state
->am_empty_patch
)
964 status_printf_ln(s
, color
,
965 _(" (fix conflicts and then run \"git am --continue\")"));
966 status_printf_ln(s
, color
,
967 _(" (use \"git am --skip\" to skip this patch)"));
968 status_printf_ln(s
, color
,
969 _(" (use \"git am --abort\" to restore the original branch)"));
971 wt_status_print_trailer(s
);
974 static char *read_line_from_git_path(const char *filename
)
976 struct strbuf buf
= STRBUF_INIT
;
977 FILE *fp
= fopen(git_path("%s", filename
), "r");
979 strbuf_release(&buf
);
982 strbuf_getline(&buf
, fp
, '\n');
984 return strbuf_detach(&buf
, NULL
);
986 strbuf_release(&buf
);
991 static int split_commit_in_progress(struct wt_status
*s
)
993 int split_in_progress
= 0;
994 char *head
= read_line_from_git_path("HEAD");
995 char *orig_head
= read_line_from_git_path("ORIG_HEAD");
996 char *rebase_amend
= read_line_from_git_path("rebase-merge/amend");
997 char *rebase_orig_head
= read_line_from_git_path("rebase-merge/orig-head");
999 if (!head
|| !orig_head
|| !rebase_amend
|| !rebase_orig_head
||
1000 !s
->branch
|| strcmp(s
->branch
, "HEAD"))
1001 return split_in_progress
;
1003 if (!strcmp(rebase_amend
, rebase_orig_head
)) {
1004 if (strcmp(head
, rebase_amend
))
1005 split_in_progress
= 1;
1006 } else if (strcmp(orig_head
, rebase_orig_head
)) {
1007 split_in_progress
= 1;
1010 if (!s
->amend
&& !s
->nowarn
&& !s
->workdir_dirty
)
1011 split_in_progress
= 0;
1016 free(rebase_orig_head
);
1017 return split_in_progress
;
1020 static void show_rebase_in_progress(struct wt_status
*s
,
1021 struct wt_status_state
*state
,
1026 if (has_unmerged(s
)) {
1028 status_printf_ln(s
, color
,
1029 _("You are currently rebasing branch '%s' on '%s'."),
1033 status_printf_ln(s
, color
,
1034 _("You are currently rebasing."));
1036 status_printf_ln(s
, color
,
1037 _(" (fix conflicts and then run \"git rebase --continue\")"));
1038 status_printf_ln(s
, color
,
1039 _(" (use \"git rebase --skip\" to skip this patch)"));
1040 status_printf_ln(s
, color
,
1041 _(" (use \"git rebase --abort\" to check out the original branch)"));
1043 } else if (state
->rebase_in_progress
|| !stat(git_path("MERGE_MSG"), &st
)) {
1045 status_printf_ln(s
, color
,
1046 _("You are currently rebasing branch '%s' on '%s'."),
1050 status_printf_ln(s
, color
,
1051 _("You are currently rebasing."));
1053 status_printf_ln(s
, color
,
1054 _(" (all conflicts fixed: run \"git rebase --continue\")"));
1055 } else if (split_commit_in_progress(s
)) {
1057 status_printf_ln(s
, color
,
1058 _("You are currently splitting a commit while rebasing branch '%s' on '%s'."),
1062 status_printf_ln(s
, color
,
1063 _("You are currently splitting a commit during a rebase."));
1065 status_printf_ln(s
, color
,
1066 _(" (Once your working directory is clean, run \"git rebase --continue\")"));
1069 status_printf_ln(s
, color
,
1070 _("You are currently editing a commit while rebasing branch '%s' on '%s'."),
1074 status_printf_ln(s
, color
,
1075 _("You are currently editing a commit during a rebase."));
1076 if (s
->hints
&& !s
->amend
) {
1077 status_printf_ln(s
, color
,
1078 _(" (use \"git commit --amend\" to amend the current commit)"));
1079 status_printf_ln(s
, color
,
1080 _(" (use \"git rebase --continue\" once you are satisfied with your changes)"));
1083 wt_status_print_trailer(s
);
1086 static void show_cherry_pick_in_progress(struct wt_status
*s
,
1087 struct wt_status_state
*state
,
1090 status_printf_ln(s
, color
, _("You are currently cherry-picking commit %s."),
1091 find_unique_abbrev(state
->cherry_pick_head_sha1
, DEFAULT_ABBREV
));
1093 if (has_unmerged(s
))
1094 status_printf_ln(s
, color
,
1095 _(" (fix conflicts and run \"git cherry-pick --continue\")"));
1097 status_printf_ln(s
, color
,
1098 _(" (all conflicts fixed: run \"git cherry-pick --continue\")"));
1099 status_printf_ln(s
, color
,
1100 _(" (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"));
1102 wt_status_print_trailer(s
);
1105 static void show_revert_in_progress(struct wt_status
*s
,
1106 struct wt_status_state
*state
,
1109 status_printf_ln(s
, color
, _("You are currently reverting commit %s."),
1110 find_unique_abbrev(state
->revert_head_sha1
, DEFAULT_ABBREV
));
1112 if (has_unmerged(s
))
1113 status_printf_ln(s
, color
,
1114 _(" (fix conflicts and run \"git revert --continue\")"));
1116 status_printf_ln(s
, color
,
1117 _(" (all conflicts fixed: run \"git revert --continue\")"));
1118 status_printf_ln(s
, color
,
1119 _(" (use \"git revert --abort\" to cancel the revert operation)"));
1121 wt_status_print_trailer(s
);
1124 static void show_bisect_in_progress(struct wt_status
*s
,
1125 struct wt_status_state
*state
,
1129 status_printf_ln(s
, color
,
1130 _("You are currently bisecting, started from branch '%s'."),
1133 status_printf_ln(s
, color
,
1134 _("You are currently bisecting."));
1136 status_printf_ln(s
, color
,
1137 _(" (use \"git bisect reset\" to get back to the original branch)"));
1138 wt_status_print_trailer(s
);
1142 * Extract branch information from rebase/bisect
1144 static char *read_and_strip_branch(const char *path
)
1146 struct strbuf sb
= STRBUF_INIT
;
1147 unsigned char sha1
[20];
1149 if (strbuf_read_file(&sb
, git_path("%s", path
), 0) <= 0)
1152 while (&sb
.len
&& sb
.buf
[sb
.len
- 1] == '\n')
1153 strbuf_setlen(&sb
, sb
.len
- 1);
1156 if (starts_with(sb
.buf
, "refs/heads/"))
1157 strbuf_remove(&sb
,0, strlen("refs/heads/"));
1158 else if (starts_with(sb
.buf
, "refs/"))
1160 else if (!get_sha1_hex(sb
.buf
, sha1
)) {
1162 abbrev
= find_unique_abbrev(sha1
, DEFAULT_ABBREV
);
1164 strbuf_addstr(&sb
, abbrev
);
1165 } else if (!strcmp(sb
.buf
, "detached HEAD")) /* rebase */
1169 return strbuf_detach(&sb
, NULL
);
1172 strbuf_release(&sb
);
1176 struct grab_1st_switch_cbdata
{
1178 unsigned char nsha1
[20];
1181 static int grab_1st_switch(unsigned char *osha1
, unsigned char *nsha1
,
1182 const char *email
, unsigned long timestamp
, int tz
,
1183 const char *message
, void *cb_data
)
1185 struct grab_1st_switch_cbdata
*cb
= cb_data
;
1186 const char *target
= NULL
, *end
;
1188 if (!starts_with(message
, "checkout: moving from "))
1190 message
+= strlen("checkout: moving from ");
1191 target
= strstr(message
, " to ");
1194 target
+= strlen(" to ");
1195 strbuf_reset(&cb
->buf
);
1196 hashcpy(cb
->nsha1
, nsha1
);
1197 for (end
= target
; *end
&& *end
!= '\n'; end
++)
1199 strbuf_add(&cb
->buf
, target
, end
- target
);
1203 static void wt_status_get_detached_from(struct wt_status_state
*state
)
1205 struct grab_1st_switch_cbdata cb
;
1206 struct commit
*commit
;
1207 unsigned char sha1
[20];
1210 strbuf_init(&cb
.buf
, 0);
1211 if (for_each_reflog_ent_reverse("HEAD", grab_1st_switch
, &cb
) <= 0) {
1212 strbuf_release(&cb
.buf
);
1216 if (dwim_ref(cb
.buf
.buf
, cb
.buf
.len
, sha1
, &ref
) == 1 &&
1217 /* sha1 is a commit? match without further lookup */
1218 (!hashcmp(cb
.nsha1
, sha1
) ||
1219 /* perhaps sha1 is a tag, try to dereference to a commit */
1220 ((commit
= lookup_commit_reference_gently(sha1
, 1)) != NULL
&&
1221 !hashcmp(cb
.nsha1
, commit
->object
.sha1
)))) {
1223 if (starts_with(ref
, "refs/tags/"))
1224 ofs
= strlen("refs/tags/");
1225 else if (starts_with(ref
, "refs/remotes/"))
1226 ofs
= strlen("refs/remotes/");
1229 state
->detached_from
= xstrdup(ref
+ ofs
);
1231 state
->detached_from
=
1232 xstrdup(find_unique_abbrev(cb
.nsha1
, DEFAULT_ABBREV
));
1233 hashcpy(state
->detached_sha1
, cb
.nsha1
);
1236 strbuf_release(&cb
.buf
);
1239 void wt_status_get_state(struct wt_status_state
*state
,
1240 int get_detached_from
)
1243 unsigned char sha1
[20];
1245 if (!stat(git_path("MERGE_HEAD"), &st
)) {
1246 state
->merge_in_progress
= 1;
1247 } else if (!stat(git_path("rebase-apply"), &st
)) {
1248 if (!stat(git_path("rebase-apply/applying"), &st
)) {
1249 state
->am_in_progress
= 1;
1250 if (!stat(git_path("rebase-apply/patch"), &st
) && !st
.st_size
)
1251 state
->am_empty_patch
= 1;
1253 state
->rebase_in_progress
= 1;
1254 state
->branch
= read_and_strip_branch("rebase-apply/head-name");
1255 state
->onto
= read_and_strip_branch("rebase-apply/onto");
1257 } else if (!stat(git_path("rebase-merge"), &st
)) {
1258 if (!stat(git_path("rebase-merge/interactive"), &st
))
1259 state
->rebase_interactive_in_progress
= 1;
1261 state
->rebase_in_progress
= 1;
1262 state
->branch
= read_and_strip_branch("rebase-merge/head-name");
1263 state
->onto
= read_and_strip_branch("rebase-merge/onto");
1264 } else if (!stat(git_path("CHERRY_PICK_HEAD"), &st
) &&
1265 !get_sha1("CHERRY_PICK_HEAD", sha1
)) {
1266 state
->cherry_pick_in_progress
= 1;
1267 hashcpy(state
->cherry_pick_head_sha1
, sha1
);
1269 if (!stat(git_path("BISECT_LOG"), &st
)) {
1270 state
->bisect_in_progress
= 1;
1271 state
->branch
= read_and_strip_branch("BISECT_START");
1273 if (!stat(git_path("REVERT_HEAD"), &st
) &&
1274 !get_sha1("REVERT_HEAD", sha1
)) {
1275 state
->revert_in_progress
= 1;
1276 hashcpy(state
->revert_head_sha1
, sha1
);
1279 if (get_detached_from
)
1280 wt_status_get_detached_from(state
);
1283 static void wt_status_print_state(struct wt_status
*s
,
1284 struct wt_status_state
*state
)
1286 const char *state_color
= color(WT_STATUS_HEADER
, s
);
1287 if (state
->merge_in_progress
)
1288 show_merge_in_progress(s
, state
, state_color
);
1289 else if (state
->am_in_progress
)
1290 show_am_in_progress(s
, state
, state_color
);
1291 else if (state
->rebase_in_progress
|| state
->rebase_interactive_in_progress
)
1292 show_rebase_in_progress(s
, state
, state_color
);
1293 else if (state
->cherry_pick_in_progress
)
1294 show_cherry_pick_in_progress(s
, state
, state_color
);
1295 else if (state
->revert_in_progress
)
1296 show_revert_in_progress(s
, state
, state_color
);
1297 if (state
->bisect_in_progress
)
1298 show_bisect_in_progress(s
, state
, state_color
);
1301 void wt_status_print(struct wt_status
*s
)
1303 const char *branch_color
= color(WT_STATUS_ONBRANCH
, s
);
1304 const char *branch_status_color
= color(WT_STATUS_HEADER
, s
);
1305 struct wt_status_state state
;
1307 memset(&state
, 0, sizeof(state
));
1308 wt_status_get_state(&state
,
1309 s
->branch
&& !strcmp(s
->branch
, "HEAD"));
1312 const char *on_what
= _("On branch ");
1313 const char *branch_name
= s
->branch
;
1314 if (starts_with(branch_name
, "refs/heads/"))
1316 else if (!strcmp(branch_name
, "HEAD")) {
1317 branch_status_color
= color(WT_STATUS_NOBRANCH
, s
);
1318 if (state
.rebase_in_progress
|| state
.rebase_interactive_in_progress
) {
1319 on_what
= _("rebase in progress; onto ");
1320 branch_name
= state
.onto
;
1321 } else if (state
.detached_from
) {
1322 unsigned char sha1
[20];
1323 branch_name
= state
.detached_from
;
1324 if (!get_sha1("HEAD", sha1
) &&
1325 !hashcmp(sha1
, state
.detached_sha1
))
1326 on_what
= _("HEAD detached at ");
1328 on_what
= _("HEAD detached from ");
1331 on_what
= _("Not currently on any branch.");
1334 status_printf(s
, color(WT_STATUS_HEADER
, s
), "%s", "");
1335 status_printf_more(s
, branch_status_color
, "%s", on_what
);
1336 status_printf_more(s
, branch_color
, "%s\n", branch_name
);
1338 wt_status_print_tracking(s
);
1341 wt_status_print_state(s
, &state
);
1344 free(state
.detached_from
);
1346 if (s
->is_initial
) {
1347 status_printf_ln(s
, color(WT_STATUS_HEADER
, s
), "%s", "");
1348 status_printf_ln(s
, color(WT_STATUS_HEADER
, s
), _("Initial commit"));
1349 status_printf_ln(s
, color(WT_STATUS_HEADER
, s
), "%s", "");
1352 wt_status_print_updated(s
);
1353 wt_status_print_unmerged(s
);
1354 wt_status_print_changed(s
);
1355 if (s
->submodule_summary
&&
1356 (!s
->ignore_submodule_arg
||
1357 strcmp(s
->ignore_submodule_arg
, "all"))) {
1358 wt_status_print_submodule_summary(s
, 0); /* staged */
1359 wt_status_print_submodule_summary(s
, 1); /* unstaged */
1361 if (s
->show_untracked_files
) {
1362 wt_status_print_other(s
, &s
->untracked
, _("Untracked files"), "add");
1363 if (s
->show_ignored_files
)
1364 wt_status_print_other(s
, &s
->ignored
, _("Ignored files"), "add -f");
1365 if (advice_status_u_option
&& 2000 < s
->untracked_in_ms
) {
1366 status_printf_ln(s
, GIT_COLOR_NORMAL
, "%s", "");
1367 status_printf_ln(s
, GIT_COLOR_NORMAL
,
1368 _("It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1369 "may speed it up, but you have to be careful not to forget to add\n"
1370 "new files yourself (see 'git help status')."),
1371 s
->untracked_in_ms
/ 1000.0);
1373 } else if (s
->commitable
)
1374 status_printf_ln(s
, GIT_COLOR_NORMAL
, _("Untracked files not listed%s"),
1376 ? _(" (use -u option to show untracked files)") : "");
1379 wt_status_print_verbose(s
);
1380 if (!s
->commitable
) {
1382 status_printf_ln(s
, GIT_COLOR_NORMAL
, _("No changes"));
1385 else if (s
->workdir_dirty
) {
1387 printf(_("no changes added to commit "
1388 "(use \"git add\" and/or \"git commit -a\")\n"));
1390 printf(_("no changes added to commit\n"));
1391 } else if (s
->untracked
.nr
) {
1393 printf(_("nothing added to commit but untracked files "
1394 "present (use \"git add\" to track)\n"));
1396 printf(_("nothing added to commit but untracked files present\n"));
1397 } else if (s
->is_initial
) {
1399 printf(_("nothing to commit (create/copy files "
1400 "and use \"git add\" to track)\n"));
1402 printf(_("nothing to commit\n"));
1403 } else if (!s
->show_untracked_files
) {
1405 printf(_("nothing to commit (use -u to show untracked files)\n"));
1407 printf(_("nothing to commit\n"));
1409 printf(_("nothing to commit, working directory clean\n"));
1413 static void wt_shortstatus_unmerged(struct string_list_item
*it
,
1414 struct wt_status
*s
)
1416 struct wt_status_change_data
*d
= it
->util
;
1417 const char *how
= "??";
1419 switch (d
->stagemask
) {
1420 case 1: how
= "DD"; break; /* both deleted */
1421 case 2: how
= "AU"; break; /* added by us */
1422 case 3: how
= "UD"; break; /* deleted by them */
1423 case 4: how
= "UA"; break; /* added by them */
1424 case 5: how
= "DU"; break; /* deleted by us */
1425 case 6: how
= "AA"; break; /* both added */
1426 case 7: how
= "UU"; break; /* both modified */
1428 color_fprintf(s
->fp
, color(WT_STATUS_UNMERGED
, s
), "%s", how
);
1429 if (s
->null_termination
) {
1430 fprintf(stdout
, " %s%c", it
->string
, 0);
1432 struct strbuf onebuf
= STRBUF_INIT
;
1434 one
= quote_path(it
->string
, s
->prefix
, &onebuf
);
1435 printf(" %s\n", one
);
1436 strbuf_release(&onebuf
);
1440 static void wt_shortstatus_status(struct string_list_item
*it
,
1441 struct wt_status
*s
)
1443 struct wt_status_change_data
*d
= it
->util
;
1445 if (d
->index_status
)
1446 color_fprintf(s
->fp
, color(WT_STATUS_UPDATED
, s
), "%c", d
->index_status
);
1449 if (d
->worktree_status
)
1450 color_fprintf(s
->fp
, color(WT_STATUS_CHANGED
, s
), "%c", d
->worktree_status
);
1454 if (s
->null_termination
) {
1455 fprintf(stdout
, "%s%c", it
->string
, 0);
1457 fprintf(stdout
, "%s%c", d
->head_path
, 0);
1459 struct strbuf onebuf
= STRBUF_INIT
;
1462 one
= quote_path(d
->head_path
, s
->prefix
, &onebuf
);
1463 if (*one
!= '"' && strchr(one
, ' ') != NULL
) {
1465 strbuf_addch(&onebuf
, '"');
1468 printf("%s -> ", one
);
1469 strbuf_release(&onebuf
);
1471 one
= quote_path(it
->string
, s
->prefix
, &onebuf
);
1472 if (*one
!= '"' && strchr(one
, ' ') != NULL
) {
1474 strbuf_addch(&onebuf
, '"');
1477 printf("%s\n", one
);
1478 strbuf_release(&onebuf
);
1482 static void wt_shortstatus_other(struct string_list_item
*it
,
1483 struct wt_status
*s
, const char *sign
)
1485 if (s
->null_termination
) {
1486 fprintf(stdout
, "%s %s%c", sign
, it
->string
, 0);
1488 struct strbuf onebuf
= STRBUF_INIT
;
1490 one
= quote_path(it
->string
, s
->prefix
, &onebuf
);
1491 color_fprintf(s
->fp
, color(WT_STATUS_UNTRACKED
, s
), "%s", sign
);
1492 printf(" %s\n", one
);
1493 strbuf_release(&onebuf
);
1497 static void wt_shortstatus_print_tracking(struct wt_status
*s
)
1499 struct branch
*branch
;
1500 const char *header_color
= color(WT_STATUS_HEADER
, s
);
1501 const char *branch_color_local
= color(WT_STATUS_LOCAL_BRANCH
, s
);
1502 const char *branch_color_remote
= color(WT_STATUS_REMOTE_BRANCH
, s
);
1505 const char *branch_name
;
1506 int num_ours
, num_theirs
;
1507 int upstream_is_gone
= 0;
1509 color_fprintf(s
->fp
, color(WT_STATUS_HEADER
, s
), "## ");
1513 branch_name
= s
->branch
;
1515 if (starts_with(branch_name
, "refs/heads/"))
1517 else if (!strcmp(branch_name
, "HEAD")) {
1518 branch_name
= _("HEAD (no branch)");
1519 branch_color_local
= color(WT_STATUS_NOBRANCH
, s
);
1522 branch
= branch_get(s
->branch
+ 11);
1524 color_fprintf(s
->fp
, header_color
, _("Initial commit on "));
1526 color_fprintf(s
->fp
, branch_color_local
, "%s", branch_name
);
1528 switch (stat_tracking_info(branch
, &num_ours
, &num_theirs
)) {
1531 fputc(s
->null_termination
? '\0' : '\n', s
->fp
);
1534 /* with "gone" base */
1535 upstream_is_gone
= 1;
1542 base
= branch
->merge
[0]->dst
;
1543 base
= shorten_unambiguous_ref(base
, 0);
1544 color_fprintf(s
->fp
, header_color
, "...");
1545 color_fprintf(s
->fp
, branch_color_remote
, "%s", base
);
1547 if (!upstream_is_gone
&& !num_ours
&& !num_theirs
) {
1548 fputc(s
->null_termination
? '\0' : '\n', s
->fp
);
1552 #define LABEL(string) (s->no_gettext ? (string) : _(string))
1554 color_fprintf(s
->fp
, header_color
, " [");
1555 if (upstream_is_gone
) {
1556 color_fprintf(s
->fp
, header_color
, LABEL(N_("gone")));
1557 } else if (!num_ours
) {
1558 color_fprintf(s
->fp
, header_color
, LABEL(N_("behind ")));
1559 color_fprintf(s
->fp
, branch_color_remote
, "%d", num_theirs
);
1560 } else if (!num_theirs
) {
1561 color_fprintf(s
->fp
, header_color
, LABEL(N_(("ahead "))));
1562 color_fprintf(s
->fp
, branch_color_local
, "%d", num_ours
);
1564 color_fprintf(s
->fp
, header_color
, LABEL(N_(("ahead "))));
1565 color_fprintf(s
->fp
, branch_color_local
, "%d", num_ours
);
1566 color_fprintf(s
->fp
, header_color
, ", %s", LABEL(N_("behind ")));
1567 color_fprintf(s
->fp
, branch_color_remote
, "%d", num_theirs
);
1570 color_fprintf(s
->fp
, header_color
, "]");
1571 fputc(s
->null_termination
? '\0' : '\n', s
->fp
);
1574 void wt_shortstatus_print(struct wt_status
*s
)
1579 wt_shortstatus_print_tracking(s
);
1581 for (i
= 0; i
< s
->change
.nr
; i
++) {
1582 struct wt_status_change_data
*d
;
1583 struct string_list_item
*it
;
1585 it
= &(s
->change
.items
[i
]);
1588 wt_shortstatus_unmerged(it
, s
);
1590 wt_shortstatus_status(it
, s
);
1592 for (i
= 0; i
< s
->untracked
.nr
; i
++) {
1593 struct string_list_item
*it
;
1595 it
= &(s
->untracked
.items
[i
]);
1596 wt_shortstatus_other(it
, s
, "??");
1598 for (i
= 0; i
< s
->ignored
.nr
; i
++) {
1599 struct string_list_item
*it
;
1601 it
= &(s
->ignored
.items
[i
]);
1602 wt_shortstatus_other(it
, s
, "!!");
1606 void wt_porcelain_print(struct wt_status
*s
)
1609 s
->relative_paths
= 0;
1612 wt_shortstatus_print(s
);