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 void wt_status_collect_changed_cb(struct diff_queue_struct
*q
,
411 struct diff_options
*options
,
414 struct wt_status
*s
= data
;
419 s
->workdir_dirty
= 1;
420 for (i
= 0; i
< q
->nr
; i
++) {
421 struct diff_filepair
*p
;
422 struct string_list_item
*it
;
423 struct wt_status_change_data
*d
;
426 it
= string_list_insert(&s
->change
, p
->one
->path
);
429 d
= xcalloc(1, sizeof(*d
));
432 if (!d
->worktree_status
)
433 d
->worktree_status
= p
->status
;
434 d
->dirty_submodule
= p
->two
->dirty_submodule
;
435 if (S_ISGITLINK(p
->two
->mode
))
436 d
->new_submodule_commits
= !!oidcmp(&p
->one
->oid
,
440 case DIFF_STATUS_ADDED
:
441 d
->mode_worktree
= p
->two
->mode
;
444 case DIFF_STATUS_DELETED
:
445 d
->mode_index
= p
->one
->mode
;
446 oidcpy(&d
->oid_index
, &p
->one
->oid
);
447 /* mode_worktree is zero for a delete. */
450 case DIFF_STATUS_MODIFIED
:
451 case DIFF_STATUS_TYPE_CHANGED
:
452 case DIFF_STATUS_UNMERGED
:
453 d
->mode_index
= p
->one
->mode
;
454 d
->mode_worktree
= p
->two
->mode
;
455 oidcpy(&d
->oid_index
, &p
->one
->oid
);
458 case DIFF_STATUS_UNKNOWN
:
459 die("BUG: worktree status unknown???");
466 static int unmerged_mask(const char *path
)
469 const struct cache_entry
*ce
;
471 pos
= cache_name_pos(path
, strlen(path
));
477 while (pos
< active_nr
) {
478 ce
= active_cache
[pos
++];
479 if (strcmp(ce
->name
, path
) || !ce_stage(ce
))
481 mask
|= (1 << (ce_stage(ce
) - 1));
486 static void wt_status_collect_updated_cb(struct diff_queue_struct
*q
,
487 struct diff_options
*options
,
490 struct wt_status
*s
= data
;
493 for (i
= 0; i
< q
->nr
; i
++) {
494 struct diff_filepair
*p
;
495 struct string_list_item
*it
;
496 struct wt_status_change_data
*d
;
499 it
= string_list_insert(&s
->change
, p
->two
->path
);
502 d
= xcalloc(1, sizeof(*d
));
505 if (!d
->index_status
)
506 d
->index_status
= p
->status
;
508 case DIFF_STATUS_ADDED
:
509 /* Leave {mode,oid}_head zero for an add. */
510 d
->mode_index
= p
->two
->mode
;
511 oidcpy(&d
->oid_index
, &p
->two
->oid
);
513 case DIFF_STATUS_DELETED
:
514 d
->mode_head
= p
->one
->mode
;
515 oidcpy(&d
->oid_head
, &p
->one
->oid
);
516 /* Leave {mode,oid}_index zero for a delete. */
519 case DIFF_STATUS_COPIED
:
520 case DIFF_STATUS_RENAMED
:
521 d
->head_path
= xstrdup(p
->one
->path
);
522 d
->score
= p
->score
* 100 / MAX_SCORE
;
524 case DIFF_STATUS_MODIFIED
:
525 case DIFF_STATUS_TYPE_CHANGED
:
526 d
->mode_head
= p
->one
->mode
;
527 d
->mode_index
= p
->two
->mode
;
528 oidcpy(&d
->oid_head
, &p
->one
->oid
);
529 oidcpy(&d
->oid_index
, &p
->two
->oid
);
531 case DIFF_STATUS_UNMERGED
:
532 d
->stagemask
= unmerged_mask(p
->two
->path
);
534 * Don't bother setting {mode,oid}_{head,index} since the print
535 * code will output the stage values directly and not use the
536 * values in these fields.
543 static void wt_status_collect_changes_worktree(struct wt_status
*s
)
547 init_revisions(&rev
, NULL
);
548 setup_revisions(0, NULL
, &rev
, NULL
);
549 rev
.diffopt
.output_format
|= DIFF_FORMAT_CALLBACK
;
550 DIFF_OPT_SET(&rev
.diffopt
, DIRTY_SUBMODULES
);
551 rev
.diffopt
.ita_invisible_in_index
= 1;
552 if (!s
->show_untracked_files
)
553 DIFF_OPT_SET(&rev
.diffopt
, IGNORE_UNTRACKED_IN_SUBMODULES
);
554 if (s
->ignore_submodule_arg
) {
555 DIFF_OPT_SET(&rev
.diffopt
, OVERRIDE_SUBMODULE_CONFIG
);
556 handle_ignore_submodules_arg(&rev
.diffopt
, s
->ignore_submodule_arg
);
558 rev
.diffopt
.format_callback
= wt_status_collect_changed_cb
;
559 rev
.diffopt
.format_callback_data
= s
;
560 copy_pathspec(&rev
.prune_data
, &s
->pathspec
);
561 run_diff_files(&rev
, 0);
564 static void wt_status_collect_changes_index(struct wt_status
*s
)
567 struct setup_revision_opt opt
;
569 init_revisions(&rev
, NULL
);
570 memset(&opt
, 0, sizeof(opt
));
571 opt
.def
= s
->is_initial
? EMPTY_TREE_SHA1_HEX
: s
->reference
;
572 setup_revisions(0, NULL
, &rev
, &opt
);
574 DIFF_OPT_SET(&rev
.diffopt
, OVERRIDE_SUBMODULE_CONFIG
);
575 rev
.diffopt
.ita_invisible_in_index
= 1;
576 if (s
->ignore_submodule_arg
) {
577 handle_ignore_submodules_arg(&rev
.diffopt
, s
->ignore_submodule_arg
);
580 * Unless the user did explicitly request a submodule ignore
581 * mode by passing a command line option we do not ignore any
582 * changed submodule SHA-1s when comparing index and HEAD, no
583 * matter what is configured. Otherwise the user won't be
584 * shown any submodules she manually added (and which are
585 * staged to be committed), which would be really confusing.
587 handle_ignore_submodules_arg(&rev
.diffopt
, "dirty");
590 rev
.diffopt
.output_format
|= DIFF_FORMAT_CALLBACK
;
591 rev
.diffopt
.format_callback
= wt_status_collect_updated_cb
;
592 rev
.diffopt
.format_callback_data
= s
;
593 rev
.diffopt
.detect_rename
= 1;
594 rev
.diffopt
.rename_limit
= 200;
595 rev
.diffopt
.break_opt
= 0;
596 copy_pathspec(&rev
.prune_data
, &s
->pathspec
);
597 run_diff_index(&rev
, 1);
600 static void wt_status_collect_changes_initial(struct wt_status
*s
)
604 for (i
= 0; i
< active_nr
; i
++) {
605 struct string_list_item
*it
;
606 struct wt_status_change_data
*d
;
607 const struct cache_entry
*ce
= active_cache
[i
];
609 if (!ce_path_match(ce
, &s
->pathspec
, NULL
))
611 if (ce_intent_to_add(ce
))
613 it
= string_list_insert(&s
->change
, ce
->name
);
616 d
= xcalloc(1, sizeof(*d
));
620 d
->index_status
= DIFF_STATUS_UNMERGED
;
621 d
->stagemask
|= (1 << (ce_stage(ce
) - 1));
623 * Don't bother setting {mode,oid}_{head,index} since the print
624 * code will output the stage values directly and not use the
625 * values in these fields.
628 d
->index_status
= DIFF_STATUS_ADDED
;
629 /* Leave {mode,oid}_head zero for adds. */
630 d
->mode_index
= ce
->ce_mode
;
631 oidcpy(&d
->oid_index
, &ce
->oid
);
636 static void wt_status_collect_untracked(struct wt_status
*s
)
639 struct dir_struct dir
;
640 uint64_t t_begin
= getnanotime();
642 if (!s
->show_untracked_files
)
645 memset(&dir
, 0, sizeof(dir
));
646 if (s
->show_untracked_files
!= SHOW_ALL_UNTRACKED_FILES
)
648 DIR_SHOW_OTHER_DIRECTORIES
| DIR_HIDE_EMPTY_DIRECTORIES
;
649 if (s
->show_ignored_files
)
650 dir
.flags
|= DIR_SHOW_IGNORED_TOO
;
652 dir
.untracked
= the_index
.untracked
;
653 setup_standard_excludes(&dir
);
655 fill_directory(&dir
, &s
->pathspec
);
657 for (i
= 0; i
< dir
.nr
; i
++) {
658 struct dir_entry
*ent
= dir
.entries
[i
];
659 if (cache_name_is_other(ent
->name
, ent
->len
) &&
660 dir_path_match(ent
, &s
->pathspec
, 0, NULL
))
661 string_list_insert(&s
->untracked
, ent
->name
);
665 for (i
= 0; i
< dir
.ignored_nr
; i
++) {
666 struct dir_entry
*ent
= dir
.ignored
[i
];
667 if (cache_name_is_other(ent
->name
, ent
->len
) &&
668 dir_path_match(ent
, &s
->pathspec
, 0, NULL
))
669 string_list_insert(&s
->ignored
, ent
->name
);
675 clear_directory(&dir
);
677 if (advice_status_u_option
)
678 s
->untracked_in_ms
= (getnanotime() - t_begin
) / 1000000;
681 void wt_status_collect(struct wt_status
*s
)
683 wt_status_collect_changes_worktree(s
);
686 wt_status_collect_changes_initial(s
);
688 wt_status_collect_changes_index(s
);
689 wt_status_collect_untracked(s
);
692 static void wt_longstatus_print_unmerged(struct wt_status
*s
)
694 int shown_header
= 0;
697 for (i
= 0; i
< s
->change
.nr
; i
++) {
698 struct wt_status_change_data
*d
;
699 struct string_list_item
*it
;
700 it
= &(s
->change
.items
[i
]);
705 wt_longstatus_print_unmerged_header(s
);
708 wt_longstatus_print_unmerged_data(s
, it
);
711 wt_longstatus_print_trailer(s
);
715 static void wt_longstatus_print_updated(struct wt_status
*s
)
717 int shown_header
= 0;
720 for (i
= 0; i
< s
->change
.nr
; i
++) {
721 struct wt_status_change_data
*d
;
722 struct string_list_item
*it
;
723 it
= &(s
->change
.items
[i
]);
725 if (!d
->index_status
||
726 d
->index_status
== DIFF_STATUS_UNMERGED
)
729 wt_longstatus_print_cached_header(s
);
733 wt_longstatus_print_change_data(s
, WT_STATUS_UPDATED
, it
);
736 wt_longstatus_print_trailer(s
);
742 * 1 : some change but no delete
744 static int wt_status_check_worktree_changes(struct wt_status
*s
,
745 int *dirty_submodules
)
750 *dirty_submodules
= 0;
752 for (i
= 0; i
< s
->change
.nr
; i
++) {
753 struct wt_status_change_data
*d
;
754 d
= s
->change
.items
[i
].util
;
755 if (!d
->worktree_status
||
756 d
->worktree_status
== DIFF_STATUS_UNMERGED
)
760 if (d
->dirty_submodule
)
761 *dirty_submodules
= 1;
762 if (d
->worktree_status
== DIFF_STATUS_DELETED
)
768 static void wt_longstatus_print_changed(struct wt_status
*s
)
770 int i
, dirty_submodules
;
771 int worktree_changes
= wt_status_check_worktree_changes(s
, &dirty_submodules
);
773 if (!worktree_changes
)
776 wt_longstatus_print_dirty_header(s
, worktree_changes
< 0, dirty_submodules
);
778 for (i
= 0; i
< s
->change
.nr
; i
++) {
779 struct wt_status_change_data
*d
;
780 struct string_list_item
*it
;
781 it
= &(s
->change
.items
[i
]);
783 if (!d
->worktree_status
||
784 d
->worktree_status
== DIFF_STATUS_UNMERGED
)
786 wt_longstatus_print_change_data(s
, WT_STATUS_CHANGED
, it
);
788 wt_longstatus_print_trailer(s
);
791 static void wt_longstatus_print_submodule_summary(struct wt_status
*s
, int uncommitted
)
793 struct child_process sm_summary
= CHILD_PROCESS_INIT
;
794 struct strbuf cmd_stdout
= STRBUF_INIT
;
795 struct strbuf summary
= STRBUF_INIT
;
796 char *summary_content
;
798 argv_array_pushf(&sm_summary
.env_array
, "GIT_INDEX_FILE=%s",
801 argv_array_push(&sm_summary
.args
, "submodule");
802 argv_array_push(&sm_summary
.args
, "summary");
803 argv_array_push(&sm_summary
.args
, uncommitted
? "--files" : "--cached");
804 argv_array_push(&sm_summary
.args
, "--for-status");
805 argv_array_push(&sm_summary
.args
, "--summary-limit");
806 argv_array_pushf(&sm_summary
.args
, "%d", s
->submodule_summary
);
808 argv_array_push(&sm_summary
.args
, s
->amend
? "HEAD^" : "HEAD");
810 sm_summary
.git_cmd
= 1;
811 sm_summary
.no_stdin
= 1;
813 capture_command(&sm_summary
, &cmd_stdout
, 1024);
815 /* prepend header, only if there's an actual output */
816 if (cmd_stdout
.len
) {
818 strbuf_addstr(&summary
, _("Submodules changed but not updated:"));
820 strbuf_addstr(&summary
, _("Submodule changes to be committed:"));
821 strbuf_addstr(&summary
, "\n\n");
823 strbuf_addbuf(&summary
, &cmd_stdout
);
824 strbuf_release(&cmd_stdout
);
826 if (s
->display_comment_prefix
) {
828 summary_content
= strbuf_detach(&summary
, &len
);
829 strbuf_add_commented_lines(&summary
, summary_content
, len
);
830 free(summary_content
);
833 fputs(summary
.buf
, s
->fp
);
834 strbuf_release(&summary
);
837 static void wt_longstatus_print_other(struct wt_status
*s
,
838 struct string_list
*l
,
843 struct strbuf buf
= STRBUF_INIT
;
844 static struct string_list output
= STRING_LIST_INIT_DUP
;
845 struct column_options copts
;
850 wt_longstatus_print_other_header(s
, what
, how
);
852 for (i
= 0; i
< l
->nr
; i
++) {
853 struct string_list_item
*it
;
856 path
= quote_path(it
->string
, s
->prefix
, &buf
);
857 if (column_active(s
->colopts
)) {
858 string_list_append(&output
, path
);
861 status_printf(s
, color(WT_STATUS_HEADER
, s
), "\t");
862 status_printf_more(s
, color(WT_STATUS_UNTRACKED
, s
),
866 strbuf_release(&buf
);
867 if (!column_active(s
->colopts
))
870 strbuf_addf(&buf
, "%s%s\t%s",
871 color(WT_STATUS_HEADER
, s
),
872 s
->display_comment_prefix
? "#" : "",
873 color(WT_STATUS_UNTRACKED
, s
));
874 memset(&copts
, 0, sizeof(copts
));
876 copts
.indent
= buf
.buf
;
877 if (want_color(s
->use_color
))
878 copts
.nl
= GIT_COLOR_RESET
"\n";
879 print_columns(&output
, s
->colopts
, &copts
);
880 string_list_clear(&output
, 0);
881 strbuf_release(&buf
);
883 status_printf_ln(s
, GIT_COLOR_NORMAL
, "%s", "");
886 void wt_status_truncate_message_at_cut_line(struct strbuf
*buf
)
889 struct strbuf pattern
= STRBUF_INIT
;
891 strbuf_addf(&pattern
, "\n%c %s", comment_line_char
, cut_line
);
892 if (starts_with(buf
->buf
, pattern
.buf
+ 1))
893 strbuf_setlen(buf
, 0);
894 else if ((p
= strstr(buf
->buf
, pattern
.buf
)))
895 strbuf_setlen(buf
, p
- buf
->buf
+ 1);
896 strbuf_release(&pattern
);
899 void wt_status_add_cut_line(FILE *fp
)
901 const char *explanation
= _("Do not touch the line above.\nEverything below will be removed.");
902 struct strbuf buf
= STRBUF_INIT
;
904 fprintf(fp
, "%c %s", comment_line_char
, cut_line
);
905 strbuf_add_commented_lines(&buf
, explanation
, strlen(explanation
));
907 strbuf_release(&buf
);
910 static void wt_longstatus_print_verbose(struct wt_status
*s
)
913 struct setup_revision_opt opt
;
914 int dirty_submodules
;
915 const char *c
= color(WT_STATUS_HEADER
, s
);
917 init_revisions(&rev
, NULL
);
918 DIFF_OPT_SET(&rev
.diffopt
, ALLOW_TEXTCONV
);
919 rev
.diffopt
.ita_invisible_in_index
= 1;
921 memset(&opt
, 0, sizeof(opt
));
922 opt
.def
= s
->is_initial
? EMPTY_TREE_SHA1_HEX
: s
->reference
;
923 setup_revisions(0, NULL
, &rev
, &opt
);
925 rev
.diffopt
.output_format
|= DIFF_FORMAT_PATCH
;
926 rev
.diffopt
.detect_rename
= 1;
927 rev
.diffopt
.file
= s
->fp
;
928 rev
.diffopt
.close_file
= 0;
930 * If we're not going to stdout, then we definitely don't
931 * want color, since we are going to the commit message
932 * file (and even the "auto" setting won't work, since it
933 * will have checked isatty on stdout). But we then do want
934 * to insert the scissor line here to reliably remove the
935 * diff before committing.
937 if (s
->fp
!= stdout
) {
938 rev
.diffopt
.use_color
= 0;
939 wt_status_add_cut_line(s
->fp
);
941 if (s
->verbose
> 1 && s
->commitable
) {
942 /* print_updated() printed a header, so do we */
944 wt_longstatus_print_trailer(s
);
945 status_printf_ln(s
, c
, _("Changes to be committed:"));
946 rev
.diffopt
.a_prefix
= "c/";
947 rev
.diffopt
.b_prefix
= "i/";
948 } /* else use prefix as per user config */
949 run_diff_index(&rev
, 1);
950 if (s
->verbose
> 1 &&
951 wt_status_check_worktree_changes(s
, &dirty_submodules
)) {
952 status_printf_ln(s
, c
,
953 "--------------------------------------------------");
954 status_printf_ln(s
, c
, _("Changes not staged for commit:"));
956 rev
.diffopt
.a_prefix
= "i/";
957 rev
.diffopt
.b_prefix
= "w/";
958 run_diff_files(&rev
, 0);
962 static void wt_longstatus_print_tracking(struct wt_status
*s
)
964 struct strbuf sb
= STRBUF_INIT
;
965 const char *cp
, *ep
, *branch_name
;
966 struct branch
*branch
;
967 char comment_line_string
[3];
970 assert(s
->branch
&& !s
->is_initial
);
971 if (!skip_prefix(s
->branch
, "refs/heads/", &branch_name
))
973 branch
= branch_get(branch_name
);
974 if (!format_tracking_info(branch
, &sb
))
978 if (s
->display_comment_prefix
) {
979 comment_line_string
[i
++] = comment_line_char
;
980 comment_line_string
[i
++] = ' ';
982 comment_line_string
[i
] = '\0';
984 for (cp
= sb
.buf
; (ep
= strchr(cp
, '\n')) != NULL
; cp
= ep
+ 1)
985 color_fprintf_ln(s
->fp
, color(WT_STATUS_HEADER
, s
),
986 "%s%.*s", comment_line_string
,
988 if (s
->display_comment_prefix
)
989 color_fprintf_ln(s
->fp
, color(WT_STATUS_HEADER
, s
), "%c",
995 static int has_unmerged(struct wt_status
*s
)
999 for (i
= 0; i
< s
->change
.nr
; i
++) {
1000 struct wt_status_change_data
*d
;
1001 d
= s
->change
.items
[i
].util
;
1008 static void show_merge_in_progress(struct wt_status
*s
,
1009 struct wt_status_state
*state
,
1012 if (has_unmerged(s
)) {
1013 status_printf_ln(s
, color
, _("You have unmerged paths."));
1015 status_printf_ln(s
, color
,
1016 _(" (fix conflicts and run \"git commit\")"));
1017 status_printf_ln(s
, color
,
1018 _(" (use \"git merge --abort\" to abort the merge)"));
1022 status_printf_ln(s
, color
,
1023 _("All conflicts fixed but you are still merging."));
1025 status_printf_ln(s
, color
,
1026 _(" (use \"git commit\" to conclude merge)"));
1028 wt_longstatus_print_trailer(s
);
1031 static void show_am_in_progress(struct wt_status
*s
,
1032 struct wt_status_state
*state
,
1035 status_printf_ln(s
, color
,
1036 _("You are in the middle of an am session."));
1037 if (state
->am_empty_patch
)
1038 status_printf_ln(s
, color
,
1039 _("The current patch is empty."));
1041 if (!state
->am_empty_patch
)
1042 status_printf_ln(s
, color
,
1043 _(" (fix conflicts and then run \"git am --continue\")"));
1044 status_printf_ln(s
, color
,
1045 _(" (use \"git am --skip\" to skip this patch)"));
1046 status_printf_ln(s
, color
,
1047 _(" (use \"git am --abort\" to restore the original branch)"));
1049 wt_longstatus_print_trailer(s
);
1052 static char *read_line_from_git_path(const char *filename
)
1054 struct strbuf buf
= STRBUF_INIT
;
1055 FILE *fp
= fopen(git_path("%s", filename
), "r");
1057 strbuf_release(&buf
);
1060 strbuf_getline_lf(&buf
, fp
);
1062 return strbuf_detach(&buf
, NULL
);
1064 strbuf_release(&buf
);
1069 static int split_commit_in_progress(struct wt_status
*s
)
1071 int split_in_progress
= 0;
1072 char *head
= read_line_from_git_path("HEAD");
1073 char *orig_head
= read_line_from_git_path("ORIG_HEAD");
1074 char *rebase_amend
= read_line_from_git_path("rebase-merge/amend");
1075 char *rebase_orig_head
= read_line_from_git_path("rebase-merge/orig-head");
1077 if (!head
|| !orig_head
|| !rebase_amend
|| !rebase_orig_head
||
1078 !s
->branch
|| strcmp(s
->branch
, "HEAD"))
1079 return split_in_progress
;
1081 if (!strcmp(rebase_amend
, rebase_orig_head
)) {
1082 if (strcmp(head
, rebase_amend
))
1083 split_in_progress
= 1;
1084 } else if (strcmp(orig_head
, rebase_orig_head
)) {
1085 split_in_progress
= 1;
1088 if (!s
->amend
&& !s
->nowarn
&& !s
->workdir_dirty
)
1089 split_in_progress
= 0;
1094 free(rebase_orig_head
);
1095 return split_in_progress
;
1100 * "pick d6a2f0303e897ec257dd0e0a39a5ccb709bc2047 some message"
1102 * "pick d6a2f03 some message"
1104 * The function assumes that the line does not contain useless spaces
1105 * before or after the command.
1107 static void abbrev_sha1_in_line(struct strbuf
*line
)
1109 struct strbuf
**split
;
1112 if (starts_with(line
->buf
, "exec ") ||
1113 starts_with(line
->buf
, "x "))
1116 split
= strbuf_split_max(line
, ' ', 3);
1117 if (split
[0] && split
[1]) {
1118 unsigned char sha1
[20];
1121 * strbuf_split_max left a space. Trim it and re-add
1122 * it after abbreviation.
1124 strbuf_trim(split
[1]);
1125 if (!get_sha1(split
[1]->buf
, sha1
)) {
1126 strbuf_reset(split
[1]);
1127 strbuf_add_unique_abbrev(split
[1], sha1
,
1129 strbuf_addch(split
[1], ' ');
1131 for (i
= 0; split
[i
]; i
++)
1132 strbuf_addbuf(line
, split
[i
]);
1135 strbuf_list_free(split
);
1138 static int read_rebase_todolist(const char *fname
, struct string_list
*lines
)
1140 struct strbuf line
= STRBUF_INIT
;
1141 FILE *f
= fopen(git_path("%s", fname
), "r");
1144 if (errno
== ENOENT
)
1146 die_errno("Could not open file %s for reading",
1147 git_path("%s", fname
));
1149 while (!strbuf_getline_lf(&line
, f
)) {
1150 if (line
.len
&& line
.buf
[0] == comment_line_char
)
1155 abbrev_sha1_in_line(&line
);
1156 string_list_append(lines
, line
.buf
);
1161 static void show_rebase_information(struct wt_status
*s
,
1162 struct wt_status_state
*state
,
1165 if (state
->rebase_interactive_in_progress
) {
1167 int nr_lines_to_show
= 2;
1169 struct string_list have_done
= STRING_LIST_INIT_DUP
;
1170 struct string_list yet_to_do
= STRING_LIST_INIT_DUP
;
1172 read_rebase_todolist("rebase-merge/done", &have_done
);
1173 if (read_rebase_todolist("rebase-merge/git-rebase-todo",
1175 status_printf_ln(s
, color
,
1176 _("git-rebase-todo is missing."));
1177 if (have_done
.nr
== 0)
1178 status_printf_ln(s
, color
, _("No commands done."));
1180 status_printf_ln(s
, color
,
1181 Q_("Last command done (%d command done):",
1182 "Last commands done (%d commands done):",
1185 for (i
= (have_done
.nr
> nr_lines_to_show
)
1186 ? have_done
.nr
- nr_lines_to_show
: 0;
1189 status_printf_ln(s
, color
, " %s", have_done
.items
[i
].string
);
1190 if (have_done
.nr
> nr_lines_to_show
&& s
->hints
)
1191 status_printf_ln(s
, color
,
1192 _(" (see more in file %s)"), git_path("rebase-merge/done"));
1195 if (yet_to_do
.nr
== 0)
1196 status_printf_ln(s
, color
,
1197 _("No commands remaining."));
1199 status_printf_ln(s
, color
,
1200 Q_("Next command to do (%d remaining command):",
1201 "Next commands to do (%d remaining commands):",
1204 for (i
= 0; i
< nr_lines_to_show
&& i
< yet_to_do
.nr
; i
++)
1205 status_printf_ln(s
, color
, " %s", yet_to_do
.items
[i
].string
);
1207 status_printf_ln(s
, color
,
1208 _(" (use \"git rebase --edit-todo\" to view and edit)"));
1210 string_list_clear(&yet_to_do
, 0);
1211 string_list_clear(&have_done
, 0);
1215 static void print_rebase_state(struct wt_status
*s
,
1216 struct wt_status_state
*state
,
1220 status_printf_ln(s
, color
,
1221 _("You are currently rebasing branch '%s' on '%s'."),
1225 status_printf_ln(s
, color
,
1226 _("You are currently rebasing."));
1229 static void show_rebase_in_progress(struct wt_status
*s
,
1230 struct wt_status_state
*state
,
1235 show_rebase_information(s
, state
, color
);
1236 if (has_unmerged(s
)) {
1237 print_rebase_state(s
, state
, color
);
1239 status_printf_ln(s
, color
,
1240 _(" (fix conflicts and then run \"git rebase --continue\")"));
1241 status_printf_ln(s
, color
,
1242 _(" (use \"git rebase --skip\" to skip this patch)"));
1243 status_printf_ln(s
, color
,
1244 _(" (use \"git rebase --abort\" to check out the original branch)"));
1246 } else if (state
->rebase_in_progress
|| !stat(git_path_merge_msg(), &st
)) {
1247 print_rebase_state(s
, state
, color
);
1249 status_printf_ln(s
, color
,
1250 _(" (all conflicts fixed: run \"git rebase --continue\")"));
1251 } else if (split_commit_in_progress(s
)) {
1253 status_printf_ln(s
, color
,
1254 _("You are currently splitting a commit while rebasing branch '%s' on '%s'."),
1258 status_printf_ln(s
, color
,
1259 _("You are currently splitting a commit during a rebase."));
1261 status_printf_ln(s
, color
,
1262 _(" (Once your working directory is clean, run \"git rebase --continue\")"));
1265 status_printf_ln(s
, color
,
1266 _("You are currently editing a commit while rebasing branch '%s' on '%s'."),
1270 status_printf_ln(s
, color
,
1271 _("You are currently editing a commit during a rebase."));
1272 if (s
->hints
&& !s
->amend
) {
1273 status_printf_ln(s
, color
,
1274 _(" (use \"git commit --amend\" to amend the current commit)"));
1275 status_printf_ln(s
, color
,
1276 _(" (use \"git rebase --continue\" once you are satisfied with your changes)"));
1279 wt_longstatus_print_trailer(s
);
1282 static void show_cherry_pick_in_progress(struct wt_status
*s
,
1283 struct wt_status_state
*state
,
1286 status_printf_ln(s
, color
, _("You are currently cherry-picking commit %s."),
1287 find_unique_abbrev(state
->cherry_pick_head_sha1
, DEFAULT_ABBREV
));
1289 if (has_unmerged(s
))
1290 status_printf_ln(s
, color
,
1291 _(" (fix conflicts and run \"git cherry-pick --continue\")"));
1293 status_printf_ln(s
, color
,
1294 _(" (all conflicts fixed: run \"git cherry-pick --continue\")"));
1295 status_printf_ln(s
, color
,
1296 _(" (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"));
1298 wt_longstatus_print_trailer(s
);
1301 static void show_revert_in_progress(struct wt_status
*s
,
1302 struct wt_status_state
*state
,
1305 status_printf_ln(s
, color
, _("You are currently reverting commit %s."),
1306 find_unique_abbrev(state
->revert_head_sha1
, DEFAULT_ABBREV
));
1308 if (has_unmerged(s
))
1309 status_printf_ln(s
, color
,
1310 _(" (fix conflicts and run \"git revert --continue\")"));
1312 status_printf_ln(s
, color
,
1313 _(" (all conflicts fixed: run \"git revert --continue\")"));
1314 status_printf_ln(s
, color
,
1315 _(" (use \"git revert --abort\" to cancel the revert operation)"));
1317 wt_longstatus_print_trailer(s
);
1320 static void show_bisect_in_progress(struct wt_status
*s
,
1321 struct wt_status_state
*state
,
1325 status_printf_ln(s
, color
,
1326 _("You are currently bisecting, started from branch '%s'."),
1329 status_printf_ln(s
, color
,
1330 _("You are currently bisecting."));
1332 status_printf_ln(s
, color
,
1333 _(" (use \"git bisect reset\" to get back to the original branch)"));
1334 wt_longstatus_print_trailer(s
);
1338 * Extract branch information from rebase/bisect
1340 static char *get_branch(const struct worktree
*wt
, const char *path
)
1342 struct strbuf sb
= STRBUF_INIT
;
1343 unsigned char sha1
[20];
1344 const char *branch_name
;
1346 if (strbuf_read_file(&sb
, worktree_git_path(wt
, "%s", path
), 0) <= 0)
1349 while (sb
.len
&& sb
.buf
[sb
.len
- 1] == '\n')
1350 strbuf_setlen(&sb
, sb
.len
- 1);
1353 if (skip_prefix(sb
.buf
, "refs/heads/", &branch_name
))
1354 strbuf_remove(&sb
, 0, branch_name
- sb
.buf
);
1355 else if (starts_with(sb
.buf
, "refs/"))
1357 else if (!get_sha1_hex(sb
.buf
, sha1
)) {
1359 strbuf_add_unique_abbrev(&sb
, sha1
, DEFAULT_ABBREV
);
1360 } else if (!strcmp(sb
.buf
, "detached HEAD")) /* rebase */
1364 return strbuf_detach(&sb
, NULL
);
1367 strbuf_release(&sb
);
1371 struct grab_1st_switch_cbdata
{
1373 unsigned char nsha1
[20];
1376 static int grab_1st_switch(struct object_id
*ooid
, struct object_id
*noid
,
1377 const char *email
, unsigned long timestamp
, int tz
,
1378 const char *message
, void *cb_data
)
1380 struct grab_1st_switch_cbdata
*cb
= cb_data
;
1381 const char *target
= NULL
, *end
;
1383 if (!skip_prefix(message
, "checkout: moving from ", &message
))
1385 target
= strstr(message
, " to ");
1388 target
+= strlen(" to ");
1389 strbuf_reset(&cb
->buf
);
1390 hashcpy(cb
->nsha1
, noid
->hash
);
1391 end
= strchrnul(target
, '\n');
1392 strbuf_add(&cb
->buf
, target
, end
- target
);
1393 if (!strcmp(cb
->buf
.buf
, "HEAD")) {
1394 /* HEAD is relative. Resolve it to the right reflog entry. */
1395 strbuf_reset(&cb
->buf
);
1396 strbuf_add_unique_abbrev(&cb
->buf
, noid
->hash
, DEFAULT_ABBREV
);
1401 static void wt_status_get_detached_from(struct wt_status_state
*state
)
1403 struct grab_1st_switch_cbdata cb
;
1404 struct commit
*commit
;
1405 unsigned char sha1
[20];
1408 strbuf_init(&cb
.buf
, 0);
1409 if (for_each_reflog_ent_reverse("HEAD", grab_1st_switch
, &cb
) <= 0) {
1410 strbuf_release(&cb
.buf
);
1414 if (dwim_ref(cb
.buf
.buf
, cb
.buf
.len
, sha1
, &ref
) == 1 &&
1415 /* sha1 is a commit? match without further lookup */
1416 (!hashcmp(cb
.nsha1
, sha1
) ||
1417 /* perhaps sha1 is a tag, try to dereference to a commit */
1418 ((commit
= lookup_commit_reference_gently(sha1
, 1)) != NULL
&&
1419 !hashcmp(cb
.nsha1
, commit
->object
.oid
.hash
)))) {
1420 const char *from
= ref
;
1421 if (!skip_prefix(from
, "refs/tags/", &from
))
1422 skip_prefix(from
, "refs/remotes/", &from
);
1423 state
->detached_from
= xstrdup(from
);
1425 state
->detached_from
=
1426 xstrdup(find_unique_abbrev(cb
.nsha1
, DEFAULT_ABBREV
));
1427 hashcpy(state
->detached_sha1
, cb
.nsha1
);
1428 state
->detached_at
= !get_sha1("HEAD", sha1
) &&
1429 !hashcmp(sha1
, state
->detached_sha1
);
1432 strbuf_release(&cb
.buf
);
1435 int wt_status_check_rebase(const struct worktree
*wt
,
1436 struct wt_status_state
*state
)
1440 if (!stat(worktree_git_path(wt
, "rebase-apply"), &st
)) {
1441 if (!stat(worktree_git_path(wt
, "rebase-apply/applying"), &st
)) {
1442 state
->am_in_progress
= 1;
1443 if (!stat(worktree_git_path(wt
, "rebase-apply/patch"), &st
) && !st
.st_size
)
1444 state
->am_empty_patch
= 1;
1446 state
->rebase_in_progress
= 1;
1447 state
->branch
= get_branch(wt
, "rebase-apply/head-name");
1448 state
->onto
= get_branch(wt
, "rebase-apply/onto");
1450 } else if (!stat(worktree_git_path(wt
, "rebase-merge"), &st
)) {
1451 if (!stat(worktree_git_path(wt
, "rebase-merge/interactive"), &st
))
1452 state
->rebase_interactive_in_progress
= 1;
1454 state
->rebase_in_progress
= 1;
1455 state
->branch
= get_branch(wt
, "rebase-merge/head-name");
1456 state
->onto
= get_branch(wt
, "rebase-merge/onto");
1462 int wt_status_check_bisect(const struct worktree
*wt
,
1463 struct wt_status_state
*state
)
1467 if (!stat(worktree_git_path(wt
, "BISECT_LOG"), &st
)) {
1468 state
->bisect_in_progress
= 1;
1469 state
->branch
= get_branch(wt
, "BISECT_START");
1475 void wt_status_get_state(struct wt_status_state
*state
,
1476 int get_detached_from
)
1479 unsigned char sha1
[20];
1481 if (!stat(git_path_merge_head(), &st
)) {
1482 state
->merge_in_progress
= 1;
1483 } else if (wt_status_check_rebase(NULL
, state
)) {
1485 } else if (!stat(git_path_cherry_pick_head(), &st
) &&
1486 !get_sha1("CHERRY_PICK_HEAD", sha1
)) {
1487 state
->cherry_pick_in_progress
= 1;
1488 hashcpy(state
->cherry_pick_head_sha1
, sha1
);
1490 wt_status_check_bisect(NULL
, state
);
1491 if (!stat(git_path_revert_head(), &st
) &&
1492 !get_sha1("REVERT_HEAD", sha1
)) {
1493 state
->revert_in_progress
= 1;
1494 hashcpy(state
->revert_head_sha1
, sha1
);
1497 if (get_detached_from
)
1498 wt_status_get_detached_from(state
);
1501 static void wt_longstatus_print_state(struct wt_status
*s
,
1502 struct wt_status_state
*state
)
1504 const char *state_color
= color(WT_STATUS_HEADER
, s
);
1505 if (state
->merge_in_progress
)
1506 show_merge_in_progress(s
, state
, state_color
);
1507 else if (state
->am_in_progress
)
1508 show_am_in_progress(s
, state
, state_color
);
1509 else if (state
->rebase_in_progress
|| state
->rebase_interactive_in_progress
)
1510 show_rebase_in_progress(s
, state
, state_color
);
1511 else if (state
->cherry_pick_in_progress
)
1512 show_cherry_pick_in_progress(s
, state
, state_color
);
1513 else if (state
->revert_in_progress
)
1514 show_revert_in_progress(s
, state
, state_color
);
1515 if (state
->bisect_in_progress
)
1516 show_bisect_in_progress(s
, state
, state_color
);
1519 static void wt_longstatus_print(struct wt_status
*s
)
1521 const char *branch_color
= color(WT_STATUS_ONBRANCH
, s
);
1522 const char *branch_status_color
= color(WT_STATUS_HEADER
, s
);
1523 struct wt_status_state state
;
1525 memset(&state
, 0, sizeof(state
));
1526 wt_status_get_state(&state
,
1527 s
->branch
&& !strcmp(s
->branch
, "HEAD"));
1530 const char *on_what
= _("On branch ");
1531 const char *branch_name
= s
->branch
;
1532 if (!strcmp(branch_name
, "HEAD")) {
1533 branch_status_color
= color(WT_STATUS_NOBRANCH
, s
);
1534 if (state
.rebase_in_progress
|| state
.rebase_interactive_in_progress
) {
1535 if (state
.rebase_interactive_in_progress
)
1536 on_what
= _("interactive rebase in progress; onto ");
1538 on_what
= _("rebase in progress; onto ");
1539 branch_name
= state
.onto
;
1540 } else if (state
.detached_from
) {
1541 branch_name
= state
.detached_from
;
1542 if (state
.detached_at
)
1543 on_what
= _("HEAD detached at ");
1545 on_what
= _("HEAD detached from ");
1548 on_what
= _("Not currently on any branch.");
1551 skip_prefix(branch_name
, "refs/heads/", &branch_name
);
1552 status_printf(s
, color(WT_STATUS_HEADER
, s
), "%s", "");
1553 status_printf_more(s
, branch_status_color
, "%s", on_what
);
1554 status_printf_more(s
, branch_color
, "%s\n", branch_name
);
1556 wt_longstatus_print_tracking(s
);
1559 wt_longstatus_print_state(s
, &state
);
1562 free(state
.detached_from
);
1564 if (s
->is_initial
) {
1565 status_printf_ln(s
, color(WT_STATUS_HEADER
, s
), "%s", "");
1566 status_printf_ln(s
, color(WT_STATUS_HEADER
, s
), _("Initial commit"));
1567 status_printf_ln(s
, color(WT_STATUS_HEADER
, s
), "%s", "");
1570 wt_longstatus_print_updated(s
);
1571 wt_longstatus_print_unmerged(s
);
1572 wt_longstatus_print_changed(s
);
1573 if (s
->submodule_summary
&&
1574 (!s
->ignore_submodule_arg
||
1575 strcmp(s
->ignore_submodule_arg
, "all"))) {
1576 wt_longstatus_print_submodule_summary(s
, 0); /* staged */
1577 wt_longstatus_print_submodule_summary(s
, 1); /* unstaged */
1579 if (s
->show_untracked_files
) {
1580 wt_longstatus_print_other(s
, &s
->untracked
, _("Untracked files"), "add");
1581 if (s
->show_ignored_files
)
1582 wt_longstatus_print_other(s
, &s
->ignored
, _("Ignored files"), "add -f");
1583 if (advice_status_u_option
&& 2000 < s
->untracked_in_ms
) {
1584 status_printf_ln(s
, GIT_COLOR_NORMAL
, "%s", "");
1585 status_printf_ln(s
, GIT_COLOR_NORMAL
,
1586 _("It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1587 "may speed it up, but you have to be careful not to forget to add\n"
1588 "new files yourself (see 'git help status')."),
1589 s
->untracked_in_ms
/ 1000.0);
1591 } else if (s
->commitable
)
1592 status_printf_ln(s
, GIT_COLOR_NORMAL
, _("Untracked files not listed%s"),
1594 ? _(" (use -u option to show untracked files)") : "");
1597 wt_longstatus_print_verbose(s
);
1598 if (!s
->commitable
) {
1600 status_printf_ln(s
, GIT_COLOR_NORMAL
, _("No changes"));
1603 else if (s
->workdir_dirty
) {
1605 printf(_("no changes added to commit "
1606 "(use \"git add\" and/or \"git commit -a\")\n"));
1608 printf(_("no changes added to commit\n"));
1609 } else if (s
->untracked
.nr
) {
1611 printf(_("nothing added to commit but untracked files "
1612 "present (use \"git add\" to track)\n"));
1614 printf(_("nothing added to commit but untracked files present\n"));
1615 } else if (s
->is_initial
) {
1617 printf(_("nothing to commit (create/copy files "
1618 "and use \"git add\" to track)\n"));
1620 printf(_("nothing to commit\n"));
1621 } else if (!s
->show_untracked_files
) {
1623 printf(_("nothing to commit (use -u to show untracked files)\n"));
1625 printf(_("nothing to commit\n"));
1627 printf(_("nothing to commit, working tree clean\n"));
1631 static void wt_shortstatus_unmerged(struct string_list_item
*it
,
1632 struct wt_status
*s
)
1634 struct wt_status_change_data
*d
= it
->util
;
1635 const char *how
= "??";
1637 switch (d
->stagemask
) {
1638 case 1: how
= "DD"; break; /* both deleted */
1639 case 2: how
= "AU"; break; /* added by us */
1640 case 3: how
= "UD"; break; /* deleted by them */
1641 case 4: how
= "UA"; break; /* added by them */
1642 case 5: how
= "DU"; break; /* deleted by us */
1643 case 6: how
= "AA"; break; /* both added */
1644 case 7: how
= "UU"; break; /* both modified */
1646 color_fprintf(s
->fp
, color(WT_STATUS_UNMERGED
, s
), "%s", how
);
1647 if (s
->null_termination
) {
1648 fprintf(stdout
, " %s%c", it
->string
, 0);
1650 struct strbuf onebuf
= STRBUF_INIT
;
1652 one
= quote_path(it
->string
, s
->prefix
, &onebuf
);
1653 printf(" %s\n", one
);
1654 strbuf_release(&onebuf
);
1658 static void wt_shortstatus_status(struct string_list_item
*it
,
1659 struct wt_status
*s
)
1661 struct wt_status_change_data
*d
= it
->util
;
1663 if (d
->index_status
)
1664 color_fprintf(s
->fp
, color(WT_STATUS_UPDATED
, s
), "%c", d
->index_status
);
1667 if (d
->worktree_status
)
1668 color_fprintf(s
->fp
, color(WT_STATUS_CHANGED
, s
), "%c", d
->worktree_status
);
1672 if (s
->null_termination
) {
1673 fprintf(stdout
, "%s%c", it
->string
, 0);
1675 fprintf(stdout
, "%s%c", d
->head_path
, 0);
1677 struct strbuf onebuf
= STRBUF_INIT
;
1680 one
= quote_path(d
->head_path
, s
->prefix
, &onebuf
);
1681 if (*one
!= '"' && strchr(one
, ' ') != NULL
) {
1683 strbuf_addch(&onebuf
, '"');
1686 printf("%s -> ", one
);
1687 strbuf_release(&onebuf
);
1689 one
= quote_path(it
->string
, s
->prefix
, &onebuf
);
1690 if (*one
!= '"' && strchr(one
, ' ') != NULL
) {
1692 strbuf_addch(&onebuf
, '"');
1695 printf("%s\n", one
);
1696 strbuf_release(&onebuf
);
1700 static void wt_shortstatus_other(struct string_list_item
*it
,
1701 struct wt_status
*s
, const char *sign
)
1703 if (s
->null_termination
) {
1704 fprintf(stdout
, "%s %s%c", sign
, it
->string
, 0);
1706 struct strbuf onebuf
= STRBUF_INIT
;
1708 one
= quote_path(it
->string
, s
->prefix
, &onebuf
);
1709 color_fprintf(s
->fp
, color(WT_STATUS_UNTRACKED
, s
), "%s", sign
);
1710 printf(" %s\n", one
);
1711 strbuf_release(&onebuf
);
1715 static void wt_shortstatus_print_tracking(struct wt_status
*s
)
1717 struct branch
*branch
;
1718 const char *header_color
= color(WT_STATUS_HEADER
, s
);
1719 const char *branch_color_local
= color(WT_STATUS_LOCAL_BRANCH
, s
);
1720 const char *branch_color_remote
= color(WT_STATUS_REMOTE_BRANCH
, s
);
1723 const char *branch_name
;
1724 int num_ours
, num_theirs
;
1725 int upstream_is_gone
= 0;
1727 color_fprintf(s
->fp
, color(WT_STATUS_HEADER
, s
), "## ");
1731 branch_name
= s
->branch
;
1734 color_fprintf(s
->fp
, header_color
, _("Initial commit on "));
1736 if (!strcmp(s
->branch
, "HEAD")) {
1737 color_fprintf(s
->fp
, color(WT_STATUS_NOBRANCH
, s
), "%s",
1738 _("HEAD (no branch)"));
1742 skip_prefix(branch_name
, "refs/heads/", &branch_name
);
1744 branch
= branch_get(branch_name
);
1746 color_fprintf(s
->fp
, branch_color_local
, "%s", branch_name
);
1748 if (stat_tracking_info(branch
, &num_ours
, &num_theirs
, &base
) < 0) {
1752 upstream_is_gone
= 1;
1755 base
= shorten_unambiguous_ref(base
, 0);
1756 color_fprintf(s
->fp
, header_color
, "...");
1757 color_fprintf(s
->fp
, branch_color_remote
, "%s", base
);
1760 if (!upstream_is_gone
&& !num_ours
&& !num_theirs
)
1763 #define LABEL(string) (s->no_gettext ? (string) : _(string))
1765 color_fprintf(s
->fp
, header_color
, " [");
1766 if (upstream_is_gone
) {
1767 color_fprintf(s
->fp
, header_color
, LABEL(N_("gone")));
1768 } else if (!num_ours
) {
1769 color_fprintf(s
->fp
, header_color
, LABEL(N_("behind ")));
1770 color_fprintf(s
->fp
, branch_color_remote
, "%d", num_theirs
);
1771 } else if (!num_theirs
) {
1772 color_fprintf(s
->fp
, header_color
, LABEL(N_("ahead ")));
1773 color_fprintf(s
->fp
, branch_color_local
, "%d", num_ours
);
1775 color_fprintf(s
->fp
, header_color
, LABEL(N_("ahead ")));
1776 color_fprintf(s
->fp
, branch_color_local
, "%d", num_ours
);
1777 color_fprintf(s
->fp
, header_color
, ", %s", LABEL(N_("behind ")));
1778 color_fprintf(s
->fp
, branch_color_remote
, "%d", num_theirs
);
1781 color_fprintf(s
->fp
, header_color
, "]");
1783 fputc(s
->null_termination
? '\0' : '\n', s
->fp
);
1786 static void wt_shortstatus_print(struct wt_status
*s
)
1791 wt_shortstatus_print_tracking(s
);
1793 for (i
= 0; i
< s
->change
.nr
; i
++) {
1794 struct wt_status_change_data
*d
;
1795 struct string_list_item
*it
;
1797 it
= &(s
->change
.items
[i
]);
1800 wt_shortstatus_unmerged(it
, s
);
1802 wt_shortstatus_status(it
, s
);
1804 for (i
= 0; i
< s
->untracked
.nr
; i
++) {
1805 struct string_list_item
*it
;
1807 it
= &(s
->untracked
.items
[i
]);
1808 wt_shortstatus_other(it
, s
, "??");
1810 for (i
= 0; i
< s
->ignored
.nr
; i
++) {
1811 struct string_list_item
*it
;
1813 it
= &(s
->ignored
.items
[i
]);
1814 wt_shortstatus_other(it
, s
, "!!");
1818 static void wt_porcelain_print(struct wt_status
*s
)
1821 s
->relative_paths
= 0;
1824 wt_shortstatus_print(s
);
1828 * Print branch information for porcelain v2 output. These lines
1829 * are printed when the '--branch' parameter is given.
1831 * # branch.oid <commit><eol>
1832 * # branch.head <head><eol>
1833 * [# branch.upstream <upstream><eol>
1834 * [# branch.ab +<ahead> -<behind><eol>]]
1836 * <commit> ::= the current commit hash or the the literal
1837 * "(initial)" to indicate an initialized repo
1840 * <head> ::= <branch_name> the current branch name or
1841 * "(detached)" literal when detached head or
1842 * "(unknown)" when something is wrong.
1844 * <upstream> ::= the upstream branch name, when set.
1846 * <ahead> ::= integer ahead value, when upstream set
1847 * and the commit is present (not gone).
1849 * <behind> ::= integer behind value, when upstream set
1850 * and commit is present.
1853 * The end-of-line is defined by the -z flag.
1855 * <eol> ::= NUL when -z,
1859 static void wt_porcelain_v2_print_tracking(struct wt_status
*s
)
1861 struct branch
*branch
;
1863 const char *branch_name
;
1864 struct wt_status_state state
;
1865 int ab_info
, nr_ahead
, nr_behind
;
1866 char eol
= s
->null_termination
? '\0' : '\n';
1868 memset(&state
, 0, sizeof(state
));
1869 wt_status_get_state(&state
, s
->branch
&& !strcmp(s
->branch
, "HEAD"));
1871 fprintf(s
->fp
, "# branch.oid %s%c",
1872 (s
->is_initial
? "(initial)" : sha1_to_hex(s
->sha1_commit
)),
1876 fprintf(s
->fp
, "# branch.head %s%c", "(unknown)", eol
);
1878 if (!strcmp(s
->branch
, "HEAD")) {
1879 fprintf(s
->fp
, "# branch.head %s%c", "(detached)", eol
);
1881 if (state
.rebase_in_progress
|| state
.rebase_interactive_in_progress
)
1882 branch_name
= state
.onto
;
1883 else if (state
.detached_from
)
1884 branch_name
= state
.detached_from
;
1889 skip_prefix(s
->branch
, "refs/heads/", &branch_name
);
1891 fprintf(s
->fp
, "# branch.head %s%c", branch_name
, eol
);
1894 /* Lookup stats on the upstream tracking branch, if set. */
1895 branch
= branch_get(branch_name
);
1897 ab_info
= (stat_tracking_info(branch
, &nr_ahead
, &nr_behind
, &base
) == 0);
1899 base
= shorten_unambiguous_ref(base
, 0);
1900 fprintf(s
->fp
, "# branch.upstream %s%c", base
, eol
);
1904 fprintf(s
->fp
, "# branch.ab +%d -%d%c", nr_ahead
, nr_behind
, eol
);
1910 free(state
.detached_from
);
1914 * Convert various submodule status values into a
1915 * fixed-length string of characters in the buffer provided.
1917 static void wt_porcelain_v2_submodule_state(
1918 struct wt_status_change_data
*d
,
1921 if (S_ISGITLINK(d
->mode_head
) ||
1922 S_ISGITLINK(d
->mode_index
) ||
1923 S_ISGITLINK(d
->mode_worktree
)) {
1925 sub
[1] = d
->new_submodule_commits
? 'C' : '.';
1926 sub
[2] = (d
->dirty_submodule
& DIRTY_SUBMODULE_MODIFIED
) ? 'M' : '.';
1927 sub
[3] = (d
->dirty_submodule
& DIRTY_SUBMODULE_UNTRACKED
) ? 'U' : '.';
1938 * Fix-up changed entries before we print them.
1940 static void wt_porcelain_v2_fix_up_changed(
1941 struct string_list_item
*it
,
1942 struct wt_status
*s
)
1944 struct wt_status_change_data
*d
= it
->util
;
1946 if (!d
->index_status
) {
1948 * This entry is unchanged in the index (relative to the head).
1949 * Therefore, the collect_updated_cb was never called for this
1950 * entry (during the head-vs-index scan) and so the head column
1951 * fields were never set.
1953 * We must have data for the index column (from the
1954 * index-vs-worktree scan (otherwise, this entry should not be
1955 * in the list of changes)).
1957 * Copy index column fields to the head column, so that our
1958 * output looks complete.
1960 assert(d
->mode_head
== 0);
1961 d
->mode_head
= d
->mode_index
;
1962 oidcpy(&d
->oid_head
, &d
->oid_index
);
1965 if (!d
->worktree_status
) {
1967 * This entry is unchanged in the worktree (relative to the index).
1968 * Therefore, the collect_changed_cb was never called for this entry
1969 * (during the index-vs-worktree scan) and so the worktree column
1970 * fields were never set.
1972 * We must have data for the index column (from the head-vs-index
1975 * Copy the index column fields to the worktree column so that
1976 * our output looks complete.
1978 * Note that we only have a mode field in the worktree column
1979 * because the scan code tries really hard to not have to compute it.
1981 assert(d
->mode_worktree
== 0);
1982 d
->mode_worktree
= d
->mode_index
;
1987 * Print porcelain v2 info for tracked entries with changes.
1989 static void wt_porcelain_v2_print_changed_entry(
1990 struct string_list_item
*it
,
1991 struct wt_status
*s
)
1993 struct wt_status_change_data
*d
= it
->util
;
1994 struct strbuf buf_index
= STRBUF_INIT
;
1995 struct strbuf buf_head
= STRBUF_INIT
;
1996 const char *path_index
= NULL
;
1997 const char *path_head
= NULL
;
1999 char submodule_token
[5];
2000 char sep_char
, eol_char
;
2002 wt_porcelain_v2_fix_up_changed(it
, s
);
2003 wt_porcelain_v2_submodule_state(d
, submodule_token
);
2005 key
[0] = d
->index_status
? d
->index_status
: '.';
2006 key
[1] = d
->worktree_status
? d
->worktree_status
: '.';
2009 if (s
->null_termination
) {
2011 * In -z mode, we DO NOT C-quote pathnames. Current path is ALWAYS first.
2012 * A single NUL character separates them.
2016 path_index
= it
->string
;
2017 path_head
= d
->head_path
;
2020 * Path(s) are C-quoted if necessary. Current path is ALWAYS first.
2021 * The source path is only present when necessary.
2022 * A single TAB separates them (because paths can contain spaces
2023 * which are not escaped and C-quoting does escape TAB characters).
2027 path_index
= quote_path(it
->string
, s
->prefix
, &buf_index
);
2029 path_head
= quote_path(d
->head_path
, s
->prefix
, &buf_head
);
2033 fprintf(s
->fp
, "2 %s %s %06o %06o %06o %s %s %c%d %s%c%s%c",
2034 key
, submodule_token
,
2035 d
->mode_head
, d
->mode_index
, d
->mode_worktree
,
2036 oid_to_hex(&d
->oid_head
), oid_to_hex(&d
->oid_index
),
2038 path_index
, sep_char
, path_head
, eol_char
);
2040 fprintf(s
->fp
, "1 %s %s %06o %06o %06o %s %s %s%c",
2041 key
, submodule_token
,
2042 d
->mode_head
, d
->mode_index
, d
->mode_worktree
,
2043 oid_to_hex(&d
->oid_head
), oid_to_hex(&d
->oid_index
),
2044 path_index
, eol_char
);
2046 strbuf_release(&buf_index
);
2047 strbuf_release(&buf_head
);
2051 * Print porcelain v2 status info for unmerged entries.
2053 static void wt_porcelain_v2_print_unmerged_entry(
2054 struct string_list_item
*it
,
2055 struct wt_status
*s
)
2057 struct wt_status_change_data
*d
= it
->util
;
2058 const struct cache_entry
*ce
;
2059 struct strbuf buf_index
= STRBUF_INIT
;
2060 const char *path_index
= NULL
;
2061 int pos
, stage
, sum
;
2064 struct object_id oid
;
2067 char submodule_token
[5];
2068 char unmerged_prefix
= 'u';
2069 char eol_char
= s
->null_termination
? '\0' : '\n';
2071 wt_porcelain_v2_submodule_state(d
, submodule_token
);
2073 switch (d
->stagemask
) {
2074 case 1: key
= "DD"; break; /* both deleted */
2075 case 2: key
= "AU"; break; /* added by us */
2076 case 3: key
= "UD"; break; /* deleted by them */
2077 case 4: key
= "UA"; break; /* added by them */
2078 case 5: key
= "DU"; break; /* deleted by us */
2079 case 6: key
= "AA"; break; /* both added */
2080 case 7: key
= "UU"; break; /* both modified */
2082 die("BUG: unhandled unmerged status %x", d
->stagemask
);
2086 * Disregard d.aux.porcelain_v2 data that we accumulated
2087 * for the head and index columns during the scans and
2088 * replace with the actual stage data.
2090 * Note that this is a last-one-wins for each the individual
2091 * stage [123] columns in the event of multiple cache entries
2094 memset(stages
, 0, sizeof(stages
));
2096 pos
= cache_name_pos(it
->string
, strlen(it
->string
));
2099 while (pos
< active_nr
) {
2100 ce
= active_cache
[pos
++];
2101 stage
= ce_stage(ce
);
2102 if (strcmp(ce
->name
, it
->string
) || !stage
)
2104 stages
[stage
- 1].mode
= ce
->ce_mode
;
2105 oidcpy(&stages
[stage
- 1].oid
, &ce
->oid
);
2106 sum
|= (1 << (stage
- 1));
2108 if (sum
!= d
->stagemask
)
2109 die("BUG: observed stagemask 0x%x != expected stagemask 0x%x", sum
, d
->stagemask
);
2111 if (s
->null_termination
)
2112 path_index
= it
->string
;
2114 path_index
= quote_path(it
->string
, s
->prefix
, &buf_index
);
2116 fprintf(s
->fp
, "%c %s %s %06o %06o %06o %06o %s %s %s %s%c",
2117 unmerged_prefix
, key
, submodule_token
,
2118 stages
[0].mode
, /* stage 1 */
2119 stages
[1].mode
, /* stage 2 */
2120 stages
[2].mode
, /* stage 3 */
2122 oid_to_hex(&stages
[0].oid
), /* stage 1 */
2123 oid_to_hex(&stages
[1].oid
), /* stage 2 */
2124 oid_to_hex(&stages
[2].oid
), /* stage 3 */
2128 strbuf_release(&buf_index
);
2132 * Print porcelain V2 status info for untracked and ignored entries.
2134 static void wt_porcelain_v2_print_other(
2135 struct string_list_item
*it
,
2136 struct wt_status
*s
,
2139 struct strbuf buf
= STRBUF_INIT
;
2143 if (s
->null_termination
) {
2147 path
= quote_path(it
->string
, s
->prefix
, &buf
);
2151 fprintf(s
->fp
, "%c %s%c", prefix
, path
, eol_char
);
2153 strbuf_release(&buf
);
2157 * Print porcelain V2 status.
2160 * [<v2_changed_items>]*
2161 * [<v2_unmerged_items>]*
2162 * [<v2_untracked_items>]*
2163 * [<v2_ignored_items>]*
2166 static void wt_porcelain_v2_print(struct wt_status
*s
)
2168 struct wt_status_change_data
*d
;
2169 struct string_list_item
*it
;
2173 wt_porcelain_v2_print_tracking(s
);
2175 for (i
= 0; i
< s
->change
.nr
; i
++) {
2176 it
= &(s
->change
.items
[i
]);
2179 wt_porcelain_v2_print_changed_entry(it
, s
);
2182 for (i
= 0; i
< s
->change
.nr
; i
++) {
2183 it
= &(s
->change
.items
[i
]);
2186 wt_porcelain_v2_print_unmerged_entry(it
, s
);
2189 for (i
= 0; i
< s
->untracked
.nr
; i
++) {
2190 it
= &(s
->untracked
.items
[i
]);
2191 wt_porcelain_v2_print_other(it
, s
, '?');
2194 for (i
= 0; i
< s
->ignored
.nr
; i
++) {
2195 it
= &(s
->ignored
.items
[i
]);
2196 wt_porcelain_v2_print_other(it
, s
, '!');
2200 void wt_status_print(struct wt_status
*s
)
2202 switch (s
->status_format
) {
2203 case STATUS_FORMAT_SHORT
:
2204 wt_shortstatus_print(s
);
2206 case STATUS_FORMAT_PORCELAIN
:
2207 wt_porcelain_print(s
);
2209 case STATUS_FORMAT_PORCELAIN_V2
:
2210 wt_porcelain_v2_print(s
);
2212 case STATUS_FORMAT_UNSPECIFIED
:
2213 die("BUG: finalize_deferred_config() should have been called");
2215 case STATUS_FORMAT_NONE
:
2216 case STATUS_FORMAT_LONG
:
2217 wt_longstatus_print(s
);
2223 * Returns 1 if there are unstaged changes, 0 otherwise.
2225 int has_unstaged_changes(int ignore_submodules
)
2227 struct rev_info rev_info
;
2230 init_revisions(&rev_info
, NULL
);
2231 if (ignore_submodules
)
2232 DIFF_OPT_SET(&rev_info
.diffopt
, IGNORE_SUBMODULES
);
2233 DIFF_OPT_SET(&rev_info
.diffopt
, QUICK
);
2234 diff_setup_done(&rev_info
.diffopt
);
2235 result
= run_diff_files(&rev_info
, 0);
2236 return diff_result_code(&rev_info
.diffopt
, result
);
2240 * Returns 1 if there are uncommitted changes, 0 otherwise.
2242 int has_uncommitted_changes(int ignore_submodules
)
2244 struct rev_info rev_info
;
2247 if (is_cache_unborn())
2250 init_revisions(&rev_info
, NULL
);
2251 if (ignore_submodules
)
2252 DIFF_OPT_SET(&rev_info
.diffopt
, IGNORE_SUBMODULES
);
2253 DIFF_OPT_SET(&rev_info
.diffopt
, QUICK
);
2254 add_head_to_pending(&rev_info
);
2255 diff_setup_done(&rev_info
.diffopt
);
2256 result
= run_diff_index(&rev_info
, 1);
2257 return diff_result_code(&rev_info
.diffopt
, result
);
2261 * If the work tree has unstaged or uncommitted changes, dies with the
2262 * appropriate message.
2264 int require_clean_work_tree(const char *action
, const char *hint
, int ignore_submodules
, int gently
)
2266 struct lock_file
*lock_file
= xcalloc(1, sizeof(*lock_file
));
2269 fd
= hold_locked_index(lock_file
, 0);
2270 refresh_cache(REFRESH_QUIET
);
2272 update_index_if_able(&the_index
, lock_file
);
2273 rollback_lock_file(lock_file
);
2275 if (has_unstaged_changes(ignore_submodules
)) {
2276 /* TRANSLATORS: the action is e.g. "pull with rebase" */
2277 error(_("cannot %s: You have unstaged changes."), _(action
));
2281 if (has_uncommitted_changes(ignore_submodules
)) {
2283 error(_("additionally, your index contains uncommitted changes."));
2285 error(_("cannot %s: Your index contains uncommitted changes."),