10 #include "run-command.h"
11 #include "argv-array.h"
14 #include "submodule.h"
20 static const char cut_line
[] =
21 "------------------------ >8 ------------------------\n";
23 static char default_wt_status_colors
[][COLOR_MAXLEN
] = {
24 GIT_COLOR_NORMAL
, /* WT_STATUS_HEADER */
25 GIT_COLOR_GREEN
, /* WT_STATUS_UPDATED */
26 GIT_COLOR_RED
, /* WT_STATUS_CHANGED */
27 GIT_COLOR_RED
, /* WT_STATUS_UNTRACKED */
28 GIT_COLOR_RED
, /* WT_STATUS_NOBRANCH */
29 GIT_COLOR_RED
, /* WT_STATUS_UNMERGED */
30 GIT_COLOR_GREEN
, /* WT_STATUS_LOCAL_BRANCH */
31 GIT_COLOR_RED
, /* WT_STATUS_REMOTE_BRANCH */
32 GIT_COLOR_NIL
, /* WT_STATUS_ONBRANCH */
35 static const char *color(int slot
, struct wt_status
*s
)
38 if (want_color(s
->use_color
))
39 c
= s
->color_palette
[slot
];
40 if (slot
== WT_STATUS_ONBRANCH
&& color_is_nil(c
))
41 c
= s
->color_palette
[WT_STATUS_HEADER
];
45 static void status_vprintf(struct wt_status
*s
, int at_bol
, const char *color
,
46 const char *fmt
, va_list ap
, const char *trail
)
48 struct strbuf sb
= STRBUF_INIT
;
49 struct strbuf linebuf
= STRBUF_INIT
;
50 const char *line
, *eol
;
52 strbuf_vaddf(&sb
, fmt
, ap
);
54 if (s
->display_comment_prefix
) {
55 strbuf_addch(&sb
, comment_line_char
);
57 strbuf_addch(&sb
, ' ');
59 color_print_strbuf(s
->fp
, color
, &sb
);
61 fprintf(s
->fp
, "%s", trail
);
65 for (line
= sb
.buf
; *line
; line
= eol
+ 1) {
66 eol
= strchr(line
, '\n');
68 strbuf_reset(&linebuf
);
69 if (at_bol
&& s
->display_comment_prefix
) {
70 strbuf_addch(&linebuf
, comment_line_char
);
71 if (*line
!= '\n' && *line
!= '\t')
72 strbuf_addch(&linebuf
, ' ');
75 strbuf_add(&linebuf
, line
, eol
- line
);
77 strbuf_addstr(&linebuf
, line
);
78 color_print_strbuf(s
->fp
, color
, &linebuf
);
86 fprintf(s
->fp
, "%s", trail
);
87 strbuf_release(&linebuf
);
91 void status_printf_ln(struct wt_status
*s
, const char *color
,
97 status_vprintf(s
, 1, color
, fmt
, ap
, "\n");
101 void status_printf(struct wt_status
*s
, const char *color
,
102 const char *fmt
, ...)
107 status_vprintf(s
, 1, color
, fmt
, ap
, NULL
);
111 static void status_printf_more(struct wt_status
*s
, const char *color
,
112 const char *fmt
, ...)
117 status_vprintf(s
, 0, color
, fmt
, ap
, NULL
);
121 void wt_status_prepare(struct wt_status
*s
)
123 unsigned char sha1
[20];
125 memset(s
, 0, sizeof(*s
));
126 memcpy(s
->color_palette
, default_wt_status_colors
,
127 sizeof(default_wt_status_colors
));
128 s
->show_untracked_files
= SHOW_NORMAL_UNTRACKED_FILES
;
130 s
->relative_paths
= 1;
131 s
->branch
= resolve_refdup("HEAD", 0, sha1
, 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_longstatus_print_unmerged_header(struct wt_status
*s
)
145 int del_mod_conflict
= 0;
146 int both_deleted
= 0;
148 const char *c
= color(WT_STATUS_HEADER
, s
);
150 status_printf_ln(s
, c
, _("Unmerged paths:"));
152 for (i
= 0; i
< s
->change
.nr
; i
++) {
153 struct string_list_item
*it
= &(s
->change
.items
[i
]);
154 struct wt_status_change_data
*d
= it
->util
;
156 switch (d
->stagemask
) {
164 del_mod_conflict
= 1;
174 if (s
->whence
!= FROM_COMMIT
)
176 else if (!s
->is_initial
)
177 status_printf_ln(s
, c
, _(" (use \"git reset %s <file>...\" to unstage)"), s
->reference
);
179 status_printf_ln(s
, c
, _(" (use \"git rm --cached <file>...\" to unstage)"));
182 if (!del_mod_conflict
)
183 status_printf_ln(s
, c
, _(" (use \"git add <file>...\" to mark resolution)"));
185 status_printf_ln(s
, c
, _(" (use \"git add/rm <file>...\" as appropriate to mark resolution)"));
186 } else if (!del_mod_conflict
&& !not_deleted
) {
187 status_printf_ln(s
, c
, _(" (use \"git rm <file>...\" to mark resolution)"));
189 status_printf_ln(s
, c
, _(" (use \"git add/rm <file>...\" as appropriate to mark resolution)"));
191 status_printf_ln(s
, c
, "%s", "");
194 static void wt_longstatus_print_cached_header(struct wt_status
*s
)
196 const char *c
= color(WT_STATUS_HEADER
, s
);
198 status_printf_ln(s
, c
, _("Changes to be committed:"));
201 if (s
->whence
!= FROM_COMMIT
)
202 ; /* NEEDSWORK: use "git reset --unresolve"??? */
203 else if (!s
->is_initial
)
204 status_printf_ln(s
, c
, _(" (use \"git reset %s <file>...\" to unstage)"), s
->reference
);
206 status_printf_ln(s
, c
, _(" (use \"git rm --cached <file>...\" to unstage)"));
207 status_printf_ln(s
, c
, "%s", "");
210 static void wt_longstatus_print_dirty_header(struct wt_status
*s
,
212 int has_dirty_submodules
)
214 const char *c
= color(WT_STATUS_HEADER
, s
);
216 status_printf_ln(s
, c
, _("Changes not staged for commit:"));
220 status_printf_ln(s
, c
, _(" (use \"git add <file>...\" to update what will be committed)"));
222 status_printf_ln(s
, c
, _(" (use \"git add/rm <file>...\" to update what will be committed)"));
223 status_printf_ln(s
, c
, _(" (use \"git checkout -- <file>...\" to discard changes in working directory)"));
224 if (has_dirty_submodules
)
225 status_printf_ln(s
, c
, _(" (commit or discard the untracked or modified content in submodules)"));
226 status_printf_ln(s
, c
, "%s", "");
229 static void wt_longstatus_print_other_header(struct wt_status
*s
,
233 const char *c
= color(WT_STATUS_HEADER
, s
);
234 status_printf_ln(s
, c
, "%s:", what
);
237 status_printf_ln(s
, c
, _(" (use \"git %s <file>...\" to include in what will be committed)"), how
);
238 status_printf_ln(s
, c
, "%s", "");
241 static void wt_longstatus_print_trailer(struct wt_status
*s
)
243 status_printf_ln(s
, color(WT_STATUS_HEADER
, s
), "%s", "");
246 #define quote_path quote_path_relative
248 static const char *wt_status_unmerged_status_string(int stagemask
)
252 return _("both deleted:");
254 return _("added by us:");
256 return _("deleted by them:");
258 return _("added by them:");
260 return _("deleted by us:");
262 return _("both added:");
264 return _("both modified:");
266 die("BUG: unhandled unmerged status %x", stagemask
);
270 static const char *wt_status_diff_status_string(int status
)
273 case DIFF_STATUS_ADDED
:
274 return _("new file:");
275 case DIFF_STATUS_COPIED
:
277 case DIFF_STATUS_DELETED
:
278 return _("deleted:");
279 case DIFF_STATUS_MODIFIED
:
280 return _("modified:");
281 case DIFF_STATUS_RENAMED
:
282 return _("renamed:");
283 case DIFF_STATUS_TYPE_CHANGED
:
284 return _("typechange:");
285 case DIFF_STATUS_UNKNOWN
:
286 return _("unknown:");
287 case DIFF_STATUS_UNMERGED
:
288 return _("unmerged:");
294 static int maxwidth(const char *(*label
)(int), int minval
, int maxval
)
298 for (i
= minval
; i
<= maxval
; i
++) {
299 const char *s
= label(i
);
300 int len
= s
? utf8_strwidth(s
) : 0;
307 static void wt_longstatus_print_unmerged_data(struct wt_status
*s
,
308 struct string_list_item
*it
)
310 const char *c
= color(WT_STATUS_UNMERGED
, s
);
311 struct wt_status_change_data
*d
= it
->util
;
312 struct strbuf onebuf
= STRBUF_INIT
;
313 static char *padding
;
314 static int label_width
;
315 const char *one
, *how
;
319 label_width
= maxwidth(wt_status_unmerged_status_string
, 1, 7);
320 label_width
+= strlen(" ");
321 padding
= xmallocz(label_width
);
322 memset(padding
, ' ', label_width
);
325 one
= quote_path(it
->string
, s
->prefix
, &onebuf
);
326 status_printf(s
, color(WT_STATUS_HEADER
, s
), "\t");
328 how
= wt_status_unmerged_status_string(d
->stagemask
);
329 len
= label_width
- utf8_strwidth(how
);
330 status_printf_more(s
, c
, "%s%.*s%s\n", how
, len
, padding
, one
);
331 strbuf_release(&onebuf
);
334 static void wt_longstatus_print_change_data(struct wt_status
*s
,
336 struct string_list_item
*it
)
338 struct wt_status_change_data
*d
= it
->util
;
339 const char *c
= color(change_type
, s
);
343 const char *one
, *two
;
344 struct strbuf onebuf
= STRBUF_INIT
, twobuf
= STRBUF_INIT
;
345 struct strbuf extra
= STRBUF_INIT
;
346 static char *padding
;
347 static int label_width
;
352 /* If DIFF_STATUS_* uses outside the range [A..Z], we're in trouble */
353 label_width
= maxwidth(wt_status_diff_status_string
, 'A', 'Z');
354 label_width
+= strlen(" ");
355 padding
= xmallocz(label_width
);
356 memset(padding
, ' ', label_width
);
359 one_name
= two_name
= it
->string
;
360 switch (change_type
) {
361 case WT_STATUS_UPDATED
:
362 status
= d
->index_status
;
364 one_name
= d
->head_path
;
366 case WT_STATUS_CHANGED
:
367 if (d
->new_submodule_commits
|| d
->dirty_submodule
) {
368 strbuf_addstr(&extra
, " (");
369 if (d
->new_submodule_commits
)
370 strbuf_addstr(&extra
, _("new commits, "));
371 if (d
->dirty_submodule
& DIRTY_SUBMODULE_MODIFIED
)
372 strbuf_addstr(&extra
, _("modified content, "));
373 if (d
->dirty_submodule
& DIRTY_SUBMODULE_UNTRACKED
)
374 strbuf_addstr(&extra
, _("untracked content, "));
375 strbuf_setlen(&extra
, extra
.len
- 2);
376 strbuf_addch(&extra
, ')');
378 status
= d
->worktree_status
;
381 die("BUG: unhandled change_type %d in wt_longstatus_print_change_data",
385 one
= quote_path(one_name
, s
->prefix
, &onebuf
);
386 two
= quote_path(two_name
, s
->prefix
, &twobuf
);
388 status_printf(s
, color(WT_STATUS_HEADER
, s
), "\t");
389 what
= wt_status_diff_status_string(status
);
391 die("BUG: unhandled diff status %c", status
);
392 len
= label_width
- utf8_strwidth(what
);
394 if (status
== DIFF_STATUS_COPIED
|| status
== DIFF_STATUS_RENAMED
)
395 status_printf_more(s
, c
, "%s%.*s%s -> %s",
396 what
, len
, padding
, one
, two
);
398 status_printf_more(s
, c
, "%s%.*s%s",
399 what
, len
, padding
, one
);
401 status_printf_more(s
, color(WT_STATUS_HEADER
, s
), "%s", extra
.buf
);
402 strbuf_release(&extra
);
404 status_printf_more(s
, GIT_COLOR_NORMAL
, "\n");
405 strbuf_release(&onebuf
);
406 strbuf_release(&twobuf
);
409 static void wt_status_collect_changed_cb(struct diff_queue_struct
*q
,
410 struct diff_options
*options
,
413 struct wt_status
*s
= data
;
418 s
->workdir_dirty
= 1;
419 for (i
= 0; i
< q
->nr
; i
++) {
420 struct diff_filepair
*p
;
421 struct string_list_item
*it
;
422 struct wt_status_change_data
*d
;
425 it
= string_list_insert(&s
->change
, p
->one
->path
);
428 d
= xcalloc(1, sizeof(*d
));
431 if (!d
->worktree_status
)
432 d
->worktree_status
= p
->status
;
433 d
->dirty_submodule
= p
->two
->dirty_submodule
;
434 if (S_ISGITLINK(p
->two
->mode
))
435 d
->new_submodule_commits
= !!oidcmp(&p
->one
->oid
,
439 case DIFF_STATUS_ADDED
:
440 die("BUG: worktree status add???");
443 case DIFF_STATUS_DELETED
:
444 d
->mode_index
= p
->one
->mode
;
445 oidcpy(&d
->oid_index
, &p
->one
->oid
);
446 /* mode_worktree is zero for a delete. */
449 case DIFF_STATUS_MODIFIED
:
450 case DIFF_STATUS_TYPE_CHANGED
:
451 case DIFF_STATUS_UNMERGED
:
452 d
->mode_index
= p
->one
->mode
;
453 d
->mode_worktree
= p
->two
->mode
;
454 oidcpy(&d
->oid_index
, &p
->one
->oid
);
457 case DIFF_STATUS_UNKNOWN
:
458 die("BUG: worktree status unknown???");
465 static int unmerged_mask(const char *path
)
468 const struct cache_entry
*ce
;
470 pos
= cache_name_pos(path
, strlen(path
));
476 while (pos
< active_nr
) {
477 ce
= active_cache
[pos
++];
478 if (strcmp(ce
->name
, path
) || !ce_stage(ce
))
480 mask
|= (1 << (ce_stage(ce
) - 1));
485 static void wt_status_collect_updated_cb(struct diff_queue_struct
*q
,
486 struct diff_options
*options
,
489 struct wt_status
*s
= data
;
492 for (i
= 0; i
< q
->nr
; i
++) {
493 struct diff_filepair
*p
;
494 struct string_list_item
*it
;
495 struct wt_status_change_data
*d
;
498 it
= string_list_insert(&s
->change
, p
->two
->path
);
501 d
= xcalloc(1, sizeof(*d
));
504 if (!d
->index_status
)
505 d
->index_status
= p
->status
;
507 case DIFF_STATUS_ADDED
:
508 /* Leave {mode,oid}_head zero for an add. */
509 d
->mode_index
= p
->two
->mode
;
510 oidcpy(&d
->oid_index
, &p
->two
->oid
);
512 case DIFF_STATUS_DELETED
:
513 d
->mode_head
= p
->one
->mode
;
514 oidcpy(&d
->oid_head
, &p
->one
->oid
);
515 /* Leave {mode,oid}_index zero for a delete. */
518 case DIFF_STATUS_COPIED
:
519 case DIFF_STATUS_RENAMED
:
520 d
->head_path
= xstrdup(p
->one
->path
);
521 d
->score
= p
->score
* 100 / MAX_SCORE
;
523 case DIFF_STATUS_MODIFIED
:
524 case DIFF_STATUS_TYPE_CHANGED
:
525 d
->mode_head
= p
->one
->mode
;
526 d
->mode_index
= p
->two
->mode
;
527 oidcpy(&d
->oid_head
, &p
->one
->oid
);
528 oidcpy(&d
->oid_index
, &p
->two
->oid
);
530 case DIFF_STATUS_UNMERGED
:
531 d
->stagemask
= unmerged_mask(p
->two
->path
);
533 * Don't bother setting {mode,oid}_{head,index} since the print
534 * code will output the stage values directly and not use the
535 * values in these fields.
542 static void wt_status_collect_changes_worktree(struct wt_status
*s
)
546 init_revisions(&rev
, NULL
);
547 setup_revisions(0, NULL
, &rev
, NULL
);
548 rev
.diffopt
.output_format
|= DIFF_FORMAT_CALLBACK
;
549 DIFF_OPT_SET(&rev
.diffopt
, DIRTY_SUBMODULES
);
550 if (!s
->show_untracked_files
)
551 DIFF_OPT_SET(&rev
.diffopt
, IGNORE_UNTRACKED_IN_SUBMODULES
);
552 if (s
->ignore_submodule_arg
) {
553 DIFF_OPT_SET(&rev
.diffopt
, OVERRIDE_SUBMODULE_CONFIG
);
554 handle_ignore_submodules_arg(&rev
.diffopt
, s
->ignore_submodule_arg
);
556 rev
.diffopt
.format_callback
= wt_status_collect_changed_cb
;
557 rev
.diffopt
.format_callback_data
= s
;
558 copy_pathspec(&rev
.prune_data
, &s
->pathspec
);
559 run_diff_files(&rev
, 0);
562 static void wt_status_collect_changes_index(struct wt_status
*s
)
565 struct setup_revision_opt opt
;
567 init_revisions(&rev
, NULL
);
568 memset(&opt
, 0, sizeof(opt
));
569 opt
.def
= s
->is_initial
? EMPTY_TREE_SHA1_HEX
: s
->reference
;
570 setup_revisions(0, NULL
, &rev
, &opt
);
572 DIFF_OPT_SET(&rev
.diffopt
, OVERRIDE_SUBMODULE_CONFIG
);
573 if (s
->ignore_submodule_arg
) {
574 handle_ignore_submodules_arg(&rev
.diffopt
, s
->ignore_submodule_arg
);
577 * Unless the user did explicitly request a submodule ignore
578 * mode by passing a command line option we do not ignore any
579 * changed submodule SHA-1s when comparing index and HEAD, no
580 * matter what is configured. Otherwise the user won't be
581 * shown any submodules she manually added (and which are
582 * staged to be committed), which would be really confusing.
584 handle_ignore_submodules_arg(&rev
.diffopt
, "dirty");
587 rev
.diffopt
.output_format
|= DIFF_FORMAT_CALLBACK
;
588 rev
.diffopt
.format_callback
= wt_status_collect_updated_cb
;
589 rev
.diffopt
.format_callback_data
= s
;
590 rev
.diffopt
.detect_rename
= 1;
591 rev
.diffopt
.rename_limit
= 200;
592 rev
.diffopt
.break_opt
= 0;
593 copy_pathspec(&rev
.prune_data
, &s
->pathspec
);
594 run_diff_index(&rev
, 1);
597 static void wt_status_collect_changes_initial(struct wt_status
*s
)
601 for (i
= 0; i
< active_nr
; i
++) {
602 struct string_list_item
*it
;
603 struct wt_status_change_data
*d
;
604 const struct cache_entry
*ce
= active_cache
[i
];
606 if (!ce_path_match(ce
, &s
->pathspec
, NULL
))
608 it
= string_list_insert(&s
->change
, ce
->name
);
611 d
= xcalloc(1, sizeof(*d
));
615 d
->index_status
= DIFF_STATUS_UNMERGED
;
616 d
->stagemask
|= (1 << (ce_stage(ce
) - 1));
618 * Don't bother setting {mode,oid}_{head,index} since the print
619 * code will output the stage values directly and not use the
620 * values in these fields.
623 d
->index_status
= DIFF_STATUS_ADDED
;
624 /* Leave {mode,oid}_head zero for adds. */
625 d
->mode_index
= ce
->ce_mode
;
626 hashcpy(d
->oid_index
.hash
, ce
->oid
.hash
);
631 static void wt_status_collect_untracked(struct wt_status
*s
)
634 struct dir_struct dir
;
635 uint64_t t_begin
= getnanotime();
637 if (!s
->show_untracked_files
)
640 memset(&dir
, 0, sizeof(dir
));
641 if (s
->show_untracked_files
!= SHOW_ALL_UNTRACKED_FILES
)
643 DIR_SHOW_OTHER_DIRECTORIES
| DIR_HIDE_EMPTY_DIRECTORIES
;
644 if (s
->show_ignored_files
)
645 dir
.flags
|= DIR_SHOW_IGNORED_TOO
;
647 dir
.untracked
= the_index
.untracked
;
648 setup_standard_excludes(&dir
);
650 fill_directory(&dir
, &s
->pathspec
);
652 for (i
= 0; i
< dir
.nr
; i
++) {
653 struct dir_entry
*ent
= dir
.entries
[i
];
654 if (cache_name_is_other(ent
->name
, ent
->len
) &&
655 dir_path_match(ent
, &s
->pathspec
, 0, NULL
))
656 string_list_insert(&s
->untracked
, ent
->name
);
660 for (i
= 0; i
< dir
.ignored_nr
; i
++) {
661 struct dir_entry
*ent
= dir
.ignored
[i
];
662 if (cache_name_is_other(ent
->name
, ent
->len
) &&
663 dir_path_match(ent
, &s
->pathspec
, 0, NULL
))
664 string_list_insert(&s
->ignored
, ent
->name
);
670 clear_directory(&dir
);
672 if (advice_status_u_option
)
673 s
->untracked_in_ms
= (getnanotime() - t_begin
) / 1000000;
676 void wt_status_collect(struct wt_status
*s
)
678 wt_status_collect_changes_worktree(s
);
681 wt_status_collect_changes_initial(s
);
683 wt_status_collect_changes_index(s
);
684 wt_status_collect_untracked(s
);
687 static void wt_longstatus_print_unmerged(struct wt_status
*s
)
689 int shown_header
= 0;
692 for (i
= 0; i
< s
->change
.nr
; i
++) {
693 struct wt_status_change_data
*d
;
694 struct string_list_item
*it
;
695 it
= &(s
->change
.items
[i
]);
700 wt_longstatus_print_unmerged_header(s
);
703 wt_longstatus_print_unmerged_data(s
, it
);
706 wt_longstatus_print_trailer(s
);
710 static void wt_longstatus_print_updated(struct wt_status
*s
)
712 int shown_header
= 0;
715 for (i
= 0; i
< s
->change
.nr
; i
++) {
716 struct wt_status_change_data
*d
;
717 struct string_list_item
*it
;
718 it
= &(s
->change
.items
[i
]);
720 if (!d
->index_status
||
721 d
->index_status
== DIFF_STATUS_UNMERGED
)
724 wt_longstatus_print_cached_header(s
);
728 wt_longstatus_print_change_data(s
, WT_STATUS_UPDATED
, it
);
731 wt_longstatus_print_trailer(s
);
737 * 1 : some change but no delete
739 static int wt_status_check_worktree_changes(struct wt_status
*s
,
740 int *dirty_submodules
)
745 *dirty_submodules
= 0;
747 for (i
= 0; i
< s
->change
.nr
; i
++) {
748 struct wt_status_change_data
*d
;
749 d
= s
->change
.items
[i
].util
;
750 if (!d
->worktree_status
||
751 d
->worktree_status
== DIFF_STATUS_UNMERGED
)
755 if (d
->dirty_submodule
)
756 *dirty_submodules
= 1;
757 if (d
->worktree_status
== DIFF_STATUS_DELETED
)
763 static void wt_longstatus_print_changed(struct wt_status
*s
)
765 int i
, dirty_submodules
;
766 int worktree_changes
= wt_status_check_worktree_changes(s
, &dirty_submodules
);
768 if (!worktree_changes
)
771 wt_longstatus_print_dirty_header(s
, worktree_changes
< 0, dirty_submodules
);
773 for (i
= 0; i
< s
->change
.nr
; i
++) {
774 struct wt_status_change_data
*d
;
775 struct string_list_item
*it
;
776 it
= &(s
->change
.items
[i
]);
778 if (!d
->worktree_status
||
779 d
->worktree_status
== DIFF_STATUS_UNMERGED
)
781 wt_longstatus_print_change_data(s
, WT_STATUS_CHANGED
, it
);
783 wt_longstatus_print_trailer(s
);
786 static void wt_longstatus_print_submodule_summary(struct wt_status
*s
, int uncommitted
)
788 struct child_process sm_summary
= CHILD_PROCESS_INIT
;
789 struct strbuf cmd_stdout
= STRBUF_INIT
;
790 struct strbuf summary
= STRBUF_INIT
;
791 char *summary_content
;
793 argv_array_pushf(&sm_summary
.env_array
, "GIT_INDEX_FILE=%s",
796 argv_array_push(&sm_summary
.args
, "submodule");
797 argv_array_push(&sm_summary
.args
, "summary");
798 argv_array_push(&sm_summary
.args
, uncommitted
? "--files" : "--cached");
799 argv_array_push(&sm_summary
.args
, "--for-status");
800 argv_array_push(&sm_summary
.args
, "--summary-limit");
801 argv_array_pushf(&sm_summary
.args
, "%d", s
->submodule_summary
);
803 argv_array_push(&sm_summary
.args
, s
->amend
? "HEAD^" : "HEAD");
805 sm_summary
.git_cmd
= 1;
806 sm_summary
.no_stdin
= 1;
808 capture_command(&sm_summary
, &cmd_stdout
, 1024);
810 /* prepend header, only if there's an actual output */
811 if (cmd_stdout
.len
) {
813 strbuf_addstr(&summary
, _("Submodules changed but not updated:"));
815 strbuf_addstr(&summary
, _("Submodule changes to be committed:"));
816 strbuf_addstr(&summary
, "\n\n");
818 strbuf_addbuf(&summary
, &cmd_stdout
);
819 strbuf_release(&cmd_stdout
);
821 if (s
->display_comment_prefix
) {
823 summary_content
= strbuf_detach(&summary
, &len
);
824 strbuf_add_commented_lines(&summary
, summary_content
, len
);
825 free(summary_content
);
828 fputs(summary
.buf
, s
->fp
);
829 strbuf_release(&summary
);
832 static void wt_longstatus_print_other(struct wt_status
*s
,
833 struct string_list
*l
,
838 struct strbuf buf
= STRBUF_INIT
;
839 static struct string_list output
= STRING_LIST_INIT_DUP
;
840 struct column_options copts
;
845 wt_longstatus_print_other_header(s
, what
, how
);
847 for (i
= 0; i
< l
->nr
; i
++) {
848 struct string_list_item
*it
;
851 path
= quote_path(it
->string
, s
->prefix
, &buf
);
852 if (column_active(s
->colopts
)) {
853 string_list_append(&output
, path
);
856 status_printf(s
, color(WT_STATUS_HEADER
, s
), "\t");
857 status_printf_more(s
, color(WT_STATUS_UNTRACKED
, s
),
861 strbuf_release(&buf
);
862 if (!column_active(s
->colopts
))
865 strbuf_addf(&buf
, "%s%s\t%s",
866 color(WT_STATUS_HEADER
, s
),
867 s
->display_comment_prefix
? "#" : "",
868 color(WT_STATUS_UNTRACKED
, s
));
869 memset(&copts
, 0, sizeof(copts
));
871 copts
.indent
= buf
.buf
;
872 if (want_color(s
->use_color
))
873 copts
.nl
= GIT_COLOR_RESET
"\n";
874 print_columns(&output
, s
->colopts
, &copts
);
875 string_list_clear(&output
, 0);
876 strbuf_release(&buf
);
878 status_printf_ln(s
, GIT_COLOR_NORMAL
, "%s", "");
881 void wt_status_truncate_message_at_cut_line(struct strbuf
*buf
)
884 struct strbuf pattern
= STRBUF_INIT
;
886 strbuf_addf(&pattern
, "\n%c %s", comment_line_char
, cut_line
);
887 if (starts_with(buf
->buf
, pattern
.buf
+ 1))
888 strbuf_setlen(buf
, 0);
889 else if ((p
= strstr(buf
->buf
, pattern
.buf
)))
890 strbuf_setlen(buf
, p
- buf
->buf
+ 1);
891 strbuf_release(&pattern
);
894 void wt_status_add_cut_line(FILE *fp
)
896 const char *explanation
= _("Do not touch the line above.\nEverything below will be removed.");
897 struct strbuf buf
= STRBUF_INIT
;
899 fprintf(fp
, "%c %s", comment_line_char
, cut_line
);
900 strbuf_add_commented_lines(&buf
, explanation
, strlen(explanation
));
902 strbuf_release(&buf
);
905 static void wt_longstatus_print_verbose(struct wt_status
*s
)
908 struct setup_revision_opt opt
;
909 int dirty_submodules
;
910 const char *c
= color(WT_STATUS_HEADER
, s
);
912 init_revisions(&rev
, NULL
);
913 DIFF_OPT_SET(&rev
.diffopt
, ALLOW_TEXTCONV
);
915 memset(&opt
, 0, sizeof(opt
));
916 opt
.def
= s
->is_initial
? EMPTY_TREE_SHA1_HEX
: s
->reference
;
917 setup_revisions(0, NULL
, &rev
, &opt
);
919 rev
.diffopt
.output_format
|= DIFF_FORMAT_PATCH
;
920 rev
.diffopt
.detect_rename
= 1;
921 rev
.diffopt
.file
= s
->fp
;
922 rev
.diffopt
.close_file
= 0;
924 * If we're not going to stdout, then we definitely don't
925 * want color, since we are going to the commit message
926 * file (and even the "auto" setting won't work, since it
927 * will have checked isatty on stdout). But we then do want
928 * to insert the scissor line here to reliably remove the
929 * diff before committing.
931 if (s
->fp
!= stdout
) {
932 rev
.diffopt
.use_color
= 0;
933 wt_status_add_cut_line(s
->fp
);
935 if (s
->verbose
> 1 && s
->commitable
) {
936 /* print_updated() printed a header, so do we */
938 wt_longstatus_print_trailer(s
);
939 status_printf_ln(s
, c
, _("Changes to be committed:"));
940 rev
.diffopt
.a_prefix
= "c/";
941 rev
.diffopt
.b_prefix
= "i/";
942 } /* else use prefix as per user config */
943 run_diff_index(&rev
, 1);
944 if (s
->verbose
> 1 &&
945 wt_status_check_worktree_changes(s
, &dirty_submodules
)) {
946 status_printf_ln(s
, c
,
947 "--------------------------------------------------");
948 status_printf_ln(s
, c
, _("Changes not staged for commit:"));
950 rev
.diffopt
.a_prefix
= "i/";
951 rev
.diffopt
.b_prefix
= "w/";
952 run_diff_files(&rev
, 0);
956 static void wt_longstatus_print_tracking(struct wt_status
*s
)
958 struct strbuf sb
= STRBUF_INIT
;
959 const char *cp
, *ep
, *branch_name
;
960 struct branch
*branch
;
961 char comment_line_string
[3];
964 assert(s
->branch
&& !s
->is_initial
);
965 if (!skip_prefix(s
->branch
, "refs/heads/", &branch_name
))
967 branch
= branch_get(branch_name
);
968 if (!format_tracking_info(branch
, &sb
))
972 if (s
->display_comment_prefix
) {
973 comment_line_string
[i
++] = comment_line_char
;
974 comment_line_string
[i
++] = ' ';
976 comment_line_string
[i
] = '\0';
978 for (cp
= sb
.buf
; (ep
= strchr(cp
, '\n')) != NULL
; cp
= ep
+ 1)
979 color_fprintf_ln(s
->fp
, color(WT_STATUS_HEADER
, s
),
980 "%s%.*s", comment_line_string
,
982 if (s
->display_comment_prefix
)
983 color_fprintf_ln(s
->fp
, color(WT_STATUS_HEADER
, s
), "%c",
989 static int has_unmerged(struct wt_status
*s
)
993 for (i
= 0; i
< s
->change
.nr
; i
++) {
994 struct wt_status_change_data
*d
;
995 d
= s
->change
.items
[i
].util
;
1002 static void show_merge_in_progress(struct wt_status
*s
,
1003 struct wt_status_state
*state
,
1006 if (has_unmerged(s
)) {
1007 status_printf_ln(s
, color
, _("You have unmerged paths."));
1009 status_printf_ln(s
, color
,
1010 _(" (fix conflicts and run \"git commit\")"));
1011 status_printf_ln(s
, color
,
1012 _(" (use \"git merge --abort\" to abort the merge)"));
1016 status_printf_ln(s
, color
,
1017 _("All conflicts fixed but you are still merging."));
1019 status_printf_ln(s
, color
,
1020 _(" (use \"git commit\" to conclude merge)"));
1022 wt_longstatus_print_trailer(s
);
1025 static void show_am_in_progress(struct wt_status
*s
,
1026 struct wt_status_state
*state
,
1029 status_printf_ln(s
, color
,
1030 _("You are in the middle of an am session."));
1031 if (state
->am_empty_patch
)
1032 status_printf_ln(s
, color
,
1033 _("The current patch is empty."));
1035 if (!state
->am_empty_patch
)
1036 status_printf_ln(s
, color
,
1037 _(" (fix conflicts and then run \"git am --continue\")"));
1038 status_printf_ln(s
, color
,
1039 _(" (use \"git am --skip\" to skip this patch)"));
1040 status_printf_ln(s
, color
,
1041 _(" (use \"git am --abort\" to restore the original branch)"));
1043 wt_longstatus_print_trailer(s
);
1046 static char *read_line_from_git_path(const char *filename
)
1048 struct strbuf buf
= STRBUF_INIT
;
1049 FILE *fp
= fopen(git_path("%s", filename
), "r");
1051 strbuf_release(&buf
);
1054 strbuf_getline_lf(&buf
, fp
);
1056 return strbuf_detach(&buf
, NULL
);
1058 strbuf_release(&buf
);
1063 static int split_commit_in_progress(struct wt_status
*s
)
1065 int split_in_progress
= 0;
1066 char *head
= read_line_from_git_path("HEAD");
1067 char *orig_head
= read_line_from_git_path("ORIG_HEAD");
1068 char *rebase_amend
= read_line_from_git_path("rebase-merge/amend");
1069 char *rebase_orig_head
= read_line_from_git_path("rebase-merge/orig-head");
1071 if (!head
|| !orig_head
|| !rebase_amend
|| !rebase_orig_head
||
1072 !s
->branch
|| strcmp(s
->branch
, "HEAD"))
1073 return split_in_progress
;
1075 if (!strcmp(rebase_amend
, rebase_orig_head
)) {
1076 if (strcmp(head
, rebase_amend
))
1077 split_in_progress
= 1;
1078 } else if (strcmp(orig_head
, rebase_orig_head
)) {
1079 split_in_progress
= 1;
1082 if (!s
->amend
&& !s
->nowarn
&& !s
->workdir_dirty
)
1083 split_in_progress
= 0;
1088 free(rebase_orig_head
);
1089 return split_in_progress
;
1094 * "pick d6a2f0303e897ec257dd0e0a39a5ccb709bc2047 some message"
1096 * "pick d6a2f03 some message"
1098 * The function assumes that the line does not contain useless spaces
1099 * before or after the command.
1101 static void abbrev_sha1_in_line(struct strbuf
*line
)
1103 struct strbuf
**split
;
1106 if (starts_with(line
->buf
, "exec ") ||
1107 starts_with(line
->buf
, "x "))
1110 split
= strbuf_split_max(line
, ' ', 3);
1111 if (split
[0] && split
[1]) {
1112 unsigned char sha1
[20];
1116 * strbuf_split_max left a space. Trim it and re-add
1117 * it after abbreviation.
1119 strbuf_trim(split
[1]);
1120 if (!get_sha1(split
[1]->buf
, sha1
)) {
1121 abbrev
= find_unique_abbrev(sha1
, DEFAULT_ABBREV
);
1122 strbuf_reset(split
[1]);
1123 strbuf_addf(split
[1], "%s ", abbrev
);
1125 for (i
= 0; split
[i
]; i
++)
1126 strbuf_addbuf(line
, split
[i
]);
1129 strbuf_list_free(split
);
1132 static void read_rebase_todolist(const char *fname
, struct string_list
*lines
)
1134 struct strbuf line
= STRBUF_INIT
;
1135 FILE *f
= fopen(git_path("%s", fname
), "r");
1138 die_errno("Could not open file %s for reading",
1139 git_path("%s", fname
));
1140 while (!strbuf_getline_lf(&line
, f
)) {
1141 if (line
.len
&& line
.buf
[0] == comment_line_char
)
1146 abbrev_sha1_in_line(&line
);
1147 string_list_append(lines
, line
.buf
);
1151 static void show_rebase_information(struct wt_status
*s
,
1152 struct wt_status_state
*state
,
1155 if (state
->rebase_interactive_in_progress
) {
1157 int nr_lines_to_show
= 2;
1159 struct string_list have_done
= STRING_LIST_INIT_DUP
;
1160 struct string_list yet_to_do
= STRING_LIST_INIT_DUP
;
1162 read_rebase_todolist("rebase-merge/done", &have_done
);
1163 read_rebase_todolist("rebase-merge/git-rebase-todo", &yet_to_do
);
1165 if (have_done
.nr
== 0)
1166 status_printf_ln(s
, color
, _("No commands done."));
1168 status_printf_ln(s
, color
,
1169 Q_("Last command done (%d command done):",
1170 "Last commands done (%d commands done):",
1173 for (i
= (have_done
.nr
> nr_lines_to_show
)
1174 ? have_done
.nr
- nr_lines_to_show
: 0;
1177 status_printf_ln(s
, color
, " %s", have_done
.items
[i
].string
);
1178 if (have_done
.nr
> nr_lines_to_show
&& s
->hints
)
1179 status_printf_ln(s
, color
,
1180 _(" (see more in file %s)"), git_path("rebase-merge/done"));
1183 if (yet_to_do
.nr
== 0)
1184 status_printf_ln(s
, color
,
1185 _("No commands remaining."));
1187 status_printf_ln(s
, color
,
1188 Q_("Next command to do (%d remaining command):",
1189 "Next commands to do (%d remaining commands):",
1192 for (i
= 0; i
< nr_lines_to_show
&& i
< yet_to_do
.nr
; i
++)
1193 status_printf_ln(s
, color
, " %s", yet_to_do
.items
[i
].string
);
1195 status_printf_ln(s
, color
,
1196 _(" (use \"git rebase --edit-todo\" to view and edit)"));
1198 string_list_clear(&yet_to_do
, 0);
1199 string_list_clear(&have_done
, 0);
1203 static void print_rebase_state(struct wt_status
*s
,
1204 struct wt_status_state
*state
,
1208 status_printf_ln(s
, color
,
1209 _("You are currently rebasing branch '%s' on '%s'."),
1213 status_printf_ln(s
, color
,
1214 _("You are currently rebasing."));
1217 static void show_rebase_in_progress(struct wt_status
*s
,
1218 struct wt_status_state
*state
,
1223 show_rebase_information(s
, state
, color
);
1224 if (has_unmerged(s
)) {
1225 print_rebase_state(s
, state
, color
);
1227 status_printf_ln(s
, color
,
1228 _(" (fix conflicts and then run \"git rebase --continue\")"));
1229 status_printf_ln(s
, color
,
1230 _(" (use \"git rebase --skip\" to skip this patch)"));
1231 status_printf_ln(s
, color
,
1232 _(" (use \"git rebase --abort\" to check out the original branch)"));
1234 } else if (state
->rebase_in_progress
|| !stat(git_path_merge_msg(), &st
)) {
1235 print_rebase_state(s
, state
, color
);
1237 status_printf_ln(s
, color
,
1238 _(" (all conflicts fixed: run \"git rebase --continue\")"));
1239 } else if (split_commit_in_progress(s
)) {
1241 status_printf_ln(s
, color
,
1242 _("You are currently splitting a commit while rebasing branch '%s' on '%s'."),
1246 status_printf_ln(s
, color
,
1247 _("You are currently splitting a commit during a rebase."));
1249 status_printf_ln(s
, color
,
1250 _(" (Once your working directory is clean, run \"git rebase --continue\")"));
1253 status_printf_ln(s
, color
,
1254 _("You are currently editing a commit while rebasing branch '%s' on '%s'."),
1258 status_printf_ln(s
, color
,
1259 _("You are currently editing a commit during a rebase."));
1260 if (s
->hints
&& !s
->amend
) {
1261 status_printf_ln(s
, color
,
1262 _(" (use \"git commit --amend\" to amend the current commit)"));
1263 status_printf_ln(s
, color
,
1264 _(" (use \"git rebase --continue\" once you are satisfied with your changes)"));
1267 wt_longstatus_print_trailer(s
);
1270 static void show_cherry_pick_in_progress(struct wt_status
*s
,
1271 struct wt_status_state
*state
,
1274 status_printf_ln(s
, color
, _("You are currently cherry-picking commit %s."),
1275 find_unique_abbrev(state
->cherry_pick_head_sha1
, DEFAULT_ABBREV
));
1277 if (has_unmerged(s
))
1278 status_printf_ln(s
, color
,
1279 _(" (fix conflicts and run \"git cherry-pick --continue\")"));
1281 status_printf_ln(s
, color
,
1282 _(" (all conflicts fixed: run \"git cherry-pick --continue\")"));
1283 status_printf_ln(s
, color
,
1284 _(" (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"));
1286 wt_longstatus_print_trailer(s
);
1289 static void show_revert_in_progress(struct wt_status
*s
,
1290 struct wt_status_state
*state
,
1293 status_printf_ln(s
, color
, _("You are currently reverting commit %s."),
1294 find_unique_abbrev(state
->revert_head_sha1
, DEFAULT_ABBREV
));
1296 if (has_unmerged(s
))
1297 status_printf_ln(s
, color
,
1298 _(" (fix conflicts and run \"git revert --continue\")"));
1300 status_printf_ln(s
, color
,
1301 _(" (all conflicts fixed: run \"git revert --continue\")"));
1302 status_printf_ln(s
, color
,
1303 _(" (use \"git revert --abort\" to cancel the revert operation)"));
1305 wt_longstatus_print_trailer(s
);
1308 static void show_bisect_in_progress(struct wt_status
*s
,
1309 struct wt_status_state
*state
,
1313 status_printf_ln(s
, color
,
1314 _("You are currently bisecting, started from branch '%s'."),
1317 status_printf_ln(s
, color
,
1318 _("You are currently bisecting."));
1320 status_printf_ln(s
, color
,
1321 _(" (use \"git bisect reset\" to get back to the original branch)"));
1322 wt_longstatus_print_trailer(s
);
1326 * Extract branch information from rebase/bisect
1328 static char *get_branch(const struct worktree
*wt
, const char *path
)
1330 struct strbuf sb
= STRBUF_INIT
;
1331 unsigned char sha1
[20];
1332 const char *branch_name
;
1334 if (strbuf_read_file(&sb
, worktree_git_path(wt
, "%s", path
), 0) <= 0)
1337 while (sb
.len
&& sb
.buf
[sb
.len
- 1] == '\n')
1338 strbuf_setlen(&sb
, sb
.len
- 1);
1341 if (skip_prefix(sb
.buf
, "refs/heads/", &branch_name
))
1342 strbuf_remove(&sb
, 0, branch_name
- sb
.buf
);
1343 else if (starts_with(sb
.buf
, "refs/"))
1345 else if (!get_sha1_hex(sb
.buf
, sha1
)) {
1347 abbrev
= find_unique_abbrev(sha1
, DEFAULT_ABBREV
);
1349 strbuf_addstr(&sb
, abbrev
);
1350 } else if (!strcmp(sb
.buf
, "detached HEAD")) /* rebase */
1354 return strbuf_detach(&sb
, NULL
);
1357 strbuf_release(&sb
);
1361 struct grab_1st_switch_cbdata
{
1363 unsigned char nsha1
[20];
1366 static int grab_1st_switch(unsigned char *osha1
, unsigned char *nsha1
,
1367 const char *email
, unsigned long timestamp
, int tz
,
1368 const char *message
, void *cb_data
)
1370 struct grab_1st_switch_cbdata
*cb
= cb_data
;
1371 const char *target
= NULL
, *end
;
1373 if (!skip_prefix(message
, "checkout: moving from ", &message
))
1375 target
= strstr(message
, " to ");
1378 target
+= strlen(" to ");
1379 strbuf_reset(&cb
->buf
);
1380 hashcpy(cb
->nsha1
, nsha1
);
1381 end
= strchrnul(target
, '\n');
1382 strbuf_add(&cb
->buf
, target
, end
- target
);
1383 if (!strcmp(cb
->buf
.buf
, "HEAD")) {
1384 /* HEAD is relative. Resolve it to the right reflog entry. */
1385 strbuf_reset(&cb
->buf
);
1386 strbuf_add_unique_abbrev(&cb
->buf
, nsha1
, DEFAULT_ABBREV
);
1391 static void wt_status_get_detached_from(struct wt_status_state
*state
)
1393 struct grab_1st_switch_cbdata cb
;
1394 struct commit
*commit
;
1395 unsigned char sha1
[20];
1398 strbuf_init(&cb
.buf
, 0);
1399 if (for_each_reflog_ent_reverse("HEAD", grab_1st_switch
, &cb
) <= 0) {
1400 strbuf_release(&cb
.buf
);
1404 if (dwim_ref(cb
.buf
.buf
, cb
.buf
.len
, sha1
, &ref
) == 1 &&
1405 /* sha1 is a commit? match without further lookup */
1406 (!hashcmp(cb
.nsha1
, sha1
) ||
1407 /* perhaps sha1 is a tag, try to dereference to a commit */
1408 ((commit
= lookup_commit_reference_gently(sha1
, 1)) != NULL
&&
1409 !hashcmp(cb
.nsha1
, commit
->object
.oid
.hash
)))) {
1410 const char *from
= ref
;
1411 if (!skip_prefix(from
, "refs/tags/", &from
))
1412 skip_prefix(from
, "refs/remotes/", &from
);
1413 state
->detached_from
= xstrdup(from
);
1415 state
->detached_from
=
1416 xstrdup(find_unique_abbrev(cb
.nsha1
, DEFAULT_ABBREV
));
1417 hashcpy(state
->detached_sha1
, cb
.nsha1
);
1418 state
->detached_at
= !get_sha1("HEAD", sha1
) &&
1419 !hashcmp(sha1
, state
->detached_sha1
);
1422 strbuf_release(&cb
.buf
);
1425 int wt_status_check_rebase(const struct worktree
*wt
,
1426 struct wt_status_state
*state
)
1430 if (!stat(worktree_git_path(wt
, "rebase-apply"), &st
)) {
1431 if (!stat(worktree_git_path(wt
, "rebase-apply/applying"), &st
)) {
1432 state
->am_in_progress
= 1;
1433 if (!stat(worktree_git_path(wt
, "rebase-apply/patch"), &st
) && !st
.st_size
)
1434 state
->am_empty_patch
= 1;
1436 state
->rebase_in_progress
= 1;
1437 state
->branch
= get_branch(wt
, "rebase-apply/head-name");
1438 state
->onto
= get_branch(wt
, "rebase-apply/onto");
1440 } else if (!stat(worktree_git_path(wt
, "rebase-merge"), &st
)) {
1441 if (!stat(worktree_git_path(wt
, "rebase-merge/interactive"), &st
))
1442 state
->rebase_interactive_in_progress
= 1;
1444 state
->rebase_in_progress
= 1;
1445 state
->branch
= get_branch(wt
, "rebase-merge/head-name");
1446 state
->onto
= get_branch(wt
, "rebase-merge/onto");
1452 int wt_status_check_bisect(const struct worktree
*wt
,
1453 struct wt_status_state
*state
)
1457 if (!stat(worktree_git_path(wt
, "BISECT_LOG"), &st
)) {
1458 state
->bisect_in_progress
= 1;
1459 state
->branch
= get_branch(wt
, "BISECT_START");
1465 void wt_status_get_state(struct wt_status_state
*state
,
1466 int get_detached_from
)
1469 unsigned char sha1
[20];
1471 if (!stat(git_path_merge_head(), &st
)) {
1472 state
->merge_in_progress
= 1;
1473 } else if (wt_status_check_rebase(NULL
, state
)) {
1475 } else if (!stat(git_path_cherry_pick_head(), &st
) &&
1476 !get_sha1("CHERRY_PICK_HEAD", sha1
)) {
1477 state
->cherry_pick_in_progress
= 1;
1478 hashcpy(state
->cherry_pick_head_sha1
, sha1
);
1480 wt_status_check_bisect(NULL
, state
);
1481 if (!stat(git_path_revert_head(), &st
) &&
1482 !get_sha1("REVERT_HEAD", sha1
)) {
1483 state
->revert_in_progress
= 1;
1484 hashcpy(state
->revert_head_sha1
, sha1
);
1487 if (get_detached_from
)
1488 wt_status_get_detached_from(state
);
1491 static void wt_longstatus_print_state(struct wt_status
*s
,
1492 struct wt_status_state
*state
)
1494 const char *state_color
= color(WT_STATUS_HEADER
, s
);
1495 if (state
->merge_in_progress
)
1496 show_merge_in_progress(s
, state
, state_color
);
1497 else if (state
->am_in_progress
)
1498 show_am_in_progress(s
, state
, state_color
);
1499 else if (state
->rebase_in_progress
|| state
->rebase_interactive_in_progress
)
1500 show_rebase_in_progress(s
, state
, state_color
);
1501 else if (state
->cherry_pick_in_progress
)
1502 show_cherry_pick_in_progress(s
, state
, state_color
);
1503 else if (state
->revert_in_progress
)
1504 show_revert_in_progress(s
, state
, state_color
);
1505 if (state
->bisect_in_progress
)
1506 show_bisect_in_progress(s
, state
, state_color
);
1509 static void wt_longstatus_print(struct wt_status
*s
)
1511 const char *branch_color
= color(WT_STATUS_ONBRANCH
, s
);
1512 const char *branch_status_color
= color(WT_STATUS_HEADER
, s
);
1513 struct wt_status_state state
;
1515 memset(&state
, 0, sizeof(state
));
1516 wt_status_get_state(&state
,
1517 s
->branch
&& !strcmp(s
->branch
, "HEAD"));
1520 const char *on_what
= _("On branch ");
1521 const char *branch_name
= s
->branch
;
1522 if (!strcmp(branch_name
, "HEAD")) {
1523 branch_status_color
= color(WT_STATUS_NOBRANCH
, s
);
1524 if (state
.rebase_in_progress
|| state
.rebase_interactive_in_progress
) {
1525 if (state
.rebase_interactive_in_progress
)
1526 on_what
= _("interactive rebase in progress; onto ");
1528 on_what
= _("rebase in progress; onto ");
1529 branch_name
= state
.onto
;
1530 } else if (state
.detached_from
) {
1531 branch_name
= state
.detached_from
;
1532 if (state
.detached_at
)
1533 on_what
= _("HEAD detached at ");
1535 on_what
= _("HEAD detached from ");
1538 on_what
= _("Not currently on any branch.");
1541 skip_prefix(branch_name
, "refs/heads/", &branch_name
);
1542 status_printf(s
, color(WT_STATUS_HEADER
, s
), "%s", "");
1543 status_printf_more(s
, branch_status_color
, "%s", on_what
);
1544 status_printf_more(s
, branch_color
, "%s\n", branch_name
);
1546 wt_longstatus_print_tracking(s
);
1549 wt_longstatus_print_state(s
, &state
);
1552 free(state
.detached_from
);
1554 if (s
->is_initial
) {
1555 status_printf_ln(s
, color(WT_STATUS_HEADER
, s
), "%s", "");
1556 status_printf_ln(s
, color(WT_STATUS_HEADER
, s
), _("Initial commit"));
1557 status_printf_ln(s
, color(WT_STATUS_HEADER
, s
), "%s", "");
1560 wt_longstatus_print_updated(s
);
1561 wt_longstatus_print_unmerged(s
);
1562 wt_longstatus_print_changed(s
);
1563 if (s
->submodule_summary
&&
1564 (!s
->ignore_submodule_arg
||
1565 strcmp(s
->ignore_submodule_arg
, "all"))) {
1566 wt_longstatus_print_submodule_summary(s
, 0); /* staged */
1567 wt_longstatus_print_submodule_summary(s
, 1); /* unstaged */
1569 if (s
->show_untracked_files
) {
1570 wt_longstatus_print_other(s
, &s
->untracked
, _("Untracked files"), "add");
1571 if (s
->show_ignored_files
)
1572 wt_longstatus_print_other(s
, &s
->ignored
, _("Ignored files"), "add -f");
1573 if (advice_status_u_option
&& 2000 < s
->untracked_in_ms
) {
1574 status_printf_ln(s
, GIT_COLOR_NORMAL
, "%s", "");
1575 status_printf_ln(s
, GIT_COLOR_NORMAL
,
1576 _("It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1577 "may speed it up, but you have to be careful not to forget to add\n"
1578 "new files yourself (see 'git help status')."),
1579 s
->untracked_in_ms
/ 1000.0);
1581 } else if (s
->commitable
)
1582 status_printf_ln(s
, GIT_COLOR_NORMAL
, _("Untracked files not listed%s"),
1584 ? _(" (use -u option to show untracked files)") : "");
1587 wt_longstatus_print_verbose(s
);
1588 if (!s
->commitable
) {
1590 status_printf_ln(s
, GIT_COLOR_NORMAL
, _("No changes"));
1593 else if (s
->workdir_dirty
) {
1595 printf(_("no changes added to commit "
1596 "(use \"git add\" and/or \"git commit -a\")\n"));
1598 printf(_("no changes added to commit\n"));
1599 } else if (s
->untracked
.nr
) {
1601 printf(_("nothing added to commit but untracked files "
1602 "present (use \"git add\" to track)\n"));
1604 printf(_("nothing added to commit but untracked files present\n"));
1605 } else if (s
->is_initial
) {
1607 printf(_("nothing to commit (create/copy files "
1608 "and use \"git add\" to track)\n"));
1610 printf(_("nothing to commit\n"));
1611 } else if (!s
->show_untracked_files
) {
1613 printf(_("nothing to commit (use -u to show untracked files)\n"));
1615 printf(_("nothing to commit\n"));
1617 printf(_("nothing to commit, working tree clean\n"));
1621 static void wt_shortstatus_unmerged(struct string_list_item
*it
,
1622 struct wt_status
*s
)
1624 struct wt_status_change_data
*d
= it
->util
;
1625 const char *how
= "??";
1627 switch (d
->stagemask
) {
1628 case 1: how
= "DD"; break; /* both deleted */
1629 case 2: how
= "AU"; break; /* added by us */
1630 case 3: how
= "UD"; break; /* deleted by them */
1631 case 4: how
= "UA"; break; /* added by them */
1632 case 5: how
= "DU"; break; /* deleted by us */
1633 case 6: how
= "AA"; break; /* both added */
1634 case 7: how
= "UU"; break; /* both modified */
1636 color_fprintf(s
->fp
, color(WT_STATUS_UNMERGED
, s
), "%s", how
);
1637 if (s
->null_termination
) {
1638 fprintf(stdout
, " %s%c", it
->string
, 0);
1640 struct strbuf onebuf
= STRBUF_INIT
;
1642 one
= quote_path(it
->string
, s
->prefix
, &onebuf
);
1643 printf(" %s\n", one
);
1644 strbuf_release(&onebuf
);
1648 static void wt_shortstatus_status(struct string_list_item
*it
,
1649 struct wt_status
*s
)
1651 struct wt_status_change_data
*d
= it
->util
;
1653 if (d
->index_status
)
1654 color_fprintf(s
->fp
, color(WT_STATUS_UPDATED
, s
), "%c", d
->index_status
);
1657 if (d
->worktree_status
)
1658 color_fprintf(s
->fp
, color(WT_STATUS_CHANGED
, s
), "%c", d
->worktree_status
);
1662 if (s
->null_termination
) {
1663 fprintf(stdout
, "%s%c", it
->string
, 0);
1665 fprintf(stdout
, "%s%c", d
->head_path
, 0);
1667 struct strbuf onebuf
= STRBUF_INIT
;
1670 one
= quote_path(d
->head_path
, s
->prefix
, &onebuf
);
1671 if (*one
!= '"' && strchr(one
, ' ') != NULL
) {
1673 strbuf_addch(&onebuf
, '"');
1676 printf("%s -> ", one
);
1677 strbuf_release(&onebuf
);
1679 one
= quote_path(it
->string
, s
->prefix
, &onebuf
);
1680 if (*one
!= '"' && strchr(one
, ' ') != NULL
) {
1682 strbuf_addch(&onebuf
, '"');
1685 printf("%s\n", one
);
1686 strbuf_release(&onebuf
);
1690 static void wt_shortstatus_other(struct string_list_item
*it
,
1691 struct wt_status
*s
, const char *sign
)
1693 if (s
->null_termination
) {
1694 fprintf(stdout
, "%s %s%c", sign
, it
->string
, 0);
1696 struct strbuf onebuf
= STRBUF_INIT
;
1698 one
= quote_path(it
->string
, s
->prefix
, &onebuf
);
1699 color_fprintf(s
->fp
, color(WT_STATUS_UNTRACKED
, s
), "%s", sign
);
1700 printf(" %s\n", one
);
1701 strbuf_release(&onebuf
);
1705 static void wt_shortstatus_print_tracking(struct wt_status
*s
)
1707 struct branch
*branch
;
1708 const char *header_color
= color(WT_STATUS_HEADER
, s
);
1709 const char *branch_color_local
= color(WT_STATUS_LOCAL_BRANCH
, s
);
1710 const char *branch_color_remote
= color(WT_STATUS_REMOTE_BRANCH
, s
);
1713 const char *branch_name
;
1714 int num_ours
, num_theirs
;
1715 int upstream_is_gone
= 0;
1717 color_fprintf(s
->fp
, color(WT_STATUS_HEADER
, s
), "## ");
1721 branch_name
= s
->branch
;
1724 color_fprintf(s
->fp
, header_color
, _("Initial commit on "));
1726 if (!strcmp(s
->branch
, "HEAD")) {
1727 color_fprintf(s
->fp
, color(WT_STATUS_NOBRANCH
, s
), "%s",
1728 _("HEAD (no branch)"));
1732 skip_prefix(branch_name
, "refs/heads/", &branch_name
);
1734 branch
= branch_get(branch_name
);
1736 color_fprintf(s
->fp
, branch_color_local
, "%s", branch_name
);
1738 if (stat_tracking_info(branch
, &num_ours
, &num_theirs
, &base
) < 0) {
1742 upstream_is_gone
= 1;
1745 base
= shorten_unambiguous_ref(base
, 0);
1746 color_fprintf(s
->fp
, header_color
, "...");
1747 color_fprintf(s
->fp
, branch_color_remote
, "%s", base
);
1750 if (!upstream_is_gone
&& !num_ours
&& !num_theirs
)
1753 #define LABEL(string) (s->no_gettext ? (string) : _(string))
1755 color_fprintf(s
->fp
, header_color
, " [");
1756 if (upstream_is_gone
) {
1757 color_fprintf(s
->fp
, header_color
, LABEL(N_("gone")));
1758 } else if (!num_ours
) {
1759 color_fprintf(s
->fp
, header_color
, LABEL(N_("behind ")));
1760 color_fprintf(s
->fp
, branch_color_remote
, "%d", num_theirs
);
1761 } else if (!num_theirs
) {
1762 color_fprintf(s
->fp
, header_color
, LABEL(N_("ahead ")));
1763 color_fprintf(s
->fp
, branch_color_local
, "%d", num_ours
);
1765 color_fprintf(s
->fp
, header_color
, LABEL(N_("ahead ")));
1766 color_fprintf(s
->fp
, branch_color_local
, "%d", num_ours
);
1767 color_fprintf(s
->fp
, header_color
, ", %s", LABEL(N_("behind ")));
1768 color_fprintf(s
->fp
, branch_color_remote
, "%d", num_theirs
);
1771 color_fprintf(s
->fp
, header_color
, "]");
1773 fputc(s
->null_termination
? '\0' : '\n', s
->fp
);
1776 static void wt_shortstatus_print(struct wt_status
*s
)
1781 wt_shortstatus_print_tracking(s
);
1783 for (i
= 0; i
< s
->change
.nr
; i
++) {
1784 struct wt_status_change_data
*d
;
1785 struct string_list_item
*it
;
1787 it
= &(s
->change
.items
[i
]);
1790 wt_shortstatus_unmerged(it
, s
);
1792 wt_shortstatus_status(it
, s
);
1794 for (i
= 0; i
< s
->untracked
.nr
; i
++) {
1795 struct string_list_item
*it
;
1797 it
= &(s
->untracked
.items
[i
]);
1798 wt_shortstatus_other(it
, s
, "??");
1800 for (i
= 0; i
< s
->ignored
.nr
; i
++) {
1801 struct string_list_item
*it
;
1803 it
= &(s
->ignored
.items
[i
]);
1804 wt_shortstatus_other(it
, s
, "!!");
1808 static void wt_porcelain_print(struct wt_status
*s
)
1811 s
->relative_paths
= 0;
1814 wt_shortstatus_print(s
);
1818 * Print branch information for porcelain v2 output. These lines
1819 * are printed when the '--branch' parameter is given.
1821 * # branch.oid <commit><eol>
1822 * # branch.head <head><eol>
1823 * [# branch.upstream <upstream><eol>
1824 * [# branch.ab +<ahead> -<behind><eol>]]
1826 * <commit> ::= the current commit hash or the the literal
1827 * "(initial)" to indicate an initialized repo
1830 * <head> ::= <branch_name> the current branch name or
1831 * "(detached)" literal when detached head or
1832 * "(unknown)" when something is wrong.
1834 * <upstream> ::= the upstream branch name, when set.
1836 * <ahead> ::= integer ahead value, when upstream set
1837 * and the commit is present (not gone).
1839 * <behind> ::= integer behind value, when upstream set
1840 * and commit is present.
1843 * The end-of-line is defined by the -z flag.
1845 * <eol> ::= NUL when -z,
1849 static void wt_porcelain_v2_print_tracking(struct wt_status
*s
)
1851 struct branch
*branch
;
1853 const char *branch_name
;
1854 struct wt_status_state state
;
1855 int ab_info
, nr_ahead
, nr_behind
;
1856 char eol
= s
->null_termination
? '\0' : '\n';
1858 memset(&state
, 0, sizeof(state
));
1859 wt_status_get_state(&state
, s
->branch
&& !strcmp(s
->branch
, "HEAD"));
1861 fprintf(s
->fp
, "# branch.oid %s%c",
1862 (s
->is_initial
? "(initial)" : sha1_to_hex(s
->sha1_commit
)),
1866 fprintf(s
->fp
, "# branch.head %s%c", "(unknown)", eol
);
1868 if (!strcmp(s
->branch
, "HEAD")) {
1869 fprintf(s
->fp
, "# branch.head %s%c", "(detached)", eol
);
1871 if (state
.rebase_in_progress
|| state
.rebase_interactive_in_progress
)
1872 branch_name
= state
.onto
;
1873 else if (state
.detached_from
)
1874 branch_name
= state
.detached_from
;
1879 skip_prefix(s
->branch
, "refs/heads/", &branch_name
);
1881 fprintf(s
->fp
, "# branch.head %s%c", branch_name
, eol
);
1884 /* Lookup stats on the upstream tracking branch, if set. */
1885 branch
= branch_get(branch_name
);
1887 ab_info
= (stat_tracking_info(branch
, &nr_ahead
, &nr_behind
, &base
) == 0);
1889 base
= shorten_unambiguous_ref(base
, 0);
1890 fprintf(s
->fp
, "# branch.upstream %s%c", base
, eol
);
1894 fprintf(s
->fp
, "# branch.ab +%d -%d%c", nr_ahead
, nr_behind
, eol
);
1900 free(state
.detached_from
);
1904 * Convert various submodule status values into a
1905 * fixed-length string of characters in the buffer provided.
1907 static void wt_porcelain_v2_submodule_state(
1908 struct wt_status_change_data
*d
,
1911 if (S_ISGITLINK(d
->mode_head
) ||
1912 S_ISGITLINK(d
->mode_index
) ||
1913 S_ISGITLINK(d
->mode_worktree
)) {
1915 sub
[1] = d
->new_submodule_commits
? 'C' : '.';
1916 sub
[2] = (d
->dirty_submodule
& DIRTY_SUBMODULE_MODIFIED
) ? 'M' : '.';
1917 sub
[3] = (d
->dirty_submodule
& DIRTY_SUBMODULE_UNTRACKED
) ? 'U' : '.';
1928 * Fix-up changed entries before we print them.
1930 static void wt_porcelain_v2_fix_up_changed(
1931 struct string_list_item
*it
,
1932 struct wt_status
*s
)
1934 struct wt_status_change_data
*d
= it
->util
;
1936 if (!d
->index_status
) {
1938 * This entry is unchanged in the index (relative to the head).
1939 * Therefore, the collect_updated_cb was never called for this
1940 * entry (during the head-vs-index scan) and so the head column
1941 * fields were never set.
1943 * We must have data for the index column (from the
1944 * index-vs-worktree scan (otherwise, this entry should not be
1945 * in the list of changes)).
1947 * Copy index column fields to the head column, so that our
1948 * output looks complete.
1950 assert(d
->mode_head
== 0);
1951 d
->mode_head
= d
->mode_index
;
1952 oidcpy(&d
->oid_head
, &d
->oid_index
);
1955 if (!d
->worktree_status
) {
1957 * This entry is unchanged in the worktree (relative to the index).
1958 * Therefore, the collect_changed_cb was never called for this entry
1959 * (during the index-vs-worktree scan) and so the worktree column
1960 * fields were never set.
1962 * We must have data for the index column (from the head-vs-index
1965 * Copy the index column fields to the worktree column so that
1966 * our output looks complete.
1968 * Note that we only have a mode field in the worktree column
1969 * because the scan code tries really hard to not have to compute it.
1971 assert(d
->mode_worktree
== 0);
1972 d
->mode_worktree
= d
->mode_index
;
1977 * Print porcelain v2 info for tracked entries with changes.
1979 static void wt_porcelain_v2_print_changed_entry(
1980 struct string_list_item
*it
,
1981 struct wt_status
*s
)
1983 struct wt_status_change_data
*d
= it
->util
;
1984 struct strbuf buf_index
= STRBUF_INIT
;
1985 struct strbuf buf_head
= STRBUF_INIT
;
1986 const char *path_index
= NULL
;
1987 const char *path_head
= NULL
;
1989 char submodule_token
[5];
1990 char sep_char
, eol_char
;
1992 wt_porcelain_v2_fix_up_changed(it
, s
);
1993 wt_porcelain_v2_submodule_state(d
, submodule_token
);
1995 key
[0] = d
->index_status
? d
->index_status
: '.';
1996 key
[1] = d
->worktree_status
? d
->worktree_status
: '.';
1999 if (s
->null_termination
) {
2001 * In -z mode, we DO NOT C-quote pathnames. Current path is ALWAYS first.
2002 * A single NUL character separates them.
2006 path_index
= it
->string
;
2007 path_head
= d
->head_path
;
2010 * Path(s) are C-quoted if necessary. Current path is ALWAYS first.
2011 * The source path is only present when necessary.
2012 * A single TAB separates them (because paths can contain spaces
2013 * which are not escaped and C-quoting does escape TAB characters).
2017 path_index
= quote_path(it
->string
, s
->prefix
, &buf_index
);
2019 path_head
= quote_path(d
->head_path
, s
->prefix
, &buf_head
);
2023 fprintf(s
->fp
, "2 %s %s %06o %06o %06o %s %s %c%d %s%c%s%c",
2024 key
, submodule_token
,
2025 d
->mode_head
, d
->mode_index
, d
->mode_worktree
,
2026 oid_to_hex(&d
->oid_head
), oid_to_hex(&d
->oid_index
),
2028 path_index
, sep_char
, path_head
, eol_char
);
2030 fprintf(s
->fp
, "1 %s %s %06o %06o %06o %s %s %s%c",
2031 key
, submodule_token
,
2032 d
->mode_head
, d
->mode_index
, d
->mode_worktree
,
2033 oid_to_hex(&d
->oid_head
), oid_to_hex(&d
->oid_index
),
2034 path_index
, eol_char
);
2036 strbuf_release(&buf_index
);
2037 strbuf_release(&buf_head
);
2041 * Print porcelain v2 status info for unmerged entries.
2043 static void wt_porcelain_v2_print_unmerged_entry(
2044 struct string_list_item
*it
,
2045 struct wt_status
*s
)
2047 struct wt_status_change_data
*d
= it
->util
;
2048 const struct cache_entry
*ce
;
2049 struct strbuf buf_index
= STRBUF_INIT
;
2050 const char *path_index
= NULL
;
2051 int pos
, stage
, sum
;
2054 struct object_id oid
;
2057 char submodule_token
[5];
2058 char unmerged_prefix
= 'u';
2059 char eol_char
= s
->null_termination
? '\0' : '\n';
2061 wt_porcelain_v2_submodule_state(d
, submodule_token
);
2063 switch (d
->stagemask
) {
2064 case 1: key
= "DD"; break; /* both deleted */
2065 case 2: key
= "AU"; break; /* added by us */
2066 case 3: key
= "UD"; break; /* deleted by them */
2067 case 4: key
= "UA"; break; /* added by them */
2068 case 5: key
= "DU"; break; /* deleted by us */
2069 case 6: key
= "AA"; break; /* both added */
2070 case 7: key
= "UU"; break; /* both modified */
2072 die("BUG: unhandled unmerged status %x", d
->stagemask
);
2076 * Disregard d.aux.porcelain_v2 data that we accumulated
2077 * for the head and index columns during the scans and
2078 * replace with the actual stage data.
2080 * Note that this is a last-one-wins for each the individual
2081 * stage [123] columns in the event of multiple cache entries
2084 memset(stages
, 0, sizeof(stages
));
2086 pos
= cache_name_pos(it
->string
, strlen(it
->string
));
2089 while (pos
< active_nr
) {
2090 ce
= active_cache
[pos
++];
2091 stage
= ce_stage(ce
);
2092 if (strcmp(ce
->name
, it
->string
) || !stage
)
2094 stages
[stage
- 1].mode
= ce
->ce_mode
;
2095 hashcpy(stages
[stage
- 1].oid
.hash
, ce
->oid
.hash
);
2096 sum
|= (1 << (stage
- 1));
2098 if (sum
!= d
->stagemask
)
2099 die("BUG: observed stagemask 0x%x != expected stagemask 0x%x", sum
, d
->stagemask
);
2101 if (s
->null_termination
)
2102 path_index
= it
->string
;
2104 path_index
= quote_path(it
->string
, s
->prefix
, &buf_index
);
2106 fprintf(s
->fp
, "%c %s %s %06o %06o %06o %06o %s %s %s %s%c",
2107 unmerged_prefix
, key
, submodule_token
,
2108 stages
[0].mode
, /* stage 1 */
2109 stages
[1].mode
, /* stage 2 */
2110 stages
[2].mode
, /* stage 3 */
2112 oid_to_hex(&stages
[0].oid
), /* stage 1 */
2113 oid_to_hex(&stages
[1].oid
), /* stage 2 */
2114 oid_to_hex(&stages
[2].oid
), /* stage 3 */
2118 strbuf_release(&buf_index
);
2122 * Print porcelain V2 status info for untracked and ignored entries.
2124 static void wt_porcelain_v2_print_other(
2125 struct string_list_item
*it
,
2126 struct wt_status
*s
,
2129 struct strbuf buf
= STRBUF_INIT
;
2133 if (s
->null_termination
) {
2137 path
= quote_path(it
->string
, s
->prefix
, &buf
);
2141 fprintf(s
->fp
, "%c %s%c", prefix
, path
, eol_char
);
2143 strbuf_release(&buf
);
2147 * Print porcelain V2 status.
2150 * [<v2_changed_items>]*
2151 * [<v2_unmerged_items>]*
2152 * [<v2_untracked_items>]*
2153 * [<v2_ignored_items>]*
2156 static void wt_porcelain_v2_print(struct wt_status
*s
)
2158 struct wt_status_change_data
*d
;
2159 struct string_list_item
*it
;
2163 wt_porcelain_v2_print_tracking(s
);
2165 for (i
= 0; i
< s
->change
.nr
; i
++) {
2166 it
= &(s
->change
.items
[i
]);
2169 wt_porcelain_v2_print_changed_entry(it
, s
);
2172 for (i
= 0; i
< s
->change
.nr
; i
++) {
2173 it
= &(s
->change
.items
[i
]);
2176 wt_porcelain_v2_print_unmerged_entry(it
, s
);
2179 for (i
= 0; i
< s
->untracked
.nr
; i
++) {
2180 it
= &(s
->untracked
.items
[i
]);
2181 wt_porcelain_v2_print_other(it
, s
, '?');
2184 for (i
= 0; i
< s
->ignored
.nr
; i
++) {
2185 it
= &(s
->ignored
.items
[i
]);
2186 wt_porcelain_v2_print_other(it
, s
, '!');
2190 void wt_status_print(struct wt_status
*s
)
2192 switch (s
->status_format
) {
2193 case STATUS_FORMAT_SHORT
:
2194 wt_shortstatus_print(s
);
2196 case STATUS_FORMAT_PORCELAIN
:
2197 wt_porcelain_print(s
);
2199 case STATUS_FORMAT_PORCELAIN_V2
:
2200 wt_porcelain_v2_print(s
);
2202 case STATUS_FORMAT_UNSPECIFIED
:
2203 die("BUG: finalize_deferred_config() should have been called");
2205 case STATUS_FORMAT_NONE
:
2206 case STATUS_FORMAT_LONG
:
2207 wt_longstatus_print(s
);