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 */
141 s
->display_comment_prefix
= 0;
144 static void wt_longstatus_print_unmerged_header(struct wt_status
*s
)
147 int del_mod_conflict
= 0;
148 int both_deleted
= 0;
150 const char *c
= color(WT_STATUS_HEADER
, s
);
152 status_printf_ln(s
, c
, _("Unmerged paths:"));
154 for (i
= 0; i
< s
->change
.nr
; i
++) {
155 struct string_list_item
*it
= &(s
->change
.items
[i
]);
156 struct wt_status_change_data
*d
= it
->util
;
158 switch (d
->stagemask
) {
166 del_mod_conflict
= 1;
176 if (s
->whence
!= FROM_COMMIT
)
178 else if (!s
->is_initial
)
179 status_printf_ln(s
, c
, _(" (use \"git reset %s <file>...\" to unstage)"), s
->reference
);
181 status_printf_ln(s
, c
, _(" (use \"git rm --cached <file>...\" to unstage)"));
184 if (!del_mod_conflict
)
185 status_printf_ln(s
, c
, _(" (use \"git add <file>...\" to mark resolution)"));
187 status_printf_ln(s
, c
, _(" (use \"git add/rm <file>...\" as appropriate to mark resolution)"));
188 } else if (!del_mod_conflict
&& !not_deleted
) {
189 status_printf_ln(s
, c
, _(" (use \"git rm <file>...\" to mark resolution)"));
191 status_printf_ln(s
, c
, _(" (use \"git add/rm <file>...\" as appropriate to mark resolution)"));
193 status_printf_ln(s
, c
, "%s", "");
196 static void wt_longstatus_print_cached_header(struct wt_status
*s
)
198 const char *c
= color(WT_STATUS_HEADER
, s
);
200 status_printf_ln(s
, c
, _("Changes to be committed:"));
203 if (s
->whence
!= FROM_COMMIT
)
204 ; /* NEEDSWORK: use "git reset --unresolve"??? */
205 else if (!s
->is_initial
)
206 status_printf_ln(s
, c
, _(" (use \"git reset %s <file>...\" to unstage)"), s
->reference
);
208 status_printf_ln(s
, c
, _(" (use \"git rm --cached <file>...\" to unstage)"));
209 status_printf_ln(s
, c
, "%s", "");
212 static void wt_longstatus_print_dirty_header(struct wt_status
*s
,
214 int has_dirty_submodules
)
216 const char *c
= color(WT_STATUS_HEADER
, s
);
218 status_printf_ln(s
, c
, _("Changes not staged for commit:"));
222 status_printf_ln(s
, c
, _(" (use \"git add <file>...\" to update what will be committed)"));
224 status_printf_ln(s
, c
, _(" (use \"git add/rm <file>...\" to update what will be committed)"));
225 status_printf_ln(s
, c
, _(" (use \"git checkout -- <file>...\" to discard changes in working directory)"));
226 if (has_dirty_submodules
)
227 status_printf_ln(s
, c
, _(" (commit or discard the untracked or modified content in submodules)"));
228 status_printf_ln(s
, c
, "%s", "");
231 static void wt_longstatus_print_other_header(struct wt_status
*s
,
235 const char *c
= color(WT_STATUS_HEADER
, s
);
236 status_printf_ln(s
, c
, "%s:", what
);
239 status_printf_ln(s
, c
, _(" (use \"git %s <file>...\" to include in what will be committed)"), how
);
240 status_printf_ln(s
, c
, "%s", "");
243 static void wt_longstatus_print_trailer(struct wt_status
*s
)
245 status_printf_ln(s
, color(WT_STATUS_HEADER
, s
), "%s", "");
248 #define quote_path quote_path_relative
250 static const char *wt_status_unmerged_status_string(int stagemask
)
254 return _("both deleted:");
256 return _("added by us:");
258 return _("deleted by them:");
260 return _("added by them:");
262 return _("deleted by us:");
264 return _("both added:");
266 return _("both modified:");
268 die("BUG: unhandled unmerged status %x", stagemask
);
272 static const char *wt_status_diff_status_string(int status
)
275 case DIFF_STATUS_ADDED
:
276 return _("new file:");
277 case DIFF_STATUS_COPIED
:
279 case DIFF_STATUS_DELETED
:
280 return _("deleted:");
281 case DIFF_STATUS_MODIFIED
:
282 return _("modified:");
283 case DIFF_STATUS_RENAMED
:
284 return _("renamed:");
285 case DIFF_STATUS_TYPE_CHANGED
:
286 return _("typechange:");
287 case DIFF_STATUS_UNKNOWN
:
288 return _("unknown:");
289 case DIFF_STATUS_UNMERGED
:
290 return _("unmerged:");
296 static int maxwidth(const char *(*label
)(int), int minval
, int maxval
)
300 for (i
= minval
; i
<= maxval
; i
++) {
301 const char *s
= label(i
);
302 int len
= s
? utf8_strwidth(s
) : 0;
309 static void wt_longstatus_print_unmerged_data(struct wt_status
*s
,
310 struct string_list_item
*it
)
312 const char *c
= color(WT_STATUS_UNMERGED
, s
);
313 struct wt_status_change_data
*d
= it
->util
;
314 struct strbuf onebuf
= STRBUF_INIT
;
315 static char *padding
;
316 static int label_width
;
317 const char *one
, *how
;
321 label_width
= maxwidth(wt_status_unmerged_status_string
, 1, 7);
322 label_width
+= strlen(" ");
323 padding
= xmallocz(label_width
);
324 memset(padding
, ' ', label_width
);
327 one
= quote_path(it
->string
, s
->prefix
, &onebuf
);
328 status_printf(s
, color(WT_STATUS_HEADER
, s
), "\t");
330 how
= wt_status_unmerged_status_string(d
->stagemask
);
331 len
= label_width
- utf8_strwidth(how
);
332 status_printf_more(s
, c
, "%s%.*s%s\n", how
, len
, padding
, one
);
333 strbuf_release(&onebuf
);
336 static void wt_longstatus_print_change_data(struct wt_status
*s
,
338 struct string_list_item
*it
)
340 struct wt_status_change_data
*d
= it
->util
;
341 const char *c
= color(change_type
, s
);
345 const char *one
, *two
;
346 struct strbuf onebuf
= STRBUF_INIT
, twobuf
= STRBUF_INIT
;
347 struct strbuf extra
= STRBUF_INIT
;
348 static char *padding
;
349 static int label_width
;
354 /* If DIFF_STATUS_* uses outside the range [A..Z], we're in trouble */
355 label_width
= maxwidth(wt_status_diff_status_string
, 'A', 'Z');
356 label_width
+= strlen(" ");
357 padding
= xmallocz(label_width
);
358 memset(padding
, ' ', label_width
);
361 one_name
= two_name
= it
->string
;
362 switch (change_type
) {
363 case WT_STATUS_UPDATED
:
364 status
= d
->index_status
;
366 one_name
= d
->head_path
;
368 case WT_STATUS_CHANGED
:
369 if (d
->new_submodule_commits
|| d
->dirty_submodule
) {
370 strbuf_addstr(&extra
, " (");
371 if (d
->new_submodule_commits
)
372 strbuf_addstr(&extra
, _("new commits, "));
373 if (d
->dirty_submodule
& DIRTY_SUBMODULE_MODIFIED
)
374 strbuf_addstr(&extra
, _("modified content, "));
375 if (d
->dirty_submodule
& DIRTY_SUBMODULE_UNTRACKED
)
376 strbuf_addstr(&extra
, _("untracked content, "));
377 strbuf_setlen(&extra
, extra
.len
- 2);
378 strbuf_addch(&extra
, ')');
380 status
= d
->worktree_status
;
383 die("BUG: unhandled change_type %d in wt_longstatus_print_change_data",
387 one
= quote_path(one_name
, s
->prefix
, &onebuf
);
388 two
= quote_path(two_name
, s
->prefix
, &twobuf
);
390 status_printf(s
, color(WT_STATUS_HEADER
, s
), "\t");
391 what
= wt_status_diff_status_string(status
);
393 die("BUG: unhandled diff status %c", status
);
394 len
= label_width
- utf8_strwidth(what
);
396 if (status
== DIFF_STATUS_COPIED
|| status
== DIFF_STATUS_RENAMED
)
397 status_printf_more(s
, c
, "%s%.*s%s -> %s",
398 what
, len
, padding
, one
, two
);
400 status_printf_more(s
, c
, "%s%.*s%s",
401 what
, len
, padding
, one
);
403 status_printf_more(s
, color(WT_STATUS_HEADER
, s
), "%s", extra
.buf
);
404 strbuf_release(&extra
);
406 status_printf_more(s
, GIT_COLOR_NORMAL
, "\n");
407 strbuf_release(&onebuf
);
408 strbuf_release(&twobuf
);
411 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
= 1;
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
, &the_index
, &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 int stash_count_refs(struct object_id
*ooid
, struct object_id
*noid
,
806 const char *email
, timestamp_t timestamp
, int tz
,
807 const char *message
, void *cb_data
)
814 static void wt_longstatus_print_stash_summary(struct wt_status
*s
)
818 for_each_reflog_ent("refs/stash", stash_count_refs
, &stash_count
);
820 status_printf_ln(s
, GIT_COLOR_NORMAL
,
821 Q_("Your stash currently has %d entry",
822 "Your stash currently has %d entries", stash_count
),
826 static void wt_longstatus_print_submodule_summary(struct wt_status
*s
, int uncommitted
)
828 struct child_process sm_summary
= CHILD_PROCESS_INIT
;
829 struct strbuf cmd_stdout
= STRBUF_INIT
;
830 struct strbuf summary
= STRBUF_INIT
;
831 char *summary_content
;
833 argv_array_pushf(&sm_summary
.env_array
, "GIT_INDEX_FILE=%s",
836 argv_array_push(&sm_summary
.args
, "submodule");
837 argv_array_push(&sm_summary
.args
, "summary");
838 argv_array_push(&sm_summary
.args
, uncommitted
? "--files" : "--cached");
839 argv_array_push(&sm_summary
.args
, "--for-status");
840 argv_array_push(&sm_summary
.args
, "--summary-limit");
841 argv_array_pushf(&sm_summary
.args
, "%d", s
->submodule_summary
);
843 argv_array_push(&sm_summary
.args
, s
->amend
? "HEAD^" : "HEAD");
845 sm_summary
.git_cmd
= 1;
846 sm_summary
.no_stdin
= 1;
848 capture_command(&sm_summary
, &cmd_stdout
, 1024);
850 /* prepend header, only if there's an actual output */
851 if (cmd_stdout
.len
) {
853 strbuf_addstr(&summary
, _("Submodules changed but not updated:"));
855 strbuf_addstr(&summary
, _("Submodule changes to be committed:"));
856 strbuf_addstr(&summary
, "\n\n");
858 strbuf_addbuf(&summary
, &cmd_stdout
);
859 strbuf_release(&cmd_stdout
);
861 if (s
->display_comment_prefix
) {
863 summary_content
= strbuf_detach(&summary
, &len
);
864 strbuf_add_commented_lines(&summary
, summary_content
, len
);
865 free(summary_content
);
868 fputs(summary
.buf
, s
->fp
);
869 strbuf_release(&summary
);
872 static void wt_longstatus_print_other(struct wt_status
*s
,
873 struct string_list
*l
,
878 struct strbuf buf
= STRBUF_INIT
;
879 static struct string_list output
= STRING_LIST_INIT_DUP
;
880 struct column_options copts
;
885 wt_longstatus_print_other_header(s
, what
, how
);
887 for (i
= 0; i
< l
->nr
; i
++) {
888 struct string_list_item
*it
;
891 path
= quote_path(it
->string
, s
->prefix
, &buf
);
892 if (column_active(s
->colopts
)) {
893 string_list_append(&output
, path
);
896 status_printf(s
, color(WT_STATUS_HEADER
, s
), "\t");
897 status_printf_more(s
, color(WT_STATUS_UNTRACKED
, s
),
901 strbuf_release(&buf
);
902 if (!column_active(s
->colopts
))
905 strbuf_addf(&buf
, "%s%s\t%s",
906 color(WT_STATUS_HEADER
, s
),
907 s
->display_comment_prefix
? "#" : "",
908 color(WT_STATUS_UNTRACKED
, s
));
909 memset(&copts
, 0, sizeof(copts
));
911 copts
.indent
= buf
.buf
;
912 if (want_color(s
->use_color
))
913 copts
.nl
= GIT_COLOR_RESET
"\n";
914 print_columns(&output
, s
->colopts
, &copts
);
915 string_list_clear(&output
, 0);
916 strbuf_release(&buf
);
918 status_printf_ln(s
, GIT_COLOR_NORMAL
, "%s", "");
921 size_t wt_status_locate_end(const char *s
, size_t len
)
924 struct strbuf pattern
= STRBUF_INIT
;
926 strbuf_addf(&pattern
, "\n%c %s", comment_line_char
, cut_line
);
927 if (starts_with(s
, pattern
.buf
+ 1))
929 else if ((p
= strstr(s
, pattern
.buf
)))
931 strbuf_release(&pattern
);
935 void wt_status_add_cut_line(FILE *fp
)
937 const char *explanation
= _("Do not touch the line above.\nEverything below will be removed.");
938 struct strbuf buf
= STRBUF_INIT
;
940 fprintf(fp
, "%c %s", comment_line_char
, cut_line
);
941 strbuf_add_commented_lines(&buf
, explanation
, strlen(explanation
));
943 strbuf_release(&buf
);
946 static void wt_longstatus_print_verbose(struct wt_status
*s
)
949 struct setup_revision_opt opt
;
950 int dirty_submodules
;
951 const char *c
= color(WT_STATUS_HEADER
, s
);
953 init_revisions(&rev
, NULL
);
954 DIFF_OPT_SET(&rev
.diffopt
, ALLOW_TEXTCONV
);
955 rev
.diffopt
.ita_invisible_in_index
= 1;
957 memset(&opt
, 0, sizeof(opt
));
958 opt
.def
= s
->is_initial
? EMPTY_TREE_SHA1_HEX
: s
->reference
;
959 setup_revisions(0, NULL
, &rev
, &opt
);
961 rev
.diffopt
.output_format
|= DIFF_FORMAT_PATCH
;
962 rev
.diffopt
.detect_rename
= 1;
963 rev
.diffopt
.file
= s
->fp
;
964 rev
.diffopt
.close_file
= 0;
966 * If we're not going to stdout, then we definitely don't
967 * want color, since we are going to the commit message
968 * file (and even the "auto" setting won't work, since it
969 * will have checked isatty on stdout). But we then do want
970 * to insert the scissor line here to reliably remove the
971 * diff before committing.
973 if (s
->fp
!= stdout
) {
974 rev
.diffopt
.use_color
= 0;
975 wt_status_add_cut_line(s
->fp
);
977 if (s
->verbose
> 1 && s
->commitable
) {
978 /* print_updated() printed a header, so do we */
980 wt_longstatus_print_trailer(s
);
981 status_printf_ln(s
, c
, _("Changes to be committed:"));
982 rev
.diffopt
.a_prefix
= "c/";
983 rev
.diffopt
.b_prefix
= "i/";
984 } /* else use prefix as per user config */
985 run_diff_index(&rev
, 1);
986 if (s
->verbose
> 1 &&
987 wt_status_check_worktree_changes(s
, &dirty_submodules
)) {
988 status_printf_ln(s
, c
,
989 "--------------------------------------------------");
990 status_printf_ln(s
, c
, _("Changes not staged for commit:"));
992 rev
.diffopt
.a_prefix
= "i/";
993 rev
.diffopt
.b_prefix
= "w/";
994 run_diff_files(&rev
, 0);
998 static void wt_longstatus_print_tracking(struct wt_status
*s
)
1000 struct strbuf sb
= STRBUF_INIT
;
1001 const char *cp
, *ep
, *branch_name
;
1002 struct branch
*branch
;
1003 char comment_line_string
[3];
1006 assert(s
->branch
&& !s
->is_initial
);
1007 if (!skip_prefix(s
->branch
, "refs/heads/", &branch_name
))
1009 branch
= branch_get(branch_name
);
1010 if (!format_tracking_info(branch
, &sb
))
1014 if (s
->display_comment_prefix
) {
1015 comment_line_string
[i
++] = comment_line_char
;
1016 comment_line_string
[i
++] = ' ';
1018 comment_line_string
[i
] = '\0';
1020 for (cp
= sb
.buf
; (ep
= strchr(cp
, '\n')) != NULL
; cp
= ep
+ 1)
1021 color_fprintf_ln(s
->fp
, color(WT_STATUS_HEADER
, s
),
1022 "%s%.*s", comment_line_string
,
1023 (int)(ep
- cp
), cp
);
1024 if (s
->display_comment_prefix
)
1025 color_fprintf_ln(s
->fp
, color(WT_STATUS_HEADER
, s
), "%c",
1029 strbuf_release(&sb
);
1032 static int has_unmerged(struct wt_status
*s
)
1036 for (i
= 0; i
< s
->change
.nr
; i
++) {
1037 struct wt_status_change_data
*d
;
1038 d
= s
->change
.items
[i
].util
;
1045 static void show_merge_in_progress(struct wt_status
*s
,
1046 struct wt_status_state
*state
,
1049 if (has_unmerged(s
)) {
1050 status_printf_ln(s
, color
, _("You have unmerged paths."));
1052 status_printf_ln(s
, color
,
1053 _(" (fix conflicts and run \"git commit\")"));
1054 status_printf_ln(s
, color
,
1055 _(" (use \"git merge --abort\" to abort the merge)"));
1059 status_printf_ln(s
, color
,
1060 _("All conflicts fixed but you are still merging."));
1062 status_printf_ln(s
, color
,
1063 _(" (use \"git commit\" to conclude merge)"));
1065 wt_longstatus_print_trailer(s
);
1068 static void show_am_in_progress(struct wt_status
*s
,
1069 struct wt_status_state
*state
,
1072 status_printf_ln(s
, color
,
1073 _("You are in the middle of an am session."));
1074 if (state
->am_empty_patch
)
1075 status_printf_ln(s
, color
,
1076 _("The current patch is empty."));
1078 if (!state
->am_empty_patch
)
1079 status_printf_ln(s
, color
,
1080 _(" (fix conflicts and then run \"git am --continue\")"));
1081 status_printf_ln(s
, color
,
1082 _(" (use \"git am --skip\" to skip this patch)"));
1083 status_printf_ln(s
, color
,
1084 _(" (use \"git am --abort\" to restore the original branch)"));
1086 wt_longstatus_print_trailer(s
);
1089 static char *read_line_from_git_path(const char *filename
)
1091 struct strbuf buf
= STRBUF_INIT
;
1092 FILE *fp
= fopen_or_warn(git_path("%s", filename
), "r");
1095 strbuf_release(&buf
);
1098 strbuf_getline_lf(&buf
, fp
);
1100 return strbuf_detach(&buf
, NULL
);
1102 strbuf_release(&buf
);
1107 static int split_commit_in_progress(struct wt_status
*s
)
1109 int split_in_progress
= 0;
1110 char *head
, *orig_head
, *rebase_amend
, *rebase_orig_head
;
1112 if ((!s
->amend
&& !s
->nowarn
&& !s
->workdir_dirty
) ||
1113 !s
->branch
|| strcmp(s
->branch
, "HEAD"))
1116 head
= read_line_from_git_path("HEAD");
1117 orig_head
= read_line_from_git_path("ORIG_HEAD");
1118 rebase_amend
= read_line_from_git_path("rebase-merge/amend");
1119 rebase_orig_head
= read_line_from_git_path("rebase-merge/orig-head");
1121 if (!head
|| !orig_head
|| !rebase_amend
|| !rebase_orig_head
)
1122 ; /* fall through, no split in progress */
1123 else if (!strcmp(rebase_amend
, rebase_orig_head
))
1124 split_in_progress
= !!strcmp(head
, rebase_amend
);
1125 else if (strcmp(orig_head
, rebase_orig_head
))
1126 split_in_progress
= 1;
1131 free(rebase_orig_head
);
1133 return split_in_progress
;
1138 * "pick d6a2f0303e897ec257dd0e0a39a5ccb709bc2047 some message"
1140 * "pick d6a2f03 some message"
1142 * The function assumes that the line does not contain useless spaces
1143 * before or after the command.
1145 static void abbrev_sha1_in_line(struct strbuf
*line
)
1147 struct strbuf
**split
;
1150 if (starts_with(line
->buf
, "exec ") ||
1151 starts_with(line
->buf
, "x "))
1154 split
= strbuf_split_max(line
, ' ', 3);
1155 if (split
[0] && split
[1]) {
1156 struct object_id oid
;
1159 * strbuf_split_max left a space. Trim it and re-add
1160 * it after abbreviation.
1162 strbuf_trim(split
[1]);
1163 if (!get_oid(split
[1]->buf
, &oid
)) {
1164 strbuf_reset(split
[1]);
1165 strbuf_add_unique_abbrev(split
[1], oid
.hash
,
1167 strbuf_addch(split
[1], ' ');
1169 for (i
= 0; split
[i
]; i
++)
1170 strbuf_addbuf(line
, split
[i
]);
1173 strbuf_list_free(split
);
1176 static int read_rebase_todolist(const char *fname
, struct string_list
*lines
)
1178 struct strbuf line
= STRBUF_INIT
;
1179 FILE *f
= fopen(git_path("%s", fname
), "r");
1182 if (errno
== ENOENT
)
1184 die_errno("Could not open file %s for reading",
1185 git_path("%s", fname
));
1187 while (!strbuf_getline_lf(&line
, f
)) {
1188 if (line
.len
&& line
.buf
[0] == comment_line_char
)
1193 abbrev_sha1_in_line(&line
);
1194 string_list_append(lines
, line
.buf
);
1197 strbuf_release(&line
);
1201 static void show_rebase_information(struct wt_status
*s
,
1202 struct wt_status_state
*state
,
1205 if (state
->rebase_interactive_in_progress
) {
1207 int nr_lines_to_show
= 2;
1209 struct string_list have_done
= STRING_LIST_INIT_DUP
;
1210 struct string_list yet_to_do
= STRING_LIST_INIT_DUP
;
1212 read_rebase_todolist("rebase-merge/done", &have_done
);
1213 if (read_rebase_todolist("rebase-merge/git-rebase-todo",
1215 status_printf_ln(s
, color
,
1216 _("git-rebase-todo is missing."));
1217 if (have_done
.nr
== 0)
1218 status_printf_ln(s
, color
, _("No commands done."));
1220 status_printf_ln(s
, color
,
1221 Q_("Last command done (%d command done):",
1222 "Last commands done (%d commands done):",
1225 for (i
= (have_done
.nr
> nr_lines_to_show
)
1226 ? have_done
.nr
- nr_lines_to_show
: 0;
1229 status_printf_ln(s
, color
, " %s", have_done
.items
[i
].string
);
1230 if (have_done
.nr
> nr_lines_to_show
&& s
->hints
)
1231 status_printf_ln(s
, color
,
1232 _(" (see more in file %s)"), git_path("rebase-merge/done"));
1235 if (yet_to_do
.nr
== 0)
1236 status_printf_ln(s
, color
,
1237 _("No commands remaining."));
1239 status_printf_ln(s
, color
,
1240 Q_("Next command to do (%d remaining command):",
1241 "Next commands to do (%d remaining commands):",
1244 for (i
= 0; i
< nr_lines_to_show
&& i
< yet_to_do
.nr
; i
++)
1245 status_printf_ln(s
, color
, " %s", yet_to_do
.items
[i
].string
);
1247 status_printf_ln(s
, color
,
1248 _(" (use \"git rebase --edit-todo\" to view and edit)"));
1250 string_list_clear(&yet_to_do
, 0);
1251 string_list_clear(&have_done
, 0);
1255 static void print_rebase_state(struct wt_status
*s
,
1256 struct wt_status_state
*state
,
1260 status_printf_ln(s
, color
,
1261 _("You are currently rebasing branch '%s' on '%s'."),
1265 status_printf_ln(s
, color
,
1266 _("You are currently rebasing."));
1269 static void show_rebase_in_progress(struct wt_status
*s
,
1270 struct wt_status_state
*state
,
1275 show_rebase_information(s
, state
, color
);
1276 if (has_unmerged(s
)) {
1277 print_rebase_state(s
, state
, color
);
1279 status_printf_ln(s
, color
,
1280 _(" (fix conflicts and then run \"git rebase --continue\")"));
1281 status_printf_ln(s
, color
,
1282 _(" (use \"git rebase --skip\" to skip this patch)"));
1283 status_printf_ln(s
, color
,
1284 _(" (use \"git rebase --abort\" to check out the original branch)"));
1286 } else if (state
->rebase_in_progress
|| !stat(git_path_merge_msg(), &st
)) {
1287 print_rebase_state(s
, state
, color
);
1289 status_printf_ln(s
, color
,
1290 _(" (all conflicts fixed: run \"git rebase --continue\")"));
1291 } else if (split_commit_in_progress(s
)) {
1293 status_printf_ln(s
, color
,
1294 _("You are currently splitting a commit while rebasing branch '%s' on '%s'."),
1298 status_printf_ln(s
, color
,
1299 _("You are currently splitting a commit during a rebase."));
1301 status_printf_ln(s
, color
,
1302 _(" (Once your working directory is clean, run \"git rebase --continue\")"));
1305 status_printf_ln(s
, color
,
1306 _("You are currently editing a commit while rebasing branch '%s' on '%s'."),
1310 status_printf_ln(s
, color
,
1311 _("You are currently editing a commit during a rebase."));
1312 if (s
->hints
&& !s
->amend
) {
1313 status_printf_ln(s
, color
,
1314 _(" (use \"git commit --amend\" to amend the current commit)"));
1315 status_printf_ln(s
, color
,
1316 _(" (use \"git rebase --continue\" once you are satisfied with your changes)"));
1319 wt_longstatus_print_trailer(s
);
1322 static void show_cherry_pick_in_progress(struct wt_status
*s
,
1323 struct wt_status_state
*state
,
1326 status_printf_ln(s
, color
, _("You are currently cherry-picking commit %s."),
1327 find_unique_abbrev(state
->cherry_pick_head_sha1
, DEFAULT_ABBREV
));
1329 if (has_unmerged(s
))
1330 status_printf_ln(s
, color
,
1331 _(" (fix conflicts and run \"git cherry-pick --continue\")"));
1333 status_printf_ln(s
, color
,
1334 _(" (all conflicts fixed: run \"git cherry-pick --continue\")"));
1335 status_printf_ln(s
, color
,
1336 _(" (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"));
1338 wt_longstatus_print_trailer(s
);
1341 static void show_revert_in_progress(struct wt_status
*s
,
1342 struct wt_status_state
*state
,
1345 status_printf_ln(s
, color
, _("You are currently reverting commit %s."),
1346 find_unique_abbrev(state
->revert_head_sha1
, DEFAULT_ABBREV
));
1348 if (has_unmerged(s
))
1349 status_printf_ln(s
, color
,
1350 _(" (fix conflicts and run \"git revert --continue\")"));
1352 status_printf_ln(s
, color
,
1353 _(" (all conflicts fixed: run \"git revert --continue\")"));
1354 status_printf_ln(s
, color
,
1355 _(" (use \"git revert --abort\" to cancel the revert operation)"));
1357 wt_longstatus_print_trailer(s
);
1360 static void show_bisect_in_progress(struct wt_status
*s
,
1361 struct wt_status_state
*state
,
1365 status_printf_ln(s
, color
,
1366 _("You are currently bisecting, started from branch '%s'."),
1369 status_printf_ln(s
, color
,
1370 _("You are currently bisecting."));
1372 status_printf_ln(s
, color
,
1373 _(" (use \"git bisect reset\" to get back to the original branch)"));
1374 wt_longstatus_print_trailer(s
);
1378 * Extract branch information from rebase/bisect
1380 static char *get_branch(const struct worktree
*wt
, const char *path
)
1382 struct strbuf sb
= STRBUF_INIT
;
1383 struct object_id oid
;
1384 const char *branch_name
;
1386 if (strbuf_read_file(&sb
, worktree_git_path(wt
, "%s", path
), 0) <= 0)
1389 while (sb
.len
&& sb
.buf
[sb
.len
- 1] == '\n')
1390 strbuf_setlen(&sb
, sb
.len
- 1);
1393 if (skip_prefix(sb
.buf
, "refs/heads/", &branch_name
))
1394 strbuf_remove(&sb
, 0, branch_name
- sb
.buf
);
1395 else if (starts_with(sb
.buf
, "refs/"))
1397 else if (!get_oid_hex(sb
.buf
, &oid
)) {
1399 strbuf_add_unique_abbrev(&sb
, oid
.hash
, DEFAULT_ABBREV
);
1400 } else if (!strcmp(sb
.buf
, "detached HEAD")) /* rebase */
1404 return strbuf_detach(&sb
, NULL
);
1407 strbuf_release(&sb
);
1411 struct grab_1st_switch_cbdata
{
1413 struct object_id noid
;
1416 static int grab_1st_switch(struct object_id
*ooid
, struct object_id
*noid
,
1417 const char *email
, timestamp_t timestamp
, int tz
,
1418 const char *message
, void *cb_data
)
1420 struct grab_1st_switch_cbdata
*cb
= cb_data
;
1421 const char *target
= NULL
, *end
;
1423 if (!skip_prefix(message
, "checkout: moving from ", &message
))
1425 target
= strstr(message
, " to ");
1428 target
+= strlen(" to ");
1429 strbuf_reset(&cb
->buf
);
1430 oidcpy(&cb
->noid
, noid
);
1431 end
= strchrnul(target
, '\n');
1432 strbuf_add(&cb
->buf
, target
, end
- target
);
1433 if (!strcmp(cb
->buf
.buf
, "HEAD")) {
1434 /* HEAD is relative. Resolve it to the right reflog entry. */
1435 strbuf_reset(&cb
->buf
);
1436 strbuf_add_unique_abbrev(&cb
->buf
, noid
->hash
, DEFAULT_ABBREV
);
1441 static void wt_status_get_detached_from(struct wt_status_state
*state
)
1443 struct grab_1st_switch_cbdata cb
;
1444 struct commit
*commit
;
1445 struct object_id oid
;
1448 strbuf_init(&cb
.buf
, 0);
1449 if (for_each_reflog_ent_reverse("HEAD", grab_1st_switch
, &cb
) <= 0) {
1450 strbuf_release(&cb
.buf
);
1454 if (dwim_ref(cb
.buf
.buf
, cb
.buf
.len
, oid
.hash
, &ref
) == 1 &&
1455 /* sha1 is a commit? match without further lookup */
1456 (!oidcmp(&cb
.noid
, &oid
) ||
1457 /* perhaps sha1 is a tag, try to dereference to a commit */
1458 ((commit
= lookup_commit_reference_gently(&oid
, 1)) != NULL
&&
1459 !oidcmp(&cb
.noid
, &commit
->object
.oid
)))) {
1460 const char *from
= ref
;
1461 if (!skip_prefix(from
, "refs/tags/", &from
))
1462 skip_prefix(from
, "refs/remotes/", &from
);
1463 state
->detached_from
= xstrdup(from
);
1465 state
->detached_from
=
1466 xstrdup(find_unique_abbrev(cb
.noid
.hash
, DEFAULT_ABBREV
));
1467 hashcpy(state
->detached_sha1
, cb
.noid
.hash
);
1468 state
->detached_at
= !get_oid("HEAD", &oid
) &&
1469 !hashcmp(oid
.hash
, state
->detached_sha1
);
1472 strbuf_release(&cb
.buf
);
1475 int wt_status_check_rebase(const struct worktree
*wt
,
1476 struct wt_status_state
*state
)
1480 if (!stat(worktree_git_path(wt
, "rebase-apply"), &st
)) {
1481 if (!stat(worktree_git_path(wt
, "rebase-apply/applying"), &st
)) {
1482 state
->am_in_progress
= 1;
1483 if (!stat(worktree_git_path(wt
, "rebase-apply/patch"), &st
) && !st
.st_size
)
1484 state
->am_empty_patch
= 1;
1486 state
->rebase_in_progress
= 1;
1487 state
->branch
= get_branch(wt
, "rebase-apply/head-name");
1488 state
->onto
= get_branch(wt
, "rebase-apply/onto");
1490 } else if (!stat(worktree_git_path(wt
, "rebase-merge"), &st
)) {
1491 if (!stat(worktree_git_path(wt
, "rebase-merge/interactive"), &st
))
1492 state
->rebase_interactive_in_progress
= 1;
1494 state
->rebase_in_progress
= 1;
1495 state
->branch
= get_branch(wt
, "rebase-merge/head-name");
1496 state
->onto
= get_branch(wt
, "rebase-merge/onto");
1502 int wt_status_check_bisect(const struct worktree
*wt
,
1503 struct wt_status_state
*state
)
1507 if (!stat(worktree_git_path(wt
, "BISECT_LOG"), &st
)) {
1508 state
->bisect_in_progress
= 1;
1509 state
->branch
= get_branch(wt
, "BISECT_START");
1515 void wt_status_get_state(struct wt_status_state
*state
,
1516 int get_detached_from
)
1519 struct object_id oid
;
1521 if (!stat(git_path_merge_head(), &st
)) {
1522 state
->merge_in_progress
= 1;
1523 } else if (wt_status_check_rebase(NULL
, state
)) {
1525 } else if (!stat(git_path_cherry_pick_head(), &st
) &&
1526 !get_oid("CHERRY_PICK_HEAD", &oid
)) {
1527 state
->cherry_pick_in_progress
= 1;
1528 hashcpy(state
->cherry_pick_head_sha1
, oid
.hash
);
1530 wt_status_check_bisect(NULL
, state
);
1531 if (!stat(git_path_revert_head(), &st
) &&
1532 !get_oid("REVERT_HEAD", &oid
)) {
1533 state
->revert_in_progress
= 1;
1534 hashcpy(state
->revert_head_sha1
, oid
.hash
);
1537 if (get_detached_from
)
1538 wt_status_get_detached_from(state
);
1541 static void wt_longstatus_print_state(struct wt_status
*s
,
1542 struct wt_status_state
*state
)
1544 const char *state_color
= color(WT_STATUS_HEADER
, s
);
1545 if (state
->merge_in_progress
)
1546 show_merge_in_progress(s
, state
, state_color
);
1547 else if (state
->am_in_progress
)
1548 show_am_in_progress(s
, state
, state_color
);
1549 else if (state
->rebase_in_progress
|| state
->rebase_interactive_in_progress
)
1550 show_rebase_in_progress(s
, state
, state_color
);
1551 else if (state
->cherry_pick_in_progress
)
1552 show_cherry_pick_in_progress(s
, state
, state_color
);
1553 else if (state
->revert_in_progress
)
1554 show_revert_in_progress(s
, state
, state_color
);
1555 if (state
->bisect_in_progress
)
1556 show_bisect_in_progress(s
, state
, state_color
);
1559 static void wt_longstatus_print(struct wt_status
*s
)
1561 const char *branch_color
= color(WT_STATUS_ONBRANCH
, s
);
1562 const char *branch_status_color
= color(WT_STATUS_HEADER
, s
);
1563 struct wt_status_state state
;
1565 memset(&state
, 0, sizeof(state
));
1566 wt_status_get_state(&state
,
1567 s
->branch
&& !strcmp(s
->branch
, "HEAD"));
1570 const char *on_what
= _("On branch ");
1571 const char *branch_name
= s
->branch
;
1572 if (!strcmp(branch_name
, "HEAD")) {
1573 branch_status_color
= color(WT_STATUS_NOBRANCH
, s
);
1574 if (state
.rebase_in_progress
|| state
.rebase_interactive_in_progress
) {
1575 if (state
.rebase_interactive_in_progress
)
1576 on_what
= _("interactive rebase in progress; onto ");
1578 on_what
= _("rebase in progress; onto ");
1579 branch_name
= state
.onto
;
1580 } else if (state
.detached_from
) {
1581 branch_name
= state
.detached_from
;
1582 if (state
.detached_at
)
1583 on_what
= _("HEAD detached at ");
1585 on_what
= _("HEAD detached from ");
1588 on_what
= _("Not currently on any branch.");
1591 skip_prefix(branch_name
, "refs/heads/", &branch_name
);
1592 status_printf(s
, color(WT_STATUS_HEADER
, s
), "%s", "");
1593 status_printf_more(s
, branch_status_color
, "%s", on_what
);
1594 status_printf_more(s
, branch_color
, "%s\n", branch_name
);
1596 wt_longstatus_print_tracking(s
);
1599 wt_longstatus_print_state(s
, &state
);
1602 free(state
.detached_from
);
1604 if (s
->is_initial
) {
1605 status_printf_ln(s
, color(WT_STATUS_HEADER
, s
), "%s", "");
1606 status_printf_ln(s
, color(WT_STATUS_HEADER
, s
),
1608 ? _("Initial commit")
1609 : _("No commits yet"));
1610 status_printf_ln(s
, color(WT_STATUS_HEADER
, s
), "%s", "");
1613 wt_longstatus_print_updated(s
);
1614 wt_longstatus_print_unmerged(s
);
1615 wt_longstatus_print_changed(s
);
1616 if (s
->submodule_summary
&&
1617 (!s
->ignore_submodule_arg
||
1618 strcmp(s
->ignore_submodule_arg
, "all"))) {
1619 wt_longstatus_print_submodule_summary(s
, 0); /* staged */
1620 wt_longstatus_print_submodule_summary(s
, 1); /* unstaged */
1622 if (s
->show_untracked_files
) {
1623 wt_longstatus_print_other(s
, &s
->untracked
, _("Untracked files"), "add");
1624 if (s
->show_ignored_files
)
1625 wt_longstatus_print_other(s
, &s
->ignored
, _("Ignored files"), "add -f");
1626 if (advice_status_u_option
&& 2000 < s
->untracked_in_ms
) {
1627 status_printf_ln(s
, GIT_COLOR_NORMAL
, "%s", "");
1628 status_printf_ln(s
, GIT_COLOR_NORMAL
,
1629 _("It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1630 "may speed it up, but you have to be careful not to forget to add\n"
1631 "new files yourself (see 'git help status')."),
1632 s
->untracked_in_ms
/ 1000.0);
1634 } else if (s
->commitable
)
1635 status_printf_ln(s
, GIT_COLOR_NORMAL
, _("Untracked files not listed%s"),
1637 ? _(" (use -u option to show untracked files)") : "");
1640 wt_longstatus_print_verbose(s
);
1641 if (!s
->commitable
) {
1643 status_printf_ln(s
, GIT_COLOR_NORMAL
, _("No changes"));
1646 else if (s
->workdir_dirty
) {
1648 printf(_("no changes added to commit "
1649 "(use \"git add\" and/or \"git commit -a\")\n"));
1651 printf(_("no changes added to commit\n"));
1652 } else if (s
->untracked
.nr
) {
1654 printf(_("nothing added to commit but untracked files "
1655 "present (use \"git add\" to track)\n"));
1657 printf(_("nothing added to commit but untracked files present\n"));
1658 } else if (s
->is_initial
) {
1660 printf(_("nothing to commit (create/copy files "
1661 "and use \"git add\" to track)\n"));
1663 printf(_("nothing to commit\n"));
1664 } else if (!s
->show_untracked_files
) {
1666 printf(_("nothing to commit (use -u to show untracked files)\n"));
1668 printf(_("nothing to commit\n"));
1670 printf(_("nothing to commit, working tree clean\n"));
1673 wt_longstatus_print_stash_summary(s
);
1676 static void wt_shortstatus_unmerged(struct string_list_item
*it
,
1677 struct wt_status
*s
)
1679 struct wt_status_change_data
*d
= it
->util
;
1680 const char *how
= "??";
1682 switch (d
->stagemask
) {
1683 case 1: how
= "DD"; break; /* both deleted */
1684 case 2: how
= "AU"; break; /* added by us */
1685 case 3: how
= "UD"; break; /* deleted by them */
1686 case 4: how
= "UA"; break; /* added by them */
1687 case 5: how
= "DU"; break; /* deleted by us */
1688 case 6: how
= "AA"; break; /* both added */
1689 case 7: how
= "UU"; break; /* both modified */
1691 color_fprintf(s
->fp
, color(WT_STATUS_UNMERGED
, s
), "%s", how
);
1692 if (s
->null_termination
) {
1693 fprintf(stdout
, " %s%c", it
->string
, 0);
1695 struct strbuf onebuf
= STRBUF_INIT
;
1697 one
= quote_path(it
->string
, s
->prefix
, &onebuf
);
1698 printf(" %s\n", one
);
1699 strbuf_release(&onebuf
);
1703 static void wt_shortstatus_status(struct string_list_item
*it
,
1704 struct wt_status
*s
)
1706 struct wt_status_change_data
*d
= it
->util
;
1708 if (d
->index_status
)
1709 color_fprintf(s
->fp
, color(WT_STATUS_UPDATED
, s
), "%c", d
->index_status
);
1712 if (d
->worktree_status
)
1713 color_fprintf(s
->fp
, color(WT_STATUS_CHANGED
, s
), "%c", d
->worktree_status
);
1717 if (s
->null_termination
) {
1718 fprintf(stdout
, "%s%c", it
->string
, 0);
1720 fprintf(stdout
, "%s%c", d
->head_path
, 0);
1722 struct strbuf onebuf
= STRBUF_INIT
;
1725 one
= quote_path(d
->head_path
, s
->prefix
, &onebuf
);
1726 if (*one
!= '"' && strchr(one
, ' ') != NULL
) {
1728 strbuf_addch(&onebuf
, '"');
1731 printf("%s -> ", one
);
1732 strbuf_release(&onebuf
);
1734 one
= quote_path(it
->string
, s
->prefix
, &onebuf
);
1735 if (*one
!= '"' && strchr(one
, ' ') != NULL
) {
1737 strbuf_addch(&onebuf
, '"');
1740 printf("%s\n", one
);
1741 strbuf_release(&onebuf
);
1745 static void wt_shortstatus_other(struct string_list_item
*it
,
1746 struct wt_status
*s
, const char *sign
)
1748 if (s
->null_termination
) {
1749 fprintf(stdout
, "%s %s%c", sign
, it
->string
, 0);
1751 struct strbuf onebuf
= STRBUF_INIT
;
1753 one
= quote_path(it
->string
, s
->prefix
, &onebuf
);
1754 color_fprintf(s
->fp
, color(WT_STATUS_UNTRACKED
, s
), "%s", sign
);
1755 printf(" %s\n", one
);
1756 strbuf_release(&onebuf
);
1760 static void wt_shortstatus_print_tracking(struct wt_status
*s
)
1762 struct branch
*branch
;
1763 const char *header_color
= color(WT_STATUS_HEADER
, s
);
1764 const char *branch_color_local
= color(WT_STATUS_LOCAL_BRANCH
, s
);
1765 const char *branch_color_remote
= color(WT_STATUS_REMOTE_BRANCH
, s
);
1769 const char *branch_name
;
1770 int num_ours
, num_theirs
;
1771 int upstream_is_gone
= 0;
1773 color_fprintf(s
->fp
, color(WT_STATUS_HEADER
, s
), "## ");
1777 branch_name
= s
->branch
;
1779 #define LABEL(string) (s->no_gettext ? (string) : _(string))
1782 color_fprintf(s
->fp
, header_color
, LABEL(N_("No commits yet on ")));
1784 if (!strcmp(s
->branch
, "HEAD")) {
1785 color_fprintf(s
->fp
, color(WT_STATUS_NOBRANCH
, s
), "%s",
1786 LABEL(N_("HEAD (no branch)")));
1790 skip_prefix(branch_name
, "refs/heads/", &branch_name
);
1792 branch
= branch_get(branch_name
);
1794 color_fprintf(s
->fp
, branch_color_local
, "%s", branch_name
);
1796 if (stat_tracking_info(branch
, &num_ours
, &num_theirs
, &base
) < 0) {
1800 upstream_is_gone
= 1;
1803 short_base
= shorten_unambiguous_ref(base
, 0);
1804 color_fprintf(s
->fp
, header_color
, "...");
1805 color_fprintf(s
->fp
, branch_color_remote
, "%s", short_base
);
1808 if (!upstream_is_gone
&& !num_ours
&& !num_theirs
)
1811 color_fprintf(s
->fp
, header_color
, " [");
1812 if (upstream_is_gone
) {
1813 color_fprintf(s
->fp
, header_color
, LABEL(N_("gone")));
1814 } else if (!num_ours
) {
1815 color_fprintf(s
->fp
, header_color
, LABEL(N_("behind ")));
1816 color_fprintf(s
->fp
, branch_color_remote
, "%d", num_theirs
);
1817 } else if (!num_theirs
) {
1818 color_fprintf(s
->fp
, header_color
, LABEL(N_("ahead ")));
1819 color_fprintf(s
->fp
, branch_color_local
, "%d", num_ours
);
1821 color_fprintf(s
->fp
, header_color
, LABEL(N_("ahead ")));
1822 color_fprintf(s
->fp
, branch_color_local
, "%d", num_ours
);
1823 color_fprintf(s
->fp
, header_color
, ", %s", LABEL(N_("behind ")));
1824 color_fprintf(s
->fp
, branch_color_remote
, "%d", num_theirs
);
1827 color_fprintf(s
->fp
, header_color
, "]");
1829 fputc(s
->null_termination
? '\0' : '\n', s
->fp
);
1832 static void wt_shortstatus_print(struct wt_status
*s
)
1834 struct string_list_item
*it
;
1837 wt_shortstatus_print_tracking(s
);
1839 for_each_string_list_item(it
, &s
->change
) {
1840 struct wt_status_change_data
*d
= it
->util
;
1843 wt_shortstatus_unmerged(it
, s
);
1845 wt_shortstatus_status(it
, s
);
1847 for_each_string_list_item(it
, &s
->untracked
)
1848 wt_shortstatus_other(it
, s
, "??");
1850 for_each_string_list_item(it
, &s
->ignored
)
1851 wt_shortstatus_other(it
, s
, "!!");
1854 static void wt_porcelain_print(struct wt_status
*s
)
1857 s
->relative_paths
= 0;
1860 wt_shortstatus_print(s
);
1864 * Print branch information for porcelain v2 output. These lines
1865 * are printed when the '--branch' parameter is given.
1867 * # branch.oid <commit><eol>
1868 * # branch.head <head><eol>
1869 * [# branch.upstream <upstream><eol>
1870 * [# branch.ab +<ahead> -<behind><eol>]]
1872 * <commit> ::= the current commit hash or the the literal
1873 * "(initial)" to indicate an initialized repo
1876 * <head> ::= <branch_name> the current branch name or
1877 * "(detached)" literal when detached head or
1878 * "(unknown)" when something is wrong.
1880 * <upstream> ::= the upstream branch name, when set.
1882 * <ahead> ::= integer ahead value, when upstream set
1883 * and the commit is present (not gone).
1885 * <behind> ::= integer behind value, when upstream set
1886 * and commit is present.
1889 * The end-of-line is defined by the -z flag.
1891 * <eol> ::= NUL when -z,
1895 static void wt_porcelain_v2_print_tracking(struct wt_status
*s
)
1897 struct branch
*branch
;
1899 const char *branch_name
;
1900 struct wt_status_state state
;
1901 int ab_info
, nr_ahead
, nr_behind
;
1902 char eol
= s
->null_termination
? '\0' : '\n';
1904 memset(&state
, 0, sizeof(state
));
1905 wt_status_get_state(&state
, s
->branch
&& !strcmp(s
->branch
, "HEAD"));
1907 fprintf(s
->fp
, "# branch.oid %s%c",
1908 (s
->is_initial
? "(initial)" : sha1_to_hex(s
->sha1_commit
)),
1912 fprintf(s
->fp
, "# branch.head %s%c", "(unknown)", eol
);
1914 if (!strcmp(s
->branch
, "HEAD")) {
1915 fprintf(s
->fp
, "# branch.head %s%c", "(detached)", eol
);
1917 if (state
.rebase_in_progress
|| state
.rebase_interactive_in_progress
)
1918 branch_name
= state
.onto
;
1919 else if (state
.detached_from
)
1920 branch_name
= state
.detached_from
;
1925 skip_prefix(s
->branch
, "refs/heads/", &branch_name
);
1927 fprintf(s
->fp
, "# branch.head %s%c", branch_name
, eol
);
1930 /* Lookup stats on the upstream tracking branch, if set. */
1931 branch
= branch_get(branch_name
);
1933 ab_info
= (stat_tracking_info(branch
, &nr_ahead
, &nr_behind
, &base
) == 0);
1935 base
= shorten_unambiguous_ref(base
, 0);
1936 fprintf(s
->fp
, "# branch.upstream %s%c", base
, eol
);
1940 fprintf(s
->fp
, "# branch.ab +%d -%d%c", nr_ahead
, nr_behind
, eol
);
1946 free(state
.detached_from
);
1950 * Convert various submodule status values into a
1951 * fixed-length string of characters in the buffer provided.
1953 static void wt_porcelain_v2_submodule_state(
1954 struct wt_status_change_data
*d
,
1957 if (S_ISGITLINK(d
->mode_head
) ||
1958 S_ISGITLINK(d
->mode_index
) ||
1959 S_ISGITLINK(d
->mode_worktree
)) {
1961 sub
[1] = d
->new_submodule_commits
? 'C' : '.';
1962 sub
[2] = (d
->dirty_submodule
& DIRTY_SUBMODULE_MODIFIED
) ? 'M' : '.';
1963 sub
[3] = (d
->dirty_submodule
& DIRTY_SUBMODULE_UNTRACKED
) ? 'U' : '.';
1974 * Fix-up changed entries before we print them.
1976 static void wt_porcelain_v2_fix_up_changed(
1977 struct string_list_item
*it
,
1978 struct wt_status
*s
)
1980 struct wt_status_change_data
*d
= it
->util
;
1982 if (!d
->index_status
) {
1984 * This entry is unchanged in the index (relative to the head).
1985 * Therefore, the collect_updated_cb was never called for this
1986 * entry (during the head-vs-index scan) and so the head column
1987 * fields were never set.
1989 * We must have data for the index column (from the
1990 * index-vs-worktree scan (otherwise, this entry should not be
1991 * in the list of changes)).
1993 * Copy index column fields to the head column, so that our
1994 * output looks complete.
1996 assert(d
->mode_head
== 0);
1997 d
->mode_head
= d
->mode_index
;
1998 oidcpy(&d
->oid_head
, &d
->oid_index
);
2001 if (!d
->worktree_status
) {
2003 * This entry is unchanged in the worktree (relative to the index).
2004 * Therefore, the collect_changed_cb was never called for this entry
2005 * (during the index-vs-worktree scan) and so the worktree column
2006 * fields were never set.
2008 * We must have data for the index column (from the head-vs-index
2011 * Copy the index column fields to the worktree column so that
2012 * our output looks complete.
2014 * Note that we only have a mode field in the worktree column
2015 * because the scan code tries really hard to not have to compute it.
2017 assert(d
->mode_worktree
== 0);
2018 d
->mode_worktree
= d
->mode_index
;
2023 * Print porcelain v2 info for tracked entries with changes.
2025 static void wt_porcelain_v2_print_changed_entry(
2026 struct string_list_item
*it
,
2027 struct wt_status
*s
)
2029 struct wt_status_change_data
*d
= it
->util
;
2030 struct strbuf buf_index
= STRBUF_INIT
;
2031 struct strbuf buf_head
= STRBUF_INIT
;
2032 const char *path_index
= NULL
;
2033 const char *path_head
= NULL
;
2035 char submodule_token
[5];
2036 char sep_char
, eol_char
;
2038 wt_porcelain_v2_fix_up_changed(it
, s
);
2039 wt_porcelain_v2_submodule_state(d
, submodule_token
);
2041 key
[0] = d
->index_status
? d
->index_status
: '.';
2042 key
[1] = d
->worktree_status
? d
->worktree_status
: '.';
2045 if (s
->null_termination
) {
2047 * In -z mode, we DO NOT C-quote pathnames. Current path is ALWAYS first.
2048 * A single NUL character separates them.
2052 path_index
= it
->string
;
2053 path_head
= d
->head_path
;
2056 * Path(s) are C-quoted if necessary. Current path is ALWAYS first.
2057 * The source path is only present when necessary.
2058 * A single TAB separates them (because paths can contain spaces
2059 * which are not escaped and C-quoting does escape TAB characters).
2063 path_index
= quote_path(it
->string
, s
->prefix
, &buf_index
);
2065 path_head
= quote_path(d
->head_path
, s
->prefix
, &buf_head
);
2069 fprintf(s
->fp
, "2 %s %s %06o %06o %06o %s %s %c%d %s%c%s%c",
2070 key
, submodule_token
,
2071 d
->mode_head
, d
->mode_index
, d
->mode_worktree
,
2072 oid_to_hex(&d
->oid_head
), oid_to_hex(&d
->oid_index
),
2074 path_index
, sep_char
, path_head
, eol_char
);
2076 fprintf(s
->fp
, "1 %s %s %06o %06o %06o %s %s %s%c",
2077 key
, submodule_token
,
2078 d
->mode_head
, d
->mode_index
, d
->mode_worktree
,
2079 oid_to_hex(&d
->oid_head
), oid_to_hex(&d
->oid_index
),
2080 path_index
, eol_char
);
2082 strbuf_release(&buf_index
);
2083 strbuf_release(&buf_head
);
2087 * Print porcelain v2 status info for unmerged entries.
2089 static void wt_porcelain_v2_print_unmerged_entry(
2090 struct string_list_item
*it
,
2091 struct wt_status
*s
)
2093 struct wt_status_change_data
*d
= it
->util
;
2094 const struct cache_entry
*ce
;
2095 struct strbuf buf_index
= STRBUF_INIT
;
2096 const char *path_index
= NULL
;
2097 int pos
, stage
, sum
;
2100 struct object_id oid
;
2103 char submodule_token
[5];
2104 char unmerged_prefix
= 'u';
2105 char eol_char
= s
->null_termination
? '\0' : '\n';
2107 wt_porcelain_v2_submodule_state(d
, submodule_token
);
2109 switch (d
->stagemask
) {
2110 case 1: key
= "DD"; break; /* both deleted */
2111 case 2: key
= "AU"; break; /* added by us */
2112 case 3: key
= "UD"; break; /* deleted by them */
2113 case 4: key
= "UA"; break; /* added by them */
2114 case 5: key
= "DU"; break; /* deleted by us */
2115 case 6: key
= "AA"; break; /* both added */
2116 case 7: key
= "UU"; break; /* both modified */
2118 die("BUG: unhandled unmerged status %x", d
->stagemask
);
2122 * Disregard d.aux.porcelain_v2 data that we accumulated
2123 * for the head and index columns during the scans and
2124 * replace with the actual stage data.
2126 * Note that this is a last-one-wins for each the individual
2127 * stage [123] columns in the event of multiple cache entries
2130 memset(stages
, 0, sizeof(stages
));
2132 pos
= cache_name_pos(it
->string
, strlen(it
->string
));
2135 while (pos
< active_nr
) {
2136 ce
= active_cache
[pos
++];
2137 stage
= ce_stage(ce
);
2138 if (strcmp(ce
->name
, it
->string
) || !stage
)
2140 stages
[stage
- 1].mode
= ce
->ce_mode
;
2141 oidcpy(&stages
[stage
- 1].oid
, &ce
->oid
);
2142 sum
|= (1 << (stage
- 1));
2144 if (sum
!= d
->stagemask
)
2145 die("BUG: observed stagemask 0x%x != expected stagemask 0x%x", sum
, d
->stagemask
);
2147 if (s
->null_termination
)
2148 path_index
= it
->string
;
2150 path_index
= quote_path(it
->string
, s
->prefix
, &buf_index
);
2152 fprintf(s
->fp
, "%c %s %s %06o %06o %06o %06o %s %s %s %s%c",
2153 unmerged_prefix
, key
, submodule_token
,
2154 stages
[0].mode
, /* stage 1 */
2155 stages
[1].mode
, /* stage 2 */
2156 stages
[2].mode
, /* stage 3 */
2158 oid_to_hex(&stages
[0].oid
), /* stage 1 */
2159 oid_to_hex(&stages
[1].oid
), /* stage 2 */
2160 oid_to_hex(&stages
[2].oid
), /* stage 3 */
2164 strbuf_release(&buf_index
);
2168 * Print porcelain V2 status info for untracked and ignored entries.
2170 static void wt_porcelain_v2_print_other(
2171 struct string_list_item
*it
,
2172 struct wt_status
*s
,
2175 struct strbuf buf
= STRBUF_INIT
;
2179 if (s
->null_termination
) {
2183 path
= quote_path(it
->string
, s
->prefix
, &buf
);
2187 fprintf(s
->fp
, "%c %s%c", prefix
, path
, eol_char
);
2189 strbuf_release(&buf
);
2193 * Print porcelain V2 status.
2196 * [<v2_changed_items>]*
2197 * [<v2_unmerged_items>]*
2198 * [<v2_untracked_items>]*
2199 * [<v2_ignored_items>]*
2202 static void wt_porcelain_v2_print(struct wt_status
*s
)
2204 struct wt_status_change_data
*d
;
2205 struct string_list_item
*it
;
2209 wt_porcelain_v2_print_tracking(s
);
2211 for (i
= 0; i
< s
->change
.nr
; i
++) {
2212 it
= &(s
->change
.items
[i
]);
2215 wt_porcelain_v2_print_changed_entry(it
, s
);
2218 for (i
= 0; i
< s
->change
.nr
; i
++) {
2219 it
= &(s
->change
.items
[i
]);
2222 wt_porcelain_v2_print_unmerged_entry(it
, s
);
2225 for (i
= 0; i
< s
->untracked
.nr
; i
++) {
2226 it
= &(s
->untracked
.items
[i
]);
2227 wt_porcelain_v2_print_other(it
, s
, '?');
2230 for (i
= 0; i
< s
->ignored
.nr
; i
++) {
2231 it
= &(s
->ignored
.items
[i
]);
2232 wt_porcelain_v2_print_other(it
, s
, '!');
2236 void wt_status_print(struct wt_status
*s
)
2238 switch (s
->status_format
) {
2239 case STATUS_FORMAT_SHORT
:
2240 wt_shortstatus_print(s
);
2242 case STATUS_FORMAT_PORCELAIN
:
2243 wt_porcelain_print(s
);
2245 case STATUS_FORMAT_PORCELAIN_V2
:
2246 wt_porcelain_v2_print(s
);
2248 case STATUS_FORMAT_UNSPECIFIED
:
2249 die("BUG: finalize_deferred_config() should have been called");
2251 case STATUS_FORMAT_NONE
:
2252 case STATUS_FORMAT_LONG
:
2253 wt_longstatus_print(s
);
2259 * Returns 1 if there are unstaged changes, 0 otherwise.
2261 int has_unstaged_changes(int ignore_submodules
)
2263 struct rev_info rev_info
;
2266 init_revisions(&rev_info
, NULL
);
2267 if (ignore_submodules
)
2268 DIFF_OPT_SET(&rev_info
.diffopt
, IGNORE_SUBMODULES
);
2269 DIFF_OPT_SET(&rev_info
.diffopt
, QUICK
);
2270 diff_setup_done(&rev_info
.diffopt
);
2271 result
= run_diff_files(&rev_info
, 0);
2272 return diff_result_code(&rev_info
.diffopt
, result
);
2276 * Returns 1 if there are uncommitted changes, 0 otherwise.
2278 int has_uncommitted_changes(int ignore_submodules
)
2280 struct rev_info rev_info
;
2283 if (is_cache_unborn())
2286 init_revisions(&rev_info
, NULL
);
2287 if (ignore_submodules
)
2288 DIFF_OPT_SET(&rev_info
.diffopt
, IGNORE_SUBMODULES
);
2289 DIFF_OPT_SET(&rev_info
.diffopt
, QUICK
);
2290 add_head_to_pending(&rev_info
);
2291 diff_setup_done(&rev_info
.diffopt
);
2292 result
= run_diff_index(&rev_info
, 1);
2293 return diff_result_code(&rev_info
.diffopt
, result
);
2297 * If the work tree has unstaged or uncommitted changes, dies with the
2298 * appropriate message.
2300 int require_clean_work_tree(const char *action
, const char *hint
, int ignore_submodules
, int gently
)
2302 struct lock_file
*lock_file
= xcalloc(1, sizeof(*lock_file
));
2305 fd
= hold_locked_index(lock_file
, 0);
2306 refresh_cache(REFRESH_QUIET
);
2308 update_index_if_able(&the_index
, lock_file
);
2309 rollback_lock_file(lock_file
);
2311 if (has_unstaged_changes(ignore_submodules
)) {
2312 /* TRANSLATORS: the action is e.g. "pull with rebase" */
2313 error(_("cannot %s: You have unstaged changes."), _(action
));
2317 if (has_uncommitted_changes(ignore_submodules
)) {
2319 error(_("additionally, your index contains uncommitted changes."));
2321 error(_("cannot %s: Your index contains uncommitted changes."),