10 #include "run-command.h"
13 #include "submodule.h"
17 static char default_wt_status_colors
[][COLOR_MAXLEN
] = {
18 GIT_COLOR_NORMAL
, /* WT_STATUS_HEADER */
19 GIT_COLOR_GREEN
, /* WT_STATUS_UPDATED */
20 GIT_COLOR_RED
, /* WT_STATUS_CHANGED */
21 GIT_COLOR_RED
, /* WT_STATUS_UNTRACKED */
22 GIT_COLOR_RED
, /* WT_STATUS_NOBRANCH */
23 GIT_COLOR_RED
, /* WT_STATUS_UNMERGED */
24 GIT_COLOR_GREEN
, /* WT_STATUS_LOCAL_BRANCH */
25 GIT_COLOR_RED
, /* WT_STATUS_REMOTE_BRANCH */
26 GIT_COLOR_NIL
, /* WT_STATUS_ONBRANCH */
29 static const char *color(int slot
, struct wt_status
*s
)
32 if (want_color(s
->use_color
))
33 c
= s
->color_palette
[slot
];
34 if (slot
== WT_STATUS_ONBRANCH
&& color_is_nil(c
))
35 c
= s
->color_palette
[WT_STATUS_HEADER
];
39 static void status_vprintf(struct wt_status
*s
, int at_bol
, const char *color
,
40 const char *fmt
, va_list ap
, const char *trail
)
42 struct strbuf sb
= STRBUF_INIT
;
43 struct strbuf linebuf
= STRBUF_INIT
;
44 const char *line
, *eol
;
46 strbuf_vaddf(&sb
, fmt
, ap
);
48 strbuf_addch(&sb
, comment_line_char
);
50 strbuf_addch(&sb
, ' ');
51 color_print_strbuf(s
->fp
, color
, &sb
);
53 fprintf(s
->fp
, "%s", trail
);
57 for (line
= sb
.buf
; *line
; line
= eol
+ 1) {
58 eol
= strchr(line
, '\n');
60 strbuf_reset(&linebuf
);
62 strbuf_addch(&linebuf
, comment_line_char
);
63 if (*line
!= '\n' && *line
!= '\t')
64 strbuf_addch(&linebuf
, ' ');
67 strbuf_add(&linebuf
, line
, eol
- line
);
69 strbuf_addstr(&linebuf
, line
);
70 color_print_strbuf(s
->fp
, color
, &linebuf
);
78 fprintf(s
->fp
, "%s", trail
);
79 strbuf_release(&linebuf
);
83 void status_printf_ln(struct wt_status
*s
, const char *color
,
89 status_vprintf(s
, 1, color
, fmt
, ap
, "\n");
93 void status_printf(struct wt_status
*s
, const char *color
,
99 status_vprintf(s
, 1, color
, fmt
, ap
, NULL
);
103 static void status_printf_more(struct wt_status
*s
, const char *color
,
104 const char *fmt
, ...)
109 status_vprintf(s
, 0, color
, fmt
, ap
, NULL
);
113 void wt_status_prepare(struct wt_status
*s
)
115 unsigned char sha1
[20];
117 memset(s
, 0, sizeof(*s
));
118 memcpy(s
->color_palette
, default_wt_status_colors
,
119 sizeof(default_wt_status_colors
));
120 s
->show_untracked_files
= SHOW_NORMAL_UNTRACKED_FILES
;
122 s
->relative_paths
= 1;
123 s
->branch
= resolve_refdup("HEAD", sha1
, 0, NULL
);
124 s
->reference
= "HEAD";
126 s
->index_file
= get_index_file();
127 s
->change
.strdup_strings
= 1;
128 s
->untracked
.strdup_strings
= 1;
129 s
->ignored
.strdup_strings
= 1;
132 static void wt_status_print_unmerged_header(struct wt_status
*s
)
135 int del_mod_conflict
= 0;
136 int both_deleted
= 0;
138 const char *c
= color(WT_STATUS_HEADER
, s
);
140 status_printf_ln(s
, c
, _("Unmerged paths:"));
142 for (i
= 0; i
< s
->change
.nr
; i
++) {
143 struct string_list_item
*it
= &(s
->change
.items
[i
]);
144 struct wt_status_change_data
*d
= it
->util
;
146 switch (d
->stagemask
) {
154 del_mod_conflict
= 1;
162 if (!advice_status_hints
)
164 if (s
->whence
!= FROM_COMMIT
)
166 else if (!s
->is_initial
)
167 status_printf_ln(s
, c
, _(" (use \"git reset %s <file>...\" to unstage)"), s
->reference
);
169 status_printf_ln(s
, c
, _(" (use \"git rm --cached <file>...\" to unstage)"));
172 if (!del_mod_conflict
)
173 status_printf_ln(s
, c
, _(" (use \"git add <file>...\" to mark resolution)"));
175 status_printf_ln(s
, c
, _(" (use \"git add/rm <file>...\" as appropriate to mark resolution)"));
176 } else if (!del_mod_conflict
&& !not_deleted
) {
177 status_printf_ln(s
, c
, _(" (use \"git rm <file>...\" to mark resolution)"));
179 status_printf_ln(s
, c
, _(" (use \"git add/rm <file>...\" as appropriate to mark resolution)"));
181 status_printf_ln(s
, c
, "");
184 static void wt_status_print_cached_header(struct wt_status
*s
)
186 const char *c
= color(WT_STATUS_HEADER
, s
);
188 status_printf_ln(s
, c
, _("Changes to be committed:"));
189 if (!advice_status_hints
)
191 if (s
->whence
!= FROM_COMMIT
)
192 ; /* NEEDSWORK: use "git reset --unresolve"??? */
193 else if (!s
->is_initial
)
194 status_printf_ln(s
, c
, _(" (use \"git reset %s <file>...\" to unstage)"), s
->reference
);
196 status_printf_ln(s
, c
, _(" (use \"git rm --cached <file>...\" to unstage)"));
197 status_printf_ln(s
, c
, "");
200 static void wt_status_print_dirty_header(struct wt_status
*s
,
202 int has_dirty_submodules
)
204 const char *c
= color(WT_STATUS_HEADER
, s
);
206 status_printf_ln(s
, c
, _("Changes not staged for commit:"));
207 if (!advice_status_hints
)
210 status_printf_ln(s
, c
, _(" (use \"git add <file>...\" to update what will be committed)"));
212 status_printf_ln(s
, c
, _(" (use \"git add/rm <file>...\" to update what will be committed)"));
213 status_printf_ln(s
, c
, _(" (use \"git checkout -- <file>...\" to discard changes in working directory)"));
214 if (has_dirty_submodules
)
215 status_printf_ln(s
, c
, _(" (commit or discard the untracked or modified content in submodules)"));
216 status_printf_ln(s
, c
, "");
219 static void wt_status_print_other_header(struct wt_status
*s
,
223 const char *c
= color(WT_STATUS_HEADER
, s
);
224 status_printf_ln(s
, c
, "%s:", what
);
225 if (!advice_status_hints
)
227 status_printf_ln(s
, c
, _(" (use \"git %s <file>...\" to include in what will be committed)"), how
);
228 status_printf_ln(s
, c
, "");
231 static void wt_status_print_trailer(struct wt_status
*s
)
233 status_printf_ln(s
, color(WT_STATUS_HEADER
, s
), "");
236 #define quote_path quote_path_relative
238 static void wt_status_print_unmerged_data(struct wt_status
*s
,
239 struct string_list_item
*it
)
241 const char *c
= color(WT_STATUS_UNMERGED
, s
);
242 struct wt_status_change_data
*d
= it
->util
;
243 struct strbuf onebuf
= STRBUF_INIT
;
244 const char *one
, *how
= _("bug");
246 one
= quote_path(it
->string
, -1, &onebuf
, s
->prefix
);
247 status_printf(s
, color(WT_STATUS_HEADER
, s
), "\t");
248 switch (d
->stagemask
) {
249 case 1: how
= _("both deleted:"); break;
250 case 2: how
= _("added by us:"); break;
251 case 3: how
= _("deleted by them:"); break;
252 case 4: how
= _("added by them:"); break;
253 case 5: how
= _("deleted by us:"); break;
254 case 6: how
= _("both added:"); break;
255 case 7: how
= _("both modified:"); break;
257 status_printf_more(s
, c
, "%-20s%s\n", how
, one
);
258 strbuf_release(&onebuf
);
261 static void wt_status_print_change_data(struct wt_status
*s
,
263 struct string_list_item
*it
)
265 struct wt_status_change_data
*d
= it
->util
;
266 const char *c
= color(change_type
, s
);
270 const char *one
, *two
;
271 struct strbuf onebuf
= STRBUF_INIT
, twobuf
= STRBUF_INIT
;
272 struct strbuf extra
= STRBUF_INIT
;
274 one_name
= two_name
= it
->string
;
275 switch (change_type
) {
276 case WT_STATUS_UPDATED
:
277 status
= d
->index_status
;
279 one_name
= d
->head_path
;
281 case WT_STATUS_CHANGED
:
282 if (d
->new_submodule_commits
|| d
->dirty_submodule
) {
283 strbuf_addstr(&extra
, " (");
284 if (d
->new_submodule_commits
)
285 strbuf_addf(&extra
, _("new commits, "));
286 if (d
->dirty_submodule
& DIRTY_SUBMODULE_MODIFIED
)
287 strbuf_addf(&extra
, _("modified content, "));
288 if (d
->dirty_submodule
& DIRTY_SUBMODULE_UNTRACKED
)
289 strbuf_addf(&extra
, _("untracked content, "));
290 strbuf_setlen(&extra
, extra
.len
- 2);
291 strbuf_addch(&extra
, ')');
293 status
= d
->worktree_status
;
296 die("BUG: unhandled change_type %d in wt_status_print_change_data",
300 one
= quote_path(one_name
, -1, &onebuf
, s
->prefix
);
301 two
= quote_path(two_name
, -1, &twobuf
, s
->prefix
);
303 status_printf(s
, color(WT_STATUS_HEADER
, s
), "\t");
305 case DIFF_STATUS_ADDED
:
306 status_printf_more(s
, c
, _("new file: %s"), one
);
308 case DIFF_STATUS_COPIED
:
309 status_printf_more(s
, c
, _("copied: %s -> %s"), one
, two
);
311 case DIFF_STATUS_DELETED
:
312 status_printf_more(s
, c
, _("deleted: %s"), one
);
314 case DIFF_STATUS_MODIFIED
:
315 status_printf_more(s
, c
, _("modified: %s"), one
);
317 case DIFF_STATUS_RENAMED
:
318 status_printf_more(s
, c
, _("renamed: %s -> %s"), one
, two
);
320 case DIFF_STATUS_TYPE_CHANGED
:
321 status_printf_more(s
, c
, _("typechange: %s"), one
);
323 case DIFF_STATUS_UNKNOWN
:
324 status_printf_more(s
, c
, _("unknown: %s"), one
);
326 case DIFF_STATUS_UNMERGED
:
327 status_printf_more(s
, c
, _("unmerged: %s"), one
);
330 die(_("bug: unhandled diff status %c"), status
);
333 status_printf_more(s
, color(WT_STATUS_HEADER
, s
), "%s", extra
.buf
);
334 strbuf_release(&extra
);
336 status_printf_more(s
, GIT_COLOR_NORMAL
, "\n");
337 strbuf_release(&onebuf
);
338 strbuf_release(&twobuf
);
341 static void wt_status_collect_changed_cb(struct diff_queue_struct
*q
,
342 struct diff_options
*options
,
345 struct wt_status
*s
= data
;
350 s
->workdir_dirty
= 1;
351 for (i
= 0; i
< q
->nr
; i
++) {
352 struct diff_filepair
*p
;
353 struct string_list_item
*it
;
354 struct wt_status_change_data
*d
;
357 it
= string_list_insert(&s
->change
, p
->one
->path
);
360 d
= xcalloc(1, sizeof(*d
));
363 if (!d
->worktree_status
)
364 d
->worktree_status
= p
->status
;
365 d
->dirty_submodule
= p
->two
->dirty_submodule
;
366 if (S_ISGITLINK(p
->two
->mode
))
367 d
->new_submodule_commits
= !!hashcmp(p
->one
->sha1
, p
->two
->sha1
);
371 static int unmerged_mask(const char *path
)
374 struct cache_entry
*ce
;
376 pos
= cache_name_pos(path
, strlen(path
));
382 while (pos
< active_nr
) {
383 ce
= active_cache
[pos
++];
384 if (strcmp(ce
->name
, path
) || !ce_stage(ce
))
386 mask
|= (1 << (ce_stage(ce
) - 1));
391 static void wt_status_collect_updated_cb(struct diff_queue_struct
*q
,
392 struct diff_options
*options
,
395 struct wt_status
*s
= data
;
398 for (i
= 0; i
< q
->nr
; i
++) {
399 struct diff_filepair
*p
;
400 struct string_list_item
*it
;
401 struct wt_status_change_data
*d
;
404 it
= string_list_insert(&s
->change
, p
->two
->path
);
407 d
= xcalloc(1, sizeof(*d
));
410 if (!d
->index_status
)
411 d
->index_status
= p
->status
;
413 case DIFF_STATUS_COPIED
:
414 case DIFF_STATUS_RENAMED
:
415 d
->head_path
= xstrdup(p
->one
->path
);
417 case DIFF_STATUS_UNMERGED
:
418 d
->stagemask
= unmerged_mask(p
->two
->path
);
424 static void wt_status_collect_changes_worktree(struct wt_status
*s
)
428 init_revisions(&rev
, NULL
);
429 setup_revisions(0, NULL
, &rev
, NULL
);
430 rev
.diffopt
.output_format
|= DIFF_FORMAT_CALLBACK
;
431 DIFF_OPT_SET(&rev
.diffopt
, DIRTY_SUBMODULES
);
432 if (!s
->show_untracked_files
)
433 DIFF_OPT_SET(&rev
.diffopt
, IGNORE_UNTRACKED_IN_SUBMODULES
);
434 if (s
->ignore_submodule_arg
) {
435 DIFF_OPT_SET(&rev
.diffopt
, OVERRIDE_SUBMODULE_CONFIG
);
436 handle_ignore_submodules_arg(&rev
.diffopt
, s
->ignore_submodule_arg
);
438 rev
.diffopt
.format_callback
= wt_status_collect_changed_cb
;
439 rev
.diffopt
.format_callback_data
= s
;
440 init_pathspec(&rev
.prune_data
, s
->pathspec
);
441 run_diff_files(&rev
, 0);
444 static void wt_status_collect_changes_index(struct wt_status
*s
)
447 struct setup_revision_opt opt
;
449 init_revisions(&rev
, NULL
);
450 memset(&opt
, 0, sizeof(opt
));
451 opt
.def
= s
->is_initial
? EMPTY_TREE_SHA1_HEX
: s
->reference
;
452 setup_revisions(0, NULL
, &rev
, &opt
);
454 if (s
->ignore_submodule_arg
) {
455 DIFF_OPT_SET(&rev
.diffopt
, OVERRIDE_SUBMODULE_CONFIG
);
456 handle_ignore_submodules_arg(&rev
.diffopt
, s
->ignore_submodule_arg
);
459 rev
.diffopt
.output_format
|= DIFF_FORMAT_CALLBACK
;
460 rev
.diffopt
.format_callback
= wt_status_collect_updated_cb
;
461 rev
.diffopt
.format_callback_data
= s
;
462 rev
.diffopt
.detect_rename
= 1;
463 rev
.diffopt
.rename_limit
= 200;
464 rev
.diffopt
.break_opt
= 0;
465 init_pathspec(&rev
.prune_data
, s
->pathspec
);
466 run_diff_index(&rev
, 1);
469 static void wt_status_collect_changes_initial(struct wt_status
*s
)
471 struct pathspec pathspec
;
474 init_pathspec(&pathspec
, s
->pathspec
);
475 for (i
= 0; i
< active_nr
; i
++) {
476 struct string_list_item
*it
;
477 struct wt_status_change_data
*d
;
478 struct cache_entry
*ce
= active_cache
[i
];
480 if (!ce_path_match(ce
, &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
;
495 free_pathspec(&pathspec
);
498 static void wt_status_collect_untracked(struct wt_status
*s
)
501 struct dir_struct dir
;
502 struct timeval t_begin
;
504 if (!s
->show_untracked_files
)
507 if (advice_status_u_option
)
508 gettimeofday(&t_begin
, NULL
);
510 memset(&dir
, 0, sizeof(dir
));
511 if (s
->show_untracked_files
!= SHOW_ALL_UNTRACKED_FILES
)
513 DIR_SHOW_OTHER_DIRECTORIES
| DIR_HIDE_EMPTY_DIRECTORIES
;
514 if (s
->show_ignored_files
)
515 dir
.flags
|= DIR_SHOW_IGNORED_TOO
;
516 setup_standard_excludes(&dir
);
518 fill_directory(&dir
, s
->pathspec
);
520 for (i
= 0; i
< dir
.nr
; i
++) {
521 struct dir_entry
*ent
= dir
.entries
[i
];
522 if (cache_name_is_other(ent
->name
, ent
->len
) &&
523 match_pathspec(s
->pathspec
, ent
->name
, ent
->len
, 0, NULL
))
524 string_list_insert(&s
->untracked
, ent
->name
);
528 for (i
= 0; i
< dir
.ignored_nr
; i
++) {
529 struct dir_entry
*ent
= dir
.ignored
[i
];
530 if (cache_name_is_other(ent
->name
, ent
->len
) &&
531 match_pathspec(s
->pathspec
, ent
->name
, ent
->len
, 0, NULL
))
532 string_list_insert(&s
->ignored
, ent
->name
);
538 clear_directory(&dir
);
540 if (advice_status_u_option
) {
541 struct timeval t_end
;
542 gettimeofday(&t_end
, NULL
);
544 (uint64_t)t_end
.tv_sec
* 1000 + t_end
.tv_usec
/ 1000 -
545 ((uint64_t)t_begin
.tv_sec
* 1000 + t_begin
.tv_usec
/ 1000);
549 void wt_status_collect(struct wt_status
*s
)
551 wt_status_collect_changes_worktree(s
);
554 wt_status_collect_changes_initial(s
);
556 wt_status_collect_changes_index(s
);
557 wt_status_collect_untracked(s
);
560 static void wt_status_print_unmerged(struct wt_status
*s
)
562 int shown_header
= 0;
565 for (i
= 0; i
< s
->change
.nr
; i
++) {
566 struct wt_status_change_data
*d
;
567 struct string_list_item
*it
;
568 it
= &(s
->change
.items
[i
]);
573 wt_status_print_unmerged_header(s
);
576 wt_status_print_unmerged_data(s
, it
);
579 wt_status_print_trailer(s
);
583 static void wt_status_print_updated(struct wt_status
*s
)
585 int shown_header
= 0;
588 for (i
= 0; i
< s
->change
.nr
; i
++) {
589 struct wt_status_change_data
*d
;
590 struct string_list_item
*it
;
591 it
= &(s
->change
.items
[i
]);
593 if (!d
->index_status
||
594 d
->index_status
== DIFF_STATUS_UNMERGED
)
597 wt_status_print_cached_header(s
);
601 wt_status_print_change_data(s
, WT_STATUS_UPDATED
, it
);
604 wt_status_print_trailer(s
);
610 * 1 : some change but no delete
612 static int wt_status_check_worktree_changes(struct wt_status
*s
,
613 int *dirty_submodules
)
618 *dirty_submodules
= 0;
620 for (i
= 0; i
< s
->change
.nr
; i
++) {
621 struct wt_status_change_data
*d
;
622 d
= s
->change
.items
[i
].util
;
623 if (!d
->worktree_status
||
624 d
->worktree_status
== DIFF_STATUS_UNMERGED
)
628 if (d
->dirty_submodule
)
629 *dirty_submodules
= 1;
630 if (d
->worktree_status
== DIFF_STATUS_DELETED
)
636 static void wt_status_print_changed(struct wt_status
*s
)
638 int i
, dirty_submodules
;
639 int worktree_changes
= wt_status_check_worktree_changes(s
, &dirty_submodules
);
641 if (!worktree_changes
)
644 wt_status_print_dirty_header(s
, worktree_changes
< 0, dirty_submodules
);
646 for (i
= 0; i
< s
->change
.nr
; i
++) {
647 struct wt_status_change_data
*d
;
648 struct string_list_item
*it
;
649 it
= &(s
->change
.items
[i
]);
651 if (!d
->worktree_status
||
652 d
->worktree_status
== DIFF_STATUS_UNMERGED
)
654 wt_status_print_change_data(s
, WT_STATUS_CHANGED
, it
);
656 wt_status_print_trailer(s
);
659 static void wt_status_print_submodule_summary(struct wt_status
*s
, int uncommitted
)
661 struct child_process sm_summary
;
662 char summary_limit
[64];
663 char index
[PATH_MAX
];
664 const char *env
[] = { NULL
, NULL
};
668 argv
[0] = "submodule";
670 argv
[2] = uncommitted
? "--files" : "--cached";
671 argv
[3] = "--for-status";
672 argv
[4] = "--summary-limit";
673 argv
[5] = summary_limit
;
674 argv
[6] = uncommitted
? NULL
: (s
->amend
? "HEAD^" : "HEAD");
677 sprintf(summary_limit
, "%d", s
->submodule_summary
);
678 snprintf(index
, sizeof(index
), "GIT_INDEX_FILE=%s", s
->index_file
);
680 memset(&sm_summary
, 0, sizeof(sm_summary
));
681 sm_summary
.argv
= argv
;
682 sm_summary
.env
= env
;
683 sm_summary
.git_cmd
= 1;
684 sm_summary
.no_stdin
= 1;
686 sm_summary
.out
= dup(fileno(s
->fp
)); /* run_command closes it */
687 run_command(&sm_summary
);
690 static void wt_status_print_other(struct wt_status
*s
,
691 struct string_list
*l
,
696 struct strbuf buf
= STRBUF_INIT
;
697 static struct string_list output
= STRING_LIST_INIT_DUP
;
698 struct column_options copts
;
703 wt_status_print_other_header(s
, what
, how
);
705 for (i
= 0; i
< l
->nr
; i
++) {
706 struct string_list_item
*it
;
709 path
= quote_path(it
->string
, strlen(it
->string
),
711 if (column_active(s
->colopts
)) {
712 string_list_append(&output
, path
);
715 status_printf(s
, color(WT_STATUS_HEADER
, s
), "\t");
716 status_printf_more(s
, color(WT_STATUS_UNTRACKED
, s
),
720 strbuf_release(&buf
);
721 if (!column_active(s
->colopts
))
724 strbuf_addf(&buf
, "%s#\t%s",
725 color(WT_STATUS_HEADER
, s
),
726 color(WT_STATUS_UNTRACKED
, s
));
727 memset(&copts
, 0, sizeof(copts
));
729 copts
.indent
= buf
.buf
;
730 if (want_color(s
->use_color
))
731 copts
.nl
= GIT_COLOR_RESET
"\n";
732 print_columns(&output
, s
->colopts
, &copts
);
733 string_list_clear(&output
, 0);
734 strbuf_release(&buf
);
737 static void wt_status_print_verbose(struct wt_status
*s
)
740 struct setup_revision_opt opt
;
742 init_revisions(&rev
, NULL
);
743 DIFF_OPT_SET(&rev
.diffopt
, ALLOW_TEXTCONV
);
745 memset(&opt
, 0, sizeof(opt
));
746 opt
.def
= s
->is_initial
? EMPTY_TREE_SHA1_HEX
: s
->reference
;
747 setup_revisions(0, NULL
, &rev
, &opt
);
749 rev
.diffopt
.output_format
|= DIFF_FORMAT_PATCH
;
750 rev
.diffopt
.detect_rename
= 1;
751 rev
.diffopt
.file
= s
->fp
;
752 rev
.diffopt
.close_file
= 0;
754 * If we're not going to stdout, then we definitely don't
755 * want color, since we are going to the commit message
756 * file (and even the "auto" setting won't work, since it
757 * will have checked isatty on stdout).
760 rev
.diffopt
.use_color
= 0;
761 run_diff_index(&rev
, 1);
764 static void wt_status_print_tracking(struct wt_status
*s
)
766 struct strbuf sb
= STRBUF_INIT
;
768 struct branch
*branch
;
770 assert(s
->branch
&& !s
->is_initial
);
771 if (prefixcmp(s
->branch
, "refs/heads/"))
773 branch
= branch_get(s
->branch
+ 11);
774 if (!format_tracking_info(branch
, &sb
))
777 for (cp
= sb
.buf
; (ep
= strchr(cp
, '\n')) != NULL
; cp
= ep
+ 1)
778 color_fprintf_ln(s
->fp
, color(WT_STATUS_HEADER
, s
),
779 "%c %.*s", comment_line_char
,
781 color_fprintf_ln(s
->fp
, color(WT_STATUS_HEADER
, s
), "%c",
785 static int has_unmerged(struct wt_status
*s
)
789 for (i
= 0; i
< s
->change
.nr
; i
++) {
790 struct wt_status_change_data
*d
;
791 d
= s
->change
.items
[i
].util
;
798 static void show_merge_in_progress(struct wt_status
*s
,
799 struct wt_status_state
*state
,
802 if (has_unmerged(s
)) {
803 status_printf_ln(s
, color
, _("You have unmerged paths."));
804 if (advice_status_hints
)
805 status_printf_ln(s
, color
,
806 _(" (fix conflicts and run \"git commit\")"));
808 status_printf_ln(s
, color
,
809 _("All conflicts fixed but you are still merging."));
810 if (advice_status_hints
)
811 status_printf_ln(s
, color
,
812 _(" (use \"git commit\" to conclude merge)"));
814 wt_status_print_trailer(s
);
817 static void show_am_in_progress(struct wt_status
*s
,
818 struct wt_status_state
*state
,
821 status_printf_ln(s
, color
,
822 _("You are in the middle of an am session."));
823 if (state
->am_empty_patch
)
824 status_printf_ln(s
, color
,
825 _("The current patch is empty."));
826 if (advice_status_hints
) {
827 if (!state
->am_empty_patch
)
828 status_printf_ln(s
, color
,
829 _(" (fix conflicts and then run \"git am --resolved\")"));
830 status_printf_ln(s
, color
,
831 _(" (use \"git am --skip\" to skip this patch)"));
832 status_printf_ln(s
, color
,
833 _(" (use \"git am --abort\" to restore the original branch)"));
835 wt_status_print_trailer(s
);
838 static char *read_line_from_git_path(const char *filename
)
840 struct strbuf buf
= STRBUF_INIT
;
841 FILE *fp
= fopen(git_path("%s", filename
), "r");
843 strbuf_release(&buf
);
846 strbuf_getline(&buf
, fp
, '\n');
848 return strbuf_detach(&buf
, NULL
);
850 strbuf_release(&buf
);
855 static int split_commit_in_progress(struct wt_status
*s
)
857 int split_in_progress
= 0;
858 char *head
= read_line_from_git_path("HEAD");
859 char *orig_head
= read_line_from_git_path("ORIG_HEAD");
860 char *rebase_amend
= read_line_from_git_path("rebase-merge/amend");
861 char *rebase_orig_head
= read_line_from_git_path("rebase-merge/orig-head");
863 if (!head
|| !orig_head
|| !rebase_amend
|| !rebase_orig_head
||
864 !s
->branch
|| strcmp(s
->branch
, "HEAD"))
865 return split_in_progress
;
867 if (!strcmp(rebase_amend
, rebase_orig_head
)) {
868 if (strcmp(head
, rebase_amend
))
869 split_in_progress
= 1;
870 } else if (strcmp(orig_head
, rebase_orig_head
)) {
871 split_in_progress
= 1;
874 if (!s
->amend
&& !s
->nowarn
&& !s
->workdir_dirty
)
875 split_in_progress
= 0;
880 free(rebase_orig_head
);
881 return split_in_progress
;
884 static void show_rebase_in_progress(struct wt_status
*s
,
885 struct wt_status_state
*state
,
890 if (has_unmerged(s
)) {
892 status_printf_ln(s
, color
,
893 _("You are currently rebasing branch '%s' on '%s'."),
897 status_printf_ln(s
, color
,
898 _("You are currently rebasing."));
899 if (advice_status_hints
) {
900 status_printf_ln(s
, color
,
901 _(" (fix conflicts and then run \"git rebase --continue\")"));
902 status_printf_ln(s
, color
,
903 _(" (use \"git rebase --skip\" to skip this patch)"));
904 status_printf_ln(s
, color
,
905 _(" (use \"git rebase --abort\" to check out the original branch)"));
907 } else if (state
->rebase_in_progress
|| !stat(git_path("MERGE_MSG"), &st
)) {
909 status_printf_ln(s
, color
,
910 _("You are currently rebasing branch '%s' on '%s'."),
914 status_printf_ln(s
, color
,
915 _("You are currently rebasing."));
916 if (advice_status_hints
)
917 status_printf_ln(s
, color
,
918 _(" (all conflicts fixed: run \"git rebase --continue\")"));
919 } else if (split_commit_in_progress(s
)) {
921 status_printf_ln(s
, color
,
922 _("You are currently splitting a commit while rebasing branch '%s' on '%s'."),
926 status_printf_ln(s
, color
,
927 _("You are currently splitting a commit during a rebase."));
928 if (advice_status_hints
)
929 status_printf_ln(s
, color
,
930 _(" (Once your working directory is clean, run \"git rebase --continue\")"));
933 status_printf_ln(s
, color
,
934 _("You are currently editing a commit while rebasing branch '%s' on '%s'."),
938 status_printf_ln(s
, color
,
939 _("You are currently editing a commit during a rebase."));
940 if (advice_status_hints
&& !s
->amend
) {
941 status_printf_ln(s
, color
,
942 _(" (use \"git commit --amend\" to amend the current commit)"));
943 status_printf_ln(s
, color
,
944 _(" (use \"git rebase --continue\" once you are satisfied with your changes)"));
947 wt_status_print_trailer(s
);
950 static void show_cherry_pick_in_progress(struct wt_status
*s
,
951 struct wt_status_state
*state
,
954 status_printf_ln(s
, color
, _("You are currently cherry-picking."));
955 if (advice_status_hints
) {
957 status_printf_ln(s
, color
,
958 _(" (fix conflicts and run \"git commit\")"));
960 status_printf_ln(s
, color
,
961 _(" (all conflicts fixed: run \"git commit\")"));
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
{
1040 unsigned char nsha1
[20];
1043 static int grab_1st_switch(unsigned char *osha1
, unsigned char *nsha1
,
1044 const char *email
, unsigned long timestamp
, int tz
,
1045 const char *message
, void *cb_data
)
1047 struct grab_1st_switch_cbdata
*cb
= cb_data
;
1048 const char *target
= NULL
, *end
;
1050 if (prefixcmp(message
, "checkout: moving from "))
1052 message
+= strlen("checkout: moving from ");
1053 target
= strstr(message
, " to ");
1056 target
+= strlen(" to ");
1057 strbuf_reset(&cb
->buf
);
1058 hashcpy(cb
->nsha1
, nsha1
);
1059 for (end
= target
; *end
&& *end
!= '\n'; end
++)
1061 strbuf_add(&cb
->buf
, target
, end
- target
);
1066 static void wt_status_get_detached_from(struct wt_status_state
*state
)
1068 struct grab_1st_switch_cbdata cb
;
1069 struct commit
*commit
;
1070 unsigned char sha1
[20];
1073 strbuf_init(&cb
.buf
, 0);
1074 if (for_each_reflog_ent_reverse("HEAD", grab_1st_switch
, &cb
) <= 0) {
1075 strbuf_release(&cb
.buf
);
1079 if (dwim_ref(cb
.buf
.buf
, cb
.buf
.len
, sha1
, &ref
) == 1 &&
1080 /* sha1 is a commit? match without further lookup */
1081 (!hashcmp(cb
.nsha1
, sha1
) ||
1082 /* perhaps sha1 is a tag, try to dereference to a commit */
1083 ((commit
= lookup_commit_reference_gently(sha1
, 1)) != NULL
&&
1084 !hashcmp(cb
.nsha1
, commit
->object
.sha1
)))) {
1086 if (!prefixcmp(ref
, "refs/tags/"))
1087 ofs
= strlen("refs/tags/");
1088 else if (!prefixcmp(ref
, "refs/remotes/"))
1089 ofs
= strlen("refs/remotes/");
1092 state
->detached_from
= xstrdup(ref
+ ofs
);
1094 state
->detached_from
=
1095 xstrdup(find_unique_abbrev(cb
.nsha1
, DEFAULT_ABBREV
));
1096 hashcpy(state
->detached_sha1
, cb
.nsha1
);
1099 strbuf_release(&cb
.buf
);
1102 void wt_status_get_state(struct wt_status_state
*state
,
1103 int get_detached_from
)
1106 unsigned char sha1
[20];
1108 if (!stat(git_path("MERGE_HEAD"), &st
)) {
1109 state
->merge_in_progress
= 1;
1110 } else if (!stat(git_path("rebase-apply"), &st
)) {
1111 if (!stat(git_path("rebase-apply/applying"), &st
)) {
1112 state
->am_in_progress
= 1;
1113 if (!stat(git_path("rebase-apply/patch"), &st
) && !st
.st_size
)
1114 state
->am_empty_patch
= 1;
1116 state
->rebase_in_progress
= 1;
1117 state
->branch
= read_and_strip_branch("rebase-apply/head-name");
1118 state
->onto
= read_and_strip_branch("rebase-apply/onto");
1120 } else if (!stat(git_path("rebase-merge"), &st
)) {
1121 if (!stat(git_path("rebase-merge/interactive"), &st
))
1122 state
->rebase_interactive_in_progress
= 1;
1124 state
->rebase_in_progress
= 1;
1125 state
->branch
= read_and_strip_branch("rebase-merge/head-name");
1126 state
->onto
= read_and_strip_branch("rebase-merge/onto");
1127 } else if (!stat(git_path("CHERRY_PICK_HEAD"), &st
)) {
1128 state
->cherry_pick_in_progress
= 1;
1130 if (!stat(git_path("BISECT_LOG"), &st
)) {
1131 state
->bisect_in_progress
= 1;
1132 state
->branch
= read_and_strip_branch("BISECT_START");
1134 if (!stat(git_path("REVERT_HEAD"), &st
) &&
1135 !get_sha1("REVERT_HEAD", sha1
)) {
1136 state
->revert_in_progress
= 1;
1137 hashcpy(state
->revert_head_sha1
, sha1
);
1140 if (get_detached_from
)
1141 wt_status_get_detached_from(state
);
1144 static void wt_status_print_state(struct wt_status
*s
,
1145 struct wt_status_state
*state
)
1147 const char *state_color
= color(WT_STATUS_HEADER
, s
);
1148 if (state
->merge_in_progress
)
1149 show_merge_in_progress(s
, state
, state_color
);
1150 else if (state
->am_in_progress
)
1151 show_am_in_progress(s
, state
, state_color
);
1152 else if (state
->rebase_in_progress
|| state
->rebase_interactive_in_progress
)
1153 show_rebase_in_progress(s
, state
, state_color
);
1154 else if (state
->cherry_pick_in_progress
)
1155 show_cherry_pick_in_progress(s
, state
, state_color
);
1156 else if (state
->revert_in_progress
)
1157 show_revert_in_progress(s
, state
, state_color
);
1158 if (state
->bisect_in_progress
)
1159 show_bisect_in_progress(s
, state
, state_color
);
1162 void wt_status_print(struct wt_status
*s
)
1164 const char *branch_color
= color(WT_STATUS_ONBRANCH
, s
);
1165 const char *branch_status_color
= color(WT_STATUS_HEADER
, s
);
1166 struct wt_status_state state
;
1168 memset(&state
, 0, sizeof(state
));
1169 wt_status_get_state(&state
,
1170 s
->branch
&& !strcmp(s
->branch
, "HEAD"));
1173 const char *on_what
= _("On branch ");
1174 const char *branch_name
= s
->branch
;
1175 if (!prefixcmp(branch_name
, "refs/heads/"))
1177 else if (!strcmp(branch_name
, "HEAD")) {
1178 branch_status_color
= color(WT_STATUS_NOBRANCH
, s
);
1179 if (state
.detached_from
) {
1180 unsigned char sha1
[20];
1181 branch_name
= state
.detached_from
;
1182 if (!get_sha1("HEAD", sha1
) &&
1183 !hashcmp(sha1
, state
.detached_sha1
))
1184 on_what
= _("HEAD detached at ");
1186 on_what
= _("HEAD detached from ");
1189 on_what
= _("Not currently on any branch.");
1192 status_printf(s
, color(WT_STATUS_HEADER
, s
), "");
1193 status_printf_more(s
, branch_status_color
, "%s", on_what
);
1194 status_printf_more(s
, branch_color
, "%s\n", branch_name
);
1196 wt_status_print_tracking(s
);
1199 wt_status_print_state(s
, &state
);
1202 free(state
.detached_from
);
1204 if (s
->is_initial
) {
1205 status_printf_ln(s
, color(WT_STATUS_HEADER
, s
), "");
1206 status_printf_ln(s
, color(WT_STATUS_HEADER
, s
), _("Initial commit"));
1207 status_printf_ln(s
, color(WT_STATUS_HEADER
, s
), "");
1210 wt_status_print_updated(s
);
1211 wt_status_print_unmerged(s
);
1212 wt_status_print_changed(s
);
1213 if (s
->submodule_summary
&&
1214 (!s
->ignore_submodule_arg
||
1215 strcmp(s
->ignore_submodule_arg
, "all"))) {
1216 wt_status_print_submodule_summary(s
, 0); /* staged */
1217 wt_status_print_submodule_summary(s
, 1); /* unstaged */
1219 if (s
->show_untracked_files
) {
1220 wt_status_print_other(s
, &s
->untracked
, _("Untracked files"), "add");
1221 if (s
->show_ignored_files
)
1222 wt_status_print_other(s
, &s
->ignored
, _("Ignored files"), "add -f");
1223 if (advice_status_u_option
&& 2000 < s
->untracked_in_ms
) {
1224 status_printf_ln(s
, GIT_COLOR_NORMAL
, "");
1225 status_printf_ln(s
, GIT_COLOR_NORMAL
,
1226 _("It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1227 "may speed it up, but you have to be careful not to forget to add\n"
1228 "new files yourself (see 'git help status')."),
1229 s
->untracked_in_ms
/ 1000.0);
1231 } else if (s
->commitable
)
1232 status_printf_ln(s
, GIT_COLOR_NORMAL
, _("Untracked files not listed%s"),
1234 ? _(" (use -u option to show untracked files)") : "");
1237 wt_status_print_verbose(s
);
1238 if (!s
->commitable
) {
1240 status_printf_ln(s
, GIT_COLOR_NORMAL
, _("No changes"));
1243 else if (s
->workdir_dirty
) {
1244 if (advice_status_hints
)
1245 printf(_("no changes added to commit "
1246 "(use \"git add\" and/or \"git commit -a\")\n"));
1248 printf(_("no changes added to commit\n"));
1249 } else if (s
->untracked
.nr
) {
1250 if (advice_status_hints
)
1251 printf(_("nothing added to commit but untracked files "
1252 "present (use \"git add\" to track)\n"));
1254 printf(_("nothing added to commit but untracked files present\n"));
1255 } else if (s
->is_initial
) {
1256 if (advice_status_hints
)
1257 printf(_("nothing to commit (create/copy files "
1258 "and use \"git add\" to track)\n"));
1260 printf(_("nothing to commit\n"));
1261 } else if (!s
->show_untracked_files
) {
1262 if (advice_status_hints
)
1263 printf(_("nothing to commit (use -u to show untracked files)\n"));
1265 printf(_("nothing to commit\n"));
1267 printf(_("nothing to commit, working directory clean\n"));
1271 static void wt_shortstatus_unmerged(struct string_list_item
*it
,
1272 struct wt_status
*s
)
1274 struct wt_status_change_data
*d
= it
->util
;
1275 const char *how
= "??";
1277 switch (d
->stagemask
) {
1278 case 1: how
= "DD"; break; /* both deleted */
1279 case 2: how
= "AU"; break; /* added by us */
1280 case 3: how
= "UD"; break; /* deleted by them */
1281 case 4: how
= "UA"; break; /* added by them */
1282 case 5: how
= "DU"; break; /* deleted by us */
1283 case 6: how
= "AA"; break; /* both added */
1284 case 7: how
= "UU"; break; /* both modified */
1286 color_fprintf(s
->fp
, color(WT_STATUS_UNMERGED
, s
), "%s", how
);
1287 if (s
->null_termination
) {
1288 fprintf(stdout
, " %s%c", it
->string
, 0);
1290 struct strbuf onebuf
= STRBUF_INIT
;
1292 one
= quote_path(it
->string
, -1, &onebuf
, s
->prefix
);
1293 printf(" %s\n", one
);
1294 strbuf_release(&onebuf
);
1298 static void wt_shortstatus_status(struct string_list_item
*it
,
1299 struct wt_status
*s
)
1301 struct wt_status_change_data
*d
= it
->util
;
1303 if (d
->index_status
)
1304 color_fprintf(s
->fp
, color(WT_STATUS_UPDATED
, s
), "%c", d
->index_status
);
1307 if (d
->worktree_status
)
1308 color_fprintf(s
->fp
, color(WT_STATUS_CHANGED
, s
), "%c", d
->worktree_status
);
1312 if (s
->null_termination
) {
1313 fprintf(stdout
, "%s%c", it
->string
, 0);
1315 fprintf(stdout
, "%s%c", d
->head_path
, 0);
1317 struct strbuf onebuf
= STRBUF_INIT
;
1320 one
= quote_path(d
->head_path
, -1, &onebuf
, s
->prefix
);
1321 if (*one
!= '"' && strchr(one
, ' ') != NULL
) {
1323 strbuf_addch(&onebuf
, '"');
1326 printf("%s -> ", one
);
1327 strbuf_release(&onebuf
);
1329 one
= quote_path(it
->string
, -1, &onebuf
, s
->prefix
);
1330 if (*one
!= '"' && strchr(one
, ' ') != NULL
) {
1332 strbuf_addch(&onebuf
, '"');
1335 printf("%s\n", one
);
1336 strbuf_release(&onebuf
);
1340 static void wt_shortstatus_other(struct string_list_item
*it
,
1341 struct wt_status
*s
, const char *sign
)
1343 if (s
->null_termination
) {
1344 fprintf(stdout
, "%s %s%c", sign
, it
->string
, 0);
1346 struct strbuf onebuf
= STRBUF_INIT
;
1348 one
= quote_path(it
->string
, -1, &onebuf
, s
->prefix
);
1349 color_fprintf(s
->fp
, color(WT_STATUS_UNTRACKED
, s
), "%s", sign
);
1350 printf(" %s\n", one
);
1351 strbuf_release(&onebuf
);
1355 static void wt_shortstatus_print_tracking(struct wt_status
*s
)
1357 struct branch
*branch
;
1358 const char *header_color
= color(WT_STATUS_HEADER
, s
);
1359 const char *branch_color_local
= color(WT_STATUS_LOCAL_BRANCH
, s
);
1360 const char *branch_color_remote
= color(WT_STATUS_REMOTE_BRANCH
, s
);
1363 const char *branch_name
;
1364 int num_ours
, num_theirs
;
1366 color_fprintf(s
->fp
, color(WT_STATUS_HEADER
, s
), "## ");
1370 branch_name
= s
->branch
;
1372 if (!prefixcmp(branch_name
, "refs/heads/"))
1374 else if (!strcmp(branch_name
, "HEAD")) {
1375 branch_name
= _("HEAD (no branch)");
1376 branch_color_local
= color(WT_STATUS_NOBRANCH
, s
);
1379 branch
= branch_get(s
->branch
+ 11);
1381 color_fprintf(s
->fp
, header_color
, _("Initial commit on "));
1382 if (!stat_tracking_info(branch
, &num_ours
, &num_theirs
)) {
1383 color_fprintf(s
->fp
, branch_color_local
, "%s", branch_name
);
1384 fputc(s
->null_termination
? '\0' : '\n', s
->fp
);
1388 base
= branch
->merge
[0]->dst
;
1389 base
= shorten_unambiguous_ref(base
, 0);
1390 color_fprintf(s
->fp
, branch_color_local
, "%s", branch_name
);
1391 color_fprintf(s
->fp
, header_color
, "...");
1392 color_fprintf(s
->fp
, branch_color_remote
, "%s", base
);
1394 color_fprintf(s
->fp
, header_color
, " [");
1396 color_fprintf(s
->fp
, header_color
, _("behind "));
1397 color_fprintf(s
->fp
, branch_color_remote
, "%d", num_theirs
);
1398 } else if (!num_theirs
) {
1399 color_fprintf(s
->fp
, header_color
, _("ahead "));
1400 color_fprintf(s
->fp
, branch_color_local
, "%d", num_ours
);
1402 color_fprintf(s
->fp
, header_color
, _("ahead "));
1403 color_fprintf(s
->fp
, branch_color_local
, "%d", num_ours
);
1404 color_fprintf(s
->fp
, header_color
, _(", behind "));
1405 color_fprintf(s
->fp
, branch_color_remote
, "%d", num_theirs
);
1408 color_fprintf(s
->fp
, header_color
, "]");
1409 fputc(s
->null_termination
? '\0' : '\n', s
->fp
);
1412 void wt_shortstatus_print(struct wt_status
*s
)
1417 wt_shortstatus_print_tracking(s
);
1419 for (i
= 0; i
< s
->change
.nr
; i
++) {
1420 struct wt_status_change_data
*d
;
1421 struct string_list_item
*it
;
1423 it
= &(s
->change
.items
[i
]);
1426 wt_shortstatus_unmerged(it
, s
);
1428 wt_shortstatus_status(it
, s
);
1430 for (i
= 0; i
< s
->untracked
.nr
; i
++) {
1431 struct string_list_item
*it
;
1433 it
= &(s
->untracked
.items
[i
]);
1434 wt_shortstatus_other(it
, s
, "??");
1436 for (i
= 0; i
< s
->ignored
.nr
; i
++) {
1437 struct string_list_item
*it
;
1439 it
= &(s
->ignored
.items
[i
]);
1440 wt_shortstatus_other(it
, s
, "!!");
1444 void wt_porcelain_print(struct wt_status
*s
)
1447 s
->relative_paths
= 0;
1449 wt_shortstatus_print(s
);