11 #include "run-command.h"
12 #include "argv-array.h"
15 #include "submodule.h"
20 static 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
, "");
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
, "");
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
, "");
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
, "");
241 static void wt_status_print_trailer(struct wt_status
*s
)
243 status_printf_ln(s
, color(WT_STATUS_HEADER
, s
), "");
246 #define quote_path quote_path_relative
248 static void wt_status_print_unmerged_data(struct wt_status
*s
,
249 struct string_list_item
*it
)
251 const char *c
= color(WT_STATUS_UNMERGED
, s
);
252 struct wt_status_change_data
*d
= it
->util
;
253 struct strbuf onebuf
= STRBUF_INIT
;
254 const char *one
, *how
= _("bug");
256 one
= quote_path(it
->string
, s
->prefix
, &onebuf
);
257 status_printf(s
, color(WT_STATUS_HEADER
, s
), "\t");
258 switch (d
->stagemask
) {
259 case 1: how
= _("both deleted:"); break;
260 case 2: how
= _("added by us:"); break;
261 case 3: how
= _("deleted by them:"); break;
262 case 4: how
= _("added by them:"); break;
263 case 5: how
= _("deleted by us:"); break;
264 case 6: how
= _("both added:"); break;
265 case 7: how
= _("both modified:"); break;
267 status_printf_more(s
, c
, "%-20s%s\n", how
, one
);
268 strbuf_release(&onebuf
);
271 static const char *wt_status_diff_status_string(int status
)
274 case DIFF_STATUS_ADDED
:
275 return _("new file:");
276 case DIFF_STATUS_COPIED
:
278 case DIFF_STATUS_DELETED
:
279 return _("deleted:");
280 case DIFF_STATUS_MODIFIED
:
281 return _("modified:");
282 case DIFF_STATUS_RENAMED
:
283 return _("renamed:");
284 case DIFF_STATUS_TYPE_CHANGED
:
285 return _("typechange:");
286 case DIFF_STATUS_UNKNOWN
:
287 return _("unknown:");
288 case DIFF_STATUS_UNMERGED
:
289 return _("unmerged:");
295 static int maxwidth(const char *(*label
)(int), int minval
, int maxval
)
299 for (i
= minval
; i
<= maxval
; i
++) {
300 const char *s
= label(i
);
301 int len
= s
? utf8_strwidth(s
) : 0;
308 static void wt_status_print_change_data(struct wt_status
*s
,
310 struct string_list_item
*it
)
312 struct wt_status_change_data
*d
= it
->util
;
313 const char *c
= color(change_type
, s
);
317 const char *one
, *two
;
318 struct strbuf onebuf
= STRBUF_INIT
, twobuf
= STRBUF_INIT
;
319 struct strbuf extra
= STRBUF_INIT
;
320 static char *padding
;
321 static int label_width
;
326 /* If DIFF_STATUS_* uses outside the range [A..Z], we're in trouble */
327 label_width
= maxwidth(wt_status_diff_status_string
, 'A', 'Z');
328 label_width
+= strlen(" ");
329 padding
= xmallocz(label_width
);
330 memset(padding
, ' ', label_width
);
333 one_name
= two_name
= it
->string
;
334 switch (change_type
) {
335 case WT_STATUS_UPDATED
:
336 status
= d
->index_status
;
338 one_name
= d
->head_path
;
340 case WT_STATUS_CHANGED
:
341 if (d
->new_submodule_commits
|| d
->dirty_submodule
) {
342 strbuf_addstr(&extra
, " (");
343 if (d
->new_submodule_commits
)
344 strbuf_addf(&extra
, _("new commits, "));
345 if (d
->dirty_submodule
& DIRTY_SUBMODULE_MODIFIED
)
346 strbuf_addf(&extra
, _("modified content, "));
347 if (d
->dirty_submodule
& DIRTY_SUBMODULE_UNTRACKED
)
348 strbuf_addf(&extra
, _("untracked content, "));
349 strbuf_setlen(&extra
, extra
.len
- 2);
350 strbuf_addch(&extra
, ')');
352 status
= d
->worktree_status
;
355 die("BUG: unhandled change_type %d in wt_status_print_change_data",
359 one
= quote_path(one_name
, s
->prefix
, &onebuf
);
360 two
= quote_path(two_name
, s
->prefix
, &twobuf
);
362 status_printf(s
, color(WT_STATUS_HEADER
, s
), "\t");
363 what
= wt_status_diff_status_string(status
);
365 die(_("bug: unhandled diff status %c"), status
);
366 len
= label_width
- utf8_strwidth(what
);
368 if (status
== DIFF_STATUS_COPIED
|| status
== DIFF_STATUS_RENAMED
)
369 status_printf_more(s
, c
, "%s%.*s%s -> %s",
370 what
, len
, padding
, one
, two
);
372 status_printf_more(s
, c
, "%s%.*s%s",
373 what
, len
, padding
, one
);
375 status_printf_more(s
, color(WT_STATUS_HEADER
, s
), "%s", extra
.buf
);
376 strbuf_release(&extra
);
378 status_printf_more(s
, GIT_COLOR_NORMAL
, "\n");
379 strbuf_release(&onebuf
);
380 strbuf_release(&twobuf
);
383 static void wt_status_collect_changed_cb(struct diff_queue_struct
*q
,
384 struct diff_options
*options
,
387 struct wt_status
*s
= data
;
392 s
->workdir_dirty
= 1;
393 for (i
= 0; i
< q
->nr
; i
++) {
394 struct diff_filepair
*p
;
395 struct string_list_item
*it
;
396 struct wt_status_change_data
*d
;
399 it
= string_list_insert(&s
->change
, p
->one
->path
);
402 d
= xcalloc(1, sizeof(*d
));
405 if (!d
->worktree_status
)
406 d
->worktree_status
= p
->status
;
407 d
->dirty_submodule
= p
->two
->dirty_submodule
;
408 if (S_ISGITLINK(p
->two
->mode
))
409 d
->new_submodule_commits
= !!hashcmp(p
->one
->sha1
, p
->two
->sha1
);
413 static int unmerged_mask(const char *path
)
416 const struct cache_entry
*ce
;
418 pos
= cache_name_pos(path
, strlen(path
));
424 while (pos
< active_nr
) {
425 ce
= active_cache
[pos
++];
426 if (strcmp(ce
->name
, path
) || !ce_stage(ce
))
428 mask
|= (1 << (ce_stage(ce
) - 1));
433 static void wt_status_collect_updated_cb(struct diff_queue_struct
*q
,
434 struct diff_options
*options
,
437 struct wt_status
*s
= data
;
440 for (i
= 0; i
< q
->nr
; i
++) {
441 struct diff_filepair
*p
;
442 struct string_list_item
*it
;
443 struct wt_status_change_data
*d
;
446 it
= string_list_insert(&s
->change
, p
->two
->path
);
449 d
= xcalloc(1, sizeof(*d
));
452 if (!d
->index_status
)
453 d
->index_status
= p
->status
;
455 case DIFF_STATUS_COPIED
:
456 case DIFF_STATUS_RENAMED
:
457 d
->head_path
= xstrdup(p
->one
->path
);
459 case DIFF_STATUS_UNMERGED
:
460 d
->stagemask
= unmerged_mask(p
->two
->path
);
466 static void wt_status_collect_changes_worktree(struct wt_status
*s
)
470 init_revisions(&rev
, NULL
);
471 setup_revisions(0, NULL
, &rev
, NULL
);
472 rev
.diffopt
.output_format
|= DIFF_FORMAT_CALLBACK
;
473 DIFF_OPT_SET(&rev
.diffopt
, DIRTY_SUBMODULES
);
474 if (!s
->show_untracked_files
)
475 DIFF_OPT_SET(&rev
.diffopt
, IGNORE_UNTRACKED_IN_SUBMODULES
);
476 if (s
->ignore_submodule_arg
) {
477 DIFF_OPT_SET(&rev
.diffopt
, OVERRIDE_SUBMODULE_CONFIG
);
478 handle_ignore_submodules_arg(&rev
.diffopt
, s
->ignore_submodule_arg
);
480 rev
.diffopt
.format_callback
= wt_status_collect_changed_cb
;
481 rev
.diffopt
.format_callback_data
= s
;
482 copy_pathspec(&rev
.prune_data
, &s
->pathspec
);
483 run_diff_files(&rev
, 0);
486 static void wt_status_collect_changes_index(struct wt_status
*s
)
489 struct setup_revision_opt opt
;
491 init_revisions(&rev
, NULL
);
492 memset(&opt
, 0, sizeof(opt
));
493 opt
.def
= s
->is_initial
? EMPTY_TREE_SHA1_HEX
: s
->reference
;
494 setup_revisions(0, NULL
, &rev
, &opt
);
496 if (s
->ignore_submodule_arg
) {
497 DIFF_OPT_SET(&rev
.diffopt
, OVERRIDE_SUBMODULE_CONFIG
);
498 handle_ignore_submodules_arg(&rev
.diffopt
, s
->ignore_submodule_arg
);
501 rev
.diffopt
.output_format
|= DIFF_FORMAT_CALLBACK
;
502 rev
.diffopt
.format_callback
= wt_status_collect_updated_cb
;
503 rev
.diffopt
.format_callback_data
= s
;
504 rev
.diffopt
.detect_rename
= 1;
505 rev
.diffopt
.rename_limit
= 200;
506 rev
.diffopt
.break_opt
= 0;
507 copy_pathspec(&rev
.prune_data
, &s
->pathspec
);
508 run_diff_index(&rev
, 1);
511 static void wt_status_collect_changes_initial(struct wt_status
*s
)
515 for (i
= 0; i
< active_nr
; i
++) {
516 struct string_list_item
*it
;
517 struct wt_status_change_data
*d
;
518 const struct cache_entry
*ce
= active_cache
[i
];
520 if (!ce_path_match(ce
, &s
->pathspec
))
522 it
= string_list_insert(&s
->change
, ce
->name
);
525 d
= xcalloc(1, sizeof(*d
));
529 d
->index_status
= DIFF_STATUS_UNMERGED
;
530 d
->stagemask
|= (1 << (ce_stage(ce
) - 1));
533 d
->index_status
= DIFF_STATUS_ADDED
;
537 static void wt_status_collect_untracked(struct wt_status
*s
)
540 struct dir_struct dir
;
541 struct timeval t_begin
;
543 if (!s
->show_untracked_files
)
546 if (advice_status_u_option
)
547 gettimeofday(&t_begin
, NULL
);
549 memset(&dir
, 0, sizeof(dir
));
550 if (s
->show_untracked_files
!= SHOW_ALL_UNTRACKED_FILES
)
552 DIR_SHOW_OTHER_DIRECTORIES
| DIR_HIDE_EMPTY_DIRECTORIES
;
553 if (s
->show_ignored_files
)
554 dir
.flags
|= DIR_SHOW_IGNORED_TOO
;
555 setup_standard_excludes(&dir
);
557 fill_directory(&dir
, &s
->pathspec
);
559 for (i
= 0; i
< dir
.nr
; i
++) {
560 struct dir_entry
*ent
= dir
.entries
[i
];
561 if (cache_name_is_other(ent
->name
, ent
->len
) &&
562 match_pathspec_depth(&s
->pathspec
, ent
->name
, ent
->len
, 0, NULL
))
563 string_list_insert(&s
->untracked
, ent
->name
);
567 for (i
= 0; i
< dir
.ignored_nr
; i
++) {
568 struct dir_entry
*ent
= dir
.ignored
[i
];
569 if (cache_name_is_other(ent
->name
, ent
->len
) &&
570 match_pathspec_depth(&s
->pathspec
, ent
->name
, ent
->len
, 0, NULL
))
571 string_list_insert(&s
->ignored
, ent
->name
);
577 clear_directory(&dir
);
579 if (advice_status_u_option
) {
580 struct timeval t_end
;
581 gettimeofday(&t_end
, NULL
);
583 (uint64_t)t_end
.tv_sec
* 1000 + t_end
.tv_usec
/ 1000 -
584 ((uint64_t)t_begin
.tv_sec
* 1000 + t_begin
.tv_usec
/ 1000);
588 void wt_status_collect(struct wt_status
*s
)
590 wt_status_collect_changes_worktree(s
);
593 wt_status_collect_changes_initial(s
);
595 wt_status_collect_changes_index(s
);
596 wt_status_collect_untracked(s
);
599 static void wt_status_print_unmerged(struct wt_status
*s
)
601 int shown_header
= 0;
604 for (i
= 0; i
< s
->change
.nr
; i
++) {
605 struct wt_status_change_data
*d
;
606 struct string_list_item
*it
;
607 it
= &(s
->change
.items
[i
]);
612 wt_status_print_unmerged_header(s
);
615 wt_status_print_unmerged_data(s
, it
);
618 wt_status_print_trailer(s
);
622 static void wt_status_print_updated(struct wt_status
*s
)
624 int shown_header
= 0;
627 for (i
= 0; i
< s
->change
.nr
; i
++) {
628 struct wt_status_change_data
*d
;
629 struct string_list_item
*it
;
630 it
= &(s
->change
.items
[i
]);
632 if (!d
->index_status
||
633 d
->index_status
== DIFF_STATUS_UNMERGED
)
636 wt_status_print_cached_header(s
);
640 wt_status_print_change_data(s
, WT_STATUS_UPDATED
, it
);
643 wt_status_print_trailer(s
);
649 * 1 : some change but no delete
651 static int wt_status_check_worktree_changes(struct wt_status
*s
,
652 int *dirty_submodules
)
657 *dirty_submodules
= 0;
659 for (i
= 0; i
< s
->change
.nr
; i
++) {
660 struct wt_status_change_data
*d
;
661 d
= s
->change
.items
[i
].util
;
662 if (!d
->worktree_status
||
663 d
->worktree_status
== DIFF_STATUS_UNMERGED
)
667 if (d
->dirty_submodule
)
668 *dirty_submodules
= 1;
669 if (d
->worktree_status
== DIFF_STATUS_DELETED
)
675 static void wt_status_print_changed(struct wt_status
*s
)
677 int i
, dirty_submodules
;
678 int worktree_changes
= wt_status_check_worktree_changes(s
, &dirty_submodules
);
680 if (!worktree_changes
)
683 wt_status_print_dirty_header(s
, worktree_changes
< 0, dirty_submodules
);
685 for (i
= 0; i
< s
->change
.nr
; i
++) {
686 struct wt_status_change_data
*d
;
687 struct string_list_item
*it
;
688 it
= &(s
->change
.items
[i
]);
690 if (!d
->worktree_status
||
691 d
->worktree_status
== DIFF_STATUS_UNMERGED
)
693 wt_status_print_change_data(s
, WT_STATUS_CHANGED
, it
);
695 wt_status_print_trailer(s
);
698 static void wt_status_print_submodule_summary(struct wt_status
*s
, int uncommitted
)
700 struct child_process sm_summary
;
701 char summary_limit
[64];
702 char index
[PATH_MAX
];
703 const char *env
[] = { NULL
, NULL
};
704 struct argv_array argv
= ARGV_ARRAY_INIT
;
705 struct strbuf cmd_stdout
= STRBUF_INIT
;
706 struct strbuf summary
= STRBUF_INIT
;
707 char *summary_content
;
710 sprintf(summary_limit
, "%d", s
->submodule_summary
);
711 snprintf(index
, sizeof(index
), "GIT_INDEX_FILE=%s", s
->index_file
);
714 argv_array_push(&argv
, "submodule");
715 argv_array_push(&argv
, "summary");
716 argv_array_push(&argv
, uncommitted
? "--files" : "--cached");
717 argv_array_push(&argv
, "--for-status");
718 argv_array_push(&argv
, "--summary-limit");
719 argv_array_push(&argv
, summary_limit
);
721 argv_array_push(&argv
, s
->amend
? "HEAD^" : "HEAD");
723 memset(&sm_summary
, 0, sizeof(sm_summary
));
724 sm_summary
.argv
= argv
.argv
;
725 sm_summary
.env
= env
;
726 sm_summary
.git_cmd
= 1;
727 sm_summary
.no_stdin
= 1;
731 run_command(&sm_summary
);
732 argv_array_clear(&argv
);
734 len
= strbuf_read(&cmd_stdout
, sm_summary
.out
, 1024);
736 /* prepend header, only if there's an actual output */
739 strbuf_addstr(&summary
, _("Submodules changed but not updated:"));
741 strbuf_addstr(&summary
, _("Submodule changes to be committed:"));
742 strbuf_addstr(&summary
, "\n\n");
744 strbuf_addbuf(&summary
, &cmd_stdout
);
745 strbuf_release(&cmd_stdout
);
747 if (s
->display_comment_prefix
) {
748 summary_content
= strbuf_detach(&summary
, &len
);
749 strbuf_add_commented_lines(&summary
, summary_content
, len
);
750 free(summary_content
);
753 fputs(summary
.buf
, s
->fp
);
754 strbuf_release(&summary
);
757 static void wt_status_print_other(struct wt_status
*s
,
758 struct string_list
*l
,
763 struct strbuf buf
= STRBUF_INIT
;
764 static struct string_list output
= STRING_LIST_INIT_DUP
;
765 struct column_options copts
;
770 wt_status_print_other_header(s
, what
, how
);
772 for (i
= 0; i
< l
->nr
; i
++) {
773 struct string_list_item
*it
;
776 path
= quote_path(it
->string
, s
->prefix
, &buf
);
777 if (column_active(s
->colopts
)) {
778 string_list_append(&output
, path
);
781 status_printf(s
, color(WT_STATUS_HEADER
, s
), "\t");
782 status_printf_more(s
, color(WT_STATUS_UNTRACKED
, s
),
786 strbuf_release(&buf
);
787 if (!column_active(s
->colopts
))
790 strbuf_addf(&buf
, "%s%s\t%s",
791 color(WT_STATUS_HEADER
, s
),
792 s
->display_comment_prefix
? "#" : "",
793 color(WT_STATUS_UNTRACKED
, s
));
794 memset(&copts
, 0, sizeof(copts
));
796 copts
.indent
= buf
.buf
;
797 if (want_color(s
->use_color
))
798 copts
.nl
= GIT_COLOR_RESET
"\n";
799 print_columns(&output
, s
->colopts
, &copts
);
800 string_list_clear(&output
, 0);
801 strbuf_release(&buf
);
803 status_printf_ln(s
, GIT_COLOR_NORMAL
, "");
806 void wt_status_truncate_message_at_cut_line(struct strbuf
*buf
)
809 struct strbuf pattern
= STRBUF_INIT
;
811 strbuf_addf(&pattern
, "%c %s", comment_line_char
, cut_line
);
812 p
= strstr(buf
->buf
, pattern
.buf
);
813 if (p
&& (p
== buf
->buf
|| p
[-1] == '\n'))
814 strbuf_setlen(buf
, p
- buf
->buf
);
815 strbuf_release(&pattern
);
818 static void wt_status_print_verbose(struct wt_status
*s
)
821 struct setup_revision_opt opt
;
823 init_revisions(&rev
, NULL
);
824 DIFF_OPT_SET(&rev
.diffopt
, ALLOW_TEXTCONV
);
826 memset(&opt
, 0, sizeof(opt
));
827 opt
.def
= s
->is_initial
? EMPTY_TREE_SHA1_HEX
: s
->reference
;
828 setup_revisions(0, NULL
, &rev
, &opt
);
830 rev
.diffopt
.output_format
|= DIFF_FORMAT_PATCH
;
831 rev
.diffopt
.detect_rename
= 1;
832 rev
.diffopt
.file
= s
->fp
;
833 rev
.diffopt
.close_file
= 0;
835 * If we're not going to stdout, then we definitely don't
836 * want color, since we are going to the commit message
837 * file (and even the "auto" setting won't work, since it
838 * will have checked isatty on stdout). But we then do want
839 * to insert the scissor line here to reliably remove the
840 * diff before committing.
842 if (s
->fp
!= stdout
) {
843 const char *explanation
= _("Do not touch the line above.\nEverything below will be removed.");
844 struct strbuf buf
= STRBUF_INIT
;
846 rev
.diffopt
.use_color
= 0;
847 fprintf(s
->fp
, "%c %s", comment_line_char
, cut_line
);
848 strbuf_add_commented_lines(&buf
, explanation
, strlen(explanation
));
849 fputs(buf
.buf
, s
->fp
);
850 strbuf_release(&buf
);
852 run_diff_index(&rev
, 1);
855 static void wt_status_print_tracking(struct wt_status
*s
)
857 struct strbuf sb
= STRBUF_INIT
;
859 struct branch
*branch
;
860 char comment_line_string
[3];
863 assert(s
->branch
&& !s
->is_initial
);
864 if (!starts_with(s
->branch
, "refs/heads/"))
866 branch
= branch_get(s
->branch
+ 11);
867 if (!format_tracking_info(branch
, &sb
))
871 if (s
->display_comment_prefix
) {
872 comment_line_string
[i
++] = comment_line_char
;
873 comment_line_string
[i
++] = ' ';
875 comment_line_string
[i
] = '\0';
877 for (cp
= sb
.buf
; (ep
= strchr(cp
, '\n')) != NULL
; cp
= ep
+ 1)
878 color_fprintf_ln(s
->fp
, color(WT_STATUS_HEADER
, s
),
879 "%s%.*s", comment_line_string
,
881 if (s
->display_comment_prefix
)
882 color_fprintf_ln(s
->fp
, color(WT_STATUS_HEADER
, s
), "%c",
885 fprintf_ln(s
->fp
, "");
888 static int has_unmerged(struct wt_status
*s
)
892 for (i
= 0; i
< s
->change
.nr
; i
++) {
893 struct wt_status_change_data
*d
;
894 d
= s
->change
.items
[i
].util
;
901 static void show_merge_in_progress(struct wt_status
*s
,
902 struct wt_status_state
*state
,
905 if (has_unmerged(s
)) {
906 status_printf_ln(s
, color
, _("You have unmerged paths."));
908 status_printf_ln(s
, color
,
909 _(" (fix conflicts and run \"git commit\")"));
911 status_printf_ln(s
, color
,
912 _("All conflicts fixed but you are still merging."));
914 status_printf_ln(s
, color
,
915 _(" (use \"git commit\" to conclude merge)"));
917 wt_status_print_trailer(s
);
920 static void show_am_in_progress(struct wt_status
*s
,
921 struct wt_status_state
*state
,
924 status_printf_ln(s
, color
,
925 _("You are in the middle of an am session."));
926 if (state
->am_empty_patch
)
927 status_printf_ln(s
, color
,
928 _("The current patch is empty."));
930 if (!state
->am_empty_patch
)
931 status_printf_ln(s
, color
,
932 _(" (fix conflicts and then run \"git am --continue\")"));
933 status_printf_ln(s
, color
,
934 _(" (use \"git am --skip\" to skip this patch)"));
935 status_printf_ln(s
, color
,
936 _(" (use \"git am --abort\" to restore the original branch)"));
938 wt_status_print_trailer(s
);
941 static char *read_line_from_git_path(const char *filename
)
943 struct strbuf buf
= STRBUF_INIT
;
944 FILE *fp
= fopen(git_path("%s", filename
), "r");
946 strbuf_release(&buf
);
949 strbuf_getline(&buf
, fp
, '\n');
951 return strbuf_detach(&buf
, NULL
);
953 strbuf_release(&buf
);
958 static int split_commit_in_progress(struct wt_status
*s
)
960 int split_in_progress
= 0;
961 char *head
= read_line_from_git_path("HEAD");
962 char *orig_head
= read_line_from_git_path("ORIG_HEAD");
963 char *rebase_amend
= read_line_from_git_path("rebase-merge/amend");
964 char *rebase_orig_head
= read_line_from_git_path("rebase-merge/orig-head");
966 if (!head
|| !orig_head
|| !rebase_amend
|| !rebase_orig_head
||
967 !s
->branch
|| strcmp(s
->branch
, "HEAD"))
968 return split_in_progress
;
970 if (!strcmp(rebase_amend
, rebase_orig_head
)) {
971 if (strcmp(head
, rebase_amend
))
972 split_in_progress
= 1;
973 } else if (strcmp(orig_head
, rebase_orig_head
)) {
974 split_in_progress
= 1;
977 if (!s
->amend
&& !s
->nowarn
&& !s
->workdir_dirty
)
978 split_in_progress
= 0;
983 free(rebase_orig_head
);
984 return split_in_progress
;
987 static void show_rebase_in_progress(struct wt_status
*s
,
988 struct wt_status_state
*state
,
993 if (has_unmerged(s
)) {
995 status_printf_ln(s
, color
,
996 _("You are currently rebasing branch '%s' on '%s'."),
1000 status_printf_ln(s
, color
,
1001 _("You are currently rebasing."));
1003 status_printf_ln(s
, color
,
1004 _(" (fix conflicts and then run \"git rebase --continue\")"));
1005 status_printf_ln(s
, color
,
1006 _(" (use \"git rebase --skip\" to skip this patch)"));
1007 status_printf_ln(s
, color
,
1008 _(" (use \"git rebase --abort\" to check out the original branch)"));
1010 } else if (state
->rebase_in_progress
|| !stat(git_path("MERGE_MSG"), &st
)) {
1012 status_printf_ln(s
, color
,
1013 _("You are currently rebasing branch '%s' on '%s'."),
1017 status_printf_ln(s
, color
,
1018 _("You are currently rebasing."));
1020 status_printf_ln(s
, color
,
1021 _(" (all conflicts fixed: run \"git rebase --continue\")"));
1022 } else if (split_commit_in_progress(s
)) {
1024 status_printf_ln(s
, color
,
1025 _("You are currently splitting a commit while rebasing branch '%s' on '%s'."),
1029 status_printf_ln(s
, color
,
1030 _("You are currently splitting a commit during a rebase."));
1032 status_printf_ln(s
, color
,
1033 _(" (Once your working directory is clean, run \"git rebase --continue\")"));
1036 status_printf_ln(s
, color
,
1037 _("You are currently editing a commit while rebasing branch '%s' on '%s'."),
1041 status_printf_ln(s
, color
,
1042 _("You are currently editing a commit during a rebase."));
1043 if (s
->hints
&& !s
->amend
) {
1044 status_printf_ln(s
, color
,
1045 _(" (use \"git commit --amend\" to amend the current commit)"));
1046 status_printf_ln(s
, color
,
1047 _(" (use \"git rebase --continue\" once you are satisfied with your changes)"));
1050 wt_status_print_trailer(s
);
1053 static void show_cherry_pick_in_progress(struct wt_status
*s
,
1054 struct wt_status_state
*state
,
1057 status_printf_ln(s
, color
, _("You are currently cherry-picking commit %s."),
1058 find_unique_abbrev(state
->cherry_pick_head_sha1
, DEFAULT_ABBREV
));
1060 if (has_unmerged(s
))
1061 status_printf_ln(s
, color
,
1062 _(" (fix conflicts and run \"git cherry-pick --continue\")"));
1064 status_printf_ln(s
, color
,
1065 _(" (all conflicts fixed: run \"git cherry-pick --continue\")"));
1066 status_printf_ln(s
, color
,
1067 _(" (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"));
1069 wt_status_print_trailer(s
);
1072 static void show_revert_in_progress(struct wt_status
*s
,
1073 struct wt_status_state
*state
,
1076 status_printf_ln(s
, color
, _("You are currently reverting commit %s."),
1077 find_unique_abbrev(state
->revert_head_sha1
, DEFAULT_ABBREV
));
1079 if (has_unmerged(s
))
1080 status_printf_ln(s
, color
,
1081 _(" (fix conflicts and run \"git revert --continue\")"));
1083 status_printf_ln(s
, color
,
1084 _(" (all conflicts fixed: run \"git revert --continue\")"));
1085 status_printf_ln(s
, color
,
1086 _(" (use \"git revert --abort\" to cancel the revert operation)"));
1088 wt_status_print_trailer(s
);
1091 static void show_bisect_in_progress(struct wt_status
*s
,
1092 struct wt_status_state
*state
,
1096 status_printf_ln(s
, color
,
1097 _("You are currently bisecting, started from branch '%s'."),
1100 status_printf_ln(s
, color
,
1101 _("You are currently bisecting."));
1103 status_printf_ln(s
, color
,
1104 _(" (use \"git bisect reset\" to get back to the original branch)"));
1105 wt_status_print_trailer(s
);
1109 * Extract branch information from rebase/bisect
1111 static char *read_and_strip_branch(const char *path
)
1113 struct strbuf sb
= STRBUF_INIT
;
1114 unsigned char sha1
[20];
1116 if (strbuf_read_file(&sb
, git_path("%s", path
), 0) <= 0)
1119 while (&sb
.len
&& sb
.buf
[sb
.len
- 1] == '\n')
1120 strbuf_setlen(&sb
, sb
.len
- 1);
1123 if (starts_with(sb
.buf
, "refs/heads/"))
1124 strbuf_remove(&sb
,0, strlen("refs/heads/"));
1125 else if (starts_with(sb
.buf
, "refs/"))
1127 else if (!get_sha1_hex(sb
.buf
, sha1
)) {
1129 abbrev
= find_unique_abbrev(sha1
, DEFAULT_ABBREV
);
1131 strbuf_addstr(&sb
, abbrev
);
1132 } else if (!strcmp(sb
.buf
, "detached HEAD")) /* rebase */
1136 return strbuf_detach(&sb
, NULL
);
1139 strbuf_release(&sb
);
1143 struct grab_1st_switch_cbdata
{
1145 unsigned char nsha1
[20];
1148 static int grab_1st_switch(unsigned char *osha1
, unsigned char *nsha1
,
1149 const char *email
, unsigned long timestamp
, int tz
,
1150 const char *message
, void *cb_data
)
1152 struct grab_1st_switch_cbdata
*cb
= cb_data
;
1153 const char *target
= NULL
, *end
;
1155 if (!starts_with(message
, "checkout: moving from "))
1157 message
+= strlen("checkout: moving from ");
1158 target
= strstr(message
, " to ");
1161 target
+= strlen(" to ");
1162 strbuf_reset(&cb
->buf
);
1163 hashcpy(cb
->nsha1
, nsha1
);
1164 for (end
= target
; *end
&& *end
!= '\n'; end
++)
1166 strbuf_add(&cb
->buf
, target
, end
- target
);
1170 static void wt_status_get_detached_from(struct wt_status_state
*state
)
1172 struct grab_1st_switch_cbdata cb
;
1173 struct commit
*commit
;
1174 unsigned char sha1
[20];
1177 strbuf_init(&cb
.buf
, 0);
1178 if (for_each_reflog_ent_reverse("HEAD", grab_1st_switch
, &cb
) <= 0) {
1179 strbuf_release(&cb
.buf
);
1183 if (dwim_ref(cb
.buf
.buf
, cb
.buf
.len
, sha1
, &ref
) == 1 &&
1184 /* sha1 is a commit? match without further lookup */
1185 (!hashcmp(cb
.nsha1
, sha1
) ||
1186 /* perhaps sha1 is a tag, try to dereference to a commit */
1187 ((commit
= lookup_commit_reference_gently(sha1
, 1)) != NULL
&&
1188 !hashcmp(cb
.nsha1
, commit
->object
.sha1
)))) {
1190 if (starts_with(ref
, "refs/tags/"))
1191 ofs
= strlen("refs/tags/");
1192 else if (starts_with(ref
, "refs/remotes/"))
1193 ofs
= strlen("refs/remotes/");
1196 state
->detached_from
= xstrdup(ref
+ ofs
);
1198 state
->detached_from
=
1199 xstrdup(find_unique_abbrev(cb
.nsha1
, DEFAULT_ABBREV
));
1200 hashcpy(state
->detached_sha1
, cb
.nsha1
);
1203 strbuf_release(&cb
.buf
);
1206 void wt_status_get_state(struct wt_status_state
*state
,
1207 int get_detached_from
)
1210 unsigned char sha1
[20];
1212 if (!stat(git_path("MERGE_HEAD"), &st
)) {
1213 state
->merge_in_progress
= 1;
1214 } else if (!stat(git_path("rebase-apply"), &st
)) {
1215 if (!stat(git_path("rebase-apply/applying"), &st
)) {
1216 state
->am_in_progress
= 1;
1217 if (!stat(git_path("rebase-apply/patch"), &st
) && !st
.st_size
)
1218 state
->am_empty_patch
= 1;
1220 state
->rebase_in_progress
= 1;
1221 state
->branch
= read_and_strip_branch("rebase-apply/head-name");
1222 state
->onto
= read_and_strip_branch("rebase-apply/onto");
1224 } else if (!stat(git_path("rebase-merge"), &st
)) {
1225 if (!stat(git_path("rebase-merge/interactive"), &st
))
1226 state
->rebase_interactive_in_progress
= 1;
1228 state
->rebase_in_progress
= 1;
1229 state
->branch
= read_and_strip_branch("rebase-merge/head-name");
1230 state
->onto
= read_and_strip_branch("rebase-merge/onto");
1231 } else if (!stat(git_path("CHERRY_PICK_HEAD"), &st
) &&
1232 !get_sha1("CHERRY_PICK_HEAD", sha1
)) {
1233 state
->cherry_pick_in_progress
= 1;
1234 hashcpy(state
->cherry_pick_head_sha1
, sha1
);
1236 if (!stat(git_path("BISECT_LOG"), &st
)) {
1237 state
->bisect_in_progress
= 1;
1238 state
->branch
= read_and_strip_branch("BISECT_START");
1240 if (!stat(git_path("REVERT_HEAD"), &st
) &&
1241 !get_sha1("REVERT_HEAD", sha1
)) {
1242 state
->revert_in_progress
= 1;
1243 hashcpy(state
->revert_head_sha1
, sha1
);
1246 if (get_detached_from
)
1247 wt_status_get_detached_from(state
);
1250 static void wt_status_print_state(struct wt_status
*s
,
1251 struct wt_status_state
*state
)
1253 const char *state_color
= color(WT_STATUS_HEADER
, s
);
1254 if (state
->merge_in_progress
)
1255 show_merge_in_progress(s
, state
, state_color
);
1256 else if (state
->am_in_progress
)
1257 show_am_in_progress(s
, state
, state_color
);
1258 else if (state
->rebase_in_progress
|| state
->rebase_interactive_in_progress
)
1259 show_rebase_in_progress(s
, state
, state_color
);
1260 else if (state
->cherry_pick_in_progress
)
1261 show_cherry_pick_in_progress(s
, state
, state_color
);
1262 else if (state
->revert_in_progress
)
1263 show_revert_in_progress(s
, state
, state_color
);
1264 if (state
->bisect_in_progress
)
1265 show_bisect_in_progress(s
, state
, state_color
);
1268 void wt_status_print(struct wt_status
*s
)
1270 const char *branch_color
= color(WT_STATUS_ONBRANCH
, s
);
1271 const char *branch_status_color
= color(WT_STATUS_HEADER
, s
);
1272 struct wt_status_state state
;
1274 memset(&state
, 0, sizeof(state
));
1275 wt_status_get_state(&state
,
1276 s
->branch
&& !strcmp(s
->branch
, "HEAD"));
1279 const char *on_what
= _("On branch ");
1280 const char *branch_name
= s
->branch
;
1281 if (starts_with(branch_name
, "refs/heads/"))
1283 else if (!strcmp(branch_name
, "HEAD")) {
1284 branch_status_color
= color(WT_STATUS_NOBRANCH
, s
);
1285 if (state
.rebase_in_progress
|| state
.rebase_interactive_in_progress
) {
1286 on_what
= _("rebase in progress; onto ");
1287 branch_name
= state
.onto
;
1288 } else if (state
.detached_from
) {
1289 unsigned char sha1
[20];
1290 branch_name
= state
.detached_from
;
1291 if (!get_sha1("HEAD", sha1
) &&
1292 !hashcmp(sha1
, state
.detached_sha1
))
1293 on_what
= _("HEAD detached at ");
1295 on_what
= _("HEAD detached from ");
1298 on_what
= _("Not currently on any branch.");
1301 status_printf(s
, color(WT_STATUS_HEADER
, s
), "");
1302 status_printf_more(s
, branch_status_color
, "%s", on_what
);
1303 status_printf_more(s
, branch_color
, "%s\n", branch_name
);
1305 wt_status_print_tracking(s
);
1308 wt_status_print_state(s
, &state
);
1311 free(state
.detached_from
);
1313 if (s
->is_initial
) {
1314 status_printf_ln(s
, color(WT_STATUS_HEADER
, s
), "");
1315 status_printf_ln(s
, color(WT_STATUS_HEADER
, s
), _("Initial commit"));
1316 status_printf_ln(s
, color(WT_STATUS_HEADER
, s
), "");
1319 wt_status_print_updated(s
);
1320 wt_status_print_unmerged(s
);
1321 wt_status_print_changed(s
);
1322 if (s
->submodule_summary
&&
1323 (!s
->ignore_submodule_arg
||
1324 strcmp(s
->ignore_submodule_arg
, "all"))) {
1325 wt_status_print_submodule_summary(s
, 0); /* staged */
1326 wt_status_print_submodule_summary(s
, 1); /* unstaged */
1328 if (s
->show_untracked_files
) {
1329 wt_status_print_other(s
, &s
->untracked
, _("Untracked files"), "add");
1330 if (s
->show_ignored_files
)
1331 wt_status_print_other(s
, &s
->ignored
, _("Ignored files"), "add -f");
1332 if (advice_status_u_option
&& 2000 < s
->untracked_in_ms
) {
1333 status_printf_ln(s
, GIT_COLOR_NORMAL
, "");
1334 status_printf_ln(s
, GIT_COLOR_NORMAL
,
1335 _("It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1336 "may speed it up, but you have to be careful not to forget to add\n"
1337 "new files yourself (see 'git help status')."),
1338 s
->untracked_in_ms
/ 1000.0);
1340 } else if (s
->commitable
)
1341 status_printf_ln(s
, GIT_COLOR_NORMAL
, _("Untracked files not listed%s"),
1343 ? _(" (use -u option to show untracked files)") : "");
1346 wt_status_print_verbose(s
);
1347 if (!s
->commitable
) {
1349 status_printf_ln(s
, GIT_COLOR_NORMAL
, _("No changes"));
1352 else if (s
->workdir_dirty
) {
1354 printf(_("no changes added to commit "
1355 "(use \"git add\" and/or \"git commit -a\")\n"));
1357 printf(_("no changes added to commit\n"));
1358 } else if (s
->untracked
.nr
) {
1360 printf(_("nothing added to commit but untracked files "
1361 "present (use \"git add\" to track)\n"));
1363 printf(_("nothing added to commit but untracked files present\n"));
1364 } else if (s
->is_initial
) {
1366 printf(_("nothing to commit (create/copy files "
1367 "and use \"git add\" to track)\n"));
1369 printf(_("nothing to commit\n"));
1370 } else if (!s
->show_untracked_files
) {
1372 printf(_("nothing to commit (use -u to show untracked files)\n"));
1374 printf(_("nothing to commit\n"));
1376 printf(_("nothing to commit, working directory clean\n"));
1380 static void wt_shortstatus_unmerged(struct string_list_item
*it
,
1381 struct wt_status
*s
)
1383 struct wt_status_change_data
*d
= it
->util
;
1384 const char *how
= "??";
1386 switch (d
->stagemask
) {
1387 case 1: how
= "DD"; break; /* both deleted */
1388 case 2: how
= "AU"; break; /* added by us */
1389 case 3: how
= "UD"; break; /* deleted by them */
1390 case 4: how
= "UA"; break; /* added by them */
1391 case 5: how
= "DU"; break; /* deleted by us */
1392 case 6: how
= "AA"; break; /* both added */
1393 case 7: how
= "UU"; break; /* both modified */
1395 color_fprintf(s
->fp
, color(WT_STATUS_UNMERGED
, s
), "%s", how
);
1396 if (s
->null_termination
) {
1397 fprintf(stdout
, " %s%c", it
->string
, 0);
1399 struct strbuf onebuf
= STRBUF_INIT
;
1401 one
= quote_path(it
->string
, s
->prefix
, &onebuf
);
1402 printf(" %s\n", one
);
1403 strbuf_release(&onebuf
);
1407 static void wt_shortstatus_status(struct string_list_item
*it
,
1408 struct wt_status
*s
)
1410 struct wt_status_change_data
*d
= it
->util
;
1412 if (d
->index_status
)
1413 color_fprintf(s
->fp
, color(WT_STATUS_UPDATED
, s
), "%c", d
->index_status
);
1416 if (d
->worktree_status
)
1417 color_fprintf(s
->fp
, color(WT_STATUS_CHANGED
, s
), "%c", d
->worktree_status
);
1421 if (s
->null_termination
) {
1422 fprintf(stdout
, "%s%c", it
->string
, 0);
1424 fprintf(stdout
, "%s%c", d
->head_path
, 0);
1426 struct strbuf onebuf
= STRBUF_INIT
;
1429 one
= quote_path(d
->head_path
, s
->prefix
, &onebuf
);
1430 if (*one
!= '"' && strchr(one
, ' ') != NULL
) {
1432 strbuf_addch(&onebuf
, '"');
1435 printf("%s -> ", one
);
1436 strbuf_release(&onebuf
);
1438 one
= quote_path(it
->string
, s
->prefix
, &onebuf
);
1439 if (*one
!= '"' && strchr(one
, ' ') != NULL
) {
1441 strbuf_addch(&onebuf
, '"');
1444 printf("%s\n", one
);
1445 strbuf_release(&onebuf
);
1449 static void wt_shortstatus_other(struct string_list_item
*it
,
1450 struct wt_status
*s
, const char *sign
)
1452 if (s
->null_termination
) {
1453 fprintf(stdout
, "%s %s%c", sign
, it
->string
, 0);
1455 struct strbuf onebuf
= STRBUF_INIT
;
1457 one
= quote_path(it
->string
, s
->prefix
, &onebuf
);
1458 color_fprintf(s
->fp
, color(WT_STATUS_UNTRACKED
, s
), "%s", sign
);
1459 printf(" %s\n", one
);
1460 strbuf_release(&onebuf
);
1464 static void wt_shortstatus_print_tracking(struct wt_status
*s
)
1466 struct branch
*branch
;
1467 const char *header_color
= color(WT_STATUS_HEADER
, s
);
1468 const char *branch_color_local
= color(WT_STATUS_LOCAL_BRANCH
, s
);
1469 const char *branch_color_remote
= color(WT_STATUS_REMOTE_BRANCH
, s
);
1472 const char *branch_name
;
1473 int num_ours
, num_theirs
;
1474 int upstream_is_gone
= 0;
1476 color_fprintf(s
->fp
, color(WT_STATUS_HEADER
, s
), "## ");
1480 branch_name
= s
->branch
;
1482 if (starts_with(branch_name
, "refs/heads/"))
1484 else if (!strcmp(branch_name
, "HEAD")) {
1485 branch_name
= _("HEAD (no branch)");
1486 branch_color_local
= color(WT_STATUS_NOBRANCH
, s
);
1489 branch
= branch_get(s
->branch
+ 11);
1491 color_fprintf(s
->fp
, header_color
, _("Initial commit on "));
1493 color_fprintf(s
->fp
, branch_color_local
, "%s", branch_name
);
1495 switch (stat_tracking_info(branch
, &num_ours
, &num_theirs
)) {
1498 fputc(s
->null_termination
? '\0' : '\n', s
->fp
);
1501 /* with "gone" base */
1502 upstream_is_gone
= 1;
1509 base
= branch
->merge
[0]->dst
;
1510 base
= shorten_unambiguous_ref(base
, 0);
1511 color_fprintf(s
->fp
, header_color
, "...");
1512 color_fprintf(s
->fp
, branch_color_remote
, "%s", base
);
1514 if (!upstream_is_gone
&& !num_ours
&& !num_theirs
) {
1515 fputc(s
->null_termination
? '\0' : '\n', s
->fp
);
1519 color_fprintf(s
->fp
, header_color
, " [");
1520 if (upstream_is_gone
) {
1521 color_fprintf(s
->fp
, header_color
, _("gone"));
1522 } else if (!num_ours
) {
1523 color_fprintf(s
->fp
, header_color
, _("behind "));
1524 color_fprintf(s
->fp
, branch_color_remote
, "%d", num_theirs
);
1525 } else if (!num_theirs
) {
1526 color_fprintf(s
->fp
, header_color
, _("ahead "));
1527 color_fprintf(s
->fp
, branch_color_local
, "%d", num_ours
);
1529 color_fprintf(s
->fp
, header_color
, _("ahead "));
1530 color_fprintf(s
->fp
, branch_color_local
, "%d", num_ours
);
1531 color_fprintf(s
->fp
, header_color
, _(", behind "));
1532 color_fprintf(s
->fp
, branch_color_remote
, "%d", num_theirs
);
1535 color_fprintf(s
->fp
, header_color
, "]");
1536 fputc(s
->null_termination
? '\0' : '\n', s
->fp
);
1539 void wt_shortstatus_print(struct wt_status
*s
)
1544 wt_shortstatus_print_tracking(s
);
1546 for (i
= 0; i
< s
->change
.nr
; i
++) {
1547 struct wt_status_change_data
*d
;
1548 struct string_list_item
*it
;
1550 it
= &(s
->change
.items
[i
]);
1553 wt_shortstatus_unmerged(it
, s
);
1555 wt_shortstatus_status(it
, s
);
1557 for (i
= 0; i
< s
->untracked
.nr
; i
++) {
1558 struct string_list_item
*it
;
1560 it
= &(s
->untracked
.items
[i
]);
1561 wt_shortstatus_other(it
, s
, "??");
1563 for (i
= 0; i
< s
->ignored
.nr
; i
++) {
1564 struct string_list_item
*it
;
1566 it
= &(s
->ignored
.items
[i
]);
1567 wt_shortstatus_other(it
, s
, "!!");
1571 void wt_porcelain_print(struct wt_status
*s
)
1574 s
->relative_paths
= 0;
1576 wt_shortstatus_print(s
);