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
);
620 release_revisions(&rev
);
623 static void wt_status_collect_changes_index(struct wt_status
*s
)
626 struct setup_revision_opt opt
;
628 repo_init_revisions(s
->repo
, &rev
, NULL
);
629 memset(&opt
, 0, sizeof(opt
));
630 opt
.def
= s
->is_initial
? empty_tree_oid_hex() : s
->reference
;
631 setup_revisions(0, NULL
, &rev
, &opt
);
633 rev
.diffopt
.flags
.override_submodule_config
= 1;
634 rev
.diffopt
.ita_invisible_in_index
= 1;
635 if (s
->ignore_submodule_arg
) {
636 handle_ignore_submodules_arg(&rev
.diffopt
, s
->ignore_submodule_arg
);
639 * Unless the user did explicitly request a submodule ignore
640 * mode by passing a command line option we do not ignore any
641 * changed submodule SHA-1s when comparing index and HEAD, no
642 * matter what is configured. Otherwise the user won't be
643 * shown any submodules manually added (and which are
644 * staged to be committed), which would be really confusing.
646 handle_ignore_submodules_arg(&rev
.diffopt
, "dirty");
649 rev
.diffopt
.output_format
|= DIFF_FORMAT_CALLBACK
;
650 rev
.diffopt
.format_callback
= wt_status_collect_updated_cb
;
651 rev
.diffopt
.format_callback_data
= s
;
652 rev
.diffopt
.detect_rename
= s
->detect_rename
>= 0 ? s
->detect_rename
: rev
.diffopt
.detect_rename
;
653 rev
.diffopt
.rename_limit
= s
->rename_limit
>= 0 ? s
->rename_limit
: rev
.diffopt
.rename_limit
;
654 rev
.diffopt
.rename_score
= s
->rename_score
>= 0 ? s
->rename_score
: rev
.diffopt
.rename_score
;
657 * The `recursive` option must be enabled to allow the diff to recurse
658 * into subdirectories of sparse directory index entries. If it is not
659 * enabled, a subdirectory containing file(s) with changes is reported
660 * as "modified", rather than the modified files themselves.
662 rev
.diffopt
.flags
.recursive
= 1;
664 copy_pathspec(&rev
.prune_data
, &s
->pathspec
);
665 run_diff_index(&rev
, 1);
666 release_revisions(&rev
);
667 clear_pathspec(&rev
.prune_data
);
670 static int add_file_to_list(const struct object_id
*oid
,
671 struct strbuf
*base
, const char *path
,
672 unsigned int mode
, void *context
)
674 struct string_list_item
*it
;
675 struct wt_status_change_data
*d
;
676 struct wt_status
*s
= context
;
677 struct strbuf full_name
= STRBUF_INIT
;
680 return READ_TREE_RECURSIVE
;
682 strbuf_add(&full_name
, base
->buf
, base
->len
);
683 strbuf_addstr(&full_name
, path
);
684 it
= string_list_insert(&s
->change
, full_name
.buf
);
691 d
->index_status
= DIFF_STATUS_ADDED
;
692 /* Leave {mode,oid}_head zero for adds. */
693 d
->mode_index
= mode
;
694 oidcpy(&d
->oid_index
, oid
);
696 strbuf_release(&full_name
);
700 static void wt_status_collect_changes_initial(struct wt_status
*s
)
702 struct index_state
*istate
= s
->repo
->index
;
705 for (i
= 0; i
< istate
->cache_nr
; i
++) {
706 struct string_list_item
*it
;
707 struct wt_status_change_data
*d
;
708 const struct cache_entry
*ce
= istate
->cache
[i
];
710 if (!ce_path_match(istate
, ce
, &s
->pathspec
, NULL
))
712 if (ce_intent_to_add(ce
))
714 if (S_ISSPARSEDIR(ce
->ce_mode
)) {
716 * This is a sparse directory entry, so we want to collect all
717 * of the added files within the tree. This requires recursively
718 * expanding the trees to find the elements that are new in this
719 * tree and marking them with DIFF_STATUS_ADDED.
721 struct strbuf base
= STRBUF_INIT
;
722 struct pathspec ps
= { 0 };
723 struct tree
*tree
= lookup_tree(istate
->repo
, &ce
->oid
);
729 strbuf_add(&base
, ce
->name
, ce
->ce_namelen
);
730 read_tree_at(istate
->repo
, tree
, &base
, &ps
,
731 add_file_to_list
, s
);
735 it
= string_list_insert(&s
->change
, ce
->name
);
742 d
->index_status
= DIFF_STATUS_UNMERGED
;
743 d
->stagemask
|= (1 << (ce_stage(ce
) - 1));
745 * Don't bother setting {mode,oid}_{head,index} since the print
746 * code will output the stage values directly and not use the
747 * values in these fields.
751 d
->index_status
= DIFF_STATUS_ADDED
;
752 /* Leave {mode,oid}_head zero for adds. */
753 d
->mode_index
= ce
->ce_mode
;
754 oidcpy(&d
->oid_index
, &ce
->oid
);
760 static void wt_status_collect_untracked(struct wt_status
*s
)
763 struct dir_struct dir
= DIR_INIT
;
764 uint64_t t_begin
= getnanotime();
765 struct index_state
*istate
= s
->repo
->index
;
767 if (!s
->show_untracked_files
)
770 if (s
->show_untracked_files
!= SHOW_ALL_UNTRACKED_FILES
)
772 DIR_SHOW_OTHER_DIRECTORIES
| DIR_HIDE_EMPTY_DIRECTORIES
;
773 if (s
->show_ignored_mode
) {
774 dir
.flags
|= DIR_SHOW_IGNORED_TOO
;
776 if (s
->show_ignored_mode
== SHOW_MATCHING_IGNORED
)
777 dir
.flags
|= DIR_SHOW_IGNORED_TOO_MODE_MATCHING
;
779 dir
.untracked
= istate
->untracked
;
782 setup_standard_excludes(&dir
);
784 fill_directory(&dir
, istate
, &s
->pathspec
);
786 for (i
= 0; i
< dir
.nr
; i
++) {
787 struct dir_entry
*ent
= dir
.entries
[i
];
788 if (index_name_is_other(istate
, ent
->name
, ent
->len
))
789 string_list_insert(&s
->untracked
, ent
->name
);
792 for (i
= 0; i
< dir
.ignored_nr
; i
++) {
793 struct dir_entry
*ent
= dir
.ignored
[i
];
794 if (index_name_is_other(istate
, ent
->name
, ent
->len
))
795 string_list_insert(&s
->ignored
, ent
->name
);
800 if (advice_enabled(ADVICE_STATUS_U_OPTION
))
801 s
->untracked_in_ms
= (getnanotime() - t_begin
) / 1000000;
804 static int has_unmerged(struct wt_status
*s
)
808 for (i
= 0; i
< s
->change
.nr
; i
++) {
809 struct wt_status_change_data
*d
;
810 d
= s
->change
.items
[i
].util
;
817 void wt_status_collect(struct wt_status
*s
)
819 trace2_region_enter("status", "worktrees", s
->repo
);
820 wt_status_collect_changes_worktree(s
);
821 trace2_region_leave("status", "worktrees", s
->repo
);
824 trace2_region_enter("status", "initial", s
->repo
);
825 wt_status_collect_changes_initial(s
);
826 trace2_region_leave("status", "initial", s
->repo
);
828 trace2_region_enter("status", "index", s
->repo
);
829 wt_status_collect_changes_index(s
);
830 trace2_region_leave("status", "index", s
->repo
);
833 trace2_region_enter("status", "untracked", s
->repo
);
834 wt_status_collect_untracked(s
);
835 trace2_region_leave("status", "untracked", s
->repo
);
837 wt_status_get_state(s
->repo
, &s
->state
, s
->branch
&& !strcmp(s
->branch
, "HEAD"));
838 if (s
->state
.merge_in_progress
&& !has_unmerged(s
))
842 void wt_status_collect_free_buffers(struct wt_status
*s
)
844 wt_status_state_free_buffers(&s
->state
);
847 void wt_status_state_free_buffers(struct wt_status_state
*state
)
849 FREE_AND_NULL(state
->branch
);
850 FREE_AND_NULL(state
->onto
);
851 FREE_AND_NULL(state
->detached_from
);
854 static void wt_longstatus_print_unmerged(struct wt_status
*s
)
856 int shown_header
= 0;
859 for (i
= 0; i
< s
->change
.nr
; i
++) {
860 struct wt_status_change_data
*d
;
861 struct string_list_item
*it
;
862 it
= &(s
->change
.items
[i
]);
867 wt_longstatus_print_unmerged_header(s
);
870 wt_longstatus_print_unmerged_data(s
, it
);
873 wt_longstatus_print_trailer(s
);
877 static void wt_longstatus_print_updated(struct wt_status
*s
)
879 int shown_header
= 0;
882 for (i
= 0; i
< s
->change
.nr
; i
++) {
883 struct wt_status_change_data
*d
;
884 struct string_list_item
*it
;
885 it
= &(s
->change
.items
[i
]);
887 if (!d
->index_status
||
888 d
->index_status
== DIFF_STATUS_UNMERGED
)
891 wt_longstatus_print_cached_header(s
);
894 wt_longstatus_print_change_data(s
, WT_STATUS_UPDATED
, it
);
897 wt_longstatus_print_trailer(s
);
903 * 1 : some change but no delete
905 static int wt_status_check_worktree_changes(struct wt_status
*s
,
906 int *dirty_submodules
)
911 *dirty_submodules
= 0;
913 for (i
= 0; i
< s
->change
.nr
; i
++) {
914 struct wt_status_change_data
*d
;
915 d
= s
->change
.items
[i
].util
;
916 if (!d
->worktree_status
||
917 d
->worktree_status
== DIFF_STATUS_UNMERGED
)
921 if (d
->dirty_submodule
)
922 *dirty_submodules
= 1;
923 if (d
->worktree_status
== DIFF_STATUS_DELETED
)
929 static void wt_longstatus_print_changed(struct wt_status
*s
)
931 int i
, dirty_submodules
;
932 int worktree_changes
= wt_status_check_worktree_changes(s
, &dirty_submodules
);
934 if (!worktree_changes
)
937 wt_longstatus_print_dirty_header(s
, worktree_changes
< 0, dirty_submodules
);
939 for (i
= 0; i
< s
->change
.nr
; i
++) {
940 struct wt_status_change_data
*d
;
941 struct string_list_item
*it
;
942 it
= &(s
->change
.items
[i
]);
944 if (!d
->worktree_status
||
945 d
->worktree_status
== DIFF_STATUS_UNMERGED
)
947 wt_longstatus_print_change_data(s
, WT_STATUS_CHANGED
, it
);
949 wt_longstatus_print_trailer(s
);
952 static int stash_count_refs(struct object_id
*ooid
, struct object_id
*noid
,
953 const char *email
, timestamp_t timestamp
, int tz
,
954 const char *message
, void *cb_data
)
961 static int count_stash_entries(void)
964 for_each_reflog_ent("refs/stash", stash_count_refs
, &n
);
968 static void wt_longstatus_print_stash_summary(struct wt_status
*s
)
970 int stash_count
= count_stash_entries();
973 status_printf_ln(s
, GIT_COLOR_NORMAL
,
974 Q_("Your stash currently has %d entry",
975 "Your stash currently has %d entries", stash_count
),
979 static void wt_longstatus_print_submodule_summary(struct wt_status
*s
, int uncommitted
)
981 struct child_process sm_summary
= CHILD_PROCESS_INIT
;
982 struct strbuf cmd_stdout
= STRBUF_INIT
;
983 struct strbuf summary
= STRBUF_INIT
;
984 char *summary_content
;
986 strvec_pushf(&sm_summary
.env_array
, "GIT_INDEX_FILE=%s", s
->index_file
);
988 strvec_push(&sm_summary
.args
, "submodule");
989 strvec_push(&sm_summary
.args
, "summary");
990 strvec_push(&sm_summary
.args
, uncommitted
? "--files" : "--cached");
991 strvec_push(&sm_summary
.args
, "--for-status");
992 strvec_push(&sm_summary
.args
, "--summary-limit");
993 strvec_pushf(&sm_summary
.args
, "%d", s
->submodule_summary
);
995 strvec_push(&sm_summary
.args
, s
->amend
? "HEAD^" : "HEAD");
997 sm_summary
.git_cmd
= 1;
998 sm_summary
.no_stdin
= 1;
1000 capture_command(&sm_summary
, &cmd_stdout
, 1024);
1002 /* prepend header, only if there's an actual output */
1003 if (cmd_stdout
.len
) {
1005 strbuf_addstr(&summary
, _("Submodules changed but not updated:"));
1007 strbuf_addstr(&summary
, _("Submodule changes to be committed:"));
1008 strbuf_addstr(&summary
, "\n\n");
1010 strbuf_addbuf(&summary
, &cmd_stdout
);
1011 strbuf_release(&cmd_stdout
);
1013 if (s
->display_comment_prefix
) {
1015 summary_content
= strbuf_detach(&summary
, &len
);
1016 strbuf_add_commented_lines(&summary
, summary_content
, len
);
1017 free(summary_content
);
1020 fputs(summary
.buf
, s
->fp
);
1021 strbuf_release(&summary
);
1024 static void wt_longstatus_print_other(struct wt_status
*s
,
1025 struct string_list
*l
,
1030 struct strbuf buf
= STRBUF_INIT
;
1031 static struct string_list output
= STRING_LIST_INIT_DUP
;
1032 struct column_options copts
;
1037 wt_longstatus_print_other_header(s
, what
, how
);
1039 for (i
= 0; i
< l
->nr
; i
++) {
1040 struct string_list_item
*it
;
1042 it
= &(l
->items
[i
]);
1043 path
= quote_path(it
->string
, s
->prefix
, &buf
, 0);
1044 if (column_active(s
->colopts
)) {
1045 string_list_append(&output
, path
);
1048 status_printf(s
, color(WT_STATUS_HEADER
, s
), "\t");
1049 status_printf_more(s
, color(WT_STATUS_UNTRACKED
, s
),
1053 strbuf_release(&buf
);
1054 if (!column_active(s
->colopts
))
1057 strbuf_addf(&buf
, "%s%s\t%s",
1058 color(WT_STATUS_HEADER
, s
),
1059 s
->display_comment_prefix
? "#" : "",
1060 color(WT_STATUS_UNTRACKED
, s
));
1061 memset(&copts
, 0, sizeof(copts
));
1063 copts
.indent
= buf
.buf
;
1064 if (want_color(s
->use_color
))
1065 copts
.nl
= GIT_COLOR_RESET
"\n";
1066 print_columns(&output
, s
->colopts
, &copts
);
1067 string_list_clear(&output
, 0);
1068 strbuf_release(&buf
);
1070 status_printf_ln(s
, GIT_COLOR_NORMAL
, "%s", "");
1073 size_t wt_status_locate_end(const char *s
, size_t len
)
1076 struct strbuf pattern
= STRBUF_INIT
;
1078 strbuf_addf(&pattern
, "\n%c %s", comment_line_char
, cut_line
);
1079 if (starts_with(s
, pattern
.buf
+ 1))
1081 else if ((p
= strstr(s
, pattern
.buf
)))
1083 strbuf_release(&pattern
);
1087 void wt_status_append_cut_line(struct strbuf
*buf
)
1089 const char *explanation
= _("Do not modify or remove the line above.\nEverything below it will be ignored.");
1091 strbuf_commented_addf(buf
, "%s", cut_line
);
1092 strbuf_add_commented_lines(buf
, explanation
, strlen(explanation
));
1095 void wt_status_add_cut_line(FILE *fp
)
1097 struct strbuf buf
= STRBUF_INIT
;
1099 wt_status_append_cut_line(&buf
);
1101 strbuf_release(&buf
);
1104 static void wt_longstatus_print_verbose(struct wt_status
*s
)
1106 struct rev_info rev
;
1107 struct setup_revision_opt opt
;
1108 int dirty_submodules
;
1109 const char *c
= color(WT_STATUS_HEADER
, s
);
1111 repo_init_revisions(s
->repo
, &rev
, NULL
);
1112 rev
.diffopt
.flags
.allow_textconv
= 1;
1113 rev
.diffopt
.ita_invisible_in_index
= 1;
1115 memset(&opt
, 0, sizeof(opt
));
1116 opt
.def
= s
->is_initial
? empty_tree_oid_hex() : s
->reference
;
1117 setup_revisions(0, NULL
, &rev
, &opt
);
1119 rev
.diffopt
.output_format
|= DIFF_FORMAT_PATCH
;
1120 rev
.diffopt
.detect_rename
= s
->detect_rename
>= 0 ? s
->detect_rename
: rev
.diffopt
.detect_rename
;
1121 rev
.diffopt
.rename_limit
= s
->rename_limit
>= 0 ? s
->rename_limit
: rev
.diffopt
.rename_limit
;
1122 rev
.diffopt
.rename_score
= s
->rename_score
>= 0 ? s
->rename_score
: rev
.diffopt
.rename_score
;
1123 rev
.diffopt
.file
= s
->fp
;
1124 rev
.diffopt
.close_file
= 0;
1126 * If we're not going to stdout, then we definitely don't
1127 * want color, since we are going to the commit message
1128 * file (and even the "auto" setting won't work, since it
1129 * will have checked isatty on stdout). But we then do want
1130 * to insert the scissor line here to reliably remove the
1131 * diff before committing.
1133 if (s
->fp
!= stdout
) {
1134 rev
.diffopt
.use_color
= 0;
1135 wt_status_add_cut_line(s
->fp
);
1137 if (s
->verbose
> 1 && s
->committable
) {
1138 /* print_updated() printed a header, so do we */
1139 if (s
->fp
!= stdout
)
1140 wt_longstatus_print_trailer(s
);
1141 status_printf_ln(s
, c
, _("Changes to be committed:"));
1142 rev
.diffopt
.a_prefix
= "c/";
1143 rev
.diffopt
.b_prefix
= "i/";
1144 } /* else use prefix as per user config */
1145 run_diff_index(&rev
, 1);
1146 if (s
->verbose
> 1 &&
1147 wt_status_check_worktree_changes(s
, &dirty_submodules
)) {
1148 status_printf_ln(s
, c
,
1149 "--------------------------------------------------");
1150 status_printf_ln(s
, c
, _("Changes not staged for commit:"));
1152 rev
.diffopt
.a_prefix
= "i/";
1153 rev
.diffopt
.b_prefix
= "w/";
1154 run_diff_files(&rev
, 0);
1156 release_revisions(&rev
);
1159 static void wt_longstatus_print_tracking(struct wt_status
*s
)
1161 struct strbuf sb
= STRBUF_INIT
;
1162 const char *cp
, *ep
, *branch_name
;
1163 struct branch
*branch
;
1164 char comment_line_string
[3];
1166 uint64_t t_begin
= 0;
1168 assert(s
->branch
&& !s
->is_initial
);
1169 if (!skip_prefix(s
->branch
, "refs/heads/", &branch_name
))
1171 branch
= branch_get(branch_name
);
1173 t_begin
= getnanotime();
1175 if (!format_tracking_info(branch
, &sb
, s
->ahead_behind_flags
))
1178 if (advice_enabled(ADVICE_STATUS_AHEAD_BEHIND_WARNING
) &&
1179 s
->ahead_behind_flags
== AHEAD_BEHIND_FULL
) {
1180 uint64_t t_delta_in_ms
= (getnanotime() - t_begin
) / 1000000;
1181 if (t_delta_in_ms
> AB_DELAY_WARNING_IN_MS
) {
1182 strbuf_addf(&sb
, _("\n"
1183 "It took %.2f seconds to compute the branch ahead/behind values.\n"
1184 "You can use '--no-ahead-behind' to avoid this.\n"),
1185 t_delta_in_ms
/ 1000.0);
1190 if (s
->display_comment_prefix
) {
1191 comment_line_string
[i
++] = comment_line_char
;
1192 comment_line_string
[i
++] = ' ';
1194 comment_line_string
[i
] = '\0';
1196 for (cp
= sb
.buf
; (ep
= strchr(cp
, '\n')) != NULL
; cp
= ep
+ 1)
1197 color_fprintf_ln(s
->fp
, color(WT_STATUS_HEADER
, s
),
1198 "%s%.*s", comment_line_string
,
1199 (int)(ep
- cp
), cp
);
1200 if (s
->display_comment_prefix
)
1201 color_fprintf_ln(s
->fp
, color(WT_STATUS_HEADER
, s
), "%c",
1205 strbuf_release(&sb
);
1208 static void show_merge_in_progress(struct wt_status
*s
,
1211 if (has_unmerged(s
)) {
1212 status_printf_ln(s
, color
, _("You have unmerged paths."));
1214 status_printf_ln(s
, color
,
1215 _(" (fix conflicts and run \"git commit\")"));
1216 status_printf_ln(s
, color
,
1217 _(" (use \"git merge --abort\" to abort the merge)"));
1220 status_printf_ln(s
, color
,
1221 _("All conflicts fixed but you are still merging."));
1223 status_printf_ln(s
, color
,
1224 _(" (use \"git commit\" to conclude merge)"));
1226 wt_longstatus_print_trailer(s
);
1229 static void show_am_in_progress(struct wt_status
*s
,
1234 status_printf_ln(s
, color
,
1235 _("You are in the middle of an am session."));
1236 if (s
->state
.am_empty_patch
)
1237 status_printf_ln(s
, color
,
1238 _("The current patch is empty."));
1240 am_empty_patch
= s
->state
.am_empty_patch
;
1241 if (!am_empty_patch
)
1242 status_printf_ln(s
, color
,
1243 _(" (fix conflicts and then run \"git am --continue\")"));
1244 status_printf_ln(s
, color
,
1245 _(" (use \"git am --skip\" to skip this patch)"));
1247 status_printf_ln(s
, color
,
1248 _(" (use \"git am --allow-empty\" to record this patch as an empty commit)"));
1249 status_printf_ln(s
, color
,
1250 _(" (use \"git am --abort\" to restore the original branch)"));
1252 wt_longstatus_print_trailer(s
);
1255 static char *read_line_from_git_path(const char *filename
)
1257 struct strbuf buf
= STRBUF_INIT
;
1258 FILE *fp
= fopen_or_warn(git_path("%s", filename
), "r");
1261 strbuf_release(&buf
);
1264 strbuf_getline_lf(&buf
, fp
);
1266 return strbuf_detach(&buf
, NULL
);
1268 strbuf_release(&buf
);
1273 static int split_commit_in_progress(struct wt_status
*s
)
1275 int split_in_progress
= 0;
1276 char *head
, *orig_head
, *rebase_amend
, *rebase_orig_head
;
1278 if ((!s
->amend
&& !s
->nowarn
&& !s
->workdir_dirty
) ||
1279 !s
->branch
|| strcmp(s
->branch
, "HEAD"))
1282 head
= read_line_from_git_path("HEAD");
1283 orig_head
= read_line_from_git_path("ORIG_HEAD");
1284 rebase_amend
= read_line_from_git_path("rebase-merge/amend");
1285 rebase_orig_head
= read_line_from_git_path("rebase-merge/orig-head");
1287 if (!head
|| !orig_head
|| !rebase_amend
|| !rebase_orig_head
)
1288 ; /* fall through, no split in progress */
1289 else if (!strcmp(rebase_amend
, rebase_orig_head
))
1290 split_in_progress
= !!strcmp(head
, rebase_amend
);
1291 else if (strcmp(orig_head
, rebase_orig_head
))
1292 split_in_progress
= 1;
1297 free(rebase_orig_head
);
1299 return split_in_progress
;
1304 * "pick d6a2f0303e897ec257dd0e0a39a5ccb709bc2047 some message"
1306 * "pick d6a2f03 some message"
1308 * The function assumes that the line does not contain useless spaces
1309 * before or after the command.
1311 static void abbrev_oid_in_line(struct strbuf
*line
)
1313 struct strbuf
**split
;
1316 if (starts_with(line
->buf
, "exec ") ||
1317 starts_with(line
->buf
, "x ") ||
1318 starts_with(line
->buf
, "label ") ||
1319 starts_with(line
->buf
, "l "))
1322 split
= strbuf_split_max(line
, ' ', 3);
1323 if (split
[0] && split
[1]) {
1324 struct object_id oid
;
1327 * strbuf_split_max left a space. Trim it and re-add
1328 * it after abbreviation.
1330 strbuf_trim(split
[1]);
1331 if (!get_oid(split
[1]->buf
, &oid
)) {
1332 strbuf_reset(split
[1]);
1333 strbuf_add_unique_abbrev(split
[1], &oid
,
1335 strbuf_addch(split
[1], ' ');
1337 for (i
= 0; split
[i
]; i
++)
1338 strbuf_addbuf(line
, split
[i
]);
1341 strbuf_list_free(split
);
1344 static int read_rebase_todolist(const char *fname
, struct string_list
*lines
)
1346 struct strbuf line
= STRBUF_INIT
;
1347 FILE *f
= fopen(git_path("%s", fname
), "r");
1350 if (errno
== ENOENT
)
1352 die_errno("Could not open file %s for reading",
1353 git_path("%s", fname
));
1355 while (!strbuf_getline_lf(&line
, f
)) {
1356 if (line
.len
&& line
.buf
[0] == comment_line_char
)
1361 abbrev_oid_in_line(&line
);
1362 string_list_append(lines
, line
.buf
);
1365 strbuf_release(&line
);
1369 static void show_rebase_information(struct wt_status
*s
,
1372 if (s
->state
.rebase_interactive_in_progress
) {
1374 int nr_lines_to_show
= 2;
1376 struct string_list have_done
= STRING_LIST_INIT_DUP
;
1377 struct string_list yet_to_do
= STRING_LIST_INIT_DUP
;
1379 read_rebase_todolist("rebase-merge/done", &have_done
);
1380 if (read_rebase_todolist("rebase-merge/git-rebase-todo",
1382 status_printf_ln(s
, color
,
1383 _("git-rebase-todo is missing."));
1384 if (have_done
.nr
== 0)
1385 status_printf_ln(s
, color
, _("No commands done."));
1387 status_printf_ln(s
, color
,
1388 Q_("Last command done (%"PRIuMAX
" command done):",
1389 "Last commands done (%"PRIuMAX
" commands done):",
1391 (uintmax_t)have_done
.nr
);
1392 for (i
= (have_done
.nr
> nr_lines_to_show
)
1393 ? have_done
.nr
- nr_lines_to_show
: 0;
1396 status_printf_ln(s
, color
, " %s", have_done
.items
[i
].string
);
1397 if (have_done
.nr
> nr_lines_to_show
&& s
->hints
)
1398 status_printf_ln(s
, color
,
1399 _(" (see more in file %s)"), git_path("rebase-merge/done"));
1402 if (yet_to_do
.nr
== 0)
1403 status_printf_ln(s
, color
,
1404 _("No commands remaining."));
1406 status_printf_ln(s
, color
,
1407 Q_("Next command to do (%"PRIuMAX
" remaining command):",
1408 "Next commands to do (%"PRIuMAX
" remaining commands):",
1410 (uintmax_t)yet_to_do
.nr
);
1411 for (i
= 0; i
< nr_lines_to_show
&& i
< yet_to_do
.nr
; i
++)
1412 status_printf_ln(s
, color
, " %s", yet_to_do
.items
[i
].string
);
1414 status_printf_ln(s
, color
,
1415 _(" (use \"git rebase --edit-todo\" to view and edit)"));
1417 string_list_clear(&yet_to_do
, 0);
1418 string_list_clear(&have_done
, 0);
1422 static void print_rebase_state(struct wt_status
*s
,
1425 if (s
->state
.branch
)
1426 status_printf_ln(s
, color
,
1427 _("You are currently rebasing branch '%s' on '%s'."),
1431 status_printf_ln(s
, color
,
1432 _("You are currently rebasing."));
1435 static void show_rebase_in_progress(struct wt_status
*s
,
1440 show_rebase_information(s
, color
);
1441 if (has_unmerged(s
)) {
1442 print_rebase_state(s
, color
);
1444 status_printf_ln(s
, color
,
1445 _(" (fix conflicts and then run \"git rebase --continue\")"));
1446 status_printf_ln(s
, color
,
1447 _(" (use \"git rebase --skip\" to skip this patch)"));
1448 status_printf_ln(s
, color
,
1449 _(" (use \"git rebase --abort\" to check out the original branch)"));
1451 } else if (s
->state
.rebase_in_progress
||
1452 !stat(git_path_merge_msg(s
->repo
), &st
)) {
1453 print_rebase_state(s
, color
);
1455 status_printf_ln(s
, color
,
1456 _(" (all conflicts fixed: run \"git rebase --continue\")"));
1457 } else if (split_commit_in_progress(s
)) {
1458 if (s
->state
.branch
)
1459 status_printf_ln(s
, color
,
1460 _("You are currently splitting a commit while rebasing branch '%s' on '%s'."),
1464 status_printf_ln(s
, color
,
1465 _("You are currently splitting a commit during a rebase."));
1467 status_printf_ln(s
, color
,
1468 _(" (Once your working directory is clean, run \"git rebase --continue\")"));
1470 if (s
->state
.branch
)
1471 status_printf_ln(s
, color
,
1472 _("You are currently editing a commit while rebasing branch '%s' on '%s'."),
1476 status_printf_ln(s
, color
,
1477 _("You are currently editing a commit during a rebase."));
1478 if (s
->hints
&& !s
->amend
) {
1479 status_printf_ln(s
, color
,
1480 _(" (use \"git commit --amend\" to amend the current commit)"));
1481 status_printf_ln(s
, color
,
1482 _(" (use \"git rebase --continue\" once you are satisfied with your changes)"));
1485 wt_longstatus_print_trailer(s
);
1488 static void show_cherry_pick_in_progress(struct wt_status
*s
,
1491 if (is_null_oid(&s
->state
.cherry_pick_head_oid
))
1492 status_printf_ln(s
, color
,
1493 _("Cherry-pick currently in progress."));
1495 status_printf_ln(s
, color
,
1496 _("You are currently cherry-picking commit %s."),
1497 find_unique_abbrev(&s
->state
.cherry_pick_head_oid
,
1501 if (has_unmerged(s
))
1502 status_printf_ln(s
, color
,
1503 _(" (fix conflicts and run \"git cherry-pick --continue\")"));
1504 else if (is_null_oid(&s
->state
.cherry_pick_head_oid
))
1505 status_printf_ln(s
, color
,
1506 _(" (run \"git cherry-pick --continue\" to continue)"));
1508 status_printf_ln(s
, color
,
1509 _(" (all conflicts fixed: run \"git cherry-pick --continue\")"));
1510 status_printf_ln(s
, color
,
1511 _(" (use \"git cherry-pick --skip\" to skip this patch)"));
1512 status_printf_ln(s
, color
,
1513 _(" (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"));
1515 wt_longstatus_print_trailer(s
);
1518 static void show_revert_in_progress(struct wt_status
*s
,
1521 if (is_null_oid(&s
->state
.revert_head_oid
))
1522 status_printf_ln(s
, color
,
1523 _("Revert currently in progress."));
1525 status_printf_ln(s
, color
,
1526 _("You are currently reverting commit %s."),
1527 find_unique_abbrev(&s
->state
.revert_head_oid
,
1530 if (has_unmerged(s
))
1531 status_printf_ln(s
, color
,
1532 _(" (fix conflicts and run \"git revert --continue\")"));
1533 else if (is_null_oid(&s
->state
.revert_head_oid
))
1534 status_printf_ln(s
, color
,
1535 _(" (run \"git revert --continue\" to continue)"));
1537 status_printf_ln(s
, color
,
1538 _(" (all conflicts fixed: run \"git revert --continue\")"));
1539 status_printf_ln(s
, color
,
1540 _(" (use \"git revert --skip\" to skip this patch)"));
1541 status_printf_ln(s
, color
,
1542 _(" (use \"git revert --abort\" to cancel the revert operation)"));
1544 wt_longstatus_print_trailer(s
);
1547 static void show_bisect_in_progress(struct wt_status
*s
,
1550 if (s
->state
.branch
)
1551 status_printf_ln(s
, color
,
1552 _("You are currently bisecting, started from branch '%s'."),
1555 status_printf_ln(s
, color
,
1556 _("You are currently bisecting."));
1558 status_printf_ln(s
, color
,
1559 _(" (use \"git bisect reset\" to get back to the original branch)"));
1560 wt_longstatus_print_trailer(s
);
1563 static void show_sparse_checkout_in_use(struct wt_status
*s
,
1566 if (s
->state
.sparse_checkout_percentage
== SPARSE_CHECKOUT_DISABLED
)
1569 if (s
->state
.sparse_checkout_percentage
== SPARSE_CHECKOUT_SPARSE_INDEX
)
1570 status_printf_ln(s
, color
, _("You are in a sparse checkout."));
1572 status_printf_ln(s
, color
,
1573 _("You are in a sparse checkout with %d%% of tracked files present."),
1574 s
->state
.sparse_checkout_percentage
);
1575 wt_longstatus_print_trailer(s
);
1579 * Extract branch information from rebase/bisect
1581 static char *get_branch(const struct worktree
*wt
, const char *path
)
1583 struct strbuf sb
= STRBUF_INIT
;
1584 struct object_id oid
;
1585 const char *branch_name
;
1587 if (strbuf_read_file(&sb
, worktree_git_path(wt
, "%s", path
), 0) <= 0)
1590 while (sb
.len
&& sb
.buf
[sb
.len
- 1] == '\n')
1591 strbuf_setlen(&sb
, sb
.len
- 1);
1594 if (skip_prefix(sb
.buf
, "refs/heads/", &branch_name
))
1595 strbuf_remove(&sb
, 0, branch_name
- sb
.buf
);
1596 else if (starts_with(sb
.buf
, "refs/"))
1598 else if (!get_oid_hex(sb
.buf
, &oid
)) {
1600 strbuf_add_unique_abbrev(&sb
, &oid
, DEFAULT_ABBREV
);
1601 } else if (!strcmp(sb
.buf
, "detached HEAD")) /* rebase */
1605 return strbuf_detach(&sb
, NULL
);
1608 strbuf_release(&sb
);
1612 struct grab_1st_switch_cbdata
{
1614 struct object_id noid
;
1617 static int grab_1st_switch(struct object_id
*ooid
, struct object_id
*noid
,
1618 const char *email
, timestamp_t timestamp
, int tz
,
1619 const char *message
, void *cb_data
)
1621 struct grab_1st_switch_cbdata
*cb
= cb_data
;
1622 const char *target
= NULL
, *end
;
1624 if (!skip_prefix(message
, "checkout: moving from ", &message
))
1626 target
= strstr(message
, " to ");
1629 target
+= strlen(" to ");
1630 strbuf_reset(&cb
->buf
);
1631 oidcpy(&cb
->noid
, noid
);
1632 end
= strchrnul(target
, '\n');
1633 strbuf_add(&cb
->buf
, target
, end
- target
);
1634 if (!strcmp(cb
->buf
.buf
, "HEAD")) {
1635 /* HEAD is relative. Resolve it to the right reflog entry. */
1636 strbuf_reset(&cb
->buf
);
1637 strbuf_add_unique_abbrev(&cb
->buf
, noid
, DEFAULT_ABBREV
);
1642 static void wt_status_get_detached_from(struct repository
*r
,
1643 struct wt_status_state
*state
)
1645 struct grab_1st_switch_cbdata cb
;
1646 struct commit
*commit
;
1647 struct object_id oid
;
1650 strbuf_init(&cb
.buf
, 0);
1651 if (for_each_reflog_ent_reverse("HEAD", grab_1st_switch
, &cb
) <= 0) {
1652 strbuf_release(&cb
.buf
);
1656 if (dwim_ref(cb
.buf
.buf
, cb
.buf
.len
, &oid
, &ref
, 1) == 1 &&
1657 /* oid is a commit? match without further lookup */
1658 (oideq(&cb
.noid
, &oid
) ||
1659 /* perhaps oid is a tag, try to dereference to a commit */
1660 ((commit
= lookup_commit_reference_gently(r
, &oid
, 1)) != NULL
&&
1661 oideq(&cb
.noid
, &commit
->object
.oid
)))) {
1662 const char *from
= ref
;
1663 if (!skip_prefix(from
, "refs/tags/", &from
))
1664 skip_prefix(from
, "refs/remotes/", &from
);
1665 state
->detached_from
= xstrdup(from
);
1667 state
->detached_from
=
1668 xstrdup(find_unique_abbrev(&cb
.noid
, DEFAULT_ABBREV
));
1669 oidcpy(&state
->detached_oid
, &cb
.noid
);
1670 state
->detached_at
= !get_oid("HEAD", &oid
) &&
1671 oideq(&oid
, &state
->detached_oid
);
1674 strbuf_release(&cb
.buf
);
1677 int wt_status_check_rebase(const struct worktree
*wt
,
1678 struct wt_status_state
*state
)
1682 if (!stat(worktree_git_path(wt
, "rebase-apply"), &st
)) {
1683 if (!stat(worktree_git_path(wt
, "rebase-apply/applying"), &st
)) {
1684 state
->am_in_progress
= 1;
1685 if (!stat(worktree_git_path(wt
, "rebase-apply/patch"), &st
) && !st
.st_size
)
1686 state
->am_empty_patch
= 1;
1688 state
->rebase_in_progress
= 1;
1689 state
->branch
= get_branch(wt
, "rebase-apply/head-name");
1690 state
->onto
= get_branch(wt
, "rebase-apply/onto");
1692 } else if (!stat(worktree_git_path(wt
, "rebase-merge"), &st
)) {
1693 if (!stat(worktree_git_path(wt
, "rebase-merge/interactive"), &st
))
1694 state
->rebase_interactive_in_progress
= 1;
1696 state
->rebase_in_progress
= 1;
1697 state
->branch
= get_branch(wt
, "rebase-merge/head-name");
1698 state
->onto
= get_branch(wt
, "rebase-merge/onto");
1704 int wt_status_check_bisect(const struct worktree
*wt
,
1705 struct wt_status_state
*state
)
1709 if (!stat(worktree_git_path(wt
, "BISECT_LOG"), &st
)) {
1710 state
->bisect_in_progress
= 1;
1711 state
->branch
= get_branch(wt
, "BISECT_START");
1717 static void wt_status_check_sparse_checkout(struct repository
*r
,
1718 struct wt_status_state
*state
)
1720 int skip_worktree
= 0;
1723 if (!core_apply_sparse_checkout
|| r
->index
->cache_nr
== 0) {
1725 * Don't compute percentage of checked out files if we
1726 * aren't in a sparse checkout or would get division by 0.
1728 state
->sparse_checkout_percentage
= SPARSE_CHECKOUT_DISABLED
;
1732 if (r
->index
->sparse_index
) {
1733 state
->sparse_checkout_percentage
= SPARSE_CHECKOUT_SPARSE_INDEX
;
1737 for (i
= 0; i
< r
->index
->cache_nr
; i
++) {
1738 struct cache_entry
*ce
= r
->index
->cache
[i
];
1739 if (ce_skip_worktree(ce
))
1743 state
->sparse_checkout_percentage
=
1744 100 - (100 * skip_worktree
)/r
->index
->cache_nr
;
1747 void wt_status_get_state(struct repository
*r
,
1748 struct wt_status_state
*state
,
1749 int get_detached_from
)
1752 struct object_id oid
;
1753 enum replay_action action
;
1755 if (!stat(git_path_merge_head(r
), &st
)) {
1756 wt_status_check_rebase(NULL
, state
);
1757 state
->merge_in_progress
= 1;
1758 } else if (wt_status_check_rebase(NULL
, state
)) {
1760 } else if (refs_ref_exists(get_main_ref_store(r
), "CHERRY_PICK_HEAD") &&
1761 !get_oid("CHERRY_PICK_HEAD", &oid
)) {
1762 state
->cherry_pick_in_progress
= 1;
1763 oidcpy(&state
->cherry_pick_head_oid
, &oid
);
1765 wt_status_check_bisect(NULL
, state
);
1766 if (refs_ref_exists(get_main_ref_store(r
), "REVERT_HEAD") &&
1767 !get_oid("REVERT_HEAD", &oid
)) {
1768 state
->revert_in_progress
= 1;
1769 oidcpy(&state
->revert_head_oid
, &oid
);
1771 if (!sequencer_get_last_command(r
, &action
)) {
1772 if (action
== REPLAY_PICK
) {
1773 state
->cherry_pick_in_progress
= 1;
1774 oidcpy(&state
->cherry_pick_head_oid
, null_oid());
1776 state
->revert_in_progress
= 1;
1777 oidcpy(&state
->revert_head_oid
, null_oid());
1780 if (get_detached_from
)
1781 wt_status_get_detached_from(r
, state
);
1782 wt_status_check_sparse_checkout(r
, state
);
1785 static void wt_longstatus_print_state(struct wt_status
*s
)
1787 const char *state_color
= color(WT_STATUS_HEADER
, s
);
1788 struct wt_status_state
*state
= &s
->state
;
1790 if (state
->merge_in_progress
) {
1791 if (state
->rebase_interactive_in_progress
) {
1792 show_rebase_information(s
, state_color
);
1795 show_merge_in_progress(s
, state_color
);
1796 } else if (state
->am_in_progress
)
1797 show_am_in_progress(s
, state_color
);
1798 else if (state
->rebase_in_progress
|| state
->rebase_interactive_in_progress
)
1799 show_rebase_in_progress(s
, state_color
);
1800 else if (state
->cherry_pick_in_progress
)
1801 show_cherry_pick_in_progress(s
, state_color
);
1802 else if (state
->revert_in_progress
)
1803 show_revert_in_progress(s
, state_color
);
1804 if (state
->bisect_in_progress
)
1805 show_bisect_in_progress(s
, state_color
);
1807 if (state
->sparse_checkout_percentage
!= SPARSE_CHECKOUT_DISABLED
)
1808 show_sparse_checkout_in_use(s
, state_color
);
1811 static void wt_longstatus_print(struct wt_status
*s
)
1813 const char *branch_color
= color(WT_STATUS_ONBRANCH
, s
);
1814 const char *branch_status_color
= color(WT_STATUS_HEADER
, s
);
1817 const char *on_what
= _("On branch ");
1818 const char *branch_name
= s
->branch
;
1819 if (!strcmp(branch_name
, "HEAD")) {
1820 branch_status_color
= color(WT_STATUS_NOBRANCH
, s
);
1821 if (s
->state
.rebase_in_progress
||
1822 s
->state
.rebase_interactive_in_progress
) {
1823 if (s
->state
.rebase_interactive_in_progress
)
1824 on_what
= _("interactive rebase in progress; onto ");
1826 on_what
= _("rebase in progress; onto ");
1827 branch_name
= s
->state
.onto
;
1828 } else if (s
->state
.detached_from
) {
1829 branch_name
= s
->state
.detached_from
;
1830 if (s
->state
.detached_at
)
1831 on_what
= _("HEAD detached at ");
1833 on_what
= _("HEAD detached from ");
1836 on_what
= _("Not currently on any branch.");
1839 skip_prefix(branch_name
, "refs/heads/", &branch_name
);
1840 status_printf(s
, color(WT_STATUS_HEADER
, s
), "%s", "");
1841 status_printf_more(s
, branch_status_color
, "%s", on_what
);
1842 status_printf_more(s
, branch_color
, "%s\n", branch_name
);
1844 wt_longstatus_print_tracking(s
);
1847 wt_longstatus_print_state(s
);
1849 if (s
->is_initial
) {
1850 status_printf_ln(s
, color(WT_STATUS_HEADER
, s
), "%s", "");
1851 status_printf_ln(s
, color(WT_STATUS_HEADER
, s
),
1853 ? _("Initial commit")
1854 : _("No commits yet"));
1855 status_printf_ln(s
, color(WT_STATUS_HEADER
, s
), "%s", "");
1858 wt_longstatus_print_updated(s
);
1859 wt_longstatus_print_unmerged(s
);
1860 wt_longstatus_print_changed(s
);
1861 if (s
->submodule_summary
&&
1862 (!s
->ignore_submodule_arg
||
1863 strcmp(s
->ignore_submodule_arg
, "all"))) {
1864 wt_longstatus_print_submodule_summary(s
, 0); /* staged */
1865 wt_longstatus_print_submodule_summary(s
, 1); /* unstaged */
1867 if (s
->show_untracked_files
) {
1868 wt_longstatus_print_other(s
, &s
->untracked
, _("Untracked files"), "add");
1869 if (s
->show_ignored_mode
)
1870 wt_longstatus_print_other(s
, &s
->ignored
, _("Ignored files"), "add -f");
1871 if (advice_enabled(ADVICE_STATUS_U_OPTION
) && 2000 < s
->untracked_in_ms
) {
1872 status_printf_ln(s
, GIT_COLOR_NORMAL
, "%s", "");
1873 status_printf_ln(s
, GIT_COLOR_NORMAL
,
1874 _("It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1875 "may speed it up, but you have to be careful not to forget to add\n"
1876 "new files yourself (see 'git help status')."),
1877 s
->untracked_in_ms
/ 1000.0);
1879 } else if (s
->committable
)
1880 status_printf_ln(s
, GIT_COLOR_NORMAL
, _("Untracked files not listed%s"),
1882 ? _(" (use -u option to show untracked files)") : "");
1885 wt_longstatus_print_verbose(s
);
1886 if (!s
->committable
) {
1888 status_printf_ln(s
, GIT_COLOR_NORMAL
, _("No changes"));
1891 else if (s
->workdir_dirty
) {
1893 fprintf(s
->fp
, _("no changes added to commit "
1894 "(use \"git add\" and/or "
1895 "\"git commit -a\")\n"));
1897 fprintf(s
->fp
, _("no changes added to "
1899 } else if (s
->untracked
.nr
) {
1901 fprintf(s
->fp
, _("nothing added to commit but "
1902 "untracked files present (use "
1903 "\"git add\" to track)\n"));
1905 fprintf(s
->fp
, _("nothing added to commit but "
1906 "untracked files present\n"));
1907 } else if (s
->is_initial
) {
1909 fprintf(s
->fp
, _("nothing to commit (create/"
1910 "copy files and use \"git "
1911 "add\" to track)\n"));
1913 fprintf(s
->fp
, _("nothing to commit\n"));
1914 } else if (!s
->show_untracked_files
) {
1916 fprintf(s
->fp
, _("nothing to commit (use -u to "
1917 "show untracked files)\n"));
1919 fprintf(s
->fp
, _("nothing to commit\n"));
1921 fprintf(s
->fp
, _("nothing to commit, working tree "
1925 wt_longstatus_print_stash_summary(s
);
1928 static void wt_shortstatus_unmerged(struct string_list_item
*it
,
1929 struct wt_status
*s
)
1931 struct wt_status_change_data
*d
= it
->util
;
1932 const char *how
= "??";
1934 switch (d
->stagemask
) {
1935 case 1: how
= "DD"; break; /* both deleted */
1936 case 2: how
= "AU"; break; /* added by us */
1937 case 3: how
= "UD"; break; /* deleted by them */
1938 case 4: how
= "UA"; break; /* added by them */
1939 case 5: how
= "DU"; break; /* deleted by us */
1940 case 6: how
= "AA"; break; /* both added */
1941 case 7: how
= "UU"; break; /* both modified */
1943 color_fprintf(s
->fp
, color(WT_STATUS_UNMERGED
, s
), "%s", how
);
1944 if (s
->null_termination
) {
1945 fprintf(s
->fp
, " %s%c", it
->string
, 0);
1947 struct strbuf onebuf
= STRBUF_INIT
;
1949 one
= quote_path(it
->string
, s
->prefix
, &onebuf
, QUOTE_PATH_QUOTE_SP
);
1950 fprintf(s
->fp
, " %s\n", one
);
1951 strbuf_release(&onebuf
);
1955 static void wt_shortstatus_status(struct string_list_item
*it
,
1956 struct wt_status
*s
)
1958 struct wt_status_change_data
*d
= it
->util
;
1960 if (d
->index_status
)
1961 color_fprintf(s
->fp
, color(WT_STATUS_UPDATED
, s
), "%c", d
->index_status
);
1964 if (d
->worktree_status
)
1965 color_fprintf(s
->fp
, color(WT_STATUS_CHANGED
, s
), "%c", d
->worktree_status
);
1969 if (s
->null_termination
) {
1970 fprintf(s
->fp
, "%s%c", it
->string
, 0);
1971 if (d
->rename_source
)
1972 fprintf(s
->fp
, "%s%c", d
->rename_source
, 0);
1974 struct strbuf onebuf
= STRBUF_INIT
;
1977 if (d
->rename_source
) {
1978 one
= quote_path(d
->rename_source
, s
->prefix
, &onebuf
,
1979 QUOTE_PATH_QUOTE_SP
);
1980 fprintf(s
->fp
, "%s -> ", one
);
1981 strbuf_release(&onebuf
);
1983 one
= quote_path(it
->string
, s
->prefix
, &onebuf
, QUOTE_PATH_QUOTE_SP
);
1984 fprintf(s
->fp
, "%s\n", one
);
1985 strbuf_release(&onebuf
);
1989 static void wt_shortstatus_other(struct string_list_item
*it
,
1990 struct wt_status
*s
, const char *sign
)
1992 if (s
->null_termination
) {
1993 fprintf(s
->fp
, "%s %s%c", sign
, it
->string
, 0);
1995 struct strbuf onebuf
= STRBUF_INIT
;
1997 one
= quote_path(it
->string
, s
->prefix
, &onebuf
, QUOTE_PATH_QUOTE_SP
);
1998 color_fprintf(s
->fp
, color(WT_STATUS_UNTRACKED
, s
), "%s", sign
);
1999 fprintf(s
->fp
, " %s\n", one
);
2000 strbuf_release(&onebuf
);
2004 static void wt_shortstatus_print_tracking(struct wt_status
*s
)
2006 struct branch
*branch
;
2007 const char *header_color
= color(WT_STATUS_HEADER
, s
);
2008 const char *branch_color_local
= color(WT_STATUS_LOCAL_BRANCH
, s
);
2009 const char *branch_color_remote
= color(WT_STATUS_REMOTE_BRANCH
, s
);
2013 const char *branch_name
;
2014 int num_ours
, num_theirs
, sti
;
2015 int upstream_is_gone
= 0;
2017 color_fprintf(s
->fp
, color(WT_STATUS_HEADER
, s
), "## ");
2021 branch_name
= s
->branch
;
2023 #define LABEL(string) (s->no_gettext ? (string) : _(string))
2026 color_fprintf(s
->fp
, header_color
, LABEL(N_("No commits yet on ")));
2028 if (!strcmp(s
->branch
, "HEAD")) {
2029 color_fprintf(s
->fp
, color(WT_STATUS_NOBRANCH
, s
), "%s",
2030 LABEL(N_("HEAD (no branch)")));
2034 skip_prefix(branch_name
, "refs/heads/", &branch_name
);
2036 branch
= branch_get(branch_name
);
2038 color_fprintf(s
->fp
, branch_color_local
, "%s", branch_name
);
2040 sti
= stat_tracking_info(branch
, &num_ours
, &num_theirs
, &base
,
2041 0, s
->ahead_behind_flags
);
2046 upstream_is_gone
= 1;
2049 short_base
= shorten_unambiguous_ref(base
, 0);
2050 color_fprintf(s
->fp
, header_color
, "...");
2051 color_fprintf(s
->fp
, branch_color_remote
, "%s", short_base
);
2054 if (!upstream_is_gone
&& !sti
)
2057 color_fprintf(s
->fp
, header_color
, " [");
2058 if (upstream_is_gone
) {
2059 color_fprintf(s
->fp
, header_color
, LABEL(N_("gone")));
2060 } else if (s
->ahead_behind_flags
== AHEAD_BEHIND_QUICK
) {
2061 color_fprintf(s
->fp
, header_color
, LABEL(N_("different")));
2062 } else if (!num_ours
) {
2063 color_fprintf(s
->fp
, header_color
, LABEL(N_("behind ")));
2064 color_fprintf(s
->fp
, branch_color_remote
, "%d", num_theirs
);
2065 } else if (!num_theirs
) {
2066 color_fprintf(s
->fp
, header_color
, LABEL(N_("ahead ")));
2067 color_fprintf(s
->fp
, branch_color_local
, "%d", num_ours
);
2069 color_fprintf(s
->fp
, header_color
, LABEL(N_("ahead ")));
2070 color_fprintf(s
->fp
, branch_color_local
, "%d", num_ours
);
2071 color_fprintf(s
->fp
, header_color
, ", %s", LABEL(N_("behind ")));
2072 color_fprintf(s
->fp
, branch_color_remote
, "%d", num_theirs
);
2075 color_fprintf(s
->fp
, header_color
, "]");
2077 fputc(s
->null_termination
? '\0' : '\n', s
->fp
);
2080 static void wt_shortstatus_print(struct wt_status
*s
)
2082 struct string_list_item
*it
;
2085 wt_shortstatus_print_tracking(s
);
2087 for_each_string_list_item(it
, &s
->change
) {
2088 struct wt_status_change_data
*d
= it
->util
;
2091 wt_shortstatus_unmerged(it
, s
);
2093 wt_shortstatus_status(it
, s
);
2095 for_each_string_list_item(it
, &s
->untracked
)
2096 wt_shortstatus_other(it
, s
, "??");
2098 for_each_string_list_item(it
, &s
->ignored
)
2099 wt_shortstatus_other(it
, s
, "!!");
2102 static void wt_porcelain_print(struct wt_status
*s
)
2105 s
->relative_paths
= 0;
2108 wt_shortstatus_print(s
);
2112 * Print branch information for porcelain v2 output. These lines
2113 * are printed when the '--branch' parameter is given.
2115 * # branch.oid <commit><eol>
2116 * # branch.head <head><eol>
2117 * [# branch.upstream <upstream><eol>
2118 * [# branch.ab +<ahead> -<behind><eol>]]
2120 * <commit> ::= the current commit hash or the literal
2121 * "(initial)" to indicate an initialized repo
2124 * <head> ::= <branch_name> the current branch name or
2125 * "(detached)" literal when detached head or
2126 * "(unknown)" when something is wrong.
2128 * <upstream> ::= the upstream branch name, when set.
2130 * <ahead> ::= integer ahead value or '?'.
2132 * <behind> ::= integer behind value or '?'.
2134 * The end-of-line is defined by the -z flag.
2136 * <eol> ::= NUL when -z,
2139 * When an upstream is set and present, the 'branch.ab' line will
2140 * be printed with the ahead/behind counts for the branch and the
2141 * upstream. When AHEAD_BEHIND_QUICK is requested and the branches
2142 * are different, '?' will be substituted for the actual count.
2144 static void wt_porcelain_v2_print_tracking(struct wt_status
*s
)
2146 struct branch
*branch
;
2148 const char *branch_name
;
2149 int ab_info
, nr_ahead
, nr_behind
;
2150 char eol
= s
->null_termination
? '\0' : '\n';
2152 fprintf(s
->fp
, "# branch.oid %s%c",
2153 (s
->is_initial
? "(initial)" : oid_to_hex(&s
->oid_commit
)),
2157 fprintf(s
->fp
, "# branch.head %s%c", "(unknown)", eol
);
2159 if (!strcmp(s
->branch
, "HEAD")) {
2160 fprintf(s
->fp
, "# branch.head %s%c", "(detached)", eol
);
2162 if (s
->state
.rebase_in_progress
||
2163 s
->state
.rebase_interactive_in_progress
)
2164 branch_name
= s
->state
.onto
;
2165 else if (s
->state
.detached_from
)
2166 branch_name
= s
->state
.detached_from
;
2171 skip_prefix(s
->branch
, "refs/heads/", &branch_name
);
2173 fprintf(s
->fp
, "# branch.head %s%c", branch_name
, eol
);
2176 /* Lookup stats on the upstream tracking branch, if set. */
2177 branch
= branch_get(branch_name
);
2179 ab_info
= stat_tracking_info(branch
, &nr_ahead
, &nr_behind
,
2180 &base
, 0, s
->ahead_behind_flags
);
2182 base
= shorten_unambiguous_ref(base
, 0);
2183 fprintf(s
->fp
, "# branch.upstream %s%c", base
, eol
);
2188 if (nr_ahead
|| nr_behind
)
2189 fprintf(s
->fp
, "# branch.ab +%d -%d%c",
2190 nr_ahead
, nr_behind
, eol
);
2192 fprintf(s
->fp
, "# branch.ab +? -?%c",
2194 } else if (!ab_info
) {
2196 fprintf(s
->fp
, "# branch.ab +0 -0%c", eol
);
2203 * Print the stash count in a porcelain-friendly format
2205 static void wt_porcelain_v2_print_stash(struct wt_status
*s
)
2207 int stash_count
= count_stash_entries();
2208 char eol
= s
->null_termination
? '\0' : '\n';
2210 if (stash_count
> 0)
2211 fprintf(s
->fp
, "# stash %d%c", stash_count
, eol
);
2215 * Convert various submodule status values into a
2216 * fixed-length string of characters in the buffer provided.
2218 static void wt_porcelain_v2_submodule_state(
2219 struct wt_status_change_data
*d
,
2222 if (S_ISGITLINK(d
->mode_head
) ||
2223 S_ISGITLINK(d
->mode_index
) ||
2224 S_ISGITLINK(d
->mode_worktree
)) {
2226 sub
[1] = d
->new_submodule_commits
? 'C' : '.';
2227 sub
[2] = (d
->dirty_submodule
& DIRTY_SUBMODULE_MODIFIED
) ? 'M' : '.';
2228 sub
[3] = (d
->dirty_submodule
& DIRTY_SUBMODULE_UNTRACKED
) ? 'U' : '.';
2239 * Fix-up changed entries before we print them.
2241 static void wt_porcelain_v2_fix_up_changed(struct string_list_item
*it
)
2243 struct wt_status_change_data
*d
= it
->util
;
2245 if (!d
->index_status
) {
2247 * This entry is unchanged in the index (relative to the head).
2248 * Therefore, the collect_updated_cb was never called for this
2249 * entry (during the head-vs-index scan) and so the head column
2250 * fields were never set.
2252 * We must have data for the index column (from the
2253 * index-vs-worktree scan (otherwise, this entry should not be
2254 * in the list of changes)).
2256 * Copy index column fields to the head column, so that our
2257 * output looks complete.
2259 assert(d
->mode_head
== 0);
2260 d
->mode_head
= d
->mode_index
;
2261 oidcpy(&d
->oid_head
, &d
->oid_index
);
2264 if (!d
->worktree_status
) {
2266 * This entry is unchanged in the worktree (relative to the index).
2267 * Therefore, the collect_changed_cb was never called for this entry
2268 * (during the index-vs-worktree scan) and so the worktree column
2269 * fields were never set.
2271 * We must have data for the index column (from the head-vs-index
2274 * Copy the index column fields to the worktree column so that
2275 * our output looks complete.
2277 * Note that we only have a mode field in the worktree column
2278 * because the scan code tries really hard to not have to compute it.
2280 assert(d
->mode_worktree
== 0);
2281 d
->mode_worktree
= d
->mode_index
;
2286 * Print porcelain v2 info for tracked entries with changes.
2288 static void wt_porcelain_v2_print_changed_entry(
2289 struct string_list_item
*it
,
2290 struct wt_status
*s
)
2292 struct wt_status_change_data
*d
= it
->util
;
2293 struct strbuf buf
= STRBUF_INIT
;
2294 struct strbuf buf_from
= STRBUF_INIT
;
2295 const char *path
= NULL
;
2296 const char *path_from
= NULL
;
2298 char submodule_token
[5];
2299 char sep_char
, eol_char
;
2301 wt_porcelain_v2_fix_up_changed(it
);
2302 wt_porcelain_v2_submodule_state(d
, submodule_token
);
2304 key
[0] = d
->index_status
? d
->index_status
: '.';
2305 key
[1] = d
->worktree_status
? d
->worktree_status
: '.';
2308 if (s
->null_termination
) {
2310 * In -z mode, we DO NOT C-quote pathnames. Current path is ALWAYS first.
2311 * A single NUL character separates them.
2316 path_from
= d
->rename_source
;
2319 * Path(s) are C-quoted if necessary. Current path is ALWAYS first.
2320 * The source path is only present when necessary.
2321 * A single TAB separates them (because paths can contain spaces
2322 * which are not escaped and C-quoting does escape TAB characters).
2326 path
= quote_path(it
->string
, s
->prefix
, &buf
, 0);
2327 if (d
->rename_source
)
2328 path_from
= quote_path(d
->rename_source
, s
->prefix
, &buf_from
, 0);
2332 fprintf(s
->fp
, "2 %s %s %06o %06o %06o %s %s %c%d %s%c%s%c",
2333 key
, submodule_token
,
2334 d
->mode_head
, d
->mode_index
, d
->mode_worktree
,
2335 oid_to_hex(&d
->oid_head
), oid_to_hex(&d
->oid_index
),
2336 d
->rename_status
, d
->rename_score
,
2337 path
, sep_char
, path_from
, eol_char
);
2339 fprintf(s
->fp
, "1 %s %s %06o %06o %06o %s %s %s%c",
2340 key
, submodule_token
,
2341 d
->mode_head
, d
->mode_index
, d
->mode_worktree
,
2342 oid_to_hex(&d
->oid_head
), oid_to_hex(&d
->oid_index
),
2345 strbuf_release(&buf
);
2346 strbuf_release(&buf_from
);
2350 * Print porcelain v2 status info for unmerged entries.
2352 static void wt_porcelain_v2_print_unmerged_entry(
2353 struct string_list_item
*it
,
2354 struct wt_status
*s
)
2356 struct wt_status_change_data
*d
= it
->util
;
2357 struct index_state
*istate
= s
->repo
->index
;
2358 const struct cache_entry
*ce
;
2359 struct strbuf buf_index
= STRBUF_INIT
;
2360 const char *path_index
= NULL
;
2361 int pos
, stage
, sum
;
2364 struct object_id oid
;
2367 char submodule_token
[5];
2368 char unmerged_prefix
= 'u';
2369 char eol_char
= s
->null_termination
? '\0' : '\n';
2371 wt_porcelain_v2_submodule_state(d
, submodule_token
);
2373 switch (d
->stagemask
) {
2374 case 1: key
= "DD"; break; /* both deleted */
2375 case 2: key
= "AU"; break; /* added by us */
2376 case 3: key
= "UD"; break; /* deleted by them */
2377 case 4: key
= "UA"; break; /* added by them */
2378 case 5: key
= "DU"; break; /* deleted by us */
2379 case 6: key
= "AA"; break; /* both added */
2380 case 7: key
= "UU"; break; /* both modified */
2382 BUG("unhandled unmerged status %x", d
->stagemask
);
2386 * Disregard d.aux.porcelain_v2 data that we accumulated
2387 * for the head and index columns during the scans and
2388 * replace with the actual stage data.
2390 * Note that this is a last-one-wins for each the individual
2391 * stage [123] columns in the event of multiple cache entries
2394 memset(stages
, 0, sizeof(stages
));
2396 pos
= index_name_pos(istate
, it
->string
, strlen(it
->string
));
2399 while (pos
< istate
->cache_nr
) {
2400 ce
= istate
->cache
[pos
++];
2401 stage
= ce_stage(ce
);
2402 if (strcmp(ce
->name
, it
->string
) || !stage
)
2404 stages
[stage
- 1].mode
= ce
->ce_mode
;
2405 oidcpy(&stages
[stage
- 1].oid
, &ce
->oid
);
2406 sum
|= (1 << (stage
- 1));
2408 if (sum
!= d
->stagemask
)
2409 BUG("observed stagemask 0x%x != expected stagemask 0x%x", sum
, d
->stagemask
);
2411 if (s
->null_termination
)
2412 path_index
= it
->string
;
2414 path_index
= quote_path(it
->string
, s
->prefix
, &buf_index
, 0);
2416 fprintf(s
->fp
, "%c %s %s %06o %06o %06o %06o %s %s %s %s%c",
2417 unmerged_prefix
, key
, submodule_token
,
2418 stages
[0].mode
, /* stage 1 */
2419 stages
[1].mode
, /* stage 2 */
2420 stages
[2].mode
, /* stage 3 */
2422 oid_to_hex(&stages
[0].oid
), /* stage 1 */
2423 oid_to_hex(&stages
[1].oid
), /* stage 2 */
2424 oid_to_hex(&stages
[2].oid
), /* stage 3 */
2428 strbuf_release(&buf_index
);
2432 * Print porcelain V2 status info for untracked and ignored entries.
2434 static void wt_porcelain_v2_print_other(
2435 struct string_list_item
*it
,
2436 struct wt_status
*s
,
2439 struct strbuf buf
= STRBUF_INIT
;
2443 if (s
->null_termination
) {
2447 path
= quote_path(it
->string
, s
->prefix
, &buf
, 0);
2451 fprintf(s
->fp
, "%c %s%c", prefix
, path
, eol_char
);
2453 strbuf_release(&buf
);
2457 * Print porcelain V2 status.
2460 * [<v2_changed_items>]*
2461 * [<v2_unmerged_items>]*
2462 * [<v2_untracked_items>]*
2463 * [<v2_ignored_items>]*
2466 static void wt_porcelain_v2_print(struct wt_status
*s
)
2468 struct wt_status_change_data
*d
;
2469 struct string_list_item
*it
;
2473 wt_porcelain_v2_print_tracking(s
);
2476 wt_porcelain_v2_print_stash(s
);
2478 for (i
= 0; i
< s
->change
.nr
; i
++) {
2479 it
= &(s
->change
.items
[i
]);
2482 wt_porcelain_v2_print_changed_entry(it
, s
);
2485 for (i
= 0; i
< s
->change
.nr
; i
++) {
2486 it
= &(s
->change
.items
[i
]);
2489 wt_porcelain_v2_print_unmerged_entry(it
, s
);
2492 for (i
= 0; i
< s
->untracked
.nr
; i
++) {
2493 it
= &(s
->untracked
.items
[i
]);
2494 wt_porcelain_v2_print_other(it
, s
, '?');
2497 for (i
= 0; i
< s
->ignored
.nr
; i
++) {
2498 it
= &(s
->ignored
.items
[i
]);
2499 wt_porcelain_v2_print_other(it
, s
, '!');
2503 void wt_status_print(struct wt_status
*s
)
2505 trace2_data_intmax("status", s
->repo
, "count/changed", s
->change
.nr
);
2506 trace2_data_intmax("status", s
->repo
, "count/untracked",
2508 trace2_data_intmax("status", s
->repo
, "count/ignored", s
->ignored
.nr
);
2510 trace2_region_enter("status", "print", s
->repo
);
2512 switch (s
->status_format
) {
2513 case STATUS_FORMAT_SHORT
:
2514 wt_shortstatus_print(s
);
2516 case STATUS_FORMAT_PORCELAIN
:
2517 wt_porcelain_print(s
);
2519 case STATUS_FORMAT_PORCELAIN_V2
:
2520 wt_porcelain_v2_print(s
);
2522 case STATUS_FORMAT_UNSPECIFIED
:
2523 BUG("finalize_deferred_config() should have been called");
2525 case STATUS_FORMAT_NONE
:
2526 case STATUS_FORMAT_LONG
:
2527 wt_longstatus_print(s
);
2531 trace2_region_leave("status", "print", s
->repo
);
2535 * Returns 1 if there are unstaged changes, 0 otherwise.
2537 int has_unstaged_changes(struct repository
*r
, int ignore_submodules
)
2539 struct rev_info rev_info
;
2542 repo_init_revisions(r
, &rev_info
, NULL
);
2543 if (ignore_submodules
) {
2544 rev_info
.diffopt
.flags
.ignore_submodules
= 1;
2545 rev_info
.diffopt
.flags
.override_submodule_config
= 1;
2547 rev_info
.diffopt
.flags
.quick
= 1;
2548 diff_setup_done(&rev_info
.diffopt
);
2549 result
= run_diff_files(&rev_info
, 0);
2550 release_revisions(&rev_info
);
2551 return diff_result_code(&rev_info
.diffopt
, result
);
2555 * Returns 1 if there are uncommitted changes, 0 otherwise.
2557 int has_uncommitted_changes(struct repository
*r
,
2558 int ignore_submodules
)
2560 struct rev_info rev_info
;
2563 if (is_index_unborn(r
->index
))
2566 repo_init_revisions(r
, &rev_info
, NULL
);
2567 if (ignore_submodules
)
2568 rev_info
.diffopt
.flags
.ignore_submodules
= 1;
2569 rev_info
.diffopt
.flags
.quick
= 1;
2571 add_head_to_pending(&rev_info
);
2572 if (!rev_info
.pending
.nr
) {
2574 * We have no head (or it's corrupt); use the empty tree,
2575 * which will complain if the index is non-empty.
2577 struct tree
*tree
= lookup_tree(r
, the_hash_algo
->empty_tree
);
2578 add_pending_object(&rev_info
, &tree
->object
, "");
2581 diff_setup_done(&rev_info
.diffopt
);
2582 result
= run_diff_index(&rev_info
, 1);
2583 release_revisions(&rev_info
);
2584 return diff_result_code(&rev_info
.diffopt
, result
);
2588 * If the work tree has unstaged or uncommitted changes, dies with the
2589 * appropriate message.
2591 int require_clean_work_tree(struct repository
*r
,
2594 int ignore_submodules
,
2597 struct lock_file lock_file
= LOCK_INIT
;
2600 fd
= repo_hold_locked_index(r
, &lock_file
, 0);
2601 refresh_index(r
->index
, REFRESH_QUIET
, NULL
, NULL
, NULL
);
2603 repo_update_index_if_able(r
, &lock_file
);
2604 rollback_lock_file(&lock_file
);
2606 if (has_unstaged_changes(r
, ignore_submodules
)) {
2607 /* TRANSLATORS: the action is e.g. "pull with rebase" */
2608 error(_("cannot %s: You have unstaged changes."), _(action
));
2612 if (has_uncommitted_changes(r
, ignore_submodules
)) {
2614 error(_("additionally, your index contains uncommitted changes."));
2616 error(_("cannot %s: Your index contains uncommitted changes."),