10 #include "run-command.h"
11 #include "argv-array.h"
14 #include "submodule.h"
21 static const char cut_line
[] =
22 "------------------------ >8 ------------------------\n";
24 static char default_wt_status_colors
[][COLOR_MAXLEN
] = {
25 GIT_COLOR_NORMAL
, /* WT_STATUS_HEADER */
26 GIT_COLOR_GREEN
, /* WT_STATUS_UPDATED */
27 GIT_COLOR_RED
, /* WT_STATUS_CHANGED */
28 GIT_COLOR_RED
, /* WT_STATUS_UNTRACKED */
29 GIT_COLOR_RED
, /* WT_STATUS_NOBRANCH */
30 GIT_COLOR_RED
, /* WT_STATUS_UNMERGED */
31 GIT_COLOR_GREEN
, /* WT_STATUS_LOCAL_BRANCH */
32 GIT_COLOR_RED
, /* WT_STATUS_REMOTE_BRANCH */
33 GIT_COLOR_NIL
, /* WT_STATUS_ONBRANCH */
36 static const char *color(int slot
, struct wt_status
*s
)
39 if (want_color(s
->use_color
))
40 c
= s
->color_palette
[slot
];
41 if (slot
== WT_STATUS_ONBRANCH
&& color_is_nil(c
))
42 c
= s
->color_palette
[WT_STATUS_HEADER
];
46 static void status_vprintf(struct wt_status
*s
, int at_bol
, const char *color
,
47 const char *fmt
, va_list ap
, const char *trail
)
49 struct strbuf sb
= STRBUF_INIT
;
50 struct strbuf linebuf
= STRBUF_INIT
;
51 const char *line
, *eol
;
53 strbuf_vaddf(&sb
, fmt
, ap
);
55 if (s
->display_comment_prefix
) {
56 strbuf_addch(&sb
, comment_line_char
);
58 strbuf_addch(&sb
, ' ');
60 color_print_strbuf(s
->fp
, color
, &sb
);
62 fprintf(s
->fp
, "%s", trail
);
66 for (line
= sb
.buf
; *line
; line
= eol
+ 1) {
67 eol
= strchr(line
, '\n');
69 strbuf_reset(&linebuf
);
70 if (at_bol
&& s
->display_comment_prefix
) {
71 strbuf_addch(&linebuf
, comment_line_char
);
72 if (*line
!= '\n' && *line
!= '\t')
73 strbuf_addch(&linebuf
, ' ');
76 strbuf_add(&linebuf
, line
, eol
- line
);
78 strbuf_addstr(&linebuf
, line
);
79 color_print_strbuf(s
->fp
, color
, &linebuf
);
87 fprintf(s
->fp
, "%s", trail
);
88 strbuf_release(&linebuf
);
92 void status_printf_ln(struct wt_status
*s
, const char *color
,
98 status_vprintf(s
, 1, color
, fmt
, ap
, "\n");
102 void status_printf(struct wt_status
*s
, const char *color
,
103 const char *fmt
, ...)
108 status_vprintf(s
, 1, color
, fmt
, ap
, NULL
);
112 static void status_printf_more(struct wt_status
*s
, const char *color
,
113 const char *fmt
, ...)
118 status_vprintf(s
, 0, color
, fmt
, ap
, NULL
);
122 void wt_status_prepare(struct wt_status
*s
)
124 struct object_id oid
;
126 memset(s
, 0, sizeof(*s
));
127 memcpy(s
->color_palette
, default_wt_status_colors
,
128 sizeof(default_wt_status_colors
));
129 s
->show_untracked_files
= SHOW_NORMAL_UNTRACKED_FILES
;
131 s
->relative_paths
= 1;
132 s
->branch
= resolve_refdup("HEAD", 0, oid
.hash
, NULL
);
133 s
->reference
= "HEAD";
135 s
->index_file
= get_index_file();
136 s
->change
.strdup_strings
= 1;
137 s
->untracked
.strdup_strings
= 1;
138 s
->ignored
.strdup_strings
= 1;
139 s
->show_branch
= -1; /* unspecified */
140 s
->display_comment_prefix
= 0;
143 static void wt_longstatus_print_unmerged_header(struct wt_status
*s
)
146 int del_mod_conflict
= 0;
147 int both_deleted
= 0;
149 const char *c
= color(WT_STATUS_HEADER
, s
);
151 status_printf_ln(s
, c
, _("Unmerged paths:"));
153 for (i
= 0; i
< s
->change
.nr
; i
++) {
154 struct string_list_item
*it
= &(s
->change
.items
[i
]);
155 struct wt_status_change_data
*d
= it
->util
;
157 switch (d
->stagemask
) {
165 del_mod_conflict
= 1;
175 if (s
->whence
!= FROM_COMMIT
)
177 else if (!s
->is_initial
)
178 status_printf_ln(s
, c
, _(" (use \"git reset %s <file>...\" to unstage)"), s
->reference
);
180 status_printf_ln(s
, c
, _(" (use \"git rm --cached <file>...\" to unstage)"));
183 if (!del_mod_conflict
)
184 status_printf_ln(s
, c
, _(" (use \"git add <file>...\" to mark resolution)"));
186 status_printf_ln(s
, c
, _(" (use \"git add/rm <file>...\" as appropriate to mark resolution)"));
187 } else if (!del_mod_conflict
&& !not_deleted
) {
188 status_printf_ln(s
, c
, _(" (use \"git rm <file>...\" to mark resolution)"));
190 status_printf_ln(s
, c
, _(" (use \"git add/rm <file>...\" as appropriate to mark resolution)"));
192 status_printf_ln(s
, c
, "%s", "");
195 static void wt_longstatus_print_cached_header(struct wt_status
*s
)
197 const char *c
= color(WT_STATUS_HEADER
, s
);
199 status_printf_ln(s
, c
, _("Changes to be committed:"));
202 if (s
->whence
!= FROM_COMMIT
)
203 ; /* NEEDSWORK: use "git reset --unresolve"??? */
204 else if (!s
->is_initial
)
205 status_printf_ln(s
, c
, _(" (use \"git reset %s <file>...\" to unstage)"), s
->reference
);
207 status_printf_ln(s
, c
, _(" (use \"git rm --cached <file>...\" to unstage)"));
208 status_printf_ln(s
, c
, "%s", "");
211 static void wt_longstatus_print_dirty_header(struct wt_status
*s
,
213 int has_dirty_submodules
)
215 const char *c
= color(WT_STATUS_HEADER
, s
);
217 status_printf_ln(s
, c
, _("Changes not staged for commit:"));
221 status_printf_ln(s
, c
, _(" (use \"git add <file>...\" to update what will be committed)"));
223 status_printf_ln(s
, c
, _(" (use \"git add/rm <file>...\" to update what will be committed)"));
224 status_printf_ln(s
, c
, _(" (use \"git checkout -- <file>...\" to discard changes in working directory)"));
225 if (has_dirty_submodules
)
226 status_printf_ln(s
, c
, _(" (commit or discard the untracked or modified content in submodules)"));
227 status_printf_ln(s
, c
, "%s", "");
230 static void wt_longstatus_print_other_header(struct wt_status
*s
,
234 const char *c
= color(WT_STATUS_HEADER
, s
);
235 status_printf_ln(s
, c
, "%s:", what
);
238 status_printf_ln(s
, c
, _(" (use \"git %s <file>...\" to include in what will be committed)"), how
);
239 status_printf_ln(s
, c
, "%s", "");
242 static void wt_longstatus_print_trailer(struct wt_status
*s
)
244 status_printf_ln(s
, color(WT_STATUS_HEADER
, s
), "%s", "");
247 #define quote_path quote_path_relative
249 static const char *wt_status_unmerged_status_string(int stagemask
)
253 return _("both deleted:");
255 return _("added by us:");
257 return _("deleted by them:");
259 return _("added by them:");
261 return _("deleted by us:");
263 return _("both added:");
265 return _("both modified:");
267 die("BUG: unhandled unmerged status %x", stagemask
);
271 static const char *wt_status_diff_status_string(int status
)
274 case DIFF_STATUS_ADDED
:
275 return _("new file:");
276 case DIFF_STATUS_COPIED
:
278 case DIFF_STATUS_DELETED
:
279 return _("deleted:");
280 case DIFF_STATUS_MODIFIED
:
281 return _("modified:");
282 case DIFF_STATUS_RENAMED
:
283 return _("renamed:");
284 case DIFF_STATUS_TYPE_CHANGED
:
285 return _("typechange:");
286 case DIFF_STATUS_UNKNOWN
:
287 return _("unknown:");
288 case DIFF_STATUS_UNMERGED
:
289 return _("unmerged:");
295 static int maxwidth(const char *(*label
)(int), int minval
, int maxval
)
299 for (i
= minval
; i
<= maxval
; i
++) {
300 const char *s
= label(i
);
301 int len
= s
? utf8_strwidth(s
) : 0;
308 static void wt_longstatus_print_unmerged_data(struct wt_status
*s
,
309 struct string_list_item
*it
)
311 const char *c
= color(WT_STATUS_UNMERGED
, s
);
312 struct wt_status_change_data
*d
= it
->util
;
313 struct strbuf onebuf
= STRBUF_INIT
;
314 static char *padding
;
315 static int label_width
;
316 const char *one
, *how
;
320 label_width
= maxwidth(wt_status_unmerged_status_string
, 1, 7);
321 label_width
+= strlen(" ");
322 padding
= xmallocz(label_width
);
323 memset(padding
, ' ', label_width
);
326 one
= quote_path(it
->string
, s
->prefix
, &onebuf
);
327 status_printf(s
, color(WT_STATUS_HEADER
, s
), "\t");
329 how
= wt_status_unmerged_status_string(d
->stagemask
);
330 len
= label_width
- utf8_strwidth(how
);
331 status_printf_more(s
, c
, "%s%.*s%s\n", how
, len
, padding
, one
);
332 strbuf_release(&onebuf
);
335 static void wt_longstatus_print_change_data(struct wt_status
*s
,
337 struct string_list_item
*it
)
339 struct wt_status_change_data
*d
= it
->util
;
340 const char *c
= color(change_type
, s
);
344 const char *one
, *two
;
345 struct strbuf onebuf
= STRBUF_INIT
, twobuf
= STRBUF_INIT
;
346 struct strbuf extra
= STRBUF_INIT
;
347 static char *padding
;
348 static int label_width
;
353 /* If DIFF_STATUS_* uses outside the range [A..Z], we're in trouble */
354 label_width
= maxwidth(wt_status_diff_status_string
, 'A', 'Z');
355 label_width
+= strlen(" ");
356 padding
= xmallocz(label_width
);
357 memset(padding
, ' ', label_width
);
360 one_name
= two_name
= it
->string
;
361 switch (change_type
) {
362 case WT_STATUS_UPDATED
:
363 status
= d
->index_status
;
365 one_name
= d
->head_path
;
367 case WT_STATUS_CHANGED
:
368 if (d
->new_submodule_commits
|| d
->dirty_submodule
) {
369 strbuf_addstr(&extra
, " (");
370 if (d
->new_submodule_commits
)
371 strbuf_addstr(&extra
, _("new commits, "));
372 if (d
->dirty_submodule
& DIRTY_SUBMODULE_MODIFIED
)
373 strbuf_addstr(&extra
, _("modified content, "));
374 if (d
->dirty_submodule
& DIRTY_SUBMODULE_UNTRACKED
)
375 strbuf_addstr(&extra
, _("untracked content, "));
376 strbuf_setlen(&extra
, extra
.len
- 2);
377 strbuf_addch(&extra
, ')');
379 status
= d
->worktree_status
;
382 die("BUG: unhandled change_type %d in wt_longstatus_print_change_data",
386 one
= quote_path(one_name
, s
->prefix
, &onebuf
);
387 two
= quote_path(two_name
, s
->prefix
, &twobuf
);
389 status_printf(s
, color(WT_STATUS_HEADER
, s
), "\t");
390 what
= wt_status_diff_status_string(status
);
392 die("BUG: unhandled diff status %c", status
);
393 len
= label_width
- utf8_strwidth(what
);
395 if (status
== DIFF_STATUS_COPIED
|| status
== DIFF_STATUS_RENAMED
)
396 status_printf_more(s
, c
, "%s%.*s%s -> %s",
397 what
, len
, padding
, one
, two
);
399 status_printf_more(s
, c
, "%s%.*s%s",
400 what
, len
, padding
, one
);
402 status_printf_more(s
, color(WT_STATUS_HEADER
, s
), "%s", extra
.buf
);
403 strbuf_release(&extra
);
405 status_printf_more(s
, GIT_COLOR_NORMAL
, "\n");
406 strbuf_release(&onebuf
);
407 strbuf_release(&twobuf
);
410 static char short_submodule_status(struct wt_status_change_data
*d
) {
411 if (d
->new_submodule_commits
)
413 if (d
->dirty_submodule
& DIRTY_SUBMODULE_MODIFIED
)
415 if (d
->dirty_submodule
& DIRTY_SUBMODULE_UNTRACKED
)
417 return d
->worktree_status
;
420 static void wt_status_collect_changed_cb(struct diff_queue_struct
*q
,
421 struct diff_options
*options
,
424 struct wt_status
*s
= data
;
429 s
->workdir_dirty
= 1;
430 for (i
= 0; i
< q
->nr
; i
++) {
431 struct diff_filepair
*p
;
432 struct string_list_item
*it
;
433 struct wt_status_change_data
*d
;
436 it
= string_list_insert(&s
->change
, p
->one
->path
);
439 d
= xcalloc(1, sizeof(*d
));
442 if (!d
->worktree_status
)
443 d
->worktree_status
= p
->status
;
444 if (S_ISGITLINK(p
->two
->mode
)) {
445 d
->dirty_submodule
= p
->two
->dirty_submodule
;
446 d
->new_submodule_commits
= !!oidcmp(&p
->one
->oid
,
448 if (s
->status_format
== STATUS_FORMAT_SHORT
)
449 d
->worktree_status
= short_submodule_status(d
);
453 case DIFF_STATUS_ADDED
:
454 d
->mode_worktree
= p
->two
->mode
;
457 case DIFF_STATUS_DELETED
:
458 d
->mode_index
= p
->one
->mode
;
459 oidcpy(&d
->oid_index
, &p
->one
->oid
);
460 /* mode_worktree is zero for a delete. */
463 case DIFF_STATUS_MODIFIED
:
464 case DIFF_STATUS_TYPE_CHANGED
:
465 case DIFF_STATUS_UNMERGED
:
466 d
->mode_index
= p
->one
->mode
;
467 d
->mode_worktree
= p
->two
->mode
;
468 oidcpy(&d
->oid_index
, &p
->one
->oid
);
471 case DIFF_STATUS_UNKNOWN
:
472 die("BUG: worktree status unknown???");
479 static int unmerged_mask(const char *path
)
482 const struct cache_entry
*ce
;
484 pos
= cache_name_pos(path
, strlen(path
));
490 while (pos
< active_nr
) {
491 ce
= active_cache
[pos
++];
492 if (strcmp(ce
->name
, path
) || !ce_stage(ce
))
494 mask
|= (1 << (ce_stage(ce
) - 1));
499 static void wt_status_collect_updated_cb(struct diff_queue_struct
*q
,
500 struct diff_options
*options
,
503 struct wt_status
*s
= data
;
506 for (i
= 0; i
< q
->nr
; i
++) {
507 struct diff_filepair
*p
;
508 struct string_list_item
*it
;
509 struct wt_status_change_data
*d
;
512 it
= string_list_insert(&s
->change
, p
->two
->path
);
515 d
= xcalloc(1, sizeof(*d
));
518 if (!d
->index_status
)
519 d
->index_status
= p
->status
;
521 case DIFF_STATUS_ADDED
:
522 /* Leave {mode,oid}_head zero for an add. */
523 d
->mode_index
= p
->two
->mode
;
524 oidcpy(&d
->oid_index
, &p
->two
->oid
);
526 case DIFF_STATUS_DELETED
:
527 d
->mode_head
= p
->one
->mode
;
528 oidcpy(&d
->oid_head
, &p
->one
->oid
);
529 /* Leave {mode,oid}_index zero for a delete. */
532 case DIFF_STATUS_COPIED
:
533 case DIFF_STATUS_RENAMED
:
534 d
->head_path
= xstrdup(p
->one
->path
);
535 d
->score
= p
->score
* 100 / MAX_SCORE
;
537 case DIFF_STATUS_MODIFIED
:
538 case DIFF_STATUS_TYPE_CHANGED
:
539 d
->mode_head
= p
->one
->mode
;
540 d
->mode_index
= p
->two
->mode
;
541 oidcpy(&d
->oid_head
, &p
->one
->oid
);
542 oidcpy(&d
->oid_index
, &p
->two
->oid
);
544 case DIFF_STATUS_UNMERGED
:
545 d
->stagemask
= unmerged_mask(p
->two
->path
);
547 * Don't bother setting {mode,oid}_{head,index} since the print
548 * code will output the stage values directly and not use the
549 * values in these fields.
556 static void wt_status_collect_changes_worktree(struct wt_status
*s
)
560 init_revisions(&rev
, NULL
);
561 setup_revisions(0, NULL
, &rev
, NULL
);
562 rev
.diffopt
.output_format
|= DIFF_FORMAT_CALLBACK
;
563 DIFF_OPT_SET(&rev
.diffopt
, DIRTY_SUBMODULES
);
564 rev
.diffopt
.ita_invisible_in_index
= 1;
565 if (!s
->show_untracked_files
)
566 DIFF_OPT_SET(&rev
.diffopt
, IGNORE_UNTRACKED_IN_SUBMODULES
);
567 if (s
->ignore_submodule_arg
) {
568 DIFF_OPT_SET(&rev
.diffopt
, OVERRIDE_SUBMODULE_CONFIG
);
569 handle_ignore_submodules_arg(&rev
.diffopt
, s
->ignore_submodule_arg
);
571 rev
.diffopt
.format_callback
= wt_status_collect_changed_cb
;
572 rev
.diffopt
.format_callback_data
= s
;
573 copy_pathspec(&rev
.prune_data
, &s
->pathspec
);
574 run_diff_files(&rev
, 0);
577 static void wt_status_collect_changes_index(struct wt_status
*s
)
580 struct setup_revision_opt opt
;
582 init_revisions(&rev
, NULL
);
583 memset(&opt
, 0, sizeof(opt
));
584 opt
.def
= s
->is_initial
? EMPTY_TREE_SHA1_HEX
: s
->reference
;
585 setup_revisions(0, NULL
, &rev
, &opt
);
587 DIFF_OPT_SET(&rev
.diffopt
, OVERRIDE_SUBMODULE_CONFIG
);
588 rev
.diffopt
.ita_invisible_in_index
= 1;
589 if (s
->ignore_submodule_arg
) {
590 handle_ignore_submodules_arg(&rev
.diffopt
, s
->ignore_submodule_arg
);
593 * Unless the user did explicitly request a submodule ignore
594 * mode by passing a command line option we do not ignore any
595 * changed submodule SHA-1s when comparing index and HEAD, no
596 * matter what is configured. Otherwise the user won't be
597 * shown any submodules she manually added (and which are
598 * staged to be committed), which would be really confusing.
600 handle_ignore_submodules_arg(&rev
.diffopt
, "dirty");
603 rev
.diffopt
.output_format
|= DIFF_FORMAT_CALLBACK
;
604 rev
.diffopt
.format_callback
= wt_status_collect_updated_cb
;
605 rev
.diffopt
.format_callback_data
= s
;
606 rev
.diffopt
.detect_rename
= DIFF_DETECT_RENAME
;
607 rev
.diffopt
.rename_limit
= 200;
608 rev
.diffopt
.break_opt
= 0;
609 copy_pathspec(&rev
.prune_data
, &s
->pathspec
);
610 run_diff_index(&rev
, 1);
613 static void wt_status_collect_changes_initial(struct wt_status
*s
)
617 for (i
= 0; i
< active_nr
; i
++) {
618 struct string_list_item
*it
;
619 struct wt_status_change_data
*d
;
620 const struct cache_entry
*ce
= active_cache
[i
];
622 if (!ce_path_match(ce
, &s
->pathspec
, NULL
))
624 if (ce_intent_to_add(ce
))
626 it
= string_list_insert(&s
->change
, ce
->name
);
629 d
= xcalloc(1, sizeof(*d
));
633 d
->index_status
= DIFF_STATUS_UNMERGED
;
634 d
->stagemask
|= (1 << (ce_stage(ce
) - 1));
636 * Don't bother setting {mode,oid}_{head,index} since the print
637 * code will output the stage values directly and not use the
638 * values in these fields.
641 d
->index_status
= DIFF_STATUS_ADDED
;
642 /* Leave {mode,oid}_head zero for adds. */
643 d
->mode_index
= ce
->ce_mode
;
644 oidcpy(&d
->oid_index
, &ce
->oid
);
649 static void wt_status_collect_untracked(struct wt_status
*s
)
652 struct dir_struct dir
;
653 uint64_t t_begin
= getnanotime();
655 if (!s
->show_untracked_files
)
658 memset(&dir
, 0, sizeof(dir
));
659 if (s
->show_untracked_files
!= SHOW_ALL_UNTRACKED_FILES
)
661 DIR_SHOW_OTHER_DIRECTORIES
| DIR_HIDE_EMPTY_DIRECTORIES
;
662 if (s
->show_ignored_files
)
663 dir
.flags
|= DIR_SHOW_IGNORED_TOO
;
665 dir
.untracked
= the_index
.untracked
;
666 setup_standard_excludes(&dir
);
668 fill_directory(&dir
, &s
->pathspec
);
670 for (i
= 0; i
< dir
.nr
; i
++) {
671 struct dir_entry
*ent
= dir
.entries
[i
];
672 if (cache_name_is_other(ent
->name
, ent
->len
) &&
673 dir_path_match(ent
, &s
->pathspec
, 0, NULL
))
674 string_list_insert(&s
->untracked
, ent
->name
);
678 for (i
= 0; i
< dir
.ignored_nr
; i
++) {
679 struct dir_entry
*ent
= dir
.ignored
[i
];
680 if (cache_name_is_other(ent
->name
, ent
->len
) &&
681 dir_path_match(ent
, &s
->pathspec
, 0, NULL
))
682 string_list_insert(&s
->ignored
, ent
->name
);
688 clear_directory(&dir
);
690 if (advice_status_u_option
)
691 s
->untracked_in_ms
= (getnanotime() - t_begin
) / 1000000;
694 void wt_status_collect(struct wt_status
*s
)
696 wt_status_collect_changes_worktree(s
);
699 wt_status_collect_changes_initial(s
);
701 wt_status_collect_changes_index(s
);
702 wt_status_collect_untracked(s
);
705 static void wt_longstatus_print_unmerged(struct wt_status
*s
)
707 int shown_header
= 0;
710 for (i
= 0; i
< s
->change
.nr
; i
++) {
711 struct wt_status_change_data
*d
;
712 struct string_list_item
*it
;
713 it
= &(s
->change
.items
[i
]);
718 wt_longstatus_print_unmerged_header(s
);
721 wt_longstatus_print_unmerged_data(s
, it
);
724 wt_longstatus_print_trailer(s
);
728 static void wt_longstatus_print_updated(struct wt_status
*s
)
730 int shown_header
= 0;
733 for (i
= 0; i
< s
->change
.nr
; i
++) {
734 struct wt_status_change_data
*d
;
735 struct string_list_item
*it
;
736 it
= &(s
->change
.items
[i
]);
738 if (!d
->index_status
||
739 d
->index_status
== DIFF_STATUS_UNMERGED
)
742 wt_longstatus_print_cached_header(s
);
746 wt_longstatus_print_change_data(s
, WT_STATUS_UPDATED
, it
);
749 wt_longstatus_print_trailer(s
);
755 * 1 : some change but no delete
757 static int wt_status_check_worktree_changes(struct wt_status
*s
,
758 int *dirty_submodules
)
763 *dirty_submodules
= 0;
765 for (i
= 0; i
< s
->change
.nr
; i
++) {
766 struct wt_status_change_data
*d
;
767 d
= s
->change
.items
[i
].util
;
768 if (!d
->worktree_status
||
769 d
->worktree_status
== DIFF_STATUS_UNMERGED
)
773 if (d
->dirty_submodule
)
774 *dirty_submodules
= 1;
775 if (d
->worktree_status
== DIFF_STATUS_DELETED
)
781 static void wt_longstatus_print_changed(struct wt_status
*s
)
783 int i
, dirty_submodules
;
784 int worktree_changes
= wt_status_check_worktree_changes(s
, &dirty_submodules
);
786 if (!worktree_changes
)
789 wt_longstatus_print_dirty_header(s
, worktree_changes
< 0, dirty_submodules
);
791 for (i
= 0; i
< s
->change
.nr
; i
++) {
792 struct wt_status_change_data
*d
;
793 struct string_list_item
*it
;
794 it
= &(s
->change
.items
[i
]);
796 if (!d
->worktree_status
||
797 d
->worktree_status
== DIFF_STATUS_UNMERGED
)
799 wt_longstatus_print_change_data(s
, WT_STATUS_CHANGED
, it
);
801 wt_longstatus_print_trailer(s
);
804 static void wt_longstatus_print_submodule_summary(struct wt_status
*s
, int uncommitted
)
806 struct child_process sm_summary
= CHILD_PROCESS_INIT
;
807 struct strbuf cmd_stdout
= STRBUF_INIT
;
808 struct strbuf summary
= STRBUF_INIT
;
809 char *summary_content
;
811 argv_array_pushf(&sm_summary
.env_array
, "GIT_INDEX_FILE=%s",
814 argv_array_push(&sm_summary
.args
, "submodule");
815 argv_array_push(&sm_summary
.args
, "summary");
816 argv_array_push(&sm_summary
.args
, uncommitted
? "--files" : "--cached");
817 argv_array_push(&sm_summary
.args
, "--for-status");
818 argv_array_push(&sm_summary
.args
, "--summary-limit");
819 argv_array_pushf(&sm_summary
.args
, "%d", s
->submodule_summary
);
821 argv_array_push(&sm_summary
.args
, s
->amend
? "HEAD^" : "HEAD");
823 sm_summary
.git_cmd
= 1;
824 sm_summary
.no_stdin
= 1;
826 capture_command(&sm_summary
, &cmd_stdout
, 1024);
828 /* prepend header, only if there's an actual output */
829 if (cmd_stdout
.len
) {
831 strbuf_addstr(&summary
, _("Submodules changed but not updated:"));
833 strbuf_addstr(&summary
, _("Submodule changes to be committed:"));
834 strbuf_addstr(&summary
, "\n\n");
836 strbuf_addbuf(&summary
, &cmd_stdout
);
837 strbuf_release(&cmd_stdout
);
839 if (s
->display_comment_prefix
) {
841 summary_content
= strbuf_detach(&summary
, &len
);
842 strbuf_add_commented_lines(&summary
, summary_content
, len
);
843 free(summary_content
);
846 fputs(summary
.buf
, s
->fp
);
847 strbuf_release(&summary
);
850 static void wt_longstatus_print_other(struct wt_status
*s
,
851 struct string_list
*l
,
856 struct strbuf buf
= STRBUF_INIT
;
857 static struct string_list output
= STRING_LIST_INIT_DUP
;
858 struct column_options copts
;
863 wt_longstatus_print_other_header(s
, what
, how
);
865 for (i
= 0; i
< l
->nr
; i
++) {
866 struct string_list_item
*it
;
869 path
= quote_path(it
->string
, s
->prefix
, &buf
);
870 if (column_active(s
->colopts
)) {
871 string_list_append(&output
, path
);
874 status_printf(s
, color(WT_STATUS_HEADER
, s
), "\t");
875 status_printf_more(s
, color(WT_STATUS_UNTRACKED
, s
),
879 strbuf_release(&buf
);
880 if (!column_active(s
->colopts
))
883 strbuf_addf(&buf
, "%s%s\t%s",
884 color(WT_STATUS_HEADER
, s
),
885 s
->display_comment_prefix
? "#" : "",
886 color(WT_STATUS_UNTRACKED
, s
));
887 memset(&copts
, 0, sizeof(copts
));
889 copts
.indent
= buf
.buf
;
890 if (want_color(s
->use_color
))
891 copts
.nl
= GIT_COLOR_RESET
"\n";
892 print_columns(&output
, s
->colopts
, &copts
);
893 string_list_clear(&output
, 0);
894 strbuf_release(&buf
);
896 status_printf_ln(s
, GIT_COLOR_NORMAL
, "%s", "");
899 size_t wt_status_locate_end(const char *s
, size_t len
)
902 struct strbuf pattern
= STRBUF_INIT
;
904 strbuf_addf(&pattern
, "\n%c %s", comment_line_char
, cut_line
);
905 if (starts_with(s
, pattern
.buf
+ 1))
907 else if ((p
= strstr(s
, pattern
.buf
)))
909 strbuf_release(&pattern
);
913 void wt_status_add_cut_line(FILE *fp
)
915 const char *explanation
= _("Do not touch the line above.\nEverything below will be removed.");
916 struct strbuf buf
= STRBUF_INIT
;
918 fprintf(fp
, "%c %s", comment_line_char
, cut_line
);
919 strbuf_add_commented_lines(&buf
, explanation
, strlen(explanation
));
921 strbuf_release(&buf
);
924 static void wt_longstatus_print_verbose(struct wt_status
*s
)
927 struct setup_revision_opt opt
;
928 int dirty_submodules
;
929 const char *c
= color(WT_STATUS_HEADER
, s
);
931 init_revisions(&rev
, NULL
);
932 DIFF_OPT_SET(&rev
.diffopt
, ALLOW_TEXTCONV
);
933 rev
.diffopt
.ita_invisible_in_index
= 1;
935 memset(&opt
, 0, sizeof(opt
));
936 opt
.def
= s
->is_initial
? EMPTY_TREE_SHA1_HEX
: s
->reference
;
937 setup_revisions(0, NULL
, &rev
, &opt
);
939 rev
.diffopt
.output_format
|= DIFF_FORMAT_PATCH
;
940 rev
.diffopt
.detect_rename
= DIFF_DETECT_RENAME
;
941 rev
.diffopt
.file
= s
->fp
;
942 rev
.diffopt
.close_file
= 0;
944 * If we're not going to stdout, then we definitely don't
945 * want color, since we are going to the commit message
946 * file (and even the "auto" setting won't work, since it
947 * will have checked isatty on stdout). But we then do want
948 * to insert the scissor line here to reliably remove the
949 * diff before committing.
951 if (s
->fp
!= stdout
) {
952 rev
.diffopt
.use_color
= 0;
953 wt_status_add_cut_line(s
->fp
);
955 if (s
->verbose
> 1 && s
->commitable
) {
956 /* print_updated() printed a header, so do we */
958 wt_longstatus_print_trailer(s
);
959 status_printf_ln(s
, c
, _("Changes to be committed:"));
960 rev
.diffopt
.a_prefix
= "c/";
961 rev
.diffopt
.b_prefix
= "i/";
962 } /* else use prefix as per user config */
963 run_diff_index(&rev
, 1);
964 if (s
->verbose
> 1 &&
965 wt_status_check_worktree_changes(s
, &dirty_submodules
)) {
966 status_printf_ln(s
, c
,
967 "--------------------------------------------------");
968 status_printf_ln(s
, c
, _("Changes not staged for commit:"));
970 rev
.diffopt
.a_prefix
= "i/";
971 rev
.diffopt
.b_prefix
= "w/";
972 run_diff_files(&rev
, 0);
976 static void wt_longstatus_print_tracking(struct wt_status
*s
)
978 struct strbuf sb
= STRBUF_INIT
;
979 const char *cp
, *ep
, *branch_name
;
980 struct branch
*branch
;
981 char comment_line_string
[3];
984 assert(s
->branch
&& !s
->is_initial
);
985 if (!skip_prefix(s
->branch
, "refs/heads/", &branch_name
))
987 branch
= branch_get(branch_name
);
988 if (!format_tracking_info(branch
, &sb
))
992 if (s
->display_comment_prefix
) {
993 comment_line_string
[i
++] = comment_line_char
;
994 comment_line_string
[i
++] = ' ';
996 comment_line_string
[i
] = '\0';
998 for (cp
= sb
.buf
; (ep
= strchr(cp
, '\n')) != NULL
; cp
= ep
+ 1)
999 color_fprintf_ln(s
->fp
, color(WT_STATUS_HEADER
, s
),
1000 "%s%.*s", comment_line_string
,
1001 (int)(ep
- cp
), cp
);
1002 if (s
->display_comment_prefix
)
1003 color_fprintf_ln(s
->fp
, color(WT_STATUS_HEADER
, s
), "%c",
1009 static int has_unmerged(struct wt_status
*s
)
1013 for (i
= 0; i
< s
->change
.nr
; i
++) {
1014 struct wt_status_change_data
*d
;
1015 d
= s
->change
.items
[i
].util
;
1022 static void show_merge_in_progress(struct wt_status
*s
,
1023 struct wt_status_state
*state
,
1026 if (has_unmerged(s
)) {
1027 status_printf_ln(s
, color
, _("You have unmerged paths."));
1029 status_printf_ln(s
, color
,
1030 _(" (fix conflicts and run \"git commit\")"));
1031 status_printf_ln(s
, color
,
1032 _(" (use \"git merge --abort\" to abort the merge)"));
1036 status_printf_ln(s
, color
,
1037 _("All conflicts fixed but you are still merging."));
1039 status_printf_ln(s
, color
,
1040 _(" (use \"git commit\" to conclude merge)"));
1042 wt_longstatus_print_trailer(s
);
1045 static void show_am_in_progress(struct wt_status
*s
,
1046 struct wt_status_state
*state
,
1049 status_printf_ln(s
, color
,
1050 _("You are in the middle of an am session."));
1051 if (state
->am_empty_patch
)
1052 status_printf_ln(s
, color
,
1053 _("The current patch is empty."));
1055 if (!state
->am_empty_patch
)
1056 status_printf_ln(s
, color
,
1057 _(" (fix conflicts and then run \"git am --continue\")"));
1058 status_printf_ln(s
, color
,
1059 _(" (use \"git am --skip\" to skip this patch)"));
1060 status_printf_ln(s
, color
,
1061 _(" (use \"git am --abort\" to restore the original branch)"));
1063 wt_longstatus_print_trailer(s
);
1066 static char *read_line_from_git_path(const char *filename
)
1068 struct strbuf buf
= STRBUF_INIT
;
1069 FILE *fp
= fopen(git_path("%s", filename
), "r");
1071 strbuf_release(&buf
);
1074 strbuf_getline_lf(&buf
, fp
);
1076 return strbuf_detach(&buf
, NULL
);
1078 strbuf_release(&buf
);
1083 static int split_commit_in_progress(struct wt_status
*s
)
1085 int split_in_progress
= 0;
1086 char *head
, *orig_head
, *rebase_amend
, *rebase_orig_head
;
1088 if ((!s
->amend
&& !s
->nowarn
&& !s
->workdir_dirty
) ||
1089 !s
->branch
|| strcmp(s
->branch
, "HEAD"))
1092 head
= read_line_from_git_path("HEAD");
1093 orig_head
= read_line_from_git_path("ORIG_HEAD");
1094 rebase_amend
= read_line_from_git_path("rebase-merge/amend");
1095 rebase_orig_head
= read_line_from_git_path("rebase-merge/orig-head");
1097 if (!head
|| !orig_head
|| !rebase_amend
|| !rebase_orig_head
)
1098 ; /* fall through, no split in progress */
1099 else if (!strcmp(rebase_amend
, rebase_orig_head
))
1100 split_in_progress
= !!strcmp(head
, rebase_amend
);
1101 else if (strcmp(orig_head
, rebase_orig_head
))
1102 split_in_progress
= 1;
1107 free(rebase_orig_head
);
1109 return split_in_progress
;
1114 * "pick d6a2f0303e897ec257dd0e0a39a5ccb709bc2047 some message"
1116 * "pick d6a2f03 some message"
1118 * The function assumes that the line does not contain useless spaces
1119 * before or after the command.
1121 static void abbrev_sha1_in_line(struct strbuf
*line
)
1123 struct strbuf
**split
;
1126 if (starts_with(line
->buf
, "exec ") ||
1127 starts_with(line
->buf
, "x "))
1130 split
= strbuf_split_max(line
, ' ', 3);
1131 if (split
[0] && split
[1]) {
1132 struct object_id oid
;
1135 * strbuf_split_max left a space. Trim it and re-add
1136 * it after abbreviation.
1138 strbuf_trim(split
[1]);
1139 if (!get_oid(split
[1]->buf
, &oid
)) {
1140 strbuf_reset(split
[1]);
1141 strbuf_add_unique_abbrev(split
[1], oid
.hash
,
1143 strbuf_addch(split
[1], ' ');
1145 for (i
= 0; split
[i
]; i
++)
1146 strbuf_addbuf(line
, split
[i
]);
1149 strbuf_list_free(split
);
1152 static int read_rebase_todolist(const char *fname
, struct string_list
*lines
)
1154 struct strbuf line
= STRBUF_INIT
;
1155 FILE *f
= fopen(git_path("%s", fname
), "r");
1158 if (errno
== ENOENT
)
1160 die_errno("Could not open file %s for reading",
1161 git_path("%s", fname
));
1163 while (!strbuf_getline_lf(&line
, f
)) {
1164 if (line
.len
&& line
.buf
[0] == comment_line_char
)
1169 abbrev_sha1_in_line(&line
);
1170 string_list_append(lines
, line
.buf
);
1176 static void show_rebase_information(struct wt_status
*s
,
1177 struct wt_status_state
*state
,
1180 if (state
->rebase_interactive_in_progress
) {
1182 int nr_lines_to_show
= 2;
1184 struct string_list have_done
= STRING_LIST_INIT_DUP
;
1185 struct string_list yet_to_do
= STRING_LIST_INIT_DUP
;
1187 read_rebase_todolist("rebase-merge/done", &have_done
);
1188 if (read_rebase_todolist("rebase-merge/git-rebase-todo",
1190 status_printf_ln(s
, color
,
1191 _("git-rebase-todo is missing."));
1192 if (have_done
.nr
== 0)
1193 status_printf_ln(s
, color
, _("No commands done."));
1195 status_printf_ln(s
, color
,
1196 Q_("Last command done (%d command done):",
1197 "Last commands done (%d commands done):",
1200 for (i
= (have_done
.nr
> nr_lines_to_show
)
1201 ? have_done
.nr
- nr_lines_to_show
: 0;
1204 status_printf_ln(s
, color
, " %s", have_done
.items
[i
].string
);
1205 if (have_done
.nr
> nr_lines_to_show
&& s
->hints
)
1206 status_printf_ln(s
, color
,
1207 _(" (see more in file %s)"), git_path("rebase-merge/done"));
1210 if (yet_to_do
.nr
== 0)
1211 status_printf_ln(s
, color
,
1212 _("No commands remaining."));
1214 status_printf_ln(s
, color
,
1215 Q_("Next command to do (%d remaining command):",
1216 "Next commands to do (%d remaining commands):",
1219 for (i
= 0; i
< nr_lines_to_show
&& i
< yet_to_do
.nr
; i
++)
1220 status_printf_ln(s
, color
, " %s", yet_to_do
.items
[i
].string
);
1222 status_printf_ln(s
, color
,
1223 _(" (use \"git rebase --edit-todo\" to view and edit)"));
1225 string_list_clear(&yet_to_do
, 0);
1226 string_list_clear(&have_done
, 0);
1230 static void print_rebase_state(struct wt_status
*s
,
1231 struct wt_status_state
*state
,
1235 status_printf_ln(s
, color
,
1236 _("You are currently rebasing branch '%s' on '%s'."),
1240 status_printf_ln(s
, color
,
1241 _("You are currently rebasing."));
1244 static void show_rebase_in_progress(struct wt_status
*s
,
1245 struct wt_status_state
*state
,
1250 show_rebase_information(s
, state
, color
);
1251 if (has_unmerged(s
)) {
1252 print_rebase_state(s
, state
, color
);
1254 status_printf_ln(s
, color
,
1255 _(" (fix conflicts and then run \"git rebase --continue\")"));
1256 status_printf_ln(s
, color
,
1257 _(" (use \"git rebase --skip\" to skip this patch)"));
1258 status_printf_ln(s
, color
,
1259 _(" (use \"git rebase --abort\" to check out the original branch)"));
1261 } else if (state
->rebase_in_progress
|| !stat(git_path_merge_msg(), &st
)) {
1262 print_rebase_state(s
, state
, color
);
1264 status_printf_ln(s
, color
,
1265 _(" (all conflicts fixed: run \"git rebase --continue\")"));
1266 } else if (split_commit_in_progress(s
)) {
1268 status_printf_ln(s
, color
,
1269 _("You are currently splitting a commit while rebasing branch '%s' on '%s'."),
1273 status_printf_ln(s
, color
,
1274 _("You are currently splitting a commit during a rebase."));
1276 status_printf_ln(s
, color
,
1277 _(" (Once your working directory is clean, run \"git rebase --continue\")"));
1280 status_printf_ln(s
, color
,
1281 _("You are currently editing a commit while rebasing branch '%s' on '%s'."),
1285 status_printf_ln(s
, color
,
1286 _("You are currently editing a commit during a rebase."));
1287 if (s
->hints
&& !s
->amend
) {
1288 status_printf_ln(s
, color
,
1289 _(" (use \"git commit --amend\" to amend the current commit)"));
1290 status_printf_ln(s
, color
,
1291 _(" (use \"git rebase --continue\" once you are satisfied with your changes)"));
1294 wt_longstatus_print_trailer(s
);
1297 static void show_cherry_pick_in_progress(struct wt_status
*s
,
1298 struct wt_status_state
*state
,
1301 status_printf_ln(s
, color
, _("You are currently cherry-picking commit %s."),
1302 find_unique_abbrev(state
->cherry_pick_head_sha1
, DEFAULT_ABBREV
));
1304 if (has_unmerged(s
))
1305 status_printf_ln(s
, color
,
1306 _(" (fix conflicts and run \"git cherry-pick --continue\")"));
1308 status_printf_ln(s
, color
,
1309 _(" (all conflicts fixed: run \"git cherry-pick --continue\")"));
1310 status_printf_ln(s
, color
,
1311 _(" (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"));
1313 wt_longstatus_print_trailer(s
);
1316 static void show_revert_in_progress(struct wt_status
*s
,
1317 struct wt_status_state
*state
,
1320 status_printf_ln(s
, color
, _("You are currently reverting commit %s."),
1321 find_unique_abbrev(state
->revert_head_sha1
, DEFAULT_ABBREV
));
1323 if (has_unmerged(s
))
1324 status_printf_ln(s
, color
,
1325 _(" (fix conflicts and run \"git revert --continue\")"));
1327 status_printf_ln(s
, color
,
1328 _(" (all conflicts fixed: run \"git revert --continue\")"));
1329 status_printf_ln(s
, color
,
1330 _(" (use \"git revert --abort\" to cancel the revert operation)"));
1332 wt_longstatus_print_trailer(s
);
1335 static void show_bisect_in_progress(struct wt_status
*s
,
1336 struct wt_status_state
*state
,
1340 status_printf_ln(s
, color
,
1341 _("You are currently bisecting, started from branch '%s'."),
1344 status_printf_ln(s
, color
,
1345 _("You are currently bisecting."));
1347 status_printf_ln(s
, color
,
1348 _(" (use \"git bisect reset\" to get back to the original branch)"));
1349 wt_longstatus_print_trailer(s
);
1353 * Extract branch information from rebase/bisect
1355 static char *get_branch(const struct worktree
*wt
, const char *path
)
1357 struct strbuf sb
= STRBUF_INIT
;
1358 struct object_id oid
;
1359 const char *branch_name
;
1361 if (strbuf_read_file(&sb
, worktree_git_path(wt
, "%s", path
), 0) <= 0)
1364 while (sb
.len
&& sb
.buf
[sb
.len
- 1] == '\n')
1365 strbuf_setlen(&sb
, sb
.len
- 1);
1368 if (skip_prefix(sb
.buf
, "refs/heads/", &branch_name
))
1369 strbuf_remove(&sb
, 0, branch_name
- sb
.buf
);
1370 else if (starts_with(sb
.buf
, "refs/"))
1372 else if (!get_oid_hex(sb
.buf
, &oid
)) {
1374 strbuf_add_unique_abbrev(&sb
, oid
.hash
, DEFAULT_ABBREV
);
1375 } else if (!strcmp(sb
.buf
, "detached HEAD")) /* rebase */
1379 return strbuf_detach(&sb
, NULL
);
1382 strbuf_release(&sb
);
1386 struct grab_1st_switch_cbdata
{
1388 struct object_id noid
;
1391 static int grab_1st_switch(struct object_id
*ooid
, struct object_id
*noid
,
1392 const char *email
, unsigned long timestamp
, int tz
,
1393 const char *message
, void *cb_data
)
1395 struct grab_1st_switch_cbdata
*cb
= cb_data
;
1396 const char *target
= NULL
, *end
;
1398 if (!skip_prefix(message
, "checkout: moving from ", &message
))
1400 target
= strstr(message
, " to ");
1403 target
+= strlen(" to ");
1404 strbuf_reset(&cb
->buf
);
1405 oidcpy(&cb
->noid
, noid
);
1406 end
= strchrnul(target
, '\n');
1407 strbuf_add(&cb
->buf
, target
, end
- target
);
1408 if (!strcmp(cb
->buf
.buf
, "HEAD")) {
1409 /* HEAD is relative. Resolve it to the right reflog entry. */
1410 strbuf_reset(&cb
->buf
);
1411 strbuf_add_unique_abbrev(&cb
->buf
, noid
->hash
, DEFAULT_ABBREV
);
1416 static void wt_status_get_detached_from(struct wt_status_state
*state
)
1418 struct grab_1st_switch_cbdata cb
;
1419 struct commit
*commit
;
1420 struct object_id oid
;
1423 strbuf_init(&cb
.buf
, 0);
1424 if (for_each_reflog_ent_reverse("HEAD", grab_1st_switch
, &cb
) <= 0) {
1425 strbuf_release(&cb
.buf
);
1429 if (dwim_ref(cb
.buf
.buf
, cb
.buf
.len
, oid
.hash
, &ref
) == 1 &&
1430 /* sha1 is a commit? match without further lookup */
1431 (!oidcmp(&cb
.noid
, &oid
) ||
1432 /* perhaps sha1 is a tag, try to dereference to a commit */
1433 ((commit
= lookup_commit_reference_gently(oid
.hash
, 1)) != NULL
&&
1434 !oidcmp(&cb
.noid
, &commit
->object
.oid
)))) {
1435 const char *from
= ref
;
1436 if (!skip_prefix(from
, "refs/tags/", &from
))
1437 skip_prefix(from
, "refs/remotes/", &from
);
1438 state
->detached_from
= xstrdup(from
);
1440 state
->detached_from
=
1441 xstrdup(find_unique_abbrev(cb
.noid
.hash
, DEFAULT_ABBREV
));
1442 hashcpy(state
->detached_sha1
, cb
.noid
.hash
);
1443 state
->detached_at
= !get_oid("HEAD", &oid
) &&
1444 !hashcmp(oid
.hash
, state
->detached_sha1
);
1447 strbuf_release(&cb
.buf
);
1450 int wt_status_check_rebase(const struct worktree
*wt
,
1451 struct wt_status_state
*state
)
1455 if (!stat(worktree_git_path(wt
, "rebase-apply"), &st
)) {
1456 if (!stat(worktree_git_path(wt
, "rebase-apply/applying"), &st
)) {
1457 state
->am_in_progress
= 1;
1458 if (!stat(worktree_git_path(wt
, "rebase-apply/patch"), &st
) && !st
.st_size
)
1459 state
->am_empty_patch
= 1;
1461 state
->rebase_in_progress
= 1;
1462 state
->branch
= get_branch(wt
, "rebase-apply/head-name");
1463 state
->onto
= get_branch(wt
, "rebase-apply/onto");
1465 } else if (!stat(worktree_git_path(wt
, "rebase-merge"), &st
)) {
1466 if (!stat(worktree_git_path(wt
, "rebase-merge/interactive"), &st
))
1467 state
->rebase_interactive_in_progress
= 1;
1469 state
->rebase_in_progress
= 1;
1470 state
->branch
= get_branch(wt
, "rebase-merge/head-name");
1471 state
->onto
= get_branch(wt
, "rebase-merge/onto");
1477 int wt_status_check_bisect(const struct worktree
*wt
,
1478 struct wt_status_state
*state
)
1482 if (!stat(worktree_git_path(wt
, "BISECT_LOG"), &st
)) {
1483 state
->bisect_in_progress
= 1;
1484 state
->branch
= get_branch(wt
, "BISECT_START");
1490 void wt_status_get_state(struct wt_status_state
*state
,
1491 int get_detached_from
)
1494 struct object_id oid
;
1496 if (!stat(git_path_merge_head(), &st
)) {
1497 state
->merge_in_progress
= 1;
1498 } else if (wt_status_check_rebase(NULL
, state
)) {
1500 } else if (!stat(git_path_cherry_pick_head(), &st
) &&
1501 !get_oid("CHERRY_PICK_HEAD", &oid
)) {
1502 state
->cherry_pick_in_progress
= 1;
1503 hashcpy(state
->cherry_pick_head_sha1
, oid
.hash
);
1505 wt_status_check_bisect(NULL
, state
);
1506 if (!stat(git_path_revert_head(), &st
) &&
1507 !get_oid("REVERT_HEAD", &oid
)) {
1508 state
->revert_in_progress
= 1;
1509 hashcpy(state
->revert_head_sha1
, oid
.hash
);
1512 if (get_detached_from
)
1513 wt_status_get_detached_from(state
);
1516 static void wt_longstatus_print_state(struct wt_status
*s
,
1517 struct wt_status_state
*state
)
1519 const char *state_color
= color(WT_STATUS_HEADER
, s
);
1520 if (state
->merge_in_progress
)
1521 show_merge_in_progress(s
, state
, state_color
);
1522 else if (state
->am_in_progress
)
1523 show_am_in_progress(s
, state
, state_color
);
1524 else if (state
->rebase_in_progress
|| state
->rebase_interactive_in_progress
)
1525 show_rebase_in_progress(s
, state
, state_color
);
1526 else if (state
->cherry_pick_in_progress
)
1527 show_cherry_pick_in_progress(s
, state
, state_color
);
1528 else if (state
->revert_in_progress
)
1529 show_revert_in_progress(s
, state
, state_color
);
1530 if (state
->bisect_in_progress
)
1531 show_bisect_in_progress(s
, state
, state_color
);
1534 static void wt_longstatus_print(struct wt_status
*s
)
1536 const char *branch_color
= color(WT_STATUS_ONBRANCH
, s
);
1537 const char *branch_status_color
= color(WT_STATUS_HEADER
, s
);
1538 struct wt_status_state state
;
1540 memset(&state
, 0, sizeof(state
));
1541 wt_status_get_state(&state
,
1542 s
->branch
&& !strcmp(s
->branch
, "HEAD"));
1545 const char *on_what
= _("On branch ");
1546 const char *branch_name
= s
->branch
;
1547 if (!strcmp(branch_name
, "HEAD")) {
1548 branch_status_color
= color(WT_STATUS_NOBRANCH
, s
);
1549 if (state
.rebase_in_progress
|| state
.rebase_interactive_in_progress
) {
1550 if (state
.rebase_interactive_in_progress
)
1551 on_what
= _("interactive rebase in progress; onto ");
1553 on_what
= _("rebase in progress; onto ");
1554 branch_name
= state
.onto
;
1555 } else if (state
.detached_from
) {
1556 branch_name
= state
.detached_from
;
1557 if (state
.detached_at
)
1558 on_what
= _("HEAD detached at ");
1560 on_what
= _("HEAD detached from ");
1563 on_what
= _("Not currently on any branch.");
1566 skip_prefix(branch_name
, "refs/heads/", &branch_name
);
1567 status_printf(s
, color(WT_STATUS_HEADER
, s
), "%s", "");
1568 status_printf_more(s
, branch_status_color
, "%s", on_what
);
1569 status_printf_more(s
, branch_color
, "%s\n", branch_name
);
1571 wt_longstatus_print_tracking(s
);
1574 wt_longstatus_print_state(s
, &state
);
1577 free(state
.detached_from
);
1579 if (s
->is_initial
) {
1580 status_printf_ln(s
, color(WT_STATUS_HEADER
, s
), "%s", "");
1581 status_printf_ln(s
, color(WT_STATUS_HEADER
, s
), _("Initial commit"));
1582 status_printf_ln(s
, color(WT_STATUS_HEADER
, s
), "%s", "");
1585 wt_longstatus_print_updated(s
);
1586 wt_longstatus_print_unmerged(s
);
1587 wt_longstatus_print_changed(s
);
1588 if (s
->submodule_summary
&&
1589 (!s
->ignore_submodule_arg
||
1590 strcmp(s
->ignore_submodule_arg
, "all"))) {
1591 wt_longstatus_print_submodule_summary(s
, 0); /* staged */
1592 wt_longstatus_print_submodule_summary(s
, 1); /* unstaged */
1594 if (s
->show_untracked_files
) {
1595 wt_longstatus_print_other(s
, &s
->untracked
, _("Untracked files"), "add");
1596 if (s
->show_ignored_files
)
1597 wt_longstatus_print_other(s
, &s
->ignored
, _("Ignored files"), "add -f");
1598 if (advice_status_u_option
&& 2000 < s
->untracked_in_ms
) {
1599 status_printf_ln(s
, GIT_COLOR_NORMAL
, "%s", "");
1600 status_printf_ln(s
, GIT_COLOR_NORMAL
,
1601 _("It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1602 "may speed it up, but you have to be careful not to forget to add\n"
1603 "new files yourself (see 'git help status')."),
1604 s
->untracked_in_ms
/ 1000.0);
1606 } else if (s
->commitable
)
1607 status_printf_ln(s
, GIT_COLOR_NORMAL
, _("Untracked files not listed%s"),
1609 ? _(" (use -u option to show untracked files)") : "");
1612 wt_longstatus_print_verbose(s
);
1613 if (!s
->commitable
) {
1615 status_printf_ln(s
, GIT_COLOR_NORMAL
, _("No changes"));
1618 else if (s
->workdir_dirty
) {
1620 printf(_("no changes added to commit "
1621 "(use \"git add\" and/or \"git commit -a\")\n"));
1623 printf(_("no changes added to commit\n"));
1624 } else if (s
->untracked
.nr
) {
1626 printf(_("nothing added to commit but untracked files "
1627 "present (use \"git add\" to track)\n"));
1629 printf(_("nothing added to commit but untracked files present\n"));
1630 } else if (s
->is_initial
) {
1632 printf(_("nothing to commit (create/copy files "
1633 "and use \"git add\" to track)\n"));
1635 printf(_("nothing to commit\n"));
1636 } else if (!s
->show_untracked_files
) {
1638 printf(_("nothing to commit (use -u to show untracked files)\n"));
1640 printf(_("nothing to commit\n"));
1642 printf(_("nothing to commit, working tree clean\n"));
1646 static void wt_shortstatus_unmerged(struct string_list_item
*it
,
1647 struct wt_status
*s
)
1649 struct wt_status_change_data
*d
= it
->util
;
1650 const char *how
= "??";
1652 switch (d
->stagemask
) {
1653 case 1: how
= "DD"; break; /* both deleted */
1654 case 2: how
= "AU"; break; /* added by us */
1655 case 3: how
= "UD"; break; /* deleted by them */
1656 case 4: how
= "UA"; break; /* added by them */
1657 case 5: how
= "DU"; break; /* deleted by us */
1658 case 6: how
= "AA"; break; /* both added */
1659 case 7: how
= "UU"; break; /* both modified */
1661 color_fprintf(s
->fp
, color(WT_STATUS_UNMERGED
, s
), "%s", how
);
1662 if (s
->null_termination
) {
1663 fprintf(stdout
, " %s%c", it
->string
, 0);
1665 struct strbuf onebuf
= STRBUF_INIT
;
1667 one
= quote_path(it
->string
, s
->prefix
, &onebuf
);
1668 printf(" %s\n", one
);
1669 strbuf_release(&onebuf
);
1673 static void wt_shortstatus_status(struct string_list_item
*it
,
1674 struct wt_status
*s
)
1676 struct wt_status_change_data
*d
= it
->util
;
1678 if (d
->index_status
)
1679 color_fprintf(s
->fp
, color(WT_STATUS_UPDATED
, s
), "%c", d
->index_status
);
1682 if (d
->worktree_status
)
1683 color_fprintf(s
->fp
, color(WT_STATUS_CHANGED
, s
), "%c", d
->worktree_status
);
1687 if (s
->null_termination
) {
1688 fprintf(stdout
, "%s%c", it
->string
, 0);
1690 fprintf(stdout
, "%s%c", d
->head_path
, 0);
1692 struct strbuf onebuf
= STRBUF_INIT
;
1695 one
= quote_path(d
->head_path
, s
->prefix
, &onebuf
);
1696 if (*one
!= '"' && strchr(one
, ' ') != NULL
) {
1698 strbuf_addch(&onebuf
, '"');
1701 printf("%s -> ", one
);
1702 strbuf_release(&onebuf
);
1704 one
= quote_path(it
->string
, s
->prefix
, &onebuf
);
1705 if (*one
!= '"' && strchr(one
, ' ') != NULL
) {
1707 strbuf_addch(&onebuf
, '"');
1710 printf("%s\n", one
);
1711 strbuf_release(&onebuf
);
1715 static void wt_shortstatus_other(struct string_list_item
*it
,
1716 struct wt_status
*s
, const char *sign
)
1718 if (s
->null_termination
) {
1719 fprintf(stdout
, "%s %s%c", sign
, it
->string
, 0);
1721 struct strbuf onebuf
= STRBUF_INIT
;
1723 one
= quote_path(it
->string
, s
->prefix
, &onebuf
);
1724 color_fprintf(s
->fp
, color(WT_STATUS_UNTRACKED
, s
), "%s", sign
);
1725 printf(" %s\n", one
);
1726 strbuf_release(&onebuf
);
1730 static void wt_shortstatus_print_tracking(struct wt_status
*s
)
1732 struct branch
*branch
;
1733 const char *header_color
= color(WT_STATUS_HEADER
, s
);
1734 const char *branch_color_local
= color(WT_STATUS_LOCAL_BRANCH
, s
);
1735 const char *branch_color_remote
= color(WT_STATUS_REMOTE_BRANCH
, s
);
1738 const char *branch_name
;
1739 int num_ours
, num_theirs
;
1740 int upstream_is_gone
= 0;
1742 color_fprintf(s
->fp
, color(WT_STATUS_HEADER
, s
), "## ");
1746 branch_name
= s
->branch
;
1748 #define LABEL(string) (s->no_gettext ? (string) : _(string))
1751 color_fprintf(s
->fp
, header_color
, LABEL(N_("Initial commit on ")));
1753 if (!strcmp(s
->branch
, "HEAD")) {
1754 color_fprintf(s
->fp
, color(WT_STATUS_NOBRANCH
, s
), "%s",
1755 LABEL(N_("HEAD (no branch)")));
1759 skip_prefix(branch_name
, "refs/heads/", &branch_name
);
1761 branch
= branch_get(branch_name
);
1763 color_fprintf(s
->fp
, branch_color_local
, "%s", branch_name
);
1765 if (stat_tracking_info(branch
, &num_ours
, &num_theirs
, &base
) < 0) {
1769 upstream_is_gone
= 1;
1772 base
= shorten_unambiguous_ref(base
, 0);
1773 color_fprintf(s
->fp
, header_color
, "...");
1774 color_fprintf(s
->fp
, branch_color_remote
, "%s", base
);
1777 if (!upstream_is_gone
&& !num_ours
&& !num_theirs
)
1780 color_fprintf(s
->fp
, header_color
, " [");
1781 if (upstream_is_gone
) {
1782 color_fprintf(s
->fp
, header_color
, LABEL(N_("gone")));
1783 } else if (!num_ours
) {
1784 color_fprintf(s
->fp
, header_color
, LABEL(N_("behind ")));
1785 color_fprintf(s
->fp
, branch_color_remote
, "%d", num_theirs
);
1786 } else if (!num_theirs
) {
1787 color_fprintf(s
->fp
, header_color
, LABEL(N_("ahead ")));
1788 color_fprintf(s
->fp
, branch_color_local
, "%d", num_ours
);
1790 color_fprintf(s
->fp
, header_color
, LABEL(N_("ahead ")));
1791 color_fprintf(s
->fp
, branch_color_local
, "%d", num_ours
);
1792 color_fprintf(s
->fp
, header_color
, ", %s", LABEL(N_("behind ")));
1793 color_fprintf(s
->fp
, branch_color_remote
, "%d", num_theirs
);
1796 color_fprintf(s
->fp
, header_color
, "]");
1798 fputc(s
->null_termination
? '\0' : '\n', s
->fp
);
1801 static void wt_shortstatus_print(struct wt_status
*s
)
1803 struct string_list_item
*it
;
1806 wt_shortstatus_print_tracking(s
);
1808 for_each_string_list_item(it
, &s
->change
) {
1809 struct wt_status_change_data
*d
= it
->util
;
1812 wt_shortstatus_unmerged(it
, s
);
1814 wt_shortstatus_status(it
, s
);
1816 for_each_string_list_item(it
, &s
->untracked
)
1817 wt_shortstatus_other(it
, s
, "??");
1819 for_each_string_list_item(it
, &s
->ignored
)
1820 wt_shortstatus_other(it
, s
, "!!");
1823 static void wt_porcelain_print(struct wt_status
*s
)
1826 s
->relative_paths
= 0;
1829 wt_shortstatus_print(s
);
1833 * Print branch information for porcelain v2 output. These lines
1834 * are printed when the '--branch' parameter is given.
1836 * # branch.oid <commit><eol>
1837 * # branch.head <head><eol>
1838 * [# branch.upstream <upstream><eol>
1839 * [# branch.ab +<ahead> -<behind><eol>]]
1841 * <commit> ::= the current commit hash or the the literal
1842 * "(initial)" to indicate an initialized repo
1845 * <head> ::= <branch_name> the current branch name or
1846 * "(detached)" literal when detached head or
1847 * "(unknown)" when something is wrong.
1849 * <upstream> ::= the upstream branch name, when set.
1851 * <ahead> ::= integer ahead value, when upstream set
1852 * and the commit is present (not gone).
1854 * <behind> ::= integer behind value, when upstream set
1855 * and commit is present.
1858 * The end-of-line is defined by the -z flag.
1860 * <eol> ::= NUL when -z,
1864 static void wt_porcelain_v2_print_tracking(struct wt_status
*s
)
1866 struct branch
*branch
;
1868 const char *branch_name
;
1869 struct wt_status_state state
;
1870 int ab_info
, nr_ahead
, nr_behind
;
1871 char eol
= s
->null_termination
? '\0' : '\n';
1873 memset(&state
, 0, sizeof(state
));
1874 wt_status_get_state(&state
, s
->branch
&& !strcmp(s
->branch
, "HEAD"));
1876 fprintf(s
->fp
, "# branch.oid %s%c",
1877 (s
->is_initial
? "(initial)" : sha1_to_hex(s
->sha1_commit
)),
1881 fprintf(s
->fp
, "# branch.head %s%c", "(unknown)", eol
);
1883 if (!strcmp(s
->branch
, "HEAD")) {
1884 fprintf(s
->fp
, "# branch.head %s%c", "(detached)", eol
);
1886 if (state
.rebase_in_progress
|| state
.rebase_interactive_in_progress
)
1887 branch_name
= state
.onto
;
1888 else if (state
.detached_from
)
1889 branch_name
= state
.detached_from
;
1894 skip_prefix(s
->branch
, "refs/heads/", &branch_name
);
1896 fprintf(s
->fp
, "# branch.head %s%c", branch_name
, eol
);
1899 /* Lookup stats on the upstream tracking branch, if set. */
1900 branch
= branch_get(branch_name
);
1902 ab_info
= (stat_tracking_info(branch
, &nr_ahead
, &nr_behind
, &base
) == 0);
1904 base
= shorten_unambiguous_ref(base
, 0);
1905 fprintf(s
->fp
, "# branch.upstream %s%c", base
, eol
);
1909 fprintf(s
->fp
, "# branch.ab +%d -%d%c", nr_ahead
, nr_behind
, eol
);
1915 free(state
.detached_from
);
1919 * Convert various submodule status values into a
1920 * fixed-length string of characters in the buffer provided.
1922 static void wt_porcelain_v2_submodule_state(
1923 struct wt_status_change_data
*d
,
1926 if (S_ISGITLINK(d
->mode_head
) ||
1927 S_ISGITLINK(d
->mode_index
) ||
1928 S_ISGITLINK(d
->mode_worktree
)) {
1930 sub
[1] = d
->new_submodule_commits
? 'C' : '.';
1931 sub
[2] = (d
->dirty_submodule
& DIRTY_SUBMODULE_MODIFIED
) ? 'M' : '.';
1932 sub
[3] = (d
->dirty_submodule
& DIRTY_SUBMODULE_UNTRACKED
) ? 'U' : '.';
1943 * Fix-up changed entries before we print them.
1945 static void wt_porcelain_v2_fix_up_changed(
1946 struct string_list_item
*it
,
1947 struct wt_status
*s
)
1949 struct wt_status_change_data
*d
= it
->util
;
1951 if (!d
->index_status
) {
1953 * This entry is unchanged in the index (relative to the head).
1954 * Therefore, the collect_updated_cb was never called for this
1955 * entry (during the head-vs-index scan) and so the head column
1956 * fields were never set.
1958 * We must have data for the index column (from the
1959 * index-vs-worktree scan (otherwise, this entry should not be
1960 * in the list of changes)).
1962 * Copy index column fields to the head column, so that our
1963 * output looks complete.
1965 assert(d
->mode_head
== 0);
1966 d
->mode_head
= d
->mode_index
;
1967 oidcpy(&d
->oid_head
, &d
->oid_index
);
1970 if (!d
->worktree_status
) {
1972 * This entry is unchanged in the worktree (relative to the index).
1973 * Therefore, the collect_changed_cb was never called for this entry
1974 * (during the index-vs-worktree scan) and so the worktree column
1975 * fields were never set.
1977 * We must have data for the index column (from the head-vs-index
1980 * Copy the index column fields to the worktree column so that
1981 * our output looks complete.
1983 * Note that we only have a mode field in the worktree column
1984 * because the scan code tries really hard to not have to compute it.
1986 assert(d
->mode_worktree
== 0);
1987 d
->mode_worktree
= d
->mode_index
;
1992 * Print porcelain v2 info for tracked entries with changes.
1994 static void wt_porcelain_v2_print_changed_entry(
1995 struct string_list_item
*it
,
1996 struct wt_status
*s
)
1998 struct wt_status_change_data
*d
= it
->util
;
1999 struct strbuf buf_index
= STRBUF_INIT
;
2000 struct strbuf buf_head
= STRBUF_INIT
;
2001 const char *path_index
= NULL
;
2002 const char *path_head
= NULL
;
2004 char submodule_token
[5];
2005 char sep_char
, eol_char
;
2007 wt_porcelain_v2_fix_up_changed(it
, s
);
2008 wt_porcelain_v2_submodule_state(d
, submodule_token
);
2010 key
[0] = d
->index_status
? d
->index_status
: '.';
2011 key
[1] = d
->worktree_status
? d
->worktree_status
: '.';
2014 if (s
->null_termination
) {
2016 * In -z mode, we DO NOT C-quote pathnames. Current path is ALWAYS first.
2017 * A single NUL character separates them.
2021 path_index
= it
->string
;
2022 path_head
= d
->head_path
;
2025 * Path(s) are C-quoted if necessary. Current path is ALWAYS first.
2026 * The source path is only present when necessary.
2027 * A single TAB separates them (because paths can contain spaces
2028 * which are not escaped and C-quoting does escape TAB characters).
2032 path_index
= quote_path(it
->string
, s
->prefix
, &buf_index
);
2034 path_head
= quote_path(d
->head_path
, s
->prefix
, &buf_head
);
2038 fprintf(s
->fp
, "2 %s %s %06o %06o %06o %s %s %c%d %s%c%s%c",
2039 key
, submodule_token
,
2040 d
->mode_head
, d
->mode_index
, d
->mode_worktree
,
2041 oid_to_hex(&d
->oid_head
), oid_to_hex(&d
->oid_index
),
2043 path_index
, sep_char
, path_head
, eol_char
);
2045 fprintf(s
->fp
, "1 %s %s %06o %06o %06o %s %s %s%c",
2046 key
, submodule_token
,
2047 d
->mode_head
, d
->mode_index
, d
->mode_worktree
,
2048 oid_to_hex(&d
->oid_head
), oid_to_hex(&d
->oid_index
),
2049 path_index
, eol_char
);
2051 strbuf_release(&buf_index
);
2052 strbuf_release(&buf_head
);
2056 * Print porcelain v2 status info for unmerged entries.
2058 static void wt_porcelain_v2_print_unmerged_entry(
2059 struct string_list_item
*it
,
2060 struct wt_status
*s
)
2062 struct wt_status_change_data
*d
= it
->util
;
2063 const struct cache_entry
*ce
;
2064 struct strbuf buf_index
= STRBUF_INIT
;
2065 const char *path_index
= NULL
;
2066 int pos
, stage
, sum
;
2069 struct object_id oid
;
2072 char submodule_token
[5];
2073 char unmerged_prefix
= 'u';
2074 char eol_char
= s
->null_termination
? '\0' : '\n';
2076 wt_porcelain_v2_submodule_state(d
, submodule_token
);
2078 switch (d
->stagemask
) {
2079 case 1: key
= "DD"; break; /* both deleted */
2080 case 2: key
= "AU"; break; /* added by us */
2081 case 3: key
= "UD"; break; /* deleted by them */
2082 case 4: key
= "UA"; break; /* added by them */
2083 case 5: key
= "DU"; break; /* deleted by us */
2084 case 6: key
= "AA"; break; /* both added */
2085 case 7: key
= "UU"; break; /* both modified */
2087 die("BUG: unhandled unmerged status %x", d
->stagemask
);
2091 * Disregard d.aux.porcelain_v2 data that we accumulated
2092 * for the head and index columns during the scans and
2093 * replace with the actual stage data.
2095 * Note that this is a last-one-wins for each the individual
2096 * stage [123] columns in the event of multiple cache entries
2099 memset(stages
, 0, sizeof(stages
));
2101 pos
= cache_name_pos(it
->string
, strlen(it
->string
));
2104 while (pos
< active_nr
) {
2105 ce
= active_cache
[pos
++];
2106 stage
= ce_stage(ce
);
2107 if (strcmp(ce
->name
, it
->string
) || !stage
)
2109 stages
[stage
- 1].mode
= ce
->ce_mode
;
2110 oidcpy(&stages
[stage
- 1].oid
, &ce
->oid
);
2111 sum
|= (1 << (stage
- 1));
2113 if (sum
!= d
->stagemask
)
2114 die("BUG: observed stagemask 0x%x != expected stagemask 0x%x", sum
, d
->stagemask
);
2116 if (s
->null_termination
)
2117 path_index
= it
->string
;
2119 path_index
= quote_path(it
->string
, s
->prefix
, &buf_index
);
2121 fprintf(s
->fp
, "%c %s %s %06o %06o %06o %06o %s %s %s %s%c",
2122 unmerged_prefix
, key
, submodule_token
,
2123 stages
[0].mode
, /* stage 1 */
2124 stages
[1].mode
, /* stage 2 */
2125 stages
[2].mode
, /* stage 3 */
2127 oid_to_hex(&stages
[0].oid
), /* stage 1 */
2128 oid_to_hex(&stages
[1].oid
), /* stage 2 */
2129 oid_to_hex(&stages
[2].oid
), /* stage 3 */
2133 strbuf_release(&buf_index
);
2137 * Print porcelain V2 status info for untracked and ignored entries.
2139 static void wt_porcelain_v2_print_other(
2140 struct string_list_item
*it
,
2141 struct wt_status
*s
,
2144 struct strbuf buf
= STRBUF_INIT
;
2148 if (s
->null_termination
) {
2152 path
= quote_path(it
->string
, s
->prefix
, &buf
);
2156 fprintf(s
->fp
, "%c %s%c", prefix
, path
, eol_char
);
2158 strbuf_release(&buf
);
2162 * Print porcelain V2 status.
2165 * [<v2_changed_items>]*
2166 * [<v2_unmerged_items>]*
2167 * [<v2_untracked_items>]*
2168 * [<v2_ignored_items>]*
2171 static void wt_porcelain_v2_print(struct wt_status
*s
)
2173 struct wt_status_change_data
*d
;
2174 struct string_list_item
*it
;
2178 wt_porcelain_v2_print_tracking(s
);
2180 for (i
= 0; i
< s
->change
.nr
; i
++) {
2181 it
= &(s
->change
.items
[i
]);
2184 wt_porcelain_v2_print_changed_entry(it
, s
);
2187 for (i
= 0; i
< s
->change
.nr
; i
++) {
2188 it
= &(s
->change
.items
[i
]);
2191 wt_porcelain_v2_print_unmerged_entry(it
, s
);
2194 for (i
= 0; i
< s
->untracked
.nr
; i
++) {
2195 it
= &(s
->untracked
.items
[i
]);
2196 wt_porcelain_v2_print_other(it
, s
, '?');
2199 for (i
= 0; i
< s
->ignored
.nr
; i
++) {
2200 it
= &(s
->ignored
.items
[i
]);
2201 wt_porcelain_v2_print_other(it
, s
, '!');
2205 void wt_status_print(struct wt_status
*s
)
2207 switch (s
->status_format
) {
2208 case STATUS_FORMAT_SHORT
:
2209 wt_shortstatus_print(s
);
2211 case STATUS_FORMAT_PORCELAIN
:
2212 wt_porcelain_print(s
);
2214 case STATUS_FORMAT_PORCELAIN_V2
:
2215 wt_porcelain_v2_print(s
);
2217 case STATUS_FORMAT_UNSPECIFIED
:
2218 die("BUG: finalize_deferred_config() should have been called");
2220 case STATUS_FORMAT_NONE
:
2221 case STATUS_FORMAT_LONG
:
2222 wt_longstatus_print(s
);
2228 * Returns 1 if there are unstaged changes, 0 otherwise.
2230 int has_unstaged_changes(int ignore_submodules
)
2232 struct rev_info rev_info
;
2235 init_revisions(&rev_info
, NULL
);
2236 if (ignore_submodules
)
2237 DIFF_OPT_SET(&rev_info
.diffopt
, IGNORE_SUBMODULES
);
2238 DIFF_OPT_SET(&rev_info
.diffopt
, QUICK
);
2239 diff_setup_done(&rev_info
.diffopt
);
2240 result
= run_diff_files(&rev_info
, 0);
2241 return diff_result_code(&rev_info
.diffopt
, result
);
2245 * Returns 1 if there are uncommitted changes, 0 otherwise.
2247 int has_uncommitted_changes(int ignore_submodules
)
2249 struct rev_info rev_info
;
2252 if (is_cache_unborn())
2255 init_revisions(&rev_info
, NULL
);
2256 if (ignore_submodules
)
2257 DIFF_OPT_SET(&rev_info
.diffopt
, IGNORE_SUBMODULES
);
2258 DIFF_OPT_SET(&rev_info
.diffopt
, QUICK
);
2259 add_head_to_pending(&rev_info
);
2260 diff_setup_done(&rev_info
.diffopt
);
2261 result
= run_diff_index(&rev_info
, 1);
2262 return diff_result_code(&rev_info
.diffopt
, result
);
2266 * If the work tree has unstaged or uncommitted changes, dies with the
2267 * appropriate message.
2269 int require_clean_work_tree(const char *action
, const char *hint
, int ignore_submodules
, int gently
)
2271 struct lock_file
*lock_file
= xcalloc(1, sizeof(*lock_file
));
2274 fd
= hold_locked_index(lock_file
, 0);
2275 refresh_cache(REFRESH_QUIET
);
2277 update_index_if_able(&the_index
, lock_file
);
2278 rollback_lock_file(lock_file
);
2280 if (has_unstaged_changes(ignore_submodules
)) {
2281 /* TRANSLATORS: the action is e.g. "pull with rebase" */
2282 error(_("cannot %s: You have unstaged changes."), _(action
));
2286 if (has_uncommitted_changes(ignore_submodules
)) {
2288 error(_("additionally, your index contains uncommitted changes."));
2290 error(_("cannot %s: Your index contains uncommitted changes."),