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
:
280 case DIFF_STATUS_MODIFIED
:
281 return _("modified");
282 case DIFF_STATUS_RENAMED
:
284 case DIFF_STATUS_TYPE_CHANGED
:
285 return _("typechange");
286 case DIFF_STATUS_UNKNOWN
:
288 case DIFF_STATUS_UNMERGED
:
289 return _("unmerged");
295 static void wt_status_print_change_data(struct wt_status
*s
,
297 struct string_list_item
*it
)
299 struct wt_status_change_data
*d
= it
->util
;
300 const char *c
= color(change_type
, s
);
304 const char *one
, *two
;
305 struct strbuf onebuf
= STRBUF_INIT
, twobuf
= STRBUF_INIT
;
306 struct strbuf extra
= STRBUF_INIT
;
307 static char *padding
;
313 /* If DIFF_STATUS_* uses outside this range, we're in trouble */
314 for (status
= 'A'; status
<= 'Z'; status
++) {
315 what
= wt_status_diff_status_string(status
);
316 len
= what
? strlen(what
) : 0;
320 width
+= 2; /* colon and a space */
321 padding
= xmallocz(width
);
322 memset(padding
, ' ', width
);
325 one_name
= two_name
= it
->string
;
326 switch (change_type
) {
327 case WT_STATUS_UPDATED
:
328 status
= d
->index_status
;
330 one_name
= d
->head_path
;
332 case WT_STATUS_CHANGED
:
333 if (d
->new_submodule_commits
|| d
->dirty_submodule
) {
334 strbuf_addstr(&extra
, " (");
335 if (d
->new_submodule_commits
)
336 strbuf_addf(&extra
, _("new commits, "));
337 if (d
->dirty_submodule
& DIRTY_SUBMODULE_MODIFIED
)
338 strbuf_addf(&extra
, _("modified content, "));
339 if (d
->dirty_submodule
& DIRTY_SUBMODULE_UNTRACKED
)
340 strbuf_addf(&extra
, _("untracked content, "));
341 strbuf_setlen(&extra
, extra
.len
- 2);
342 strbuf_addch(&extra
, ')');
344 status
= d
->worktree_status
;
347 die("BUG: unhandled change_type %d in wt_status_print_change_data",
351 one
= quote_path(one_name
, s
->prefix
, &onebuf
);
352 two
= quote_path(two_name
, s
->prefix
, &twobuf
);
354 status_printf(s
, color(WT_STATUS_HEADER
, s
), "\t");
355 what
= wt_status_diff_status_string(status
);
357 die(_("bug: unhandled diff status %c"), status
);
358 /* 1 for colon, which is not part of "what" */
359 len
= strlen(padding
) - (utf8_strwidth(what
) + 1);
361 if (status
== DIFF_STATUS_COPIED
|| status
== DIFF_STATUS_RENAMED
)
362 status_printf_more(s
, c
, "%s:%.*s%s -> %s",
363 what
, len
, padding
, one
, two
);
365 status_printf_more(s
, c
, "%s:%.*s%s",
366 what
, len
, padding
, one
);
368 status_printf_more(s
, color(WT_STATUS_HEADER
, s
), "%s", extra
.buf
);
369 strbuf_release(&extra
);
371 status_printf_more(s
, GIT_COLOR_NORMAL
, "\n");
372 strbuf_release(&onebuf
);
373 strbuf_release(&twobuf
);
376 static void wt_status_collect_changed_cb(struct diff_queue_struct
*q
,
377 struct diff_options
*options
,
380 struct wt_status
*s
= data
;
385 s
->workdir_dirty
= 1;
386 for (i
= 0; i
< q
->nr
; i
++) {
387 struct diff_filepair
*p
;
388 struct string_list_item
*it
;
389 struct wt_status_change_data
*d
;
392 it
= string_list_insert(&s
->change
, p
->one
->path
);
395 d
= xcalloc(1, sizeof(*d
));
398 if (!d
->worktree_status
)
399 d
->worktree_status
= p
->status
;
400 d
->dirty_submodule
= p
->two
->dirty_submodule
;
401 if (S_ISGITLINK(p
->two
->mode
))
402 d
->new_submodule_commits
= !!hashcmp(p
->one
->sha1
, p
->two
->sha1
);
406 static int unmerged_mask(const char *path
)
409 const struct cache_entry
*ce
;
411 pos
= cache_name_pos(path
, strlen(path
));
417 while (pos
< active_nr
) {
418 ce
= active_cache
[pos
++];
419 if (strcmp(ce
->name
, path
) || !ce_stage(ce
))
421 mask
|= (1 << (ce_stage(ce
) - 1));
426 static void wt_status_collect_updated_cb(struct diff_queue_struct
*q
,
427 struct diff_options
*options
,
430 struct wt_status
*s
= data
;
433 for (i
= 0; i
< q
->nr
; i
++) {
434 struct diff_filepair
*p
;
435 struct string_list_item
*it
;
436 struct wt_status_change_data
*d
;
439 it
= string_list_insert(&s
->change
, p
->two
->path
);
442 d
= xcalloc(1, sizeof(*d
));
445 if (!d
->index_status
)
446 d
->index_status
= p
->status
;
448 case DIFF_STATUS_COPIED
:
449 case DIFF_STATUS_RENAMED
:
450 d
->head_path
= xstrdup(p
->one
->path
);
452 case DIFF_STATUS_UNMERGED
:
453 d
->stagemask
= unmerged_mask(p
->two
->path
);
459 static void wt_status_collect_changes_worktree(struct wt_status
*s
)
463 init_revisions(&rev
, NULL
);
464 setup_revisions(0, NULL
, &rev
, NULL
);
465 rev
.diffopt
.output_format
|= DIFF_FORMAT_CALLBACK
;
466 DIFF_OPT_SET(&rev
.diffopt
, DIRTY_SUBMODULES
);
467 if (!s
->show_untracked_files
)
468 DIFF_OPT_SET(&rev
.diffopt
, IGNORE_UNTRACKED_IN_SUBMODULES
);
469 if (s
->ignore_submodule_arg
) {
470 DIFF_OPT_SET(&rev
.diffopt
, OVERRIDE_SUBMODULE_CONFIG
);
471 handle_ignore_submodules_arg(&rev
.diffopt
, s
->ignore_submodule_arg
);
473 rev
.diffopt
.format_callback
= wt_status_collect_changed_cb
;
474 rev
.diffopt
.format_callback_data
= s
;
475 copy_pathspec(&rev
.prune_data
, &s
->pathspec
);
476 run_diff_files(&rev
, 0);
479 static void wt_status_collect_changes_index(struct wt_status
*s
)
482 struct setup_revision_opt opt
;
484 init_revisions(&rev
, NULL
);
485 memset(&opt
, 0, sizeof(opt
));
486 opt
.def
= s
->is_initial
? EMPTY_TREE_SHA1_HEX
: s
->reference
;
487 setup_revisions(0, NULL
, &rev
, &opt
);
489 DIFF_OPT_SET(&rev
.diffopt
, OVERRIDE_SUBMODULE_CONFIG
);
490 if (s
->ignore_submodule_arg
) {
491 handle_ignore_submodules_arg(&rev
.diffopt
, s
->ignore_submodule_arg
);
494 * Unless the user did explicitly request a submodule ignore
495 * mode by passing a command line option we do not ignore any
496 * changed submodule SHA-1s when comparing index and HEAD, no
497 * matter what is configured. Otherwise the user won't be
498 * shown any submodules she manually added (and which are
499 * staged to be committed), which would be really confusing.
501 handle_ignore_submodules_arg(&rev
.diffopt
, "dirty");
504 rev
.diffopt
.output_format
|= DIFF_FORMAT_CALLBACK
;
505 rev
.diffopt
.format_callback
= wt_status_collect_updated_cb
;
506 rev
.diffopt
.format_callback_data
= s
;
507 rev
.diffopt
.detect_rename
= 1;
508 rev
.diffopt
.rename_limit
= 200;
509 rev
.diffopt
.break_opt
= 0;
510 copy_pathspec(&rev
.prune_data
, &s
->pathspec
);
511 run_diff_index(&rev
, 1);
514 static void wt_status_collect_changes_initial(struct wt_status
*s
)
518 for (i
= 0; i
< active_nr
; i
++) {
519 struct string_list_item
*it
;
520 struct wt_status_change_data
*d
;
521 const struct cache_entry
*ce
= active_cache
[i
];
523 if (!ce_path_match(ce
, &s
->pathspec
))
525 it
= string_list_insert(&s
->change
, ce
->name
);
528 d
= xcalloc(1, sizeof(*d
));
532 d
->index_status
= DIFF_STATUS_UNMERGED
;
533 d
->stagemask
|= (1 << (ce_stage(ce
) - 1));
536 d
->index_status
= DIFF_STATUS_ADDED
;
540 static void wt_status_collect_untracked(struct wt_status
*s
)
543 struct dir_struct dir
;
544 struct timeval t_begin
;
546 if (!s
->show_untracked_files
)
549 if (advice_status_u_option
)
550 gettimeofday(&t_begin
, NULL
);
552 memset(&dir
, 0, sizeof(dir
));
553 if (s
->show_untracked_files
!= SHOW_ALL_UNTRACKED_FILES
)
555 DIR_SHOW_OTHER_DIRECTORIES
| DIR_HIDE_EMPTY_DIRECTORIES
;
556 if (s
->show_ignored_files
)
557 dir
.flags
|= DIR_SHOW_IGNORED_TOO
;
558 setup_standard_excludes(&dir
);
560 fill_directory(&dir
, &s
->pathspec
);
562 for (i
= 0; i
< dir
.nr
; i
++) {
563 struct dir_entry
*ent
= dir
.entries
[i
];
564 if (cache_name_is_other(ent
->name
, ent
->len
) &&
565 match_pathspec_depth(&s
->pathspec
, ent
->name
, ent
->len
, 0, NULL
))
566 string_list_insert(&s
->untracked
, ent
->name
);
570 for (i
= 0; i
< dir
.ignored_nr
; i
++) {
571 struct dir_entry
*ent
= dir
.ignored
[i
];
572 if (cache_name_is_other(ent
->name
, ent
->len
) &&
573 match_pathspec_depth(&s
->pathspec
, ent
->name
, ent
->len
, 0, NULL
))
574 string_list_insert(&s
->ignored
, ent
->name
);
580 clear_directory(&dir
);
582 if (advice_status_u_option
) {
583 struct timeval t_end
;
584 gettimeofday(&t_end
, NULL
);
586 (uint64_t)t_end
.tv_sec
* 1000 + t_end
.tv_usec
/ 1000 -
587 ((uint64_t)t_begin
.tv_sec
* 1000 + t_begin
.tv_usec
/ 1000);
591 void wt_status_collect(struct wt_status
*s
)
593 wt_status_collect_changes_worktree(s
);
596 wt_status_collect_changes_initial(s
);
598 wt_status_collect_changes_index(s
);
599 wt_status_collect_untracked(s
);
602 static void wt_status_print_unmerged(struct wt_status
*s
)
604 int shown_header
= 0;
607 for (i
= 0; i
< s
->change
.nr
; i
++) {
608 struct wt_status_change_data
*d
;
609 struct string_list_item
*it
;
610 it
= &(s
->change
.items
[i
]);
615 wt_status_print_unmerged_header(s
);
618 wt_status_print_unmerged_data(s
, it
);
621 wt_status_print_trailer(s
);
625 static void wt_status_print_updated(struct wt_status
*s
)
627 int shown_header
= 0;
630 for (i
= 0; i
< s
->change
.nr
; i
++) {
631 struct wt_status_change_data
*d
;
632 struct string_list_item
*it
;
633 it
= &(s
->change
.items
[i
]);
635 if (!d
->index_status
||
636 d
->index_status
== DIFF_STATUS_UNMERGED
)
639 wt_status_print_cached_header(s
);
643 wt_status_print_change_data(s
, WT_STATUS_UPDATED
, it
);
646 wt_status_print_trailer(s
);
652 * 1 : some change but no delete
654 static int wt_status_check_worktree_changes(struct wt_status
*s
,
655 int *dirty_submodules
)
660 *dirty_submodules
= 0;
662 for (i
= 0; i
< s
->change
.nr
; i
++) {
663 struct wt_status_change_data
*d
;
664 d
= s
->change
.items
[i
].util
;
665 if (!d
->worktree_status
||
666 d
->worktree_status
== DIFF_STATUS_UNMERGED
)
670 if (d
->dirty_submodule
)
671 *dirty_submodules
= 1;
672 if (d
->worktree_status
== DIFF_STATUS_DELETED
)
678 static void wt_status_print_changed(struct wt_status
*s
)
680 int i
, dirty_submodules
;
681 int worktree_changes
= wt_status_check_worktree_changes(s
, &dirty_submodules
);
683 if (!worktree_changes
)
686 wt_status_print_dirty_header(s
, worktree_changes
< 0, dirty_submodules
);
688 for (i
= 0; i
< s
->change
.nr
; i
++) {
689 struct wt_status_change_data
*d
;
690 struct string_list_item
*it
;
691 it
= &(s
->change
.items
[i
]);
693 if (!d
->worktree_status
||
694 d
->worktree_status
== DIFF_STATUS_UNMERGED
)
696 wt_status_print_change_data(s
, WT_STATUS_CHANGED
, it
);
698 wt_status_print_trailer(s
);
701 static void wt_status_print_submodule_summary(struct wt_status
*s
, int uncommitted
)
703 struct child_process sm_summary
;
704 char summary_limit
[64];
705 char index
[PATH_MAX
];
706 const char *env
[] = { NULL
, NULL
};
707 struct argv_array argv
= ARGV_ARRAY_INIT
;
708 struct strbuf cmd_stdout
= STRBUF_INIT
;
709 struct strbuf summary
= STRBUF_INIT
;
710 char *summary_content
;
713 sprintf(summary_limit
, "%d", s
->submodule_summary
);
714 snprintf(index
, sizeof(index
), "GIT_INDEX_FILE=%s", s
->index_file
);
717 argv_array_push(&argv
, "submodule");
718 argv_array_push(&argv
, "summary");
719 argv_array_push(&argv
, uncommitted
? "--files" : "--cached");
720 argv_array_push(&argv
, "--for-status");
721 argv_array_push(&argv
, "--summary-limit");
722 argv_array_push(&argv
, summary_limit
);
724 argv_array_push(&argv
, s
->amend
? "HEAD^" : "HEAD");
726 memset(&sm_summary
, 0, sizeof(sm_summary
));
727 sm_summary
.argv
= argv
.argv
;
728 sm_summary
.env
= env
;
729 sm_summary
.git_cmd
= 1;
730 sm_summary
.no_stdin
= 1;
734 run_command(&sm_summary
);
735 argv_array_clear(&argv
);
737 len
= strbuf_read(&cmd_stdout
, sm_summary
.out
, 1024);
739 /* prepend header, only if there's an actual output */
742 strbuf_addstr(&summary
, _("Submodules changed but not updated:"));
744 strbuf_addstr(&summary
, _("Submodule changes to be committed:"));
745 strbuf_addstr(&summary
, "\n\n");
747 strbuf_addbuf(&summary
, &cmd_stdout
);
748 strbuf_release(&cmd_stdout
);
750 if (s
->display_comment_prefix
) {
751 summary_content
= strbuf_detach(&summary
, &len
);
752 strbuf_add_commented_lines(&summary
, summary_content
, len
);
753 free(summary_content
);
756 fputs(summary
.buf
, s
->fp
);
757 strbuf_release(&summary
);
760 static void wt_status_print_other(struct wt_status
*s
,
761 struct string_list
*l
,
766 struct strbuf buf
= STRBUF_INIT
;
767 static struct string_list output
= STRING_LIST_INIT_DUP
;
768 struct column_options copts
;
773 wt_status_print_other_header(s
, what
, how
);
775 for (i
= 0; i
< l
->nr
; i
++) {
776 struct string_list_item
*it
;
779 path
= quote_path(it
->string
, s
->prefix
, &buf
);
780 if (column_active(s
->colopts
)) {
781 string_list_append(&output
, path
);
784 status_printf(s
, color(WT_STATUS_HEADER
, s
), "\t");
785 status_printf_more(s
, color(WT_STATUS_UNTRACKED
, s
),
789 strbuf_release(&buf
);
790 if (!column_active(s
->colopts
))
793 strbuf_addf(&buf
, "%s%s\t%s",
794 color(WT_STATUS_HEADER
, s
),
795 s
->display_comment_prefix
? "#" : "",
796 color(WT_STATUS_UNTRACKED
, s
));
797 memset(&copts
, 0, sizeof(copts
));
799 copts
.indent
= buf
.buf
;
800 if (want_color(s
->use_color
))
801 copts
.nl
= GIT_COLOR_RESET
"\n";
802 print_columns(&output
, s
->colopts
, &copts
);
803 string_list_clear(&output
, 0);
804 strbuf_release(&buf
);
806 status_printf_ln(s
, GIT_COLOR_NORMAL
, "");
809 void wt_status_truncate_message_at_cut_line(struct strbuf
*buf
)
812 struct strbuf pattern
= STRBUF_INIT
;
814 strbuf_addf(&pattern
, "%c %s", comment_line_char
, cut_line
);
815 p
= strstr(buf
->buf
, pattern
.buf
);
816 if (p
&& (p
== buf
->buf
|| p
[-1] == '\n'))
817 strbuf_setlen(buf
, p
- buf
->buf
);
818 strbuf_release(&pattern
);
821 static void wt_status_print_verbose(struct wt_status
*s
)
824 struct setup_revision_opt opt
;
826 init_revisions(&rev
, NULL
);
827 DIFF_OPT_SET(&rev
.diffopt
, ALLOW_TEXTCONV
);
829 memset(&opt
, 0, sizeof(opt
));
830 opt
.def
= s
->is_initial
? EMPTY_TREE_SHA1_HEX
: s
->reference
;
831 setup_revisions(0, NULL
, &rev
, &opt
);
833 rev
.diffopt
.output_format
|= DIFF_FORMAT_PATCH
;
834 rev
.diffopt
.detect_rename
= 1;
835 rev
.diffopt
.file
= s
->fp
;
836 rev
.diffopt
.close_file
= 0;
838 * If we're not going to stdout, then we definitely don't
839 * want color, since we are going to the commit message
840 * file (and even the "auto" setting won't work, since it
841 * will have checked isatty on stdout). But we then do want
842 * to insert the scissor line here to reliably remove the
843 * diff before committing.
845 if (s
->fp
!= stdout
) {
846 const char *explanation
= _("Do not touch the line above.\nEverything below will be removed.");
847 struct strbuf buf
= STRBUF_INIT
;
849 rev
.diffopt
.use_color
= 0;
850 fprintf(s
->fp
, "%c %s", comment_line_char
, cut_line
);
851 strbuf_add_commented_lines(&buf
, explanation
, strlen(explanation
));
852 fputs(buf
.buf
, s
->fp
);
853 strbuf_release(&buf
);
855 run_diff_index(&rev
, 1);
858 static void wt_status_print_tracking(struct wt_status
*s
)
860 struct strbuf sb
= STRBUF_INIT
;
862 struct branch
*branch
;
863 char comment_line_string
[3];
866 assert(s
->branch
&& !s
->is_initial
);
867 if (!starts_with(s
->branch
, "refs/heads/"))
869 branch
= branch_get(s
->branch
+ 11);
870 if (!format_tracking_info(branch
, &sb
))
874 if (s
->display_comment_prefix
) {
875 comment_line_string
[i
++] = comment_line_char
;
876 comment_line_string
[i
++] = ' ';
878 comment_line_string
[i
] = '\0';
880 for (cp
= sb
.buf
; (ep
= strchr(cp
, '\n')) != NULL
; cp
= ep
+ 1)
881 color_fprintf_ln(s
->fp
, color(WT_STATUS_HEADER
, s
),
882 "%s%.*s", comment_line_string
,
884 if (s
->display_comment_prefix
)
885 color_fprintf_ln(s
->fp
, color(WT_STATUS_HEADER
, s
), "%c",
888 fprintf_ln(s
->fp
, "");
891 static int has_unmerged(struct wt_status
*s
)
895 for (i
= 0; i
< s
->change
.nr
; i
++) {
896 struct wt_status_change_data
*d
;
897 d
= s
->change
.items
[i
].util
;
904 static void show_merge_in_progress(struct wt_status
*s
,
905 struct wt_status_state
*state
,
908 if (has_unmerged(s
)) {
909 status_printf_ln(s
, color
, _("You have unmerged paths."));
911 status_printf_ln(s
, color
,
912 _(" (fix conflicts and run \"git commit\")"));
914 status_printf_ln(s
, color
,
915 _("All conflicts fixed but you are still merging."));
917 status_printf_ln(s
, color
,
918 _(" (use \"git commit\" to conclude merge)"));
920 wt_status_print_trailer(s
);
923 static void show_am_in_progress(struct wt_status
*s
,
924 struct wt_status_state
*state
,
927 status_printf_ln(s
, color
,
928 _("You are in the middle of an am session."));
929 if (state
->am_empty_patch
)
930 status_printf_ln(s
, color
,
931 _("The current patch is empty."));
933 if (!state
->am_empty_patch
)
934 status_printf_ln(s
, color
,
935 _(" (fix conflicts and then run \"git am --continue\")"));
936 status_printf_ln(s
, color
,
937 _(" (use \"git am --skip\" to skip this patch)"));
938 status_printf_ln(s
, color
,
939 _(" (use \"git am --abort\" to restore the original branch)"));
941 wt_status_print_trailer(s
);
944 static char *read_line_from_git_path(const char *filename
)
946 struct strbuf buf
= STRBUF_INIT
;
947 FILE *fp
= fopen(git_path("%s", filename
), "r");
949 strbuf_release(&buf
);
952 strbuf_getline(&buf
, fp
, '\n');
954 return strbuf_detach(&buf
, NULL
);
956 strbuf_release(&buf
);
961 static int split_commit_in_progress(struct wt_status
*s
)
963 int split_in_progress
= 0;
964 char *head
= read_line_from_git_path("HEAD");
965 char *orig_head
= read_line_from_git_path("ORIG_HEAD");
966 char *rebase_amend
= read_line_from_git_path("rebase-merge/amend");
967 char *rebase_orig_head
= read_line_from_git_path("rebase-merge/orig-head");
969 if (!head
|| !orig_head
|| !rebase_amend
|| !rebase_orig_head
||
970 !s
->branch
|| strcmp(s
->branch
, "HEAD"))
971 return split_in_progress
;
973 if (!strcmp(rebase_amend
, rebase_orig_head
)) {
974 if (strcmp(head
, rebase_amend
))
975 split_in_progress
= 1;
976 } else if (strcmp(orig_head
, rebase_orig_head
)) {
977 split_in_progress
= 1;
980 if (!s
->amend
&& !s
->nowarn
&& !s
->workdir_dirty
)
981 split_in_progress
= 0;
986 free(rebase_orig_head
);
987 return split_in_progress
;
990 static void show_rebase_in_progress(struct wt_status
*s
,
991 struct wt_status_state
*state
,
996 if (has_unmerged(s
)) {
998 status_printf_ln(s
, color
,
999 _("You are currently rebasing branch '%s' on '%s'."),
1003 status_printf_ln(s
, color
,
1004 _("You are currently rebasing."));
1006 status_printf_ln(s
, color
,
1007 _(" (fix conflicts and then run \"git rebase --continue\")"));
1008 status_printf_ln(s
, color
,
1009 _(" (use \"git rebase --skip\" to skip this patch)"));
1010 status_printf_ln(s
, color
,
1011 _(" (use \"git rebase --abort\" to check out the original branch)"));
1013 } else if (state
->rebase_in_progress
|| !stat(git_path("MERGE_MSG"), &st
)) {
1015 status_printf_ln(s
, color
,
1016 _("You are currently rebasing branch '%s' on '%s'."),
1020 status_printf_ln(s
, color
,
1021 _("You are currently rebasing."));
1023 status_printf_ln(s
, color
,
1024 _(" (all conflicts fixed: run \"git rebase --continue\")"));
1025 } else if (split_commit_in_progress(s
)) {
1027 status_printf_ln(s
, color
,
1028 _("You are currently splitting a commit while rebasing branch '%s' on '%s'."),
1032 status_printf_ln(s
, color
,
1033 _("You are currently splitting a commit during a rebase."));
1035 status_printf_ln(s
, color
,
1036 _(" (Once your working directory is clean, run \"git rebase --continue\")"));
1039 status_printf_ln(s
, color
,
1040 _("You are currently editing a commit while rebasing branch '%s' on '%s'."),
1044 status_printf_ln(s
, color
,
1045 _("You are currently editing a commit during a rebase."));
1046 if (s
->hints
&& !s
->amend
) {
1047 status_printf_ln(s
, color
,
1048 _(" (use \"git commit --amend\" to amend the current commit)"));
1049 status_printf_ln(s
, color
,
1050 _(" (use \"git rebase --continue\" once you are satisfied with your changes)"));
1053 wt_status_print_trailer(s
);
1056 static void show_cherry_pick_in_progress(struct wt_status
*s
,
1057 struct wt_status_state
*state
,
1060 status_printf_ln(s
, color
, _("You are currently cherry-picking commit %s."),
1061 find_unique_abbrev(state
->cherry_pick_head_sha1
, DEFAULT_ABBREV
));
1063 if (has_unmerged(s
))
1064 status_printf_ln(s
, color
,
1065 _(" (fix conflicts and run \"git cherry-pick --continue\")"));
1067 status_printf_ln(s
, color
,
1068 _(" (all conflicts fixed: run \"git cherry-pick --continue\")"));
1069 status_printf_ln(s
, color
,
1070 _(" (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"));
1072 wt_status_print_trailer(s
);
1075 static void show_revert_in_progress(struct wt_status
*s
,
1076 struct wt_status_state
*state
,
1079 status_printf_ln(s
, color
, _("You are currently reverting commit %s."),
1080 find_unique_abbrev(state
->revert_head_sha1
, DEFAULT_ABBREV
));
1082 if (has_unmerged(s
))
1083 status_printf_ln(s
, color
,
1084 _(" (fix conflicts and run \"git revert --continue\")"));
1086 status_printf_ln(s
, color
,
1087 _(" (all conflicts fixed: run \"git revert --continue\")"));
1088 status_printf_ln(s
, color
,
1089 _(" (use \"git revert --abort\" to cancel the revert operation)"));
1091 wt_status_print_trailer(s
);
1094 static void show_bisect_in_progress(struct wt_status
*s
,
1095 struct wt_status_state
*state
,
1099 status_printf_ln(s
, color
,
1100 _("You are currently bisecting, started from branch '%s'."),
1103 status_printf_ln(s
, color
,
1104 _("You are currently bisecting."));
1106 status_printf_ln(s
, color
,
1107 _(" (use \"git bisect reset\" to get back to the original branch)"));
1108 wt_status_print_trailer(s
);
1112 * Extract branch information from rebase/bisect
1114 static char *read_and_strip_branch(const char *path
)
1116 struct strbuf sb
= STRBUF_INIT
;
1117 unsigned char sha1
[20];
1119 if (strbuf_read_file(&sb
, git_path("%s", path
), 0) <= 0)
1122 while (&sb
.len
&& sb
.buf
[sb
.len
- 1] == '\n')
1123 strbuf_setlen(&sb
, sb
.len
- 1);
1126 if (starts_with(sb
.buf
, "refs/heads/"))
1127 strbuf_remove(&sb
,0, strlen("refs/heads/"));
1128 else if (starts_with(sb
.buf
, "refs/"))
1130 else if (!get_sha1_hex(sb
.buf
, sha1
)) {
1132 abbrev
= find_unique_abbrev(sha1
, DEFAULT_ABBREV
);
1134 strbuf_addstr(&sb
, abbrev
);
1135 } else if (!strcmp(sb
.buf
, "detached HEAD")) /* rebase */
1139 return strbuf_detach(&sb
, NULL
);
1142 strbuf_release(&sb
);
1146 struct grab_1st_switch_cbdata
{
1148 unsigned char nsha1
[20];
1151 static int grab_1st_switch(unsigned char *osha1
, unsigned char *nsha1
,
1152 const char *email
, unsigned long timestamp
, int tz
,
1153 const char *message
, void *cb_data
)
1155 struct grab_1st_switch_cbdata
*cb
= cb_data
;
1156 const char *target
= NULL
, *end
;
1158 if (!starts_with(message
, "checkout: moving from "))
1160 message
+= strlen("checkout: moving from ");
1161 target
= strstr(message
, " to ");
1164 target
+= strlen(" to ");
1165 strbuf_reset(&cb
->buf
);
1166 hashcpy(cb
->nsha1
, nsha1
);
1167 for (end
= target
; *end
&& *end
!= '\n'; end
++)
1169 strbuf_add(&cb
->buf
, target
, end
- target
);
1173 static void wt_status_get_detached_from(struct wt_status_state
*state
)
1175 struct grab_1st_switch_cbdata cb
;
1176 struct commit
*commit
;
1177 unsigned char sha1
[20];
1180 strbuf_init(&cb
.buf
, 0);
1181 if (for_each_reflog_ent_reverse("HEAD", grab_1st_switch
, &cb
) <= 0) {
1182 strbuf_release(&cb
.buf
);
1186 if (dwim_ref(cb
.buf
.buf
, cb
.buf
.len
, sha1
, &ref
) == 1 &&
1187 /* sha1 is a commit? match without further lookup */
1188 (!hashcmp(cb
.nsha1
, sha1
) ||
1189 /* perhaps sha1 is a tag, try to dereference to a commit */
1190 ((commit
= lookup_commit_reference_gently(sha1
, 1)) != NULL
&&
1191 !hashcmp(cb
.nsha1
, commit
->object
.sha1
)))) {
1193 if (starts_with(ref
, "refs/tags/"))
1194 ofs
= strlen("refs/tags/");
1195 else if (starts_with(ref
, "refs/remotes/"))
1196 ofs
= strlen("refs/remotes/");
1199 state
->detached_from
= xstrdup(ref
+ ofs
);
1201 state
->detached_from
=
1202 xstrdup(find_unique_abbrev(cb
.nsha1
, DEFAULT_ABBREV
));
1203 hashcpy(state
->detached_sha1
, cb
.nsha1
);
1206 strbuf_release(&cb
.buf
);
1209 void wt_status_get_state(struct wt_status_state
*state
,
1210 int get_detached_from
)
1213 unsigned char sha1
[20];
1215 if (!stat(git_path("MERGE_HEAD"), &st
)) {
1216 state
->merge_in_progress
= 1;
1217 } else if (!stat(git_path("rebase-apply"), &st
)) {
1218 if (!stat(git_path("rebase-apply/applying"), &st
)) {
1219 state
->am_in_progress
= 1;
1220 if (!stat(git_path("rebase-apply/patch"), &st
) && !st
.st_size
)
1221 state
->am_empty_patch
= 1;
1223 state
->rebase_in_progress
= 1;
1224 state
->branch
= read_and_strip_branch("rebase-apply/head-name");
1225 state
->onto
= read_and_strip_branch("rebase-apply/onto");
1227 } else if (!stat(git_path("rebase-merge"), &st
)) {
1228 if (!stat(git_path("rebase-merge/interactive"), &st
))
1229 state
->rebase_interactive_in_progress
= 1;
1231 state
->rebase_in_progress
= 1;
1232 state
->branch
= read_and_strip_branch("rebase-merge/head-name");
1233 state
->onto
= read_and_strip_branch("rebase-merge/onto");
1234 } else if (!stat(git_path("CHERRY_PICK_HEAD"), &st
) &&
1235 !get_sha1("CHERRY_PICK_HEAD", sha1
)) {
1236 state
->cherry_pick_in_progress
= 1;
1237 hashcpy(state
->cherry_pick_head_sha1
, sha1
);
1239 if (!stat(git_path("BISECT_LOG"), &st
)) {
1240 state
->bisect_in_progress
= 1;
1241 state
->branch
= read_and_strip_branch("BISECT_START");
1243 if (!stat(git_path("REVERT_HEAD"), &st
) &&
1244 !get_sha1("REVERT_HEAD", sha1
)) {
1245 state
->revert_in_progress
= 1;
1246 hashcpy(state
->revert_head_sha1
, sha1
);
1249 if (get_detached_from
)
1250 wt_status_get_detached_from(state
);
1253 static void wt_status_print_state(struct wt_status
*s
,
1254 struct wt_status_state
*state
)
1256 const char *state_color
= color(WT_STATUS_HEADER
, s
);
1257 if (state
->merge_in_progress
)
1258 show_merge_in_progress(s
, state
, state_color
);
1259 else if (state
->am_in_progress
)
1260 show_am_in_progress(s
, state
, state_color
);
1261 else if (state
->rebase_in_progress
|| state
->rebase_interactive_in_progress
)
1262 show_rebase_in_progress(s
, state
, state_color
);
1263 else if (state
->cherry_pick_in_progress
)
1264 show_cherry_pick_in_progress(s
, state
, state_color
);
1265 else if (state
->revert_in_progress
)
1266 show_revert_in_progress(s
, state
, state_color
);
1267 if (state
->bisect_in_progress
)
1268 show_bisect_in_progress(s
, state
, state_color
);
1271 void wt_status_print(struct wt_status
*s
)
1273 const char *branch_color
= color(WT_STATUS_ONBRANCH
, s
);
1274 const char *branch_status_color
= color(WT_STATUS_HEADER
, s
);
1275 struct wt_status_state state
;
1277 memset(&state
, 0, sizeof(state
));
1278 wt_status_get_state(&state
,
1279 s
->branch
&& !strcmp(s
->branch
, "HEAD"));
1282 const char *on_what
= _("On branch ");
1283 const char *branch_name
= s
->branch
;
1284 if (starts_with(branch_name
, "refs/heads/"))
1286 else if (!strcmp(branch_name
, "HEAD")) {
1287 branch_status_color
= color(WT_STATUS_NOBRANCH
, s
);
1288 if (state
.rebase_in_progress
|| state
.rebase_interactive_in_progress
) {
1289 on_what
= _("rebase in progress; onto ");
1290 branch_name
= state
.onto
;
1291 } else if (state
.detached_from
) {
1292 unsigned char sha1
[20];
1293 branch_name
= state
.detached_from
;
1294 if (!get_sha1("HEAD", sha1
) &&
1295 !hashcmp(sha1
, state
.detached_sha1
))
1296 on_what
= _("HEAD detached at ");
1298 on_what
= _("HEAD detached from ");
1301 on_what
= _("Not currently on any branch.");
1304 status_printf(s
, color(WT_STATUS_HEADER
, s
), "");
1305 status_printf_more(s
, branch_status_color
, "%s", on_what
);
1306 status_printf_more(s
, branch_color
, "%s\n", branch_name
);
1308 wt_status_print_tracking(s
);
1311 wt_status_print_state(s
, &state
);
1314 free(state
.detached_from
);
1316 if (s
->is_initial
) {
1317 status_printf_ln(s
, color(WT_STATUS_HEADER
, s
), "");
1318 status_printf_ln(s
, color(WT_STATUS_HEADER
, s
), _("Initial commit"));
1319 status_printf_ln(s
, color(WT_STATUS_HEADER
, s
), "");
1322 wt_status_print_updated(s
);
1323 wt_status_print_unmerged(s
);
1324 wt_status_print_changed(s
);
1325 if (s
->submodule_summary
&&
1326 (!s
->ignore_submodule_arg
||
1327 strcmp(s
->ignore_submodule_arg
, "all"))) {
1328 wt_status_print_submodule_summary(s
, 0); /* staged */
1329 wt_status_print_submodule_summary(s
, 1); /* unstaged */
1331 if (s
->show_untracked_files
) {
1332 wt_status_print_other(s
, &s
->untracked
, _("Untracked files"), "add");
1333 if (s
->show_ignored_files
)
1334 wt_status_print_other(s
, &s
->ignored
, _("Ignored files"), "add -f");
1335 if (advice_status_u_option
&& 2000 < s
->untracked_in_ms
) {
1336 status_printf_ln(s
, GIT_COLOR_NORMAL
, "");
1337 status_printf_ln(s
, GIT_COLOR_NORMAL
,
1338 _("It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1339 "may speed it up, but you have to be careful not to forget to add\n"
1340 "new files yourself (see 'git help status')."),
1341 s
->untracked_in_ms
/ 1000.0);
1343 } else if (s
->commitable
)
1344 status_printf_ln(s
, GIT_COLOR_NORMAL
, _("Untracked files not listed%s"),
1346 ? _(" (use -u option to show untracked files)") : "");
1349 wt_status_print_verbose(s
);
1350 if (!s
->commitable
) {
1352 status_printf_ln(s
, GIT_COLOR_NORMAL
, _("No changes"));
1355 else if (s
->workdir_dirty
) {
1357 printf(_("no changes added to commit "
1358 "(use \"git add\" and/or \"git commit -a\")\n"));
1360 printf(_("no changes added to commit\n"));
1361 } else if (s
->untracked
.nr
) {
1363 printf(_("nothing added to commit but untracked files "
1364 "present (use \"git add\" to track)\n"));
1366 printf(_("nothing added to commit but untracked files present\n"));
1367 } else if (s
->is_initial
) {
1369 printf(_("nothing to commit (create/copy files "
1370 "and use \"git add\" to track)\n"));
1372 printf(_("nothing to commit\n"));
1373 } else if (!s
->show_untracked_files
) {
1375 printf(_("nothing to commit (use -u to show untracked files)\n"));
1377 printf(_("nothing to commit\n"));
1379 printf(_("nothing to commit, working directory clean\n"));
1383 static void wt_shortstatus_unmerged(struct string_list_item
*it
,
1384 struct wt_status
*s
)
1386 struct wt_status_change_data
*d
= it
->util
;
1387 const char *how
= "??";
1389 switch (d
->stagemask
) {
1390 case 1: how
= "DD"; break; /* both deleted */
1391 case 2: how
= "AU"; break; /* added by us */
1392 case 3: how
= "UD"; break; /* deleted by them */
1393 case 4: how
= "UA"; break; /* added by them */
1394 case 5: how
= "DU"; break; /* deleted by us */
1395 case 6: how
= "AA"; break; /* both added */
1396 case 7: how
= "UU"; break; /* both modified */
1398 color_fprintf(s
->fp
, color(WT_STATUS_UNMERGED
, s
), "%s", how
);
1399 if (s
->null_termination
) {
1400 fprintf(stdout
, " %s%c", it
->string
, 0);
1402 struct strbuf onebuf
= STRBUF_INIT
;
1404 one
= quote_path(it
->string
, s
->prefix
, &onebuf
);
1405 printf(" %s\n", one
);
1406 strbuf_release(&onebuf
);
1410 static void wt_shortstatus_status(struct string_list_item
*it
,
1411 struct wt_status
*s
)
1413 struct wt_status_change_data
*d
= it
->util
;
1415 if (d
->index_status
)
1416 color_fprintf(s
->fp
, color(WT_STATUS_UPDATED
, s
), "%c", d
->index_status
);
1419 if (d
->worktree_status
)
1420 color_fprintf(s
->fp
, color(WT_STATUS_CHANGED
, s
), "%c", d
->worktree_status
);
1424 if (s
->null_termination
) {
1425 fprintf(stdout
, "%s%c", it
->string
, 0);
1427 fprintf(stdout
, "%s%c", d
->head_path
, 0);
1429 struct strbuf onebuf
= STRBUF_INIT
;
1432 one
= quote_path(d
->head_path
, s
->prefix
, &onebuf
);
1433 if (*one
!= '"' && strchr(one
, ' ') != NULL
) {
1435 strbuf_addch(&onebuf
, '"');
1438 printf("%s -> ", one
);
1439 strbuf_release(&onebuf
);
1441 one
= quote_path(it
->string
, s
->prefix
, &onebuf
);
1442 if (*one
!= '"' && strchr(one
, ' ') != NULL
) {
1444 strbuf_addch(&onebuf
, '"');
1447 printf("%s\n", one
);
1448 strbuf_release(&onebuf
);
1452 static void wt_shortstatus_other(struct string_list_item
*it
,
1453 struct wt_status
*s
, const char *sign
)
1455 if (s
->null_termination
) {
1456 fprintf(stdout
, "%s %s%c", sign
, it
->string
, 0);
1458 struct strbuf onebuf
= STRBUF_INIT
;
1460 one
= quote_path(it
->string
, s
->prefix
, &onebuf
);
1461 color_fprintf(s
->fp
, color(WT_STATUS_UNTRACKED
, s
), "%s", sign
);
1462 printf(" %s\n", one
);
1463 strbuf_release(&onebuf
);
1467 static void wt_shortstatus_print_tracking(struct wt_status
*s
)
1469 struct branch
*branch
;
1470 const char *header_color
= color(WT_STATUS_HEADER
, s
);
1471 const char *branch_color_local
= color(WT_STATUS_LOCAL_BRANCH
, s
);
1472 const char *branch_color_remote
= color(WT_STATUS_REMOTE_BRANCH
, s
);
1475 const char *branch_name
;
1476 int num_ours
, num_theirs
;
1477 int upstream_is_gone
= 0;
1479 color_fprintf(s
->fp
, color(WT_STATUS_HEADER
, s
), "## ");
1483 branch_name
= s
->branch
;
1485 if (starts_with(branch_name
, "refs/heads/"))
1487 else if (!strcmp(branch_name
, "HEAD")) {
1488 branch_name
= _("HEAD (no branch)");
1489 branch_color_local
= color(WT_STATUS_NOBRANCH
, s
);
1492 branch
= branch_get(s
->branch
+ 11);
1494 color_fprintf(s
->fp
, header_color
, _("Initial commit on "));
1496 color_fprintf(s
->fp
, branch_color_local
, "%s", branch_name
);
1498 switch (stat_tracking_info(branch
, &num_ours
, &num_theirs
)) {
1501 fputc(s
->null_termination
? '\0' : '\n', s
->fp
);
1504 /* with "gone" base */
1505 upstream_is_gone
= 1;
1512 base
= branch
->merge
[0]->dst
;
1513 base
= shorten_unambiguous_ref(base
, 0);
1514 color_fprintf(s
->fp
, header_color
, "...");
1515 color_fprintf(s
->fp
, branch_color_remote
, "%s", base
);
1517 if (!upstream_is_gone
&& !num_ours
&& !num_theirs
) {
1518 fputc(s
->null_termination
? '\0' : '\n', s
->fp
);
1522 color_fprintf(s
->fp
, header_color
, " [");
1523 if (upstream_is_gone
) {
1524 color_fprintf(s
->fp
, header_color
, _("gone"));
1525 } else if (!num_ours
) {
1526 color_fprintf(s
->fp
, header_color
, _("behind "));
1527 color_fprintf(s
->fp
, branch_color_remote
, "%d", num_theirs
);
1528 } else if (!num_theirs
) {
1529 color_fprintf(s
->fp
, header_color
, _("ahead "));
1530 color_fprintf(s
->fp
, branch_color_local
, "%d", num_ours
);
1532 color_fprintf(s
->fp
, header_color
, _("ahead "));
1533 color_fprintf(s
->fp
, branch_color_local
, "%d", num_ours
);
1534 color_fprintf(s
->fp
, header_color
, _(", behind "));
1535 color_fprintf(s
->fp
, branch_color_remote
, "%d", num_theirs
);
1538 color_fprintf(s
->fp
, header_color
, "]");
1539 fputc(s
->null_termination
? '\0' : '\n', s
->fp
);
1542 void wt_shortstatus_print(struct wt_status
*s
)
1547 wt_shortstatus_print_tracking(s
);
1549 for (i
= 0; i
< s
->change
.nr
; i
++) {
1550 struct wt_status_change_data
*d
;
1551 struct string_list_item
*it
;
1553 it
= &(s
->change
.items
[i
]);
1556 wt_shortstatus_unmerged(it
, s
);
1558 wt_shortstatus_status(it
, s
);
1560 for (i
= 0; i
< s
->untracked
.nr
; i
++) {
1561 struct string_list_item
*it
;
1563 it
= &(s
->untracked
.items
[i
]);
1564 wt_shortstatus_other(it
, s
, "??");
1566 for (i
= 0; i
< s
->ignored
.nr
; i
++) {
1567 struct string_list_item
*it
;
1569 it
= &(s
->ignored
.items
[i
]);
1570 wt_shortstatus_other(it
, s
, "!!");
1574 void wt_porcelain_print(struct wt_status
*s
)
1577 s
->relative_paths
= 0;
1579 wt_shortstatus_print(s
);