11 #include "run-command.h"
12 #include "argv-array.h"
15 #include "submodule.h"
19 static char default_wt_status_colors
[][COLOR_MAXLEN
] = {
20 GIT_COLOR_NORMAL
, /* WT_STATUS_HEADER */
21 GIT_COLOR_GREEN
, /* WT_STATUS_UPDATED */
22 GIT_COLOR_RED
, /* WT_STATUS_CHANGED */
23 GIT_COLOR_RED
, /* WT_STATUS_UNTRACKED */
24 GIT_COLOR_RED
, /* WT_STATUS_NOBRANCH */
25 GIT_COLOR_RED
, /* WT_STATUS_UNMERGED */
26 GIT_COLOR_GREEN
, /* WT_STATUS_LOCAL_BRANCH */
27 GIT_COLOR_RED
, /* WT_STATUS_REMOTE_BRANCH */
28 GIT_COLOR_NIL
, /* WT_STATUS_ONBRANCH */
31 static const char *color(int slot
, struct wt_status
*s
)
34 if (want_color(s
->use_color
))
35 c
= s
->color_palette
[slot
];
36 if (slot
== WT_STATUS_ONBRANCH
&& color_is_nil(c
))
37 c
= s
->color_palette
[WT_STATUS_HEADER
];
41 static void status_vprintf(struct wt_status
*s
, int at_bol
, const char *color
,
42 const char *fmt
, va_list ap
, const char *trail
)
44 struct strbuf sb
= STRBUF_INIT
;
45 struct strbuf linebuf
= STRBUF_INIT
;
46 const char *line
, *eol
;
48 strbuf_vaddf(&sb
, fmt
, ap
);
50 if (s
->display_comment_prefix
) {
51 strbuf_addch(&sb
, comment_line_char
);
53 strbuf_addch(&sb
, ' ');
55 color_print_strbuf(s
->fp
, color
, &sb
);
57 fprintf(s
->fp
, "%s", trail
);
61 for (line
= sb
.buf
; *line
; line
= eol
+ 1) {
62 eol
= strchr(line
, '\n');
64 strbuf_reset(&linebuf
);
65 if (at_bol
&& s
->display_comment_prefix
) {
66 strbuf_addch(&linebuf
, comment_line_char
);
67 if (*line
!= '\n' && *line
!= '\t')
68 strbuf_addch(&linebuf
, ' ');
71 strbuf_add(&linebuf
, line
, eol
- line
);
73 strbuf_addstr(&linebuf
, line
);
74 color_print_strbuf(s
->fp
, color
, &linebuf
);
82 fprintf(s
->fp
, "%s", trail
);
83 strbuf_release(&linebuf
);
87 void status_printf_ln(struct wt_status
*s
, const char *color
,
93 status_vprintf(s
, 1, color
, fmt
, ap
, "\n");
97 void status_printf(struct wt_status
*s
, const char *color
,
103 status_vprintf(s
, 1, color
, fmt
, ap
, NULL
);
107 static void status_printf_more(struct wt_status
*s
, const char *color
,
108 const char *fmt
, ...)
113 status_vprintf(s
, 0, color
, fmt
, ap
, NULL
);
117 void wt_status_prepare(struct wt_status
*s
)
119 unsigned char sha1
[20];
121 memset(s
, 0, sizeof(*s
));
122 memcpy(s
->color_palette
, default_wt_status_colors
,
123 sizeof(default_wt_status_colors
));
124 s
->show_untracked_files
= SHOW_NORMAL_UNTRACKED_FILES
;
126 s
->relative_paths
= 1;
127 s
->branch
= resolve_refdup("HEAD", sha1
, 0, NULL
);
128 s
->reference
= "HEAD";
130 s
->index_file
= get_index_file();
131 s
->change
.strdup_strings
= 1;
132 s
->untracked
.strdup_strings
= 1;
133 s
->ignored
.strdup_strings
= 1;
134 s
->show_branch
= -1; /* unspecified */
135 s
->display_comment_prefix
= 0;
138 static void wt_status_print_unmerged_header(struct wt_status
*s
)
141 int del_mod_conflict
= 0;
142 int both_deleted
= 0;
144 const char *c
= color(WT_STATUS_HEADER
, s
);
146 status_printf_ln(s
, c
, _("Unmerged paths:"));
148 for (i
= 0; i
< s
->change
.nr
; i
++) {
149 struct string_list_item
*it
= &(s
->change
.items
[i
]);
150 struct wt_status_change_data
*d
= it
->util
;
152 switch (d
->stagemask
) {
160 del_mod_conflict
= 1;
170 if (s
->whence
!= FROM_COMMIT
)
172 else if (!s
->is_initial
)
173 status_printf_ln(s
, c
, _(" (use \"git reset %s <file>...\" to unstage)"), s
->reference
);
175 status_printf_ln(s
, c
, _(" (use \"git rm --cached <file>...\" to unstage)"));
178 if (!del_mod_conflict
)
179 status_printf_ln(s
, c
, _(" (use \"git add <file>...\" to mark resolution)"));
181 status_printf_ln(s
, c
, _(" (use \"git add/rm <file>...\" as appropriate to mark resolution)"));
182 } else if (!del_mod_conflict
&& !not_deleted
) {
183 status_printf_ln(s
, c
, _(" (use \"git rm <file>...\" to mark resolution)"));
185 status_printf_ln(s
, c
, _(" (use \"git add/rm <file>...\" as appropriate to mark resolution)"));
187 status_printf_ln(s
, c
, "");
190 static void wt_status_print_cached_header(struct wt_status
*s
)
192 const char *c
= color(WT_STATUS_HEADER
, s
);
194 status_printf_ln(s
, c
, _("Changes to be committed:"));
197 if (s
->whence
!= FROM_COMMIT
)
198 ; /* NEEDSWORK: use "git reset --unresolve"??? */
199 else if (!s
->is_initial
)
200 status_printf_ln(s
, c
, _(" (use \"git reset %s <file>...\" to unstage)"), s
->reference
);
202 status_printf_ln(s
, c
, _(" (use \"git rm --cached <file>...\" to unstage)"));
203 status_printf_ln(s
, c
, "");
206 static void wt_status_print_dirty_header(struct wt_status
*s
,
208 int has_dirty_submodules
)
210 const char *c
= color(WT_STATUS_HEADER
, s
);
212 status_printf_ln(s
, c
, _("Changes not staged for commit:"));
216 status_printf_ln(s
, c
, _(" (use \"git add <file>...\" to update what will be committed)"));
218 status_printf_ln(s
, c
, _(" (use \"git add/rm <file>...\" to update what will be committed)"));
219 status_printf_ln(s
, c
, _(" (use \"git checkout -- <file>...\" to discard changes in working directory)"));
220 if (has_dirty_submodules
)
221 status_printf_ln(s
, c
, _(" (commit or discard the untracked or modified content in submodules)"));
222 status_printf_ln(s
, c
, "");
225 static void wt_status_print_other_header(struct wt_status
*s
,
229 const char *c
= color(WT_STATUS_HEADER
, s
);
230 status_printf_ln(s
, c
, "%s:", what
);
233 status_printf_ln(s
, c
, _(" (use \"git %s <file>...\" to include in what will be committed)"), how
);
234 status_printf_ln(s
, c
, "");
237 static void wt_status_print_trailer(struct wt_status
*s
)
239 status_printf_ln(s
, color(WT_STATUS_HEADER
, s
), "");
242 #define quote_path quote_path_relative
244 static void wt_status_print_unmerged_data(struct wt_status
*s
,
245 struct string_list_item
*it
)
247 const char *c
= color(WT_STATUS_UNMERGED
, s
);
248 struct wt_status_change_data
*d
= it
->util
;
249 struct strbuf onebuf
= STRBUF_INIT
;
250 const char *one
, *how
= _("bug");
252 one
= quote_path(it
->string
, s
->prefix
, &onebuf
);
253 status_printf(s
, color(WT_STATUS_HEADER
, s
), "\t");
254 switch (d
->stagemask
) {
255 case 1: how
= _("both deleted:"); break;
256 case 2: how
= _("added by us:"); break;
257 case 3: how
= _("deleted by them:"); break;
258 case 4: how
= _("added by them:"); break;
259 case 5: how
= _("deleted by us:"); break;
260 case 6: how
= _("both added:"); break;
261 case 7: how
= _("both modified:"); break;
263 status_printf_more(s
, c
, "%-20s%s\n", how
, one
);
264 strbuf_release(&onebuf
);
267 static void wt_status_print_change_data(struct wt_status
*s
,
269 struct string_list_item
*it
)
271 struct wt_status_change_data
*d
= it
->util
;
272 const char *c
= color(change_type
, s
);
276 const char *one
, *two
;
277 struct strbuf onebuf
= STRBUF_INIT
, twobuf
= STRBUF_INIT
;
278 struct strbuf extra
= STRBUF_INIT
;
280 one_name
= two_name
= it
->string
;
281 switch (change_type
) {
282 case WT_STATUS_UPDATED
:
283 status
= d
->index_status
;
285 one_name
= d
->head_path
;
287 case WT_STATUS_CHANGED
:
288 if (d
->new_submodule_commits
|| d
->dirty_submodule
) {
289 strbuf_addstr(&extra
, " (");
290 if (d
->new_submodule_commits
)
291 strbuf_addf(&extra
, _("new commits, "));
292 if (d
->dirty_submodule
& DIRTY_SUBMODULE_MODIFIED
)
293 strbuf_addf(&extra
, _("modified content, "));
294 if (d
->dirty_submodule
& DIRTY_SUBMODULE_UNTRACKED
)
295 strbuf_addf(&extra
, _("untracked content, "));
296 strbuf_setlen(&extra
, extra
.len
- 2);
297 strbuf_addch(&extra
, ')');
299 status
= d
->worktree_status
;
302 die("BUG: unhandled change_type %d in wt_status_print_change_data",
306 one
= quote_path(one_name
, s
->prefix
, &onebuf
);
307 two
= quote_path(two_name
, s
->prefix
, &twobuf
);
309 status_printf(s
, color(WT_STATUS_HEADER
, s
), "\t");
311 case DIFF_STATUS_ADDED
:
312 status_printf_more(s
, c
, _("new file: %s"), one
);
314 case DIFF_STATUS_COPIED
:
315 status_printf_more(s
, c
, _("copied: %s -> %s"), one
, two
);
317 case DIFF_STATUS_DELETED
:
318 status_printf_more(s
, c
, _("deleted: %s"), one
);
320 case DIFF_STATUS_MODIFIED
:
321 status_printf_more(s
, c
, _("modified: %s"), one
);
323 case DIFF_STATUS_RENAMED
:
324 status_printf_more(s
, c
, _("renamed: %s -> %s"), one
, two
);
326 case DIFF_STATUS_TYPE_CHANGED
:
327 status_printf_more(s
, c
, _("typechange: %s"), one
);
329 case DIFF_STATUS_UNKNOWN
:
330 status_printf_more(s
, c
, _("unknown: %s"), one
);
332 case DIFF_STATUS_UNMERGED
:
333 status_printf_more(s
, c
, _("unmerged: %s"), one
);
336 die(_("bug: unhandled diff status %c"), status
);
339 status_printf_more(s
, color(WT_STATUS_HEADER
, s
), "%s", extra
.buf
);
340 strbuf_release(&extra
);
342 status_printf_more(s
, GIT_COLOR_NORMAL
, "\n");
343 strbuf_release(&onebuf
);
344 strbuf_release(&twobuf
);
347 static void wt_status_collect_changed_cb(struct diff_queue_struct
*q
,
348 struct diff_options
*options
,
351 struct wt_status
*s
= data
;
356 s
->workdir_dirty
= 1;
357 for (i
= 0; i
< q
->nr
; i
++) {
358 struct diff_filepair
*p
;
359 struct string_list_item
*it
;
360 struct wt_status_change_data
*d
;
363 it
= string_list_insert(&s
->change
, p
->one
->path
);
366 d
= xcalloc(1, sizeof(*d
));
369 if (!d
->worktree_status
)
370 d
->worktree_status
= p
->status
;
371 d
->dirty_submodule
= p
->two
->dirty_submodule
;
372 if (S_ISGITLINK(p
->two
->mode
))
373 d
->new_submodule_commits
= !!hashcmp(p
->one
->sha1
, p
->two
->sha1
);
377 static int unmerged_mask(const char *path
)
380 const struct cache_entry
*ce
;
382 pos
= cache_name_pos(path
, strlen(path
));
388 while (pos
< active_nr
) {
389 ce
= active_cache
[pos
++];
390 if (strcmp(ce
->name
, path
) || !ce_stage(ce
))
392 mask
|= (1 << (ce_stage(ce
) - 1));
397 static void wt_status_collect_updated_cb(struct diff_queue_struct
*q
,
398 struct diff_options
*options
,
401 struct wt_status
*s
= data
;
404 for (i
= 0; i
< q
->nr
; i
++) {
405 struct diff_filepair
*p
;
406 struct string_list_item
*it
;
407 struct wt_status_change_data
*d
;
410 it
= string_list_insert(&s
->change
, p
->two
->path
);
413 d
= xcalloc(1, sizeof(*d
));
416 if (!d
->index_status
)
417 d
->index_status
= p
->status
;
419 case DIFF_STATUS_COPIED
:
420 case DIFF_STATUS_RENAMED
:
421 d
->head_path
= xstrdup(p
->one
->path
);
423 case DIFF_STATUS_UNMERGED
:
424 d
->stagemask
= unmerged_mask(p
->two
->path
);
430 static void wt_status_collect_changes_worktree(struct wt_status
*s
)
434 init_revisions(&rev
, NULL
);
435 setup_revisions(0, NULL
, &rev
, NULL
);
436 rev
.diffopt
.output_format
|= DIFF_FORMAT_CALLBACK
;
437 DIFF_OPT_SET(&rev
.diffopt
, DIRTY_SUBMODULES
);
438 if (!s
->show_untracked_files
)
439 DIFF_OPT_SET(&rev
.diffopt
, IGNORE_UNTRACKED_IN_SUBMODULES
);
440 if (s
->ignore_submodule_arg
) {
441 DIFF_OPT_SET(&rev
.diffopt
, OVERRIDE_SUBMODULE_CONFIG
);
442 handle_ignore_submodules_arg(&rev
.diffopt
, s
->ignore_submodule_arg
);
444 rev
.diffopt
.format_callback
= wt_status_collect_changed_cb
;
445 rev
.diffopt
.format_callback_data
= s
;
446 copy_pathspec(&rev
.prune_data
, &s
->pathspec
);
447 run_diff_files(&rev
, 0);
450 static void wt_status_collect_changes_index(struct wt_status
*s
)
453 struct setup_revision_opt opt
;
455 init_revisions(&rev
, NULL
);
456 memset(&opt
, 0, sizeof(opt
));
457 opt
.def
= s
->is_initial
? EMPTY_TREE_SHA1_HEX
: s
->reference
;
458 setup_revisions(0, NULL
, &rev
, &opt
);
460 if (s
->ignore_submodule_arg
) {
461 DIFF_OPT_SET(&rev
.diffopt
, OVERRIDE_SUBMODULE_CONFIG
);
462 handle_ignore_submodules_arg(&rev
.diffopt
, s
->ignore_submodule_arg
);
465 rev
.diffopt
.output_format
|= DIFF_FORMAT_CALLBACK
;
466 rev
.diffopt
.format_callback
= wt_status_collect_updated_cb
;
467 rev
.diffopt
.format_callback_data
= s
;
468 rev
.diffopt
.detect_rename
= 1;
469 rev
.diffopt
.rename_limit
= 200;
470 rev
.diffopt
.break_opt
= 0;
471 copy_pathspec(&rev
.prune_data
, &s
->pathspec
);
472 run_diff_index(&rev
, 1);
475 static void wt_status_collect_changes_initial(struct wt_status
*s
)
479 for (i
= 0; i
< active_nr
; i
++) {
480 struct string_list_item
*it
;
481 struct wt_status_change_data
*d
;
482 const struct cache_entry
*ce
= active_cache
[i
];
484 if (!ce_path_match(ce
, &s
->pathspec
))
486 it
= string_list_insert(&s
->change
, ce
->name
);
489 d
= xcalloc(1, sizeof(*d
));
493 d
->index_status
= DIFF_STATUS_UNMERGED
;
494 d
->stagemask
|= (1 << (ce_stage(ce
) - 1));
497 d
->index_status
= DIFF_STATUS_ADDED
;
501 static void wt_status_collect_untracked(struct wt_status
*s
)
504 struct dir_struct dir
;
505 struct timeval t_begin
;
507 if (!s
->show_untracked_files
)
510 if (advice_status_u_option
)
511 gettimeofday(&t_begin
, NULL
);
513 memset(&dir
, 0, sizeof(dir
));
514 if (s
->show_untracked_files
!= SHOW_ALL_UNTRACKED_FILES
)
516 DIR_SHOW_OTHER_DIRECTORIES
| DIR_HIDE_EMPTY_DIRECTORIES
;
517 if (s
->show_ignored_files
)
518 dir
.flags
|= DIR_SHOW_IGNORED_TOO
;
519 setup_standard_excludes(&dir
);
521 fill_directory(&dir
, &s
->pathspec
);
523 for (i
= 0; i
< dir
.nr
; i
++) {
524 struct dir_entry
*ent
= dir
.entries
[i
];
525 if (cache_name_is_other(ent
->name
, ent
->len
) &&
526 match_pathspec_depth(&s
->pathspec
, ent
->name
, ent
->len
, 0, NULL
))
527 string_list_insert(&s
->untracked
, ent
->name
);
531 for (i
= 0; i
< dir
.ignored_nr
; i
++) {
532 struct dir_entry
*ent
= dir
.ignored
[i
];
533 if (cache_name_is_other(ent
->name
, ent
->len
) &&
534 match_pathspec_depth(&s
->pathspec
, ent
->name
, ent
->len
, 0, NULL
))
535 string_list_insert(&s
->ignored
, ent
->name
);
541 clear_directory(&dir
);
543 if (advice_status_u_option
) {
544 struct timeval t_end
;
545 gettimeofday(&t_end
, NULL
);
547 (uint64_t)t_end
.tv_sec
* 1000 + t_end
.tv_usec
/ 1000 -
548 ((uint64_t)t_begin
.tv_sec
* 1000 + t_begin
.tv_usec
/ 1000);
552 void wt_status_collect(struct wt_status
*s
)
554 wt_status_collect_changes_worktree(s
);
557 wt_status_collect_changes_initial(s
);
559 wt_status_collect_changes_index(s
);
560 wt_status_collect_untracked(s
);
563 static void wt_status_print_unmerged(struct wt_status
*s
)
565 int shown_header
= 0;
568 for (i
= 0; i
< s
->change
.nr
; i
++) {
569 struct wt_status_change_data
*d
;
570 struct string_list_item
*it
;
571 it
= &(s
->change
.items
[i
]);
576 wt_status_print_unmerged_header(s
);
579 wt_status_print_unmerged_data(s
, it
);
582 wt_status_print_trailer(s
);
586 static void wt_status_print_updated(struct wt_status
*s
)
588 int shown_header
= 0;
591 for (i
= 0; i
< s
->change
.nr
; i
++) {
592 struct wt_status_change_data
*d
;
593 struct string_list_item
*it
;
594 it
= &(s
->change
.items
[i
]);
596 if (!d
->index_status
||
597 d
->index_status
== DIFF_STATUS_UNMERGED
)
600 wt_status_print_cached_header(s
);
604 wt_status_print_change_data(s
, WT_STATUS_UPDATED
, it
);
607 wt_status_print_trailer(s
);
613 * 1 : some change but no delete
615 static int wt_status_check_worktree_changes(struct wt_status
*s
,
616 int *dirty_submodules
)
621 *dirty_submodules
= 0;
623 for (i
= 0; i
< s
->change
.nr
; i
++) {
624 struct wt_status_change_data
*d
;
625 d
= s
->change
.items
[i
].util
;
626 if (!d
->worktree_status
||
627 d
->worktree_status
== DIFF_STATUS_UNMERGED
)
631 if (d
->dirty_submodule
)
632 *dirty_submodules
= 1;
633 if (d
->worktree_status
== DIFF_STATUS_DELETED
)
639 static void wt_status_print_changed(struct wt_status
*s
)
641 int i
, dirty_submodules
;
642 int worktree_changes
= wt_status_check_worktree_changes(s
, &dirty_submodules
);
644 if (!worktree_changes
)
647 wt_status_print_dirty_header(s
, worktree_changes
< 0, dirty_submodules
);
649 for (i
= 0; i
< s
->change
.nr
; i
++) {
650 struct wt_status_change_data
*d
;
651 struct string_list_item
*it
;
652 it
= &(s
->change
.items
[i
]);
654 if (!d
->worktree_status
||
655 d
->worktree_status
== DIFF_STATUS_UNMERGED
)
657 wt_status_print_change_data(s
, WT_STATUS_CHANGED
, it
);
659 wt_status_print_trailer(s
);
662 static void wt_status_print_submodule_summary(struct wt_status
*s
, int uncommitted
)
664 struct child_process sm_summary
;
665 char summary_limit
[64];
666 char index
[PATH_MAX
];
667 const char *env
[] = { NULL
, NULL
};
668 struct argv_array argv
= ARGV_ARRAY_INIT
;
669 struct strbuf cmd_stdout
= STRBUF_INIT
;
670 struct strbuf summary
= STRBUF_INIT
;
671 char *summary_content
;
674 sprintf(summary_limit
, "%d", s
->submodule_summary
);
675 snprintf(index
, sizeof(index
), "GIT_INDEX_FILE=%s", s
->index_file
);
678 argv_array_push(&argv
, "submodule");
679 argv_array_push(&argv
, "summary");
680 argv_array_push(&argv
, uncommitted
? "--files" : "--cached");
681 argv_array_push(&argv
, "--for-status");
682 argv_array_push(&argv
, "--summary-limit");
683 argv_array_push(&argv
, summary_limit
);
685 argv_array_push(&argv
, s
->amend
? "HEAD^" : "HEAD");
687 memset(&sm_summary
, 0, sizeof(sm_summary
));
688 sm_summary
.argv
= argv
.argv
;
689 sm_summary
.env
= env
;
690 sm_summary
.git_cmd
= 1;
691 sm_summary
.no_stdin
= 1;
695 run_command(&sm_summary
);
696 argv_array_clear(&argv
);
698 len
= strbuf_read(&cmd_stdout
, sm_summary
.out
, 1024);
700 /* prepend header, only if there's an actual output */
703 strbuf_addstr(&summary
, _("Submodules changed but not updated:"));
705 strbuf_addstr(&summary
, _("Submodule changes to be committed:"));
706 strbuf_addstr(&summary
, "\n\n");
708 strbuf_addbuf(&summary
, &cmd_stdout
);
709 strbuf_release(&cmd_stdout
);
711 if (s
->display_comment_prefix
) {
712 summary_content
= strbuf_detach(&summary
, &len
);
713 strbuf_add_commented_lines(&summary
, summary_content
, len
);
714 free(summary_content
);
717 fputs(summary
.buf
, s
->fp
);
718 strbuf_release(&summary
);
721 static void wt_status_print_other(struct wt_status
*s
,
722 struct string_list
*l
,
727 struct strbuf buf
= STRBUF_INIT
;
728 static struct string_list output
= STRING_LIST_INIT_DUP
;
729 struct column_options copts
;
734 wt_status_print_other_header(s
, what
, how
);
736 for (i
= 0; i
< l
->nr
; i
++) {
737 struct string_list_item
*it
;
740 path
= quote_path(it
->string
, s
->prefix
, &buf
);
741 if (column_active(s
->colopts
)) {
742 string_list_append(&output
, path
);
745 status_printf(s
, color(WT_STATUS_HEADER
, s
), "\t");
746 status_printf_more(s
, color(WT_STATUS_UNTRACKED
, s
),
750 strbuf_release(&buf
);
751 if (!column_active(s
->colopts
))
754 strbuf_addf(&buf
, "%s%s\t%s",
755 color(WT_STATUS_HEADER
, s
),
756 s
->display_comment_prefix
? "#" : "",
757 color(WT_STATUS_UNTRACKED
, s
));
758 memset(&copts
, 0, sizeof(copts
));
760 copts
.indent
= buf
.buf
;
761 if (want_color(s
->use_color
))
762 copts
.nl
= GIT_COLOR_RESET
"\n";
763 print_columns(&output
, s
->colopts
, &copts
);
764 string_list_clear(&output
, 0);
765 strbuf_release(&buf
);
767 status_printf_ln(s
, GIT_COLOR_NORMAL
, "");
770 static void wt_status_print_verbose(struct wt_status
*s
)
773 struct setup_revision_opt opt
;
775 init_revisions(&rev
, NULL
);
776 DIFF_OPT_SET(&rev
.diffopt
, ALLOW_TEXTCONV
);
778 memset(&opt
, 0, sizeof(opt
));
779 opt
.def
= s
->is_initial
? EMPTY_TREE_SHA1_HEX
: s
->reference
;
780 setup_revisions(0, NULL
, &rev
, &opt
);
782 rev
.diffopt
.output_format
|= DIFF_FORMAT_PATCH
;
783 rev
.diffopt
.detect_rename
= 1;
784 rev
.diffopt
.file
= s
->fp
;
785 rev
.diffopt
.close_file
= 0;
787 * If we're not going to stdout, then we definitely don't
788 * want color, since we are going to the commit message
789 * file (and even the "auto" setting won't work, since it
790 * will have checked isatty on stdout).
793 rev
.diffopt
.use_color
= 0;
794 run_diff_index(&rev
, 1);
797 static void wt_status_print_tracking(struct wt_status
*s
)
799 struct strbuf sb
= STRBUF_INIT
;
801 struct branch
*branch
;
802 char comment_line_string
[3];
805 assert(s
->branch
&& !s
->is_initial
);
806 if (prefixcmp(s
->branch
, "refs/heads/"))
808 branch
= branch_get(s
->branch
+ 11);
809 if (!format_tracking_info(branch
, &sb
))
813 if (s
->display_comment_prefix
) {
814 comment_line_string
[i
++] = comment_line_char
;
815 comment_line_string
[i
++] = ' ';
817 comment_line_string
[i
] = '\0';
819 for (cp
= sb
.buf
; (ep
= strchr(cp
, '\n')) != NULL
; cp
= ep
+ 1)
820 color_fprintf_ln(s
->fp
, color(WT_STATUS_HEADER
, s
),
821 "%s%.*s", comment_line_string
,
823 if (s
->display_comment_prefix
)
824 color_fprintf_ln(s
->fp
, color(WT_STATUS_HEADER
, s
), "%c",
827 fprintf_ln(s
->fp
, "");
830 static int has_unmerged(struct wt_status
*s
)
834 for (i
= 0; i
< s
->change
.nr
; i
++) {
835 struct wt_status_change_data
*d
;
836 d
= s
->change
.items
[i
].util
;
843 static void show_merge_in_progress(struct wt_status
*s
,
844 struct wt_status_state
*state
,
847 if (has_unmerged(s
)) {
848 status_printf_ln(s
, color
, _("You have unmerged paths."));
850 status_printf_ln(s
, color
,
851 _(" (fix conflicts and run \"git commit\")"));
853 status_printf_ln(s
, color
,
854 _("All conflicts fixed but you are still merging."));
856 status_printf_ln(s
, color
,
857 _(" (use \"git commit\" to conclude merge)"));
859 wt_status_print_trailer(s
);
862 static void show_am_in_progress(struct wt_status
*s
,
863 struct wt_status_state
*state
,
866 status_printf_ln(s
, color
,
867 _("You are in the middle of an am session."));
868 if (state
->am_empty_patch
)
869 status_printf_ln(s
, color
,
870 _("The current patch is empty."));
872 if (!state
->am_empty_patch
)
873 status_printf_ln(s
, color
,
874 _(" (fix conflicts and then run \"git am --continue\")"));
875 status_printf_ln(s
, color
,
876 _(" (use \"git am --skip\" to skip this patch)"));
877 status_printf_ln(s
, color
,
878 _(" (use \"git am --abort\" to restore the original branch)"));
880 wt_status_print_trailer(s
);
883 static char *read_line_from_git_path(const char *filename
)
885 struct strbuf buf
= STRBUF_INIT
;
886 FILE *fp
= fopen(git_path("%s", filename
), "r");
888 strbuf_release(&buf
);
891 strbuf_getline(&buf
, fp
, '\n');
893 return strbuf_detach(&buf
, NULL
);
895 strbuf_release(&buf
);
900 static int split_commit_in_progress(struct wt_status
*s
)
902 int split_in_progress
= 0;
903 char *head
= read_line_from_git_path("HEAD");
904 char *orig_head
= read_line_from_git_path("ORIG_HEAD");
905 char *rebase_amend
= read_line_from_git_path("rebase-merge/amend");
906 char *rebase_orig_head
= read_line_from_git_path("rebase-merge/orig-head");
908 if (!head
|| !orig_head
|| !rebase_amend
|| !rebase_orig_head
||
909 !s
->branch
|| strcmp(s
->branch
, "HEAD"))
910 return split_in_progress
;
912 if (!strcmp(rebase_amend
, rebase_orig_head
)) {
913 if (strcmp(head
, rebase_amend
))
914 split_in_progress
= 1;
915 } else if (strcmp(orig_head
, rebase_orig_head
)) {
916 split_in_progress
= 1;
919 if (!s
->amend
&& !s
->nowarn
&& !s
->workdir_dirty
)
920 split_in_progress
= 0;
925 free(rebase_orig_head
);
926 return split_in_progress
;
929 static void show_rebase_in_progress(struct wt_status
*s
,
930 struct wt_status_state
*state
,
935 if (has_unmerged(s
)) {
937 status_printf_ln(s
, color
,
938 _("You are currently rebasing branch '%s' on '%s'."),
942 status_printf_ln(s
, color
,
943 _("You are currently rebasing."));
945 status_printf_ln(s
, color
,
946 _(" (fix conflicts and then run \"git rebase --continue\")"));
947 status_printf_ln(s
, color
,
948 _(" (use \"git rebase --skip\" to skip this patch)"));
949 status_printf_ln(s
, color
,
950 _(" (use \"git rebase --abort\" to check out the original branch)"));
952 } else if (state
->rebase_in_progress
|| !stat(git_path("MERGE_MSG"), &st
)) {
954 status_printf_ln(s
, color
,
955 _("You are currently rebasing branch '%s' on '%s'."),
959 status_printf_ln(s
, color
,
960 _("You are currently rebasing."));
962 status_printf_ln(s
, color
,
963 _(" (all conflicts fixed: run \"git rebase --continue\")"));
964 } else if (split_commit_in_progress(s
)) {
966 status_printf_ln(s
, color
,
967 _("You are currently splitting a commit while rebasing branch '%s' on '%s'."),
971 status_printf_ln(s
, color
,
972 _("You are currently splitting a commit during a rebase."));
974 status_printf_ln(s
, color
,
975 _(" (Once your working directory is clean, run \"git rebase --continue\")"));
978 status_printf_ln(s
, color
,
979 _("You are currently editing a commit while rebasing branch '%s' on '%s'."),
983 status_printf_ln(s
, color
,
984 _("You are currently editing a commit during a rebase."));
985 if (s
->hints
&& !s
->amend
) {
986 status_printf_ln(s
, color
,
987 _(" (use \"git commit --amend\" to amend the current commit)"));
988 status_printf_ln(s
, color
,
989 _(" (use \"git rebase --continue\" once you are satisfied with your changes)"));
992 wt_status_print_trailer(s
);
995 static void show_cherry_pick_in_progress(struct wt_status
*s
,
996 struct wt_status_state
*state
,
999 status_printf_ln(s
, color
, _("You are currently cherry-picking commit %s."),
1000 find_unique_abbrev(state
->cherry_pick_head_sha1
, DEFAULT_ABBREV
));
1002 if (has_unmerged(s
))
1003 status_printf_ln(s
, color
,
1004 _(" (fix conflicts and run \"git cherry-pick --continue\")"));
1006 status_printf_ln(s
, color
,
1007 _(" (all conflicts fixed: run \"git cherry-pick --continue\")"));
1008 status_printf_ln(s
, color
,
1009 _(" (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"));
1011 wt_status_print_trailer(s
);
1014 static void show_revert_in_progress(struct wt_status
*s
,
1015 struct wt_status_state
*state
,
1018 status_printf_ln(s
, color
, _("You are currently reverting commit %s."),
1019 find_unique_abbrev(state
->revert_head_sha1
, DEFAULT_ABBREV
));
1021 if (has_unmerged(s
))
1022 status_printf_ln(s
, color
,
1023 _(" (fix conflicts and run \"git revert --continue\")"));
1025 status_printf_ln(s
, color
,
1026 _(" (all conflicts fixed: run \"git revert --continue\")"));
1027 status_printf_ln(s
, color
,
1028 _(" (use \"git revert --abort\" to cancel the revert operation)"));
1030 wt_status_print_trailer(s
);
1033 static void show_bisect_in_progress(struct wt_status
*s
,
1034 struct wt_status_state
*state
,
1038 status_printf_ln(s
, color
,
1039 _("You are currently bisecting, started from branch '%s'."),
1042 status_printf_ln(s
, color
,
1043 _("You are currently bisecting."));
1045 status_printf_ln(s
, color
,
1046 _(" (use \"git bisect reset\" to get back to the original branch)"));
1047 wt_status_print_trailer(s
);
1051 * Extract branch information from rebase/bisect
1053 static char *read_and_strip_branch(const char *path
)
1055 struct strbuf sb
= STRBUF_INIT
;
1056 unsigned char sha1
[20];
1058 if (strbuf_read_file(&sb
, git_path("%s", path
), 0) <= 0)
1061 while (&sb
.len
&& sb
.buf
[sb
.len
- 1] == '\n')
1062 strbuf_setlen(&sb
, sb
.len
- 1);
1065 if (!prefixcmp(sb
.buf
, "refs/heads/"))
1066 strbuf_remove(&sb
,0, strlen("refs/heads/"));
1067 else if (!prefixcmp(sb
.buf
, "refs/"))
1069 else if (!get_sha1_hex(sb
.buf
, sha1
)) {
1071 abbrev
= find_unique_abbrev(sha1
, DEFAULT_ABBREV
);
1073 strbuf_addstr(&sb
, abbrev
);
1074 } else if (!strcmp(sb
.buf
, "detached HEAD")) /* rebase */
1078 return strbuf_detach(&sb
, NULL
);
1081 strbuf_release(&sb
);
1085 struct grab_1st_switch_cbdata
{
1087 unsigned char nsha1
[20];
1090 static int grab_1st_switch(unsigned char *osha1
, unsigned char *nsha1
,
1091 const char *email
, unsigned long timestamp
, int tz
,
1092 const char *message
, void *cb_data
)
1094 struct grab_1st_switch_cbdata
*cb
= cb_data
;
1095 const char *target
= NULL
, *end
;
1097 if (prefixcmp(message
, "checkout: moving from "))
1099 message
+= strlen("checkout: moving from ");
1100 target
= strstr(message
, " to ");
1103 target
+= strlen(" to ");
1104 strbuf_reset(&cb
->buf
);
1105 hashcpy(cb
->nsha1
, nsha1
);
1106 for (end
= target
; *end
&& *end
!= '\n'; end
++)
1108 strbuf_add(&cb
->buf
, target
, end
- target
);
1112 static void wt_status_get_detached_from(struct wt_status_state
*state
)
1114 struct grab_1st_switch_cbdata cb
;
1115 struct commit
*commit
;
1116 unsigned char sha1
[20];
1119 strbuf_init(&cb
.buf
, 0);
1120 if (for_each_reflog_ent_reverse("HEAD", grab_1st_switch
, &cb
) <= 0) {
1121 strbuf_release(&cb
.buf
);
1125 if (dwim_ref(cb
.buf
.buf
, cb
.buf
.len
, sha1
, &ref
) == 1 &&
1126 /* sha1 is a commit? match without further lookup */
1127 (!hashcmp(cb
.nsha1
, sha1
) ||
1128 /* perhaps sha1 is a tag, try to dereference to a commit */
1129 ((commit
= lookup_commit_reference_gently(sha1
, 1)) != NULL
&&
1130 !hashcmp(cb
.nsha1
, commit
->object
.sha1
)))) {
1132 if (!prefixcmp(ref
, "refs/tags/"))
1133 ofs
= strlen("refs/tags/");
1134 else if (!prefixcmp(ref
, "refs/remotes/"))
1135 ofs
= strlen("refs/remotes/");
1138 state
->detached_from
= xstrdup(ref
+ ofs
);
1140 state
->detached_from
=
1141 xstrdup(find_unique_abbrev(cb
.nsha1
, DEFAULT_ABBREV
));
1142 hashcpy(state
->detached_sha1
, cb
.nsha1
);
1145 strbuf_release(&cb
.buf
);
1148 void wt_status_get_state(struct wt_status_state
*state
,
1149 int get_detached_from
)
1152 unsigned char sha1
[20];
1154 if (!stat(git_path("MERGE_HEAD"), &st
)) {
1155 state
->merge_in_progress
= 1;
1156 } else if (!stat(git_path("rebase-apply"), &st
)) {
1157 if (!stat(git_path("rebase-apply/applying"), &st
)) {
1158 state
->am_in_progress
= 1;
1159 if (!stat(git_path("rebase-apply/patch"), &st
) && !st
.st_size
)
1160 state
->am_empty_patch
= 1;
1162 state
->rebase_in_progress
= 1;
1163 state
->branch
= read_and_strip_branch("rebase-apply/head-name");
1164 state
->onto
= read_and_strip_branch("rebase-apply/onto");
1166 } else if (!stat(git_path("rebase-merge"), &st
)) {
1167 if (!stat(git_path("rebase-merge/interactive"), &st
))
1168 state
->rebase_interactive_in_progress
= 1;
1170 state
->rebase_in_progress
= 1;
1171 state
->branch
= read_and_strip_branch("rebase-merge/head-name");
1172 state
->onto
= read_and_strip_branch("rebase-merge/onto");
1173 } else if (!stat(git_path("CHERRY_PICK_HEAD"), &st
) &&
1174 !get_sha1("CHERRY_PICK_HEAD", sha1
)) {
1175 state
->cherry_pick_in_progress
= 1;
1176 hashcpy(state
->cherry_pick_head_sha1
, sha1
);
1178 if (!stat(git_path("BISECT_LOG"), &st
)) {
1179 state
->bisect_in_progress
= 1;
1180 state
->branch
= read_and_strip_branch("BISECT_START");
1182 if (!stat(git_path("REVERT_HEAD"), &st
) &&
1183 !get_sha1("REVERT_HEAD", sha1
)) {
1184 state
->revert_in_progress
= 1;
1185 hashcpy(state
->revert_head_sha1
, sha1
);
1188 if (get_detached_from
)
1189 wt_status_get_detached_from(state
);
1192 static void wt_status_print_state(struct wt_status
*s
,
1193 struct wt_status_state
*state
)
1195 const char *state_color
= color(WT_STATUS_HEADER
, s
);
1196 if (state
->merge_in_progress
)
1197 show_merge_in_progress(s
, state
, state_color
);
1198 else if (state
->am_in_progress
)
1199 show_am_in_progress(s
, state
, state_color
);
1200 else if (state
->rebase_in_progress
|| state
->rebase_interactive_in_progress
)
1201 show_rebase_in_progress(s
, state
, state_color
);
1202 else if (state
->cherry_pick_in_progress
)
1203 show_cherry_pick_in_progress(s
, state
, state_color
);
1204 else if (state
->revert_in_progress
)
1205 show_revert_in_progress(s
, state
, state_color
);
1206 if (state
->bisect_in_progress
)
1207 show_bisect_in_progress(s
, state
, state_color
);
1210 void wt_status_print(struct wt_status
*s
)
1212 const char *branch_color
= color(WT_STATUS_ONBRANCH
, s
);
1213 const char *branch_status_color
= color(WT_STATUS_HEADER
, s
);
1214 struct wt_status_state state
;
1216 memset(&state
, 0, sizeof(state
));
1217 wt_status_get_state(&state
,
1218 s
->branch
&& !strcmp(s
->branch
, "HEAD"));
1221 const char *on_what
= _("On branch ");
1222 const char *branch_name
= s
->branch
;
1223 if (!prefixcmp(branch_name
, "refs/heads/"))
1225 else if (!strcmp(branch_name
, "HEAD")) {
1226 branch_status_color
= color(WT_STATUS_NOBRANCH
, s
);
1227 if (state
.rebase_in_progress
|| state
.rebase_interactive_in_progress
) {
1228 on_what
= _("rebase in progress; onto ");
1229 branch_name
= state
.onto
;
1230 } else if (state
.detached_from
) {
1231 unsigned char sha1
[20];
1232 branch_name
= state
.detached_from
;
1233 if (!get_sha1("HEAD", sha1
) &&
1234 !hashcmp(sha1
, state
.detached_sha1
))
1235 on_what
= _("HEAD detached at ");
1237 on_what
= _("HEAD detached from ");
1240 on_what
= _("Not currently on any branch.");
1243 status_printf(s
, color(WT_STATUS_HEADER
, s
), "");
1244 status_printf_more(s
, branch_status_color
, "%s", on_what
);
1245 status_printf_more(s
, branch_color
, "%s\n", branch_name
);
1247 wt_status_print_tracking(s
);
1250 wt_status_print_state(s
, &state
);
1253 free(state
.detached_from
);
1255 if (s
->is_initial
) {
1256 status_printf_ln(s
, color(WT_STATUS_HEADER
, s
), "");
1257 status_printf_ln(s
, color(WT_STATUS_HEADER
, s
), _("Initial commit"));
1258 status_printf_ln(s
, color(WT_STATUS_HEADER
, s
), "");
1261 wt_status_print_updated(s
);
1262 wt_status_print_unmerged(s
);
1263 wt_status_print_changed(s
);
1264 if (s
->submodule_summary
&&
1265 (!s
->ignore_submodule_arg
||
1266 strcmp(s
->ignore_submodule_arg
, "all"))) {
1267 wt_status_print_submodule_summary(s
, 0); /* staged */
1268 wt_status_print_submodule_summary(s
, 1); /* unstaged */
1270 if (s
->show_untracked_files
) {
1271 wt_status_print_other(s
, &s
->untracked
, _("Untracked files"), "add");
1272 if (s
->show_ignored_files
)
1273 wt_status_print_other(s
, &s
->ignored
, _("Ignored files"), "add -f");
1274 if (advice_status_u_option
&& 2000 < s
->untracked_in_ms
) {
1275 status_printf_ln(s
, GIT_COLOR_NORMAL
, "");
1276 status_printf_ln(s
, GIT_COLOR_NORMAL
,
1277 _("It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1278 "may speed it up, but you have to be careful not to forget to add\n"
1279 "new files yourself (see 'git help status')."),
1280 s
->untracked_in_ms
/ 1000.0);
1282 } else if (s
->commitable
)
1283 status_printf_ln(s
, GIT_COLOR_NORMAL
, _("Untracked files not listed%s"),
1285 ? _(" (use -u option to show untracked files)") : "");
1288 wt_status_print_verbose(s
);
1289 if (!s
->commitable
) {
1291 status_printf_ln(s
, GIT_COLOR_NORMAL
, _("No changes"));
1294 else if (s
->workdir_dirty
) {
1296 printf(_("no changes added to commit "
1297 "(use \"git add\" and/or \"git commit -a\")\n"));
1299 printf(_("no changes added to commit\n"));
1300 } else if (s
->untracked
.nr
) {
1302 printf(_("nothing added to commit but untracked files "
1303 "present (use \"git add\" to track)\n"));
1305 printf(_("nothing added to commit but untracked files present\n"));
1306 } else if (s
->is_initial
) {
1308 printf(_("nothing to commit (create/copy files "
1309 "and use \"git add\" to track)\n"));
1311 printf(_("nothing to commit\n"));
1312 } else if (!s
->show_untracked_files
) {
1314 printf(_("nothing to commit (use -u to show untracked files)\n"));
1316 printf(_("nothing to commit\n"));
1318 printf(_("nothing to commit, working directory clean\n"));
1322 static void wt_shortstatus_unmerged(struct string_list_item
*it
,
1323 struct wt_status
*s
)
1325 struct wt_status_change_data
*d
= it
->util
;
1326 const char *how
= "??";
1328 switch (d
->stagemask
) {
1329 case 1: how
= "DD"; break; /* both deleted */
1330 case 2: how
= "AU"; break; /* added by us */
1331 case 3: how
= "UD"; break; /* deleted by them */
1332 case 4: how
= "UA"; break; /* added by them */
1333 case 5: how
= "DU"; break; /* deleted by us */
1334 case 6: how
= "AA"; break; /* both added */
1335 case 7: how
= "UU"; break; /* both modified */
1337 color_fprintf(s
->fp
, color(WT_STATUS_UNMERGED
, s
), "%s", how
);
1338 if (s
->null_termination
) {
1339 fprintf(stdout
, " %s%c", it
->string
, 0);
1341 struct strbuf onebuf
= STRBUF_INIT
;
1343 one
= quote_path(it
->string
, s
->prefix
, &onebuf
);
1344 printf(" %s\n", one
);
1345 strbuf_release(&onebuf
);
1349 static void wt_shortstatus_status(struct string_list_item
*it
,
1350 struct wt_status
*s
)
1352 struct wt_status_change_data
*d
= it
->util
;
1354 if (d
->index_status
)
1355 color_fprintf(s
->fp
, color(WT_STATUS_UPDATED
, s
), "%c", d
->index_status
);
1358 if (d
->worktree_status
)
1359 color_fprintf(s
->fp
, color(WT_STATUS_CHANGED
, s
), "%c", d
->worktree_status
);
1363 if (s
->null_termination
) {
1364 fprintf(stdout
, "%s%c", it
->string
, 0);
1366 fprintf(stdout
, "%s%c", d
->head_path
, 0);
1368 struct strbuf onebuf
= STRBUF_INIT
;
1371 one
= quote_path(d
->head_path
, s
->prefix
, &onebuf
);
1372 if (*one
!= '"' && strchr(one
, ' ') != NULL
) {
1374 strbuf_addch(&onebuf
, '"');
1377 printf("%s -> ", one
);
1378 strbuf_release(&onebuf
);
1380 one
= quote_path(it
->string
, s
->prefix
, &onebuf
);
1381 if (*one
!= '"' && strchr(one
, ' ') != NULL
) {
1383 strbuf_addch(&onebuf
, '"');
1386 printf("%s\n", one
);
1387 strbuf_release(&onebuf
);
1391 static void wt_shortstatus_other(struct string_list_item
*it
,
1392 struct wt_status
*s
, const char *sign
)
1394 if (s
->null_termination
) {
1395 fprintf(stdout
, "%s %s%c", sign
, it
->string
, 0);
1397 struct strbuf onebuf
= STRBUF_INIT
;
1399 one
= quote_path(it
->string
, s
->prefix
, &onebuf
);
1400 color_fprintf(s
->fp
, color(WT_STATUS_UNTRACKED
, s
), "%s", sign
);
1401 printf(" %s\n", one
);
1402 strbuf_release(&onebuf
);
1406 static void wt_shortstatus_print_tracking(struct wt_status
*s
)
1408 struct branch
*branch
;
1409 const char *header_color
= color(WT_STATUS_HEADER
, s
);
1410 const char *branch_color_local
= color(WT_STATUS_LOCAL_BRANCH
, s
);
1411 const char *branch_color_remote
= color(WT_STATUS_REMOTE_BRANCH
, s
);
1414 const char *branch_name
;
1415 int num_ours
, num_theirs
;
1416 int upstream_is_gone
= 0;
1418 color_fprintf(s
->fp
, color(WT_STATUS_HEADER
, s
), "## ");
1422 branch_name
= s
->branch
;
1424 if (!prefixcmp(branch_name
, "refs/heads/"))
1426 else if (!strcmp(branch_name
, "HEAD")) {
1427 branch_name
= _("HEAD (no branch)");
1428 branch_color_local
= color(WT_STATUS_NOBRANCH
, s
);
1431 branch
= branch_get(s
->branch
+ 11);
1433 color_fprintf(s
->fp
, header_color
, _("Initial commit on "));
1435 color_fprintf(s
->fp
, branch_color_local
, "%s", branch_name
);
1437 switch (stat_tracking_info(branch
, &num_ours
, &num_theirs
)) {
1440 fputc(s
->null_termination
? '\0' : '\n', s
->fp
);
1443 /* with "gone" base */
1444 upstream_is_gone
= 1;
1451 base
= branch
->merge
[0]->dst
;
1452 base
= shorten_unambiguous_ref(base
, 0);
1453 color_fprintf(s
->fp
, header_color
, "...");
1454 color_fprintf(s
->fp
, branch_color_remote
, "%s", base
);
1456 if (!upstream_is_gone
&& !num_ours
&& !num_theirs
) {
1457 fputc(s
->null_termination
? '\0' : '\n', s
->fp
);
1461 color_fprintf(s
->fp
, header_color
, " [");
1462 if (upstream_is_gone
) {
1463 color_fprintf(s
->fp
, header_color
, _("gone"));
1464 } else if (!num_ours
) {
1465 color_fprintf(s
->fp
, header_color
, _("behind "));
1466 color_fprintf(s
->fp
, branch_color_remote
, "%d", num_theirs
);
1467 } else if (!num_theirs
) {
1468 color_fprintf(s
->fp
, header_color
, _("ahead "));
1469 color_fprintf(s
->fp
, branch_color_local
, "%d", num_ours
);
1471 color_fprintf(s
->fp
, header_color
, _("ahead "));
1472 color_fprintf(s
->fp
, branch_color_local
, "%d", num_ours
);
1473 color_fprintf(s
->fp
, header_color
, _(", behind "));
1474 color_fprintf(s
->fp
, branch_color_remote
, "%d", num_theirs
);
1477 color_fprintf(s
->fp
, header_color
, "]");
1478 fputc(s
->null_termination
? '\0' : '\n', s
->fp
);
1481 void wt_shortstatus_print(struct wt_status
*s
)
1486 wt_shortstatus_print_tracking(s
);
1488 for (i
= 0; i
< s
->change
.nr
; i
++) {
1489 struct wt_status_change_data
*d
;
1490 struct string_list_item
*it
;
1492 it
= &(s
->change
.items
[i
]);
1495 wt_shortstatus_unmerged(it
, s
);
1497 wt_shortstatus_status(it
, s
);
1499 for (i
= 0; i
< s
->untracked
.nr
; i
++) {
1500 struct string_list_item
*it
;
1502 it
= &(s
->untracked
.items
[i
]);
1503 wt_shortstatus_other(it
, s
, "??");
1505 for (i
= 0; i
< s
->ignored
.nr
; i
++) {
1506 struct string_list_item
*it
;
1508 it
= &(s
->ignored
.items
[i
]);
1509 wt_shortstatus_other(it
, s
, "!!");
1513 void wt_porcelain_print(struct wt_status
*s
)
1516 s
->relative_paths
= 0;
1518 wt_shortstatus_print(s
);