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
)
412 if (d
->new_submodule_commits
)
414 if (d
->dirty_submodule
& DIRTY_SUBMODULE_MODIFIED
)
416 if (d
->dirty_submodule
& DIRTY_SUBMODULE_UNTRACKED
)
418 return d
->worktree_status
;
421 static void wt_status_collect_changed_cb(struct diff_queue_struct
*q
,
422 struct diff_options
*options
,
425 struct wt_status
*s
= data
;
430 s
->workdir_dirty
= 1;
431 for (i
= 0; i
< q
->nr
; i
++) {
432 struct diff_filepair
*p
;
433 struct string_list_item
*it
;
434 struct wt_status_change_data
*d
;
437 it
= string_list_insert(&s
->change
, p
->one
->path
);
440 d
= xcalloc(1, sizeof(*d
));
443 if (!d
->worktree_status
)
444 d
->worktree_status
= p
->status
;
445 if (S_ISGITLINK(p
->two
->mode
)) {
446 d
->dirty_submodule
= p
->two
->dirty_submodule
;
447 d
->new_submodule_commits
= !!oidcmp(&p
->one
->oid
,
449 if (s
->status_format
== STATUS_FORMAT_SHORT
)
450 d
->worktree_status
= short_submodule_status(d
);
454 case DIFF_STATUS_ADDED
:
455 d
->mode_worktree
= p
->two
->mode
;
458 case DIFF_STATUS_DELETED
:
459 d
->mode_index
= p
->one
->mode
;
460 oidcpy(&d
->oid_index
, &p
->one
->oid
);
461 /* mode_worktree is zero for a delete. */
464 case DIFF_STATUS_MODIFIED
:
465 case DIFF_STATUS_TYPE_CHANGED
:
466 case DIFF_STATUS_UNMERGED
:
467 d
->mode_index
= p
->one
->mode
;
468 d
->mode_worktree
= p
->two
->mode
;
469 oidcpy(&d
->oid_index
, &p
->one
->oid
);
472 case DIFF_STATUS_UNKNOWN
:
473 die("BUG: worktree status unknown???");
480 static int unmerged_mask(const char *path
)
483 const struct cache_entry
*ce
;
485 pos
= cache_name_pos(path
, strlen(path
));
491 while (pos
< active_nr
) {
492 ce
= active_cache
[pos
++];
493 if (strcmp(ce
->name
, path
) || !ce_stage(ce
))
495 mask
|= (1 << (ce_stage(ce
) - 1));
500 static void wt_status_collect_updated_cb(struct diff_queue_struct
*q
,
501 struct diff_options
*options
,
504 struct wt_status
*s
= data
;
507 for (i
= 0; i
< q
->nr
; i
++) {
508 struct diff_filepair
*p
;
509 struct string_list_item
*it
;
510 struct wt_status_change_data
*d
;
513 it
= string_list_insert(&s
->change
, p
->two
->path
);
516 d
= xcalloc(1, sizeof(*d
));
519 if (!d
->index_status
)
520 d
->index_status
= p
->status
;
522 case DIFF_STATUS_ADDED
:
523 /* Leave {mode,oid}_head zero for an add. */
524 d
->mode_index
= p
->two
->mode
;
525 oidcpy(&d
->oid_index
, &p
->two
->oid
);
527 case DIFF_STATUS_DELETED
:
528 d
->mode_head
= p
->one
->mode
;
529 oidcpy(&d
->oid_head
, &p
->one
->oid
);
530 /* Leave {mode,oid}_index zero for a delete. */
533 case DIFF_STATUS_COPIED
:
534 case DIFF_STATUS_RENAMED
:
535 d
->head_path
= xstrdup(p
->one
->path
);
536 d
->score
= p
->score
* 100 / MAX_SCORE
;
538 case DIFF_STATUS_MODIFIED
:
539 case DIFF_STATUS_TYPE_CHANGED
:
540 d
->mode_head
= p
->one
->mode
;
541 d
->mode_index
= p
->two
->mode
;
542 oidcpy(&d
->oid_head
, &p
->one
->oid
);
543 oidcpy(&d
->oid_index
, &p
->two
->oid
);
545 case DIFF_STATUS_UNMERGED
:
546 d
->stagemask
= unmerged_mask(p
->two
->path
);
548 * Don't bother setting {mode,oid}_{head,index} since the print
549 * code will output the stage values directly and not use the
550 * values in these fields.
557 static void wt_status_collect_changes_worktree(struct wt_status
*s
)
561 init_revisions(&rev
, NULL
);
562 setup_revisions(0, NULL
, &rev
, NULL
);
563 rev
.diffopt
.output_format
|= DIFF_FORMAT_CALLBACK
;
564 DIFF_OPT_SET(&rev
.diffopt
, DIRTY_SUBMODULES
);
565 rev
.diffopt
.ita_invisible_in_index
= 1;
566 if (!s
->show_untracked_files
)
567 DIFF_OPT_SET(&rev
.diffopt
, IGNORE_UNTRACKED_IN_SUBMODULES
);
568 if (s
->ignore_submodule_arg
) {
569 DIFF_OPT_SET(&rev
.diffopt
, OVERRIDE_SUBMODULE_CONFIG
);
570 handle_ignore_submodules_arg(&rev
.diffopt
, s
->ignore_submodule_arg
);
572 rev
.diffopt
.format_callback
= wt_status_collect_changed_cb
;
573 rev
.diffopt
.format_callback_data
= s
;
574 copy_pathspec(&rev
.prune_data
, &s
->pathspec
);
575 run_diff_files(&rev
, 0);
578 static void wt_status_collect_changes_index(struct wt_status
*s
)
581 struct setup_revision_opt opt
;
583 init_revisions(&rev
, NULL
);
584 memset(&opt
, 0, sizeof(opt
));
585 opt
.def
= s
->is_initial
? EMPTY_TREE_SHA1_HEX
: s
->reference
;
586 setup_revisions(0, NULL
, &rev
, &opt
);
588 DIFF_OPT_SET(&rev
.diffopt
, OVERRIDE_SUBMODULE_CONFIG
);
589 rev
.diffopt
.ita_invisible_in_index
= 1;
590 if (s
->ignore_submodule_arg
) {
591 handle_ignore_submodules_arg(&rev
.diffopt
, s
->ignore_submodule_arg
);
594 * Unless the user did explicitly request a submodule ignore
595 * mode by passing a command line option we do not ignore any
596 * changed submodule SHA-1s when comparing index and HEAD, no
597 * matter what is configured. Otherwise the user won't be
598 * shown any submodules she manually added (and which are
599 * staged to be committed), which would be really confusing.
601 handle_ignore_submodules_arg(&rev
.diffopt
, "dirty");
604 rev
.diffopt
.output_format
|= DIFF_FORMAT_CALLBACK
;
605 rev
.diffopt
.format_callback
= wt_status_collect_updated_cb
;
606 rev
.diffopt
.format_callback_data
= s
;
607 rev
.diffopt
.detect_rename
= DIFF_DETECT_RENAME
;
608 rev
.diffopt
.rename_limit
= 200;
609 rev
.diffopt
.break_opt
= 0;
610 copy_pathspec(&rev
.prune_data
, &s
->pathspec
);
611 run_diff_index(&rev
, 1);
614 static void wt_status_collect_changes_initial(struct wt_status
*s
)
618 for (i
= 0; i
< active_nr
; i
++) {
619 struct string_list_item
*it
;
620 struct wt_status_change_data
*d
;
621 const struct cache_entry
*ce
= active_cache
[i
];
623 if (!ce_path_match(ce
, &s
->pathspec
, NULL
))
625 if (ce_intent_to_add(ce
))
627 it
= string_list_insert(&s
->change
, ce
->name
);
630 d
= xcalloc(1, sizeof(*d
));
634 d
->index_status
= DIFF_STATUS_UNMERGED
;
635 d
->stagemask
|= (1 << (ce_stage(ce
) - 1));
637 * Don't bother setting {mode,oid}_{head,index} since the print
638 * code will output the stage values directly and not use the
639 * values in these fields.
642 d
->index_status
= DIFF_STATUS_ADDED
;
643 /* Leave {mode,oid}_head zero for adds. */
644 d
->mode_index
= ce
->ce_mode
;
645 oidcpy(&d
->oid_index
, &ce
->oid
);
650 static void wt_status_collect_untracked(struct wt_status
*s
)
653 struct dir_struct dir
;
654 uint64_t t_begin
= getnanotime();
656 if (!s
->show_untracked_files
)
659 memset(&dir
, 0, sizeof(dir
));
660 if (s
->show_untracked_files
!= SHOW_ALL_UNTRACKED_FILES
)
662 DIR_SHOW_OTHER_DIRECTORIES
| DIR_HIDE_EMPTY_DIRECTORIES
;
663 if (s
->show_ignored_files
)
664 dir
.flags
|= DIR_SHOW_IGNORED_TOO
;
666 dir
.untracked
= the_index
.untracked
;
667 setup_standard_excludes(&dir
);
669 fill_directory(&dir
, &s
->pathspec
);
671 for (i
= 0; i
< dir
.nr
; i
++) {
672 struct dir_entry
*ent
= dir
.entries
[i
];
673 if (cache_name_is_other(ent
->name
, ent
->len
) &&
674 dir_path_match(ent
, &s
->pathspec
, 0, NULL
))
675 string_list_insert(&s
->untracked
, ent
->name
);
679 for (i
= 0; i
< dir
.ignored_nr
; i
++) {
680 struct dir_entry
*ent
= dir
.ignored
[i
];
681 if (cache_name_is_other(ent
->name
, ent
->len
) &&
682 dir_path_match(ent
, &s
->pathspec
, 0, NULL
))
683 string_list_insert(&s
->ignored
, ent
->name
);
689 clear_directory(&dir
);
691 if (advice_status_u_option
)
692 s
->untracked_in_ms
= (getnanotime() - t_begin
) / 1000000;
695 void wt_status_collect(struct wt_status
*s
)
697 wt_status_collect_changes_worktree(s
);
700 wt_status_collect_changes_initial(s
);
702 wt_status_collect_changes_index(s
);
703 wt_status_collect_untracked(s
);
706 static void wt_longstatus_print_unmerged(struct wt_status
*s
)
708 int shown_header
= 0;
711 for (i
= 0; i
< s
->change
.nr
; i
++) {
712 struct wt_status_change_data
*d
;
713 struct string_list_item
*it
;
714 it
= &(s
->change
.items
[i
]);
719 wt_longstatus_print_unmerged_header(s
);
722 wt_longstatus_print_unmerged_data(s
, it
);
725 wt_longstatus_print_trailer(s
);
729 static void wt_longstatus_print_updated(struct wt_status
*s
)
731 int shown_header
= 0;
734 for (i
= 0; i
< s
->change
.nr
; i
++) {
735 struct wt_status_change_data
*d
;
736 struct string_list_item
*it
;
737 it
= &(s
->change
.items
[i
]);
739 if (!d
->index_status
||
740 d
->index_status
== DIFF_STATUS_UNMERGED
)
743 wt_longstatus_print_cached_header(s
);
747 wt_longstatus_print_change_data(s
, WT_STATUS_UPDATED
, it
);
750 wt_longstatus_print_trailer(s
);
756 * 1 : some change but no delete
758 static int wt_status_check_worktree_changes(struct wt_status
*s
,
759 int *dirty_submodules
)
764 *dirty_submodules
= 0;
766 for (i
= 0; i
< s
->change
.nr
; i
++) {
767 struct wt_status_change_data
*d
;
768 d
= s
->change
.items
[i
].util
;
769 if (!d
->worktree_status
||
770 d
->worktree_status
== DIFF_STATUS_UNMERGED
)
774 if (d
->dirty_submodule
)
775 *dirty_submodules
= 1;
776 if (d
->worktree_status
== DIFF_STATUS_DELETED
)
782 static void wt_longstatus_print_changed(struct wt_status
*s
)
784 int i
, dirty_submodules
;
785 int worktree_changes
= wt_status_check_worktree_changes(s
, &dirty_submodules
);
787 if (!worktree_changes
)
790 wt_longstatus_print_dirty_header(s
, worktree_changes
< 0, dirty_submodules
);
792 for (i
= 0; i
< s
->change
.nr
; i
++) {
793 struct wt_status_change_data
*d
;
794 struct string_list_item
*it
;
795 it
= &(s
->change
.items
[i
]);
797 if (!d
->worktree_status
||
798 d
->worktree_status
== DIFF_STATUS_UNMERGED
)
800 wt_longstatus_print_change_data(s
, WT_STATUS_CHANGED
, it
);
802 wt_longstatus_print_trailer(s
);
805 static void wt_longstatus_print_submodule_summary(struct wt_status
*s
, int uncommitted
)
807 struct child_process sm_summary
= CHILD_PROCESS_INIT
;
808 struct strbuf cmd_stdout
= STRBUF_INIT
;
809 struct strbuf summary
= STRBUF_INIT
;
810 char *summary_content
;
812 argv_array_pushf(&sm_summary
.env_array
, "GIT_INDEX_FILE=%s",
815 argv_array_push(&sm_summary
.args
, "submodule");
816 argv_array_push(&sm_summary
.args
, "summary");
817 argv_array_push(&sm_summary
.args
, uncommitted
? "--files" : "--cached");
818 argv_array_push(&sm_summary
.args
, "--for-status");
819 argv_array_push(&sm_summary
.args
, "--summary-limit");
820 argv_array_pushf(&sm_summary
.args
, "%d", s
->submodule_summary
);
822 argv_array_push(&sm_summary
.args
, s
->amend
? "HEAD^" : "HEAD");
824 sm_summary
.git_cmd
= 1;
825 sm_summary
.no_stdin
= 1;
827 capture_command(&sm_summary
, &cmd_stdout
, 1024);
829 /* prepend header, only if there's an actual output */
830 if (cmd_stdout
.len
) {
832 strbuf_addstr(&summary
, _("Submodules changed but not updated:"));
834 strbuf_addstr(&summary
, _("Submodule changes to be committed:"));
835 strbuf_addstr(&summary
, "\n\n");
837 strbuf_addbuf(&summary
, &cmd_stdout
);
838 strbuf_release(&cmd_stdout
);
840 if (s
->display_comment_prefix
) {
842 summary_content
= strbuf_detach(&summary
, &len
);
843 strbuf_add_commented_lines(&summary
, summary_content
, len
);
844 free(summary_content
);
847 fputs(summary
.buf
, s
->fp
);
848 strbuf_release(&summary
);
851 static void wt_longstatus_print_other(struct wt_status
*s
,
852 struct string_list
*l
,
857 struct strbuf buf
= STRBUF_INIT
;
858 static struct string_list output
= STRING_LIST_INIT_DUP
;
859 struct column_options copts
;
864 wt_longstatus_print_other_header(s
, what
, how
);
866 for (i
= 0; i
< l
->nr
; i
++) {
867 struct string_list_item
*it
;
870 path
= quote_path(it
->string
, s
->prefix
, &buf
);
871 if (column_active(s
->colopts
)) {
872 string_list_append(&output
, path
);
875 status_printf(s
, color(WT_STATUS_HEADER
, s
), "\t");
876 status_printf_more(s
, color(WT_STATUS_UNTRACKED
, s
),
880 strbuf_release(&buf
);
881 if (!column_active(s
->colopts
))
884 strbuf_addf(&buf
, "%s%s\t%s",
885 color(WT_STATUS_HEADER
, s
),
886 s
->display_comment_prefix
? "#" : "",
887 color(WT_STATUS_UNTRACKED
, s
));
888 memset(&copts
, 0, sizeof(copts
));
890 copts
.indent
= buf
.buf
;
891 if (want_color(s
->use_color
))
892 copts
.nl
= GIT_COLOR_RESET
"\n";
893 print_columns(&output
, s
->colopts
, &copts
);
894 string_list_clear(&output
, 0);
895 strbuf_release(&buf
);
897 status_printf_ln(s
, GIT_COLOR_NORMAL
, "%s", "");
900 size_t wt_status_locate_end(const char *s
, size_t len
)
903 struct strbuf pattern
= STRBUF_INIT
;
905 strbuf_addf(&pattern
, "\n%c %s", comment_line_char
, cut_line
);
906 if (starts_with(s
, pattern
.buf
+ 1))
908 else if ((p
= strstr(s
, pattern
.buf
)))
910 strbuf_release(&pattern
);
914 void wt_status_add_cut_line(FILE *fp
)
916 const char *explanation
= _("Do not touch the line above.\nEverything below will be removed.");
917 struct strbuf buf
= STRBUF_INIT
;
919 fprintf(fp
, "%c %s", comment_line_char
, cut_line
);
920 strbuf_add_commented_lines(&buf
, explanation
, strlen(explanation
));
922 strbuf_release(&buf
);
925 static void wt_longstatus_print_verbose(struct wt_status
*s
)
928 struct setup_revision_opt opt
;
929 int dirty_submodules
;
930 const char *c
= color(WT_STATUS_HEADER
, s
);
932 init_revisions(&rev
, NULL
);
933 DIFF_OPT_SET(&rev
.diffopt
, ALLOW_TEXTCONV
);
934 rev
.diffopt
.ita_invisible_in_index
= 1;
936 memset(&opt
, 0, sizeof(opt
));
937 opt
.def
= s
->is_initial
? EMPTY_TREE_SHA1_HEX
: s
->reference
;
938 setup_revisions(0, NULL
, &rev
, &opt
);
940 rev
.diffopt
.output_format
|= DIFF_FORMAT_PATCH
;
941 rev
.diffopt
.detect_rename
= DIFF_DETECT_RENAME
;
942 rev
.diffopt
.file
= s
->fp
;
943 rev
.diffopt
.close_file
= 0;
945 * If we're not going to stdout, then we definitely don't
946 * want color, since we are going to the commit message
947 * file (and even the "auto" setting won't work, since it
948 * will have checked isatty on stdout). But we then do want
949 * to insert the scissor line here to reliably remove the
950 * diff before committing.
952 if (s
->fp
!= stdout
) {
953 rev
.diffopt
.use_color
= 0;
954 wt_status_add_cut_line(s
->fp
);
956 if (s
->verbose
> 1 && s
->commitable
) {
957 /* print_updated() printed a header, so do we */
959 wt_longstatus_print_trailer(s
);
960 status_printf_ln(s
, c
, _("Changes to be committed:"));
961 rev
.diffopt
.a_prefix
= "c/";
962 rev
.diffopt
.b_prefix
= "i/";
963 } /* else use prefix as per user config */
964 run_diff_index(&rev
, 1);
965 if (s
->verbose
> 1 &&
966 wt_status_check_worktree_changes(s
, &dirty_submodules
)) {
967 status_printf_ln(s
, c
,
968 "--------------------------------------------------");
969 status_printf_ln(s
, c
, _("Changes not staged for commit:"));
971 rev
.diffopt
.a_prefix
= "i/";
972 rev
.diffopt
.b_prefix
= "w/";
973 run_diff_files(&rev
, 0);
977 static void wt_longstatus_print_tracking(struct wt_status
*s
)
979 struct strbuf sb
= STRBUF_INIT
;
980 const char *cp
, *ep
, *branch_name
;
981 struct branch
*branch
;
982 char comment_line_string
[3];
985 assert(s
->branch
&& !s
->is_initial
);
986 if (!skip_prefix(s
->branch
, "refs/heads/", &branch_name
))
988 branch
= branch_get(branch_name
);
989 if (!format_tracking_info(branch
, &sb
))
993 if (s
->display_comment_prefix
) {
994 comment_line_string
[i
++] = comment_line_char
;
995 comment_line_string
[i
++] = ' ';
997 comment_line_string
[i
] = '\0';
999 for (cp
= sb
.buf
; (ep
= strchr(cp
, '\n')) != NULL
; cp
= ep
+ 1)
1000 color_fprintf_ln(s
->fp
, color(WT_STATUS_HEADER
, s
),
1001 "%s%.*s", comment_line_string
,
1002 (int)(ep
- cp
), cp
);
1003 if (s
->display_comment_prefix
)
1004 color_fprintf_ln(s
->fp
, color(WT_STATUS_HEADER
, s
), "%c",
1010 static int has_unmerged(struct wt_status
*s
)
1014 for (i
= 0; i
< s
->change
.nr
; i
++) {
1015 struct wt_status_change_data
*d
;
1016 d
= s
->change
.items
[i
].util
;
1023 static void show_merge_in_progress(struct wt_status
*s
,
1024 struct wt_status_state
*state
,
1027 if (has_unmerged(s
)) {
1028 status_printf_ln(s
, color
, _("You have unmerged paths."));
1030 status_printf_ln(s
, color
,
1031 _(" (fix conflicts and run \"git commit\")"));
1032 status_printf_ln(s
, color
,
1033 _(" (use \"git merge --abort\" to abort the merge)"));
1037 status_printf_ln(s
, color
,
1038 _("All conflicts fixed but you are still merging."));
1040 status_printf_ln(s
, color
,
1041 _(" (use \"git commit\" to conclude merge)"));
1043 wt_longstatus_print_trailer(s
);
1046 static void show_am_in_progress(struct wt_status
*s
,
1047 struct wt_status_state
*state
,
1050 status_printf_ln(s
, color
,
1051 _("You are in the middle of an am session."));
1052 if (state
->am_empty_patch
)
1053 status_printf_ln(s
, color
,
1054 _("The current patch is empty."));
1056 if (!state
->am_empty_patch
)
1057 status_printf_ln(s
, color
,
1058 _(" (fix conflicts and then run \"git am --continue\")"));
1059 status_printf_ln(s
, color
,
1060 _(" (use \"git am --skip\" to skip this patch)"));
1061 status_printf_ln(s
, color
,
1062 _(" (use \"git am --abort\" to restore the original branch)"));
1064 wt_longstatus_print_trailer(s
);
1067 static char *read_line_from_git_path(const char *filename
)
1069 struct strbuf buf
= STRBUF_INIT
;
1070 FILE *fp
= fopen(git_path("%s", filename
), "r");
1072 strbuf_release(&buf
);
1075 strbuf_getline_lf(&buf
, fp
);
1077 return strbuf_detach(&buf
, NULL
);
1079 strbuf_release(&buf
);
1084 static int split_commit_in_progress(struct wt_status
*s
)
1086 int split_in_progress
= 0;
1087 char *head
, *orig_head
, *rebase_amend
, *rebase_orig_head
;
1089 if ((!s
->amend
&& !s
->nowarn
&& !s
->workdir_dirty
) ||
1090 !s
->branch
|| strcmp(s
->branch
, "HEAD"))
1093 head
= read_line_from_git_path("HEAD");
1094 orig_head
= read_line_from_git_path("ORIG_HEAD");
1095 rebase_amend
= read_line_from_git_path("rebase-merge/amend");
1096 rebase_orig_head
= read_line_from_git_path("rebase-merge/orig-head");
1098 if (!head
|| !orig_head
|| !rebase_amend
|| !rebase_orig_head
)
1099 ; /* fall through, no split in progress */
1100 else if (!strcmp(rebase_amend
, rebase_orig_head
))
1101 split_in_progress
= !!strcmp(head
, rebase_amend
);
1102 else if (strcmp(orig_head
, rebase_orig_head
))
1103 split_in_progress
= 1;
1108 free(rebase_orig_head
);
1110 return split_in_progress
;
1115 * "pick d6a2f0303e897ec257dd0e0a39a5ccb709bc2047 some message"
1117 * "pick d6a2f03 some message"
1119 * The function assumes that the line does not contain useless spaces
1120 * before or after the command.
1122 static void abbrev_sha1_in_line(struct strbuf
*line
)
1124 struct strbuf
**split
;
1127 if (starts_with(line
->buf
, "exec ") ||
1128 starts_with(line
->buf
, "x "))
1131 split
= strbuf_split_max(line
, ' ', 3);
1132 if (split
[0] && split
[1]) {
1133 struct object_id oid
;
1136 * strbuf_split_max left a space. Trim it and re-add
1137 * it after abbreviation.
1139 strbuf_trim(split
[1]);
1140 if (!get_oid(split
[1]->buf
, &oid
)) {
1141 strbuf_reset(split
[1]);
1142 strbuf_add_unique_abbrev(split
[1], oid
.hash
,
1144 strbuf_addch(split
[1], ' ');
1146 for (i
= 0; split
[i
]; i
++)
1147 strbuf_addbuf(line
, split
[i
]);
1150 strbuf_list_free(split
);
1153 static int read_rebase_todolist(const char *fname
, struct string_list
*lines
)
1155 struct strbuf line
= STRBUF_INIT
;
1156 FILE *f
= fopen(git_path("%s", fname
), "r");
1159 if (errno
== ENOENT
)
1161 die_errno("Could not open file %s for reading",
1162 git_path("%s", fname
));
1164 while (!strbuf_getline_lf(&line
, f
)) {
1165 if (line
.len
&& line
.buf
[0] == comment_line_char
)
1170 abbrev_sha1_in_line(&line
);
1171 string_list_append(lines
, line
.buf
);
1177 static void show_rebase_information(struct wt_status
*s
,
1178 struct wt_status_state
*state
,
1181 if (state
->rebase_interactive_in_progress
) {
1183 int nr_lines_to_show
= 2;
1185 struct string_list have_done
= STRING_LIST_INIT_DUP
;
1186 struct string_list yet_to_do
= STRING_LIST_INIT_DUP
;
1188 read_rebase_todolist("rebase-merge/done", &have_done
);
1189 if (read_rebase_todolist("rebase-merge/git-rebase-todo",
1191 status_printf_ln(s
, color
,
1192 _("git-rebase-todo is missing."));
1193 if (have_done
.nr
== 0)
1194 status_printf_ln(s
, color
, _("No commands done."));
1196 status_printf_ln(s
, color
,
1197 Q_("Last command done (%d command done):",
1198 "Last commands done (%d commands done):",
1201 for (i
= (have_done
.nr
> nr_lines_to_show
)
1202 ? have_done
.nr
- nr_lines_to_show
: 0;
1205 status_printf_ln(s
, color
, " %s", have_done
.items
[i
].string
);
1206 if (have_done
.nr
> nr_lines_to_show
&& s
->hints
)
1207 status_printf_ln(s
, color
,
1208 _(" (see more in file %s)"), git_path("rebase-merge/done"));
1211 if (yet_to_do
.nr
== 0)
1212 status_printf_ln(s
, color
,
1213 _("No commands remaining."));
1215 status_printf_ln(s
, color
,
1216 Q_("Next command to do (%d remaining command):",
1217 "Next commands to do (%d remaining commands):",
1220 for (i
= 0; i
< nr_lines_to_show
&& i
< yet_to_do
.nr
; i
++)
1221 status_printf_ln(s
, color
, " %s", yet_to_do
.items
[i
].string
);
1223 status_printf_ln(s
, color
,
1224 _(" (use \"git rebase --edit-todo\" to view and edit)"));
1226 string_list_clear(&yet_to_do
, 0);
1227 string_list_clear(&have_done
, 0);
1231 static void print_rebase_state(struct wt_status
*s
,
1232 struct wt_status_state
*state
,
1236 status_printf_ln(s
, color
,
1237 _("You are currently rebasing branch '%s' on '%s'."),
1241 status_printf_ln(s
, color
,
1242 _("You are currently rebasing."));
1245 static void show_rebase_in_progress(struct wt_status
*s
,
1246 struct wt_status_state
*state
,
1251 show_rebase_information(s
, state
, color
);
1252 if (has_unmerged(s
)) {
1253 print_rebase_state(s
, state
, color
);
1255 status_printf_ln(s
, color
,
1256 _(" (fix conflicts and then run \"git rebase --continue\")"));
1257 status_printf_ln(s
, color
,
1258 _(" (use \"git rebase --skip\" to skip this patch)"));
1259 status_printf_ln(s
, color
,
1260 _(" (use \"git rebase --abort\" to check out the original branch)"));
1262 } else if (state
->rebase_in_progress
|| !stat(git_path_merge_msg(), &st
)) {
1263 print_rebase_state(s
, state
, color
);
1265 status_printf_ln(s
, color
,
1266 _(" (all conflicts fixed: run \"git rebase --continue\")"));
1267 } else if (split_commit_in_progress(s
)) {
1269 status_printf_ln(s
, color
,
1270 _("You are currently splitting a commit while rebasing branch '%s' on '%s'."),
1274 status_printf_ln(s
, color
,
1275 _("You are currently splitting a commit during a rebase."));
1277 status_printf_ln(s
, color
,
1278 _(" (Once your working directory is clean, run \"git rebase --continue\")"));
1281 status_printf_ln(s
, color
,
1282 _("You are currently editing a commit while rebasing branch '%s' on '%s'."),
1286 status_printf_ln(s
, color
,
1287 _("You are currently editing a commit during a rebase."));
1288 if (s
->hints
&& !s
->amend
) {
1289 status_printf_ln(s
, color
,
1290 _(" (use \"git commit --amend\" to amend the current commit)"));
1291 status_printf_ln(s
, color
,
1292 _(" (use \"git rebase --continue\" once you are satisfied with your changes)"));
1295 wt_longstatus_print_trailer(s
);
1298 static void show_cherry_pick_in_progress(struct wt_status
*s
,
1299 struct wt_status_state
*state
,
1302 status_printf_ln(s
, color
, _("You are currently cherry-picking commit %s."),
1303 find_unique_abbrev(state
->cherry_pick_head_sha1
, DEFAULT_ABBREV
));
1305 if (has_unmerged(s
))
1306 status_printf_ln(s
, color
,
1307 _(" (fix conflicts and run \"git cherry-pick --continue\")"));
1309 status_printf_ln(s
, color
,
1310 _(" (all conflicts fixed: run \"git cherry-pick --continue\")"));
1311 status_printf_ln(s
, color
,
1312 _(" (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"));
1314 wt_longstatus_print_trailer(s
);
1317 static void show_revert_in_progress(struct wt_status
*s
,
1318 struct wt_status_state
*state
,
1321 status_printf_ln(s
, color
, _("You are currently reverting commit %s."),
1322 find_unique_abbrev(state
->revert_head_sha1
, DEFAULT_ABBREV
));
1324 if (has_unmerged(s
))
1325 status_printf_ln(s
, color
,
1326 _(" (fix conflicts and run \"git revert --continue\")"));
1328 status_printf_ln(s
, color
,
1329 _(" (all conflicts fixed: run \"git revert --continue\")"));
1330 status_printf_ln(s
, color
,
1331 _(" (use \"git revert --abort\" to cancel the revert operation)"));
1333 wt_longstatus_print_trailer(s
);
1336 static void show_bisect_in_progress(struct wt_status
*s
,
1337 struct wt_status_state
*state
,
1341 status_printf_ln(s
, color
,
1342 _("You are currently bisecting, started from branch '%s'."),
1345 status_printf_ln(s
, color
,
1346 _("You are currently bisecting."));
1348 status_printf_ln(s
, color
,
1349 _(" (use \"git bisect reset\" to get back to the original branch)"));
1350 wt_longstatus_print_trailer(s
);
1354 * Extract branch information from rebase/bisect
1356 static char *get_branch(const struct worktree
*wt
, const char *path
)
1358 struct strbuf sb
= STRBUF_INIT
;
1359 struct object_id oid
;
1360 const char *branch_name
;
1362 if (strbuf_read_file(&sb
, worktree_git_path(wt
, "%s", path
), 0) <= 0)
1365 while (sb
.len
&& sb
.buf
[sb
.len
- 1] == '\n')
1366 strbuf_setlen(&sb
, sb
.len
- 1);
1369 if (skip_prefix(sb
.buf
, "refs/heads/", &branch_name
))
1370 strbuf_remove(&sb
, 0, branch_name
- sb
.buf
);
1371 else if (starts_with(sb
.buf
, "refs/"))
1373 else if (!get_oid_hex(sb
.buf
, &oid
)) {
1375 strbuf_add_unique_abbrev(&sb
, oid
.hash
, DEFAULT_ABBREV
);
1376 } else if (!strcmp(sb
.buf
, "detached HEAD")) /* rebase */
1380 return strbuf_detach(&sb
, NULL
);
1383 strbuf_release(&sb
);
1387 struct grab_1st_switch_cbdata
{
1389 struct object_id noid
;
1392 static int grab_1st_switch(struct object_id
*ooid
, struct object_id
*noid
,
1393 const char *email
, unsigned long timestamp
, int tz
,
1394 const char *message
, void *cb_data
)
1396 struct grab_1st_switch_cbdata
*cb
= cb_data
;
1397 const char *target
= NULL
, *end
;
1399 if (!skip_prefix(message
, "checkout: moving from ", &message
))
1401 target
= strstr(message
, " to ");
1404 target
+= strlen(" to ");
1405 strbuf_reset(&cb
->buf
);
1406 oidcpy(&cb
->noid
, noid
);
1407 end
= strchrnul(target
, '\n');
1408 strbuf_add(&cb
->buf
, target
, end
- target
);
1409 if (!strcmp(cb
->buf
.buf
, "HEAD")) {
1410 /* HEAD is relative. Resolve it to the right reflog entry. */
1411 strbuf_reset(&cb
->buf
);
1412 strbuf_add_unique_abbrev(&cb
->buf
, noid
->hash
, DEFAULT_ABBREV
);
1417 static void wt_status_get_detached_from(struct wt_status_state
*state
)
1419 struct grab_1st_switch_cbdata cb
;
1420 struct commit
*commit
;
1421 struct object_id oid
;
1424 strbuf_init(&cb
.buf
, 0);
1425 if (for_each_reflog_ent_reverse("HEAD", grab_1st_switch
, &cb
) <= 0) {
1426 strbuf_release(&cb
.buf
);
1430 if (dwim_ref(cb
.buf
.buf
, cb
.buf
.len
, oid
.hash
, &ref
) == 1 &&
1431 /* sha1 is a commit? match without further lookup */
1432 (!oidcmp(&cb
.noid
, &oid
) ||
1433 /* perhaps sha1 is a tag, try to dereference to a commit */
1434 ((commit
= lookup_commit_reference_gently(oid
.hash
, 1)) != NULL
&&
1435 !oidcmp(&cb
.noid
, &commit
->object
.oid
)))) {
1436 const char *from
= ref
;
1437 if (!skip_prefix(from
, "refs/tags/", &from
))
1438 skip_prefix(from
, "refs/remotes/", &from
);
1439 state
->detached_from
= xstrdup(from
);
1441 state
->detached_from
=
1442 xstrdup(find_unique_abbrev(cb
.noid
.hash
, DEFAULT_ABBREV
));
1443 hashcpy(state
->detached_sha1
, cb
.noid
.hash
);
1444 state
->detached_at
= !get_oid("HEAD", &oid
) &&
1445 !hashcmp(oid
.hash
, state
->detached_sha1
);
1448 strbuf_release(&cb
.buf
);
1451 int wt_status_check_rebase(const struct worktree
*wt
,
1452 struct wt_status_state
*state
)
1456 if (!stat(worktree_git_path(wt
, "rebase-apply"), &st
)) {
1457 if (!stat(worktree_git_path(wt
, "rebase-apply/applying"), &st
)) {
1458 state
->am_in_progress
= 1;
1459 if (!stat(worktree_git_path(wt
, "rebase-apply/patch"), &st
) && !st
.st_size
)
1460 state
->am_empty_patch
= 1;
1462 state
->rebase_in_progress
= 1;
1463 state
->branch
= get_branch(wt
, "rebase-apply/head-name");
1464 state
->onto
= get_branch(wt
, "rebase-apply/onto");
1466 } else if (!stat(worktree_git_path(wt
, "rebase-merge"), &st
)) {
1467 if (!stat(worktree_git_path(wt
, "rebase-merge/interactive"), &st
))
1468 state
->rebase_interactive_in_progress
= 1;
1470 state
->rebase_in_progress
= 1;
1471 state
->branch
= get_branch(wt
, "rebase-merge/head-name");
1472 state
->onto
= get_branch(wt
, "rebase-merge/onto");
1478 int wt_status_check_bisect(const struct worktree
*wt
,
1479 struct wt_status_state
*state
)
1483 if (!stat(worktree_git_path(wt
, "BISECT_LOG"), &st
)) {
1484 state
->bisect_in_progress
= 1;
1485 state
->branch
= get_branch(wt
, "BISECT_START");
1491 void wt_status_get_state(struct wt_status_state
*state
,
1492 int get_detached_from
)
1495 struct object_id oid
;
1497 if (!stat(git_path_merge_head(), &st
)) {
1498 state
->merge_in_progress
= 1;
1499 } else if (wt_status_check_rebase(NULL
, state
)) {
1501 } else if (!stat(git_path_cherry_pick_head(), &st
) &&
1502 !get_oid("CHERRY_PICK_HEAD", &oid
)) {
1503 state
->cherry_pick_in_progress
= 1;
1504 hashcpy(state
->cherry_pick_head_sha1
, oid
.hash
);
1506 wt_status_check_bisect(NULL
, state
);
1507 if (!stat(git_path_revert_head(), &st
) &&
1508 !get_oid("REVERT_HEAD", &oid
)) {
1509 state
->revert_in_progress
= 1;
1510 hashcpy(state
->revert_head_sha1
, oid
.hash
);
1513 if (get_detached_from
)
1514 wt_status_get_detached_from(state
);
1517 static void wt_longstatus_print_state(struct wt_status
*s
,
1518 struct wt_status_state
*state
)
1520 const char *state_color
= color(WT_STATUS_HEADER
, s
);
1521 if (state
->merge_in_progress
)
1522 show_merge_in_progress(s
, state
, state_color
);
1523 else if (state
->am_in_progress
)
1524 show_am_in_progress(s
, state
, state_color
);
1525 else if (state
->rebase_in_progress
|| state
->rebase_interactive_in_progress
)
1526 show_rebase_in_progress(s
, state
, state_color
);
1527 else if (state
->cherry_pick_in_progress
)
1528 show_cherry_pick_in_progress(s
, state
, state_color
);
1529 else if (state
->revert_in_progress
)
1530 show_revert_in_progress(s
, state
, state_color
);
1531 if (state
->bisect_in_progress
)
1532 show_bisect_in_progress(s
, state
, state_color
);
1535 static void wt_longstatus_print(struct wt_status
*s
)
1537 const char *branch_color
= color(WT_STATUS_ONBRANCH
, s
);
1538 const char *branch_status_color
= color(WT_STATUS_HEADER
, s
);
1539 struct wt_status_state state
;
1541 memset(&state
, 0, sizeof(state
));
1542 wt_status_get_state(&state
,
1543 s
->branch
&& !strcmp(s
->branch
, "HEAD"));
1546 const char *on_what
= _("On branch ");
1547 const char *branch_name
= s
->branch
;
1548 if (!strcmp(branch_name
, "HEAD")) {
1549 branch_status_color
= color(WT_STATUS_NOBRANCH
, s
);
1550 if (state
.rebase_in_progress
|| state
.rebase_interactive_in_progress
) {
1551 if (state
.rebase_interactive_in_progress
)
1552 on_what
= _("interactive rebase in progress; onto ");
1554 on_what
= _("rebase in progress; onto ");
1555 branch_name
= state
.onto
;
1556 } else if (state
.detached_from
) {
1557 branch_name
= state
.detached_from
;
1558 if (state
.detached_at
)
1559 on_what
= _("HEAD detached at ");
1561 on_what
= _("HEAD detached from ");
1564 on_what
= _("Not currently on any branch.");
1567 skip_prefix(branch_name
, "refs/heads/", &branch_name
);
1568 status_printf(s
, color(WT_STATUS_HEADER
, s
), "%s", "");
1569 status_printf_more(s
, branch_status_color
, "%s", on_what
);
1570 status_printf_more(s
, branch_color
, "%s\n", branch_name
);
1572 wt_longstatus_print_tracking(s
);
1575 wt_longstatus_print_state(s
, &state
);
1578 free(state
.detached_from
);
1580 if (s
->is_initial
) {
1581 status_printf_ln(s
, color(WT_STATUS_HEADER
, s
), "%s", "");
1582 status_printf_ln(s
, color(WT_STATUS_HEADER
, s
), _("Initial commit"));
1583 status_printf_ln(s
, color(WT_STATUS_HEADER
, s
), "%s", "");
1586 wt_longstatus_print_updated(s
);
1587 wt_longstatus_print_unmerged(s
);
1588 wt_longstatus_print_changed(s
);
1589 if (s
->submodule_summary
&&
1590 (!s
->ignore_submodule_arg
||
1591 strcmp(s
->ignore_submodule_arg
, "all"))) {
1592 wt_longstatus_print_submodule_summary(s
, 0); /* staged */
1593 wt_longstatus_print_submodule_summary(s
, 1); /* unstaged */
1595 if (s
->show_untracked_files
) {
1596 wt_longstatus_print_other(s
, &s
->untracked
, _("Untracked files"), "add");
1597 if (s
->show_ignored_files
)
1598 wt_longstatus_print_other(s
, &s
->ignored
, _("Ignored files"), "add -f");
1599 if (advice_status_u_option
&& 2000 < s
->untracked_in_ms
) {
1600 status_printf_ln(s
, GIT_COLOR_NORMAL
, "%s", "");
1601 status_printf_ln(s
, GIT_COLOR_NORMAL
,
1602 _("It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1603 "may speed it up, but you have to be careful not to forget to add\n"
1604 "new files yourself (see 'git help status')."),
1605 s
->untracked_in_ms
/ 1000.0);
1607 } else if (s
->commitable
)
1608 status_printf_ln(s
, GIT_COLOR_NORMAL
, _("Untracked files not listed%s"),
1610 ? _(" (use -u option to show untracked files)") : "");
1613 wt_longstatus_print_verbose(s
);
1614 if (!s
->commitable
) {
1616 status_printf_ln(s
, GIT_COLOR_NORMAL
, _("No changes"));
1619 else if (s
->workdir_dirty
) {
1621 printf(_("no changes added to commit "
1622 "(use \"git add\" and/or \"git commit -a\")\n"));
1624 printf(_("no changes added to commit\n"));
1625 } else if (s
->untracked
.nr
) {
1627 printf(_("nothing added to commit but untracked files "
1628 "present (use \"git add\" to track)\n"));
1630 printf(_("nothing added to commit but untracked files present\n"));
1631 } else if (s
->is_initial
) {
1633 printf(_("nothing to commit (create/copy files "
1634 "and use \"git add\" to track)\n"));
1636 printf(_("nothing to commit\n"));
1637 } else if (!s
->show_untracked_files
) {
1639 printf(_("nothing to commit (use -u to show untracked files)\n"));
1641 printf(_("nothing to commit\n"));
1643 printf(_("nothing to commit, working tree clean\n"));
1647 static void wt_shortstatus_unmerged(struct string_list_item
*it
,
1648 struct wt_status
*s
)
1650 struct wt_status_change_data
*d
= it
->util
;
1651 const char *how
= "??";
1653 switch (d
->stagemask
) {
1654 case 1: how
= "DD"; break; /* both deleted */
1655 case 2: how
= "AU"; break; /* added by us */
1656 case 3: how
= "UD"; break; /* deleted by them */
1657 case 4: how
= "UA"; break; /* added by them */
1658 case 5: how
= "DU"; break; /* deleted by us */
1659 case 6: how
= "AA"; break; /* both added */
1660 case 7: how
= "UU"; break; /* both modified */
1662 color_fprintf(s
->fp
, color(WT_STATUS_UNMERGED
, s
), "%s", how
);
1663 if (s
->null_termination
) {
1664 fprintf(stdout
, " %s%c", it
->string
, 0);
1666 struct strbuf onebuf
= STRBUF_INIT
;
1668 one
= quote_path(it
->string
, s
->prefix
, &onebuf
);
1669 printf(" %s\n", one
);
1670 strbuf_release(&onebuf
);
1674 static void wt_shortstatus_status(struct string_list_item
*it
,
1675 struct wt_status
*s
)
1677 struct wt_status_change_data
*d
= it
->util
;
1679 if (d
->index_status
)
1680 color_fprintf(s
->fp
, color(WT_STATUS_UPDATED
, s
), "%c", d
->index_status
);
1683 if (d
->worktree_status
)
1684 color_fprintf(s
->fp
, color(WT_STATUS_CHANGED
, s
), "%c", d
->worktree_status
);
1688 if (s
->null_termination
) {
1689 fprintf(stdout
, "%s%c", it
->string
, 0);
1691 fprintf(stdout
, "%s%c", d
->head_path
, 0);
1693 struct strbuf onebuf
= STRBUF_INIT
;
1696 one
= quote_path(d
->head_path
, s
->prefix
, &onebuf
);
1697 if (*one
!= '"' && strchr(one
, ' ') != NULL
) {
1699 strbuf_addch(&onebuf
, '"');
1702 printf("%s -> ", one
);
1703 strbuf_release(&onebuf
);
1705 one
= quote_path(it
->string
, s
->prefix
, &onebuf
);
1706 if (*one
!= '"' && strchr(one
, ' ') != NULL
) {
1708 strbuf_addch(&onebuf
, '"');
1711 printf("%s\n", one
);
1712 strbuf_release(&onebuf
);
1716 static void wt_shortstatus_other(struct string_list_item
*it
,
1717 struct wt_status
*s
, const char *sign
)
1719 if (s
->null_termination
) {
1720 fprintf(stdout
, "%s %s%c", sign
, it
->string
, 0);
1722 struct strbuf onebuf
= STRBUF_INIT
;
1724 one
= quote_path(it
->string
, s
->prefix
, &onebuf
);
1725 color_fprintf(s
->fp
, color(WT_STATUS_UNTRACKED
, s
), "%s", sign
);
1726 printf(" %s\n", one
);
1727 strbuf_release(&onebuf
);
1731 static void wt_shortstatus_print_tracking(struct wt_status
*s
)
1733 struct branch
*branch
;
1734 const char *header_color
= color(WT_STATUS_HEADER
, s
);
1735 const char *branch_color_local
= color(WT_STATUS_LOCAL_BRANCH
, s
);
1736 const char *branch_color_remote
= color(WT_STATUS_REMOTE_BRANCH
, s
);
1739 const char *branch_name
;
1740 int num_ours
, num_theirs
;
1741 int upstream_is_gone
= 0;
1743 color_fprintf(s
->fp
, color(WT_STATUS_HEADER
, s
), "## ");
1747 branch_name
= s
->branch
;
1749 #define LABEL(string) (s->no_gettext ? (string) : _(string))
1752 color_fprintf(s
->fp
, header_color
, LABEL(N_("Initial commit on ")));
1754 if (!strcmp(s
->branch
, "HEAD")) {
1755 color_fprintf(s
->fp
, color(WT_STATUS_NOBRANCH
, s
), "%s",
1756 LABEL(N_("HEAD (no branch)")));
1760 skip_prefix(branch_name
, "refs/heads/", &branch_name
);
1762 branch
= branch_get(branch_name
);
1764 color_fprintf(s
->fp
, branch_color_local
, "%s", branch_name
);
1766 if (stat_tracking_info(branch
, &num_ours
, &num_theirs
, &base
) < 0) {
1770 upstream_is_gone
= 1;
1773 base
= shorten_unambiguous_ref(base
, 0);
1774 color_fprintf(s
->fp
, header_color
, "...");
1775 color_fprintf(s
->fp
, branch_color_remote
, "%s", base
);
1778 if (!upstream_is_gone
&& !num_ours
&& !num_theirs
)
1781 color_fprintf(s
->fp
, header_color
, " [");
1782 if (upstream_is_gone
) {
1783 color_fprintf(s
->fp
, header_color
, LABEL(N_("gone")));
1784 } else if (!num_ours
) {
1785 color_fprintf(s
->fp
, header_color
, LABEL(N_("behind ")));
1786 color_fprintf(s
->fp
, branch_color_remote
, "%d", num_theirs
);
1787 } else if (!num_theirs
) {
1788 color_fprintf(s
->fp
, header_color
, LABEL(N_("ahead ")));
1789 color_fprintf(s
->fp
, branch_color_local
, "%d", num_ours
);
1791 color_fprintf(s
->fp
, header_color
, LABEL(N_("ahead ")));
1792 color_fprintf(s
->fp
, branch_color_local
, "%d", num_ours
);
1793 color_fprintf(s
->fp
, header_color
, ", %s", LABEL(N_("behind ")));
1794 color_fprintf(s
->fp
, branch_color_remote
, "%d", num_theirs
);
1797 color_fprintf(s
->fp
, header_color
, "]");
1799 fputc(s
->null_termination
? '\0' : '\n', s
->fp
);
1802 static void wt_shortstatus_print(struct wt_status
*s
)
1804 struct string_list_item
*it
;
1807 wt_shortstatus_print_tracking(s
);
1809 for_each_string_list_item(it
, &s
->change
) {
1810 struct wt_status_change_data
*d
= it
->util
;
1813 wt_shortstatus_unmerged(it
, s
);
1815 wt_shortstatus_status(it
, s
);
1817 for_each_string_list_item(it
, &s
->untracked
)
1818 wt_shortstatus_other(it
, s
, "??");
1820 for_each_string_list_item(it
, &s
->ignored
)
1821 wt_shortstatus_other(it
, s
, "!!");
1824 static void wt_porcelain_print(struct wt_status
*s
)
1827 s
->relative_paths
= 0;
1830 wt_shortstatus_print(s
);
1834 * Print branch information for porcelain v2 output. These lines
1835 * are printed when the '--branch' parameter is given.
1837 * # branch.oid <commit><eol>
1838 * # branch.head <head><eol>
1839 * [# branch.upstream <upstream><eol>
1840 * [# branch.ab +<ahead> -<behind><eol>]]
1842 * <commit> ::= the current commit hash or the the literal
1843 * "(initial)" to indicate an initialized repo
1846 * <head> ::= <branch_name> the current branch name or
1847 * "(detached)" literal when detached head or
1848 * "(unknown)" when something is wrong.
1850 * <upstream> ::= the upstream branch name, when set.
1852 * <ahead> ::= integer ahead value, when upstream set
1853 * and the commit is present (not gone).
1855 * <behind> ::= integer behind value, when upstream set
1856 * and commit is present.
1859 * The end-of-line is defined by the -z flag.
1861 * <eol> ::= NUL when -z,
1865 static void wt_porcelain_v2_print_tracking(struct wt_status
*s
)
1867 struct branch
*branch
;
1869 const char *branch_name
;
1870 struct wt_status_state state
;
1871 int ab_info
, nr_ahead
, nr_behind
;
1872 char eol
= s
->null_termination
? '\0' : '\n';
1874 memset(&state
, 0, sizeof(state
));
1875 wt_status_get_state(&state
, s
->branch
&& !strcmp(s
->branch
, "HEAD"));
1877 fprintf(s
->fp
, "# branch.oid %s%c",
1878 (s
->is_initial
? "(initial)" : sha1_to_hex(s
->sha1_commit
)),
1882 fprintf(s
->fp
, "# branch.head %s%c", "(unknown)", eol
);
1884 if (!strcmp(s
->branch
, "HEAD")) {
1885 fprintf(s
->fp
, "# branch.head %s%c", "(detached)", eol
);
1887 if (state
.rebase_in_progress
|| state
.rebase_interactive_in_progress
)
1888 branch_name
= state
.onto
;
1889 else if (state
.detached_from
)
1890 branch_name
= state
.detached_from
;
1895 skip_prefix(s
->branch
, "refs/heads/", &branch_name
);
1897 fprintf(s
->fp
, "# branch.head %s%c", branch_name
, eol
);
1900 /* Lookup stats on the upstream tracking branch, if set. */
1901 branch
= branch_get(branch_name
);
1903 ab_info
= (stat_tracking_info(branch
, &nr_ahead
, &nr_behind
, &base
) == 0);
1905 base
= shorten_unambiguous_ref(base
, 0);
1906 fprintf(s
->fp
, "# branch.upstream %s%c", base
, eol
);
1910 fprintf(s
->fp
, "# branch.ab +%d -%d%c", nr_ahead
, nr_behind
, eol
);
1916 free(state
.detached_from
);
1920 * Convert various submodule status values into a
1921 * fixed-length string of characters in the buffer provided.
1923 static void wt_porcelain_v2_submodule_state(
1924 struct wt_status_change_data
*d
,
1927 if (S_ISGITLINK(d
->mode_head
) ||
1928 S_ISGITLINK(d
->mode_index
) ||
1929 S_ISGITLINK(d
->mode_worktree
)) {
1931 sub
[1] = d
->new_submodule_commits
? 'C' : '.';
1932 sub
[2] = (d
->dirty_submodule
& DIRTY_SUBMODULE_MODIFIED
) ? 'M' : '.';
1933 sub
[3] = (d
->dirty_submodule
& DIRTY_SUBMODULE_UNTRACKED
) ? 'U' : '.';
1944 * Fix-up changed entries before we print them.
1946 static void wt_porcelain_v2_fix_up_changed(
1947 struct string_list_item
*it
,
1948 struct wt_status
*s
)
1950 struct wt_status_change_data
*d
= it
->util
;
1952 if (!d
->index_status
) {
1954 * This entry is unchanged in the index (relative to the head).
1955 * Therefore, the collect_updated_cb was never called for this
1956 * entry (during the head-vs-index scan) and so the head column
1957 * fields were never set.
1959 * We must have data for the index column (from the
1960 * index-vs-worktree scan (otherwise, this entry should not be
1961 * in the list of changes)).
1963 * Copy index column fields to the head column, so that our
1964 * output looks complete.
1966 assert(d
->mode_head
== 0);
1967 d
->mode_head
= d
->mode_index
;
1968 oidcpy(&d
->oid_head
, &d
->oid_index
);
1971 if (!d
->worktree_status
) {
1973 * This entry is unchanged in the worktree (relative to the index).
1974 * Therefore, the collect_changed_cb was never called for this entry
1975 * (during the index-vs-worktree scan) and so the worktree column
1976 * fields were never set.
1978 * We must have data for the index column (from the head-vs-index
1981 * Copy the index column fields to the worktree column so that
1982 * our output looks complete.
1984 * Note that we only have a mode field in the worktree column
1985 * because the scan code tries really hard to not have to compute it.
1987 assert(d
->mode_worktree
== 0);
1988 d
->mode_worktree
= d
->mode_index
;
1993 * Print porcelain v2 info for tracked entries with changes.
1995 static void wt_porcelain_v2_print_changed_entry(
1996 struct string_list_item
*it
,
1997 struct wt_status
*s
)
1999 struct wt_status_change_data
*d
= it
->util
;
2000 struct strbuf buf_index
= STRBUF_INIT
;
2001 struct strbuf buf_head
= STRBUF_INIT
;
2002 const char *path_index
= NULL
;
2003 const char *path_head
= NULL
;
2005 char submodule_token
[5];
2006 char sep_char
, eol_char
;
2008 wt_porcelain_v2_fix_up_changed(it
, s
);
2009 wt_porcelain_v2_submodule_state(d
, submodule_token
);
2011 key
[0] = d
->index_status
? d
->index_status
: '.';
2012 key
[1] = d
->worktree_status
? d
->worktree_status
: '.';
2015 if (s
->null_termination
) {
2017 * In -z mode, we DO NOT C-quote pathnames. Current path is ALWAYS first.
2018 * A single NUL character separates them.
2022 path_index
= it
->string
;
2023 path_head
= d
->head_path
;
2026 * Path(s) are C-quoted if necessary. Current path is ALWAYS first.
2027 * The source path is only present when necessary.
2028 * A single TAB separates them (because paths can contain spaces
2029 * which are not escaped and C-quoting does escape TAB characters).
2033 path_index
= quote_path(it
->string
, s
->prefix
, &buf_index
);
2035 path_head
= quote_path(d
->head_path
, s
->prefix
, &buf_head
);
2039 fprintf(s
->fp
, "2 %s %s %06o %06o %06o %s %s %c%d %s%c%s%c",
2040 key
, submodule_token
,
2041 d
->mode_head
, d
->mode_index
, d
->mode_worktree
,
2042 oid_to_hex(&d
->oid_head
), oid_to_hex(&d
->oid_index
),
2044 path_index
, sep_char
, path_head
, eol_char
);
2046 fprintf(s
->fp
, "1 %s %s %06o %06o %06o %s %s %s%c",
2047 key
, submodule_token
,
2048 d
->mode_head
, d
->mode_index
, d
->mode_worktree
,
2049 oid_to_hex(&d
->oid_head
), oid_to_hex(&d
->oid_index
),
2050 path_index
, eol_char
);
2052 strbuf_release(&buf_index
);
2053 strbuf_release(&buf_head
);
2057 * Print porcelain v2 status info for unmerged entries.
2059 static void wt_porcelain_v2_print_unmerged_entry(
2060 struct string_list_item
*it
,
2061 struct wt_status
*s
)
2063 struct wt_status_change_data
*d
= it
->util
;
2064 const struct cache_entry
*ce
;
2065 struct strbuf buf_index
= STRBUF_INIT
;
2066 const char *path_index
= NULL
;
2067 int pos
, stage
, sum
;
2070 struct object_id oid
;
2073 char submodule_token
[5];
2074 char unmerged_prefix
= 'u';
2075 char eol_char
= s
->null_termination
? '\0' : '\n';
2077 wt_porcelain_v2_submodule_state(d
, submodule_token
);
2079 switch (d
->stagemask
) {
2080 case 1: key
= "DD"; break; /* both deleted */
2081 case 2: key
= "AU"; break; /* added by us */
2082 case 3: key
= "UD"; break; /* deleted by them */
2083 case 4: key
= "UA"; break; /* added by them */
2084 case 5: key
= "DU"; break; /* deleted by us */
2085 case 6: key
= "AA"; break; /* both added */
2086 case 7: key
= "UU"; break; /* both modified */
2088 die("BUG: unhandled unmerged status %x", d
->stagemask
);
2092 * Disregard d.aux.porcelain_v2 data that we accumulated
2093 * for the head and index columns during the scans and
2094 * replace with the actual stage data.
2096 * Note that this is a last-one-wins for each the individual
2097 * stage [123] columns in the event of multiple cache entries
2100 memset(stages
, 0, sizeof(stages
));
2102 pos
= cache_name_pos(it
->string
, strlen(it
->string
));
2105 while (pos
< active_nr
) {
2106 ce
= active_cache
[pos
++];
2107 stage
= ce_stage(ce
);
2108 if (strcmp(ce
->name
, it
->string
) || !stage
)
2110 stages
[stage
- 1].mode
= ce
->ce_mode
;
2111 oidcpy(&stages
[stage
- 1].oid
, &ce
->oid
);
2112 sum
|= (1 << (stage
- 1));
2114 if (sum
!= d
->stagemask
)
2115 die("BUG: observed stagemask 0x%x != expected stagemask 0x%x", sum
, d
->stagemask
);
2117 if (s
->null_termination
)
2118 path_index
= it
->string
;
2120 path_index
= quote_path(it
->string
, s
->prefix
, &buf_index
);
2122 fprintf(s
->fp
, "%c %s %s %06o %06o %06o %06o %s %s %s %s%c",
2123 unmerged_prefix
, key
, submodule_token
,
2124 stages
[0].mode
, /* stage 1 */
2125 stages
[1].mode
, /* stage 2 */
2126 stages
[2].mode
, /* stage 3 */
2128 oid_to_hex(&stages
[0].oid
), /* stage 1 */
2129 oid_to_hex(&stages
[1].oid
), /* stage 2 */
2130 oid_to_hex(&stages
[2].oid
), /* stage 3 */
2134 strbuf_release(&buf_index
);
2138 * Print porcelain V2 status info for untracked and ignored entries.
2140 static void wt_porcelain_v2_print_other(
2141 struct string_list_item
*it
,
2142 struct wt_status
*s
,
2145 struct strbuf buf
= STRBUF_INIT
;
2149 if (s
->null_termination
) {
2153 path
= quote_path(it
->string
, s
->prefix
, &buf
);
2157 fprintf(s
->fp
, "%c %s%c", prefix
, path
, eol_char
);
2159 strbuf_release(&buf
);
2163 * Print porcelain V2 status.
2166 * [<v2_changed_items>]*
2167 * [<v2_unmerged_items>]*
2168 * [<v2_untracked_items>]*
2169 * [<v2_ignored_items>]*
2172 static void wt_porcelain_v2_print(struct wt_status
*s
)
2174 struct wt_status_change_data
*d
;
2175 struct string_list_item
*it
;
2179 wt_porcelain_v2_print_tracking(s
);
2181 for (i
= 0; i
< s
->change
.nr
; i
++) {
2182 it
= &(s
->change
.items
[i
]);
2185 wt_porcelain_v2_print_changed_entry(it
, s
);
2188 for (i
= 0; i
< s
->change
.nr
; i
++) {
2189 it
= &(s
->change
.items
[i
]);
2192 wt_porcelain_v2_print_unmerged_entry(it
, s
);
2195 for (i
= 0; i
< s
->untracked
.nr
; i
++) {
2196 it
= &(s
->untracked
.items
[i
]);
2197 wt_porcelain_v2_print_other(it
, s
, '?');
2200 for (i
= 0; i
< s
->ignored
.nr
; i
++) {
2201 it
= &(s
->ignored
.items
[i
]);
2202 wt_porcelain_v2_print_other(it
, s
, '!');
2206 void wt_status_print(struct wt_status
*s
)
2208 switch (s
->status_format
) {
2209 case STATUS_FORMAT_SHORT
:
2210 wt_shortstatus_print(s
);
2212 case STATUS_FORMAT_PORCELAIN
:
2213 wt_porcelain_print(s
);
2215 case STATUS_FORMAT_PORCELAIN_V2
:
2216 wt_porcelain_v2_print(s
);
2218 case STATUS_FORMAT_UNSPECIFIED
:
2219 die("BUG: finalize_deferred_config() should have been called");
2221 case STATUS_FORMAT_NONE
:
2222 case STATUS_FORMAT_LONG
:
2223 wt_longstatus_print(s
);
2229 * Returns 1 if there are unstaged changes, 0 otherwise.
2231 int has_unstaged_changes(int ignore_submodules
)
2233 struct rev_info rev_info
;
2236 init_revisions(&rev_info
, NULL
);
2237 if (ignore_submodules
)
2238 DIFF_OPT_SET(&rev_info
.diffopt
, IGNORE_SUBMODULES
);
2239 DIFF_OPT_SET(&rev_info
.diffopt
, QUICK
);
2240 diff_setup_done(&rev_info
.diffopt
);
2241 result
= run_diff_files(&rev_info
, 0);
2242 return diff_result_code(&rev_info
.diffopt
, result
);
2246 * Returns 1 if there are uncommitted changes, 0 otherwise.
2248 int has_uncommitted_changes(int ignore_submodules
)
2250 struct rev_info rev_info
;
2253 if (is_cache_unborn())
2256 init_revisions(&rev_info
, NULL
);
2257 if (ignore_submodules
)
2258 DIFF_OPT_SET(&rev_info
.diffopt
, IGNORE_SUBMODULES
);
2259 DIFF_OPT_SET(&rev_info
.diffopt
, QUICK
);
2260 add_head_to_pending(&rev_info
);
2261 diff_setup_done(&rev_info
.diffopt
);
2262 result
= run_diff_index(&rev_info
, 1);
2263 return diff_result_code(&rev_info
.diffopt
, result
);
2267 * If the work tree has unstaged or uncommitted changes, dies with the
2268 * appropriate message.
2270 int require_clean_work_tree(const char *action
, const char *hint
, int ignore_submodules
, int gently
)
2272 struct lock_file
*lock_file
= xcalloc(1, sizeof(*lock_file
));
2275 fd
= hold_locked_index(lock_file
, 0);
2276 refresh_cache(REFRESH_QUIET
);
2278 update_index_if_able(&the_index
, lock_file
);
2279 rollback_lock_file(lock_file
);
2281 if (has_unstaged_changes(ignore_submodules
)) {
2282 /* TRANSLATORS: the action is e.g. "pull with rebase" */
2283 error(_("cannot %s: You have unstaged changes."), _(action
));
2287 if (has_uncommitted_changes(ignore_submodules
)) {
2289 error(_("additionally, your index contains uncommitted changes."));
2291 error(_("cannot %s: Your index contains uncommitted changes."),