1 #define USE_THE_REPOSITORY_VARIABLE
2 #define DISABLE_SIGN_COMPARE_WARNINGS
4 #include "git-compat-util.h"
11 #include "environment.h"
15 #include "object-name.h"
20 #include "repository.h"
21 #include "run-command.h"
25 #include "submodule.h"
27 #include "read-cache.h"
36 #include "sequencer.h"
37 #include "fsmonitor-settings.h"
39 #define AB_DELAY_WARNING_IN_MS (2 * 1000)
40 #define UF_DELAY_WARNING_IN_MS (2 * 1000)
42 static const char cut_line
[] =
43 "------------------------ >8 ------------------------\n";
45 static char default_wt_status_colors
[][COLOR_MAXLEN
] = {
46 GIT_COLOR_NORMAL
, /* WT_STATUS_HEADER */
47 GIT_COLOR_GREEN
, /* WT_STATUS_UPDATED */
48 GIT_COLOR_RED
, /* WT_STATUS_CHANGED */
49 GIT_COLOR_RED
, /* WT_STATUS_UNTRACKED */
50 GIT_COLOR_RED
, /* WT_STATUS_NOBRANCH */
51 GIT_COLOR_RED
, /* WT_STATUS_UNMERGED */
52 GIT_COLOR_GREEN
, /* WT_STATUS_LOCAL_BRANCH */
53 GIT_COLOR_RED
, /* WT_STATUS_REMOTE_BRANCH */
54 GIT_COLOR_NIL
, /* WT_STATUS_ONBRANCH */
57 static const char *color(int slot
, struct wt_status
*s
)
60 if (want_color(s
->use_color
))
61 c
= s
->color_palette
[slot
];
62 if (slot
== WT_STATUS_ONBRANCH
&& color_is_nil(c
))
63 c
= s
->color_palette
[WT_STATUS_HEADER
];
67 static void status_vprintf(struct wt_status
*s
, int at_bol
, const char *color
,
68 const char *fmt
, va_list ap
, const char *trail
)
70 struct strbuf sb
= STRBUF_INIT
;
71 struct strbuf linebuf
= STRBUF_INIT
;
72 const char *line
, *eol
;
74 strbuf_vaddf(&sb
, fmt
, ap
);
76 if (s
->display_comment_prefix
) {
77 strbuf_addstr(&sb
, comment_line_str
);
79 strbuf_addch(&sb
, ' ');
81 color_print_strbuf(s
->fp
, color
, &sb
);
83 fprintf(s
->fp
, "%s", trail
);
87 for (line
= sb
.buf
; *line
; line
= eol
+ 1) {
88 eol
= strchr(line
, '\n');
90 strbuf_reset(&linebuf
);
91 if (at_bol
&& s
->display_comment_prefix
) {
92 strbuf_addstr(&linebuf
, comment_line_str
);
93 if (*line
!= '\n' && *line
!= '\t')
94 strbuf_addch(&linebuf
, ' ');
97 strbuf_add(&linebuf
, line
, eol
- line
);
99 strbuf_addstr(&linebuf
, line
);
100 color_print_strbuf(s
->fp
, color
, &linebuf
);
102 fprintf(s
->fp
, "\n");
108 fprintf(s
->fp
, "%s", trail
);
109 strbuf_release(&linebuf
);
113 void status_printf_ln(struct wt_status
*s
, const char *color
,
114 const char *fmt
, ...)
119 status_vprintf(s
, 1, color
, fmt
, ap
, "\n");
123 void status_printf(struct wt_status
*s
, const char *color
,
124 const char *fmt
, ...)
129 status_vprintf(s
, 1, color
, fmt
, ap
, NULL
);
133 __attribute__((format (printf
, 3, 4)))
134 static void status_printf_more(struct wt_status
*s
, const char *color
,
135 const char *fmt
, ...)
140 status_vprintf(s
, 0, color
, fmt
, ap
, NULL
);
144 void wt_status_prepare(struct repository
*r
, struct wt_status
*s
)
146 memset(s
, 0, sizeof(*s
));
148 memcpy(s
->color_palette
, default_wt_status_colors
,
149 sizeof(default_wt_status_colors
));
150 s
->show_untracked_files
= SHOW_NORMAL_UNTRACKED_FILES
;
152 s
->relative_paths
= 1;
153 s
->branch
= refs_resolve_refdup(get_main_ref_store(the_repository
),
154 "HEAD", 0, NULL
, NULL
);
155 s
->reference
= "HEAD";
157 s
->index_file
= repo_get_index_file(the_repository
);
158 s
->change
.strdup_strings
= 1;
159 s
->untracked
.strdup_strings
= 1;
160 s
->ignored
.strdup_strings
= 1;
161 s
->show_branch
= -1; /* unspecified */
163 s
->ahead_behind_flags
= AHEAD_BEHIND_UNSPECIFIED
;
164 s
->display_comment_prefix
= 0;
165 s
->detect_rename
= -1;
166 s
->rename_score
= -1;
167 s
->rename_limit
= -1;
170 static void wt_longstatus_print_unmerged_header(struct wt_status
*s
)
173 int del_mod_conflict
= 0;
174 int both_deleted
= 0;
176 const char *c
= color(WT_STATUS_HEADER
, s
);
178 status_printf_ln(s
, c
, _("Unmerged paths:"));
180 for (i
= 0; i
< s
->change
.nr
; i
++) {
181 struct string_list_item
*it
= &(s
->change
.items
[i
]);
182 struct wt_status_change_data
*d
= it
->util
;
184 switch (d
->stagemask
) {
192 del_mod_conflict
= 1;
202 if (s
->whence
!= FROM_COMMIT
)
204 else if (!s
->is_initial
) {
205 if (!strcmp(s
->reference
, "HEAD"))
206 status_printf_ln(s
, c
,
207 _(" (use \"git restore --staged <file>...\" to unstage)"));
209 status_printf_ln(s
, c
,
210 _(" (use \"git restore --source=%s --staged <file>...\" to unstage)"),
213 status_printf_ln(s
, c
, _(" (use \"git rm --cached <file>...\" to unstage)"));
216 if (!del_mod_conflict
)
217 status_printf_ln(s
, c
, _(" (use \"git add <file>...\" to mark resolution)"));
219 status_printf_ln(s
, c
, _(" (use \"git add/rm <file>...\" as appropriate to mark resolution)"));
220 } else if (!del_mod_conflict
&& !not_deleted
) {
221 status_printf_ln(s
, c
, _(" (use \"git rm <file>...\" to mark resolution)"));
223 status_printf_ln(s
, c
, _(" (use \"git add/rm <file>...\" as appropriate to mark resolution)"));
227 static void wt_longstatus_print_cached_header(struct wt_status
*s
)
229 const char *c
= color(WT_STATUS_HEADER
, s
);
231 status_printf_ln(s
, c
, _("Changes to be committed:"));
234 if (s
->whence
!= FROM_COMMIT
)
235 ; /* NEEDSWORK: use "git reset --unresolve"??? */
236 else if (!s
->is_initial
) {
237 if (!strcmp(s
->reference
, "HEAD"))
238 status_printf_ln(s
, c
239 , _(" (use \"git restore --staged <file>...\" to unstage)"));
241 status_printf_ln(s
, c
,
242 _(" (use \"git restore --source=%s --staged <file>...\" to unstage)"),
245 status_printf_ln(s
, c
, _(" (use \"git rm --cached <file>...\" to unstage)"));
248 static void wt_longstatus_print_dirty_header(struct wt_status
*s
,
250 int has_dirty_submodules
)
252 const char *c
= color(WT_STATUS_HEADER
, s
);
254 status_printf_ln(s
, c
, _("Changes not staged for commit:"));
258 status_printf_ln(s
, c
, _(" (use \"git add <file>...\" to update what will be committed)"));
260 status_printf_ln(s
, c
, _(" (use \"git add/rm <file>...\" to update what will be committed)"));
261 status_printf_ln(s
, c
, _(" (use \"git restore <file>...\" to discard changes in working directory)"));
262 if (has_dirty_submodules
)
263 status_printf_ln(s
, c
, _(" (commit or discard the untracked or modified content in submodules)"));
266 static void wt_longstatus_print_other_header(struct wt_status
*s
,
270 const char *c
= color(WT_STATUS_HEADER
, s
);
271 status_printf_ln(s
, c
, "%s:", what
);
274 status_printf_ln(s
, c
, _(" (use \"git %s <file>...\" to include in what will be committed)"), how
);
277 static void wt_longstatus_print_trailer(struct wt_status
*s
)
279 status_printf_ln(s
, color(WT_STATUS_HEADER
, s
), "%s", "");
282 static const char *wt_status_unmerged_status_string(int stagemask
)
286 return _("both deleted:");
288 return _("added by us:");
290 return _("deleted by them:");
292 return _("added by them:");
294 return _("deleted by us:");
296 return _("both added:");
298 return _("both modified:");
300 BUG("unhandled unmerged status %x", stagemask
);
304 static const char *wt_status_diff_status_string(int status
)
307 case DIFF_STATUS_ADDED
:
308 return _("new file:");
309 case DIFF_STATUS_COPIED
:
311 case DIFF_STATUS_DELETED
:
312 return _("deleted:");
313 case DIFF_STATUS_MODIFIED
:
314 return _("modified:");
315 case DIFF_STATUS_RENAMED
:
316 return _("renamed:");
317 case DIFF_STATUS_TYPE_CHANGED
:
318 return _("typechange:");
319 case DIFF_STATUS_UNKNOWN
:
320 return _("unknown:");
321 case DIFF_STATUS_UNMERGED
:
322 return _("unmerged:");
328 static int maxwidth(const char *(*label
)(int), int minval
, int maxval
)
332 for (i
= minval
; i
<= maxval
; i
++) {
333 const char *s
= label(i
);
334 int len
= s
? utf8_strwidth(s
) : 0;
341 static void wt_longstatus_print_unmerged_data(struct wt_status
*s
,
342 struct string_list_item
*it
)
344 const char *c
= color(WT_STATUS_UNMERGED
, s
);
345 struct wt_status_change_data
*d
= it
->util
;
346 struct strbuf onebuf
= STRBUF_INIT
;
347 static char *padding
;
348 static int label_width
;
349 const char *one
, *how
;
353 label_width
= maxwidth(wt_status_unmerged_status_string
, 1, 7);
354 label_width
+= strlen(" ");
355 padding
= xmallocz(label_width
);
356 memset(padding
, ' ', label_width
);
359 one
= quote_path(it
->string
, s
->prefix
, &onebuf
, 0);
360 status_printf(s
, color(WT_STATUS_HEADER
, s
), "\t");
362 how
= wt_status_unmerged_status_string(d
->stagemask
);
363 len
= label_width
- utf8_strwidth(how
);
364 status_printf_more(s
, c
, "%s%.*s%s\n", how
, len
, padding
, one
);
365 strbuf_release(&onebuf
);
368 static void wt_longstatus_print_change_data(struct wt_status
*s
,
370 struct string_list_item
*it
)
372 struct wt_status_change_data
*d
= it
->util
;
373 const char *c
= color(change_type
, s
);
377 const char *one
, *two
;
378 struct strbuf onebuf
= STRBUF_INIT
, twobuf
= STRBUF_INIT
;
379 struct strbuf extra
= STRBUF_INIT
;
380 static char *padding
;
381 static int label_width
;
386 /* If DIFF_STATUS_* uses outside the range [A..Z], we're in trouble */
387 label_width
= maxwidth(wt_status_diff_status_string
, 'A', 'Z');
388 label_width
+= strlen(" ");
389 padding
= xmallocz(label_width
);
390 memset(padding
, ' ', label_width
);
393 one_name
= two_name
= it
->string
;
394 switch (change_type
) {
395 case WT_STATUS_UPDATED
:
396 status
= d
->index_status
;
398 case WT_STATUS_CHANGED
:
399 if (d
->new_submodule_commits
|| d
->dirty_submodule
) {
400 strbuf_addstr(&extra
, " (");
401 if (d
->new_submodule_commits
)
402 strbuf_addstr(&extra
, _("new commits, "));
403 if (d
->dirty_submodule
& DIRTY_SUBMODULE_MODIFIED
)
404 strbuf_addstr(&extra
, _("modified content, "));
405 if (d
->dirty_submodule
& DIRTY_SUBMODULE_UNTRACKED
)
406 strbuf_addstr(&extra
, _("untracked content, "));
407 strbuf_setlen(&extra
, extra
.len
- 2);
408 strbuf_addch(&extra
, ')');
410 status
= d
->worktree_status
;
413 BUG("unhandled change_type %d in wt_longstatus_print_change_data",
418 * Only pick up the rename it's relevant. If the rename is for
419 * the changed section and we're printing the updated section,
422 if (d
->rename_status
== status
)
423 one_name
= d
->rename_source
;
425 one
= quote_path(one_name
, s
->prefix
, &onebuf
, 0);
426 two
= quote_path(two_name
, s
->prefix
, &twobuf
, 0);
428 status_printf(s
, color(WT_STATUS_HEADER
, s
), "\t");
429 what
= wt_status_diff_status_string(status
);
431 BUG("unhandled diff status %c", status
);
432 len
= label_width
- utf8_strwidth(what
);
434 if (one_name
!= two_name
)
435 status_printf_more(s
, c
, "%s%.*s%s -> %s",
436 what
, len
, padding
, one
, two
);
438 status_printf_more(s
, c
, "%s%.*s%s",
439 what
, len
, padding
, one
);
441 status_printf_more(s
, color(WT_STATUS_HEADER
, s
), "%s", extra
.buf
);
442 strbuf_release(&extra
);
444 status_printf_more(s
, GIT_COLOR_NORMAL
, "\n");
445 strbuf_release(&onebuf
);
446 strbuf_release(&twobuf
);
449 static char short_submodule_status(struct wt_status_change_data
*d
)
451 if (d
->new_submodule_commits
)
453 if (d
->dirty_submodule
& DIRTY_SUBMODULE_MODIFIED
)
455 if (d
->dirty_submodule
& DIRTY_SUBMODULE_UNTRACKED
)
457 return d
->worktree_status
;
460 static void wt_status_collect_changed_cb(struct diff_queue_struct
*q
,
461 struct diff_options
*options UNUSED
,
464 struct wt_status
*s
= data
;
469 s
->workdir_dirty
= 1;
470 for (i
= 0; i
< q
->nr
; i
++) {
471 struct diff_filepair
*p
;
472 struct string_list_item
*it
;
473 struct wt_status_change_data
*d
;
476 it
= string_list_insert(&s
->change
, p
->two
->path
);
482 if (!d
->worktree_status
)
483 d
->worktree_status
= p
->status
;
484 if (S_ISGITLINK(p
->two
->mode
)) {
485 d
->dirty_submodule
= p
->two
->dirty_submodule
;
486 d
->new_submodule_commits
= !oideq(&p
->one
->oid
,
488 if (s
->status_format
== STATUS_FORMAT_SHORT
)
489 d
->worktree_status
= short_submodule_status(d
);
493 case DIFF_STATUS_ADDED
:
494 d
->mode_worktree
= p
->two
->mode
;
497 case DIFF_STATUS_DELETED
:
498 d
->mode_index
= p
->one
->mode
;
499 oidcpy(&d
->oid_index
, &p
->one
->oid
);
500 /* mode_worktree is zero for a delete. */
503 case DIFF_STATUS_COPIED
:
504 case DIFF_STATUS_RENAMED
:
505 if (d
->rename_status
)
506 BUG("multiple renames on the same target? how?");
507 d
->rename_source
= xstrdup(p
->one
->path
);
508 d
->rename_score
= p
->score
* 100 / MAX_SCORE
;
509 d
->rename_status
= p
->status
;
511 case DIFF_STATUS_MODIFIED
:
512 case DIFF_STATUS_TYPE_CHANGED
:
513 case DIFF_STATUS_UNMERGED
:
514 d
->mode_index
= p
->one
->mode
;
515 d
->mode_worktree
= p
->two
->mode
;
516 oidcpy(&d
->oid_index
, &p
->one
->oid
);
520 BUG("unhandled diff-files status '%c'", p
->status
);
527 static int unmerged_mask(struct index_state
*istate
, const char *path
)
530 const struct cache_entry
*ce
;
532 pos
= index_name_pos(istate
, path
, strlen(path
));
538 while (pos
< istate
->cache_nr
) {
539 ce
= istate
->cache
[pos
++];
540 if (strcmp(ce
->name
, path
) || !ce_stage(ce
))
542 mask
|= (1 << (ce_stage(ce
) - 1));
547 static void wt_status_collect_updated_cb(struct diff_queue_struct
*q
,
548 struct diff_options
*options UNUSED
,
551 struct wt_status
*s
= data
;
554 for (i
= 0; i
< q
->nr
; i
++) {
555 struct diff_filepair
*p
;
556 struct string_list_item
*it
;
557 struct wt_status_change_data
*d
;
560 it
= string_list_insert(&s
->change
, p
->two
->path
);
566 if (!d
->index_status
)
567 d
->index_status
= p
->status
;
569 case DIFF_STATUS_ADDED
:
570 /* Leave {mode,oid}_head zero for an add. */
571 d
->mode_index
= p
->two
->mode
;
572 oidcpy(&d
->oid_index
, &p
->two
->oid
);
575 case DIFF_STATUS_DELETED
:
576 d
->mode_head
= p
->one
->mode
;
577 oidcpy(&d
->oid_head
, &p
->one
->oid
);
579 /* Leave {mode,oid}_index zero for a delete. */
582 case DIFF_STATUS_COPIED
:
583 case DIFF_STATUS_RENAMED
:
584 if (d
->rename_status
)
585 BUG("multiple renames on the same target? how?");
586 d
->rename_source
= xstrdup(p
->one
->path
);
587 d
->rename_score
= p
->score
* 100 / MAX_SCORE
;
588 d
->rename_status
= p
->status
;
590 case DIFF_STATUS_MODIFIED
:
591 case DIFF_STATUS_TYPE_CHANGED
:
592 d
->mode_head
= p
->one
->mode
;
593 d
->mode_index
= p
->two
->mode
;
594 oidcpy(&d
->oid_head
, &p
->one
->oid
);
595 oidcpy(&d
->oid_index
, &p
->two
->oid
);
598 case DIFF_STATUS_UNMERGED
:
599 d
->stagemask
= unmerged_mask(s
->repo
->index
,
602 * Don't bother setting {mode,oid}_{head,index} since the print
603 * code will output the stage values directly and not use the
604 * values in these fields.
609 BUG("unhandled diff-index status '%c'", p
->status
);
615 static void wt_status_collect_changes_worktree(struct wt_status
*s
)
619 repo_init_revisions(s
->repo
, &rev
, NULL
);
620 setup_revisions(0, NULL
, &rev
, NULL
);
621 rev
.diffopt
.output_format
|= DIFF_FORMAT_CALLBACK
;
622 rev
.diffopt
.flags
.dirty_submodules
= 1;
623 rev
.diffopt
.ita_invisible_in_index
= 1;
624 if (!s
->show_untracked_files
)
625 rev
.diffopt
.flags
.ignore_untracked_in_submodules
= 1;
626 if (s
->ignore_submodule_arg
) {
627 rev
.diffopt
.flags
.override_submodule_config
= 1;
628 handle_ignore_submodules_arg(&rev
.diffopt
, s
->ignore_submodule_arg
);
629 } else if (!rev
.diffopt
.flags
.ignore_submodule_set
&&
630 s
->show_untracked_files
!= SHOW_NO_UNTRACKED_FILES
)
631 handle_ignore_submodules_arg(&rev
.diffopt
, "none");
632 rev
.diffopt
.format_callback
= wt_status_collect_changed_cb
;
633 rev
.diffopt
.format_callback_data
= s
;
634 rev
.diffopt
.detect_rename
= s
->detect_rename
>= 0 ? s
->detect_rename
: rev
.diffopt
.detect_rename
;
635 rev
.diffopt
.rename_limit
= s
->rename_limit
>= 0 ? s
->rename_limit
: rev
.diffopt
.rename_limit
;
636 rev
.diffopt
.rename_score
= s
->rename_score
>= 0 ? s
->rename_score
: rev
.diffopt
.rename_score
;
637 copy_pathspec(&rev
.prune_data
, &s
->pathspec
);
638 run_diff_files(&rev
, 0);
639 release_revisions(&rev
);
642 static void wt_status_collect_changes_index(struct wt_status
*s
)
645 struct setup_revision_opt opt
;
647 repo_init_revisions(s
->repo
, &rev
, NULL
);
648 memset(&opt
, 0, sizeof(opt
));
649 opt
.def
= s
->is_initial
? empty_tree_oid_hex(the_repository
->hash_algo
) : s
->reference
;
650 setup_revisions(0, NULL
, &rev
, &opt
);
652 rev
.diffopt
.flags
.override_submodule_config
= 1;
653 rev
.diffopt
.ita_invisible_in_index
= 1;
654 if (s
->ignore_submodule_arg
) {
655 handle_ignore_submodules_arg(&rev
.diffopt
, s
->ignore_submodule_arg
);
658 * Unless the user did explicitly request a submodule ignore
659 * mode by passing a command line option we do not ignore any
660 * changed submodule SHA-1s when comparing index and HEAD, no
661 * matter what is configured. Otherwise the user won't be
662 * shown any submodules manually added (and which are
663 * staged to be committed), which would be really confusing.
665 handle_ignore_submodules_arg(&rev
.diffopt
, "dirty");
668 rev
.diffopt
.output_format
|= DIFF_FORMAT_CALLBACK
;
669 rev
.diffopt
.format_callback
= wt_status_collect_updated_cb
;
670 rev
.diffopt
.format_callback_data
= s
;
671 rev
.diffopt
.detect_rename
= s
->detect_rename
>= 0 ? s
->detect_rename
: rev
.diffopt
.detect_rename
;
672 rev
.diffopt
.rename_limit
= s
->rename_limit
>= 0 ? s
->rename_limit
: rev
.diffopt
.rename_limit
;
673 rev
.diffopt
.rename_score
= s
->rename_score
>= 0 ? s
->rename_score
: rev
.diffopt
.rename_score
;
676 * The `recursive` option must be enabled to allow the diff to recurse
677 * into subdirectories of sparse directory index entries. If it is not
678 * enabled, a subdirectory containing file(s) with changes is reported
679 * as "modified", rather than the modified files themselves.
681 rev
.diffopt
.flags
.recursive
= 1;
683 copy_pathspec(&rev
.prune_data
, &s
->pathspec
);
684 run_diff_index(&rev
, DIFF_INDEX_CACHED
);
685 release_revisions(&rev
);
688 static int add_file_to_list(const struct object_id
*oid
,
689 struct strbuf
*base
, const char *path
,
690 unsigned int mode
, void *context
)
692 struct string_list_item
*it
;
693 struct wt_status_change_data
*d
;
694 struct wt_status
*s
= context
;
695 struct strbuf full_name
= STRBUF_INIT
;
698 return READ_TREE_RECURSIVE
;
700 strbuf_add(&full_name
, base
->buf
, base
->len
);
701 strbuf_addstr(&full_name
, path
);
702 it
= string_list_insert(&s
->change
, full_name
.buf
);
709 d
->index_status
= DIFF_STATUS_ADDED
;
710 /* Leave {mode,oid}_head zero for adds. */
711 d
->mode_index
= mode
;
712 oidcpy(&d
->oid_index
, oid
);
714 strbuf_release(&full_name
);
718 static void wt_status_collect_changes_initial(struct wt_status
*s
)
720 struct index_state
*istate
= s
->repo
->index
;
721 struct strbuf base
= STRBUF_INIT
;
724 for (i
= 0; i
< istate
->cache_nr
; i
++) {
725 struct string_list_item
*it
;
726 struct wt_status_change_data
*d
;
727 const struct cache_entry
*ce
= istate
->cache
[i
];
729 if (!ce_path_match(istate
, ce
, &s
->pathspec
, NULL
))
731 if (ce_intent_to_add(ce
))
733 if (S_ISSPARSEDIR(ce
->ce_mode
)) {
735 * This is a sparse directory entry, so we want to collect all
736 * of the added files within the tree. This requires recursively
737 * expanding the trees to find the elements that are new in this
738 * tree and marking them with DIFF_STATUS_ADDED.
740 struct pathspec ps
= { 0 };
741 struct tree
*tree
= lookup_tree(istate
->repo
, &ce
->oid
);
748 strbuf_add(&base
, ce
->name
, ce
->ce_namelen
);
749 read_tree_at(istate
->repo
, tree
, &base
, 0, &ps
,
750 add_file_to_list
, s
);
755 it
= string_list_insert(&s
->change
, ce
->name
);
762 d
->index_status
= DIFF_STATUS_UNMERGED
;
763 d
->stagemask
|= (1 << (ce_stage(ce
) - 1));
765 * Don't bother setting {mode,oid}_{head,index} since the print
766 * code will output the stage values directly and not use the
767 * values in these fields.
771 d
->index_status
= DIFF_STATUS_ADDED
;
772 /* Leave {mode,oid}_head zero for adds. */
773 d
->mode_index
= ce
->ce_mode
;
774 oidcpy(&d
->oid_index
, &ce
->oid
);
779 strbuf_release(&base
);
782 static void wt_status_collect_untracked(struct wt_status
*s
)
785 struct dir_struct dir
= DIR_INIT
;
786 uint64_t t_begin
= getnanotime();
787 struct index_state
*istate
= s
->repo
->index
;
789 if (!s
->show_untracked_files
)
792 if (s
->show_untracked_files
!= SHOW_ALL_UNTRACKED_FILES
)
794 DIR_SHOW_OTHER_DIRECTORIES
| DIR_HIDE_EMPTY_DIRECTORIES
;
795 if (s
->show_ignored_mode
) {
796 dir
.flags
|= DIR_SHOW_IGNORED_TOO
;
798 if (s
->show_ignored_mode
== SHOW_MATCHING_IGNORED
)
799 dir
.flags
|= DIR_SHOW_IGNORED_TOO_MODE_MATCHING
;
801 dir
.untracked
= istate
->untracked
;
804 setup_standard_excludes(&dir
);
806 fill_directory(&dir
, istate
, &s
->pathspec
);
808 for (i
= 0; i
< dir
.nr
; i
++) {
809 struct dir_entry
*ent
= dir
.entries
[i
];
810 if (index_name_is_other(istate
, ent
->name
, ent
->len
))
811 string_list_insert(&s
->untracked
, ent
->name
);
814 for (i
= 0; i
< dir
.ignored_nr
; i
++) {
815 struct dir_entry
*ent
= dir
.ignored
[i
];
816 if (index_name_is_other(istate
, ent
->name
, ent
->len
))
817 string_list_insert(&s
->ignored
, ent
->name
);
822 if (advice_enabled(ADVICE_STATUS_U_OPTION
))
823 s
->untracked_in_ms
= (getnanotime() - t_begin
) / 1000000;
826 static int has_unmerged(struct wt_status
*s
)
830 for (i
= 0; i
< s
->change
.nr
; i
++) {
831 struct wt_status_change_data
*d
;
832 d
= s
->change
.items
[i
].util
;
839 void wt_status_collect(struct wt_status
*s
)
841 trace2_region_enter("status", "worktrees", s
->repo
);
842 wt_status_collect_changes_worktree(s
);
843 trace2_region_leave("status", "worktrees", s
->repo
);
846 trace2_region_enter("status", "initial", s
->repo
);
847 wt_status_collect_changes_initial(s
);
848 trace2_region_leave("status", "initial", s
->repo
);
850 trace2_region_enter("status", "index", s
->repo
);
851 wt_status_collect_changes_index(s
);
852 trace2_region_leave("status", "index", s
->repo
);
855 trace2_region_enter("status", "untracked", s
->repo
);
856 wt_status_collect_untracked(s
);
857 trace2_region_leave("status", "untracked", s
->repo
);
859 wt_status_get_state(s
->repo
, &s
->state
, s
->branch
&& !strcmp(s
->branch
, "HEAD"));
860 if (s
->state
.merge_in_progress
&& !has_unmerged(s
))
864 void wt_status_collect_free_buffers(struct wt_status
*s
)
866 wt_status_state_free_buffers(&s
->state
);
869 void wt_status_state_free_buffers(struct wt_status_state
*state
)
871 FREE_AND_NULL(state
->branch
);
872 FREE_AND_NULL(state
->onto
);
873 FREE_AND_NULL(state
->detached_from
);
874 FREE_AND_NULL(state
->bisecting_from
);
877 static void wt_longstatus_print_unmerged(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
]);
890 wt_longstatus_print_unmerged_header(s
);
893 wt_longstatus_print_unmerged_data(s
, it
);
896 wt_longstatus_print_trailer(s
);
900 static void wt_longstatus_print_updated(struct wt_status
*s
)
902 int shown_header
= 0;
905 for (i
= 0; i
< s
->change
.nr
; i
++) {
906 struct wt_status_change_data
*d
;
907 struct string_list_item
*it
;
908 it
= &(s
->change
.items
[i
]);
910 if (!d
->index_status
||
911 d
->index_status
== DIFF_STATUS_UNMERGED
)
914 wt_longstatus_print_cached_header(s
);
917 wt_longstatus_print_change_data(s
, WT_STATUS_UPDATED
, it
);
920 wt_longstatus_print_trailer(s
);
926 * 1 : some change but no delete
928 static int wt_status_check_worktree_changes(struct wt_status
*s
,
929 int *dirty_submodules
)
934 *dirty_submodules
= 0;
936 for (i
= 0; i
< s
->change
.nr
; i
++) {
937 struct wt_status_change_data
*d
;
938 d
= s
->change
.items
[i
].util
;
939 if (!d
->worktree_status
||
940 d
->worktree_status
== DIFF_STATUS_UNMERGED
)
944 if (d
->dirty_submodule
)
945 *dirty_submodules
= 1;
946 if (d
->worktree_status
== DIFF_STATUS_DELETED
)
952 static void wt_longstatus_print_changed(struct wt_status
*s
)
954 int i
, dirty_submodules
;
955 int worktree_changes
= wt_status_check_worktree_changes(s
, &dirty_submodules
);
957 if (!worktree_changes
)
960 wt_longstatus_print_dirty_header(s
, worktree_changes
< 0, dirty_submodules
);
962 for (i
= 0; i
< s
->change
.nr
; i
++) {
963 struct wt_status_change_data
*d
;
964 struct string_list_item
*it
;
965 it
= &(s
->change
.items
[i
]);
967 if (!d
->worktree_status
||
968 d
->worktree_status
== DIFF_STATUS_UNMERGED
)
970 wt_longstatus_print_change_data(s
, WT_STATUS_CHANGED
, it
);
972 wt_longstatus_print_trailer(s
);
975 static int stash_count_refs(struct object_id
*ooid UNUSED
,
976 struct object_id
*noid UNUSED
,
977 const char *email UNUSED
,
978 timestamp_t timestamp UNUSED
, int tz UNUSED
,
979 const char *message UNUSED
, void *cb_data
)
986 static int count_stash_entries(void)
989 refs_for_each_reflog_ent(get_main_ref_store(the_repository
),
990 "refs/stash", stash_count_refs
, &n
);
994 static void wt_longstatus_print_stash_summary(struct wt_status
*s
)
996 int stash_count
= count_stash_entries();
999 status_printf_ln(s
, GIT_COLOR_NORMAL
,
1000 Q_("Your stash currently has %d entry",
1001 "Your stash currently has %d entries", stash_count
),
1005 static void wt_longstatus_print_submodule_summary(struct wt_status
*s
, int uncommitted
)
1007 struct child_process sm_summary
= CHILD_PROCESS_INIT
;
1008 struct strbuf cmd_stdout
= STRBUF_INIT
;
1009 struct strbuf summary
= STRBUF_INIT
;
1010 char *summary_content
;
1012 strvec_pushf(&sm_summary
.env
, "GIT_INDEX_FILE=%s", s
->index_file
);
1014 strvec_push(&sm_summary
.args
, "submodule");
1015 strvec_push(&sm_summary
.args
, "summary");
1016 strvec_push(&sm_summary
.args
, uncommitted
? "--files" : "--cached");
1017 strvec_push(&sm_summary
.args
, "--for-status");
1018 strvec_push(&sm_summary
.args
, "--summary-limit");
1019 strvec_pushf(&sm_summary
.args
, "%d", s
->submodule_summary
);
1021 strvec_push(&sm_summary
.args
, s
->amend
? "HEAD^" : "HEAD");
1023 sm_summary
.git_cmd
= 1;
1024 sm_summary
.no_stdin
= 1;
1026 capture_command(&sm_summary
, &cmd_stdout
, 1024);
1028 /* prepend header, only if there's an actual output */
1029 if (cmd_stdout
.len
) {
1031 strbuf_addstr(&summary
, _("Submodules changed but not updated:"));
1033 strbuf_addstr(&summary
, _("Submodule changes to be committed:"));
1034 strbuf_addstr(&summary
, "\n\n");
1036 strbuf_addbuf(&summary
, &cmd_stdout
);
1037 strbuf_release(&cmd_stdout
);
1039 if (s
->display_comment_prefix
) {
1041 summary_content
= strbuf_detach(&summary
, &len
);
1042 strbuf_add_commented_lines(&summary
, summary_content
, len
, comment_line_str
);
1043 free(summary_content
);
1046 fputs(summary
.buf
, s
->fp
);
1047 strbuf_release(&summary
);
1050 static void wt_longstatus_print_other(struct wt_status
*s
,
1051 struct string_list
*l
,
1056 struct strbuf buf
= STRBUF_INIT
;
1057 static struct string_list output
= STRING_LIST_INIT_DUP
;
1058 struct column_options copts
;
1063 wt_longstatus_print_other_header(s
, what
, how
);
1065 for (i
= 0; i
< l
->nr
; i
++) {
1066 struct string_list_item
*it
;
1068 it
= &(l
->items
[i
]);
1069 path
= quote_path(it
->string
, s
->prefix
, &buf
, 0);
1070 if (column_active(s
->colopts
)) {
1071 string_list_append(&output
, path
);
1074 status_printf(s
, color(WT_STATUS_HEADER
, s
), "\t");
1075 status_printf_more(s
, color(WT_STATUS_UNTRACKED
, s
),
1079 strbuf_release(&buf
);
1080 if (!column_active(s
->colopts
))
1083 strbuf_addf(&buf
, "%s%s\t%s",
1084 color(WT_STATUS_HEADER
, s
),
1085 s
->display_comment_prefix
? "#" : "",
1086 color(WT_STATUS_UNTRACKED
, s
));
1087 memset(&copts
, 0, sizeof(copts
));
1089 copts
.indent
= buf
.buf
;
1090 if (want_color(s
->use_color
))
1091 copts
.nl
= GIT_COLOR_RESET
"\n";
1092 print_columns(&output
, s
->colopts
, &copts
);
1093 string_list_clear(&output
, 0);
1094 strbuf_release(&buf
);
1096 status_printf_ln(s
, GIT_COLOR_NORMAL
, "%s", "");
1099 size_t wt_status_locate_end(const char *s
, size_t len
)
1102 struct strbuf pattern
= STRBUF_INIT
;
1104 strbuf_addf(&pattern
, "\n%s %s", comment_line_str
, cut_line
);
1105 if (starts_with(s
, pattern
.buf
+ 1))
1107 else if ((p
= strstr(s
, pattern
.buf
))) {
1108 size_t newlen
= p
- s
+ 1;
1112 strbuf_release(&pattern
);
1116 void wt_status_append_cut_line(struct strbuf
*buf
)
1118 const char *explanation
= _("Do not modify or remove the line above.\nEverything below it will be ignored.");
1120 strbuf_commented_addf(buf
, comment_line_str
, "%s", cut_line
);
1121 strbuf_add_commented_lines(buf
, explanation
, strlen(explanation
), comment_line_str
);
1124 void wt_status_add_cut_line(struct wt_status
*s
)
1126 struct strbuf buf
= STRBUF_INIT
;
1128 if (s
->added_cut_line
)
1130 s
->added_cut_line
= 1;
1131 wt_status_append_cut_line(&buf
);
1132 fputs(buf
.buf
, s
->fp
);
1133 strbuf_release(&buf
);
1136 static void wt_longstatus_print_verbose(struct wt_status
*s
)
1138 struct rev_info rev
;
1139 struct setup_revision_opt opt
;
1140 int dirty_submodules
;
1141 const char *c
= color(WT_STATUS_HEADER
, s
);
1143 repo_init_revisions(s
->repo
, &rev
, NULL
);
1144 rev
.diffopt
.flags
.allow_textconv
= 1;
1145 rev
.diffopt
.ita_invisible_in_index
= 1;
1147 memset(&opt
, 0, sizeof(opt
));
1148 opt
.def
= s
->is_initial
? empty_tree_oid_hex(the_repository
->hash_algo
) : s
->reference
;
1149 setup_revisions(0, NULL
, &rev
, &opt
);
1151 rev
.diffopt
.output_format
|= DIFF_FORMAT_PATCH
;
1152 rev
.diffopt
.detect_rename
= s
->detect_rename
>= 0 ? s
->detect_rename
: rev
.diffopt
.detect_rename
;
1153 rev
.diffopt
.rename_limit
= s
->rename_limit
>= 0 ? s
->rename_limit
: rev
.diffopt
.rename_limit
;
1154 rev
.diffopt
.rename_score
= s
->rename_score
>= 0 ? s
->rename_score
: rev
.diffopt
.rename_score
;
1155 rev
.diffopt
.file
= s
->fp
;
1156 rev
.diffopt
.close_file
= 0;
1158 * If we're not going to stdout, then we definitely don't
1159 * want color, since we are going to the commit message
1160 * file (and even the "auto" setting won't work, since it
1161 * will have checked isatty on stdout). But we then do want
1162 * to insert the scissor line here to reliably remove the
1163 * diff before committing, if we didn't already include one
1166 if (s
->fp
!= stdout
) {
1167 rev
.diffopt
.use_color
= 0;
1168 wt_status_add_cut_line(s
);
1170 if (s
->verbose
> 1 && s
->committable
) {
1171 /* print_updated() printed a header, so do we */
1172 if (s
->fp
!= stdout
)
1173 wt_longstatus_print_trailer(s
);
1174 status_printf_ln(s
, c
, _("Changes to be committed:"));
1175 rev
.diffopt
.a_prefix
= "c/";
1176 rev
.diffopt
.b_prefix
= "i/";
1177 } /* else use prefix as per user config */
1178 run_diff_index(&rev
, DIFF_INDEX_CACHED
);
1179 if (s
->verbose
> 1 &&
1180 wt_status_check_worktree_changes(s
, &dirty_submodules
)) {
1181 status_printf_ln(s
, c
,
1182 "--------------------------------------------------");
1183 status_printf_ln(s
, c
, _("Changes not staged for commit:"));
1185 rev
.diffopt
.a_prefix
= "i/";
1186 rev
.diffopt
.b_prefix
= "w/";
1187 run_diff_files(&rev
, 0);
1189 release_revisions(&rev
);
1192 static void wt_longstatus_print_tracking(struct wt_status
*s
)
1194 struct strbuf sb
= STRBUF_INIT
;
1195 const char *cp
, *ep
, *branch_name
;
1196 struct branch
*branch
;
1197 uint64_t t_begin
= 0;
1199 assert(s
->branch
&& !s
->is_initial
);
1200 if (!skip_prefix(s
->branch
, "refs/heads/", &branch_name
))
1202 branch
= branch_get(branch_name
);
1204 t_begin
= getnanotime();
1206 if (!format_tracking_info(branch
, &sb
, s
->ahead_behind_flags
,
1207 !s
->commit_template
))
1210 if (advice_enabled(ADVICE_STATUS_AHEAD_BEHIND_WARNING
) &&
1211 s
->ahead_behind_flags
== AHEAD_BEHIND_FULL
) {
1212 uint64_t t_delta_in_ms
= (getnanotime() - t_begin
) / 1000000;
1213 if (t_delta_in_ms
> AB_DELAY_WARNING_IN_MS
) {
1214 strbuf_addf(&sb
, _("\n"
1215 "It took %.2f seconds to compute the branch ahead/behind values.\n"
1216 "You can use '--no-ahead-behind' to avoid this.\n"),
1217 t_delta_in_ms
/ 1000.0);
1221 for (cp
= sb
.buf
; (ep
= strchr(cp
, '\n')) != NULL
; cp
= ep
+ 1)
1222 color_fprintf_ln(s
->fp
, color(WT_STATUS_HEADER
, s
),
1224 s
->display_comment_prefix
? comment_line_str
: "",
1225 s
->display_comment_prefix
? " " : "",
1226 (int)(ep
- cp
), cp
);
1227 if (s
->display_comment_prefix
)
1228 color_fprintf_ln(s
->fp
, color(WT_STATUS_HEADER
, s
), "%s",
1232 strbuf_release(&sb
);
1235 static int uf_was_slow(struct wt_status
*s
)
1237 if (getenv("GIT_TEST_UF_DELAY_WARNING"))
1238 s
->untracked_in_ms
= 3250;
1239 return UF_DELAY_WARNING_IN_MS
< s
->untracked_in_ms
;
1242 static void show_merge_in_progress(struct wt_status
*s
,
1245 if (has_unmerged(s
)) {
1246 status_printf_ln(s
, color
, _("You have unmerged paths."));
1248 status_printf_ln(s
, color
,
1249 _(" (fix conflicts and run \"git commit\")"));
1250 status_printf_ln(s
, color
,
1251 _(" (use \"git merge --abort\" to abort the merge)"));
1254 status_printf_ln(s
, color
,
1255 _("All conflicts fixed but you are still merging."));
1257 status_printf_ln(s
, color
,
1258 _(" (use \"git commit\" to conclude merge)"));
1260 wt_longstatus_print_trailer(s
);
1263 static void show_am_in_progress(struct wt_status
*s
,
1268 status_printf_ln(s
, color
,
1269 _("You are in the middle of an am session."));
1270 if (s
->state
.am_empty_patch
)
1271 status_printf_ln(s
, color
,
1272 _("The current patch is empty."));
1274 am_empty_patch
= s
->state
.am_empty_patch
;
1275 if (!am_empty_patch
)
1276 status_printf_ln(s
, color
,
1277 _(" (fix conflicts and then run \"git am --continue\")"));
1278 status_printf_ln(s
, color
,
1279 _(" (use \"git am --skip\" to skip this patch)"));
1281 status_printf_ln(s
, color
,
1282 _(" (use \"git am --allow-empty\" to record this patch as an empty commit)"));
1283 status_printf_ln(s
, color
,
1284 _(" (use \"git am --abort\" to restore the original branch)"));
1286 wt_longstatus_print_trailer(s
);
1289 static char *read_line_from_git_path(const char *filename
)
1291 struct strbuf buf
= STRBUF_INIT
;
1292 FILE *fp
= fopen_or_warn(repo_git_path_append(the_repository
, &buf
,
1293 "%s", filename
), "r");
1296 strbuf_release(&buf
);
1299 strbuf_getline_lf(&buf
, fp
);
1301 return strbuf_detach(&buf
, NULL
);
1303 strbuf_release(&buf
);
1308 static int split_commit_in_progress(struct wt_status
*s
)
1310 int split_in_progress
= 0;
1311 struct object_id head_oid
, orig_head_oid
;
1312 char *rebase_amend
, *rebase_orig_head
;
1313 int head_flags
, orig_head_flags
;
1315 if ((!s
->amend
&& !s
->nowarn
&& !s
->workdir_dirty
) ||
1316 !s
->branch
|| strcmp(s
->branch
, "HEAD"))
1319 if (refs_read_ref_full(get_main_ref_store(the_repository
), "HEAD", RESOLVE_REF_READING
| RESOLVE_REF_NO_RECURSE
,
1320 &head_oid
, &head_flags
) ||
1321 refs_read_ref_full(get_main_ref_store(the_repository
), "ORIG_HEAD", RESOLVE_REF_READING
| RESOLVE_REF_NO_RECURSE
,
1322 &orig_head_oid
, &orig_head_flags
))
1324 if (head_flags
& REF_ISSYMREF
|| orig_head_flags
& REF_ISSYMREF
)
1327 rebase_amend
= read_line_from_git_path("rebase-merge/amend");
1328 rebase_orig_head
= read_line_from_git_path("rebase-merge/orig-head");
1330 if (!rebase_amend
|| !rebase_orig_head
)
1331 ; /* fall through, no split in progress */
1332 else if (!strcmp(rebase_amend
, rebase_orig_head
))
1333 split_in_progress
= !!strcmp(oid_to_hex(&head_oid
), rebase_amend
);
1334 else if (strcmp(oid_to_hex(&orig_head_oid
), rebase_orig_head
))
1335 split_in_progress
= 1;
1338 free(rebase_orig_head
);
1340 return split_in_progress
;
1345 * "pick d6a2f0303e897ec257dd0e0a39a5ccb709bc2047 some message"
1347 * "pick d6a2f03 some message"
1349 * The function assumes that the line does not contain useless spaces
1350 * before or after the command.
1352 static void abbrev_oid_in_line(struct strbuf
*line
)
1354 struct strbuf
**split
;
1357 if (starts_with(line
->buf
, "exec ") ||
1358 starts_with(line
->buf
, "x ") ||
1359 starts_with(line
->buf
, "label ") ||
1360 starts_with(line
->buf
, "l "))
1363 split
= strbuf_split_max(line
, ' ', 3);
1364 if (split
[0] && split
[1]) {
1365 struct object_id oid
;
1368 * strbuf_split_max left a space. Trim it and re-add
1369 * it after abbreviation.
1371 strbuf_trim(split
[1]);
1372 if (!repo_get_oid(the_repository
, split
[1]->buf
, &oid
)) {
1373 strbuf_reset(split
[1]);
1374 strbuf_add_unique_abbrev(split
[1], &oid
,
1376 strbuf_addch(split
[1], ' ');
1378 for (i
= 0; split
[i
]; i
++)
1379 strbuf_addbuf(line
, split
[i
]);
1382 strbuf_list_free(split
);
1385 static int read_rebase_todolist(const char *fname
, struct string_list
*lines
)
1387 struct strbuf buf
= STRBUF_INIT
;
1388 FILE *f
= fopen(repo_git_path_append(the_repository
, &buf
, "%s", fname
), "r");
1392 if (errno
== ENOENT
) {
1396 die_errno("Could not open file %s for reading",
1397 repo_git_path_replace(the_repository
, &buf
, "%s", fname
));
1399 while (!strbuf_getline_lf(&buf
, f
)) {
1400 if (starts_with(buf
.buf
, comment_line_str
))
1405 abbrev_oid_in_line(&buf
);
1406 string_list_append(lines
, buf
.buf
);
1412 strbuf_release(&buf
);
1416 static void show_rebase_information(struct wt_status
*s
,
1419 if (s
->state
.rebase_interactive_in_progress
) {
1421 int nr_lines_to_show
= 2;
1423 struct string_list have_done
= STRING_LIST_INIT_DUP
;
1424 struct string_list yet_to_do
= STRING_LIST_INIT_DUP
;
1426 read_rebase_todolist("rebase-merge/done", &have_done
);
1427 if (read_rebase_todolist("rebase-merge/git-rebase-todo",
1429 status_printf_ln(s
, color
,
1430 _("git-rebase-todo is missing."));
1431 if (have_done
.nr
== 0)
1432 status_printf_ln(s
, color
, _("No commands done."));
1434 status_printf_ln(s
, color
,
1435 Q_("Last command done (%"PRIuMAX
" command done):",
1436 "Last commands done (%"PRIuMAX
" commands done):",
1438 (uintmax_t)have_done
.nr
);
1439 for (i
= (have_done
.nr
> nr_lines_to_show
)
1440 ? have_done
.nr
- nr_lines_to_show
: 0;
1443 status_printf_ln(s
, color
, " %s", have_done
.items
[i
].string
);
1444 if (have_done
.nr
> nr_lines_to_show
&& s
->hints
) {
1445 char *path
= repo_git_path(the_repository
, "rebase-merge/done");
1446 status_printf_ln(s
, color
,
1447 _(" (see more in file %s)"), path
);
1452 if (yet_to_do
.nr
== 0)
1453 status_printf_ln(s
, color
,
1454 _("No commands remaining."));
1456 status_printf_ln(s
, color
,
1457 Q_("Next command to do (%"PRIuMAX
" remaining command):",
1458 "Next commands to do (%"PRIuMAX
" remaining commands):",
1460 (uintmax_t)yet_to_do
.nr
);
1461 for (i
= 0; i
< nr_lines_to_show
&& i
< yet_to_do
.nr
; i
++)
1462 status_printf_ln(s
, color
, " %s", yet_to_do
.items
[i
].string
);
1464 status_printf_ln(s
, color
,
1465 _(" (use \"git rebase --edit-todo\" to view and edit)"));
1467 string_list_clear(&yet_to_do
, 0);
1468 string_list_clear(&have_done
, 0);
1472 static void print_rebase_state(struct wt_status
*s
,
1475 if (s
->state
.branch
)
1476 status_printf_ln(s
, color
,
1477 _("You are currently rebasing branch '%s' on '%s'."),
1481 status_printf_ln(s
, color
,
1482 _("You are currently rebasing."));
1485 static void show_rebase_in_progress(struct wt_status
*s
,
1490 show_rebase_information(s
, color
);
1491 if (has_unmerged(s
)) {
1492 print_rebase_state(s
, color
);
1494 status_printf_ln(s
, color
,
1495 _(" (fix conflicts and then run \"git rebase --continue\")"));
1496 status_printf_ln(s
, color
,
1497 _(" (use \"git rebase --skip\" to skip this patch)"));
1498 status_printf_ln(s
, color
,
1499 _(" (use \"git rebase --abort\" to check out the original branch)"));
1501 } else if (s
->state
.rebase_in_progress
||
1502 !stat(git_path_merge_msg(s
->repo
), &st
)) {
1503 print_rebase_state(s
, color
);
1505 status_printf_ln(s
, color
,
1506 _(" (all conflicts fixed: run \"git rebase --continue\")"));
1507 } else if (split_commit_in_progress(s
)) {
1508 if (s
->state
.branch
)
1509 status_printf_ln(s
, color
,
1510 _("You are currently splitting a commit while rebasing branch '%s' on '%s'."),
1514 status_printf_ln(s
, color
,
1515 _("You are currently splitting a commit during a rebase."));
1517 status_printf_ln(s
, color
,
1518 _(" (Once your working directory is clean, run \"git rebase --continue\")"));
1520 if (s
->state
.branch
)
1521 status_printf_ln(s
, color
,
1522 _("You are currently editing a commit while rebasing branch '%s' on '%s'."),
1526 status_printf_ln(s
, color
,
1527 _("You are currently editing a commit during a rebase."));
1528 if (s
->hints
&& !s
->amend
) {
1529 status_printf_ln(s
, color
,
1530 _(" (use \"git commit --amend\" to amend the current commit)"));
1531 status_printf_ln(s
, color
,
1532 _(" (use \"git rebase --continue\" once you are satisfied with your changes)"));
1535 wt_longstatus_print_trailer(s
);
1538 static void show_cherry_pick_in_progress(struct wt_status
*s
,
1541 if (is_null_oid(&s
->state
.cherry_pick_head_oid
))
1542 status_printf_ln(s
, color
,
1543 _("Cherry-pick currently in progress."));
1545 status_printf_ln(s
, color
,
1546 _("You are currently cherry-picking commit %s."),
1547 repo_find_unique_abbrev(the_repository
, &s
->state
.cherry_pick_head_oid
,
1551 if (has_unmerged(s
))
1552 status_printf_ln(s
, color
,
1553 _(" (fix conflicts and run \"git cherry-pick --continue\")"));
1554 else if (is_null_oid(&s
->state
.cherry_pick_head_oid
))
1555 status_printf_ln(s
, color
,
1556 _(" (run \"git cherry-pick --continue\" to continue)"));
1558 status_printf_ln(s
, color
,
1559 _(" (all conflicts fixed: run \"git cherry-pick --continue\")"));
1560 status_printf_ln(s
, color
,
1561 _(" (use \"git cherry-pick --skip\" to skip this patch)"));
1562 status_printf_ln(s
, color
,
1563 _(" (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"));
1565 wt_longstatus_print_trailer(s
);
1568 static void show_revert_in_progress(struct wt_status
*s
,
1571 if (is_null_oid(&s
->state
.revert_head_oid
))
1572 status_printf_ln(s
, color
,
1573 _("Revert currently in progress."));
1575 status_printf_ln(s
, color
,
1576 _("You are currently reverting commit %s."),
1577 repo_find_unique_abbrev(the_repository
, &s
->state
.revert_head_oid
,
1580 if (has_unmerged(s
))
1581 status_printf_ln(s
, color
,
1582 _(" (fix conflicts and run \"git revert --continue\")"));
1583 else if (is_null_oid(&s
->state
.revert_head_oid
))
1584 status_printf_ln(s
, color
,
1585 _(" (run \"git revert --continue\" to continue)"));
1587 status_printf_ln(s
, color
,
1588 _(" (all conflicts fixed: run \"git revert --continue\")"));
1589 status_printf_ln(s
, color
,
1590 _(" (use \"git revert --skip\" to skip this patch)"));
1591 status_printf_ln(s
, color
,
1592 _(" (use \"git revert --abort\" to cancel the revert operation)"));
1594 wt_longstatus_print_trailer(s
);
1597 static void show_bisect_in_progress(struct wt_status
*s
,
1600 if (s
->state
.bisecting_from
)
1601 status_printf_ln(s
, color
,
1602 _("You are currently bisecting, started from branch '%s'."),
1603 s
->state
.bisecting_from
);
1605 status_printf_ln(s
, color
,
1606 _("You are currently bisecting."));
1608 status_printf_ln(s
, color
,
1609 _(" (use \"git bisect reset\" to get back to the original branch)"));
1610 wt_longstatus_print_trailer(s
);
1613 static void show_sparse_checkout_in_use(struct wt_status
*s
,
1616 if (s
->state
.sparse_checkout_percentage
== SPARSE_CHECKOUT_DISABLED
)
1619 if (s
->state
.sparse_checkout_percentage
== SPARSE_CHECKOUT_SPARSE_INDEX
)
1620 status_printf_ln(s
, color
, _("You are in a sparse checkout."));
1622 status_printf_ln(s
, color
,
1623 _("You are in a sparse checkout with %d%% of tracked files present."),
1624 s
->state
.sparse_checkout_percentage
);
1625 wt_longstatus_print_trailer(s
);
1629 * Extract branch information from rebase/bisect
1631 static char *get_branch(const struct worktree
*wt
, const char *path
)
1633 struct strbuf sb
= STRBUF_INIT
;
1634 struct object_id oid
;
1635 const char *branch_name
;
1637 if (strbuf_read_file(&sb
, worktree_git_path(the_repository
, wt
, "%s", path
), 0) <= 0)
1640 while (sb
.len
&& sb
.buf
[sb
.len
- 1] == '\n')
1641 strbuf_setlen(&sb
, sb
.len
- 1);
1644 if (skip_prefix(sb
.buf
, "refs/heads/", &branch_name
))
1645 strbuf_remove(&sb
, 0, branch_name
- sb
.buf
);
1646 else if (starts_with(sb
.buf
, "refs/"))
1648 else if (!get_oid_hex(sb
.buf
, &oid
)) {
1650 strbuf_add_unique_abbrev(&sb
, &oid
, DEFAULT_ABBREV
);
1651 } else if (!strcmp(sb
.buf
, "detached HEAD")) /* rebase */
1655 return strbuf_detach(&sb
, NULL
);
1658 strbuf_release(&sb
);
1662 struct grab_1st_switch_cbdata
{
1664 struct object_id noid
;
1667 static int grab_1st_switch(struct object_id
*ooid UNUSED
,
1668 struct object_id
*noid
,
1669 const char *email UNUSED
,
1670 timestamp_t timestamp UNUSED
, int tz UNUSED
,
1671 const char *message
, void *cb_data
)
1673 struct grab_1st_switch_cbdata
*cb
= cb_data
;
1674 const char *target
= NULL
, *end
;
1676 if (!skip_prefix(message
, "checkout: moving from ", &message
))
1678 target
= strstr(message
, " to ");
1681 target
+= strlen(" to ");
1682 strbuf_reset(&cb
->buf
);
1683 oidcpy(&cb
->noid
, noid
);
1684 end
= strchrnul(target
, '\n');
1685 strbuf_add(&cb
->buf
, target
, end
- target
);
1686 if (!strcmp(cb
->buf
.buf
, "HEAD")) {
1687 /* HEAD is relative. Resolve it to the right reflog entry. */
1688 strbuf_reset(&cb
->buf
);
1689 strbuf_add_unique_abbrev(&cb
->buf
, noid
, DEFAULT_ABBREV
);
1694 static void wt_status_get_detached_from(struct repository
*r
,
1695 struct wt_status_state
*state
)
1697 struct grab_1st_switch_cbdata cb
;
1698 struct commit
*commit
;
1699 struct object_id oid
;
1702 strbuf_init(&cb
.buf
, 0);
1703 if (refs_for_each_reflog_ent_reverse(get_main_ref_store(the_repository
), "HEAD", grab_1st_switch
, &cb
) <= 0) {
1704 strbuf_release(&cb
.buf
);
1708 if (repo_dwim_ref(r
, cb
.buf
.buf
, cb
.buf
.len
, &oid
, &ref
,
1710 /* oid is a commit? match without further lookup */
1711 (oideq(&cb
.noid
, &oid
) ||
1712 /* perhaps oid is a tag, try to dereference to a commit */
1713 ((commit
= lookup_commit_reference_gently(r
, &oid
, 1)) != NULL
&&
1714 oideq(&cb
.noid
, &commit
->object
.oid
)))) {
1715 const char *from
= ref
;
1716 if (!skip_prefix(from
, "refs/tags/", &from
))
1717 skip_prefix(from
, "refs/remotes/", &from
);
1718 state
->detached_from
= xstrdup(from
);
1720 state
->detached_from
=
1721 xstrdup(repo_find_unique_abbrev(r
, &cb
.noid
, DEFAULT_ABBREV
));
1722 oidcpy(&state
->detached_oid
, &cb
.noid
);
1723 state
->detached_at
= !repo_get_oid(r
, "HEAD", &oid
) &&
1724 oideq(&oid
, &state
->detached_oid
);
1727 strbuf_release(&cb
.buf
);
1730 int wt_status_check_rebase(const struct worktree
*wt
,
1731 struct wt_status_state
*state
)
1735 if (!stat(worktree_git_path(the_repository
, wt
, "rebase-apply"), &st
)) {
1736 if (!stat(worktree_git_path(the_repository
, wt
, "rebase-apply/applying"), &st
)) {
1737 state
->am_in_progress
= 1;
1738 if (!stat(worktree_git_path(the_repository
, wt
, "rebase-apply/patch"), &st
) && !st
.st_size
)
1739 state
->am_empty_patch
= 1;
1741 state
->rebase_in_progress
= 1;
1742 state
->branch
= get_branch(wt
, "rebase-apply/head-name");
1743 state
->onto
= get_branch(wt
, "rebase-apply/onto");
1745 } else if (!stat(worktree_git_path(the_repository
, wt
, "rebase-merge"), &st
)) {
1746 if (!stat(worktree_git_path(the_repository
, wt
, "rebase-merge/interactive"), &st
))
1747 state
->rebase_interactive_in_progress
= 1;
1749 state
->rebase_in_progress
= 1;
1750 state
->branch
= get_branch(wt
, "rebase-merge/head-name");
1751 state
->onto
= get_branch(wt
, "rebase-merge/onto");
1757 int wt_status_check_bisect(const struct worktree
*wt
,
1758 struct wt_status_state
*state
)
1762 if (!stat(worktree_git_path(the_repository
, wt
, "BISECT_LOG"), &st
)) {
1763 state
->bisect_in_progress
= 1;
1764 state
->bisecting_from
= get_branch(wt
, "BISECT_START");
1770 static void wt_status_check_sparse_checkout(struct repository
*r
,
1771 struct wt_status_state
*state
)
1773 int skip_worktree
= 0;
1776 if (!core_apply_sparse_checkout
|| r
->index
->cache_nr
== 0) {
1778 * Don't compute percentage of checked out files if we
1779 * aren't in a sparse checkout or would get division by 0.
1781 state
->sparse_checkout_percentage
= SPARSE_CHECKOUT_DISABLED
;
1785 if (r
->index
->sparse_index
) {
1786 state
->sparse_checkout_percentage
= SPARSE_CHECKOUT_SPARSE_INDEX
;
1790 for (i
= 0; i
< r
->index
->cache_nr
; i
++) {
1791 struct cache_entry
*ce
= r
->index
->cache
[i
];
1792 if (ce_skip_worktree(ce
))
1796 state
->sparse_checkout_percentage
=
1797 100 - (100 * skip_worktree
)/r
->index
->cache_nr
;
1800 void wt_status_get_state(struct repository
*r
,
1801 struct wt_status_state
*state
,
1802 int get_detached_from
)
1805 struct object_id oid
;
1806 enum replay_action action
;
1808 if (!stat(git_path_merge_head(r
), &st
)) {
1809 wt_status_check_rebase(NULL
, state
);
1810 state
->merge_in_progress
= 1;
1811 } else if (wt_status_check_rebase(NULL
, state
)) {
1813 } else if (refs_ref_exists(get_main_ref_store(r
), "CHERRY_PICK_HEAD") &&
1814 !repo_get_oid(r
, "CHERRY_PICK_HEAD", &oid
)) {
1815 state
->cherry_pick_in_progress
= 1;
1816 oidcpy(&state
->cherry_pick_head_oid
, &oid
);
1818 wt_status_check_bisect(NULL
, state
);
1819 if (refs_ref_exists(get_main_ref_store(r
), "REVERT_HEAD") &&
1820 !repo_get_oid(r
, "REVERT_HEAD", &oid
)) {
1821 state
->revert_in_progress
= 1;
1822 oidcpy(&state
->revert_head_oid
, &oid
);
1824 if (!sequencer_get_last_command(r
, &action
)) {
1825 if (action
== REPLAY_PICK
&& !state
->cherry_pick_in_progress
) {
1826 state
->cherry_pick_in_progress
= 1;
1827 oidcpy(&state
->cherry_pick_head_oid
, null_oid(the_hash_algo
));
1828 } else if (action
== REPLAY_REVERT
&& !state
->revert_in_progress
) {
1829 state
->revert_in_progress
= 1;
1830 oidcpy(&state
->revert_head_oid
, null_oid(the_hash_algo
));
1833 if (get_detached_from
)
1834 wt_status_get_detached_from(r
, state
);
1835 wt_status_check_sparse_checkout(r
, state
);
1838 static void wt_longstatus_print_state(struct wt_status
*s
)
1840 const char *state_color
= color(WT_STATUS_HEADER
, s
);
1841 struct wt_status_state
*state
= &s
->state
;
1843 if (state
->merge_in_progress
) {
1844 if (state
->rebase_interactive_in_progress
) {
1845 show_rebase_information(s
, state_color
);
1848 show_merge_in_progress(s
, state_color
);
1849 } else if (state
->am_in_progress
)
1850 show_am_in_progress(s
, state_color
);
1851 else if (state
->rebase_in_progress
|| state
->rebase_interactive_in_progress
)
1852 show_rebase_in_progress(s
, state_color
);
1853 else if (state
->cherry_pick_in_progress
)
1854 show_cherry_pick_in_progress(s
, state_color
);
1855 else if (state
->revert_in_progress
)
1856 show_revert_in_progress(s
, state_color
);
1857 if (state
->bisect_in_progress
)
1858 show_bisect_in_progress(s
, state_color
);
1860 if (state
->sparse_checkout_percentage
!= SPARSE_CHECKOUT_DISABLED
)
1861 show_sparse_checkout_in_use(s
, state_color
);
1864 static void wt_longstatus_print(struct wt_status
*s
)
1866 const char *branch_color
= color(WT_STATUS_ONBRANCH
, s
);
1867 const char *branch_status_color
= color(WT_STATUS_HEADER
, s
);
1868 enum fsmonitor_mode fsm_mode
= fsm_settings__get_mode(s
->repo
);
1871 const char *on_what
= _("On branch ");
1872 const char *branch_name
= s
->branch
;
1873 if (!strcmp(branch_name
, "HEAD")) {
1874 branch_status_color
= color(WT_STATUS_NOBRANCH
, s
);
1875 if (s
->state
.rebase_in_progress
||
1876 s
->state
.rebase_interactive_in_progress
) {
1877 if (s
->state
.rebase_interactive_in_progress
)
1878 on_what
= _("interactive rebase in progress; onto ");
1880 on_what
= _("rebase in progress; onto ");
1881 branch_name
= s
->state
.onto
;
1882 } else if (s
->state
.detached_from
) {
1883 branch_name
= s
->state
.detached_from
;
1884 if (s
->state
.detached_at
)
1885 on_what
= _("HEAD detached at ");
1887 on_what
= _("HEAD detached from ");
1890 on_what
= _("Not currently on any branch.");
1893 skip_prefix(branch_name
, "refs/heads/", &branch_name
);
1894 status_printf(s
, color(WT_STATUS_HEADER
, s
), "%s", "");
1895 status_printf_more(s
, branch_status_color
, "%s", on_what
);
1896 status_printf_more(s
, branch_color
, "%s\n", branch_name
);
1898 wt_longstatus_print_tracking(s
);
1901 wt_longstatus_print_state(s
);
1903 if (s
->is_initial
) {
1904 status_printf_ln(s
, color(WT_STATUS_HEADER
, s
), "%s", "");
1905 status_printf_ln(s
, color(WT_STATUS_HEADER
, s
),
1907 ? _("Initial commit")
1908 : _("No commits yet"));
1909 status_printf_ln(s
, color(WT_STATUS_HEADER
, s
), "%s", "");
1912 wt_longstatus_print_updated(s
);
1913 wt_longstatus_print_unmerged(s
);
1914 wt_longstatus_print_changed(s
);
1915 if (s
->submodule_summary
&&
1916 (!s
->ignore_submodule_arg
||
1917 strcmp(s
->ignore_submodule_arg
, "all"))) {
1918 wt_longstatus_print_submodule_summary(s
, 0); /* staged */
1919 wt_longstatus_print_submodule_summary(s
, 1); /* unstaged */
1921 if (s
->show_untracked_files
) {
1922 wt_longstatus_print_other(s
, &s
->untracked
, _("Untracked files"), "add");
1923 if (s
->show_ignored_mode
)
1924 wt_longstatus_print_other(s
, &s
->ignored
, _("Ignored files"), "add -f");
1925 if (advice_enabled(ADVICE_STATUS_U_OPTION
) && uf_was_slow(s
)) {
1926 status_printf_ln(s
, GIT_COLOR_NORMAL
, "%s", "");
1927 if (fsm_mode
> FSMONITOR_MODE_DISABLED
) {
1928 status_printf_ln(s
, GIT_COLOR_NORMAL
,
1929 _("It took %.2f seconds to enumerate untracked files,\n"
1930 "but the results were cached, and subsequent runs may be faster."),
1931 s
->untracked_in_ms
/ 1000.0);
1933 status_printf_ln(s
, GIT_COLOR_NORMAL
,
1934 _("It took %.2f seconds to enumerate untracked files."),
1935 s
->untracked_in_ms
/ 1000.0);
1937 status_printf_ln(s
, GIT_COLOR_NORMAL
,
1938 _("See 'git help status' for information on how to improve this."));
1939 status_printf_ln(s
, GIT_COLOR_NORMAL
, "%s", "");
1941 } else if (s
->committable
)
1942 status_printf_ln(s
, GIT_COLOR_NORMAL
, _("Untracked files not listed%s"),
1944 ? _(" (use -u option to show untracked files)") : "");
1947 wt_longstatus_print_verbose(s
);
1948 if (!s
->committable
) {
1950 status_printf_ln(s
, GIT_COLOR_NORMAL
, _("No changes"));
1953 else if (s
->workdir_dirty
) {
1955 fprintf(s
->fp
, _("no changes added to commit "
1956 "(use \"git add\" and/or "
1957 "\"git commit -a\")\n"));
1959 fprintf(s
->fp
, _("no changes added to "
1961 } else if (s
->untracked
.nr
) {
1963 fprintf(s
->fp
, _("nothing added to commit but "
1964 "untracked files present (use "
1965 "\"git add\" to track)\n"));
1967 fprintf(s
->fp
, _("nothing added to commit but "
1968 "untracked files present\n"));
1969 } else if (s
->is_initial
) {
1971 fprintf(s
->fp
, _("nothing to commit (create/"
1972 "copy files and use \"git "
1973 "add\" to track)\n"));
1975 fprintf(s
->fp
, _("nothing to commit\n"));
1976 } else if (!s
->show_untracked_files
) {
1978 fprintf(s
->fp
, _("nothing to commit (use -u to "
1979 "show untracked files)\n"));
1981 fprintf(s
->fp
, _("nothing to commit\n"));
1983 fprintf(s
->fp
, _("nothing to commit, working tree "
1987 wt_longstatus_print_stash_summary(s
);
1990 static void wt_shortstatus_unmerged(struct string_list_item
*it
,
1991 struct wt_status
*s
)
1993 struct wt_status_change_data
*d
= it
->util
;
1994 const char *how
= "??";
1996 switch (d
->stagemask
) {
1997 case 1: how
= "DD"; break; /* both deleted */
1998 case 2: how
= "AU"; break; /* added by us */
1999 case 3: how
= "UD"; break; /* deleted by them */
2000 case 4: how
= "UA"; break; /* added by them */
2001 case 5: how
= "DU"; break; /* deleted by us */
2002 case 6: how
= "AA"; break; /* both added */
2003 case 7: how
= "UU"; break; /* both modified */
2005 color_fprintf(s
->fp
, color(WT_STATUS_UNMERGED
, s
), "%s", how
);
2006 if (s
->null_termination
) {
2007 fprintf(s
->fp
, " %s%c", it
->string
, 0);
2009 struct strbuf onebuf
= STRBUF_INIT
;
2011 one
= quote_path(it
->string
, s
->prefix
, &onebuf
, QUOTE_PATH_QUOTE_SP
);
2012 fprintf(s
->fp
, " %s\n", one
);
2013 strbuf_release(&onebuf
);
2017 static void wt_shortstatus_status(struct string_list_item
*it
,
2018 struct wt_status
*s
)
2020 struct wt_status_change_data
*d
= it
->util
;
2022 if (d
->index_status
)
2023 color_fprintf(s
->fp
, color(WT_STATUS_UPDATED
, s
), "%c", d
->index_status
);
2026 if (d
->worktree_status
)
2027 color_fprintf(s
->fp
, color(WT_STATUS_CHANGED
, s
), "%c", d
->worktree_status
);
2031 if (s
->null_termination
) {
2032 fprintf(s
->fp
, "%s%c", it
->string
, 0);
2033 if (d
->rename_source
)
2034 fprintf(s
->fp
, "%s%c", d
->rename_source
, 0);
2036 struct strbuf onebuf
= STRBUF_INIT
;
2039 if (d
->rename_source
) {
2040 one
= quote_path(d
->rename_source
, s
->prefix
, &onebuf
,
2041 QUOTE_PATH_QUOTE_SP
);
2042 fprintf(s
->fp
, "%s -> ", one
);
2043 strbuf_release(&onebuf
);
2045 one
= quote_path(it
->string
, s
->prefix
, &onebuf
, QUOTE_PATH_QUOTE_SP
);
2046 fprintf(s
->fp
, "%s\n", one
);
2047 strbuf_release(&onebuf
);
2051 static void wt_shortstatus_other(struct string_list_item
*it
,
2052 struct wt_status
*s
, const char *sign
)
2054 if (s
->null_termination
) {
2055 fprintf(s
->fp
, "%s %s%c", sign
, it
->string
, 0);
2057 struct strbuf onebuf
= STRBUF_INIT
;
2059 one
= quote_path(it
->string
, s
->prefix
, &onebuf
, QUOTE_PATH_QUOTE_SP
);
2060 color_fprintf(s
->fp
, color(WT_STATUS_UNTRACKED
, s
), "%s", sign
);
2061 fprintf(s
->fp
, " %s\n", one
);
2062 strbuf_release(&onebuf
);
2066 static void wt_shortstatus_print_tracking(struct wt_status
*s
)
2068 struct branch
*branch
;
2069 const char *header_color
= color(WT_STATUS_HEADER
, s
);
2070 const char *branch_color_local
= color(WT_STATUS_LOCAL_BRANCH
, s
);
2071 const char *branch_color_remote
= color(WT_STATUS_REMOTE_BRANCH
, s
);
2075 const char *branch_name
;
2076 int num_ours
, num_theirs
, sti
;
2077 int upstream_is_gone
= 0;
2079 color_fprintf(s
->fp
, color(WT_STATUS_HEADER
, s
), "## ");
2083 branch_name
= s
->branch
;
2085 #define LABEL(string) (s->no_gettext ? (string) : _(string))
2088 color_fprintf(s
->fp
, header_color
, LABEL(N_("No commits yet on ")));
2090 if (!strcmp(s
->branch
, "HEAD")) {
2091 color_fprintf(s
->fp
, color(WT_STATUS_NOBRANCH
, s
), "%s",
2092 LABEL(N_("HEAD (no branch)")));
2096 skip_prefix(branch_name
, "refs/heads/", &branch_name
);
2098 branch
= branch_get(branch_name
);
2100 color_fprintf(s
->fp
, branch_color_local
, "%s", branch_name
);
2102 sti
= stat_tracking_info(branch
, &num_ours
, &num_theirs
, &base
,
2103 0, s
->ahead_behind_flags
);
2108 upstream_is_gone
= 1;
2111 short_base
= refs_shorten_unambiguous_ref(get_main_ref_store(the_repository
),
2113 color_fprintf(s
->fp
, header_color
, "...");
2114 color_fprintf(s
->fp
, branch_color_remote
, "%s", short_base
);
2117 if (!upstream_is_gone
&& !sti
)
2120 color_fprintf(s
->fp
, header_color
, " [");
2121 if (upstream_is_gone
) {
2122 color_fprintf(s
->fp
, header_color
, LABEL(N_("gone")));
2123 } else if (s
->ahead_behind_flags
== AHEAD_BEHIND_QUICK
) {
2124 color_fprintf(s
->fp
, header_color
, LABEL(N_("different")));
2125 } else if (!num_ours
) {
2126 color_fprintf(s
->fp
, header_color
, LABEL(N_("behind ")));
2127 color_fprintf(s
->fp
, branch_color_remote
, "%d", num_theirs
);
2128 } else if (!num_theirs
) {
2129 color_fprintf(s
->fp
, header_color
, LABEL(N_("ahead ")));
2130 color_fprintf(s
->fp
, branch_color_local
, "%d", num_ours
);
2132 color_fprintf(s
->fp
, header_color
, LABEL(N_("ahead ")));
2133 color_fprintf(s
->fp
, branch_color_local
, "%d", num_ours
);
2134 color_fprintf(s
->fp
, header_color
, ", %s", LABEL(N_("behind ")));
2135 color_fprintf(s
->fp
, branch_color_remote
, "%d", num_theirs
);
2138 color_fprintf(s
->fp
, header_color
, "]");
2140 fputc(s
->null_termination
? '\0' : '\n', s
->fp
);
2143 static void wt_shortstatus_print(struct wt_status
*s
)
2145 struct string_list_item
*it
;
2148 wt_shortstatus_print_tracking(s
);
2150 for_each_string_list_item(it
, &s
->change
) {
2151 struct wt_status_change_data
*d
= it
->util
;
2154 wt_shortstatus_unmerged(it
, s
);
2156 wt_shortstatus_status(it
, s
);
2158 for_each_string_list_item(it
, &s
->untracked
)
2159 wt_shortstatus_other(it
, s
, "??");
2161 for_each_string_list_item(it
, &s
->ignored
)
2162 wt_shortstatus_other(it
, s
, "!!");
2165 static void wt_porcelain_print(struct wt_status
*s
)
2168 s
->relative_paths
= 0;
2171 wt_shortstatus_print(s
);
2175 * Print branch information for porcelain v2 output. These lines
2176 * are printed when the '--branch' parameter is given.
2178 * # branch.oid <commit><eol>
2179 * # branch.head <head><eol>
2180 * [# branch.upstream <upstream><eol>
2181 * [# branch.ab +<ahead> -<behind><eol>]]
2183 * <commit> ::= the current commit hash or the literal
2184 * "(initial)" to indicate an initialized repo
2187 * <head> ::= <branch_name> the current branch name or
2188 * "(detached)" literal when detached head or
2189 * "(unknown)" when something is wrong.
2191 * <upstream> ::= the upstream branch name, when set.
2193 * <ahead> ::= integer ahead value or '?'.
2195 * <behind> ::= integer behind value or '?'.
2197 * The end-of-line is defined by the -z flag.
2199 * <eol> ::= NUL when -z,
2202 * When an upstream is set and present, the 'branch.ab' line will
2203 * be printed with the ahead/behind counts for the branch and the
2204 * upstream. When AHEAD_BEHIND_QUICK is requested and the branches
2205 * are different, '?' will be substituted for the actual count.
2207 static void wt_porcelain_v2_print_tracking(struct wt_status
*s
)
2209 struct branch
*branch
;
2211 const char *branch_name
;
2212 int ab_info
, nr_ahead
, nr_behind
;
2213 char eol
= s
->null_termination
? '\0' : '\n';
2215 fprintf(s
->fp
, "# branch.oid %s%c",
2216 (s
->is_initial
? "(initial)" : oid_to_hex(&s
->oid_commit
)),
2220 fprintf(s
->fp
, "# branch.head %s%c", "(unknown)", eol
);
2222 if (!strcmp(s
->branch
, "HEAD")) {
2223 fprintf(s
->fp
, "# branch.head %s%c", "(detached)", eol
);
2225 if (s
->state
.rebase_in_progress
||
2226 s
->state
.rebase_interactive_in_progress
)
2227 branch_name
= s
->state
.onto
;
2228 else if (s
->state
.detached_from
)
2229 branch_name
= s
->state
.detached_from
;
2234 skip_prefix(s
->branch
, "refs/heads/", &branch_name
);
2236 fprintf(s
->fp
, "# branch.head %s%c", branch_name
, eol
);
2239 /* Lookup stats on the upstream tracking branch, if set. */
2240 branch
= branch_get(branch_name
);
2242 ab_info
= stat_tracking_info(branch
, &nr_ahead
, &nr_behind
,
2243 &base
, 0, s
->ahead_behind_flags
);
2245 base
= refs_shorten_unambiguous_ref(get_main_ref_store(the_repository
),
2247 fprintf(s
->fp
, "# branch.upstream %s%c", base
, eol
);
2252 if (nr_ahead
|| nr_behind
)
2253 fprintf(s
->fp
, "# branch.ab +%d -%d%c",
2254 nr_ahead
, nr_behind
, eol
);
2256 fprintf(s
->fp
, "# branch.ab +? -?%c",
2258 } else if (!ab_info
) {
2260 fprintf(s
->fp
, "# branch.ab +0 -0%c", eol
);
2267 * Print the stash count in a porcelain-friendly format
2269 static void wt_porcelain_v2_print_stash(struct wt_status
*s
)
2271 int stash_count
= count_stash_entries();
2272 char eol
= s
->null_termination
? '\0' : '\n';
2274 if (stash_count
> 0)
2275 fprintf(s
->fp
, "# stash %d%c", stash_count
, eol
);
2279 * Convert various submodule status values into a
2280 * fixed-length string of characters in the buffer provided.
2282 static void wt_porcelain_v2_submodule_state(
2283 struct wt_status_change_data
*d
,
2286 if (S_ISGITLINK(d
->mode_head
) ||
2287 S_ISGITLINK(d
->mode_index
) ||
2288 S_ISGITLINK(d
->mode_worktree
)) {
2290 sub
[1] = d
->new_submodule_commits
? 'C' : '.';
2291 sub
[2] = (d
->dirty_submodule
& DIRTY_SUBMODULE_MODIFIED
) ? 'M' : '.';
2292 sub
[3] = (d
->dirty_submodule
& DIRTY_SUBMODULE_UNTRACKED
) ? 'U' : '.';
2303 * Fix-up changed entries before we print them.
2305 static void wt_porcelain_v2_fix_up_changed(struct string_list_item
*it
)
2307 struct wt_status_change_data
*d
= it
->util
;
2309 if (!d
->index_status
) {
2311 * This entry is unchanged in the index (relative to the head).
2312 * Therefore, the collect_updated_cb was never called for this
2313 * entry (during the head-vs-index scan) and so the head column
2314 * fields were never set.
2316 * We must have data for the index column (from the
2317 * index-vs-worktree scan (otherwise, this entry should not be
2318 * in the list of changes)).
2320 * Copy index column fields to the head column, so that our
2321 * output looks complete.
2323 assert(d
->mode_head
== 0);
2324 d
->mode_head
= d
->mode_index
;
2325 oidcpy(&d
->oid_head
, &d
->oid_index
);
2328 if (!d
->worktree_status
) {
2330 * This entry is unchanged in the worktree (relative to the index).
2331 * Therefore, the collect_changed_cb was never called for this entry
2332 * (during the index-vs-worktree scan) and so the worktree column
2333 * fields were never set.
2335 * We must have data for the index column (from the head-vs-index
2338 * Copy the index column fields to the worktree column so that
2339 * our output looks complete.
2341 * Note that we only have a mode field in the worktree column
2342 * because the scan code tries really hard to not have to compute it.
2344 assert(d
->mode_worktree
== 0);
2345 d
->mode_worktree
= d
->mode_index
;
2350 * Print porcelain v2 info for tracked entries with changes.
2352 static void wt_porcelain_v2_print_changed_entry(
2353 struct string_list_item
*it
,
2354 struct wt_status
*s
)
2356 struct wt_status_change_data
*d
= it
->util
;
2357 struct strbuf buf
= STRBUF_INIT
;
2358 struct strbuf buf_from
= STRBUF_INIT
;
2359 const char *path
= NULL
;
2360 const char *path_from
= NULL
;
2362 char submodule_token
[5];
2363 char sep_char
, eol_char
;
2365 wt_porcelain_v2_fix_up_changed(it
);
2366 wt_porcelain_v2_submodule_state(d
, submodule_token
);
2368 key
[0] = d
->index_status
? d
->index_status
: '.';
2369 key
[1] = d
->worktree_status
? d
->worktree_status
: '.';
2372 if (s
->null_termination
) {
2374 * In -z mode, we DO NOT C-quote pathnames. Current path is ALWAYS first.
2375 * A single NUL character separates them.
2380 path_from
= d
->rename_source
;
2383 * Path(s) are C-quoted if necessary. Current path is ALWAYS first.
2384 * The source path is only present when necessary.
2385 * A single TAB separates them (because paths can contain spaces
2386 * which are not escaped and C-quoting does escape TAB characters).
2390 path
= quote_path(it
->string
, s
->prefix
, &buf
, 0);
2391 if (d
->rename_source
)
2392 path_from
= quote_path(d
->rename_source
, s
->prefix
, &buf_from
, 0);
2396 fprintf(s
->fp
, "2 %s %s %06o %06o %06o %s %s %c%d %s%c%s%c",
2397 key
, submodule_token
,
2398 d
->mode_head
, d
->mode_index
, d
->mode_worktree
,
2399 oid_to_hex(&d
->oid_head
), oid_to_hex(&d
->oid_index
),
2400 d
->rename_status
, d
->rename_score
,
2401 path
, sep_char
, path_from
, eol_char
);
2403 fprintf(s
->fp
, "1 %s %s %06o %06o %06o %s %s %s%c",
2404 key
, submodule_token
,
2405 d
->mode_head
, d
->mode_index
, d
->mode_worktree
,
2406 oid_to_hex(&d
->oid_head
), oid_to_hex(&d
->oid_index
),
2409 strbuf_release(&buf
);
2410 strbuf_release(&buf_from
);
2414 * Print porcelain v2 status info for unmerged entries.
2416 static void wt_porcelain_v2_print_unmerged_entry(
2417 struct string_list_item
*it
,
2418 struct wt_status
*s
)
2420 struct wt_status_change_data
*d
= it
->util
;
2421 struct index_state
*istate
= s
->repo
->index
;
2422 const struct cache_entry
*ce
;
2423 struct strbuf buf_index
= STRBUF_INIT
;
2424 const char *path_index
= NULL
;
2425 int pos
, stage
, sum
;
2428 struct object_id oid
;
2431 char submodule_token
[5];
2432 char unmerged_prefix
= 'u';
2433 char eol_char
= s
->null_termination
? '\0' : '\n';
2435 wt_porcelain_v2_submodule_state(d
, submodule_token
);
2437 switch (d
->stagemask
) {
2438 case 1: key
= "DD"; break; /* both deleted */
2439 case 2: key
= "AU"; break; /* added by us */
2440 case 3: key
= "UD"; break; /* deleted by them */
2441 case 4: key
= "UA"; break; /* added by them */
2442 case 5: key
= "DU"; break; /* deleted by us */
2443 case 6: key
= "AA"; break; /* both added */
2444 case 7: key
= "UU"; break; /* both modified */
2446 BUG("unhandled unmerged status %x", d
->stagemask
);
2450 * Disregard d.aux.porcelain_v2 data that we accumulated
2451 * for the head and index columns during the scans and
2452 * replace with the actual stage data.
2454 * Note that this is a last-one-wins for each the individual
2455 * stage [123] columns in the event of multiple cache entries
2458 memset(stages
, 0, sizeof(stages
));
2460 pos
= index_name_pos(istate
, it
->string
, strlen(it
->string
));
2463 while (pos
< istate
->cache_nr
) {
2464 ce
= istate
->cache
[pos
++];
2465 stage
= ce_stage(ce
);
2466 if (strcmp(ce
->name
, it
->string
) || !stage
)
2468 stages
[stage
- 1].mode
= ce
->ce_mode
;
2469 oidcpy(&stages
[stage
- 1].oid
, &ce
->oid
);
2470 sum
|= (1 << (stage
- 1));
2472 if (sum
!= d
->stagemask
)
2473 BUG("observed stagemask 0x%x != expected stagemask 0x%x", sum
, d
->stagemask
);
2475 if (s
->null_termination
)
2476 path_index
= it
->string
;
2478 path_index
= quote_path(it
->string
, s
->prefix
, &buf_index
, 0);
2480 fprintf(s
->fp
, "%c %s %s %06o %06o %06o %06o %s %s %s %s%c",
2481 unmerged_prefix
, key
, submodule_token
,
2482 stages
[0].mode
, /* stage 1 */
2483 stages
[1].mode
, /* stage 2 */
2484 stages
[2].mode
, /* stage 3 */
2486 oid_to_hex(&stages
[0].oid
), /* stage 1 */
2487 oid_to_hex(&stages
[1].oid
), /* stage 2 */
2488 oid_to_hex(&stages
[2].oid
), /* stage 3 */
2492 strbuf_release(&buf_index
);
2496 * Print porcelain V2 status info for untracked and ignored entries.
2498 static void wt_porcelain_v2_print_other(
2499 struct string_list_item
*it
,
2500 struct wt_status
*s
,
2503 struct strbuf buf
= STRBUF_INIT
;
2507 if (s
->null_termination
) {
2511 path
= quote_path(it
->string
, s
->prefix
, &buf
, 0);
2515 fprintf(s
->fp
, "%c %s%c", prefix
, path
, eol_char
);
2517 strbuf_release(&buf
);
2521 * Print porcelain V2 status.
2524 * [<v2_changed_items>]*
2525 * [<v2_unmerged_items>]*
2526 * [<v2_untracked_items>]*
2527 * [<v2_ignored_items>]*
2530 static void wt_porcelain_v2_print(struct wt_status
*s
)
2532 struct wt_status_change_data
*d
;
2533 struct string_list_item
*it
;
2537 wt_porcelain_v2_print_tracking(s
);
2540 wt_porcelain_v2_print_stash(s
);
2542 for (i
= 0; i
< s
->change
.nr
; i
++) {
2543 it
= &(s
->change
.items
[i
]);
2546 wt_porcelain_v2_print_changed_entry(it
, s
);
2549 for (i
= 0; i
< s
->change
.nr
; i
++) {
2550 it
= &(s
->change
.items
[i
]);
2553 wt_porcelain_v2_print_unmerged_entry(it
, s
);
2556 for (i
= 0; i
< s
->untracked
.nr
; i
++) {
2557 it
= &(s
->untracked
.items
[i
]);
2558 wt_porcelain_v2_print_other(it
, s
, '?');
2561 for (i
= 0; i
< s
->ignored
.nr
; i
++) {
2562 it
= &(s
->ignored
.items
[i
]);
2563 wt_porcelain_v2_print_other(it
, s
, '!');
2567 void wt_status_print(struct wt_status
*s
)
2569 trace2_data_intmax("status", s
->repo
, "count/changed", s
->change
.nr
);
2570 trace2_data_intmax("status", s
->repo
, "count/untracked",
2572 trace2_data_intmax("status", s
->repo
, "count/ignored", s
->ignored
.nr
);
2574 trace2_region_enter("status", "print", s
->repo
);
2576 switch (s
->status_format
) {
2577 case STATUS_FORMAT_SHORT
:
2578 wt_shortstatus_print(s
);
2580 case STATUS_FORMAT_PORCELAIN
:
2581 wt_porcelain_print(s
);
2583 case STATUS_FORMAT_PORCELAIN_V2
:
2584 wt_porcelain_v2_print(s
);
2586 case STATUS_FORMAT_UNSPECIFIED
:
2587 BUG("finalize_deferred_config() should have been called");
2589 case STATUS_FORMAT_NONE
:
2590 case STATUS_FORMAT_LONG
:
2591 wt_longstatus_print(s
);
2595 trace2_region_leave("status", "print", s
->repo
);
2599 * Returns 1 if there are unstaged changes, 0 otherwise.
2601 int has_unstaged_changes(struct repository
*r
, int ignore_submodules
)
2603 struct rev_info rev_info
;
2606 repo_init_revisions(r
, &rev_info
, NULL
);
2607 if (ignore_submodules
) {
2608 rev_info
.diffopt
.flags
.ignore_submodules
= 1;
2609 rev_info
.diffopt
.flags
.override_submodule_config
= 1;
2611 rev_info
.diffopt
.flags
.quick
= 1;
2612 diff_setup_done(&rev_info
.diffopt
);
2613 run_diff_files(&rev_info
, 0);
2614 result
= diff_result_code(&rev_info
);
2615 release_revisions(&rev_info
);
2620 * Returns 1 if there are uncommitted changes, 0 otherwise.
2622 int has_uncommitted_changes(struct repository
*r
,
2623 int ignore_submodules
)
2625 struct rev_info rev_info
;
2628 if (is_index_unborn(r
->index
))
2631 repo_init_revisions(r
, &rev_info
, NULL
);
2632 if (ignore_submodules
)
2633 rev_info
.diffopt
.flags
.ignore_submodules
= 1;
2634 rev_info
.diffopt
.flags
.quick
= 1;
2636 add_head_to_pending(&rev_info
);
2637 if (!rev_info
.pending
.nr
) {
2639 * We have no head (or it's corrupt); use the empty tree,
2640 * which will complain if the index is non-empty.
2642 struct tree
*tree
= lookup_tree(r
, the_hash_algo
->empty_tree
);
2643 add_pending_object(&rev_info
, &tree
->object
, "");
2646 diff_setup_done(&rev_info
.diffopt
);
2647 run_diff_index(&rev_info
, DIFF_INDEX_CACHED
);
2648 result
= diff_result_code(&rev_info
);
2649 release_revisions(&rev_info
);
2654 * If the work tree has unstaged or uncommitted changes, dies with the
2655 * appropriate message.
2657 int require_clean_work_tree(struct repository
*r
,
2660 int ignore_submodules
,
2663 struct lock_file lock_file
= LOCK_INIT
;
2666 fd
= repo_hold_locked_index(r
, &lock_file
, 0);
2667 refresh_index(r
->index
, REFRESH_QUIET
, NULL
, NULL
, NULL
);
2669 repo_update_index_if_able(r
, &lock_file
);
2670 rollback_lock_file(&lock_file
);
2672 if (has_unstaged_changes(r
, ignore_submodules
)) {
2673 /* TRANSLATORS: the action is e.g. "pull with rebase" */
2674 error(_("cannot %s: You have unstaged changes."), _(action
));
2678 if (has_uncommitted_changes(r
, ignore_submodules
)) {
2680 error(_("additionally, your index contains uncommitted changes."));
2682 error(_("cannot %s: Your index contains uncommitted changes."),
2690 BUG("empty hint passed to require_clean_work_tree();"
2691 " use NULL instead");