10 #include "run-command.h"
11 #include "argv-array.h"
14 #include "submodule.h"
18 static char default_wt_status_colors
[][COLOR_MAXLEN
] = {
19 GIT_COLOR_NORMAL
, /* WT_STATUS_HEADER */
20 GIT_COLOR_GREEN
, /* WT_STATUS_UPDATED */
21 GIT_COLOR_RED
, /* WT_STATUS_CHANGED */
22 GIT_COLOR_RED
, /* WT_STATUS_UNTRACKED */
23 GIT_COLOR_RED
, /* WT_STATUS_NOBRANCH */
24 GIT_COLOR_RED
, /* WT_STATUS_UNMERGED */
25 GIT_COLOR_GREEN
, /* WT_STATUS_LOCAL_BRANCH */
26 GIT_COLOR_RED
, /* WT_STATUS_REMOTE_BRANCH */
27 GIT_COLOR_NIL
, /* WT_STATUS_ONBRANCH */
30 static const char *color(int slot
, struct wt_status
*s
)
33 if (want_color(s
->use_color
))
34 c
= s
->color_palette
[slot
];
35 if (slot
== WT_STATUS_ONBRANCH
&& color_is_nil(c
))
36 c
= s
->color_palette
[WT_STATUS_HEADER
];
40 static void status_vprintf(struct wt_status
*s
, int at_bol
, const char *color
,
41 const char *fmt
, va_list ap
, const char *trail
)
43 struct strbuf sb
= STRBUF_INIT
;
44 struct strbuf linebuf
= STRBUF_INIT
;
45 const char *line
, *eol
;
47 strbuf_vaddf(&sb
, fmt
, ap
);
49 if (s
->display_comment_prefix
) {
50 strbuf_addch(&sb
, comment_line_char
);
52 strbuf_addch(&sb
, ' ');
54 color_print_strbuf(s
->fp
, color
, &sb
);
56 fprintf(s
->fp
, "%s", trail
);
60 for (line
= sb
.buf
; *line
; line
= eol
+ 1) {
61 eol
= strchr(line
, '\n');
63 strbuf_reset(&linebuf
);
64 if (at_bol
&& s
->display_comment_prefix
) {
65 strbuf_addch(&linebuf
, comment_line_char
);
66 if (*line
!= '\n' && *line
!= '\t')
67 strbuf_addch(&linebuf
, ' ');
70 strbuf_add(&linebuf
, line
, eol
- line
);
72 strbuf_addstr(&linebuf
, line
);
73 color_print_strbuf(s
->fp
, color
, &linebuf
);
81 fprintf(s
->fp
, "%s", trail
);
82 strbuf_release(&linebuf
);
86 void status_printf_ln(struct wt_status
*s
, const char *color
,
92 status_vprintf(s
, 1, color
, fmt
, ap
, "\n");
96 void status_printf(struct wt_status
*s
, const char *color
,
102 status_vprintf(s
, 1, color
, fmt
, ap
, NULL
);
106 static void status_printf_more(struct wt_status
*s
, const char *color
,
107 const char *fmt
, ...)
112 status_vprintf(s
, 0, color
, fmt
, ap
, NULL
);
116 void wt_status_prepare(struct wt_status
*s
)
118 unsigned char sha1
[20];
120 memset(s
, 0, sizeof(*s
));
121 memcpy(s
->color_palette
, default_wt_status_colors
,
122 sizeof(default_wt_status_colors
));
123 s
->show_untracked_files
= SHOW_NORMAL_UNTRACKED_FILES
;
125 s
->relative_paths
= 1;
126 s
->branch
= resolve_refdup("HEAD", sha1
, 0, NULL
);
127 s
->reference
= "HEAD";
129 s
->index_file
= get_index_file();
130 s
->change
.strdup_strings
= 1;
131 s
->untracked
.strdup_strings
= 1;
132 s
->ignored
.strdup_strings
= 1;
133 s
->show_branch
= -1; /* unspecified */
134 s
->display_comment_prefix
= 0;
137 static void wt_status_print_unmerged_header(struct wt_status
*s
)
140 int del_mod_conflict
= 0;
141 int both_deleted
= 0;
143 const char *c
= color(WT_STATUS_HEADER
, s
);
145 status_printf_ln(s
, c
, _("Unmerged paths:"));
147 for (i
= 0; i
< s
->change
.nr
; i
++) {
148 struct string_list_item
*it
= &(s
->change
.items
[i
]);
149 struct wt_status_change_data
*d
= it
->util
;
151 switch (d
->stagemask
) {
159 del_mod_conflict
= 1;
167 if (!advice_status_hints
)
169 if (s
->whence
!= FROM_COMMIT
)
171 else if (!s
->is_initial
)
172 status_printf_ln(s
, c
, _(" (use \"git reset %s <file>...\" to unstage)"), s
->reference
);
174 status_printf_ln(s
, c
, _(" (use \"git rm --cached <file>...\" to unstage)"));
177 if (!del_mod_conflict
)
178 status_printf_ln(s
, c
, _(" (use \"git add <file>...\" to mark resolution)"));
180 status_printf_ln(s
, c
, _(" (use \"git add/rm <file>...\" as appropriate to mark resolution)"));
181 } else if (!del_mod_conflict
&& !not_deleted
) {
182 status_printf_ln(s
, c
, _(" (use \"git rm <file>...\" to mark resolution)"));
184 status_printf_ln(s
, c
, _(" (use \"git add/rm <file>...\" as appropriate to mark resolution)"));
186 status_printf_ln(s
, c
, "");
189 static void wt_status_print_cached_header(struct wt_status
*s
)
191 const char *c
= color(WT_STATUS_HEADER
, s
);
193 status_printf_ln(s
, c
, _("Changes to be committed:"));
194 if (!advice_status_hints
)
196 if (s
->whence
!= FROM_COMMIT
)
197 ; /* NEEDSWORK: use "git reset --unresolve"??? */
198 else if (!s
->is_initial
)
199 status_printf_ln(s
, c
, _(" (use \"git reset %s <file>...\" to unstage)"), s
->reference
);
201 status_printf_ln(s
, c
, _(" (use \"git rm --cached <file>...\" to unstage)"));
202 status_printf_ln(s
, c
, "");
205 static void wt_status_print_dirty_header(struct wt_status
*s
,
207 int has_dirty_submodules
)
209 const char *c
= color(WT_STATUS_HEADER
, s
);
211 status_printf_ln(s
, c
, _("Changes not staged for commit:"));
212 if (!advice_status_hints
)
215 status_printf_ln(s
, c
, _(" (use \"git add <file>...\" to update what will be committed)"));
217 status_printf_ln(s
, c
, _(" (use \"git add/rm <file>...\" to update what will be committed)"));
218 status_printf_ln(s
, c
, _(" (use \"git checkout -- <file>...\" to discard changes in working directory)"));
219 if (has_dirty_submodules
)
220 status_printf_ln(s
, c
, _(" (commit or discard the untracked or modified content in submodules)"));
221 status_printf_ln(s
, c
, "");
224 static void wt_status_print_other_header(struct wt_status
*s
,
228 const char *c
= color(WT_STATUS_HEADER
, s
);
229 status_printf_ln(s
, c
, "%s:", what
);
230 if (!advice_status_hints
)
232 status_printf_ln(s
, c
, _(" (use \"git %s <file>...\" to include in what will be committed)"), how
);
233 status_printf_ln(s
, c
, "");
236 static void wt_status_print_trailer(struct wt_status
*s
)
238 status_printf_ln(s
, color(WT_STATUS_HEADER
, s
), "");
241 #define quote_path quote_path_relative
243 static void wt_status_print_unmerged_data(struct wt_status
*s
,
244 struct string_list_item
*it
)
246 const char *c
= color(WT_STATUS_UNMERGED
, s
);
247 struct wt_status_change_data
*d
= it
->util
;
248 struct strbuf onebuf
= STRBUF_INIT
;
249 const char *one
, *how
= _("bug");
251 one
= quote_path(it
->string
, s
->prefix
, &onebuf
);
252 status_printf(s
, color(WT_STATUS_HEADER
, s
), "\t");
253 switch (d
->stagemask
) {
254 case 1: how
= _("both deleted:"); break;
255 case 2: how
= _("added by us:"); break;
256 case 3: how
= _("deleted by them:"); break;
257 case 4: how
= _("added by them:"); break;
258 case 5: how
= _("deleted by us:"); break;
259 case 6: how
= _("both added:"); break;
260 case 7: how
= _("both modified:"); break;
262 status_printf_more(s
, c
, "%-20s%s\n", how
, one
);
263 strbuf_release(&onebuf
);
266 static void wt_status_print_change_data(struct wt_status
*s
,
268 struct string_list_item
*it
)
270 struct wt_status_change_data
*d
= it
->util
;
271 const char *c
= color(change_type
, s
);
275 const char *one
, *two
;
276 struct strbuf onebuf
= STRBUF_INIT
, twobuf
= STRBUF_INIT
;
277 struct strbuf extra
= STRBUF_INIT
;
279 one_name
= two_name
= it
->string
;
280 switch (change_type
) {
281 case WT_STATUS_UPDATED
:
282 status
= d
->index_status
;
284 one_name
= d
->head_path
;
286 case WT_STATUS_CHANGED
:
287 if (d
->new_submodule_commits
|| d
->dirty_submodule
) {
288 strbuf_addstr(&extra
, " (");
289 if (d
->new_submodule_commits
)
290 strbuf_addf(&extra
, _("new commits, "));
291 if (d
->dirty_submodule
& DIRTY_SUBMODULE_MODIFIED
)
292 strbuf_addf(&extra
, _("modified content, "));
293 if (d
->dirty_submodule
& DIRTY_SUBMODULE_UNTRACKED
)
294 strbuf_addf(&extra
, _("untracked content, "));
295 strbuf_setlen(&extra
, extra
.len
- 2);
296 strbuf_addch(&extra
, ')');
298 status
= d
->worktree_status
;
301 die("BUG: unhandled change_type %d in wt_status_print_change_data",
305 one
= quote_path(one_name
, s
->prefix
, &onebuf
);
306 two
= quote_path(two_name
, s
->prefix
, &twobuf
);
308 status_printf(s
, color(WT_STATUS_HEADER
, s
), "\t");
310 case DIFF_STATUS_ADDED
:
311 status_printf_more(s
, c
, _("new file: %s"), one
);
313 case DIFF_STATUS_COPIED
:
314 status_printf_more(s
, c
, _("copied: %s -> %s"), one
, two
);
316 case DIFF_STATUS_DELETED
:
317 status_printf_more(s
, c
, _("deleted: %s"), one
);
319 case DIFF_STATUS_MODIFIED
:
320 status_printf_more(s
, c
, _("modified: %s"), one
);
322 case DIFF_STATUS_RENAMED
:
323 status_printf_more(s
, c
, _("renamed: %s -> %s"), one
, two
);
325 case DIFF_STATUS_TYPE_CHANGED
:
326 status_printf_more(s
, c
, _("typechange: %s"), one
);
328 case DIFF_STATUS_UNKNOWN
:
329 status_printf_more(s
, c
, _("unknown: %s"), one
);
331 case DIFF_STATUS_UNMERGED
:
332 status_printf_more(s
, c
, _("unmerged: %s"), one
);
335 die(_("bug: unhandled diff status %c"), status
);
338 status_printf_more(s
, color(WT_STATUS_HEADER
, s
), "%s", extra
.buf
);
339 strbuf_release(&extra
);
341 status_printf_more(s
, GIT_COLOR_NORMAL
, "\n");
342 strbuf_release(&onebuf
);
343 strbuf_release(&twobuf
);
346 static void wt_status_collect_changed_cb(struct diff_queue_struct
*q
,
347 struct diff_options
*options
,
350 struct wt_status
*s
= data
;
355 s
->workdir_dirty
= 1;
356 for (i
= 0; i
< q
->nr
; i
++) {
357 struct diff_filepair
*p
;
358 struct string_list_item
*it
;
359 struct wt_status_change_data
*d
;
362 it
= string_list_insert(&s
->change
, p
->one
->path
);
365 d
= xcalloc(1, sizeof(*d
));
368 if (!d
->worktree_status
)
369 d
->worktree_status
= p
->status
;
370 d
->dirty_submodule
= p
->two
->dirty_submodule
;
371 if (S_ISGITLINK(p
->two
->mode
))
372 d
->new_submodule_commits
= !!hashcmp(p
->one
->sha1
, p
->two
->sha1
);
376 static int unmerged_mask(const char *path
)
379 const struct cache_entry
*ce
;
381 pos
= cache_name_pos(path
, strlen(path
));
387 while (pos
< active_nr
) {
388 ce
= active_cache
[pos
++];
389 if (strcmp(ce
->name
, path
) || !ce_stage(ce
))
391 mask
|= (1 << (ce_stage(ce
) - 1));
396 static void wt_status_collect_updated_cb(struct diff_queue_struct
*q
,
397 struct diff_options
*options
,
400 struct wt_status
*s
= data
;
403 for (i
= 0; i
< q
->nr
; i
++) {
404 struct diff_filepair
*p
;
405 struct string_list_item
*it
;
406 struct wt_status_change_data
*d
;
409 it
= string_list_insert(&s
->change
, p
->two
->path
);
412 d
= xcalloc(1, sizeof(*d
));
415 if (!d
->index_status
)
416 d
->index_status
= p
->status
;
418 case DIFF_STATUS_COPIED
:
419 case DIFF_STATUS_RENAMED
:
420 d
->head_path
= xstrdup(p
->one
->path
);
422 case DIFF_STATUS_UNMERGED
:
423 d
->stagemask
= unmerged_mask(p
->two
->path
);
429 static void wt_status_collect_changes_worktree(struct wt_status
*s
)
433 init_revisions(&rev
, NULL
);
434 setup_revisions(0, NULL
, &rev
, NULL
);
435 rev
.diffopt
.output_format
|= DIFF_FORMAT_CALLBACK
;
436 DIFF_OPT_SET(&rev
.diffopt
, DIRTY_SUBMODULES
);
437 if (!s
->show_untracked_files
)
438 DIFF_OPT_SET(&rev
.diffopt
, IGNORE_UNTRACKED_IN_SUBMODULES
);
439 if (s
->ignore_submodule_arg
) {
440 DIFF_OPT_SET(&rev
.diffopt
, OVERRIDE_SUBMODULE_CONFIG
);
441 handle_ignore_submodules_arg(&rev
.diffopt
, s
->ignore_submodule_arg
);
443 rev
.diffopt
.format_callback
= wt_status_collect_changed_cb
;
444 rev
.diffopt
.format_callback_data
= s
;
445 init_pathspec(&rev
.prune_data
, s
->pathspec
);
446 run_diff_files(&rev
, 0);
449 static void wt_status_collect_changes_index(struct wt_status
*s
)
452 struct setup_revision_opt opt
;
454 init_revisions(&rev
, NULL
);
455 memset(&opt
, 0, sizeof(opt
));
456 opt
.def
= s
->is_initial
? EMPTY_TREE_SHA1_HEX
: s
->reference
;
457 setup_revisions(0, NULL
, &rev
, &opt
);
459 if (s
->ignore_submodule_arg
) {
460 DIFF_OPT_SET(&rev
.diffopt
, OVERRIDE_SUBMODULE_CONFIG
);
461 handle_ignore_submodules_arg(&rev
.diffopt
, s
->ignore_submodule_arg
);
464 rev
.diffopt
.output_format
|= DIFF_FORMAT_CALLBACK
;
465 rev
.diffopt
.format_callback
= wt_status_collect_updated_cb
;
466 rev
.diffopt
.format_callback_data
= s
;
467 rev
.diffopt
.detect_rename
= 1;
468 rev
.diffopt
.rename_limit
= 200;
469 rev
.diffopt
.break_opt
= 0;
470 init_pathspec(&rev
.prune_data
, s
->pathspec
);
471 run_diff_index(&rev
, 1);
474 static void wt_status_collect_changes_initial(struct wt_status
*s
)
476 struct pathspec pathspec
;
479 init_pathspec(&pathspec
, s
->pathspec
);
480 for (i
= 0; i
< active_nr
; i
++) {
481 struct string_list_item
*it
;
482 struct wt_status_change_data
*d
;
483 const struct cache_entry
*ce
= active_cache
[i
];
485 if (!ce_path_match(ce
, &pathspec
))
487 it
= string_list_insert(&s
->change
, ce
->name
);
490 d
= xcalloc(1, sizeof(*d
));
494 d
->index_status
= DIFF_STATUS_UNMERGED
;
495 d
->stagemask
|= (1 << (ce_stage(ce
) - 1));
498 d
->index_status
= DIFF_STATUS_ADDED
;
500 free_pathspec(&pathspec
);
503 static void wt_status_collect_untracked(struct wt_status
*s
)
506 struct dir_struct dir
;
507 struct timeval t_begin
;
509 if (!s
->show_untracked_files
)
512 if (advice_status_u_option
)
513 gettimeofday(&t_begin
, NULL
);
515 memset(&dir
, 0, sizeof(dir
));
516 if (s
->show_untracked_files
!= SHOW_ALL_UNTRACKED_FILES
)
518 DIR_SHOW_OTHER_DIRECTORIES
| DIR_HIDE_EMPTY_DIRECTORIES
;
519 if (s
->show_ignored_files
)
520 dir
.flags
|= DIR_SHOW_IGNORED_TOO
;
521 setup_standard_excludes(&dir
);
523 fill_directory(&dir
, s
->pathspec
);
525 for (i
= 0; i
< dir
.nr
; i
++) {
526 struct dir_entry
*ent
= dir
.entries
[i
];
527 if (cache_name_is_other(ent
->name
, ent
->len
) &&
528 match_pathspec(s
->pathspec
, ent
->name
, ent
->len
, 0, NULL
))
529 string_list_insert(&s
->untracked
, ent
->name
);
533 for (i
= 0; i
< dir
.ignored_nr
; i
++) {
534 struct dir_entry
*ent
= dir
.ignored
[i
];
535 if (cache_name_is_other(ent
->name
, ent
->len
) &&
536 match_pathspec(s
->pathspec
, ent
->name
, ent
->len
, 0, NULL
))
537 string_list_insert(&s
->ignored
, ent
->name
);
543 clear_directory(&dir
);
545 if (advice_status_u_option
) {
546 struct timeval t_end
;
547 gettimeofday(&t_end
, NULL
);
549 (uint64_t)t_end
.tv_sec
* 1000 + t_end
.tv_usec
/ 1000 -
550 ((uint64_t)t_begin
.tv_sec
* 1000 + t_begin
.tv_usec
/ 1000);
554 void wt_status_collect(struct wt_status
*s
)
556 wt_status_collect_changes_worktree(s
);
559 wt_status_collect_changes_initial(s
);
561 wt_status_collect_changes_index(s
);
562 wt_status_collect_untracked(s
);
565 static void wt_status_print_unmerged(struct wt_status
*s
)
567 int shown_header
= 0;
570 for (i
= 0; i
< s
->change
.nr
; i
++) {
571 struct wt_status_change_data
*d
;
572 struct string_list_item
*it
;
573 it
= &(s
->change
.items
[i
]);
578 wt_status_print_unmerged_header(s
);
581 wt_status_print_unmerged_data(s
, it
);
584 wt_status_print_trailer(s
);
588 static void wt_status_print_updated(struct wt_status
*s
)
590 int shown_header
= 0;
593 for (i
= 0; i
< s
->change
.nr
; i
++) {
594 struct wt_status_change_data
*d
;
595 struct string_list_item
*it
;
596 it
= &(s
->change
.items
[i
]);
598 if (!d
->index_status
||
599 d
->index_status
== DIFF_STATUS_UNMERGED
)
602 wt_status_print_cached_header(s
);
606 wt_status_print_change_data(s
, WT_STATUS_UPDATED
, it
);
609 wt_status_print_trailer(s
);
615 * 1 : some change but no delete
617 static int wt_status_check_worktree_changes(struct wt_status
*s
,
618 int *dirty_submodules
)
623 *dirty_submodules
= 0;
625 for (i
= 0; i
< s
->change
.nr
; i
++) {
626 struct wt_status_change_data
*d
;
627 d
= s
->change
.items
[i
].util
;
628 if (!d
->worktree_status
||
629 d
->worktree_status
== DIFF_STATUS_UNMERGED
)
633 if (d
->dirty_submodule
)
634 *dirty_submodules
= 1;
635 if (d
->worktree_status
== DIFF_STATUS_DELETED
)
641 static void wt_status_print_changed(struct wt_status
*s
)
643 int i
, dirty_submodules
;
644 int worktree_changes
= wt_status_check_worktree_changes(s
, &dirty_submodules
);
646 if (!worktree_changes
)
649 wt_status_print_dirty_header(s
, worktree_changes
< 0, dirty_submodules
);
651 for (i
= 0; i
< s
->change
.nr
; i
++) {
652 struct wt_status_change_data
*d
;
653 struct string_list_item
*it
;
654 it
= &(s
->change
.items
[i
]);
656 if (!d
->worktree_status
||
657 d
->worktree_status
== DIFF_STATUS_UNMERGED
)
659 wt_status_print_change_data(s
, WT_STATUS_CHANGED
, it
);
661 wt_status_print_trailer(s
);
664 static void wt_status_print_submodule_summary(struct wt_status
*s
, int uncommitted
)
666 struct child_process sm_summary
;
667 char summary_limit
[64];
668 char index
[PATH_MAX
];
669 const char *env
[] = { NULL
, NULL
};
670 struct argv_array argv
= ARGV_ARRAY_INIT
;
671 struct strbuf cmd_stdout
= STRBUF_INIT
;
672 struct strbuf summary
= STRBUF_INIT
;
673 char *summary_content
;
676 sprintf(summary_limit
, "%d", s
->submodule_summary
);
677 snprintf(index
, sizeof(index
), "GIT_INDEX_FILE=%s", s
->index_file
);
680 argv_array_push(&argv
, "submodule");
681 argv_array_push(&argv
, "summary");
682 argv_array_push(&argv
, uncommitted
? "--files" : "--cached");
683 argv_array_push(&argv
, "--for-status");
684 argv_array_push(&argv
, "--summary-limit");
685 argv_array_push(&argv
, summary_limit
);
687 argv_array_push(&argv
, s
->amend
? "HEAD^" : "HEAD");
689 memset(&sm_summary
, 0, sizeof(sm_summary
));
690 sm_summary
.argv
= argv
.argv
;
691 sm_summary
.env
= env
;
692 sm_summary
.git_cmd
= 1;
693 sm_summary
.no_stdin
= 1;
697 run_command(&sm_summary
);
698 argv_array_clear(&argv
);
700 len
= strbuf_read(&cmd_stdout
, sm_summary
.out
, 1024);
702 /* prepend header, only if there's an actual output */
705 strbuf_addstr(&summary
, _("Submodules changed but not updated:"));
707 strbuf_addstr(&summary
, _("Submodule changes to be committed:"));
708 strbuf_addstr(&summary
, "\n\n");
710 strbuf_addbuf(&summary
, &cmd_stdout
);
711 strbuf_release(&cmd_stdout
);
713 if (s
->display_comment_prefix
) {
714 summary_content
= strbuf_detach(&summary
, &len
);
715 strbuf_add_commented_lines(&summary
, summary_content
, len
);
716 free(summary_content
);
719 fputs(summary
.buf
, s
->fp
);
720 strbuf_release(&summary
);
723 static void wt_status_print_other(struct wt_status
*s
,
724 struct string_list
*l
,
729 struct strbuf buf
= STRBUF_INIT
;
730 static struct string_list output
= STRING_LIST_INIT_DUP
;
731 struct column_options copts
;
736 wt_status_print_other_header(s
, what
, how
);
738 for (i
= 0; i
< l
->nr
; i
++) {
739 struct string_list_item
*it
;
742 path
= quote_path(it
->string
, s
->prefix
, &buf
);
743 if (column_active(s
->colopts
)) {
744 string_list_append(&output
, path
);
747 status_printf(s
, color(WT_STATUS_HEADER
, s
), "\t");
748 status_printf_more(s
, color(WT_STATUS_UNTRACKED
, s
),
752 strbuf_release(&buf
);
753 if (!column_active(s
->colopts
))
756 strbuf_addf(&buf
, "%s%s\t%s",
757 color(WT_STATUS_HEADER
, s
),
758 s
->display_comment_prefix
? "#" : "",
759 color(WT_STATUS_UNTRACKED
, s
));
760 memset(&copts
, 0, sizeof(copts
));
762 copts
.indent
= buf
.buf
;
763 if (want_color(s
->use_color
))
764 copts
.nl
= GIT_COLOR_RESET
"\n";
765 print_columns(&output
, s
->colopts
, &copts
);
766 string_list_clear(&output
, 0);
767 strbuf_release(&buf
);
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."));
849 if (advice_status_hints
)
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."));
855 if (advice_status_hints
)
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."));
871 if (advice_status_hints
) {
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."));
944 if (advice_status_hints
) {
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."));
961 if (advice_status_hints
)
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."));
973 if (advice_status_hints
)
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 (advice_status_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."));
1000 if (advice_status_hints
) {
1001 if (has_unmerged(s
))
1002 status_printf_ln(s
, color
,
1003 _(" (fix conflicts and run \"git cherry-pick --continue\")"));
1005 status_printf_ln(s
, color
,
1006 _(" (all conflicts fixed: run \"git cherry-pick --continue\")"));
1007 status_printf_ln(s
, color
,
1008 _(" (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"));
1010 wt_status_print_trailer(s
);
1013 static void show_revert_in_progress(struct wt_status
*s
,
1014 struct wt_status_state
*state
,
1017 status_printf_ln(s
, color
, _("You are currently reverting commit %s."),
1018 find_unique_abbrev(state
->revert_head_sha1
, DEFAULT_ABBREV
));
1019 if (advice_status_hints
) {
1020 if (has_unmerged(s
))
1021 status_printf_ln(s
, color
,
1022 _(" (fix conflicts and run \"git revert --continue\")"));
1024 status_printf_ln(s
, color
,
1025 _(" (all conflicts fixed: run \"git revert --continue\")"));
1026 status_printf_ln(s
, color
,
1027 _(" (use \"git revert --abort\" to cancel the revert operation)"));
1029 wt_status_print_trailer(s
);
1032 static void show_bisect_in_progress(struct wt_status
*s
,
1033 struct wt_status_state
*state
,
1037 status_printf_ln(s
, color
,
1038 _("You are currently bisecting, started from branch '%s'."),
1041 status_printf_ln(s
, color
,
1042 _("You are currently bisecting."));
1043 if (advice_status_hints
)
1044 status_printf_ln(s
, color
,
1045 _(" (use \"git bisect reset\" to get back to the original branch)"));
1046 wt_status_print_trailer(s
);
1050 * Extract branch information from rebase/bisect
1052 static char *read_and_strip_branch(const char *path
)
1054 struct strbuf sb
= STRBUF_INIT
;
1055 unsigned char sha1
[20];
1057 if (strbuf_read_file(&sb
, git_path("%s", path
), 0) <= 0)
1060 while (&sb
.len
&& sb
.buf
[sb
.len
- 1] == '\n')
1061 strbuf_setlen(&sb
, sb
.len
- 1);
1064 if (!prefixcmp(sb
.buf
, "refs/heads/"))
1065 strbuf_remove(&sb
,0, strlen("refs/heads/"));
1066 else if (!prefixcmp(sb
.buf
, "refs/"))
1068 else if (!get_sha1_hex(sb
.buf
, sha1
)) {
1070 abbrev
= find_unique_abbrev(sha1
, DEFAULT_ABBREV
);
1072 strbuf_addstr(&sb
, abbrev
);
1073 } else if (!strcmp(sb
.buf
, "detached HEAD")) /* rebase */
1077 return strbuf_detach(&sb
, NULL
);
1080 strbuf_release(&sb
);
1084 struct grab_1st_switch_cbdata
{
1086 unsigned char nsha1
[20];
1089 static int grab_1st_switch(unsigned char *osha1
, unsigned char *nsha1
,
1090 const char *email
, unsigned long timestamp
, int tz
,
1091 const char *message
, void *cb_data
)
1093 struct grab_1st_switch_cbdata
*cb
= cb_data
;
1094 const char *target
= NULL
, *end
;
1096 if (prefixcmp(message
, "checkout: moving from "))
1098 message
+= strlen("checkout: moving from ");
1099 target
= strstr(message
, " to ");
1102 target
+= strlen(" to ");
1103 strbuf_reset(&cb
->buf
);
1104 hashcpy(cb
->nsha1
, nsha1
);
1105 for (end
= target
; *end
&& *end
!= '\n'; end
++)
1107 strbuf_add(&cb
->buf
, target
, end
- target
);
1111 static void wt_status_get_detached_from(struct wt_status_state
*state
)
1113 struct grab_1st_switch_cbdata cb
;
1114 struct commit
*commit
;
1115 unsigned char sha1
[20];
1118 strbuf_init(&cb
.buf
, 0);
1119 if (for_each_reflog_ent_reverse("HEAD", grab_1st_switch
, &cb
) <= 0) {
1120 strbuf_release(&cb
.buf
);
1124 if (dwim_ref(cb
.buf
.buf
, cb
.buf
.len
, sha1
, &ref
) == 1 &&
1125 /* sha1 is a commit? match without further lookup */
1126 (!hashcmp(cb
.nsha1
, sha1
) ||
1127 /* perhaps sha1 is a tag, try to dereference to a commit */
1128 ((commit
= lookup_commit_reference_gently(sha1
, 1)) != NULL
&&
1129 !hashcmp(cb
.nsha1
, commit
->object
.sha1
)))) {
1131 if (!prefixcmp(ref
, "refs/tags/"))
1132 ofs
= strlen("refs/tags/");
1133 else if (!prefixcmp(ref
, "refs/remotes/"))
1134 ofs
= strlen("refs/remotes/");
1137 state
->detached_from
= xstrdup(ref
+ ofs
);
1139 state
->detached_from
=
1140 xstrdup(find_unique_abbrev(cb
.nsha1
, DEFAULT_ABBREV
));
1141 hashcpy(state
->detached_sha1
, cb
.nsha1
);
1144 strbuf_release(&cb
.buf
);
1147 void wt_status_get_state(struct wt_status_state
*state
,
1148 int get_detached_from
)
1151 unsigned char sha1
[20];
1153 if (!stat(git_path("MERGE_HEAD"), &st
)) {
1154 state
->merge_in_progress
= 1;
1155 } else if (!stat(git_path("rebase-apply"), &st
)) {
1156 if (!stat(git_path("rebase-apply/applying"), &st
)) {
1157 state
->am_in_progress
= 1;
1158 if (!stat(git_path("rebase-apply/patch"), &st
) && !st
.st_size
)
1159 state
->am_empty_patch
= 1;
1161 state
->rebase_in_progress
= 1;
1162 state
->branch
= read_and_strip_branch("rebase-apply/head-name");
1163 state
->onto
= read_and_strip_branch("rebase-apply/onto");
1165 } else if (!stat(git_path("rebase-merge"), &st
)) {
1166 if (!stat(git_path("rebase-merge/interactive"), &st
))
1167 state
->rebase_interactive_in_progress
= 1;
1169 state
->rebase_in_progress
= 1;
1170 state
->branch
= read_and_strip_branch("rebase-merge/head-name");
1171 state
->onto
= read_and_strip_branch("rebase-merge/onto");
1172 } else if (!stat(git_path("CHERRY_PICK_HEAD"), &st
)) {
1173 state
->cherry_pick_in_progress
= 1;
1175 if (!stat(git_path("BISECT_LOG"), &st
)) {
1176 state
->bisect_in_progress
= 1;
1177 state
->branch
= read_and_strip_branch("BISECT_START");
1179 if (!stat(git_path("REVERT_HEAD"), &st
) &&
1180 !get_sha1("REVERT_HEAD", sha1
)) {
1181 state
->revert_in_progress
= 1;
1182 hashcpy(state
->revert_head_sha1
, sha1
);
1185 if (get_detached_from
)
1186 wt_status_get_detached_from(state
);
1189 static void wt_status_print_state(struct wt_status
*s
,
1190 struct wt_status_state
*state
)
1192 const char *state_color
= color(WT_STATUS_HEADER
, s
);
1193 if (state
->merge_in_progress
)
1194 show_merge_in_progress(s
, state
, state_color
);
1195 else if (state
->am_in_progress
)
1196 show_am_in_progress(s
, state
, state_color
);
1197 else if (state
->rebase_in_progress
|| state
->rebase_interactive_in_progress
)
1198 show_rebase_in_progress(s
, state
, state_color
);
1199 else if (state
->cherry_pick_in_progress
)
1200 show_cherry_pick_in_progress(s
, state
, state_color
);
1201 else if (state
->revert_in_progress
)
1202 show_revert_in_progress(s
, state
, state_color
);
1203 if (state
->bisect_in_progress
)
1204 show_bisect_in_progress(s
, state
, state_color
);
1207 void wt_status_print(struct wt_status
*s
)
1209 const char *branch_color
= color(WT_STATUS_ONBRANCH
, s
);
1210 const char *branch_status_color
= color(WT_STATUS_HEADER
, s
);
1211 struct wt_status_state state
;
1213 memset(&state
, 0, sizeof(state
));
1214 wt_status_get_state(&state
,
1215 s
->branch
&& !strcmp(s
->branch
, "HEAD"));
1218 const char *on_what
= _("On branch ");
1219 const char *branch_name
= s
->branch
;
1220 if (!prefixcmp(branch_name
, "refs/heads/"))
1222 else if (!strcmp(branch_name
, "HEAD")) {
1223 branch_status_color
= color(WT_STATUS_NOBRANCH
, s
);
1224 if (state
.rebase_in_progress
|| state
.rebase_interactive_in_progress
) {
1225 on_what
= _("rebase in progress; onto ");
1226 branch_name
= state
.onto
;
1227 } else if (state
.detached_from
) {
1228 unsigned char sha1
[20];
1229 branch_name
= state
.detached_from
;
1230 if (!get_sha1("HEAD", sha1
) &&
1231 !hashcmp(sha1
, state
.detached_sha1
))
1232 on_what
= _("HEAD detached at ");
1234 on_what
= _("HEAD detached from ");
1237 on_what
= _("Not currently on any branch.");
1240 status_printf(s
, color(WT_STATUS_HEADER
, s
), "");
1241 status_printf_more(s
, branch_status_color
, "%s", on_what
);
1242 status_printf_more(s
, branch_color
, "%s\n", branch_name
);
1244 wt_status_print_tracking(s
);
1247 wt_status_print_state(s
, &state
);
1250 free(state
.detached_from
);
1252 if (s
->is_initial
) {
1253 status_printf_ln(s
, color(WT_STATUS_HEADER
, s
), "");
1254 status_printf_ln(s
, color(WT_STATUS_HEADER
, s
), _("Initial commit"));
1255 status_printf_ln(s
, color(WT_STATUS_HEADER
, s
), "");
1258 wt_status_print_updated(s
);
1259 wt_status_print_unmerged(s
);
1260 wt_status_print_changed(s
);
1261 if (s
->submodule_summary
&&
1262 (!s
->ignore_submodule_arg
||
1263 strcmp(s
->ignore_submodule_arg
, "all"))) {
1264 wt_status_print_submodule_summary(s
, 0); /* staged */
1265 wt_status_print_submodule_summary(s
, 1); /* unstaged */
1267 if (s
->show_untracked_files
) {
1268 wt_status_print_other(s
, &s
->untracked
, _("Untracked files"), "add");
1269 if (s
->show_ignored_files
)
1270 wt_status_print_other(s
, &s
->ignored
, _("Ignored files"), "add -f");
1271 if (advice_status_u_option
&& 2000 < s
->untracked_in_ms
) {
1272 status_printf_ln(s
, GIT_COLOR_NORMAL
, "");
1273 status_printf_ln(s
, GIT_COLOR_NORMAL
,
1274 _("It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1275 "may speed it up, but you have to be careful not to forget to add\n"
1276 "new files yourself (see 'git help status')."),
1277 s
->untracked_in_ms
/ 1000.0);
1279 } else if (s
->commitable
)
1280 status_printf_ln(s
, GIT_COLOR_NORMAL
, _("Untracked files not listed%s"),
1282 ? _(" (use -u option to show untracked files)") : "");
1285 wt_status_print_verbose(s
);
1286 if (!s
->commitable
) {
1288 status_printf_ln(s
, GIT_COLOR_NORMAL
, _("No changes"));
1291 else if (s
->workdir_dirty
) {
1292 if (advice_status_hints
)
1293 printf(_("no changes added to commit "
1294 "(use \"git add\" and/or \"git commit -a\")\n"));
1296 printf(_("no changes added to commit\n"));
1297 } else if (s
->untracked
.nr
) {
1298 if (advice_status_hints
)
1299 printf(_("nothing added to commit but untracked files "
1300 "present (use \"git add\" to track)\n"));
1302 printf(_("nothing added to commit but untracked files present\n"));
1303 } else if (s
->is_initial
) {
1304 if (advice_status_hints
)
1305 printf(_("nothing to commit (create/copy files "
1306 "and use \"git add\" to track)\n"));
1308 printf(_("nothing to commit\n"));
1309 } else if (!s
->show_untracked_files
) {
1310 if (advice_status_hints
)
1311 printf(_("nothing to commit (use -u to show untracked files)\n"));
1313 printf(_("nothing to commit\n"));
1315 printf(_("nothing to commit, working directory clean\n"));
1319 static void wt_shortstatus_unmerged(struct string_list_item
*it
,
1320 struct wt_status
*s
)
1322 struct wt_status_change_data
*d
= it
->util
;
1323 const char *how
= "??";
1325 switch (d
->stagemask
) {
1326 case 1: how
= "DD"; break; /* both deleted */
1327 case 2: how
= "AU"; break; /* added by us */
1328 case 3: how
= "UD"; break; /* deleted by them */
1329 case 4: how
= "UA"; break; /* added by them */
1330 case 5: how
= "DU"; break; /* deleted by us */
1331 case 6: how
= "AA"; break; /* both added */
1332 case 7: how
= "UU"; break; /* both modified */
1334 color_fprintf(s
->fp
, color(WT_STATUS_UNMERGED
, s
), "%s", how
);
1335 if (s
->null_termination
) {
1336 fprintf(stdout
, " %s%c", it
->string
, 0);
1338 struct strbuf onebuf
= STRBUF_INIT
;
1340 one
= quote_path(it
->string
, s
->prefix
, &onebuf
);
1341 printf(" %s\n", one
);
1342 strbuf_release(&onebuf
);
1346 static void wt_shortstatus_status(struct string_list_item
*it
,
1347 struct wt_status
*s
)
1349 struct wt_status_change_data
*d
= it
->util
;
1351 if (d
->index_status
)
1352 color_fprintf(s
->fp
, color(WT_STATUS_UPDATED
, s
), "%c", d
->index_status
);
1355 if (d
->worktree_status
)
1356 color_fprintf(s
->fp
, color(WT_STATUS_CHANGED
, s
), "%c", d
->worktree_status
);
1360 if (s
->null_termination
) {
1361 fprintf(stdout
, "%s%c", it
->string
, 0);
1363 fprintf(stdout
, "%s%c", d
->head_path
, 0);
1365 struct strbuf onebuf
= STRBUF_INIT
;
1368 one
= quote_path(d
->head_path
, s
->prefix
, &onebuf
);
1369 if (*one
!= '"' && strchr(one
, ' ') != NULL
) {
1371 strbuf_addch(&onebuf
, '"');
1374 printf("%s -> ", one
);
1375 strbuf_release(&onebuf
);
1377 one
= quote_path(it
->string
, s
->prefix
, &onebuf
);
1378 if (*one
!= '"' && strchr(one
, ' ') != NULL
) {
1380 strbuf_addch(&onebuf
, '"');
1383 printf("%s\n", one
);
1384 strbuf_release(&onebuf
);
1388 static void wt_shortstatus_other(struct string_list_item
*it
,
1389 struct wt_status
*s
, const char *sign
)
1391 if (s
->null_termination
) {
1392 fprintf(stdout
, "%s %s%c", sign
, it
->string
, 0);
1394 struct strbuf onebuf
= STRBUF_INIT
;
1396 one
= quote_path(it
->string
, s
->prefix
, &onebuf
);
1397 color_fprintf(s
->fp
, color(WT_STATUS_UNTRACKED
, s
), "%s", sign
);
1398 printf(" %s\n", one
);
1399 strbuf_release(&onebuf
);
1403 static void wt_shortstatus_print_tracking(struct wt_status
*s
)
1405 struct branch
*branch
;
1406 const char *header_color
= color(WT_STATUS_HEADER
, s
);
1407 const char *branch_color_local
= color(WT_STATUS_LOCAL_BRANCH
, s
);
1408 const char *branch_color_remote
= color(WT_STATUS_REMOTE_BRANCH
, s
);
1411 const char *branch_name
;
1412 int num_ours
, num_theirs
;
1414 color_fprintf(s
->fp
, color(WT_STATUS_HEADER
, s
), "## ");
1418 branch_name
= s
->branch
;
1420 if (!prefixcmp(branch_name
, "refs/heads/"))
1422 else if (!strcmp(branch_name
, "HEAD")) {
1423 branch_name
= _("HEAD (no branch)");
1424 branch_color_local
= color(WT_STATUS_NOBRANCH
, s
);
1427 branch
= branch_get(s
->branch
+ 11);
1429 color_fprintf(s
->fp
, header_color
, _("Initial commit on "));
1430 if (!stat_tracking_info(branch
, &num_ours
, &num_theirs
)) {
1431 color_fprintf(s
->fp
, branch_color_local
, "%s", branch_name
);
1432 fputc(s
->null_termination
? '\0' : '\n', s
->fp
);
1436 base
= branch
->merge
[0]->dst
;
1437 base
= shorten_unambiguous_ref(base
, 0);
1438 color_fprintf(s
->fp
, branch_color_local
, "%s", branch_name
);
1439 color_fprintf(s
->fp
, header_color
, "...");
1440 color_fprintf(s
->fp
, branch_color_remote
, "%s", base
);
1442 color_fprintf(s
->fp
, header_color
, " [");
1444 color_fprintf(s
->fp
, header_color
, _("behind "));
1445 color_fprintf(s
->fp
, branch_color_remote
, "%d", num_theirs
);
1446 } else if (!num_theirs
) {
1447 color_fprintf(s
->fp
, header_color
, _("ahead "));
1448 color_fprintf(s
->fp
, branch_color_local
, "%d", num_ours
);
1450 color_fprintf(s
->fp
, header_color
, _("ahead "));
1451 color_fprintf(s
->fp
, branch_color_local
, "%d", num_ours
);
1452 color_fprintf(s
->fp
, header_color
, _(", behind "));
1453 color_fprintf(s
->fp
, branch_color_remote
, "%d", num_theirs
);
1456 color_fprintf(s
->fp
, header_color
, "]");
1457 fputc(s
->null_termination
? '\0' : '\n', s
->fp
);
1460 void wt_shortstatus_print(struct wt_status
*s
)
1465 wt_shortstatus_print_tracking(s
);
1467 for (i
= 0; i
< s
->change
.nr
; i
++) {
1468 struct wt_status_change_data
*d
;
1469 struct string_list_item
*it
;
1471 it
= &(s
->change
.items
[i
]);
1474 wt_shortstatus_unmerged(it
, s
);
1476 wt_shortstatus_status(it
, s
);
1478 for (i
= 0; i
< s
->untracked
.nr
; i
++) {
1479 struct string_list_item
*it
;
1481 it
= &(s
->untracked
.items
[i
]);
1482 wt_shortstatus_other(it
, s
, "??");
1484 for (i
= 0; i
< s
->ignored
.nr
; i
++) {
1485 struct string_list_item
*it
;
1487 it
= &(s
->ignored
.items
[i
]);
1488 wt_shortstatus_other(it
, s
, "!!");
1492 void wt_porcelain_print(struct wt_status
*s
)
1495 s
->relative_paths
= 0;
1497 wt_shortstatus_print(s
);