10 #include "run-command.h"
14 #include "submodule.h"
20 #include "sequencer.h"
22 #define AB_DELAY_WARNING_IN_MS (2 * 1000)
24 static const char cut_line
[] =
25 "------------------------ >8 ------------------------\n";
27 static char default_wt_status_colors
[][COLOR_MAXLEN
] = {
28 GIT_COLOR_NORMAL
, /* WT_STATUS_HEADER */
29 GIT_COLOR_GREEN
, /* WT_STATUS_UPDATED */
30 GIT_COLOR_RED
, /* WT_STATUS_CHANGED */
31 GIT_COLOR_RED
, /* WT_STATUS_UNTRACKED */
32 GIT_COLOR_RED
, /* WT_STATUS_NOBRANCH */
33 GIT_COLOR_RED
, /* WT_STATUS_UNMERGED */
34 GIT_COLOR_GREEN
, /* WT_STATUS_LOCAL_BRANCH */
35 GIT_COLOR_RED
, /* WT_STATUS_REMOTE_BRANCH */
36 GIT_COLOR_NIL
, /* WT_STATUS_ONBRANCH */
39 static const char *color(int slot
, struct wt_status
*s
)
42 if (want_color(s
->use_color
))
43 c
= s
->color_palette
[slot
];
44 if (slot
== WT_STATUS_ONBRANCH
&& color_is_nil(c
))
45 c
= s
->color_palette
[WT_STATUS_HEADER
];
49 static void status_vprintf(struct wt_status
*s
, int at_bol
, const char *color
,
50 const char *fmt
, va_list ap
, const char *trail
)
52 struct strbuf sb
= STRBUF_INIT
;
53 struct strbuf linebuf
= STRBUF_INIT
;
54 const char *line
, *eol
;
56 strbuf_vaddf(&sb
, fmt
, ap
);
58 if (s
->display_comment_prefix
) {
59 strbuf_addch(&sb
, comment_line_char
);
61 strbuf_addch(&sb
, ' ');
63 color_print_strbuf(s
->fp
, color
, &sb
);
65 fprintf(s
->fp
, "%s", trail
);
69 for (line
= sb
.buf
; *line
; line
= eol
+ 1) {
70 eol
= strchr(line
, '\n');
72 strbuf_reset(&linebuf
);
73 if (at_bol
&& s
->display_comment_prefix
) {
74 strbuf_addch(&linebuf
, comment_line_char
);
75 if (*line
!= '\n' && *line
!= '\t')
76 strbuf_addch(&linebuf
, ' ');
79 strbuf_add(&linebuf
, line
, eol
- line
);
81 strbuf_addstr(&linebuf
, line
);
82 color_print_strbuf(s
->fp
, color
, &linebuf
);
90 fprintf(s
->fp
, "%s", trail
);
91 strbuf_release(&linebuf
);
95 void status_printf_ln(struct wt_status
*s
, const char *color
,
101 status_vprintf(s
, 1, color
, fmt
, ap
, "\n");
105 void status_printf(struct wt_status
*s
, const char *color
,
106 const char *fmt
, ...)
111 status_vprintf(s
, 1, color
, fmt
, ap
, NULL
);
115 static void status_printf_more(struct wt_status
*s
, const char *color
,
116 const char *fmt
, ...)
121 status_vprintf(s
, 0, color
, fmt
, ap
, NULL
);
125 void wt_status_prepare(struct repository
*r
, struct wt_status
*s
)
127 memset(s
, 0, sizeof(*s
));
129 memcpy(s
->color_palette
, default_wt_status_colors
,
130 sizeof(default_wt_status_colors
));
131 s
->show_untracked_files
= SHOW_NORMAL_UNTRACKED_FILES
;
133 s
->relative_paths
= 1;
134 s
->branch
= resolve_refdup("HEAD", 0, NULL
, NULL
);
135 s
->reference
= "HEAD";
137 s
->index_file
= get_index_file();
138 s
->change
.strdup_strings
= 1;
139 s
->untracked
.strdup_strings
= 1;
140 s
->ignored
.strdup_strings
= 1;
141 s
->show_branch
= -1; /* unspecified */
143 s
->ahead_behind_flags
= AHEAD_BEHIND_UNSPECIFIED
;
144 s
->display_comment_prefix
= 0;
145 s
->detect_rename
= -1;
146 s
->rename_score
= -1;
147 s
->rename_limit
= -1;
150 static void wt_longstatus_print_unmerged_header(struct wt_status
*s
)
153 int del_mod_conflict
= 0;
154 int both_deleted
= 0;
156 const char *c
= color(WT_STATUS_HEADER
, s
);
158 status_printf_ln(s
, c
, _("Unmerged paths:"));
160 for (i
= 0; i
< s
->change
.nr
; i
++) {
161 struct string_list_item
*it
= &(s
->change
.items
[i
]);
162 struct wt_status_change_data
*d
= it
->util
;
164 switch (d
->stagemask
) {
172 del_mod_conflict
= 1;
182 if (s
->whence
!= FROM_COMMIT
)
184 else if (!s
->is_initial
) {
185 if (!strcmp(s
->reference
, "HEAD"))
186 status_printf_ln(s
, c
,
187 _(" (use \"git restore --staged <file>...\" to unstage)"));
189 status_printf_ln(s
, c
,
190 _(" (use \"git restore --source=%s --staged <file>...\" to unstage)"),
193 status_printf_ln(s
, c
, _(" (use \"git rm --cached <file>...\" to unstage)"));
196 if (!del_mod_conflict
)
197 status_printf_ln(s
, c
, _(" (use \"git add <file>...\" to mark resolution)"));
199 status_printf_ln(s
, c
, _(" (use \"git add/rm <file>...\" as appropriate to mark resolution)"));
200 } else if (!del_mod_conflict
&& !not_deleted
) {
201 status_printf_ln(s
, c
, _(" (use \"git rm <file>...\" to mark resolution)"));
203 status_printf_ln(s
, c
, _(" (use \"git add/rm <file>...\" as appropriate to mark resolution)"));
207 static void wt_longstatus_print_cached_header(struct wt_status
*s
)
209 const char *c
= color(WT_STATUS_HEADER
, s
);
211 status_printf_ln(s
, c
, _("Changes to be committed:"));
214 if (s
->whence
!= FROM_COMMIT
)
215 ; /* NEEDSWORK: use "git reset --unresolve"??? */
216 else if (!s
->is_initial
) {
217 if (!strcmp(s
->reference
, "HEAD"))
218 status_printf_ln(s
, c
219 , _(" (use \"git restore --staged <file>...\" to unstage)"));
221 status_printf_ln(s
, c
,
222 _(" (use \"git restore --source=%s --staged <file>...\" to unstage)"),
225 status_printf_ln(s
, c
, _(" (use \"git rm --cached <file>...\" to unstage)"));
228 static void wt_longstatus_print_dirty_header(struct wt_status
*s
,
230 int has_dirty_submodules
)
232 const char *c
= color(WT_STATUS_HEADER
, s
);
234 status_printf_ln(s
, c
, _("Changes not staged for commit:"));
238 status_printf_ln(s
, c
, _(" (use \"git add <file>...\" to update what will be committed)"));
240 status_printf_ln(s
, c
, _(" (use \"git add/rm <file>...\" to update what will be committed)"));
241 status_printf_ln(s
, c
, _(" (use \"git restore <file>...\" to discard changes in working directory)"));
242 if (has_dirty_submodules
)
243 status_printf_ln(s
, c
, _(" (commit or discard the untracked or modified content in submodules)"));
246 static void wt_longstatus_print_other_header(struct wt_status
*s
,
250 const char *c
= color(WT_STATUS_HEADER
, s
);
251 status_printf_ln(s
, c
, "%s:", what
);
254 status_printf_ln(s
, c
, _(" (use \"git %s <file>...\" to include in what will be committed)"), how
);
257 static void wt_longstatus_print_trailer(struct wt_status
*s
)
259 status_printf_ln(s
, color(WT_STATUS_HEADER
, s
), "%s", "");
262 static const char *wt_status_unmerged_status_string(int stagemask
)
266 return _("both deleted:");
268 return _("added by us:");
270 return _("deleted by them:");
272 return _("added by them:");
274 return _("deleted by us:");
276 return _("both added:");
278 return _("both modified:");
280 BUG("unhandled unmerged status %x", stagemask
);
284 static const char *wt_status_diff_status_string(int status
)
287 case DIFF_STATUS_ADDED
:
288 return _("new file:");
289 case DIFF_STATUS_COPIED
:
291 case DIFF_STATUS_DELETED
:
292 return _("deleted:");
293 case DIFF_STATUS_MODIFIED
:
294 return _("modified:");
295 case DIFF_STATUS_RENAMED
:
296 return _("renamed:");
297 case DIFF_STATUS_TYPE_CHANGED
:
298 return _("typechange:");
299 case DIFF_STATUS_UNKNOWN
:
300 return _("unknown:");
301 case DIFF_STATUS_UNMERGED
:
302 return _("unmerged:");
308 static int maxwidth(const char *(*label
)(int), int minval
, int maxval
)
312 for (i
= minval
; i
<= maxval
; i
++) {
313 const char *s
= label(i
);
314 int len
= s
? utf8_strwidth(s
) : 0;
321 static void wt_longstatus_print_unmerged_data(struct wt_status
*s
,
322 struct string_list_item
*it
)
324 const char *c
= color(WT_STATUS_UNMERGED
, s
);
325 struct wt_status_change_data
*d
= it
->util
;
326 struct strbuf onebuf
= STRBUF_INIT
;
327 static char *padding
;
328 static int label_width
;
329 const char *one
, *how
;
333 label_width
= maxwidth(wt_status_unmerged_status_string
, 1, 7);
334 label_width
+= strlen(" ");
335 padding
= xmallocz(label_width
);
336 memset(padding
, ' ', label_width
);
339 one
= quote_path(it
->string
, s
->prefix
, &onebuf
, 0);
340 status_printf(s
, color(WT_STATUS_HEADER
, s
), "\t");
342 how
= wt_status_unmerged_status_string(d
->stagemask
);
343 len
= label_width
- utf8_strwidth(how
);
344 status_printf_more(s
, c
, "%s%.*s%s\n", how
, len
, padding
, one
);
345 strbuf_release(&onebuf
);
348 static void wt_longstatus_print_change_data(struct wt_status
*s
,
350 struct string_list_item
*it
)
352 struct wt_status_change_data
*d
= it
->util
;
353 const char *c
= color(change_type
, s
);
357 const char *one
, *two
;
358 struct strbuf onebuf
= STRBUF_INIT
, twobuf
= STRBUF_INIT
;
359 struct strbuf extra
= STRBUF_INIT
;
360 static char *padding
;
361 static int label_width
;
366 /* If DIFF_STATUS_* uses outside the range [A..Z], we're in trouble */
367 label_width
= maxwidth(wt_status_diff_status_string
, 'A', 'Z');
368 label_width
+= strlen(" ");
369 padding
= xmallocz(label_width
);
370 memset(padding
, ' ', label_width
);
373 one_name
= two_name
= it
->string
;
374 switch (change_type
) {
375 case WT_STATUS_UPDATED
:
376 status
= d
->index_status
;
378 case WT_STATUS_CHANGED
:
379 if (d
->new_submodule_commits
|| d
->dirty_submodule
) {
380 strbuf_addstr(&extra
, " (");
381 if (d
->new_submodule_commits
)
382 strbuf_addstr(&extra
, _("new commits, "));
383 if (d
->dirty_submodule
& DIRTY_SUBMODULE_MODIFIED
)
384 strbuf_addstr(&extra
, _("modified content, "));
385 if (d
->dirty_submodule
& DIRTY_SUBMODULE_UNTRACKED
)
386 strbuf_addstr(&extra
, _("untracked content, "));
387 strbuf_setlen(&extra
, extra
.len
- 2);
388 strbuf_addch(&extra
, ')');
390 status
= d
->worktree_status
;
393 BUG("unhandled change_type %d in wt_longstatus_print_change_data",
398 * Only pick up the rename it's relevant. If the rename is for
399 * the changed section and we're printing the updated section,
402 if (d
->rename_status
== status
)
403 one_name
= d
->rename_source
;
405 one
= quote_path(one_name
, s
->prefix
, &onebuf
, 0);
406 two
= quote_path(two_name
, s
->prefix
, &twobuf
, 0);
408 status_printf(s
, color(WT_STATUS_HEADER
, s
), "\t");
409 what
= wt_status_diff_status_string(status
);
411 BUG("unhandled diff status %c", status
);
412 len
= label_width
- utf8_strwidth(what
);
414 if (one_name
!= two_name
)
415 status_printf_more(s
, c
, "%s%.*s%s -> %s",
416 what
, len
, padding
, one
, two
);
418 status_printf_more(s
, c
, "%s%.*s%s",
419 what
, len
, padding
, one
);
421 status_printf_more(s
, color(WT_STATUS_HEADER
, s
), "%s", extra
.buf
);
422 strbuf_release(&extra
);
424 status_printf_more(s
, GIT_COLOR_NORMAL
, "\n");
425 strbuf_release(&onebuf
);
426 strbuf_release(&twobuf
);
429 static char short_submodule_status(struct wt_status_change_data
*d
)
431 if (d
->new_submodule_commits
)
433 if (d
->dirty_submodule
& DIRTY_SUBMODULE_MODIFIED
)
435 if (d
->dirty_submodule
& DIRTY_SUBMODULE_UNTRACKED
)
437 return d
->worktree_status
;
440 static void wt_status_collect_changed_cb(struct diff_queue_struct
*q
,
441 struct diff_options
*options
,
444 struct wt_status
*s
= data
;
449 s
->workdir_dirty
= 1;
450 for (i
= 0; i
< q
->nr
; i
++) {
451 struct diff_filepair
*p
;
452 struct string_list_item
*it
;
453 struct wt_status_change_data
*d
;
456 it
= string_list_insert(&s
->change
, p
->two
->path
);
462 if (!d
->worktree_status
)
463 d
->worktree_status
= p
->status
;
464 if (S_ISGITLINK(p
->two
->mode
)) {
465 d
->dirty_submodule
= p
->two
->dirty_submodule
;
466 d
->new_submodule_commits
= !oideq(&p
->one
->oid
,
468 if (s
->status_format
== STATUS_FORMAT_SHORT
)
469 d
->worktree_status
= short_submodule_status(d
);
473 case DIFF_STATUS_ADDED
:
474 d
->mode_worktree
= p
->two
->mode
;
477 case DIFF_STATUS_DELETED
:
478 d
->mode_index
= p
->one
->mode
;
479 oidcpy(&d
->oid_index
, &p
->one
->oid
);
480 /* mode_worktree is zero for a delete. */
483 case DIFF_STATUS_COPIED
:
484 case DIFF_STATUS_RENAMED
:
485 if (d
->rename_status
)
486 BUG("multiple renames on the same target? how?");
487 d
->rename_source
= xstrdup(p
->one
->path
);
488 d
->rename_score
= p
->score
* 100 / MAX_SCORE
;
489 d
->rename_status
= p
->status
;
491 case DIFF_STATUS_MODIFIED
:
492 case DIFF_STATUS_TYPE_CHANGED
:
493 case DIFF_STATUS_UNMERGED
:
494 d
->mode_index
= p
->one
->mode
;
495 d
->mode_worktree
= p
->two
->mode
;
496 oidcpy(&d
->oid_index
, &p
->one
->oid
);
500 BUG("unhandled diff-files status '%c'", p
->status
);
507 static int unmerged_mask(struct index_state
*istate
, const char *path
)
510 const struct cache_entry
*ce
;
512 pos
= index_name_pos(istate
, path
, strlen(path
));
518 while (pos
< istate
->cache_nr
) {
519 ce
= istate
->cache
[pos
++];
520 if (strcmp(ce
->name
, path
) || !ce_stage(ce
))
522 mask
|= (1 << (ce_stage(ce
) - 1));
527 static void wt_status_collect_updated_cb(struct diff_queue_struct
*q
,
528 struct diff_options
*options
,
531 struct wt_status
*s
= data
;
534 for (i
= 0; i
< q
->nr
; i
++) {
535 struct diff_filepair
*p
;
536 struct string_list_item
*it
;
537 struct wt_status_change_data
*d
;
540 it
= string_list_insert(&s
->change
, p
->two
->path
);
546 if (!d
->index_status
)
547 d
->index_status
= p
->status
;
549 case DIFF_STATUS_ADDED
:
550 /* Leave {mode,oid}_head zero for an add. */
551 d
->mode_index
= p
->two
->mode
;
552 oidcpy(&d
->oid_index
, &p
->two
->oid
);
555 case DIFF_STATUS_DELETED
:
556 d
->mode_head
= p
->one
->mode
;
557 oidcpy(&d
->oid_head
, &p
->one
->oid
);
559 /* Leave {mode,oid}_index zero for a delete. */
562 case DIFF_STATUS_COPIED
:
563 case DIFF_STATUS_RENAMED
:
564 if (d
->rename_status
)
565 BUG("multiple renames on the same target? how?");
566 d
->rename_source
= xstrdup(p
->one
->path
);
567 d
->rename_score
= p
->score
* 100 / MAX_SCORE
;
568 d
->rename_status
= p
->status
;
570 case DIFF_STATUS_MODIFIED
:
571 case DIFF_STATUS_TYPE_CHANGED
:
572 d
->mode_head
= p
->one
->mode
;
573 d
->mode_index
= p
->two
->mode
;
574 oidcpy(&d
->oid_head
, &p
->one
->oid
);
575 oidcpy(&d
->oid_index
, &p
->two
->oid
);
578 case DIFF_STATUS_UNMERGED
:
579 d
->stagemask
= unmerged_mask(s
->repo
->index
,
582 * Don't bother setting {mode,oid}_{head,index} since the print
583 * code will output the stage values directly and not use the
584 * values in these fields.
589 BUG("unhandled diff-index status '%c'", p
->status
);
595 static void wt_status_collect_changes_worktree(struct wt_status
*s
)
599 repo_init_revisions(s
->repo
, &rev
, NULL
);
600 setup_revisions(0, NULL
, &rev
, NULL
);
601 rev
.diffopt
.output_format
|= DIFF_FORMAT_CALLBACK
;
602 rev
.diffopt
.flags
.dirty_submodules
= 1;
603 rev
.diffopt
.ita_invisible_in_index
= 1;
604 if (!s
->show_untracked_files
)
605 rev
.diffopt
.flags
.ignore_untracked_in_submodules
= 1;
606 if (s
->ignore_submodule_arg
) {
607 rev
.diffopt
.flags
.override_submodule_config
= 1;
608 handle_ignore_submodules_arg(&rev
.diffopt
, s
->ignore_submodule_arg
);
609 } else if (!rev
.diffopt
.flags
.ignore_submodule_set
&&
610 s
->show_untracked_files
!= SHOW_NO_UNTRACKED_FILES
)
611 handle_ignore_submodules_arg(&rev
.diffopt
, "none");
612 rev
.diffopt
.format_callback
= wt_status_collect_changed_cb
;
613 rev
.diffopt
.format_callback_data
= s
;
614 rev
.diffopt
.detect_rename
= s
->detect_rename
>= 0 ? s
->detect_rename
: rev
.diffopt
.detect_rename
;
615 rev
.diffopt
.rename_limit
= s
->rename_limit
>= 0 ? s
->rename_limit
: rev
.diffopt
.rename_limit
;
616 rev
.diffopt
.rename_score
= s
->rename_score
>= 0 ? s
->rename_score
: rev
.diffopt
.rename_score
;
617 copy_pathspec(&rev
.prune_data
, &s
->pathspec
);
618 run_diff_files(&rev
, 0);
619 clear_pathspec(&rev
.prune_data
);
622 static void wt_status_collect_changes_index(struct wt_status
*s
)
625 struct setup_revision_opt opt
;
627 repo_init_revisions(s
->repo
, &rev
, NULL
);
628 memset(&opt
, 0, sizeof(opt
));
629 opt
.def
= s
->is_initial
? empty_tree_oid_hex() : s
->reference
;
630 setup_revisions(0, NULL
, &rev
, &opt
);
632 rev
.diffopt
.flags
.override_submodule_config
= 1;
633 rev
.diffopt
.ita_invisible_in_index
= 1;
634 if (s
->ignore_submodule_arg
) {
635 handle_ignore_submodules_arg(&rev
.diffopt
, s
->ignore_submodule_arg
);
638 * Unless the user did explicitly request a submodule ignore
639 * mode by passing a command line option we do not ignore any
640 * changed submodule SHA-1s when comparing index and HEAD, no
641 * matter what is configured. Otherwise the user won't be
642 * shown any submodules manually added (and which are
643 * staged to be committed), which would be really confusing.
645 handle_ignore_submodules_arg(&rev
.diffopt
, "dirty");
648 rev
.diffopt
.output_format
|= DIFF_FORMAT_CALLBACK
;
649 rev
.diffopt
.format_callback
= wt_status_collect_updated_cb
;
650 rev
.diffopt
.format_callback_data
= s
;
651 rev
.diffopt
.detect_rename
= s
->detect_rename
>= 0 ? s
->detect_rename
: rev
.diffopt
.detect_rename
;
652 rev
.diffopt
.rename_limit
= s
->rename_limit
>= 0 ? s
->rename_limit
: rev
.diffopt
.rename_limit
;
653 rev
.diffopt
.rename_score
= s
->rename_score
>= 0 ? s
->rename_score
: rev
.diffopt
.rename_score
;
656 * The `recursive` option must be enabled to allow the diff to recurse
657 * into subdirectories of sparse directory index entries. If it is not
658 * enabled, a subdirectory containing file(s) with changes is reported
659 * as "modified", rather than the modified files themselves.
661 rev
.diffopt
.flags
.recursive
= 1;
663 copy_pathspec(&rev
.prune_data
, &s
->pathspec
);
664 run_diff_index(&rev
, 1);
665 object_array_clear(&rev
.pending
);
666 clear_pathspec(&rev
.prune_data
);
669 static int add_file_to_list(const struct object_id
*oid
,
670 struct strbuf
*base
, const char *path
,
671 unsigned int mode
, void *context
)
673 struct string_list_item
*it
;
674 struct wt_status_change_data
*d
;
675 struct wt_status
*s
= context
;
676 struct strbuf full_name
= STRBUF_INIT
;
679 return READ_TREE_RECURSIVE
;
681 strbuf_add(&full_name
, base
->buf
, base
->len
);
682 strbuf_addstr(&full_name
, path
);
683 it
= string_list_insert(&s
->change
, full_name
.buf
);
690 d
->index_status
= DIFF_STATUS_ADDED
;
691 /* Leave {mode,oid}_head zero for adds. */
692 d
->mode_index
= mode
;
693 oidcpy(&d
->oid_index
, oid
);
695 strbuf_release(&full_name
);
699 static void wt_status_collect_changes_initial(struct wt_status
*s
)
701 struct index_state
*istate
= s
->repo
->index
;
704 for (i
= 0; i
< istate
->cache_nr
; i
++) {
705 struct string_list_item
*it
;
706 struct wt_status_change_data
*d
;
707 const struct cache_entry
*ce
= istate
->cache
[i
];
709 if (!ce_path_match(istate
, ce
, &s
->pathspec
, NULL
))
711 if (ce_intent_to_add(ce
))
713 if (S_ISSPARSEDIR(ce
->ce_mode
)) {
715 * This is a sparse directory entry, so we want to collect all
716 * of the added files within the tree. This requires recursively
717 * expanding the trees to find the elements that are new in this
718 * tree and marking them with DIFF_STATUS_ADDED.
720 struct strbuf base
= STRBUF_INIT
;
721 struct pathspec ps
= { 0 };
722 struct tree
*tree
= lookup_tree(istate
->repo
, &ce
->oid
);
728 strbuf_add(&base
, ce
->name
, ce
->ce_namelen
);
729 read_tree_at(istate
->repo
, tree
, &base
, &ps
,
730 add_file_to_list
, s
);
734 it
= string_list_insert(&s
->change
, ce
->name
);
741 d
->index_status
= DIFF_STATUS_UNMERGED
;
742 d
->stagemask
|= (1 << (ce_stage(ce
) - 1));
744 * Don't bother setting {mode,oid}_{head,index} since the print
745 * code will output the stage values directly and not use the
746 * values in these fields.
750 d
->index_status
= DIFF_STATUS_ADDED
;
751 /* Leave {mode,oid}_head zero for adds. */
752 d
->mode_index
= ce
->ce_mode
;
753 oidcpy(&d
->oid_index
, &ce
->oid
);
759 static void wt_status_collect_untracked(struct wt_status
*s
)
762 struct dir_struct dir
= DIR_INIT
;
763 uint64_t t_begin
= getnanotime();
764 struct index_state
*istate
= s
->repo
->index
;
766 if (!s
->show_untracked_files
)
769 if (s
->show_untracked_files
!= SHOW_ALL_UNTRACKED_FILES
)
771 DIR_SHOW_OTHER_DIRECTORIES
| DIR_HIDE_EMPTY_DIRECTORIES
;
772 if (s
->show_ignored_mode
) {
773 dir
.flags
|= DIR_SHOW_IGNORED_TOO
;
775 if (s
->show_ignored_mode
== SHOW_MATCHING_IGNORED
)
776 dir
.flags
|= DIR_SHOW_IGNORED_TOO_MODE_MATCHING
;
778 dir
.untracked
= istate
->untracked
;
781 setup_standard_excludes(&dir
);
783 fill_directory(&dir
, istate
, &s
->pathspec
);
785 for (i
= 0; i
< dir
.nr
; i
++) {
786 struct dir_entry
*ent
= dir
.entries
[i
];
787 if (index_name_is_other(istate
, ent
->name
, ent
->len
))
788 string_list_insert(&s
->untracked
, ent
->name
);
791 for (i
= 0; i
< dir
.ignored_nr
; i
++) {
792 struct dir_entry
*ent
= dir
.ignored
[i
];
793 if (index_name_is_other(istate
, ent
->name
, ent
->len
))
794 string_list_insert(&s
->ignored
, ent
->name
);
799 if (advice_enabled(ADVICE_STATUS_U_OPTION
))
800 s
->untracked_in_ms
= (getnanotime() - t_begin
) / 1000000;
803 static int has_unmerged(struct wt_status
*s
)
807 for (i
= 0; i
< s
->change
.nr
; i
++) {
808 struct wt_status_change_data
*d
;
809 d
= s
->change
.items
[i
].util
;
816 void wt_status_collect(struct wt_status
*s
)
818 trace2_region_enter("status", "worktrees", s
->repo
);
819 wt_status_collect_changes_worktree(s
);
820 trace2_region_leave("status", "worktrees", s
->repo
);
823 trace2_region_enter("status", "initial", s
->repo
);
824 wt_status_collect_changes_initial(s
);
825 trace2_region_leave("status", "initial", s
->repo
);
827 trace2_region_enter("status", "index", s
->repo
);
828 wt_status_collect_changes_index(s
);
829 trace2_region_leave("status", "index", s
->repo
);
832 trace2_region_enter("status", "untracked", s
->repo
);
833 wt_status_collect_untracked(s
);
834 trace2_region_leave("status", "untracked", s
->repo
);
836 wt_status_get_state(s
->repo
, &s
->state
, s
->branch
&& !strcmp(s
->branch
, "HEAD"));
837 if (s
->state
.merge_in_progress
&& !has_unmerged(s
))
841 void wt_status_collect_free_buffers(struct wt_status
*s
)
843 wt_status_state_free_buffers(&s
->state
);
846 void wt_status_state_free_buffers(struct wt_status_state
*state
)
848 FREE_AND_NULL(state
->branch
);
849 FREE_AND_NULL(state
->onto
);
850 FREE_AND_NULL(state
->detached_from
);
853 static void wt_longstatus_print_unmerged(struct wt_status
*s
)
855 int shown_header
= 0;
858 for (i
= 0; i
< s
->change
.nr
; i
++) {
859 struct wt_status_change_data
*d
;
860 struct string_list_item
*it
;
861 it
= &(s
->change
.items
[i
]);
866 wt_longstatus_print_unmerged_header(s
);
869 wt_longstatus_print_unmerged_data(s
, it
);
872 wt_longstatus_print_trailer(s
);
876 static void wt_longstatus_print_updated(struct wt_status
*s
)
878 int shown_header
= 0;
881 for (i
= 0; i
< s
->change
.nr
; i
++) {
882 struct wt_status_change_data
*d
;
883 struct string_list_item
*it
;
884 it
= &(s
->change
.items
[i
]);
886 if (!d
->index_status
||
887 d
->index_status
== DIFF_STATUS_UNMERGED
)
890 wt_longstatus_print_cached_header(s
);
893 wt_longstatus_print_change_data(s
, WT_STATUS_UPDATED
, it
);
896 wt_longstatus_print_trailer(s
);
902 * 1 : some change but no delete
904 static int wt_status_check_worktree_changes(struct wt_status
*s
,
905 int *dirty_submodules
)
910 *dirty_submodules
= 0;
912 for (i
= 0; i
< s
->change
.nr
; i
++) {
913 struct wt_status_change_data
*d
;
914 d
= s
->change
.items
[i
].util
;
915 if (!d
->worktree_status
||
916 d
->worktree_status
== DIFF_STATUS_UNMERGED
)
920 if (d
->dirty_submodule
)
921 *dirty_submodules
= 1;
922 if (d
->worktree_status
== DIFF_STATUS_DELETED
)
928 static void wt_longstatus_print_changed(struct wt_status
*s
)
930 int i
, dirty_submodules
;
931 int worktree_changes
= wt_status_check_worktree_changes(s
, &dirty_submodules
);
933 if (!worktree_changes
)
936 wt_longstatus_print_dirty_header(s
, worktree_changes
< 0, dirty_submodules
);
938 for (i
= 0; i
< s
->change
.nr
; i
++) {
939 struct wt_status_change_data
*d
;
940 struct string_list_item
*it
;
941 it
= &(s
->change
.items
[i
]);
943 if (!d
->worktree_status
||
944 d
->worktree_status
== DIFF_STATUS_UNMERGED
)
946 wt_longstatus_print_change_data(s
, WT_STATUS_CHANGED
, it
);
948 wt_longstatus_print_trailer(s
);
951 static int stash_count_refs(struct object_id
*ooid
, struct object_id
*noid
,
952 const char *email
, timestamp_t timestamp
, int tz
,
953 const char *message
, void *cb_data
)
960 static int count_stash_entries(void)
963 for_each_reflog_ent("refs/stash", stash_count_refs
, &n
);
967 static void wt_longstatus_print_stash_summary(struct wt_status
*s
)
969 int stash_count
= count_stash_entries();
972 status_printf_ln(s
, GIT_COLOR_NORMAL
,
973 Q_("Your stash currently has %d entry",
974 "Your stash currently has %d entries", stash_count
),
978 static void wt_longstatus_print_submodule_summary(struct wt_status
*s
, int uncommitted
)
980 struct child_process sm_summary
= CHILD_PROCESS_INIT
;
981 struct strbuf cmd_stdout
= STRBUF_INIT
;
982 struct strbuf summary
= STRBUF_INIT
;
983 char *summary_content
;
985 strvec_pushf(&sm_summary
.env_array
, "GIT_INDEX_FILE=%s", s
->index_file
);
987 strvec_push(&sm_summary
.args
, "submodule");
988 strvec_push(&sm_summary
.args
, "summary");
989 strvec_push(&sm_summary
.args
, uncommitted
? "--files" : "--cached");
990 strvec_push(&sm_summary
.args
, "--for-status");
991 strvec_push(&sm_summary
.args
, "--summary-limit");
992 strvec_pushf(&sm_summary
.args
, "%d", s
->submodule_summary
);
994 strvec_push(&sm_summary
.args
, s
->amend
? "HEAD^" : "HEAD");
996 sm_summary
.git_cmd
= 1;
997 sm_summary
.no_stdin
= 1;
999 capture_command(&sm_summary
, &cmd_stdout
, 1024);
1001 /* prepend header, only if there's an actual output */
1002 if (cmd_stdout
.len
) {
1004 strbuf_addstr(&summary
, _("Submodules changed but not updated:"));
1006 strbuf_addstr(&summary
, _("Submodule changes to be committed:"));
1007 strbuf_addstr(&summary
, "\n\n");
1009 strbuf_addbuf(&summary
, &cmd_stdout
);
1010 strbuf_release(&cmd_stdout
);
1012 if (s
->display_comment_prefix
) {
1014 summary_content
= strbuf_detach(&summary
, &len
);
1015 strbuf_add_commented_lines(&summary
, summary_content
, len
);
1016 free(summary_content
);
1019 fputs(summary
.buf
, s
->fp
);
1020 strbuf_release(&summary
);
1023 static void wt_longstatus_print_other(struct wt_status
*s
,
1024 struct string_list
*l
,
1029 struct strbuf buf
= STRBUF_INIT
;
1030 static struct string_list output
= STRING_LIST_INIT_DUP
;
1031 struct column_options copts
;
1036 wt_longstatus_print_other_header(s
, what
, how
);
1038 for (i
= 0; i
< l
->nr
; i
++) {
1039 struct string_list_item
*it
;
1041 it
= &(l
->items
[i
]);
1042 path
= quote_path(it
->string
, s
->prefix
, &buf
, 0);
1043 if (column_active(s
->colopts
)) {
1044 string_list_append(&output
, path
);
1047 status_printf(s
, color(WT_STATUS_HEADER
, s
), "\t");
1048 status_printf_more(s
, color(WT_STATUS_UNTRACKED
, s
),
1052 strbuf_release(&buf
);
1053 if (!column_active(s
->colopts
))
1056 strbuf_addf(&buf
, "%s%s\t%s",
1057 color(WT_STATUS_HEADER
, s
),
1058 s
->display_comment_prefix
? "#" : "",
1059 color(WT_STATUS_UNTRACKED
, s
));
1060 memset(&copts
, 0, sizeof(copts
));
1062 copts
.indent
= buf
.buf
;
1063 if (want_color(s
->use_color
))
1064 copts
.nl
= GIT_COLOR_RESET
"\n";
1065 print_columns(&output
, s
->colopts
, &copts
);
1066 string_list_clear(&output
, 0);
1067 strbuf_release(&buf
);
1069 status_printf_ln(s
, GIT_COLOR_NORMAL
, "%s", "");
1072 size_t wt_status_locate_end(const char *s
, size_t len
)
1075 struct strbuf pattern
= STRBUF_INIT
;
1077 strbuf_addf(&pattern
, "\n%c %s", comment_line_char
, cut_line
);
1078 if (starts_with(s
, pattern
.buf
+ 1))
1080 else if ((p
= strstr(s
, pattern
.buf
)))
1082 strbuf_release(&pattern
);
1086 void wt_status_append_cut_line(struct strbuf
*buf
)
1088 const char *explanation
= _("Do not modify or remove the line above.\nEverything below it will be ignored.");
1090 strbuf_commented_addf(buf
, "%s", cut_line
);
1091 strbuf_add_commented_lines(buf
, explanation
, strlen(explanation
));
1094 void wt_status_add_cut_line(FILE *fp
)
1096 struct strbuf buf
= STRBUF_INIT
;
1098 wt_status_append_cut_line(&buf
);
1100 strbuf_release(&buf
);
1103 static void wt_longstatus_print_verbose(struct wt_status
*s
)
1105 struct rev_info rev
;
1106 struct setup_revision_opt opt
;
1107 int dirty_submodules
;
1108 const char *c
= color(WT_STATUS_HEADER
, s
);
1110 repo_init_revisions(s
->repo
, &rev
, NULL
);
1111 rev
.diffopt
.flags
.allow_textconv
= 1;
1112 rev
.diffopt
.ita_invisible_in_index
= 1;
1114 memset(&opt
, 0, sizeof(opt
));
1115 opt
.def
= s
->is_initial
? empty_tree_oid_hex() : s
->reference
;
1116 setup_revisions(0, NULL
, &rev
, &opt
);
1118 rev
.diffopt
.output_format
|= DIFF_FORMAT_PATCH
;
1119 rev
.diffopt
.detect_rename
= s
->detect_rename
>= 0 ? s
->detect_rename
: rev
.diffopt
.detect_rename
;
1120 rev
.diffopt
.rename_limit
= s
->rename_limit
>= 0 ? s
->rename_limit
: rev
.diffopt
.rename_limit
;
1121 rev
.diffopt
.rename_score
= s
->rename_score
>= 0 ? s
->rename_score
: rev
.diffopt
.rename_score
;
1122 rev
.diffopt
.file
= s
->fp
;
1123 rev
.diffopt
.close_file
= 0;
1125 * If we're not going to stdout, then we definitely don't
1126 * want color, since we are going to the commit message
1127 * file (and even the "auto" setting won't work, since it
1128 * will have checked isatty on stdout). But we then do want
1129 * to insert the scissor line here to reliably remove the
1130 * diff before committing.
1132 if (s
->fp
!= stdout
) {
1133 rev
.diffopt
.use_color
= 0;
1134 wt_status_add_cut_line(s
->fp
);
1136 if (s
->verbose
> 1 && s
->committable
) {
1137 /* print_updated() printed a header, so do we */
1138 if (s
->fp
!= stdout
)
1139 wt_longstatus_print_trailer(s
);
1140 status_printf_ln(s
, c
, _("Changes to be committed:"));
1141 rev
.diffopt
.a_prefix
= "c/";
1142 rev
.diffopt
.b_prefix
= "i/";
1143 } /* else use prefix as per user config */
1144 run_diff_index(&rev
, 1);
1145 if (s
->verbose
> 1 &&
1146 wt_status_check_worktree_changes(s
, &dirty_submodules
)) {
1147 status_printf_ln(s
, c
,
1148 "--------------------------------------------------");
1149 status_printf_ln(s
, c
, _("Changes not staged for commit:"));
1151 rev
.diffopt
.a_prefix
= "i/";
1152 rev
.diffopt
.b_prefix
= "w/";
1153 run_diff_files(&rev
, 0);
1157 static void wt_longstatus_print_tracking(struct wt_status
*s
)
1159 struct strbuf sb
= STRBUF_INIT
;
1160 const char *cp
, *ep
, *branch_name
;
1161 struct branch
*branch
;
1162 char comment_line_string
[3];
1164 uint64_t t_begin
= 0;
1166 assert(s
->branch
&& !s
->is_initial
);
1167 if (!skip_prefix(s
->branch
, "refs/heads/", &branch_name
))
1169 branch
= branch_get(branch_name
);
1171 t_begin
= getnanotime();
1173 if (!format_tracking_info(branch
, &sb
, s
->ahead_behind_flags
))
1176 if (advice_enabled(ADVICE_STATUS_AHEAD_BEHIND_WARNING
) &&
1177 s
->ahead_behind_flags
== AHEAD_BEHIND_FULL
) {
1178 uint64_t t_delta_in_ms
= (getnanotime() - t_begin
) / 1000000;
1179 if (t_delta_in_ms
> AB_DELAY_WARNING_IN_MS
) {
1180 strbuf_addf(&sb
, _("\n"
1181 "It took %.2f seconds to compute the branch ahead/behind values.\n"
1182 "You can use '--no-ahead-behind' to avoid this.\n"),
1183 t_delta_in_ms
/ 1000.0);
1188 if (s
->display_comment_prefix
) {
1189 comment_line_string
[i
++] = comment_line_char
;
1190 comment_line_string
[i
++] = ' ';
1192 comment_line_string
[i
] = '\0';
1194 for (cp
= sb
.buf
; (ep
= strchr(cp
, '\n')) != NULL
; cp
= ep
+ 1)
1195 color_fprintf_ln(s
->fp
, color(WT_STATUS_HEADER
, s
),
1196 "%s%.*s", comment_line_string
,
1197 (int)(ep
- cp
), cp
);
1198 if (s
->display_comment_prefix
)
1199 color_fprintf_ln(s
->fp
, color(WT_STATUS_HEADER
, s
), "%c",
1203 strbuf_release(&sb
);
1206 static void show_merge_in_progress(struct wt_status
*s
,
1209 if (has_unmerged(s
)) {
1210 status_printf_ln(s
, color
, _("You have unmerged paths."));
1212 status_printf_ln(s
, color
,
1213 _(" (fix conflicts and run \"git commit\")"));
1214 status_printf_ln(s
, color
,
1215 _(" (use \"git merge --abort\" to abort the merge)"));
1218 status_printf_ln(s
, color
,
1219 _("All conflicts fixed but you are still merging."));
1221 status_printf_ln(s
, color
,
1222 _(" (use \"git commit\" to conclude merge)"));
1224 wt_longstatus_print_trailer(s
);
1227 static void show_am_in_progress(struct wt_status
*s
,
1232 status_printf_ln(s
, color
,
1233 _("You are in the middle of an am session."));
1234 if (s
->state
.am_empty_patch
)
1235 status_printf_ln(s
, color
,
1236 _("The current patch is empty."));
1238 am_empty_patch
= s
->state
.am_empty_patch
;
1239 if (!am_empty_patch
)
1240 status_printf_ln(s
, color
,
1241 _(" (fix conflicts and then run \"git am --continue\")"));
1242 status_printf_ln(s
, color
,
1243 _(" (use \"git am --skip\" to skip this patch)"));
1245 status_printf_ln(s
, color
,
1246 _(" (use \"git am --allow-empty\" to record this patch as an empty commit)"));
1247 status_printf_ln(s
, color
,
1248 _(" (use \"git am --abort\" to restore the original branch)"));
1250 wt_longstatus_print_trailer(s
);
1253 static char *read_line_from_git_path(const char *filename
)
1255 struct strbuf buf
= STRBUF_INIT
;
1256 FILE *fp
= fopen_or_warn(git_path("%s", filename
), "r");
1259 strbuf_release(&buf
);
1262 strbuf_getline_lf(&buf
, fp
);
1264 return strbuf_detach(&buf
, NULL
);
1266 strbuf_release(&buf
);
1271 static int split_commit_in_progress(struct wt_status
*s
)
1273 int split_in_progress
= 0;
1274 char *head
, *orig_head
, *rebase_amend
, *rebase_orig_head
;
1276 if ((!s
->amend
&& !s
->nowarn
&& !s
->workdir_dirty
) ||
1277 !s
->branch
|| strcmp(s
->branch
, "HEAD"))
1280 head
= read_line_from_git_path("HEAD");
1281 orig_head
= read_line_from_git_path("ORIG_HEAD");
1282 rebase_amend
= read_line_from_git_path("rebase-merge/amend");
1283 rebase_orig_head
= read_line_from_git_path("rebase-merge/orig-head");
1285 if (!head
|| !orig_head
|| !rebase_amend
|| !rebase_orig_head
)
1286 ; /* fall through, no split in progress */
1287 else if (!strcmp(rebase_amend
, rebase_orig_head
))
1288 split_in_progress
= !!strcmp(head
, rebase_amend
);
1289 else if (strcmp(orig_head
, rebase_orig_head
))
1290 split_in_progress
= 1;
1295 free(rebase_orig_head
);
1297 return split_in_progress
;
1302 * "pick d6a2f0303e897ec257dd0e0a39a5ccb709bc2047 some message"
1304 * "pick d6a2f03 some message"
1306 * The function assumes that the line does not contain useless spaces
1307 * before or after the command.
1309 static void abbrev_oid_in_line(struct strbuf
*line
)
1311 struct strbuf
**split
;
1314 if (starts_with(line
->buf
, "exec ") ||
1315 starts_with(line
->buf
, "x ") ||
1316 starts_with(line
->buf
, "label ") ||
1317 starts_with(line
->buf
, "l "))
1320 split
= strbuf_split_max(line
, ' ', 3);
1321 if (split
[0] && split
[1]) {
1322 struct object_id oid
;
1325 * strbuf_split_max left a space. Trim it and re-add
1326 * it after abbreviation.
1328 strbuf_trim(split
[1]);
1329 if (!get_oid(split
[1]->buf
, &oid
)) {
1330 strbuf_reset(split
[1]);
1331 strbuf_add_unique_abbrev(split
[1], &oid
,
1333 strbuf_addch(split
[1], ' ');
1335 for (i
= 0; split
[i
]; i
++)
1336 strbuf_addbuf(line
, split
[i
]);
1339 strbuf_list_free(split
);
1342 static int read_rebase_todolist(const char *fname
, struct string_list
*lines
)
1344 struct strbuf line
= STRBUF_INIT
;
1345 FILE *f
= fopen(git_path("%s", fname
), "r");
1348 if (errno
== ENOENT
)
1350 die_errno("Could not open file %s for reading",
1351 git_path("%s", fname
));
1353 while (!strbuf_getline_lf(&line
, f
)) {
1354 if (line
.len
&& line
.buf
[0] == comment_line_char
)
1359 abbrev_oid_in_line(&line
);
1360 string_list_append(lines
, line
.buf
);
1363 strbuf_release(&line
);
1367 static void show_rebase_information(struct wt_status
*s
,
1370 if (s
->state
.rebase_interactive_in_progress
) {
1372 int nr_lines_to_show
= 2;
1374 struct string_list have_done
= STRING_LIST_INIT_DUP
;
1375 struct string_list yet_to_do
= STRING_LIST_INIT_DUP
;
1377 read_rebase_todolist("rebase-merge/done", &have_done
);
1378 if (read_rebase_todolist("rebase-merge/git-rebase-todo",
1380 status_printf_ln(s
, color
,
1381 _("git-rebase-todo is missing."));
1382 if (have_done
.nr
== 0)
1383 status_printf_ln(s
, color
, _("No commands done."));
1385 status_printf_ln(s
, color
,
1386 Q_("Last command done (%d command done):",
1387 "Last commands done (%d commands done):",
1390 for (i
= (have_done
.nr
> nr_lines_to_show
)
1391 ? have_done
.nr
- nr_lines_to_show
: 0;
1394 status_printf_ln(s
, color
, " %s", have_done
.items
[i
].string
);
1395 if (have_done
.nr
> nr_lines_to_show
&& s
->hints
)
1396 status_printf_ln(s
, color
,
1397 _(" (see more in file %s)"), git_path("rebase-merge/done"));
1400 if (yet_to_do
.nr
== 0)
1401 status_printf_ln(s
, color
,
1402 _("No commands remaining."));
1404 status_printf_ln(s
, color
,
1405 Q_("Next command to do (%d remaining command):",
1406 "Next commands to do (%d remaining commands):",
1409 for (i
= 0; i
< nr_lines_to_show
&& i
< yet_to_do
.nr
; i
++)
1410 status_printf_ln(s
, color
, " %s", yet_to_do
.items
[i
].string
);
1412 status_printf_ln(s
, color
,
1413 _(" (use \"git rebase --edit-todo\" to view and edit)"));
1415 string_list_clear(&yet_to_do
, 0);
1416 string_list_clear(&have_done
, 0);
1420 static void print_rebase_state(struct wt_status
*s
,
1423 if (s
->state
.branch
)
1424 status_printf_ln(s
, color
,
1425 _("You are currently rebasing branch '%s' on '%s'."),
1429 status_printf_ln(s
, color
,
1430 _("You are currently rebasing."));
1433 static void show_rebase_in_progress(struct wt_status
*s
,
1438 show_rebase_information(s
, color
);
1439 if (has_unmerged(s
)) {
1440 print_rebase_state(s
, color
);
1442 status_printf_ln(s
, color
,
1443 _(" (fix conflicts and then run \"git rebase --continue\")"));
1444 status_printf_ln(s
, color
,
1445 _(" (use \"git rebase --skip\" to skip this patch)"));
1446 status_printf_ln(s
, color
,
1447 _(" (use \"git rebase --abort\" to check out the original branch)"));
1449 } else if (s
->state
.rebase_in_progress
||
1450 !stat(git_path_merge_msg(s
->repo
), &st
)) {
1451 print_rebase_state(s
, color
);
1453 status_printf_ln(s
, color
,
1454 _(" (all conflicts fixed: run \"git rebase --continue\")"));
1455 } else if (split_commit_in_progress(s
)) {
1456 if (s
->state
.branch
)
1457 status_printf_ln(s
, color
,
1458 _("You are currently splitting a commit while rebasing branch '%s' on '%s'."),
1462 status_printf_ln(s
, color
,
1463 _("You are currently splitting a commit during a rebase."));
1465 status_printf_ln(s
, color
,
1466 _(" (Once your working directory is clean, run \"git rebase --continue\")"));
1468 if (s
->state
.branch
)
1469 status_printf_ln(s
, color
,
1470 _("You are currently editing a commit while rebasing branch '%s' on '%s'."),
1474 status_printf_ln(s
, color
,
1475 _("You are currently editing a commit during a rebase."));
1476 if (s
->hints
&& !s
->amend
) {
1477 status_printf_ln(s
, color
,
1478 _(" (use \"git commit --amend\" to amend the current commit)"));
1479 status_printf_ln(s
, color
,
1480 _(" (use \"git rebase --continue\" once you are satisfied with your changes)"));
1483 wt_longstatus_print_trailer(s
);
1486 static void show_cherry_pick_in_progress(struct wt_status
*s
,
1489 if (is_null_oid(&s
->state
.cherry_pick_head_oid
))
1490 status_printf_ln(s
, color
,
1491 _("Cherry-pick currently in progress."));
1493 status_printf_ln(s
, color
,
1494 _("You are currently cherry-picking commit %s."),
1495 find_unique_abbrev(&s
->state
.cherry_pick_head_oid
,
1499 if (has_unmerged(s
))
1500 status_printf_ln(s
, color
,
1501 _(" (fix conflicts and run \"git cherry-pick --continue\")"));
1502 else if (is_null_oid(&s
->state
.cherry_pick_head_oid
))
1503 status_printf_ln(s
, color
,
1504 _(" (run \"git cherry-pick --continue\" to continue)"));
1506 status_printf_ln(s
, color
,
1507 _(" (all conflicts fixed: run \"git cherry-pick --continue\")"));
1508 status_printf_ln(s
, color
,
1509 _(" (use \"git cherry-pick --skip\" to skip this patch)"));
1510 status_printf_ln(s
, color
,
1511 _(" (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"));
1513 wt_longstatus_print_trailer(s
);
1516 static void show_revert_in_progress(struct wt_status
*s
,
1519 if (is_null_oid(&s
->state
.revert_head_oid
))
1520 status_printf_ln(s
, color
,
1521 _("Revert currently in progress."));
1523 status_printf_ln(s
, color
,
1524 _("You are currently reverting commit %s."),
1525 find_unique_abbrev(&s
->state
.revert_head_oid
,
1528 if (has_unmerged(s
))
1529 status_printf_ln(s
, color
,
1530 _(" (fix conflicts and run \"git revert --continue\")"));
1531 else if (is_null_oid(&s
->state
.revert_head_oid
))
1532 status_printf_ln(s
, color
,
1533 _(" (run \"git revert --continue\" to continue)"));
1535 status_printf_ln(s
, color
,
1536 _(" (all conflicts fixed: run \"git revert --continue\")"));
1537 status_printf_ln(s
, color
,
1538 _(" (use \"git revert --skip\" to skip this patch)"));
1539 status_printf_ln(s
, color
,
1540 _(" (use \"git revert --abort\" to cancel the revert operation)"));
1542 wt_longstatus_print_trailer(s
);
1545 static void show_bisect_in_progress(struct wt_status
*s
,
1548 if (s
->state
.branch
)
1549 status_printf_ln(s
, color
,
1550 _("You are currently bisecting, started from branch '%s'."),
1553 status_printf_ln(s
, color
,
1554 _("You are currently bisecting."));
1556 status_printf_ln(s
, color
,
1557 _(" (use \"git bisect reset\" to get back to the original branch)"));
1558 wt_longstatus_print_trailer(s
);
1561 static void show_sparse_checkout_in_use(struct wt_status
*s
,
1564 if (s
->state
.sparse_checkout_percentage
== SPARSE_CHECKOUT_DISABLED
)
1567 if (s
->state
.sparse_checkout_percentage
== SPARSE_CHECKOUT_SPARSE_INDEX
)
1568 status_printf_ln(s
, color
, _("You are in a sparse checkout."));
1570 status_printf_ln(s
, color
,
1571 _("You are in a sparse checkout with %d%% of tracked files present."),
1572 s
->state
.sparse_checkout_percentage
);
1573 wt_longstatus_print_trailer(s
);
1577 * Extract branch information from rebase/bisect
1579 static char *get_branch(const struct worktree
*wt
, const char *path
)
1581 struct strbuf sb
= STRBUF_INIT
;
1582 struct object_id oid
;
1583 const char *branch_name
;
1585 if (strbuf_read_file(&sb
, worktree_git_path(wt
, "%s", path
), 0) <= 0)
1588 while (sb
.len
&& sb
.buf
[sb
.len
- 1] == '\n')
1589 strbuf_setlen(&sb
, sb
.len
- 1);
1592 if (skip_prefix(sb
.buf
, "refs/heads/", &branch_name
))
1593 strbuf_remove(&sb
, 0, branch_name
- sb
.buf
);
1594 else if (starts_with(sb
.buf
, "refs/"))
1596 else if (!get_oid_hex(sb
.buf
, &oid
)) {
1598 strbuf_add_unique_abbrev(&sb
, &oid
, DEFAULT_ABBREV
);
1599 } else if (!strcmp(sb
.buf
, "detached HEAD")) /* rebase */
1603 return strbuf_detach(&sb
, NULL
);
1606 strbuf_release(&sb
);
1610 struct grab_1st_switch_cbdata
{
1612 struct object_id noid
;
1615 static int grab_1st_switch(struct object_id
*ooid
, struct object_id
*noid
,
1616 const char *email
, timestamp_t timestamp
, int tz
,
1617 const char *message
, void *cb_data
)
1619 struct grab_1st_switch_cbdata
*cb
= cb_data
;
1620 const char *target
= NULL
, *end
;
1622 if (!skip_prefix(message
, "checkout: moving from ", &message
))
1624 target
= strstr(message
, " to ");
1627 target
+= strlen(" to ");
1628 strbuf_reset(&cb
->buf
);
1629 oidcpy(&cb
->noid
, noid
);
1630 end
= strchrnul(target
, '\n');
1631 strbuf_add(&cb
->buf
, target
, end
- target
);
1632 if (!strcmp(cb
->buf
.buf
, "HEAD")) {
1633 /* HEAD is relative. Resolve it to the right reflog entry. */
1634 strbuf_reset(&cb
->buf
);
1635 strbuf_add_unique_abbrev(&cb
->buf
, noid
, DEFAULT_ABBREV
);
1640 static void wt_status_get_detached_from(struct repository
*r
,
1641 struct wt_status_state
*state
)
1643 struct grab_1st_switch_cbdata cb
;
1644 struct commit
*commit
;
1645 struct object_id oid
;
1648 strbuf_init(&cb
.buf
, 0);
1649 if (for_each_reflog_ent_reverse("HEAD", grab_1st_switch
, &cb
) <= 0) {
1650 strbuf_release(&cb
.buf
);
1654 if (dwim_ref(cb
.buf
.buf
, cb
.buf
.len
, &oid
, &ref
, 1) == 1 &&
1655 /* oid is a commit? match without further lookup */
1656 (oideq(&cb
.noid
, &oid
) ||
1657 /* perhaps oid is a tag, try to dereference to a commit */
1658 ((commit
= lookup_commit_reference_gently(r
, &oid
, 1)) != NULL
&&
1659 oideq(&cb
.noid
, &commit
->object
.oid
)))) {
1660 const char *from
= ref
;
1661 if (!skip_prefix(from
, "refs/tags/", &from
))
1662 skip_prefix(from
, "refs/remotes/", &from
);
1663 state
->detached_from
= xstrdup(from
);
1665 state
->detached_from
=
1666 xstrdup(find_unique_abbrev(&cb
.noid
, DEFAULT_ABBREV
));
1667 oidcpy(&state
->detached_oid
, &cb
.noid
);
1668 state
->detached_at
= !get_oid("HEAD", &oid
) &&
1669 oideq(&oid
, &state
->detached_oid
);
1672 strbuf_release(&cb
.buf
);
1675 int wt_status_check_rebase(const struct worktree
*wt
,
1676 struct wt_status_state
*state
)
1680 if (!stat(worktree_git_path(wt
, "rebase-apply"), &st
)) {
1681 if (!stat(worktree_git_path(wt
, "rebase-apply/applying"), &st
)) {
1682 state
->am_in_progress
= 1;
1683 if (!stat(worktree_git_path(wt
, "rebase-apply/patch"), &st
) && !st
.st_size
)
1684 state
->am_empty_patch
= 1;
1686 state
->rebase_in_progress
= 1;
1687 state
->branch
= get_branch(wt
, "rebase-apply/head-name");
1688 state
->onto
= get_branch(wt
, "rebase-apply/onto");
1690 } else if (!stat(worktree_git_path(wt
, "rebase-merge"), &st
)) {
1691 if (!stat(worktree_git_path(wt
, "rebase-merge/interactive"), &st
))
1692 state
->rebase_interactive_in_progress
= 1;
1694 state
->rebase_in_progress
= 1;
1695 state
->branch
= get_branch(wt
, "rebase-merge/head-name");
1696 state
->onto
= get_branch(wt
, "rebase-merge/onto");
1702 int wt_status_check_bisect(const struct worktree
*wt
,
1703 struct wt_status_state
*state
)
1707 if (!stat(worktree_git_path(wt
, "BISECT_LOG"), &st
)) {
1708 state
->bisect_in_progress
= 1;
1709 state
->branch
= get_branch(wt
, "BISECT_START");
1715 static void wt_status_check_sparse_checkout(struct repository
*r
,
1716 struct wt_status_state
*state
)
1718 int skip_worktree
= 0;
1721 if (!core_apply_sparse_checkout
|| r
->index
->cache_nr
== 0) {
1723 * Don't compute percentage of checked out files if we
1724 * aren't in a sparse checkout or would get division by 0.
1726 state
->sparse_checkout_percentage
= SPARSE_CHECKOUT_DISABLED
;
1730 if (r
->index
->sparse_index
) {
1731 state
->sparse_checkout_percentage
= SPARSE_CHECKOUT_SPARSE_INDEX
;
1735 for (i
= 0; i
< r
->index
->cache_nr
; i
++) {
1736 struct cache_entry
*ce
= r
->index
->cache
[i
];
1737 if (ce_skip_worktree(ce
))
1741 state
->sparse_checkout_percentage
=
1742 100 - (100 * skip_worktree
)/r
->index
->cache_nr
;
1745 void wt_status_get_state(struct repository
*r
,
1746 struct wt_status_state
*state
,
1747 int get_detached_from
)
1750 struct object_id oid
;
1751 enum replay_action action
;
1753 if (!stat(git_path_merge_head(r
), &st
)) {
1754 wt_status_check_rebase(NULL
, state
);
1755 state
->merge_in_progress
= 1;
1756 } else if (wt_status_check_rebase(NULL
, state
)) {
1758 } else if (refs_ref_exists(get_main_ref_store(r
), "CHERRY_PICK_HEAD") &&
1759 !get_oid("CHERRY_PICK_HEAD", &oid
)) {
1760 state
->cherry_pick_in_progress
= 1;
1761 oidcpy(&state
->cherry_pick_head_oid
, &oid
);
1763 wt_status_check_bisect(NULL
, state
);
1764 if (refs_ref_exists(get_main_ref_store(r
), "REVERT_HEAD") &&
1765 !get_oid("REVERT_HEAD", &oid
)) {
1766 state
->revert_in_progress
= 1;
1767 oidcpy(&state
->revert_head_oid
, &oid
);
1769 if (!sequencer_get_last_command(r
, &action
)) {
1770 if (action
== REPLAY_PICK
) {
1771 state
->cherry_pick_in_progress
= 1;
1772 oidcpy(&state
->cherry_pick_head_oid
, null_oid());
1774 state
->revert_in_progress
= 1;
1775 oidcpy(&state
->revert_head_oid
, null_oid());
1778 if (get_detached_from
)
1779 wt_status_get_detached_from(r
, state
);
1780 wt_status_check_sparse_checkout(r
, state
);
1783 static void wt_longstatus_print_state(struct wt_status
*s
)
1785 const char *state_color
= color(WT_STATUS_HEADER
, s
);
1786 struct wt_status_state
*state
= &s
->state
;
1788 if (state
->merge_in_progress
) {
1789 if (state
->rebase_interactive_in_progress
) {
1790 show_rebase_information(s
, state_color
);
1793 show_merge_in_progress(s
, state_color
);
1794 } else if (state
->am_in_progress
)
1795 show_am_in_progress(s
, state_color
);
1796 else if (state
->rebase_in_progress
|| state
->rebase_interactive_in_progress
)
1797 show_rebase_in_progress(s
, state_color
);
1798 else if (state
->cherry_pick_in_progress
)
1799 show_cherry_pick_in_progress(s
, state_color
);
1800 else if (state
->revert_in_progress
)
1801 show_revert_in_progress(s
, state_color
);
1802 if (state
->bisect_in_progress
)
1803 show_bisect_in_progress(s
, state_color
);
1805 if (state
->sparse_checkout_percentage
!= SPARSE_CHECKOUT_DISABLED
)
1806 show_sparse_checkout_in_use(s
, state_color
);
1809 static void wt_longstatus_print(struct wt_status
*s
)
1811 const char *branch_color
= color(WT_STATUS_ONBRANCH
, s
);
1812 const char *branch_status_color
= color(WT_STATUS_HEADER
, s
);
1815 const char *on_what
= _("On branch ");
1816 const char *branch_name
= s
->branch
;
1817 if (!strcmp(branch_name
, "HEAD")) {
1818 branch_status_color
= color(WT_STATUS_NOBRANCH
, s
);
1819 if (s
->state
.rebase_in_progress
||
1820 s
->state
.rebase_interactive_in_progress
) {
1821 if (s
->state
.rebase_interactive_in_progress
)
1822 on_what
= _("interactive rebase in progress; onto ");
1824 on_what
= _("rebase in progress; onto ");
1825 branch_name
= s
->state
.onto
;
1826 } else if (s
->state
.detached_from
) {
1827 branch_name
= s
->state
.detached_from
;
1828 if (s
->state
.detached_at
)
1829 on_what
= _("HEAD detached at ");
1831 on_what
= _("HEAD detached from ");
1834 on_what
= _("Not currently on any branch.");
1837 skip_prefix(branch_name
, "refs/heads/", &branch_name
);
1838 status_printf(s
, color(WT_STATUS_HEADER
, s
), "%s", "");
1839 status_printf_more(s
, branch_status_color
, "%s", on_what
);
1840 status_printf_more(s
, branch_color
, "%s\n", branch_name
);
1842 wt_longstatus_print_tracking(s
);
1845 wt_longstatus_print_state(s
);
1847 if (s
->is_initial
) {
1848 status_printf_ln(s
, color(WT_STATUS_HEADER
, s
), "%s", "");
1849 status_printf_ln(s
, color(WT_STATUS_HEADER
, s
),
1851 ? _("Initial commit")
1852 : _("No commits yet"));
1853 status_printf_ln(s
, color(WT_STATUS_HEADER
, s
), "%s", "");
1856 wt_longstatus_print_updated(s
);
1857 wt_longstatus_print_unmerged(s
);
1858 wt_longstatus_print_changed(s
);
1859 if (s
->submodule_summary
&&
1860 (!s
->ignore_submodule_arg
||
1861 strcmp(s
->ignore_submodule_arg
, "all"))) {
1862 wt_longstatus_print_submodule_summary(s
, 0); /* staged */
1863 wt_longstatus_print_submodule_summary(s
, 1); /* unstaged */
1865 if (s
->show_untracked_files
) {
1866 wt_longstatus_print_other(s
, &s
->untracked
, _("Untracked files"), "add");
1867 if (s
->show_ignored_mode
)
1868 wt_longstatus_print_other(s
, &s
->ignored
, _("Ignored files"), "add -f");
1869 if (advice_enabled(ADVICE_STATUS_U_OPTION
) && 2000 < s
->untracked_in_ms
) {
1870 status_printf_ln(s
, GIT_COLOR_NORMAL
, "%s", "");
1871 status_printf_ln(s
, GIT_COLOR_NORMAL
,
1872 _("It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1873 "may speed it up, but you have to be careful not to forget to add\n"
1874 "new files yourself (see 'git help status')."),
1875 s
->untracked_in_ms
/ 1000.0);
1877 } else if (s
->committable
)
1878 status_printf_ln(s
, GIT_COLOR_NORMAL
, _("Untracked files not listed%s"),
1880 ? _(" (use -u option to show untracked files)") : "");
1883 wt_longstatus_print_verbose(s
);
1884 if (!s
->committable
) {
1886 status_printf_ln(s
, GIT_COLOR_NORMAL
, _("No changes"));
1889 else if (s
->workdir_dirty
) {
1891 fprintf(s
->fp
, _("no changes added to commit "
1892 "(use \"git add\" and/or "
1893 "\"git commit -a\")\n"));
1895 fprintf(s
->fp
, _("no changes added to "
1897 } else if (s
->untracked
.nr
) {
1899 fprintf(s
->fp
, _("nothing added to commit but "
1900 "untracked files present (use "
1901 "\"git add\" to track)\n"));
1903 fprintf(s
->fp
, _("nothing added to commit but "
1904 "untracked files present\n"));
1905 } else if (s
->is_initial
) {
1907 fprintf(s
->fp
, _("nothing to commit (create/"
1908 "copy files and use \"git "
1909 "add\" to track)\n"));
1911 fprintf(s
->fp
, _("nothing to commit\n"));
1912 } else if (!s
->show_untracked_files
) {
1914 fprintf(s
->fp
, _("nothing to commit (use -u to "
1915 "show untracked files)\n"));
1917 fprintf(s
->fp
, _("nothing to commit\n"));
1919 fprintf(s
->fp
, _("nothing to commit, working tree "
1923 wt_longstatus_print_stash_summary(s
);
1926 static void wt_shortstatus_unmerged(struct string_list_item
*it
,
1927 struct wt_status
*s
)
1929 struct wt_status_change_data
*d
= it
->util
;
1930 const char *how
= "??";
1932 switch (d
->stagemask
) {
1933 case 1: how
= "DD"; break; /* both deleted */
1934 case 2: how
= "AU"; break; /* added by us */
1935 case 3: how
= "UD"; break; /* deleted by them */
1936 case 4: how
= "UA"; break; /* added by them */
1937 case 5: how
= "DU"; break; /* deleted by us */
1938 case 6: how
= "AA"; break; /* both added */
1939 case 7: how
= "UU"; break; /* both modified */
1941 color_fprintf(s
->fp
, color(WT_STATUS_UNMERGED
, s
), "%s", how
);
1942 if (s
->null_termination
) {
1943 fprintf(s
->fp
, " %s%c", it
->string
, 0);
1945 struct strbuf onebuf
= STRBUF_INIT
;
1947 one
= quote_path(it
->string
, s
->prefix
, &onebuf
, QUOTE_PATH_QUOTE_SP
);
1948 fprintf(s
->fp
, " %s\n", one
);
1949 strbuf_release(&onebuf
);
1953 static void wt_shortstatus_status(struct string_list_item
*it
,
1954 struct wt_status
*s
)
1956 struct wt_status_change_data
*d
= it
->util
;
1958 if (d
->index_status
)
1959 color_fprintf(s
->fp
, color(WT_STATUS_UPDATED
, s
), "%c", d
->index_status
);
1962 if (d
->worktree_status
)
1963 color_fprintf(s
->fp
, color(WT_STATUS_CHANGED
, s
), "%c", d
->worktree_status
);
1967 if (s
->null_termination
) {
1968 fprintf(s
->fp
, "%s%c", it
->string
, 0);
1969 if (d
->rename_source
)
1970 fprintf(s
->fp
, "%s%c", d
->rename_source
, 0);
1972 struct strbuf onebuf
= STRBUF_INIT
;
1975 if (d
->rename_source
) {
1976 one
= quote_path(d
->rename_source
, s
->prefix
, &onebuf
,
1977 QUOTE_PATH_QUOTE_SP
);
1978 fprintf(s
->fp
, "%s -> ", one
);
1979 strbuf_release(&onebuf
);
1981 one
= quote_path(it
->string
, s
->prefix
, &onebuf
, QUOTE_PATH_QUOTE_SP
);
1982 fprintf(s
->fp
, "%s\n", one
);
1983 strbuf_release(&onebuf
);
1987 static void wt_shortstatus_other(struct string_list_item
*it
,
1988 struct wt_status
*s
, const char *sign
)
1990 if (s
->null_termination
) {
1991 fprintf(s
->fp
, "%s %s%c", sign
, it
->string
, 0);
1993 struct strbuf onebuf
= STRBUF_INIT
;
1995 one
= quote_path(it
->string
, s
->prefix
, &onebuf
, QUOTE_PATH_QUOTE_SP
);
1996 color_fprintf(s
->fp
, color(WT_STATUS_UNTRACKED
, s
), "%s", sign
);
1997 fprintf(s
->fp
, " %s\n", one
);
1998 strbuf_release(&onebuf
);
2002 static void wt_shortstatus_print_tracking(struct wt_status
*s
)
2004 struct branch
*branch
;
2005 const char *header_color
= color(WT_STATUS_HEADER
, s
);
2006 const char *branch_color_local
= color(WT_STATUS_LOCAL_BRANCH
, s
);
2007 const char *branch_color_remote
= color(WT_STATUS_REMOTE_BRANCH
, s
);
2011 const char *branch_name
;
2012 int num_ours
, num_theirs
, sti
;
2013 int upstream_is_gone
= 0;
2015 color_fprintf(s
->fp
, color(WT_STATUS_HEADER
, s
), "## ");
2019 branch_name
= s
->branch
;
2021 #define LABEL(string) (s->no_gettext ? (string) : _(string))
2024 color_fprintf(s
->fp
, header_color
, LABEL(N_("No commits yet on ")));
2026 if (!strcmp(s
->branch
, "HEAD")) {
2027 color_fprintf(s
->fp
, color(WT_STATUS_NOBRANCH
, s
), "%s",
2028 LABEL(N_("HEAD (no branch)")));
2032 skip_prefix(branch_name
, "refs/heads/", &branch_name
);
2034 branch
= branch_get(branch_name
);
2036 color_fprintf(s
->fp
, branch_color_local
, "%s", branch_name
);
2038 sti
= stat_tracking_info(branch
, &num_ours
, &num_theirs
, &base
,
2039 0, s
->ahead_behind_flags
);
2044 upstream_is_gone
= 1;
2047 short_base
= shorten_unambiguous_ref(base
, 0);
2048 color_fprintf(s
->fp
, header_color
, "...");
2049 color_fprintf(s
->fp
, branch_color_remote
, "%s", short_base
);
2052 if (!upstream_is_gone
&& !sti
)
2055 color_fprintf(s
->fp
, header_color
, " [");
2056 if (upstream_is_gone
) {
2057 color_fprintf(s
->fp
, header_color
, LABEL(N_("gone")));
2058 } else if (s
->ahead_behind_flags
== AHEAD_BEHIND_QUICK
) {
2059 color_fprintf(s
->fp
, header_color
, LABEL(N_("different")));
2060 } else if (!num_ours
) {
2061 color_fprintf(s
->fp
, header_color
, LABEL(N_("behind ")));
2062 color_fprintf(s
->fp
, branch_color_remote
, "%d", num_theirs
);
2063 } else if (!num_theirs
) {
2064 color_fprintf(s
->fp
, header_color
, LABEL(N_("ahead ")));
2065 color_fprintf(s
->fp
, branch_color_local
, "%d", num_ours
);
2067 color_fprintf(s
->fp
, header_color
, LABEL(N_("ahead ")));
2068 color_fprintf(s
->fp
, branch_color_local
, "%d", num_ours
);
2069 color_fprintf(s
->fp
, header_color
, ", %s", LABEL(N_("behind ")));
2070 color_fprintf(s
->fp
, branch_color_remote
, "%d", num_theirs
);
2073 color_fprintf(s
->fp
, header_color
, "]");
2075 fputc(s
->null_termination
? '\0' : '\n', s
->fp
);
2078 static void wt_shortstatus_print(struct wt_status
*s
)
2080 struct string_list_item
*it
;
2083 wt_shortstatus_print_tracking(s
);
2085 for_each_string_list_item(it
, &s
->change
) {
2086 struct wt_status_change_data
*d
= it
->util
;
2089 wt_shortstatus_unmerged(it
, s
);
2091 wt_shortstatus_status(it
, s
);
2093 for_each_string_list_item(it
, &s
->untracked
)
2094 wt_shortstatus_other(it
, s
, "??");
2096 for_each_string_list_item(it
, &s
->ignored
)
2097 wt_shortstatus_other(it
, s
, "!!");
2100 static void wt_porcelain_print(struct wt_status
*s
)
2103 s
->relative_paths
= 0;
2106 wt_shortstatus_print(s
);
2110 * Print branch information for porcelain v2 output. These lines
2111 * are printed when the '--branch' parameter is given.
2113 * # branch.oid <commit><eol>
2114 * # branch.head <head><eol>
2115 * [# branch.upstream <upstream><eol>
2116 * [# branch.ab +<ahead> -<behind><eol>]]
2118 * <commit> ::= the current commit hash or the literal
2119 * "(initial)" to indicate an initialized repo
2122 * <head> ::= <branch_name> the current branch name or
2123 * "(detached)" literal when detached head or
2124 * "(unknown)" when something is wrong.
2126 * <upstream> ::= the upstream branch name, when set.
2128 * <ahead> ::= integer ahead value or '?'.
2130 * <behind> ::= integer behind value or '?'.
2132 * The end-of-line is defined by the -z flag.
2134 * <eol> ::= NUL when -z,
2137 * When an upstream is set and present, the 'branch.ab' line will
2138 * be printed with the ahead/behind counts for the branch and the
2139 * upstream. When AHEAD_BEHIND_QUICK is requested and the branches
2140 * are different, '?' will be substituted for the actual count.
2142 static void wt_porcelain_v2_print_tracking(struct wt_status
*s
)
2144 struct branch
*branch
;
2146 const char *branch_name
;
2147 int ab_info
, nr_ahead
, nr_behind
;
2148 char eol
= s
->null_termination
? '\0' : '\n';
2150 fprintf(s
->fp
, "# branch.oid %s%c",
2151 (s
->is_initial
? "(initial)" : oid_to_hex(&s
->oid_commit
)),
2155 fprintf(s
->fp
, "# branch.head %s%c", "(unknown)", eol
);
2157 if (!strcmp(s
->branch
, "HEAD")) {
2158 fprintf(s
->fp
, "# branch.head %s%c", "(detached)", eol
);
2160 if (s
->state
.rebase_in_progress
||
2161 s
->state
.rebase_interactive_in_progress
)
2162 branch_name
= s
->state
.onto
;
2163 else if (s
->state
.detached_from
)
2164 branch_name
= s
->state
.detached_from
;
2169 skip_prefix(s
->branch
, "refs/heads/", &branch_name
);
2171 fprintf(s
->fp
, "# branch.head %s%c", branch_name
, eol
);
2174 /* Lookup stats on the upstream tracking branch, if set. */
2175 branch
= branch_get(branch_name
);
2177 ab_info
= stat_tracking_info(branch
, &nr_ahead
, &nr_behind
,
2178 &base
, 0, s
->ahead_behind_flags
);
2180 base
= shorten_unambiguous_ref(base
, 0);
2181 fprintf(s
->fp
, "# branch.upstream %s%c", base
, eol
);
2186 if (nr_ahead
|| nr_behind
)
2187 fprintf(s
->fp
, "# branch.ab +%d -%d%c",
2188 nr_ahead
, nr_behind
, eol
);
2190 fprintf(s
->fp
, "# branch.ab +? -?%c",
2192 } else if (!ab_info
) {
2194 fprintf(s
->fp
, "# branch.ab +0 -0%c", eol
);
2201 * Print the stash count in a porcelain-friendly format
2203 static void wt_porcelain_v2_print_stash(struct wt_status
*s
)
2205 int stash_count
= count_stash_entries();
2206 char eol
= s
->null_termination
? '\0' : '\n';
2208 if (stash_count
> 0)
2209 fprintf(s
->fp
, "# stash %d%c", stash_count
, eol
);
2213 * Convert various submodule status values into a
2214 * fixed-length string of characters in the buffer provided.
2216 static void wt_porcelain_v2_submodule_state(
2217 struct wt_status_change_data
*d
,
2220 if (S_ISGITLINK(d
->mode_head
) ||
2221 S_ISGITLINK(d
->mode_index
) ||
2222 S_ISGITLINK(d
->mode_worktree
)) {
2224 sub
[1] = d
->new_submodule_commits
? 'C' : '.';
2225 sub
[2] = (d
->dirty_submodule
& DIRTY_SUBMODULE_MODIFIED
) ? 'M' : '.';
2226 sub
[3] = (d
->dirty_submodule
& DIRTY_SUBMODULE_UNTRACKED
) ? 'U' : '.';
2237 * Fix-up changed entries before we print them.
2239 static void wt_porcelain_v2_fix_up_changed(struct string_list_item
*it
)
2241 struct wt_status_change_data
*d
= it
->util
;
2243 if (!d
->index_status
) {
2245 * This entry is unchanged in the index (relative to the head).
2246 * Therefore, the collect_updated_cb was never called for this
2247 * entry (during the head-vs-index scan) and so the head column
2248 * fields were never set.
2250 * We must have data for the index column (from the
2251 * index-vs-worktree scan (otherwise, this entry should not be
2252 * in the list of changes)).
2254 * Copy index column fields to the head column, so that our
2255 * output looks complete.
2257 assert(d
->mode_head
== 0);
2258 d
->mode_head
= d
->mode_index
;
2259 oidcpy(&d
->oid_head
, &d
->oid_index
);
2262 if (!d
->worktree_status
) {
2264 * This entry is unchanged in the worktree (relative to the index).
2265 * Therefore, the collect_changed_cb was never called for this entry
2266 * (during the index-vs-worktree scan) and so the worktree column
2267 * fields were never set.
2269 * We must have data for the index column (from the head-vs-index
2272 * Copy the index column fields to the worktree column so that
2273 * our output looks complete.
2275 * Note that we only have a mode field in the worktree column
2276 * because the scan code tries really hard to not have to compute it.
2278 assert(d
->mode_worktree
== 0);
2279 d
->mode_worktree
= d
->mode_index
;
2284 * Print porcelain v2 info for tracked entries with changes.
2286 static void wt_porcelain_v2_print_changed_entry(
2287 struct string_list_item
*it
,
2288 struct wt_status
*s
)
2290 struct wt_status_change_data
*d
= it
->util
;
2291 struct strbuf buf
= STRBUF_INIT
;
2292 struct strbuf buf_from
= STRBUF_INIT
;
2293 const char *path
= NULL
;
2294 const char *path_from
= NULL
;
2296 char submodule_token
[5];
2297 char sep_char
, eol_char
;
2299 wt_porcelain_v2_fix_up_changed(it
);
2300 wt_porcelain_v2_submodule_state(d
, submodule_token
);
2302 key
[0] = d
->index_status
? d
->index_status
: '.';
2303 key
[1] = d
->worktree_status
? d
->worktree_status
: '.';
2306 if (s
->null_termination
) {
2308 * In -z mode, we DO NOT C-quote pathnames. Current path is ALWAYS first.
2309 * A single NUL character separates them.
2314 path_from
= d
->rename_source
;
2317 * Path(s) are C-quoted if necessary. Current path is ALWAYS first.
2318 * The source path is only present when necessary.
2319 * A single TAB separates them (because paths can contain spaces
2320 * which are not escaped and C-quoting does escape TAB characters).
2324 path
= quote_path(it
->string
, s
->prefix
, &buf
, 0);
2325 if (d
->rename_source
)
2326 path_from
= quote_path(d
->rename_source
, s
->prefix
, &buf_from
, 0);
2330 fprintf(s
->fp
, "2 %s %s %06o %06o %06o %s %s %c%d %s%c%s%c",
2331 key
, submodule_token
,
2332 d
->mode_head
, d
->mode_index
, d
->mode_worktree
,
2333 oid_to_hex(&d
->oid_head
), oid_to_hex(&d
->oid_index
),
2334 d
->rename_status
, d
->rename_score
,
2335 path
, sep_char
, path_from
, eol_char
);
2337 fprintf(s
->fp
, "1 %s %s %06o %06o %06o %s %s %s%c",
2338 key
, submodule_token
,
2339 d
->mode_head
, d
->mode_index
, d
->mode_worktree
,
2340 oid_to_hex(&d
->oid_head
), oid_to_hex(&d
->oid_index
),
2343 strbuf_release(&buf
);
2344 strbuf_release(&buf_from
);
2348 * Print porcelain v2 status info for unmerged entries.
2350 static void wt_porcelain_v2_print_unmerged_entry(
2351 struct string_list_item
*it
,
2352 struct wt_status
*s
)
2354 struct wt_status_change_data
*d
= it
->util
;
2355 struct index_state
*istate
= s
->repo
->index
;
2356 const struct cache_entry
*ce
;
2357 struct strbuf buf_index
= STRBUF_INIT
;
2358 const char *path_index
= NULL
;
2359 int pos
, stage
, sum
;
2362 struct object_id oid
;
2365 char submodule_token
[5];
2366 char unmerged_prefix
= 'u';
2367 char eol_char
= s
->null_termination
? '\0' : '\n';
2369 wt_porcelain_v2_submodule_state(d
, submodule_token
);
2371 switch (d
->stagemask
) {
2372 case 1: key
= "DD"; break; /* both deleted */
2373 case 2: key
= "AU"; break; /* added by us */
2374 case 3: key
= "UD"; break; /* deleted by them */
2375 case 4: key
= "UA"; break; /* added by them */
2376 case 5: key
= "DU"; break; /* deleted by us */
2377 case 6: key
= "AA"; break; /* both added */
2378 case 7: key
= "UU"; break; /* both modified */
2380 BUG("unhandled unmerged status %x", d
->stagemask
);
2384 * Disregard d.aux.porcelain_v2 data that we accumulated
2385 * for the head and index columns during the scans and
2386 * replace with the actual stage data.
2388 * Note that this is a last-one-wins for each the individual
2389 * stage [123] columns in the event of multiple cache entries
2392 memset(stages
, 0, sizeof(stages
));
2394 pos
= index_name_pos(istate
, it
->string
, strlen(it
->string
));
2397 while (pos
< istate
->cache_nr
) {
2398 ce
= istate
->cache
[pos
++];
2399 stage
= ce_stage(ce
);
2400 if (strcmp(ce
->name
, it
->string
) || !stage
)
2402 stages
[stage
- 1].mode
= ce
->ce_mode
;
2403 oidcpy(&stages
[stage
- 1].oid
, &ce
->oid
);
2404 sum
|= (1 << (stage
- 1));
2406 if (sum
!= d
->stagemask
)
2407 BUG("observed stagemask 0x%x != expected stagemask 0x%x", sum
, d
->stagemask
);
2409 if (s
->null_termination
)
2410 path_index
= it
->string
;
2412 path_index
= quote_path(it
->string
, s
->prefix
, &buf_index
, 0);
2414 fprintf(s
->fp
, "%c %s %s %06o %06o %06o %06o %s %s %s %s%c",
2415 unmerged_prefix
, key
, submodule_token
,
2416 stages
[0].mode
, /* stage 1 */
2417 stages
[1].mode
, /* stage 2 */
2418 stages
[2].mode
, /* stage 3 */
2420 oid_to_hex(&stages
[0].oid
), /* stage 1 */
2421 oid_to_hex(&stages
[1].oid
), /* stage 2 */
2422 oid_to_hex(&stages
[2].oid
), /* stage 3 */
2426 strbuf_release(&buf_index
);
2430 * Print porcelain V2 status info for untracked and ignored entries.
2432 static void wt_porcelain_v2_print_other(
2433 struct string_list_item
*it
,
2434 struct wt_status
*s
,
2437 struct strbuf buf
= STRBUF_INIT
;
2441 if (s
->null_termination
) {
2445 path
= quote_path(it
->string
, s
->prefix
, &buf
, 0);
2449 fprintf(s
->fp
, "%c %s%c", prefix
, path
, eol_char
);
2451 strbuf_release(&buf
);
2455 * Print porcelain V2 status.
2458 * [<v2_changed_items>]*
2459 * [<v2_unmerged_items>]*
2460 * [<v2_untracked_items>]*
2461 * [<v2_ignored_items>]*
2464 static void wt_porcelain_v2_print(struct wt_status
*s
)
2466 struct wt_status_change_data
*d
;
2467 struct string_list_item
*it
;
2471 wt_porcelain_v2_print_tracking(s
);
2474 wt_porcelain_v2_print_stash(s
);
2476 for (i
= 0; i
< s
->change
.nr
; i
++) {
2477 it
= &(s
->change
.items
[i
]);
2480 wt_porcelain_v2_print_changed_entry(it
, s
);
2483 for (i
= 0; i
< s
->change
.nr
; i
++) {
2484 it
= &(s
->change
.items
[i
]);
2487 wt_porcelain_v2_print_unmerged_entry(it
, s
);
2490 for (i
= 0; i
< s
->untracked
.nr
; i
++) {
2491 it
= &(s
->untracked
.items
[i
]);
2492 wt_porcelain_v2_print_other(it
, s
, '?');
2495 for (i
= 0; i
< s
->ignored
.nr
; i
++) {
2496 it
= &(s
->ignored
.items
[i
]);
2497 wt_porcelain_v2_print_other(it
, s
, '!');
2501 void wt_status_print(struct wt_status
*s
)
2503 trace2_data_intmax("status", s
->repo
, "count/changed", s
->change
.nr
);
2504 trace2_data_intmax("status", s
->repo
, "count/untracked",
2506 trace2_data_intmax("status", s
->repo
, "count/ignored", s
->ignored
.nr
);
2508 trace2_region_enter("status", "print", s
->repo
);
2510 switch (s
->status_format
) {
2511 case STATUS_FORMAT_SHORT
:
2512 wt_shortstatus_print(s
);
2514 case STATUS_FORMAT_PORCELAIN
:
2515 wt_porcelain_print(s
);
2517 case STATUS_FORMAT_PORCELAIN_V2
:
2518 wt_porcelain_v2_print(s
);
2520 case STATUS_FORMAT_UNSPECIFIED
:
2521 BUG("finalize_deferred_config() should have been called");
2523 case STATUS_FORMAT_NONE
:
2524 case STATUS_FORMAT_LONG
:
2525 wt_longstatus_print(s
);
2529 trace2_region_leave("status", "print", s
->repo
);
2533 * Returns 1 if there are unstaged changes, 0 otherwise.
2535 int has_unstaged_changes(struct repository
*r
, int ignore_submodules
)
2537 struct rev_info rev_info
;
2540 repo_init_revisions(r
, &rev_info
, NULL
);
2541 if (ignore_submodules
) {
2542 rev_info
.diffopt
.flags
.ignore_submodules
= 1;
2543 rev_info
.diffopt
.flags
.override_submodule_config
= 1;
2545 rev_info
.diffopt
.flags
.quick
= 1;
2546 diff_setup_done(&rev_info
.diffopt
);
2547 result
= run_diff_files(&rev_info
, 0);
2548 return diff_result_code(&rev_info
.diffopt
, result
);
2552 * Returns 1 if there are uncommitted changes, 0 otherwise.
2554 int has_uncommitted_changes(struct repository
*r
,
2555 int ignore_submodules
)
2557 struct rev_info rev_info
;
2560 if (is_index_unborn(r
->index
))
2563 repo_init_revisions(r
, &rev_info
, NULL
);
2564 if (ignore_submodules
)
2565 rev_info
.diffopt
.flags
.ignore_submodules
= 1;
2566 rev_info
.diffopt
.flags
.quick
= 1;
2568 add_head_to_pending(&rev_info
);
2569 if (!rev_info
.pending
.nr
) {
2571 * We have no head (or it's corrupt); use the empty tree,
2572 * which will complain if the index is non-empty.
2574 struct tree
*tree
= lookup_tree(r
, the_hash_algo
->empty_tree
);
2575 add_pending_object(&rev_info
, &tree
->object
, "");
2578 diff_setup_done(&rev_info
.diffopt
);
2579 result
= run_diff_index(&rev_info
, 1);
2580 object_array_clear(&rev_info
.pending
);
2581 return diff_result_code(&rev_info
.diffopt
, result
);
2585 * If the work tree has unstaged or uncommitted changes, dies with the
2586 * appropriate message.
2588 int require_clean_work_tree(struct repository
*r
,
2591 int ignore_submodules
,
2594 struct lock_file lock_file
= LOCK_INIT
;
2597 fd
= repo_hold_locked_index(r
, &lock_file
, 0);
2598 refresh_index(r
->index
, REFRESH_QUIET
, NULL
, NULL
, NULL
);
2600 repo_update_index_if_able(r
, &lock_file
);
2601 rollback_lock_file(&lock_file
);
2603 if (has_unstaged_changes(r
, ignore_submodules
)) {
2604 /* TRANSLATORS: the action is e.g. "pull with rebase" */
2605 error(_("cannot %s: You have unstaged changes."), _(action
));
2609 if (has_uncommitted_changes(r
, ignore_submodules
)) {
2611 error(_("additionally, your index contains uncommitted changes."));
2613 error(_("cannot %s: Your index contains uncommitted changes."),