?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
Documentation: add instructions to help setup gmail 2FA
[git/git-svn.git] / wt-status.c
blob4f27bd62af992122d83df911c42b585342ac1066
1 #include "cache.h"
2 #include "wt-status.h"
3 #include "object.h"
4 #include "dir.h"
5 #include "commit.h"
6 #include "diff.h"
7 #include "revision.h"
8 #include "diffcore.h"
9 #include "quote.h"
10 #include "run-command.h"
11 #include "argv-array.h"
12 #include "remote.h"
13 #include "refs.h"
14 #include "submodule.h"
15 #include "column.h"
16 #include "strbuf.h"
17 #include "utf8.h"
18 #include "worktree.h"
19
20 static const char cut_line[] =
21 "------------------------ >8 ------------------------\n";
22
23 static char default_wt_status_colors[][COLOR_MAXLEN] = {
24 GIT_COLOR_NORMAL, /* WT_STATUS_HEADER */
25 GIT_COLOR_GREEN, /* WT_STATUS_UPDATED */
26 GIT_COLOR_RED, /* WT_STATUS_CHANGED */
27 GIT_COLOR_RED, /* WT_STATUS_UNTRACKED */
28 GIT_COLOR_RED, /* WT_STATUS_NOBRANCH */
29 GIT_COLOR_RED, /* WT_STATUS_UNMERGED */
30 GIT_COLOR_GREEN, /* WT_STATUS_LOCAL_BRANCH */
31 GIT_COLOR_RED, /* WT_STATUS_REMOTE_BRANCH */
32 GIT_COLOR_NIL, /* WT_STATUS_ONBRANCH */
33 };
34
35 static const char *color(int slot, struct wt_status *s)
36 {
37 const char *c = "";
38 if (want_color(s->use_color))
39 c = s->color_palette[slot];
40 if (slot == WT_STATUS_ONBRANCH && color_is_nil(c))
41 c = s->color_palette[WT_STATUS_HEADER];
42 return c;
43 }
44
45 static void status_vprintf(struct wt_status *s, int at_bol, const char *color,
46 const char *fmt, va_list ap, const char *trail)
47 {
48 struct strbuf sb = STRBUF_INIT;
49 struct strbuf linebuf = STRBUF_INIT;
50 const char *line, *eol;
51
52 strbuf_vaddf(&sb, fmt, ap);
53 if (!sb.len) {
54 if (s->display_comment_prefix) {
55 strbuf_addch(&sb, comment_line_char);
56 if (!trail)
57 strbuf_addch(&sb, ' ');
58 }
59 color_print_strbuf(s->fp, color, &sb);
60 if (trail)
61 fprintf(s->fp, "%s", trail);
62 strbuf_release(&sb);
63 return;
64 }
65 for (line = sb.buf; *line; line = eol + 1) {
66 eol = strchr(line, '\n');
67
68 strbuf_reset(&linebuf);
69 if (at_bol && s->display_comment_prefix) {
70 strbuf_addch(&linebuf, comment_line_char);
71 if (*line != '\n' && *line != '\t')
72 strbuf_addch(&linebuf, ' ');
73 }
74 if (eol)
75 strbuf_add(&linebuf, line, eol - line);
76 else
77 strbuf_addstr(&linebuf, line);
78 color_print_strbuf(s->fp, color, &linebuf);
79 if (eol)
80 fprintf(s->fp, "\n");
81 else
82 break;
83 at_bol = 1;
84 }
85 if (trail)
86 fprintf(s->fp, "%s", trail);
87 strbuf_release(&linebuf);
88 strbuf_release(&sb);
89 }
90
91 void status_printf_ln(struct wt_status *s, const char *color,
92 const char *fmt, ...)
93 {
94 va_list ap;
95
96 va_start(ap, fmt);
97 status_vprintf(s, 1, color, fmt, ap, "\n");
98 va_end(ap);
99 }
100
101 void status_printf(struct wt_status *s, const char *color,
102 const char *fmt, ...)
103 {
104 va_list ap;
105
106 va_start(ap, fmt);
107 status_vprintf(s, 1, color, fmt, ap, NULL);
108 va_end(ap);
109 }
110
111 static void status_printf_more(struct wt_status *s, const char *color,
112 const char *fmt, ...)
113 {
114 va_list ap;
115
116 va_start(ap, fmt);
117 status_vprintf(s, 0, color, fmt, ap, NULL);
118 va_end(ap);
119 }
120
121 void wt_status_prepare(struct wt_status *s)
122 {
123 unsigned char sha1[20];
124
125 memset(s, 0, sizeof(*s));
126 memcpy(s->color_palette, default_wt_status_colors,
127 sizeof(default_wt_status_colors));
128 s->show_untracked_files = SHOW_NORMAL_UNTRACKED_FILES;
129 s->use_color = -1;
130 s->relative_paths = 1;
131 s->branch = resolve_refdup("HEAD", 0, sha1, NULL);
132 s->reference = "HEAD";
133 s->fp = stdout;
134 s->index_file = get_index_file();
135 s->change.strdup_strings = 1;
136 s->untracked.strdup_strings = 1;
137 s->ignored.strdup_strings = 1;
138 s->show_branch = -1; /* unspecified */
139 s->display_comment_prefix = 0;
140 }
141
142 static void wt_status_print_unmerged_header(struct wt_status *s)
143 {
144 int i;
145 int del_mod_conflict = 0;
146 int both_deleted = 0;
147 int not_deleted = 0;
148 const char *c = color(WT_STATUS_HEADER, s);
149
150 status_printf_ln(s, c, _("Unmerged paths:"));
151
152 for (i = 0; i < s->change.nr; i++) {
153 struct string_list_item *it = &(s->change.items[i]);
154 struct wt_status_change_data *d = it->util;
155
156 switch (d->stagemask) {
157 case 0:
158 break;
159 case 1:
160 both_deleted = 1;
161 break;
162 case 3:
163 case 5:
164 del_mod_conflict = 1;
165 break;
166 default:
167 not_deleted = 1;
168 break;
169 }
170 }
171
172 if (!s->hints)
173 return;
174 if (s->whence != FROM_COMMIT)
175 ;
176 else if (!s->is_initial)
177 status_printf_ln(s, c, _(" (use \"git reset %s <file>...\" to unstage)"), s->reference);
178 else
179 status_printf_ln(s, c, _(" (use \"git rm --cached <file>...\" to unstage)"));
180
181 if (!both_deleted) {
182 if (!del_mod_conflict)
183 status_printf_ln(s, c, _(" (use \"git add <file>...\" to mark resolution)"));
184 else
185 status_printf_ln(s, c, _(" (use \"git add/rm <file>...\" as appropriate to mark resolution)"));
186 } else if (!del_mod_conflict && !not_deleted) {
187 status_printf_ln(s, c, _(" (use \"git rm <file>...\" to mark resolution)"));
188 } else {
189 status_printf_ln(s, c, _(" (use \"git add/rm <file>...\" as appropriate to mark resolution)"));
190 }
191 status_printf_ln(s, c, "%s", "");
192 }
193
194 static void wt_status_print_cached_header(struct wt_status *s)
195 {
196 const char *c = color(WT_STATUS_HEADER, s);
197
198 status_printf_ln(s, c, _("Changes to be committed:"));
199 if (!s->hints)
200 return;
201 if (s->whence != FROM_COMMIT)
202 ; /* NEEDSWORK: use "git reset --unresolve"??? */
203 else if (!s->is_initial)
204 status_printf_ln(s, c, _(" (use \"git reset %s <file>...\" to unstage)"), s->reference);
205 else
206 status_printf_ln(s, c, _(" (use \"git rm --cached <file>...\" to unstage)"));
207 status_printf_ln(s, c, "%s", "");
208 }
209
210 static void wt_status_print_dirty_header(struct wt_status *s,
211 int has_deleted,
212 int has_dirty_submodules)
213 {
214 const char *c = color(WT_STATUS_HEADER, s);
215
216 status_printf_ln(s, c, _("Changes not staged for commit:"));
217 if (!s->hints)
218 return;
219 if (!has_deleted)
220 status_printf_ln(s, c, _(" (use \"git add <file>...\" to update what will be committed)"));
221 else
222 status_printf_ln(s, c, _(" (use \"git add/rm <file>...\" to update what will be committed)"));
223 status_printf_ln(s, c, _(" (use \"git checkout -- <file>...\" to discard changes in working directory)"));
224 if (has_dirty_submodules)
225 status_printf_ln(s, c, _(" (commit or discard the untracked or modified content in submodules)"));
226 status_printf_ln(s, c, "%s", "");
227 }
228
229 static void wt_status_print_other_header(struct wt_status *s,
230 const char *what,
231 const char *how)
232 {
233 const char *c = color(WT_STATUS_HEADER, s);
234 status_printf_ln(s, c, "%s:", what);
235 if (!s->hints)
236 return;
237 status_printf_ln(s, c, _(" (use \"git %s <file>...\" to include in what will be committed)"), how);
238 status_printf_ln(s, c, "%s", "");
239 }
240
241 static void wt_status_print_trailer(struct wt_status *s)
242 {
243 status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", "");
244 }
245
246 #define quote_path quote_path_relative
247
248 static const char *wt_status_unmerged_status_string(int stagemask)
249 {
250 switch (stagemask) {
251 case 1:
252 return _("both deleted:");
253 case 2:
254 return _("added by us:");
255 case 3:
256 return _("deleted by them:");
257 case 4:
258 return _("added by them:");
259 case 5:
260 return _("deleted by us:");
261 case 6:
262 return _("both added:");
263 case 7:
264 return _("both modified:");
265 default:
266 die(_("bug: unhandled unmerged status %x"), stagemask);
267 }
268 }
269
270 static const char *wt_status_diff_status_string(int status)
271 {
272 switch (status) {
273 case DIFF_STATUS_ADDED:
274 return _("new file:");
275 case DIFF_STATUS_COPIED:
276 return _("copied:");
277 case DIFF_STATUS_DELETED:
278 return _("deleted:");
279 case DIFF_STATUS_MODIFIED:
280 return _("modified:");
281 case DIFF_STATUS_RENAMED:
282 return _("renamed:");
283 case DIFF_STATUS_TYPE_CHANGED:
284 return _("typechange:");
285 case DIFF_STATUS_UNKNOWN:
286 return _("unknown:");
287 case DIFF_STATUS_UNMERGED:
288 return _("unmerged:");
289 default:
290 return NULL;
291 }
292 }
293
294 static int maxwidth(const char *(*label)(int), int minval, int maxval)
295 {
296 int result = 0, i;
297
298 for (i = minval; i <= maxval; i++) {
299 const char *s = label(i);
300 int len = s ? utf8_strwidth(s) : 0;
301 if (len > result)
302 result = len;
303 }
304 return result;
305 }
306
307 static void wt_status_print_unmerged_data(struct wt_status *s,
308 struct string_list_item *it)
309 {
310 const char *c = color(WT_STATUS_UNMERGED, s);
311 struct wt_status_change_data *d = it->util;
312 struct strbuf onebuf = STRBUF_INIT;
313 static char *padding;
314 static int label_width;
315 const char *one, *how;
316 int len;
317
318 if (!padding) {
319 label_width = maxwidth(wt_status_unmerged_status_string, 1, 7);
320 label_width += strlen(" ");
321 padding = xmallocz(label_width);
322 memset(padding, ' ', label_width);
323 }
324
325 one = quote_path(it->string, s->prefix, &onebuf);
326 status_printf(s, color(WT_STATUS_HEADER, s), "\t");
327
328 how = wt_status_unmerged_status_string(d->stagemask);
329 len = label_width - utf8_strwidth(how);
330 status_printf_more(s, c, "%s%.*s%s\n", how, len, padding, one);
331 strbuf_release(&onebuf);
332 }
333
334 static void wt_status_print_change_data(struct wt_status *s,
335 int change_type,
336 struct string_list_item *it)
337 {
338 struct wt_status_change_data *d = it->util;
339 const char *c = color(change_type, s);
340 int status;
341 char *one_name;
342 char *two_name;
343 const char *one, *two;
344 struct strbuf onebuf = STRBUF_INIT, twobuf = STRBUF_INIT;
345 struct strbuf extra = STRBUF_INIT;
346 static char *padding;
347 static int label_width;
348 const char *what;
349 int len;
350
351 if (!padding) {
352 /* If DIFF_STATUS_* uses outside the range [A..Z], we're in trouble */
353 label_width = maxwidth(wt_status_diff_status_string, 'A', 'Z');
354 label_width += strlen(" ");
355 padding = xmallocz(label_width);
356 memset(padding, ' ', label_width);
357 }
358
359 one_name = two_name = it->string;
360 switch (change_type) {
361 case WT_STATUS_UPDATED:
362 status = d->index_status;
363 if (d->head_path)
364 one_name = d->head_path;
365 break;
366 case WT_STATUS_CHANGED:
367 if (d->new_submodule_commits || d->dirty_submodule) {
368 strbuf_addstr(&extra, " (");
369 if (d->new_submodule_commits)
370 strbuf_addf(&extra, _("new commits, "));
371 if (d->dirty_submodule & DIRTY_SUBMODULE_MODIFIED)
372 strbuf_addf(&extra, _("modified content, "));
373 if (d->dirty_submodule & DIRTY_SUBMODULE_UNTRACKED)
374 strbuf_addf(&extra, _("untracked content, "));
375 strbuf_setlen(&extra, extra.len - 2);
376 strbuf_addch(&extra, ')');
377 }
378 status = d->worktree_status;
379 break;
380 default:
381 die("BUG: unhandled change_type %d in wt_status_print_change_data",
382 change_type);
383 }
384
385 one = quote_path(one_name, s->prefix, &onebuf);
386 two = quote_path(two_name, s->prefix, &twobuf);
387
388 status_printf(s, color(WT_STATUS_HEADER, s), "\t");
389 what = wt_status_diff_status_string(status);
390 if (!what)
391 die(_("bug: unhandled diff status %c"), status);
392 len = label_width - utf8_strwidth(what);
393 assert(len >= 0);
394 if (status == DIFF_STATUS_COPIED || status == DIFF_STATUS_RENAMED)
395 status_printf_more(s, c, "%s%.*s%s -> %s",
396 what, len, padding, one, two);
397 else
398 status_printf_more(s, c, "%s%.*s%s",
399 what, len, padding, one);
400 if (extra.len) {
401 status_printf_more(s, color(WT_STATUS_HEADER, s), "%s", extra.buf);
402 strbuf_release(&extra);
403 }
404 status_printf_more(s, GIT_COLOR_NORMAL, "\n");
405 strbuf_release(&onebuf);
406 strbuf_release(&twobuf);
407 }
408
409 static void wt_status_collect_changed_cb(struct diff_queue_struct *q,
410 struct diff_options *options,
411 void *data)
412 {
413 struct wt_status *s = data;
414 int i;
415
416 if (!q->nr)
417 return;
418 s->workdir_dirty = 1;
419 for (i = 0; i < q->nr; i++) {
420 struct diff_filepair *p;
421 struct string_list_item *it;
422 struct wt_status_change_data *d;
423
424 p = q->queue[i];
425 it = string_list_insert(&s->change, p->one->path);
426 d = it->util;
427 if (!d) {
428 d = xcalloc(1, sizeof(*d));
429 it->util = d;
430 }
431 if (!d->worktree_status)
432 d->worktree_status = p->status;
433 d->dirty_submodule = p->two->dirty_submodule;
434 if (S_ISGITLINK(p->two->mode))
435 d->new_submodule_commits = !!hashcmp(p->one->sha1, p->two->sha1);
436 }
437 }
438
439 static int unmerged_mask(const char *path)
440 {
441 int pos, mask;
442 const struct cache_entry *ce;
443
444 pos = cache_name_pos(path, strlen(path));
445 if (0 <= pos)
446 return 0;
447
448 mask = 0;
449 pos = -pos-1;
450 while (pos < active_nr) {
451 ce = active_cache[pos++];
452 if (strcmp(ce->name, path) || !ce_stage(ce))
453 break;
454 mask |= (1 << (ce_stage(ce) - 1));
455 }
456 return mask;
457 }
458
459 static void wt_status_collect_updated_cb(struct diff_queue_struct *q,
460 struct diff_options *options,
461 void *data)
462 {
463 struct wt_status *s = data;
464 int i;
465
466 for (i = 0; i < q->nr; i++) {
467 struct diff_filepair *p;
468 struct string_list_item *it;
469 struct wt_status_change_data *d;
470
471 p = q->queue[i];
472 it = string_list_insert(&s->change, p->two->path);
473 d = it->util;
474 if (!d) {
475 d = xcalloc(1, sizeof(*d));
476 it->util = d;
477 }
478 if (!d->index_status)
479 d->index_status = p->status;
480 switch (p->status) {
481 case DIFF_STATUS_COPIED:
482 case DIFF_STATUS_RENAMED:
483 d->head_path = xstrdup(p->one->path);
484 break;
485 case DIFF_STATUS_UNMERGED:
486 d->stagemask = unmerged_mask(p->two->path);
487 break;
488 }
489 }
490 }
491
492 static void wt_status_collect_changes_worktree(struct wt_status *s)
493 {
494 struct rev_info rev;
495
496 init_revisions(&rev, NULL);
497 setup_revisions(0, NULL, &rev, NULL);
498 rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
499 DIFF_OPT_SET(&rev.diffopt, DIRTY_SUBMODULES);
500 if (!s->show_untracked_files)
501 DIFF_OPT_SET(&rev.diffopt, IGNORE_UNTRACKED_IN_SUBMODULES);
502 if (s->ignore_submodule_arg) {
503 DIFF_OPT_SET(&rev.diffopt, OVERRIDE_SUBMODULE_CONFIG);
504 handle_ignore_submodules_arg(&rev.diffopt, s->ignore_submodule_arg);
505 }
506 rev.diffopt.format_callback = wt_status_collect_changed_cb;
507 rev.diffopt.format_callback_data = s;
508 copy_pathspec(&rev.prune_data, &s->pathspec);
509 run_diff_files(&rev, 0);
510 }
511
512 static void wt_status_collect_changes_index(struct wt_status *s)
513 {
514 struct rev_info rev;
515 struct setup_revision_opt opt;
516
517 init_revisions(&rev, NULL);
518 memset(&opt, 0, sizeof(opt));
519 opt.def = s->is_initial ? EMPTY_TREE_SHA1_HEX : s->reference;
520 setup_revisions(0, NULL, &rev, &opt);
521
522 DIFF_OPT_SET(&rev.diffopt, OVERRIDE_SUBMODULE_CONFIG);
523 if (s->ignore_submodule_arg) {
524 handle_ignore_submodules_arg(&rev.diffopt, s->ignore_submodule_arg);
525 } else {
526 /*
527 * Unless the user did explicitly request a submodule ignore
528 * mode by passing a command line option we do not ignore any
529 * changed submodule SHA-1s when comparing index and HEAD, no
530 * matter what is configured. Otherwise the user won't be
531 * shown any submodules she manually added (and which are
532 * staged to be committed), which would be really confusing.
533 */
534 handle_ignore_submodules_arg(&rev.diffopt, "dirty");
535 }
536
537 rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
538 rev.diffopt.format_callback = wt_status_collect_updated_cb;
539 rev.diffopt.format_callback_data = s;
540 rev.diffopt.detect_rename = 1;
541 rev.diffopt.rename_limit = 200;
542 rev.diffopt.break_opt = 0;
543 copy_pathspec(&rev.prune_data, &s->pathspec);
544 run_diff_index(&rev, 1);
545 }
546
547 static void wt_status_collect_changes_initial(struct wt_status *s)
548 {
549 int i;
550
551 for (i = 0; i < active_nr; i++) {
552 struct string_list_item *it;
553 struct wt_status_change_data *d;
554 const struct cache_entry *ce = active_cache[i];
555
556 if (!ce_path_match(ce, &s->pathspec, NULL))
557 continue;
558 it = string_list_insert(&s->change, ce->name);
559 d = it->util;
560 if (!d) {
561 d = xcalloc(1, sizeof(*d));
562 it->util = d;
563 }
564 if (ce_stage(ce)) {
565 d->index_status = DIFF_STATUS_UNMERGED;
566 d->stagemask |= (1 << (ce_stage(ce) - 1));
567 }
568 else
569 d->index_status = DIFF_STATUS_ADDED;
570 }
571 }
572
573 static void wt_status_collect_untracked(struct wt_status *s)
574 {
575 int i;
576 struct dir_struct dir;
577 uint64_t t_begin = getnanotime();
578
579 if (!s->show_untracked_files)
580 return;
581
582 memset(&dir, 0, sizeof(dir));
583 if (s->show_untracked_files != SHOW_ALL_UNTRACKED_FILES)
584 dir.flags |=
585 DIR_SHOW_OTHER_DIRECTORIES | DIR_HIDE_EMPTY_DIRECTORIES;
586 if (s->show_ignored_files)
587 dir.flags |= DIR_SHOW_IGNORED_TOO;
588 else
589 dir.untracked = the_index.untracked;
590 setup_standard_excludes(&dir);
591
592 fill_directory(&dir, &s->pathspec);
593
594 for (i = 0; i < dir.nr; i++) {
595 struct dir_entry *ent = dir.entries[i];
596 if (cache_name_is_other(ent->name, ent->len) &&
597 dir_path_match(ent, &s->pathspec, 0, NULL))
598 string_list_insert(&s->untracked, ent->name);
599 free(ent);
600 }
601
602 for (i = 0; i < dir.ignored_nr; i++) {
603 struct dir_entry *ent = dir.ignored[i];
604 if (cache_name_is_other(ent->name, ent->len) &&
605 dir_path_match(ent, &s->pathspec, 0, NULL))
606 string_list_insert(&s->ignored, ent->name);
607 free(ent);
608 }
609
610 free(dir.entries);
611 free(dir.ignored);
612 clear_directory(&dir);
613
614 if (advice_status_u_option)
615 s->untracked_in_ms = (getnanotime() - t_begin) / 1000000;
616 }
617
618 void wt_status_collect(struct wt_status *s)
619 {
620 wt_status_collect_changes_worktree(s);
621
622 if (s->is_initial)
623 wt_status_collect_changes_initial(s);
624 else
625 wt_status_collect_changes_index(s);
626 wt_status_collect_untracked(s);
627 }
628
629 static void wt_status_print_unmerged(struct wt_status *s)
630 {
631 int shown_header = 0;
632 int i;
633
634 for (i = 0; i < s->change.nr; i++) {
635 struct wt_status_change_data *d;
636 struct string_list_item *it;
637 it = &(s->change.items[i]);
638 d = it->util;
639 if (!d->stagemask)
640 continue;
641 if (!shown_header) {
642 wt_status_print_unmerged_header(s);
643 shown_header = 1;
644 }
645 wt_status_print_unmerged_data(s, it);
646 }
647 if (shown_header)
648 wt_status_print_trailer(s);
649
650 }
651
652 static void wt_status_print_updated(struct wt_status *s)
653 {
654 int shown_header = 0;
655 int i;
656
657 for (i = 0; i < s->change.nr; i++) {
658 struct wt_status_change_data *d;
659 struct string_list_item *it;
660 it = &(s->change.items[i]);
661 d = it->util;
662 if (!d->index_status ||
663 d->index_status == DIFF_STATUS_UNMERGED)
664 continue;
665 if (!shown_header) {
666 wt_status_print_cached_header(s);
667 s->commitable = 1;
668 shown_header = 1;
669 }
670 wt_status_print_change_data(s, WT_STATUS_UPDATED, it);
671 }
672 if (shown_header)
673 wt_status_print_trailer(s);
674 }
675
676 /*
677 * -1 : has delete
678 * 0 : no change
679 * 1 : some change but no delete
680 */
681 static int wt_status_check_worktree_changes(struct wt_status *s,
682 int *dirty_submodules)
683 {
684 int i;
685 int changes = 0;
686
687 *dirty_submodules = 0;
688
689 for (i = 0; i < s->change.nr; i++) {
690 struct wt_status_change_data *d;
691 d = s->change.items[i].util;
692 if (!d->worktree_status ||
693 d->worktree_status == DIFF_STATUS_UNMERGED)
694 continue;
695 if (!changes)
696 changes = 1;
697 if (d->dirty_submodule)
698 *dirty_submodules = 1;
699 if (d->worktree_status == DIFF_STATUS_DELETED)
700 changes = -1;
701 }
702 return changes;
703 }
704
705 static void wt_status_print_changed(struct wt_status *s)
706 {
707 int i, dirty_submodules;
708 int worktree_changes = wt_status_check_worktree_changes(s, &dirty_submodules);
709
710 if (!worktree_changes)
711 return;
712
713 wt_status_print_dirty_header(s, worktree_changes < 0, dirty_submodules);
714
715 for (i = 0; i < s->change.nr; i++) {
716 struct wt_status_change_data *d;
717 struct string_list_item *it;
718 it = &(s->change.items[i]);
719 d = it->util;
720 if (!d->worktree_status ||
721 d->worktree_status == DIFF_STATUS_UNMERGED)
722 continue;
723 wt_status_print_change_data(s, WT_STATUS_CHANGED, it);
724 }
725 wt_status_print_trailer(s);
726 }
727
728 static void wt_status_print_submodule_summary(struct wt_status *s, int uncommitted)
729 {
730 struct child_process sm_summary = CHILD_PROCESS_INIT;
731 struct strbuf cmd_stdout = STRBUF_INIT;
732 struct strbuf summary = STRBUF_INIT;
733 char *summary_content;
734
735 argv_array_pushf(&sm_summary.env_array, "GIT_INDEX_FILE=%s",
736 s->index_file);
737
738 argv_array_push(&sm_summary.args, "submodule");
739 argv_array_push(&sm_summary.args, "summary");
740 argv_array_push(&sm_summary.args, uncommitted ? "--files" : "--cached");
741 argv_array_push(&sm_summary.args, "--for-status");
742 argv_array_push(&sm_summary.args, "--summary-limit");
743 argv_array_pushf(&sm_summary.args, "%d", s->submodule_summary);
744 if (!uncommitted)
745 argv_array_push(&sm_summary.args, s->amend ? "HEAD^" : "HEAD");
746
747 sm_summary.git_cmd = 1;
748 sm_summary.no_stdin = 1;
749
750 capture_command(&sm_summary, &cmd_stdout, 1024);
751
752 /* prepend header, only if there's an actual output */
753 if (cmd_stdout.len) {
754 if (uncommitted)
755 strbuf_addstr(&summary, _("Submodules changed but not updated:"));
756 else
757 strbuf_addstr(&summary, _("Submodule changes to be committed:"));
758 strbuf_addstr(&summary, "\n\n");
759 }
760 strbuf_addbuf(&summary, &cmd_stdout);
761 strbuf_release(&cmd_stdout);
762
763 if (s->display_comment_prefix) {
764 size_t len;
765 summary_content = strbuf_detach(&summary, &len);
766 strbuf_add_commented_lines(&summary, summary_content, len);
767 free(summary_content);
768 }
769
770 fputs(summary.buf, s->fp);
771 strbuf_release(&summary);
772 }
773
774 static void wt_status_print_other(struct wt_status *s,
775 struct string_list *l,
776 const char *what,
777 const char *how)
778 {
779 int i;
780 struct strbuf buf = STRBUF_INIT;
781 static struct string_list output = STRING_LIST_INIT_DUP;
782 struct column_options copts;
783
784 if (!l->nr)
785 return;
786
787 wt_status_print_other_header(s, what, how);
788
789 for (i = 0; i < l->nr; i++) {
790 struct string_list_item *it;
791 const char *path;
792 it = &(l->items[i]);
793 path = quote_path(it->string, s->prefix, &buf);
794 if (column_active(s->colopts)) {
795 string_list_append(&output, path);
796 continue;
797 }
798 status_printf(s, color(WT_STATUS_HEADER, s), "\t");
799 status_printf_more(s, color(WT_STATUS_UNTRACKED, s),
800 "%s\n", path);
801 }
802
803 strbuf_release(&buf);
804 if (!column_active(s->colopts))
805 goto conclude;
806
807 strbuf_addf(&buf, "%s%s\t%s",
808 color(WT_STATUS_HEADER, s),
809 s->display_comment_prefix ? "#" : "",
810 color(WT_STATUS_UNTRACKED, s));
811 memset(&copts, 0, sizeof(copts));
812 copts.padding = 1;
813 copts.indent = buf.buf;
814 if (want_color(s->use_color))
815 copts.nl = GIT_COLOR_RESET "\n";
816 print_columns(&output, s->colopts, &copts);
817 string_list_clear(&output, 0);
818 strbuf_release(&buf);
819 conclude:
820 status_printf_ln(s, GIT_COLOR_NORMAL, "%s", "");
821 }
822
823 void wt_status_truncate_message_at_cut_line(struct strbuf *buf)
824 {
825 const char *p;
826 struct strbuf pattern = STRBUF_INIT;
827
828 strbuf_addf(&pattern, "\n%c %s", comment_line_char, cut_line);
829 if (starts_with(buf->buf, pattern.buf + 1))
830 strbuf_setlen(buf, 0);
831 else if ((p = strstr(buf->buf, pattern.buf)))
832 strbuf_setlen(buf, p - buf->buf + 1);
833 strbuf_release(&pattern);
834 }
835
836 void wt_status_add_cut_line(FILE *fp)
837 {
838 const char *explanation = _("Do not touch the line above.\nEverything below will be removed.");
839 struct strbuf buf = STRBUF_INIT;
840
841 fprintf(fp, "%c %s", comment_line_char, cut_line);
842 strbuf_add_commented_lines(&buf, explanation, strlen(explanation));
843 fputs(buf.buf, fp);
844 strbuf_release(&buf);
845 }
846
847 static void wt_status_print_verbose(struct wt_status *s)
848 {
849 struct rev_info rev;
850 struct setup_revision_opt opt;
851 int dirty_submodules;
852 const char *c = color(WT_STATUS_HEADER, s);
853
854 init_revisions(&rev, NULL);
855 DIFF_OPT_SET(&rev.diffopt, ALLOW_TEXTCONV);
856
857 memset(&opt, 0, sizeof(opt));
858 opt.def = s->is_initial ? EMPTY_TREE_SHA1_HEX : s->reference;
859 setup_revisions(0, NULL, &rev, &opt);
860
861 rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
862 rev.diffopt.detect_rename = 1;
863 rev.diffopt.file = s->fp;
864 rev.diffopt.close_file = 0;
865 /*
866 * If we're not going to stdout, then we definitely don't
867 * want color, since we are going to the commit message
868 * file (and even the "auto" setting won't work, since it
869 * will have checked isatty on stdout). But we then do want
870 * to insert the scissor line here to reliably remove the
871 * diff before committing.
872 */
873 if (s->fp != stdout) {
874 rev.diffopt.use_color = 0;
875 wt_status_add_cut_line(s->fp);
876 }
877 if (s->verbose > 1 && s->commitable) {
878 /* print_updated() printed a header, so do we */
879 if (s->fp != stdout)
880 wt_status_print_trailer(s);
881 status_printf_ln(s, c, _("Changes to be committed:"));
882 rev.diffopt.a_prefix = "c/";
883 rev.diffopt.b_prefix = "i/";
884 } /* else use prefix as per user config */
885 run_diff_index(&rev, 1);
886 if (s->verbose > 1 &&
887 wt_status_check_worktree_changes(s, &dirty_submodules)) {
888 status_printf_ln(s, c,
889 "--------------------------------------------------");
890 status_printf_ln(s, c, _("Changes not staged for commit:"));
891 setup_work_tree();
892 rev.diffopt.a_prefix = "i/";
893 rev.diffopt.b_prefix = "w/";
894 run_diff_files(&rev, 0);
895 }
896 }
897
898 static void wt_status_print_tracking(struct wt_status *s)
899 {
900 struct strbuf sb = STRBUF_INIT;
901 const char *cp, *ep, *branch_name;
902 struct branch *branch;
903 char comment_line_string[3];
904 int i;
905
906 assert(s->branch && !s->is_initial);
907 if (!skip_prefix(s->branch, "refs/heads/", &branch_name))
908 return;
909 branch = branch_get(branch_name);
910 if (!format_tracking_info(branch, &sb))
911 return;
912
913 i = 0;
914 if (s->display_comment_prefix) {
915 comment_line_string[i++] = comment_line_char;
916 comment_line_string[i++] = ' ';
917 }
918 comment_line_string[i] = '\0';
919
920 for (cp = sb.buf; (ep = strchr(cp, '\n')) != NULL; cp = ep + 1)
921 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s),
922 "%s%.*s", comment_line_string,
923 (int)(ep - cp), cp);
924 if (s->display_comment_prefix)
925 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s), "%c",
926 comment_line_char);
927 else
928 fputs("", s->fp);
929 }
930
931 static int has_unmerged(struct wt_status *s)
932 {
933 int i;
934
935 for (i = 0; i < s->change.nr; i++) {
936 struct wt_status_change_data *d;
937 d = s->change.items[i].util;
938 if (d->stagemask)
939 return 1;
940 }
941 return 0;
942 }
943
944 static void show_merge_in_progress(struct wt_status *s,
945 struct wt_status_state *state,
946 const char *color)
947 {
948 if (has_unmerged(s)) {
949 status_printf_ln(s, color, _("You have unmerged paths."));
950 if (s->hints)
951 status_printf_ln(s, color,
952 _(" (fix conflicts and run \"git commit\")"));
953 } else {
954 s-> commitable = 1;
955 status_printf_ln(s, color,
956 _("All conflicts fixed but you are still merging."));
957 if (s->hints)
958 status_printf_ln(s, color,
959 _(" (use \"git commit\" to conclude merge)"));
960 }
961 wt_status_print_trailer(s);
962 }
963
964 static void show_am_in_progress(struct wt_status *s,
965 struct wt_status_state *state,
966 const char *color)
967 {
968 status_printf_ln(s, color,
969 _("You are in the middle of an am session."));
970 if (state->am_empty_patch)
971 status_printf_ln(s, color,
972 _("The current patch is empty."));
973 if (s->hints) {
974 if (!state->am_empty_patch)
975 status_printf_ln(s, color,
976 _(" (fix conflicts and then run \"git am --continue\")"));
977 status_printf_ln(s, color,
978 _(" (use \"git am --skip\" to skip this patch)"));
979 status_printf_ln(s, color,
980 _(" (use \"git am --abort\" to restore the original branch)"));
981 }
982 wt_status_print_trailer(s);
983 }
984
985 static char *read_line_from_git_path(const char *filename)
986 {
987 struct strbuf buf = STRBUF_INIT;
988 FILE *fp = fopen(git_path("%s", filename), "r");
989 if (!fp) {
990 strbuf_release(&buf);
991 return NULL;
992 }
993 strbuf_getline_lf(&buf, fp);
994 if (!fclose(fp)) {
995 return strbuf_detach(&buf, NULL);
996 } else {
997 strbuf_release(&buf);
998 return NULL;
999 }
1000 }
1001
1002 static int split_commit_in_progress(struct wt_status *s)
1003 {
1004 int split_in_progress = 0;
1005 char *head = read_line_from_git_path("HEAD");
1006 char *orig_head = read_line_from_git_path("ORIG_HEAD");
1007 char *rebase_amend = read_line_from_git_path("rebase-merge/amend");
1008 char *rebase_orig_head = read_line_from_git_path("rebase-merge/orig-head");
1009
1010 if (!head || !orig_head || !rebase_amend || !rebase_orig_head ||
1011 !s->branch || strcmp(s->branch, "HEAD"))
1012 return split_in_progress;
1013
1014 if (!strcmp(rebase_amend, rebase_orig_head)) {
1015 if (strcmp(head, rebase_amend))
1016 split_in_progress = 1;
1017 } else if (strcmp(orig_head, rebase_orig_head)) {
1018 split_in_progress = 1;
1019 }
1020
1021 if (!s->amend && !s->nowarn && !s->workdir_dirty)
1022 split_in_progress = 0;
1023
1024 free(head);
1025 free(orig_head);
1026 free(rebase_amend);
1027 free(rebase_orig_head);
1028 return split_in_progress;
1029 }
1030
1031 /*
1032 * Turn
1033 * "pick d6a2f0303e897ec257dd0e0a39a5ccb709bc2047 some message"
1034 * into
1035 * "pick d6a2f03 some message"
1036 *
1037 * The function assumes that the line does not contain useless spaces
1038 * before or after the command.
1039 */
1040 static void abbrev_sha1_in_line(struct strbuf *line)
1041 {
1042 struct strbuf **split;
1043 int i;
1044
1045 if (starts_with(line->buf, "exec ") ||
1046 starts_with(line->buf, "x "))
1047 return;
1048
1049 split = strbuf_split_max(line, ' ', 3);
1050 if (split[0] && split[1]) {
1051 unsigned char sha1[20];
1052 const char *abbrev;
1053
1054 /*
1055 * strbuf_split_max left a space. Trim it and re-add
1056 * it after abbreviation.
1057 */
1058 strbuf_trim(split[1]);
1059 if (!get_sha1(split[1]->buf, sha1)) {
1060 abbrev = find_unique_abbrev(sha1, DEFAULT_ABBREV);
1061 strbuf_reset(split[1]);
1062 strbuf_addf(split[1], "%s ", abbrev);
1063 strbuf_reset(line);
1064 for (i = 0; split[i]; i++)
1065 strbuf_addf(line, "%s", split[i]->buf);
1066 }
1067 }
1068 strbuf_list_free(split);
1069 }
1070
1071 static void read_rebase_todolist(const char *fname, struct string_list *lines)
1072 {
1073 struct strbuf line = STRBUF_INIT;
1074 FILE *f = fopen(git_path("%s", fname), "r");
1075
1076 if (!f)
1077 die_errno("Could not open file %s for reading",
1078 git_path("%s", fname));
1079 while (!strbuf_getline_lf(&line, f)) {
1080 if (line.len && line.buf[0] == comment_line_char)
1081 continue;
1082 strbuf_trim(&line);
1083 if (!line.len)
1084 continue;
1085 abbrev_sha1_in_line(&line);
1086 string_list_append(lines, line.buf);
1087 }
1088 }
1089
1090 static void show_rebase_information(struct wt_status *s,
1091 struct wt_status_state *state,
1092 const char *color)
1093 {
1094 if (state->rebase_interactive_in_progress) {
1095 int i;
1096 int nr_lines_to_show = 2;
1097
1098 struct string_list have_done = STRING_LIST_INIT_DUP;
1099 struct string_list yet_to_do = STRING_LIST_INIT_DUP;
1100
1101 read_rebase_todolist("rebase-merge/done", &have_done);
1102 read_rebase_todolist("rebase-merge/git-rebase-todo", &yet_to_do);
1103
1104 if (have_done.nr == 0)
1105 status_printf_ln(s, color, _("No commands done."));
1106 else {
1107 status_printf_ln(s, color,
1108 Q_("Last command done (%d command done):",
1109 "Last commands done (%d commands done):",
1110 have_done.nr),
1111 have_done.nr);
1112 for (i = (have_done.nr > nr_lines_to_show)
1113 ? have_done.nr - nr_lines_to_show : 0;
1114 i < have_done.nr;
1115 i++)
1116 status_printf_ln(s, color, " %s", have_done.items[i].string);
1117 if (have_done.nr > nr_lines_to_show && s->hints)
1118 status_printf_ln(s, color,
1119 _(" (see more in file %s)"), git_path("rebase-merge/done"));
1120 }
1121
1122 if (yet_to_do.nr == 0)
1123 status_printf_ln(s, color,
1124 _("No commands remaining."));
1125 else {
1126 status_printf_ln(s, color,
1127 Q_("Next command to do (%d remaining command):",
1128 "Next commands to do (%d remaining commands):",
1129 yet_to_do.nr),
1130 yet_to_do.nr);
1131 for (i = 0; i < nr_lines_to_show && i < yet_to_do.nr; i++)
1132 status_printf_ln(s, color, " %s", yet_to_do.items[i].string);
1133 if (s->hints)
1134 status_printf_ln(s, color,
1135 _(" (use \"git rebase --edit-todo\" to view and edit)"));
1136 }
1137 string_list_clear(&yet_to_do, 0);
1138 string_list_clear(&have_done, 0);
1139 }
1140 }
1141
1142 static void print_rebase_state(struct wt_status *s,
1143 struct wt_status_state *state,
1144 const char *color)
1145 {
1146 if (state->branch)
1147 status_printf_ln(s, color,
1148 _("You are currently rebasing branch '%s' on '%s'."),
1149 state->branch,
1150 state->onto);
1151 else
1152 status_printf_ln(s, color,
1153 _("You are currently rebasing."));
1154 }
1155
1156 static void show_rebase_in_progress(struct wt_status *s,
1157 struct wt_status_state *state,
1158 const char *color)
1159 {
1160 struct stat st;
1161
1162 show_rebase_information(s, state, color);
1163 if (has_unmerged(s)) {
1164 print_rebase_state(s, state, color);
1165 if (s->hints) {
1166 status_printf_ln(s, color,
1167 _(" (fix conflicts and then run \"git rebase --continue\")"));
1168 status_printf_ln(s, color,
1169 _(" (use \"git rebase --skip\" to skip this patch)"));
1170 status_printf_ln(s, color,
1171 _(" (use \"git rebase --abort\" to check out the original branch)"));
1172 }
1173 } else if (state->rebase_in_progress || !stat(git_path_merge_msg(), &st)) {
1174 print_rebase_state(s, state, color);
1175 if (s->hints)
1176 status_printf_ln(s, color,
1177 _(" (all conflicts fixed: run \"git rebase --continue\")"));
1178 } else if (split_commit_in_progress(s)) {
1179 if (state->branch)
1180 status_printf_ln(s, color,
1181 _("You are currently splitting a commit while rebasing branch '%s' on '%s'."),
1182 state->branch,
1183 state->onto);
1184 else
1185 status_printf_ln(s, color,
1186 _("You are currently splitting a commit during a rebase."));
1187 if (s->hints)
1188 status_printf_ln(s, color,
1189 _(" (Once your working directory is clean, run \"git rebase --continue\")"));
1190 } else {
1191 if (state->branch)
1192 status_printf_ln(s, color,
1193 _("You are currently editing a commit while rebasing branch '%s' on '%s'."),
1194 state->branch,
1195 state->onto);
1196 else
1197 status_printf_ln(s, color,
1198 _("You are currently editing a commit during a rebase."));
1199 if (s->hints && !s->amend) {
1200 status_printf_ln(s, color,
1201 _(" (use \"git commit --amend\" to amend the current commit)"));
1202 status_printf_ln(s, color,
1203 _(" (use \"git rebase --continue\" once you are satisfied with your changes)"));
1204 }
1205 }
1206 wt_status_print_trailer(s);
1207 }
1208
1209 static void show_cherry_pick_in_progress(struct wt_status *s,
1210 struct wt_status_state *state,
1211 const char *color)
1212 {
1213 status_printf_ln(s, color, _("You are currently cherry-picking commit %s."),
1214 find_unique_abbrev(state->cherry_pick_head_sha1, DEFAULT_ABBREV));
1215 if (s->hints) {
1216 if (has_unmerged(s))
1217 status_printf_ln(s, color,
1218 _(" (fix conflicts and run \"git cherry-pick --continue\")"));
1219 else
1220 status_printf_ln(s, color,
1221 _(" (all conflicts fixed: run \"git cherry-pick --continue\")"));
1222 status_printf_ln(s, color,
1223 _(" (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"));
1224 }
1225 wt_status_print_trailer(s);
1226 }
1227
1228 static void show_revert_in_progress(struct wt_status *s,
1229 struct wt_status_state *state,
1230 const char *color)
1231 {
1232 status_printf_ln(s, color, _("You are currently reverting commit %s."),
1233 find_unique_abbrev(state->revert_head_sha1, DEFAULT_ABBREV));
1234 if (s->hints) {
1235 if (has_unmerged(s))
1236 status_printf_ln(s, color,
1237 _(" (fix conflicts and run \"git revert --continue\")"));
1238 else
1239 status_printf_ln(s, color,
1240 _(" (all conflicts fixed: run \"git revert --continue\")"));
1241 status_printf_ln(s, color,
1242 _(" (use \"git revert --abort\" to cancel the revert operation)"));
1243 }
1244 wt_status_print_trailer(s);
1245 }
1246
1247 static void show_bisect_in_progress(struct wt_status *s,
1248 struct wt_status_state *state,
1249 const char *color)
1250 {
1251 if (state->branch)
1252 status_printf_ln(s, color,
1253 _("You are currently bisecting, started from branch '%s'."),
1254 state->branch);
1255 else
1256 status_printf_ln(s, color,
1257 _("You are currently bisecting."));
1258 if (s->hints)
1259 status_printf_ln(s, color,
1260 _(" (use \"git bisect reset\" to get back to the original branch)"));
1261 wt_status_print_trailer(s);
1262 }
1263
1264 /*
1265 * Extract branch information from rebase/bisect
1266 */
1267 static char *get_branch(const struct worktree *wt, const char *path)
1268 {
1269 struct strbuf sb = STRBUF_INIT;
1270 unsigned char sha1[20];
1271 const char *branch_name;
1272
1273 if (strbuf_read_file(&sb, worktree_git_path(wt, "%s", path), 0) <= 0)
1274 goto got_nothing;
1275
1276 while (sb.len && sb.buf[sb.len - 1] == '\n')
1277 strbuf_setlen(&sb, sb.len - 1);
1278 if (!sb.len)
1279 goto got_nothing;
1280 if (skip_prefix(sb.buf, "refs/heads/", &branch_name))
1281 strbuf_remove(&sb, 0, branch_name - sb.buf);
1282 else if (starts_with(sb.buf, "refs/"))
1283 ;
1284 else if (!get_sha1_hex(sb.buf, sha1)) {
1285 const char *abbrev;
1286 abbrev = find_unique_abbrev(sha1, DEFAULT_ABBREV);
1287 strbuf_reset(&sb);
1288 strbuf_addstr(&sb, abbrev);
1289 } else if (!strcmp(sb.buf, "detached HEAD")) /* rebase */
1290 goto got_nothing;
1291 else /* bisect */
1292 ;
1293 return strbuf_detach(&sb, NULL);
1294
1295 got_nothing:
1296 strbuf_release(&sb);
1297 return NULL;
1298 }
1299
1300 struct grab_1st_switch_cbdata {
1301 struct strbuf buf;
1302 unsigned char nsha1[20];
1303 };
1304
1305 static int grab_1st_switch(unsigned char *osha1, unsigned char *nsha1,
1306 const char *email, unsigned long timestamp, int tz,
1307 const char *message, void *cb_data)
1308 {
1309 struct grab_1st_switch_cbdata *cb = cb_data;
1310 const char *target = NULL, *end;
1311
1312 if (!skip_prefix(message, "checkout: moving from ", &message))
1313 return 0;
1314 target = strstr(message, " to ");
1315 if (!target)
1316 return 0;
1317 target += strlen(" to ");
1318 strbuf_reset(&cb->buf);
1319 hashcpy(cb->nsha1, nsha1);
1320 end = strchrnul(target, '\n');
1321 strbuf_add(&cb->buf, target, end - target);
1322 if (!strcmp(cb->buf.buf, "HEAD")) {
1323 /* HEAD is relative. Resolve it to the right reflog entry. */
1324 strbuf_reset(&cb->buf);
1325 strbuf_addstr(&cb->buf,
1326 find_unique_abbrev(nsha1, DEFAULT_ABBREV));
1327 }
1328 return 1;
1329 }
1330
1331 static void wt_status_get_detached_from(struct wt_status_state *state)
1332 {
1333 struct grab_1st_switch_cbdata cb;
1334 struct commit *commit;
1335 unsigned char sha1[20];
1336 char *ref = NULL;
1337
1338 strbuf_init(&cb.buf, 0);
1339 if (for_each_reflog_ent_reverse("HEAD", grab_1st_switch, &cb) <= 0) {
1340 strbuf_release(&cb.buf);
1341 return;
1342 }
1343
1344 if (dwim_ref(cb.buf.buf, cb.buf.len, sha1, &ref) == 1 &&
1345 /* sha1 is a commit? match without further lookup */
1346 (!hashcmp(cb.nsha1, sha1) ||
1347 /* perhaps sha1 is a tag, try to dereference to a commit */
1348 ((commit = lookup_commit_reference_gently(sha1, 1)) != NULL &&
1349 !hashcmp(cb.nsha1, commit->object.oid.hash)))) {
1350 const char *from = ref;
1351 if (!skip_prefix(from, "refs/tags/", &from))
1352 skip_prefix(from, "refs/remotes/", &from);
1353 state->detached_from = xstrdup(from);
1354 } else
1355 state->detached_from =
1356 xstrdup(find_unique_abbrev(cb.nsha1, DEFAULT_ABBREV));
1357 hashcpy(state->detached_sha1, cb.nsha1);
1358 state->detached_at = !get_sha1("HEAD", sha1) &&
1359 !hashcmp(sha1, state->detached_sha1);
1360
1361 free(ref);
1362 strbuf_release(&cb.buf);
1363 }
1364
1365 int wt_status_check_rebase(const struct worktree *wt,
1366 struct wt_status_state *state)
1367 {
1368 struct stat st;
1369
1370 if (!stat(worktree_git_path(wt, "rebase-apply"), &st)) {
1371 if (!stat(worktree_git_path(wt, "rebase-apply/applying"), &st)) {
1372 state->am_in_progress = 1;
1373 if (!stat(worktree_git_path(wt, "rebase-apply/patch"), &st) && !st.st_size)
1374 state->am_empty_patch = 1;
1375 } else {
1376 state->rebase_in_progress = 1;
1377 state->branch = get_branch(wt, "rebase-apply/head-name");
1378 state->onto = get_branch(wt, "rebase-apply/onto");
1379 }
1380 } else if (!stat(worktree_git_path(wt, "rebase-merge"), &st)) {
1381 if (!stat(worktree_git_path(wt, "rebase-merge/interactive"), &st))
1382 state->rebase_interactive_in_progress = 1;
1383 else
1384 state->rebase_in_progress = 1;
1385 state->branch = get_branch(wt, "rebase-merge/head-name");
1386 state->onto = get_branch(wt, "rebase-merge/onto");
1387 } else
1388 return 0;
1389 return 1;
1390 }
1391
1392 int wt_status_check_bisect(const struct worktree *wt,
1393 struct wt_status_state *state)
1394 {
1395 struct stat st;
1396
1397 if (!stat(worktree_git_path(wt, "BISECT_LOG"), &st)) {
1398 state->bisect_in_progress = 1;
1399 state->branch = get_branch(wt, "BISECT_START");
1400 return 1;
1401 }
1402 return 0;
1403 }
1404
1405 void wt_status_get_state(struct wt_status_state *state,
1406 int get_detached_from)
1407 {
1408 struct stat st;
1409 unsigned char sha1[20];
1410
1411 if (!stat(git_path_merge_head(), &st)) {
1412 state->merge_in_progress = 1;
1413 } else if (wt_status_check_rebase(NULL, state)) {
1414 ; /* all set */
1415 } else if (!stat(git_path_cherry_pick_head(), &st) &&
1416 !get_sha1("CHERRY_PICK_HEAD", sha1)) {
1417 state->cherry_pick_in_progress = 1;
1418 hashcpy(state->cherry_pick_head_sha1, sha1);
1419 }
1420 wt_status_check_bisect(NULL, state);
1421 if (!stat(git_path_revert_head(), &st) &&
1422 !get_sha1("REVERT_HEAD", sha1)) {
1423 state->revert_in_progress = 1;
1424 hashcpy(state->revert_head_sha1, sha1);
1425 }
1426
1427 if (get_detached_from)
1428 wt_status_get_detached_from(state);
1429 }
1430
1431 static void wt_status_print_state(struct wt_status *s,
1432 struct wt_status_state *state)
1433 {
1434 const char *state_color = color(WT_STATUS_HEADER, s);
1435 if (state->merge_in_progress)
1436 show_merge_in_progress(s, state, state_color);
1437 else if (state->am_in_progress)
1438 show_am_in_progress(s, state, state_color);
1439 else if (state->rebase_in_progress || state->rebase_interactive_in_progress)
1440 show_rebase_in_progress(s, state, state_color);
1441 else if (state->cherry_pick_in_progress)
1442 show_cherry_pick_in_progress(s, state, state_color);
1443 else if (state->revert_in_progress)
1444 show_revert_in_progress(s, state, state_color);
1445 if (state->bisect_in_progress)
1446 show_bisect_in_progress(s, state, state_color);
1447 }
1448
1449 void wt_status_print(struct wt_status *s)
1450 {
1451 const char *branch_color = color(WT_STATUS_ONBRANCH, s);
1452 const char *branch_status_color = color(WT_STATUS_HEADER, s);
1453 struct wt_status_state state;
1454
1455 memset(&state, 0, sizeof(state));
1456 wt_status_get_state(&state,
1457 s->branch && !strcmp(s->branch, "HEAD"));
1458
1459 if (s->branch) {
1460 const char *on_what = _("On branch ");
1461 const char *branch_name = s->branch;
1462 if (!strcmp(branch_name, "HEAD")) {
1463 branch_status_color = color(WT_STATUS_NOBRANCH, s);
1464 if (state.rebase_in_progress || state.rebase_interactive_in_progress) {
1465 if (state.rebase_interactive_in_progress)
1466 on_what = _("interactive rebase in progress; onto ");
1467 else
1468 on_what = _("rebase in progress; onto ");
1469 branch_name = state.onto;
1470 } else if (state.detached_from) {
1471 branch_name = state.detached_from;
1472 if (state.detached_at)
1473 on_what = _("HEAD detached at ");
1474 else
1475 on_what = _("HEAD detached from ");
1476 } else {
1477 branch_name = "";
1478 on_what = _("Not currently on any branch.");
1479 }
1480 } else
1481 skip_prefix(branch_name, "refs/heads/", &branch_name);
1482 status_printf(s, color(WT_STATUS_HEADER, s), "%s", "");
1483 status_printf_more(s, branch_status_color, "%s", on_what);
1484 status_printf_more(s, branch_color, "%s\n", branch_name);
1485 if (!s->is_initial)
1486 wt_status_print_tracking(s);
1487 }
1488
1489 wt_status_print_state(s, &state);
1490 free(state.branch);
1491 free(state.onto);
1492 free(state.detached_from);
1493
1494 if (s->is_initial) {
1495 status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", "");
1496 status_printf_ln(s, color(WT_STATUS_HEADER, s), _("Initial commit"));
1497 status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", "");
1498 }
1499
1500 wt_status_print_updated(s);
1501 wt_status_print_unmerged(s);
1502 wt_status_print_changed(s);
1503 if (s->submodule_summary &&
1504 (!s->ignore_submodule_arg ||
1505 strcmp(s->ignore_submodule_arg, "all"))) {
1506 wt_status_print_submodule_summary(s, 0); /* staged */
1507 wt_status_print_submodule_summary(s, 1); /* unstaged */
1508 }
1509 if (s->show_untracked_files) {
1510 wt_status_print_other(s, &s->untracked, _("Untracked files"), "add");
1511 if (s->show_ignored_files)
1512 wt_status_print_other(s, &s->ignored, _("Ignored files"), "add -f");
1513 if (advice_status_u_option && 2000 < s->untracked_in_ms) {
1514 status_printf_ln(s, GIT_COLOR_NORMAL, "%s", "");
1515 status_printf_ln(s, GIT_COLOR_NORMAL,
1516 _("It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1517 "may speed it up, but you have to be careful not to forget to add\n"
1518 "new files yourself (see 'git help status')."),
1519 s->untracked_in_ms / 1000.0);
1520 }
1521 } else if (s->commitable)
1522 status_printf_ln(s, GIT_COLOR_NORMAL, _("Untracked files not listed%s"),
1523 s->hints
1524 ? _(" (use -u option to show untracked files)") : "");
1525
1526 if (s->verbose)
1527 wt_status_print_verbose(s);
1528 if (!s->commitable) {
1529 if (s->amend)
1530 status_printf_ln(s, GIT_COLOR_NORMAL, _("No changes"));
1531 else if (s->nowarn)
1532 ; /* nothing */
1533 else if (s->workdir_dirty) {
1534 if (s->hints)
1535 printf(_("no changes added to commit "
1536 "(use \"git add\" and/or \"git commit -a\")\n"));
1537 else
1538 printf(_("no changes added to commit\n"));
1539 } else if (s->untracked.nr) {
1540 if (s->hints)
1541 printf(_("nothing added to commit but untracked files "
1542 "present (use \"git add\" to track)\n"));
1543 else
1544 printf(_("nothing added to commit but untracked files present\n"));
1545 } else if (s->is_initial) {
1546 if (s->hints)
1547 printf(_("nothing to commit (create/copy files "
1548 "and use \"git add\" to track)\n"));
1549 else
1550 printf(_("nothing to commit\n"));
1551 } else if (!s->show_untracked_files) {
1552 if (s->hints)
1553 printf(_("nothing to commit (use -u to show untracked files)\n"));
1554 else
1555 printf(_("nothing to commit\n"));
1556 } else
1557 printf(_("nothing to commit, working directory clean\n"));
1558 }
1559 }
1560
1561 static void wt_shortstatus_unmerged(struct string_list_item *it,
1562 struct wt_status *s)
1563 {
1564 struct wt_status_change_data *d = it->util;
1565 const char *how = "??";
1566
1567 switch (d->stagemask) {
1568 case 1: how = "DD"; break; /* both deleted */
1569 case 2: how = "AU"; break; /* added by us */
1570 case 3: how = "UD"; break; /* deleted by them */
1571 case 4: how = "UA"; break; /* added by them */
1572 case 5: how = "DU"; break; /* deleted by us */
1573 case 6: how = "AA"; break; /* both added */
1574 case 7: how = "UU"; break; /* both modified */
1575 }
1576 color_fprintf(s->fp, color(WT_STATUS_UNMERGED, s), "%s", how);
1577 if (s->null_termination) {
1578 fprintf(stdout, " %s%c", it->string, 0);
1579 } else {
1580 struct strbuf onebuf = STRBUF_INIT;
1581 const char *one;
1582 one = quote_path(it->string, s->prefix, &onebuf);
1583 printf(" %s\n", one);
1584 strbuf_release(&onebuf);
1585 }
1586 }
1587
1588 static void wt_shortstatus_status(struct string_list_item *it,
1589 struct wt_status *s)
1590 {
1591 struct wt_status_change_data *d = it->util;
1592
1593 if (d->index_status)
1594 color_fprintf(s->fp, color(WT_STATUS_UPDATED, s), "%c", d->index_status);
1595 else
1596 putchar(' ');
1597 if (d->worktree_status)
1598 color_fprintf(s->fp, color(WT_STATUS_CHANGED, s), "%c", d->worktree_status);
1599 else
1600 putchar(' ');
1601 putchar(' ');
1602 if (s->null_termination) {
1603 fprintf(stdout, "%s%c", it->string, 0);
1604 if (d->head_path)
1605 fprintf(stdout, "%s%c", d->head_path, 0);
1606 } else {
1607 struct strbuf onebuf = STRBUF_INIT;
1608 const char *one;
1609 if (d->head_path) {
1610 one = quote_path(d->head_path, s->prefix, &onebuf);
1611 if (*one != '"' && strchr(one, ' ') != NULL) {
1612 putchar('"');
1613 strbuf_addch(&onebuf, '"');
1614 one = onebuf.buf;
1615 }
1616 printf("%s -> ", one);
1617 strbuf_release(&onebuf);
1618 }
1619 one = quote_path(it->string, s->prefix, &onebuf);
1620 if (*one != '"' && strchr(one, ' ') != NULL) {
1621 putchar('"');
1622 strbuf_addch(&onebuf, '"');
1623 one = onebuf.buf;
1624 }
1625 printf("%s\n", one);
1626 strbuf_release(&onebuf);
1627 }
1628 }
1629
1630 static void wt_shortstatus_other(struct string_list_item *it,
1631 struct wt_status *s, const char *sign)
1632 {
1633 if (s->null_termination) {
1634 fprintf(stdout, "%s %s%c", sign, it->string, 0);
1635 } else {
1636 struct strbuf onebuf = STRBUF_INIT;
1637 const char *one;
1638 one = quote_path(it->string, s->prefix, &onebuf);
1639 color_fprintf(s->fp, color(WT_STATUS_UNTRACKED, s), "%s", sign);
1640 printf(" %s\n", one);
1641 strbuf_release(&onebuf);
1642 }
1643 }
1644
1645 static void wt_shortstatus_print_tracking(struct wt_status *s)
1646 {
1647 struct branch *branch;
1648 const char *header_color = color(WT_STATUS_HEADER, s);
1649 const char *branch_color_local = color(WT_STATUS_LOCAL_BRANCH, s);
1650 const char *branch_color_remote = color(WT_STATUS_REMOTE_BRANCH, s);
1651
1652 const char *base;
1653 const char *branch_name;
1654 int num_ours, num_theirs;
1655 int upstream_is_gone = 0;
1656
1657 color_fprintf(s->fp, color(WT_STATUS_HEADER, s), "## ");
1658
1659 if (!s->branch)
1660 return;
1661 branch_name = s->branch;
1662
1663 if (s->is_initial)
1664 color_fprintf(s->fp, header_color, _("Initial commit on "));
1665
1666 if (!strcmp(s->branch, "HEAD")) {
1667 color_fprintf(s->fp, color(WT_STATUS_NOBRANCH, s), "%s",
1668 _("HEAD (no branch)"));
1669 goto conclude;
1670 }
1671
1672 skip_prefix(branch_name, "refs/heads/", &branch_name);
1673
1674 branch = branch_get(branch_name);
1675
1676 color_fprintf(s->fp, branch_color_local, "%s", branch_name);
1677
1678 if (stat_tracking_info(branch, &num_ours, &num_theirs, &base) < 0) {
1679 if (!base)
1680 goto conclude;
1681
1682 upstream_is_gone = 1;
1683 }
1684
1685 base = shorten_unambiguous_ref(base, 0);
1686 color_fprintf(s->fp, header_color, "...");
1687 color_fprintf(s->fp, branch_color_remote, "%s", base);
1688 free((char *)base);
1689
1690 if (!upstream_is_gone && !num_ours && !num_theirs)
1691 goto conclude;
1692
1693 #define LABEL(string) (s->no_gettext ? (string) : _(string))
1694
1695 color_fprintf(s->fp, header_color, " [");
1696 if (upstream_is_gone) {
1697 color_fprintf(s->fp, header_color, LABEL(N_("gone")));
1698 } else if (!num_ours) {
1699 color_fprintf(s->fp, header_color, LABEL(N_("behind ")));
1700 color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
1701 } else if (!num_theirs) {
1702 color_fprintf(s->fp, header_color, LABEL(N_("ahead ")));
1703 color_fprintf(s->fp, branch_color_local, "%d", num_ours);
1704 } else {
1705 color_fprintf(s->fp, header_color, LABEL(N_("ahead ")));
1706 color_fprintf(s->fp, branch_color_local, "%d", num_ours);
1707 color_fprintf(s->fp, header_color, ", %s", LABEL(N_("behind ")));
1708 color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
1709 }
1710
1711 color_fprintf(s->fp, header_color, "]");
1712 conclude:
1713 fputc(s->null_termination ? '\0' : '\n', s->fp);
1714 }
1715
1716 void wt_shortstatus_print(struct wt_status *s)
1717 {
1718 int i;
1719
1720 if (s->show_branch)
1721 wt_shortstatus_print_tracking(s);
1722
1723 for (i = 0; i < s->change.nr; i++) {
1724 struct wt_status_change_data *d;
1725 struct string_list_item *it;
1726
1727 it = &(s->change.items[i]);
1728 d = it->util;
1729 if (d->stagemask)
1730 wt_shortstatus_unmerged(it, s);
1731 else
1732 wt_shortstatus_status(it, s);
1733 }
1734 for (i = 0; i < s->untracked.nr; i++) {
1735 struct string_list_item *it;
1736
1737 it = &(s->untracked.items[i]);
1738 wt_shortstatus_other(it, s, "??");
1739 }
1740 for (i = 0; i < s->ignored.nr; i++) {
1741 struct string_list_item *it;
1742
1743 it = &(s->ignored.items[i]);
1744 wt_shortstatus_other(it, s, "!!");
1745 }
1746 }
1747
1748 void wt_porcelain_print(struct wt_status *s)
1749 {
1750 s->use_color = 0;
1751 s->relative_paths = 0;
1752 s->prefix = NULL;
1753 s->no_gettext = 1;
1754 wt_shortstatus_print(s);
1755 }
Eric Wong's git-svn branch