11 #include "run-command.h"
14 #include "submodule.h"
18 static char default_wt_status_colors
[][COLOR_MAXLEN
] = {
19 GIT_COLOR_NORMAL
, /* WT_STATUS_HEADER */
20 GIT_COLOR_GREEN
, /* WT_STATUS_UPDATED */
21 GIT_COLOR_RED
, /* WT_STATUS_CHANGED */
22 GIT_COLOR_RED
, /* WT_STATUS_UNTRACKED */
23 GIT_COLOR_RED
, /* WT_STATUS_NOBRANCH */
24 GIT_COLOR_RED
, /* WT_STATUS_UNMERGED */
25 GIT_COLOR_GREEN
, /* WT_STATUS_LOCAL_BRANCH */
26 GIT_COLOR_RED
, /* WT_STATUS_REMOTE_BRANCH */
27 GIT_COLOR_NIL
, /* WT_STATUS_ONBRANCH */
30 static const char *color(int slot
, struct wt_status
*s
)
33 if (want_color(s
->use_color
))
34 c
= s
->color_palette
[slot
];
35 if (slot
== WT_STATUS_ONBRANCH
&& color_is_nil(c
))
36 c
= s
->color_palette
[WT_STATUS_HEADER
];
40 static void status_vprintf(struct wt_status
*s
, int at_bol
, const char *color
,
41 const char *fmt
, va_list ap
, const char *trail
)
43 struct strbuf sb
= STRBUF_INIT
;
44 struct strbuf linebuf
= STRBUF_INIT
;
45 const char *line
, *eol
;
47 strbuf_vaddf(&sb
, fmt
, ap
);
49 strbuf_addch(&sb
, comment_line_char
);
51 strbuf_addch(&sb
, ' ');
52 color_print_strbuf(s
->fp
, color
, &sb
);
54 fprintf(s
->fp
, "%s", trail
);
58 for (line
= sb
.buf
; *line
; line
= eol
+ 1) {
59 eol
= strchr(line
, '\n');
61 strbuf_reset(&linebuf
);
63 strbuf_addch(&linebuf
, comment_line_char
);
64 if (*line
!= '\n' && *line
!= '\t')
65 strbuf_addch(&linebuf
, ' ');
68 strbuf_add(&linebuf
, line
, eol
- line
);
70 strbuf_addstr(&linebuf
, line
);
71 color_print_strbuf(s
->fp
, color
, &linebuf
);
79 fprintf(s
->fp
, "%s", trail
);
80 strbuf_release(&linebuf
);
84 void status_printf_ln(struct wt_status
*s
, const char *color
,
90 status_vprintf(s
, 1, color
, fmt
, ap
, "\n");
94 void status_printf(struct wt_status
*s
, const char *color
,
100 status_vprintf(s
, 1, color
, fmt
, ap
, NULL
);
104 static void status_printf_more(struct wt_status
*s
, const char *color
,
105 const char *fmt
, ...)
110 status_vprintf(s
, 0, color
, fmt
, ap
, NULL
);
114 void wt_status_prepare(struct wt_status
*s
)
116 unsigned char sha1
[20];
118 memset(s
, 0, sizeof(*s
));
119 memcpy(s
->color_palette
, default_wt_status_colors
,
120 sizeof(default_wt_status_colors
));
121 s
->show_untracked_files
= SHOW_NORMAL_UNTRACKED_FILES
;
123 s
->relative_paths
= 1;
124 s
->branch
= resolve_refdup("HEAD", sha1
, 0, NULL
);
125 s
->reference
= "HEAD";
127 s
->index_file
= get_index_file();
128 s
->change
.strdup_strings
= 1;
129 s
->untracked
.strdup_strings
= 1;
130 s
->ignored
.strdup_strings
= 1;
131 s
->show_branch
= -1; /* unspecified */
134 static void wt_status_print_unmerged_header(struct wt_status
*s
)
137 int del_mod_conflict
= 0;
138 int both_deleted
= 0;
140 const char *c
= color(WT_STATUS_HEADER
, s
);
142 status_printf_ln(s
, c
, _("Unmerged paths:"));
144 for (i
= 0; i
< s
->change
.nr
; i
++) {
145 struct string_list_item
*it
= &(s
->change
.items
[i
]);
146 struct wt_status_change_data
*d
= it
->util
;
148 switch (d
->stagemask
) {
156 del_mod_conflict
= 1;
164 if (!advice_status_hints
)
166 if (s
->whence
!= FROM_COMMIT
)
168 else if (!s
->is_initial
)
169 status_printf_ln(s
, c
, _(" (use \"git reset %s <file>...\" to unstage)"), s
->reference
);
171 status_printf_ln(s
, c
, _(" (use \"git rm --cached <file>...\" to unstage)"));
174 if (!del_mod_conflict
)
175 status_printf_ln(s
, c
, _(" (use \"git add <file>...\" to mark resolution)"));
177 status_printf_ln(s
, c
, _(" (use \"git add/rm <file>...\" as appropriate to mark resolution)"));
178 } else if (!del_mod_conflict
&& !not_deleted
) {
179 status_printf_ln(s
, c
, _(" (use \"git rm <file>...\" to mark resolution)"));
181 status_printf_ln(s
, c
, _(" (use \"git add/rm <file>...\" as appropriate to mark resolution)"));
183 status_printf_ln(s
, c
, "");
186 static void wt_status_print_cached_header(struct wt_status
*s
)
188 const char *c
= color(WT_STATUS_HEADER
, s
);
190 status_printf_ln(s
, c
, _("Changes to be committed:"));
191 if (!advice_status_hints
)
193 if (s
->whence
!= FROM_COMMIT
)
194 ; /* NEEDSWORK: use "git reset --unresolve"??? */
195 else if (!s
->is_initial
)
196 status_printf_ln(s
, c
, _(" (use \"git reset %s <file>...\" to unstage)"), s
->reference
);
198 status_printf_ln(s
, c
, _(" (use \"git rm --cached <file>...\" to unstage)"));
199 status_printf_ln(s
, c
, "");
202 static void wt_status_print_dirty_header(struct wt_status
*s
,
204 int has_dirty_submodules
)
206 const char *c
= color(WT_STATUS_HEADER
, s
);
208 status_printf_ln(s
, c
, _("Changes not staged for commit:"));
209 if (!advice_status_hints
)
212 status_printf_ln(s
, c
, _(" (use \"git add <file>...\" to update what will be committed)"));
214 status_printf_ln(s
, c
, _(" (use \"git add/rm <file>...\" to update what will be committed)"));
215 status_printf_ln(s
, c
, _(" (use \"git checkout -- <file>...\" to discard changes in working directory)"));
216 if (has_dirty_submodules
)
217 status_printf_ln(s
, c
, _(" (commit or discard the untracked or modified content in submodules)"));
218 status_printf_ln(s
, c
, "");
221 static void wt_status_print_other_header(struct wt_status
*s
,
225 const char *c
= color(WT_STATUS_HEADER
, s
);
226 status_printf_ln(s
, c
, "%s:", what
);
227 if (!advice_status_hints
)
229 status_printf_ln(s
, c
, _(" (use \"git %s <file>...\" to include in what will be committed)"), how
);
230 status_printf_ln(s
, c
, "");
233 static void wt_status_print_trailer(struct wt_status
*s
)
235 status_printf_ln(s
, color(WT_STATUS_HEADER
, s
), "");
238 #define quote_path quote_path_relative
240 static void wt_status_print_unmerged_data(struct wt_status
*s
,
241 struct string_list_item
*it
)
243 const char *c
= color(WT_STATUS_UNMERGED
, s
);
244 struct wt_status_change_data
*d
= it
->util
;
245 struct strbuf onebuf
= STRBUF_INIT
;
246 const char *one
, *how
= _("bug");
248 one
= quote_path(it
->string
, s
->prefix
, &onebuf
);
249 status_printf(s
, color(WT_STATUS_HEADER
, s
), "\t");
250 switch (d
->stagemask
) {
251 case 1: how
= _("both deleted:"); break;
252 case 2: how
= _("added by us:"); break;
253 case 3: how
= _("deleted by them:"); break;
254 case 4: how
= _("added by them:"); break;
255 case 5: how
= _("deleted by us:"); break;
256 case 6: how
= _("both added:"); break;
257 case 7: how
= _("both modified:"); break;
259 status_printf_more(s
, c
, "%-20s%s\n", how
, one
);
260 strbuf_release(&onebuf
);
263 static void wt_status_print_change_data(struct wt_status
*s
,
265 struct string_list_item
*it
)
267 struct wt_status_change_data
*d
= it
->util
;
268 const char *c
= color(change_type
, s
);
272 const char *one
, *two
;
273 struct strbuf onebuf
= STRBUF_INIT
, twobuf
= STRBUF_INIT
;
274 struct strbuf extra
= STRBUF_INIT
;
276 one_name
= two_name
= it
->string
;
277 switch (change_type
) {
278 case WT_STATUS_UPDATED
:
279 status
= d
->index_status
;
281 one_name
= d
->head_path
;
283 case WT_STATUS_CHANGED
:
284 if (d
->new_submodule_commits
|| d
->dirty_submodule
) {
285 strbuf_addstr(&extra
, " (");
286 if (d
->new_submodule_commits
)
287 strbuf_addf(&extra
, _("new commits, "));
288 if (d
->dirty_submodule
& DIRTY_SUBMODULE_MODIFIED
)
289 strbuf_addf(&extra
, _("modified content, "));
290 if (d
->dirty_submodule
& DIRTY_SUBMODULE_UNTRACKED
)
291 strbuf_addf(&extra
, _("untracked content, "));
292 strbuf_setlen(&extra
, extra
.len
- 2);
293 strbuf_addch(&extra
, ')');
295 status
= d
->worktree_status
;
298 die("BUG: unhandled change_type %d in wt_status_print_change_data",
302 one
= quote_path(one_name
, s
->prefix
, &onebuf
);
303 two
= quote_path(two_name
, s
->prefix
, &twobuf
);
305 status_printf(s
, color(WT_STATUS_HEADER
, s
), "\t");
307 case DIFF_STATUS_ADDED
:
308 status_printf_more(s
, c
, _("new file: %s"), one
);
310 case DIFF_STATUS_COPIED
:
311 status_printf_more(s
, c
, _("copied: %s -> %s"), one
, two
);
313 case DIFF_STATUS_DELETED
:
314 status_printf_more(s
, c
, _("deleted: %s"), one
);
316 case DIFF_STATUS_MODIFIED
:
317 status_printf_more(s
, c
, _("modified: %s"), one
);
319 case DIFF_STATUS_RENAMED
:
320 status_printf_more(s
, c
, _("renamed: %s -> %s"), one
, two
);
322 case DIFF_STATUS_TYPE_CHANGED
:
323 status_printf_more(s
, c
, _("typechange: %s"), one
);
325 case DIFF_STATUS_UNKNOWN
:
326 status_printf_more(s
, c
, _("unknown: %s"), one
);
328 case DIFF_STATUS_UNMERGED
:
329 status_printf_more(s
, c
, _("unmerged: %s"), one
);
332 die(_("bug: unhandled diff status %c"), status
);
335 status_printf_more(s
, color(WT_STATUS_HEADER
, s
), "%s", extra
.buf
);
336 strbuf_release(&extra
);
338 status_printf_more(s
, GIT_COLOR_NORMAL
, "\n");
339 strbuf_release(&onebuf
);
340 strbuf_release(&twobuf
);
343 static void wt_status_collect_changed_cb(struct diff_queue_struct
*q
,
344 struct diff_options
*options
,
347 struct wt_status
*s
= data
;
352 s
->workdir_dirty
= 1;
353 for (i
= 0; i
< q
->nr
; i
++) {
354 struct diff_filepair
*p
;
355 struct string_list_item
*it
;
356 struct wt_status_change_data
*d
;
359 it
= string_list_insert(&s
->change
, p
->one
->path
);
362 d
= xcalloc(1, sizeof(*d
));
365 if (!d
->worktree_status
)
366 d
->worktree_status
= p
->status
;
367 d
->dirty_submodule
= p
->two
->dirty_submodule
;
368 if (S_ISGITLINK(p
->two
->mode
))
369 d
->new_submodule_commits
= !!hashcmp(p
->one
->sha1
, p
->two
->sha1
);
373 static int unmerged_mask(const char *path
)
376 const struct cache_entry
*ce
;
378 pos
= cache_name_pos(path
, strlen(path
));
384 while (pos
< active_nr
) {
385 ce
= active_cache
[pos
++];
386 if (strcmp(ce
->name
, path
) || !ce_stage(ce
))
388 mask
|= (1 << (ce_stage(ce
) - 1));
393 static void wt_status_collect_updated_cb(struct diff_queue_struct
*q
,
394 struct diff_options
*options
,
397 struct wt_status
*s
= data
;
400 for (i
= 0; i
< q
->nr
; i
++) {
401 struct diff_filepair
*p
;
402 struct string_list_item
*it
;
403 struct wt_status_change_data
*d
;
406 it
= string_list_insert(&s
->change
, p
->two
->path
);
409 d
= xcalloc(1, sizeof(*d
));
412 if (!d
->index_status
)
413 d
->index_status
= p
->status
;
415 case DIFF_STATUS_COPIED
:
416 case DIFF_STATUS_RENAMED
:
417 d
->head_path
= xstrdup(p
->one
->path
);
419 case DIFF_STATUS_UNMERGED
:
420 d
->stagemask
= unmerged_mask(p
->two
->path
);
426 static void wt_status_collect_changes_worktree(struct wt_status
*s
)
430 init_revisions(&rev
, NULL
);
431 setup_revisions(0, NULL
, &rev
, NULL
);
432 rev
.diffopt
.output_format
|= DIFF_FORMAT_CALLBACK
;
433 DIFF_OPT_SET(&rev
.diffopt
, DIRTY_SUBMODULES
);
434 if (!s
->show_untracked_files
)
435 DIFF_OPT_SET(&rev
.diffopt
, IGNORE_UNTRACKED_IN_SUBMODULES
);
436 if (s
->ignore_submodule_arg
) {
437 DIFF_OPT_SET(&rev
.diffopt
, OVERRIDE_SUBMODULE_CONFIG
);
438 handle_ignore_submodules_arg(&rev
.diffopt
, s
->ignore_submodule_arg
);
440 rev
.diffopt
.format_callback
= wt_status_collect_changed_cb
;
441 rev
.diffopt
.format_callback_data
= s
;
442 copy_pathspec(&rev
.prune_data
, &s
->pathspec
);
443 run_diff_files(&rev
, 0);
446 static void wt_status_collect_changes_index(struct wt_status
*s
)
449 struct setup_revision_opt opt
;
451 init_revisions(&rev
, NULL
);
452 memset(&opt
, 0, sizeof(opt
));
453 opt
.def
= s
->is_initial
? EMPTY_TREE_SHA1_HEX
: s
->reference
;
454 setup_revisions(0, NULL
, &rev
, &opt
);
456 if (s
->ignore_submodule_arg
) {
457 DIFF_OPT_SET(&rev
.diffopt
, OVERRIDE_SUBMODULE_CONFIG
);
458 handle_ignore_submodules_arg(&rev
.diffopt
, s
->ignore_submodule_arg
);
461 rev
.diffopt
.output_format
|= DIFF_FORMAT_CALLBACK
;
462 rev
.diffopt
.format_callback
= wt_status_collect_updated_cb
;
463 rev
.diffopt
.format_callback_data
= s
;
464 rev
.diffopt
.detect_rename
= 1;
465 rev
.diffopt
.rename_limit
= 200;
466 rev
.diffopt
.break_opt
= 0;
467 copy_pathspec(&rev
.prune_data
, &s
->pathspec
);
468 run_diff_index(&rev
, 1);
471 static void wt_status_collect_changes_initial(struct wt_status
*s
)
475 for (i
= 0; i
< active_nr
; i
++) {
476 struct string_list_item
*it
;
477 struct wt_status_change_data
*d
;
478 const struct cache_entry
*ce
= active_cache
[i
];
480 if (!ce_path_match(ce
, &s
->pathspec
))
482 it
= string_list_insert(&s
->change
, ce
->name
);
485 d
= xcalloc(1, sizeof(*d
));
489 d
->index_status
= DIFF_STATUS_UNMERGED
;
490 d
->stagemask
|= (1 << (ce_stage(ce
) - 1));
493 d
->index_status
= DIFF_STATUS_ADDED
;
497 static void wt_status_collect_untracked(struct wt_status
*s
)
500 struct dir_struct dir
;
501 struct timeval t_begin
;
503 if (!s
->show_untracked_files
)
506 if (advice_status_u_option
)
507 gettimeofday(&t_begin
, NULL
);
509 memset(&dir
, 0, sizeof(dir
));
510 if (s
->show_untracked_files
!= SHOW_ALL_UNTRACKED_FILES
)
512 DIR_SHOW_OTHER_DIRECTORIES
| DIR_HIDE_EMPTY_DIRECTORIES
;
513 if (s
->show_ignored_files
)
514 dir
.flags
|= DIR_SHOW_IGNORED_TOO
;
515 setup_standard_excludes(&dir
);
517 fill_directory(&dir
, &s
->pathspec
);
519 for (i
= 0; i
< dir
.nr
; i
++) {
520 struct dir_entry
*ent
= dir
.entries
[i
];
521 if (cache_name_is_other(ent
->name
, ent
->len
) &&
522 match_pathspec_depth(&s
->pathspec
, ent
->name
, ent
->len
, 0, NULL
))
523 string_list_insert(&s
->untracked
, ent
->name
);
527 for (i
= 0; i
< dir
.ignored_nr
; i
++) {
528 struct dir_entry
*ent
= dir
.ignored
[i
];
529 if (cache_name_is_other(ent
->name
, ent
->len
) &&
530 match_pathspec_depth(&s
->pathspec
, ent
->name
, ent
->len
, 0, NULL
))
531 string_list_insert(&s
->ignored
, ent
->name
);
537 clear_directory(&dir
);
539 if (advice_status_u_option
) {
540 struct timeval t_end
;
541 gettimeofday(&t_end
, NULL
);
543 (uint64_t)t_end
.tv_sec
* 1000 + t_end
.tv_usec
/ 1000 -
544 ((uint64_t)t_begin
.tv_sec
* 1000 + t_begin
.tv_usec
/ 1000);
548 void wt_status_collect(struct wt_status
*s
)
550 wt_status_collect_changes_worktree(s
);
553 wt_status_collect_changes_initial(s
);
555 wt_status_collect_changes_index(s
);
556 wt_status_collect_untracked(s
);
559 static void wt_status_print_unmerged(struct wt_status
*s
)
561 int shown_header
= 0;
564 for (i
= 0; i
< s
->change
.nr
; i
++) {
565 struct wt_status_change_data
*d
;
566 struct string_list_item
*it
;
567 it
= &(s
->change
.items
[i
]);
572 wt_status_print_unmerged_header(s
);
575 wt_status_print_unmerged_data(s
, it
);
578 wt_status_print_trailer(s
);
582 static void wt_status_print_updated(struct wt_status
*s
)
584 int shown_header
= 0;
587 for (i
= 0; i
< s
->change
.nr
; i
++) {
588 struct wt_status_change_data
*d
;
589 struct string_list_item
*it
;
590 it
= &(s
->change
.items
[i
]);
592 if (!d
->index_status
||
593 d
->index_status
== DIFF_STATUS_UNMERGED
)
596 wt_status_print_cached_header(s
);
600 wt_status_print_change_data(s
, WT_STATUS_UPDATED
, it
);
603 wt_status_print_trailer(s
);
609 * 1 : some change but no delete
611 static int wt_status_check_worktree_changes(struct wt_status
*s
,
612 int *dirty_submodules
)
617 *dirty_submodules
= 0;
619 for (i
= 0; i
< s
->change
.nr
; i
++) {
620 struct wt_status_change_data
*d
;
621 d
= s
->change
.items
[i
].util
;
622 if (!d
->worktree_status
||
623 d
->worktree_status
== DIFF_STATUS_UNMERGED
)
627 if (d
->dirty_submodule
)
628 *dirty_submodules
= 1;
629 if (d
->worktree_status
== DIFF_STATUS_DELETED
)
635 static void wt_status_print_changed(struct wt_status
*s
)
637 int i
, dirty_submodules
;
638 int worktree_changes
= wt_status_check_worktree_changes(s
, &dirty_submodules
);
640 if (!worktree_changes
)
643 wt_status_print_dirty_header(s
, worktree_changes
< 0, dirty_submodules
);
645 for (i
= 0; i
< s
->change
.nr
; i
++) {
646 struct wt_status_change_data
*d
;
647 struct string_list_item
*it
;
648 it
= &(s
->change
.items
[i
]);
650 if (!d
->worktree_status
||
651 d
->worktree_status
== DIFF_STATUS_UNMERGED
)
653 wt_status_print_change_data(s
, WT_STATUS_CHANGED
, it
);
655 wt_status_print_trailer(s
);
658 static void wt_status_print_submodule_summary(struct wt_status
*s
, int uncommitted
)
660 struct child_process sm_summary
;
661 char summary_limit
[64];
662 char index
[PATH_MAX
];
663 const char *env
[] = { NULL
, NULL
};
667 argv
[0] = "submodule";
669 argv
[2] = uncommitted
? "--files" : "--cached";
670 argv
[3] = "--for-status";
671 argv
[4] = "--summary-limit";
672 argv
[5] = summary_limit
;
673 argv
[6] = uncommitted
? NULL
: (s
->amend
? "HEAD^" : "HEAD");
676 sprintf(summary_limit
, "%d", s
->submodule_summary
);
677 snprintf(index
, sizeof(index
), "GIT_INDEX_FILE=%s", s
->index_file
);
679 memset(&sm_summary
, 0, sizeof(sm_summary
));
680 sm_summary
.argv
= argv
;
681 sm_summary
.env
= env
;
682 sm_summary
.git_cmd
= 1;
683 sm_summary
.no_stdin
= 1;
685 sm_summary
.out
= dup(fileno(s
->fp
)); /* run_command closes it */
686 run_command(&sm_summary
);
689 static void wt_status_print_other(struct wt_status
*s
,
690 struct string_list
*l
,
695 struct strbuf buf
= STRBUF_INIT
;
696 static struct string_list output
= STRING_LIST_INIT_DUP
;
697 struct column_options copts
;
702 wt_status_print_other_header(s
, what
, how
);
704 for (i
= 0; i
< l
->nr
; i
++) {
705 struct string_list_item
*it
;
708 path
= quote_path(it
->string
, s
->prefix
, &buf
);
709 if (column_active(s
->colopts
)) {
710 string_list_append(&output
, path
);
713 status_printf(s
, color(WT_STATUS_HEADER
, s
), "\t");
714 status_printf_more(s
, color(WT_STATUS_UNTRACKED
, s
),
718 strbuf_release(&buf
);
719 if (!column_active(s
->colopts
))
722 strbuf_addf(&buf
, "%s#\t%s",
723 color(WT_STATUS_HEADER
, s
),
724 color(WT_STATUS_UNTRACKED
, s
));
725 memset(&copts
, 0, sizeof(copts
));
727 copts
.indent
= buf
.buf
;
728 if (want_color(s
->use_color
))
729 copts
.nl
= GIT_COLOR_RESET
"\n";
730 print_columns(&output
, s
->colopts
, &copts
);
731 string_list_clear(&output
, 0);
732 strbuf_release(&buf
);
735 static void wt_status_print_verbose(struct wt_status
*s
)
738 struct setup_revision_opt opt
;
740 init_revisions(&rev
, NULL
);
741 DIFF_OPT_SET(&rev
.diffopt
, ALLOW_TEXTCONV
);
743 memset(&opt
, 0, sizeof(opt
));
744 opt
.def
= s
->is_initial
? EMPTY_TREE_SHA1_HEX
: s
->reference
;
745 setup_revisions(0, NULL
, &rev
, &opt
);
747 rev
.diffopt
.output_format
|= DIFF_FORMAT_PATCH
;
748 rev
.diffopt
.detect_rename
= 1;
749 rev
.diffopt
.file
= s
->fp
;
750 rev
.diffopt
.close_file
= 0;
752 * If we're not going to stdout, then we definitely don't
753 * want color, since we are going to the commit message
754 * file (and even the "auto" setting won't work, since it
755 * will have checked isatty on stdout).
758 rev
.diffopt
.use_color
= 0;
759 run_diff_index(&rev
, 1);
762 static void wt_status_print_tracking(struct wt_status
*s
)
764 struct strbuf sb
= STRBUF_INIT
;
766 struct branch
*branch
;
768 assert(s
->branch
&& !s
->is_initial
);
769 if (prefixcmp(s
->branch
, "refs/heads/"))
771 branch
= branch_get(s
->branch
+ 11);
772 if (!format_tracking_info(branch
, &sb
))
775 for (cp
= sb
.buf
; (ep
= strchr(cp
, '\n')) != NULL
; cp
= ep
+ 1)
776 color_fprintf_ln(s
->fp
, color(WT_STATUS_HEADER
, s
),
777 "%c %.*s", comment_line_char
,
779 color_fprintf_ln(s
->fp
, color(WT_STATUS_HEADER
, s
), "%c",
783 static int has_unmerged(struct wt_status
*s
)
787 for (i
= 0; i
< s
->change
.nr
; i
++) {
788 struct wt_status_change_data
*d
;
789 d
= s
->change
.items
[i
].util
;
796 static void show_merge_in_progress(struct wt_status
*s
,
797 struct wt_status_state
*state
,
800 if (has_unmerged(s
)) {
801 status_printf_ln(s
, color
, _("You have unmerged paths."));
802 if (advice_status_hints
)
803 status_printf_ln(s
, color
,
804 _(" (fix conflicts and run \"git commit\")"));
806 status_printf_ln(s
, color
,
807 _("All conflicts fixed but you are still merging."));
808 if (advice_status_hints
)
809 status_printf_ln(s
, color
,
810 _(" (use \"git commit\" to conclude merge)"));
812 wt_status_print_trailer(s
);
815 static void show_am_in_progress(struct wt_status
*s
,
816 struct wt_status_state
*state
,
819 status_printf_ln(s
, color
,
820 _("You are in the middle of an am session."));
821 if (state
->am_empty_patch
)
822 status_printf_ln(s
, color
,
823 _("The current patch is empty."));
824 if (advice_status_hints
) {
825 if (!state
->am_empty_patch
)
826 status_printf_ln(s
, color
,
827 _(" (fix conflicts and then run \"git am --continue\")"));
828 status_printf_ln(s
, color
,
829 _(" (use \"git am --skip\" to skip this patch)"));
830 status_printf_ln(s
, color
,
831 _(" (use \"git am --abort\" to restore the original branch)"));
833 wt_status_print_trailer(s
);
836 static char *read_line_from_git_path(const char *filename
)
838 struct strbuf buf
= STRBUF_INIT
;
839 FILE *fp
= fopen(git_path("%s", filename
), "r");
841 strbuf_release(&buf
);
844 strbuf_getline(&buf
, fp
, '\n');
846 return strbuf_detach(&buf
, NULL
);
848 strbuf_release(&buf
);
853 static int split_commit_in_progress(struct wt_status
*s
)
855 int split_in_progress
= 0;
856 char *head
= read_line_from_git_path("HEAD");
857 char *orig_head
= read_line_from_git_path("ORIG_HEAD");
858 char *rebase_amend
= read_line_from_git_path("rebase-merge/amend");
859 char *rebase_orig_head
= read_line_from_git_path("rebase-merge/orig-head");
861 if (!head
|| !orig_head
|| !rebase_amend
|| !rebase_orig_head
||
862 !s
->branch
|| strcmp(s
->branch
, "HEAD"))
863 return split_in_progress
;
865 if (!strcmp(rebase_amend
, rebase_orig_head
)) {
866 if (strcmp(head
, rebase_amend
))
867 split_in_progress
= 1;
868 } else if (strcmp(orig_head
, rebase_orig_head
)) {
869 split_in_progress
= 1;
872 if (!s
->amend
&& !s
->nowarn
&& !s
->workdir_dirty
)
873 split_in_progress
= 0;
878 free(rebase_orig_head
);
879 return split_in_progress
;
882 static void show_rebase_in_progress(struct wt_status
*s
,
883 struct wt_status_state
*state
,
888 if (has_unmerged(s
)) {
890 status_printf_ln(s
, color
,
891 _("You are currently rebasing branch '%s' on '%s'."),
895 status_printf_ln(s
, color
,
896 _("You are currently rebasing."));
897 if (advice_status_hints
) {
898 status_printf_ln(s
, color
,
899 _(" (fix conflicts and then run \"git rebase --continue\")"));
900 status_printf_ln(s
, color
,
901 _(" (use \"git rebase --skip\" to skip this patch)"));
902 status_printf_ln(s
, color
,
903 _(" (use \"git rebase --abort\" to check out the original branch)"));
905 } else if (state
->rebase_in_progress
|| !stat(git_path("MERGE_MSG"), &st
)) {
907 status_printf_ln(s
, color
,
908 _("You are currently rebasing branch '%s' on '%s'."),
912 status_printf_ln(s
, color
,
913 _("You are currently rebasing."));
914 if (advice_status_hints
)
915 status_printf_ln(s
, color
,
916 _(" (all conflicts fixed: run \"git rebase --continue\")"));
917 } else if (split_commit_in_progress(s
)) {
919 status_printf_ln(s
, color
,
920 _("You are currently splitting a commit while rebasing branch '%s' on '%s'."),
924 status_printf_ln(s
, color
,
925 _("You are currently splitting a commit during a rebase."));
926 if (advice_status_hints
)
927 status_printf_ln(s
, color
,
928 _(" (Once your working directory is clean, run \"git rebase --continue\")"));
931 status_printf_ln(s
, color
,
932 _("You are currently editing a commit while rebasing branch '%s' on '%s'."),
936 status_printf_ln(s
, color
,
937 _("You are currently editing a commit during a rebase."));
938 if (advice_status_hints
&& !s
->amend
) {
939 status_printf_ln(s
, color
,
940 _(" (use \"git commit --amend\" to amend the current commit)"));
941 status_printf_ln(s
, color
,
942 _(" (use \"git rebase --continue\" once you are satisfied with your changes)"));
945 wt_status_print_trailer(s
);
948 static void show_cherry_pick_in_progress(struct wt_status
*s
,
949 struct wt_status_state
*state
,
952 status_printf_ln(s
, color
, _("You are currently cherry-picking."));
953 if (advice_status_hints
) {
955 status_printf_ln(s
, color
,
956 _(" (fix conflicts and run \"git cherry-pick --continue\")"));
958 status_printf_ln(s
, color
,
959 _(" (all conflicts fixed: run \"git cherry-pick --continue\")"));
960 status_printf_ln(s
, color
,
961 _(" (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"));
963 wt_status_print_trailer(s
);
966 static void show_revert_in_progress(struct wt_status
*s
,
967 struct wt_status_state
*state
,
970 status_printf_ln(s
, color
, _("You are currently reverting commit %s."),
971 find_unique_abbrev(state
->revert_head_sha1
, DEFAULT_ABBREV
));
972 if (advice_status_hints
) {
974 status_printf_ln(s
, color
,
975 _(" (fix conflicts and run \"git revert --continue\")"));
977 status_printf_ln(s
, color
,
978 _(" (all conflicts fixed: run \"git revert --continue\")"));
979 status_printf_ln(s
, color
,
980 _(" (use \"git revert --abort\" to cancel the revert operation)"));
982 wt_status_print_trailer(s
);
985 static void show_bisect_in_progress(struct wt_status
*s
,
986 struct wt_status_state
*state
,
990 status_printf_ln(s
, color
,
991 _("You are currently bisecting, started from branch '%s'."),
994 status_printf_ln(s
, color
,
995 _("You are currently bisecting."));
996 if (advice_status_hints
)
997 status_printf_ln(s
, color
,
998 _(" (use \"git bisect reset\" to get back to the original branch)"));
999 wt_status_print_trailer(s
);
1003 * Extract branch information from rebase/bisect
1005 static char *read_and_strip_branch(const char *path
)
1007 struct strbuf sb
= STRBUF_INIT
;
1008 unsigned char sha1
[20];
1010 if (strbuf_read_file(&sb
, git_path("%s", path
), 0) <= 0)
1013 while (&sb
.len
&& sb
.buf
[sb
.len
- 1] == '\n')
1014 strbuf_setlen(&sb
, sb
.len
- 1);
1017 if (!prefixcmp(sb
.buf
, "refs/heads/"))
1018 strbuf_remove(&sb
,0, strlen("refs/heads/"));
1019 else if (!prefixcmp(sb
.buf
, "refs/"))
1021 else if (!get_sha1_hex(sb
.buf
, sha1
)) {
1023 abbrev
= find_unique_abbrev(sha1
, DEFAULT_ABBREV
);
1025 strbuf_addstr(&sb
, abbrev
);
1026 } else if (!strcmp(sb
.buf
, "detached HEAD")) /* rebase */
1030 return strbuf_detach(&sb
, NULL
);
1033 strbuf_release(&sb
);
1037 struct grab_1st_switch_cbdata
{
1039 unsigned char nsha1
[20];
1042 static int grab_1st_switch(unsigned char *osha1
, unsigned char *nsha1
,
1043 const char *email
, unsigned long timestamp
, int tz
,
1044 const char *message
, void *cb_data
)
1046 struct grab_1st_switch_cbdata
*cb
= cb_data
;
1047 const char *target
= NULL
, *end
;
1049 if (prefixcmp(message
, "checkout: moving from "))
1051 message
+= strlen("checkout: moving from ");
1052 target
= strstr(message
, " to ");
1055 target
+= strlen(" to ");
1056 strbuf_reset(&cb
->buf
);
1057 hashcpy(cb
->nsha1
, nsha1
);
1058 for (end
= target
; *end
&& *end
!= '\n'; end
++)
1060 strbuf_add(&cb
->buf
, target
, end
- target
);
1064 static void wt_status_get_detached_from(struct wt_status_state
*state
)
1066 struct grab_1st_switch_cbdata cb
;
1067 struct commit
*commit
;
1068 unsigned char sha1
[20];
1071 strbuf_init(&cb
.buf
, 0);
1072 if (for_each_reflog_ent_reverse("HEAD", grab_1st_switch
, &cb
) <= 0) {
1073 strbuf_release(&cb
.buf
);
1077 if (dwim_ref(cb
.buf
.buf
, cb
.buf
.len
, sha1
, &ref
) == 1 &&
1078 /* sha1 is a commit? match without further lookup */
1079 (!hashcmp(cb
.nsha1
, sha1
) ||
1080 /* perhaps sha1 is a tag, try to dereference to a commit */
1081 ((commit
= lookup_commit_reference_gently(sha1
, 1)) != NULL
&&
1082 !hashcmp(cb
.nsha1
, commit
->object
.sha1
)))) {
1084 if (!prefixcmp(ref
, "refs/tags/"))
1085 ofs
= strlen("refs/tags/");
1086 else if (!prefixcmp(ref
, "refs/remotes/"))
1087 ofs
= strlen("refs/remotes/");
1090 state
->detached_from
= xstrdup(ref
+ ofs
);
1092 state
->detached_from
=
1093 xstrdup(find_unique_abbrev(cb
.nsha1
, DEFAULT_ABBREV
));
1094 hashcpy(state
->detached_sha1
, cb
.nsha1
);
1097 strbuf_release(&cb
.buf
);
1100 void wt_status_get_state(struct wt_status_state
*state
,
1101 int get_detached_from
)
1104 unsigned char sha1
[20];
1106 if (!stat(git_path("MERGE_HEAD"), &st
)) {
1107 state
->merge_in_progress
= 1;
1108 } else if (!stat(git_path("rebase-apply"), &st
)) {
1109 if (!stat(git_path("rebase-apply/applying"), &st
)) {
1110 state
->am_in_progress
= 1;
1111 if (!stat(git_path("rebase-apply/patch"), &st
) && !st
.st_size
)
1112 state
->am_empty_patch
= 1;
1114 state
->rebase_in_progress
= 1;
1115 state
->branch
= read_and_strip_branch("rebase-apply/head-name");
1116 state
->onto
= read_and_strip_branch("rebase-apply/onto");
1118 } else if (!stat(git_path("rebase-merge"), &st
)) {
1119 if (!stat(git_path("rebase-merge/interactive"), &st
))
1120 state
->rebase_interactive_in_progress
= 1;
1122 state
->rebase_in_progress
= 1;
1123 state
->branch
= read_and_strip_branch("rebase-merge/head-name");
1124 state
->onto
= read_and_strip_branch("rebase-merge/onto");
1125 } else if (!stat(git_path("CHERRY_PICK_HEAD"), &st
)) {
1126 state
->cherry_pick_in_progress
= 1;
1128 if (!stat(git_path("BISECT_LOG"), &st
)) {
1129 state
->bisect_in_progress
= 1;
1130 state
->branch
= read_and_strip_branch("BISECT_START");
1132 if (!stat(git_path("REVERT_HEAD"), &st
) &&
1133 !get_sha1("REVERT_HEAD", sha1
)) {
1134 state
->revert_in_progress
= 1;
1135 hashcpy(state
->revert_head_sha1
, sha1
);
1138 if (get_detached_from
)
1139 wt_status_get_detached_from(state
);
1142 static void wt_status_print_state(struct wt_status
*s
,
1143 struct wt_status_state
*state
)
1145 const char *state_color
= color(WT_STATUS_HEADER
, s
);
1146 if (state
->merge_in_progress
)
1147 show_merge_in_progress(s
, state
, state_color
);
1148 else if (state
->am_in_progress
)
1149 show_am_in_progress(s
, state
, state_color
);
1150 else if (state
->rebase_in_progress
|| state
->rebase_interactive_in_progress
)
1151 show_rebase_in_progress(s
, state
, state_color
);
1152 else if (state
->cherry_pick_in_progress
)
1153 show_cherry_pick_in_progress(s
, state
, state_color
);
1154 else if (state
->revert_in_progress
)
1155 show_revert_in_progress(s
, state
, state_color
);
1156 if (state
->bisect_in_progress
)
1157 show_bisect_in_progress(s
, state
, state_color
);
1160 void wt_status_print(struct wt_status
*s
)
1162 const char *branch_color
= color(WT_STATUS_ONBRANCH
, s
);
1163 const char *branch_status_color
= color(WT_STATUS_HEADER
, s
);
1164 struct wt_status_state state
;
1166 memset(&state
, 0, sizeof(state
));
1167 wt_status_get_state(&state
,
1168 s
->branch
&& !strcmp(s
->branch
, "HEAD"));
1171 const char *on_what
= _("On branch ");
1172 const char *branch_name
= s
->branch
;
1173 if (!prefixcmp(branch_name
, "refs/heads/"))
1175 else if (!strcmp(branch_name
, "HEAD")) {
1176 branch_status_color
= color(WT_STATUS_NOBRANCH
, s
);
1177 if (state
.rebase_in_progress
|| state
.rebase_interactive_in_progress
) {
1178 on_what
= _("rebase in progress; onto ");
1179 branch_name
= state
.onto
;
1180 } else if (state
.detached_from
) {
1181 unsigned char sha1
[20];
1182 branch_name
= state
.detached_from
;
1183 if (!get_sha1("HEAD", sha1
) &&
1184 !hashcmp(sha1
, state
.detached_sha1
))
1185 on_what
= _("HEAD detached at ");
1187 on_what
= _("HEAD detached from ");
1190 on_what
= _("Not currently on any branch.");
1193 status_printf(s
, color(WT_STATUS_HEADER
, s
), "");
1194 status_printf_more(s
, branch_status_color
, "%s", on_what
);
1195 status_printf_more(s
, branch_color
, "%s\n", branch_name
);
1197 wt_status_print_tracking(s
);
1200 wt_status_print_state(s
, &state
);
1203 free(state
.detached_from
);
1205 if (s
->is_initial
) {
1206 status_printf_ln(s
, color(WT_STATUS_HEADER
, s
), "");
1207 status_printf_ln(s
, color(WT_STATUS_HEADER
, s
), _("Initial commit"));
1208 status_printf_ln(s
, color(WT_STATUS_HEADER
, s
), "");
1211 wt_status_print_updated(s
);
1212 wt_status_print_unmerged(s
);
1213 wt_status_print_changed(s
);
1214 if (s
->submodule_summary
&&
1215 (!s
->ignore_submodule_arg
||
1216 strcmp(s
->ignore_submodule_arg
, "all"))) {
1217 wt_status_print_submodule_summary(s
, 0); /* staged */
1218 wt_status_print_submodule_summary(s
, 1); /* unstaged */
1220 if (s
->show_untracked_files
) {
1221 wt_status_print_other(s
, &s
->untracked
, _("Untracked files"), "add");
1222 if (s
->show_ignored_files
)
1223 wt_status_print_other(s
, &s
->ignored
, _("Ignored files"), "add -f");
1224 if (advice_status_u_option
&& 2000 < s
->untracked_in_ms
) {
1225 status_printf_ln(s
, GIT_COLOR_NORMAL
, "");
1226 status_printf_ln(s
, GIT_COLOR_NORMAL
,
1227 _("It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1228 "may speed it up, but you have to be careful not to forget to add\n"
1229 "new files yourself (see 'git help status')."),
1230 s
->untracked_in_ms
/ 1000.0);
1232 } else if (s
->commitable
)
1233 status_printf_ln(s
, GIT_COLOR_NORMAL
, _("Untracked files not listed%s"),
1235 ? _(" (use -u option to show untracked files)") : "");
1238 wt_status_print_verbose(s
);
1239 if (!s
->commitable
) {
1241 status_printf_ln(s
, GIT_COLOR_NORMAL
, _("No changes"));
1244 else if (s
->workdir_dirty
) {
1245 if (advice_status_hints
)
1246 printf(_("no changes added to commit "
1247 "(use \"git add\" and/or \"git commit -a\")\n"));
1249 printf(_("no changes added to commit\n"));
1250 } else if (s
->untracked
.nr
) {
1251 if (advice_status_hints
)
1252 printf(_("nothing added to commit but untracked files "
1253 "present (use \"git add\" to track)\n"));
1255 printf(_("nothing added to commit but untracked files present\n"));
1256 } else if (s
->is_initial
) {
1257 if (advice_status_hints
)
1258 printf(_("nothing to commit (create/copy files "
1259 "and use \"git add\" to track)\n"));
1261 printf(_("nothing to commit\n"));
1262 } else if (!s
->show_untracked_files
) {
1263 if (advice_status_hints
)
1264 printf(_("nothing to commit (use -u to show untracked files)\n"));
1266 printf(_("nothing to commit\n"));
1268 printf(_("nothing to commit, working directory clean\n"));
1272 static void wt_shortstatus_unmerged(struct string_list_item
*it
,
1273 struct wt_status
*s
)
1275 struct wt_status_change_data
*d
= it
->util
;
1276 const char *how
= "??";
1278 switch (d
->stagemask
) {
1279 case 1: how
= "DD"; break; /* both deleted */
1280 case 2: how
= "AU"; break; /* added by us */
1281 case 3: how
= "UD"; break; /* deleted by them */
1282 case 4: how
= "UA"; break; /* added by them */
1283 case 5: how
= "DU"; break; /* deleted by us */
1284 case 6: how
= "AA"; break; /* both added */
1285 case 7: how
= "UU"; break; /* both modified */
1287 color_fprintf(s
->fp
, color(WT_STATUS_UNMERGED
, s
), "%s", how
);
1288 if (s
->null_termination
) {
1289 fprintf(stdout
, " %s%c", it
->string
, 0);
1291 struct strbuf onebuf
= STRBUF_INIT
;
1293 one
= quote_path(it
->string
, s
->prefix
, &onebuf
);
1294 printf(" %s\n", one
);
1295 strbuf_release(&onebuf
);
1299 static void wt_shortstatus_status(struct string_list_item
*it
,
1300 struct wt_status
*s
)
1302 struct wt_status_change_data
*d
= it
->util
;
1304 if (d
->index_status
)
1305 color_fprintf(s
->fp
, color(WT_STATUS_UPDATED
, s
), "%c", d
->index_status
);
1308 if (d
->worktree_status
)
1309 color_fprintf(s
->fp
, color(WT_STATUS_CHANGED
, s
), "%c", d
->worktree_status
);
1313 if (s
->null_termination
) {
1314 fprintf(stdout
, "%s%c", it
->string
, 0);
1316 fprintf(stdout
, "%s%c", d
->head_path
, 0);
1318 struct strbuf onebuf
= STRBUF_INIT
;
1321 one
= quote_path(d
->head_path
, s
->prefix
, &onebuf
);
1322 if (*one
!= '"' && strchr(one
, ' ') != NULL
) {
1324 strbuf_addch(&onebuf
, '"');
1327 printf("%s -> ", one
);
1328 strbuf_release(&onebuf
);
1330 one
= quote_path(it
->string
, s
->prefix
, &onebuf
);
1331 if (*one
!= '"' && strchr(one
, ' ') != NULL
) {
1333 strbuf_addch(&onebuf
, '"');
1336 printf("%s\n", one
);
1337 strbuf_release(&onebuf
);
1341 static void wt_shortstatus_other(struct string_list_item
*it
,
1342 struct wt_status
*s
, const char *sign
)
1344 if (s
->null_termination
) {
1345 fprintf(stdout
, "%s %s%c", sign
, it
->string
, 0);
1347 struct strbuf onebuf
= STRBUF_INIT
;
1349 one
= quote_path(it
->string
, s
->prefix
, &onebuf
);
1350 color_fprintf(s
->fp
, color(WT_STATUS_UNTRACKED
, s
), "%s", sign
);
1351 printf(" %s\n", one
);
1352 strbuf_release(&onebuf
);
1356 static void wt_shortstatus_print_tracking(struct wt_status
*s
)
1358 struct branch
*branch
;
1359 const char *header_color
= color(WT_STATUS_HEADER
, s
);
1360 const char *branch_color_local
= color(WT_STATUS_LOCAL_BRANCH
, s
);
1361 const char *branch_color_remote
= color(WT_STATUS_REMOTE_BRANCH
, s
);
1364 const char *branch_name
;
1365 int num_ours
, num_theirs
;
1367 color_fprintf(s
->fp
, color(WT_STATUS_HEADER
, s
), "## ");
1371 branch_name
= s
->branch
;
1373 if (!prefixcmp(branch_name
, "refs/heads/"))
1375 else if (!strcmp(branch_name
, "HEAD")) {
1376 branch_name
= _("HEAD (no branch)");
1377 branch_color_local
= color(WT_STATUS_NOBRANCH
, s
);
1380 branch
= branch_get(s
->branch
+ 11);
1382 color_fprintf(s
->fp
, header_color
, _("Initial commit on "));
1383 if (!stat_tracking_info(branch
, &num_ours
, &num_theirs
)) {
1384 color_fprintf(s
->fp
, branch_color_local
, "%s", branch_name
);
1385 fputc(s
->null_termination
? '\0' : '\n', s
->fp
);
1389 base
= branch
->merge
[0]->dst
;
1390 base
= shorten_unambiguous_ref(base
, 0);
1391 color_fprintf(s
->fp
, branch_color_local
, "%s", branch_name
);
1392 color_fprintf(s
->fp
, header_color
, "...");
1393 color_fprintf(s
->fp
, branch_color_remote
, "%s", base
);
1395 color_fprintf(s
->fp
, header_color
, " [");
1397 color_fprintf(s
->fp
, header_color
, _("behind "));
1398 color_fprintf(s
->fp
, branch_color_remote
, "%d", num_theirs
);
1399 } else if (!num_theirs
) {
1400 color_fprintf(s
->fp
, header_color
, _("ahead "));
1401 color_fprintf(s
->fp
, branch_color_local
, "%d", num_ours
);
1403 color_fprintf(s
->fp
, header_color
, _("ahead "));
1404 color_fprintf(s
->fp
, branch_color_local
, "%d", num_ours
);
1405 color_fprintf(s
->fp
, header_color
, _(", behind "));
1406 color_fprintf(s
->fp
, branch_color_remote
, "%d", num_theirs
);
1409 color_fprintf(s
->fp
, header_color
, "]");
1410 fputc(s
->null_termination
? '\0' : '\n', s
->fp
);
1413 void wt_shortstatus_print(struct wt_status
*s
)
1418 wt_shortstatus_print_tracking(s
);
1420 for (i
= 0; i
< s
->change
.nr
; i
++) {
1421 struct wt_status_change_data
*d
;
1422 struct string_list_item
*it
;
1424 it
= &(s
->change
.items
[i
]);
1427 wt_shortstatus_unmerged(it
, s
);
1429 wt_shortstatus_status(it
, s
);
1431 for (i
= 0; i
< s
->untracked
.nr
; i
++) {
1432 struct string_list_item
*it
;
1434 it
= &(s
->untracked
.items
[i
]);
1435 wt_shortstatus_other(it
, s
, "??");
1437 for (i
= 0; i
< s
->ignored
.nr
; i
++) {
1438 struct string_list_item
*it
;
1440 it
= &(s
->ignored
.items
[i
]);
1441 wt_shortstatus_other(it
, s
, "!!");
1445 void wt_porcelain_print(struct wt_status
*s
)
1448 s
->relative_paths
= 0;
1450 wt_shortstatus_print(s
);