?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
unable_to_lock_die(): rename function from unable_to_lock_index_die()
[git/mjg.git] / wt-status.c
blob1bf5d725453f726f6a6179f9706a50f3c8c9dbb5
1 #include "cache.h"
2 #include "pathspec.h"
3 #include "wt-status.h"
4 #include "object.h"
5 #include "dir.h"
6 #include "commit.h"
7 #include "diff.h"
8 #include "revision.h"
9 #include "diffcore.h"
10 #include "quote.h"
11 #include "run-command.h"
12 #include "argv-array.h"
13 #include "remote.h"
14 #include "refs.h"
15 #include "submodule.h"
16 #include "column.h"
17 #include "strbuf.h"
18 #include "utf8.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", sha1, 0, 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 setup_standard_excludes(&dir);
589
590 fill_directory(&dir, &s->pathspec);
591
592 for (i = 0; i < dir.nr; i++) {
593 struct dir_entry *ent = dir.entries[i];
594 if (cache_name_is_other(ent->name, ent->len) &&
595 dir_path_match(ent, &s->pathspec, 0, NULL))
596 string_list_insert(&s->untracked, ent->name);
597 free(ent);
598 }
599
600 for (i = 0; i < dir.ignored_nr; i++) {
601 struct dir_entry *ent = dir.ignored[i];
602 if (cache_name_is_other(ent->name, ent->len) &&
603 dir_path_match(ent, &s->pathspec, 0, NULL))
604 string_list_insert(&s->ignored, ent->name);
605 free(ent);
606 }
607
608 free(dir.entries);
609 free(dir.ignored);
610 clear_directory(&dir);
611
612 if (advice_status_u_option)
613 s->untracked_in_ms = (getnanotime() - t_begin) / 1000000;
614 }
615
616 void wt_status_collect(struct wt_status *s)
617 {
618 wt_status_collect_changes_worktree(s);
619
620 if (s->is_initial)
621 wt_status_collect_changes_initial(s);
622 else
623 wt_status_collect_changes_index(s);
624 wt_status_collect_untracked(s);
625 }
626
627 static void wt_status_print_unmerged(struct wt_status *s)
628 {
629 int shown_header = 0;
630 int i;
631
632 for (i = 0; i < s->change.nr; i++) {
633 struct wt_status_change_data *d;
634 struct string_list_item *it;
635 it = &(s->change.items[i]);
636 d = it->util;
637 if (!d->stagemask)
638 continue;
639 if (!shown_header) {
640 wt_status_print_unmerged_header(s);
641 shown_header = 1;
642 }
643 wt_status_print_unmerged_data(s, it);
644 }
645 if (shown_header)
646 wt_status_print_trailer(s);
647
648 }
649
650 static void wt_status_print_updated(struct wt_status *s)
651 {
652 int shown_header = 0;
653 int i;
654
655 for (i = 0; i < s->change.nr; i++) {
656 struct wt_status_change_data *d;
657 struct string_list_item *it;
658 it = &(s->change.items[i]);
659 d = it->util;
660 if (!d->index_status ||
661 d->index_status == DIFF_STATUS_UNMERGED)
662 continue;
663 if (!shown_header) {
664 wt_status_print_cached_header(s);
665 s->commitable = 1;
666 shown_header = 1;
667 }
668 wt_status_print_change_data(s, WT_STATUS_UPDATED, it);
669 }
670 if (shown_header)
671 wt_status_print_trailer(s);
672 }
673
674 /*
675 * -1 : has delete
676 * 0 : no change
677 * 1 : some change but no delete
678 */
679 static int wt_status_check_worktree_changes(struct wt_status *s,
680 int *dirty_submodules)
681 {
682 int i;
683 int changes = 0;
684
685 *dirty_submodules = 0;
686
687 for (i = 0; i < s->change.nr; i++) {
688 struct wt_status_change_data *d;
689 d = s->change.items[i].util;
690 if (!d->worktree_status ||
691 d->worktree_status == DIFF_STATUS_UNMERGED)
692 continue;
693 if (!changes)
694 changes = 1;
695 if (d->dirty_submodule)
696 *dirty_submodules = 1;
697 if (d->worktree_status == DIFF_STATUS_DELETED)
698 changes = -1;
699 }
700 return changes;
701 }
702
703 static void wt_status_print_changed(struct wt_status *s)
704 {
705 int i, dirty_submodules;
706 int worktree_changes = wt_status_check_worktree_changes(s, &dirty_submodules);
707
708 if (!worktree_changes)
709 return;
710
711 wt_status_print_dirty_header(s, worktree_changes < 0, dirty_submodules);
712
713 for (i = 0; i < s->change.nr; i++) {
714 struct wt_status_change_data *d;
715 struct string_list_item *it;
716 it = &(s->change.items[i]);
717 d = it->util;
718 if (!d->worktree_status ||
719 d->worktree_status == DIFF_STATUS_UNMERGED)
720 continue;
721 wt_status_print_change_data(s, WT_STATUS_CHANGED, it);
722 }
723 wt_status_print_trailer(s);
724 }
725
726 static void wt_status_print_submodule_summary(struct wt_status *s, int uncommitted)
727 {
728 struct child_process sm_summary = CHILD_PROCESS_INIT;
729 struct argv_array env = ARGV_ARRAY_INIT;
730 struct argv_array argv = ARGV_ARRAY_INIT;
731 struct strbuf cmd_stdout = STRBUF_INIT;
732 struct strbuf summary = STRBUF_INIT;
733 char *summary_content;
734 size_t len;
735
736 argv_array_pushf(&env, "GIT_INDEX_FILE=%s", s->index_file);
737
738 argv_array_push(&argv, "submodule");
739 argv_array_push(&argv, "summary");
740 argv_array_push(&argv, uncommitted ? "--files" : "--cached");
741 argv_array_push(&argv, "--for-status");
742 argv_array_push(&argv, "--summary-limit");
743 argv_array_pushf(&argv, "%d", s->submodule_summary);
744 if (!uncommitted)
745 argv_array_push(&argv, s->amend ? "HEAD^" : "HEAD");
746
747 sm_summary.argv = argv.argv;
748 sm_summary.env = env.argv;
749 sm_summary.git_cmd = 1;
750 sm_summary.no_stdin = 1;
751 fflush(s->fp);
752 sm_summary.out = -1;
753
754 run_command(&sm_summary);
755 argv_array_clear(&env);
756 argv_array_clear(&argv);
757
758 len = strbuf_read(&cmd_stdout, sm_summary.out, 1024);
759
760 /* prepend header, only if there's an actual output */
761 if (len) {
762 if (uncommitted)
763 strbuf_addstr(&summary, _("Submodules changed but not updated:"));
764 else
765 strbuf_addstr(&summary, _("Submodule changes to be committed:"));
766 strbuf_addstr(&summary, "\n\n");
767 }
768 strbuf_addbuf(&summary, &cmd_stdout);
769 strbuf_release(&cmd_stdout);
770
771 if (s->display_comment_prefix) {
772 summary_content = strbuf_detach(&summary, &len);
773 strbuf_add_commented_lines(&summary, summary_content, len);
774 free(summary_content);
775 }
776
777 fputs(summary.buf, s->fp);
778 strbuf_release(&summary);
779 }
780
781 static void wt_status_print_other(struct wt_status *s,
782 struct string_list *l,
783 const char *what,
784 const char *how)
785 {
786 int i;
787 struct strbuf buf = STRBUF_INIT;
788 static struct string_list output = STRING_LIST_INIT_DUP;
789 struct column_options copts;
790
791 if (!l->nr)
792 return;
793
794 wt_status_print_other_header(s, what, how);
795
796 for (i = 0; i < l->nr; i++) {
797 struct string_list_item *it;
798 const char *path;
799 it = &(l->items[i]);
800 path = quote_path(it->string, s->prefix, &buf);
801 if (column_active(s->colopts)) {
802 string_list_append(&output, path);
803 continue;
804 }
805 status_printf(s, color(WT_STATUS_HEADER, s), "\t");
806 status_printf_more(s, color(WT_STATUS_UNTRACKED, s),
807 "%s\n", path);
808 }
809
810 strbuf_release(&buf);
811 if (!column_active(s->colopts))
812 goto conclude;
813
814 strbuf_addf(&buf, "%s%s\t%s",
815 color(WT_STATUS_HEADER, s),
816 s->display_comment_prefix ? "#" : "",
817 color(WT_STATUS_UNTRACKED, s));
818 memset(&copts, 0, sizeof(copts));
819 copts.padding = 1;
820 copts.indent = buf.buf;
821 if (want_color(s->use_color))
822 copts.nl = GIT_COLOR_RESET "\n";
823 print_columns(&output, s->colopts, &copts);
824 string_list_clear(&output, 0);
825 strbuf_release(&buf);
826 conclude:
827 status_printf_ln(s, GIT_COLOR_NORMAL, "%s", "");
828 }
829
830 void wt_status_truncate_message_at_cut_line(struct strbuf *buf)
831 {
832 const char *p;
833 struct strbuf pattern = STRBUF_INIT;
834
835 strbuf_addf(&pattern, "%c %s", comment_line_char, cut_line);
836 p = strstr(buf->buf, pattern.buf);
837 if (p && (p == buf->buf || p[-1] == '\n'))
838 strbuf_setlen(buf, p - buf->buf);
839 strbuf_release(&pattern);
840 }
841
842 void wt_status_add_cut_line(FILE *fp)
843 {
844 const char *explanation = _("Do not touch the line above.\nEverything below will be removed.");
845 struct strbuf buf = STRBUF_INIT;
846
847 fprintf(fp, "%c %s", comment_line_char, cut_line);
848 strbuf_add_commented_lines(&buf, explanation, strlen(explanation));
849 fputs(buf.buf, fp);
850 strbuf_release(&buf);
851 }
852
853 static void wt_status_print_verbose(struct wt_status *s)
854 {
855 struct rev_info rev;
856 struct setup_revision_opt opt;
857
858 init_revisions(&rev, NULL);
859 DIFF_OPT_SET(&rev.diffopt, ALLOW_TEXTCONV);
860
861 memset(&opt, 0, sizeof(opt));
862 opt.def = s->is_initial ? EMPTY_TREE_SHA1_HEX : s->reference;
863 setup_revisions(0, NULL, &rev, &opt);
864
865 rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
866 rev.diffopt.detect_rename = 1;
867 rev.diffopt.file = s->fp;
868 rev.diffopt.close_file = 0;
869 /*
870 * If we're not going to stdout, then we definitely don't
871 * want color, since we are going to the commit message
872 * file (and even the "auto" setting won't work, since it
873 * will have checked isatty on stdout). But we then do want
874 * to insert the scissor line here to reliably remove the
875 * diff before committing.
876 */
877 if (s->fp != stdout) {
878 rev.diffopt.use_color = 0;
879 wt_status_add_cut_line(s->fp);
880 }
881 run_diff_index(&rev, 1);
882 }
883
884 static void wt_status_print_tracking(struct wt_status *s)
885 {
886 struct strbuf sb = STRBUF_INIT;
887 const char *cp, *ep;
888 struct branch *branch;
889 char comment_line_string[3];
890 int i;
891
892 assert(s->branch && !s->is_initial);
893 if (!starts_with(s->branch, "refs/heads/"))
894 return;
895 branch = branch_get(s->branch + 11);
896 if (!format_tracking_info(branch, &sb))
897 return;
898
899 i = 0;
900 if (s->display_comment_prefix) {
901 comment_line_string[i++] = comment_line_char;
902 comment_line_string[i++] = ' ';
903 }
904 comment_line_string[i] = '\0';
905
906 for (cp = sb.buf; (ep = strchr(cp, '\n')) != NULL; cp = ep + 1)
907 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s),
908 "%s%.*s", comment_line_string,
909 (int)(ep - cp), cp);
910 if (s->display_comment_prefix)
911 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s), "%c",
912 comment_line_char);
913 else
914 fputs("", s->fp);
915 }
916
917 static int has_unmerged(struct wt_status *s)
918 {
919 int i;
920
921 for (i = 0; i < s->change.nr; i++) {
922 struct wt_status_change_data *d;
923 d = s->change.items[i].util;
924 if (d->stagemask)
925 return 1;
926 }
927 return 0;
928 }
929
930 static void show_merge_in_progress(struct wt_status *s,
931 struct wt_status_state *state,
932 const char *color)
933 {
934 if (has_unmerged(s)) {
935 status_printf_ln(s, color, _("You have unmerged paths."));
936 if (s->hints)
937 status_printf_ln(s, color,
938 _(" (fix conflicts and run \"git commit\")"));
939 } else {
940 status_printf_ln(s, color,
941 _("All conflicts fixed but you are still merging."));
942 if (s->hints)
943 status_printf_ln(s, color,
944 _(" (use \"git commit\" to conclude merge)"));
945 }
946 wt_status_print_trailer(s);
947 }
948
949 static void show_am_in_progress(struct wt_status *s,
950 struct wt_status_state *state,
951 const char *color)
952 {
953 status_printf_ln(s, color,
954 _("You are in the middle of an am session."));
955 if (state->am_empty_patch)
956 status_printf_ln(s, color,
957 _("The current patch is empty."));
958 if (s->hints) {
959 if (!state->am_empty_patch)
960 status_printf_ln(s, color,
961 _(" (fix conflicts and then run \"git am --continue\")"));
962 status_printf_ln(s, color,
963 _(" (use \"git am --skip\" to skip this patch)"));
964 status_printf_ln(s, color,
965 _(" (use \"git am --abort\" to restore the original branch)"));
966 }
967 wt_status_print_trailer(s);
968 }
969
970 static char *read_line_from_git_path(const char *filename)
971 {
972 struct strbuf buf = STRBUF_INIT;
973 FILE *fp = fopen(git_path("%s", filename), "r");
974 if (!fp) {
975 strbuf_release(&buf);
976 return NULL;
977 }
978 strbuf_getline(&buf, fp, '\n');
979 if (!fclose(fp)) {
980 return strbuf_detach(&buf, NULL);
981 } else {
982 strbuf_release(&buf);
983 return NULL;
984 }
985 }
986
987 static int split_commit_in_progress(struct wt_status *s)
988 {
989 int split_in_progress = 0;
990 char *head = read_line_from_git_path("HEAD");
991 char *orig_head = read_line_from_git_path("ORIG_HEAD");
992 char *rebase_amend = read_line_from_git_path("rebase-merge/amend");
993 char *rebase_orig_head = read_line_from_git_path("rebase-merge/orig-head");
994
995 if (!head || !orig_head || !rebase_amend || !rebase_orig_head ||
996 !s->branch || strcmp(s->branch, "HEAD"))
997 return split_in_progress;
998
999 if (!strcmp(rebase_amend, rebase_orig_head)) {
1000 if (strcmp(head, rebase_amend))
1001 split_in_progress = 1;
1002 } else if (strcmp(orig_head, rebase_orig_head)) {
1003 split_in_progress = 1;
1004 }
1005
1006 if (!s->amend && !s->nowarn && !s->workdir_dirty)
1007 split_in_progress = 0;
1008
1009 free(head);
1010 free(orig_head);
1011 free(rebase_amend);
1012 free(rebase_orig_head);
1013 return split_in_progress;
1014 }
1015
1016 static void show_rebase_in_progress(struct wt_status *s,
1017 struct wt_status_state *state,
1018 const char *color)
1019 {
1020 struct stat st;
1021
1022 if (has_unmerged(s)) {
1023 if (state->branch)
1024 status_printf_ln(s, color,
1025 _("You are currently rebasing branch '%s' on '%s'."),
1026 state->branch,
1027 state->onto);
1028 else
1029 status_printf_ln(s, color,
1030 _("You are currently rebasing."));
1031 if (s->hints) {
1032 status_printf_ln(s, color,
1033 _(" (fix conflicts and then run \"git rebase --continue\")"));
1034 status_printf_ln(s, color,
1035 _(" (use \"git rebase --skip\" to skip this patch)"));
1036 status_printf_ln(s, color,
1037 _(" (use \"git rebase --abort\" to check out the original branch)"));
1038 }
1039 } else if (state->rebase_in_progress || !stat(git_path("MERGE_MSG"), &st)) {
1040 if (state->branch)
1041 status_printf_ln(s, color,
1042 _("You are currently rebasing branch '%s' on '%s'."),
1043 state->branch,
1044 state->onto);
1045 else
1046 status_printf_ln(s, color,
1047 _("You are currently rebasing."));
1048 if (s->hints)
1049 status_printf_ln(s, color,
1050 _(" (all conflicts fixed: run \"git rebase --continue\")"));
1051 } else if (split_commit_in_progress(s)) {
1052 if (state->branch)
1053 status_printf_ln(s, color,
1054 _("You are currently splitting a commit while rebasing branch '%s' on '%s'."),
1055 state->branch,
1056 state->onto);
1057 else
1058 status_printf_ln(s, color,
1059 _("You are currently splitting a commit during a rebase."));
1060 if (s->hints)
1061 status_printf_ln(s, color,
1062 _(" (Once your working directory is clean, run \"git rebase --continue\")"));
1063 } else {
1064 if (state->branch)
1065 status_printf_ln(s, color,
1066 _("You are currently editing a commit while rebasing branch '%s' on '%s'."),
1067 state->branch,
1068 state->onto);
1069 else
1070 status_printf_ln(s, color,
1071 _("You are currently editing a commit during a rebase."));
1072 if (s->hints && !s->amend) {
1073 status_printf_ln(s, color,
1074 _(" (use \"git commit --amend\" to amend the current commit)"));
1075 status_printf_ln(s, color,
1076 _(" (use \"git rebase --continue\" once you are satisfied with your changes)"));
1077 }
1078 }
1079 wt_status_print_trailer(s);
1080 }
1081
1082 static void show_cherry_pick_in_progress(struct wt_status *s,
1083 struct wt_status_state *state,
1084 const char *color)
1085 {
1086 status_printf_ln(s, color, _("You are currently cherry-picking commit %s."),
1087 find_unique_abbrev(state->cherry_pick_head_sha1, DEFAULT_ABBREV));
1088 if (s->hints) {
1089 if (has_unmerged(s))
1090 status_printf_ln(s, color,
1091 _(" (fix conflicts and run \"git cherry-pick --continue\")"));
1092 else
1093 status_printf_ln(s, color,
1094 _(" (all conflicts fixed: run \"git cherry-pick --continue\")"));
1095 status_printf_ln(s, color,
1096 _(" (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"));
1097 }
1098 wt_status_print_trailer(s);
1099 }
1100
1101 static void show_revert_in_progress(struct wt_status *s,
1102 struct wt_status_state *state,
1103 const char *color)
1104 {
1105 status_printf_ln(s, color, _("You are currently reverting commit %s."),
1106 find_unique_abbrev(state->revert_head_sha1, DEFAULT_ABBREV));
1107 if (s->hints) {
1108 if (has_unmerged(s))
1109 status_printf_ln(s, color,
1110 _(" (fix conflicts and run \"git revert --continue\")"));
1111 else
1112 status_printf_ln(s, color,
1113 _(" (all conflicts fixed: run \"git revert --continue\")"));
1114 status_printf_ln(s, color,
1115 _(" (use \"git revert --abort\" to cancel the revert operation)"));
1116 }
1117 wt_status_print_trailer(s);
1118 }
1119
1120 static void show_bisect_in_progress(struct wt_status *s,
1121 struct wt_status_state *state,
1122 const char *color)
1123 {
1124 if (state->branch)
1125 status_printf_ln(s, color,
1126 _("You are currently bisecting, started from branch '%s'."),
1127 state->branch);
1128 else
1129 status_printf_ln(s, color,
1130 _("You are currently bisecting."));
1131 if (s->hints)
1132 status_printf_ln(s, color,
1133 _(" (use \"git bisect reset\" to get back to the original branch)"));
1134 wt_status_print_trailer(s);
1135 }
1136
1137 /*
1138 * Extract branch information from rebase/bisect
1139 */
1140 static char *read_and_strip_branch(const char *path)
1141 {
1142 struct strbuf sb = STRBUF_INIT;
1143 unsigned char sha1[20];
1144
1145 if (strbuf_read_file(&sb, git_path("%s", path), 0) <= 0)
1146 goto got_nothing;
1147
1148 while (&sb.len && sb.buf[sb.len - 1] == '\n')
1149 strbuf_setlen(&sb, sb.len - 1);
1150 if (!sb.len)
1151 goto got_nothing;
1152 if (starts_with(sb.buf, "refs/heads/"))
1153 strbuf_remove(&sb,0, strlen("refs/heads/"));
1154 else if (starts_with(sb.buf, "refs/"))
1155 ;
1156 else if (!get_sha1_hex(sb.buf, sha1)) {
1157 const char *abbrev;
1158 abbrev = find_unique_abbrev(sha1, DEFAULT_ABBREV);
1159 strbuf_reset(&sb);
1160 strbuf_addstr(&sb, abbrev);
1161 } else if (!strcmp(sb.buf, "detached HEAD")) /* rebase */
1162 goto got_nothing;
1163 else /* bisect */
1164 ;
1165 return strbuf_detach(&sb, NULL);
1166
1167 got_nothing:
1168 strbuf_release(&sb);
1169 return NULL;
1170 }
1171
1172 struct grab_1st_switch_cbdata {
1173 struct strbuf buf;
1174 unsigned char nsha1[20];
1175 };
1176
1177 static int grab_1st_switch(unsigned char *osha1, unsigned char *nsha1,
1178 const char *email, unsigned long timestamp, int tz,
1179 const char *message, void *cb_data)
1180 {
1181 struct grab_1st_switch_cbdata *cb = cb_data;
1182 const char *target = NULL, *end;
1183
1184 if (!starts_with(message, "checkout: moving from "))
1185 return 0;
1186 message += strlen("checkout: moving from ");
1187 target = strstr(message, " to ");
1188 if (!target)
1189 return 0;
1190 target += strlen(" to ");
1191 strbuf_reset(&cb->buf);
1192 hashcpy(cb->nsha1, nsha1);
1193 for (end = target; *end && *end != '\n'; end++)
1194 ;
1195 strbuf_add(&cb->buf, target, end - target);
1196 return 1;
1197 }
1198
1199 static void wt_status_get_detached_from(struct wt_status_state *state)
1200 {
1201 struct grab_1st_switch_cbdata cb;
1202 struct commit *commit;
1203 unsigned char sha1[20];
1204 char *ref = NULL;
1205
1206 strbuf_init(&cb.buf, 0);
1207 if (for_each_reflog_ent_reverse("HEAD", grab_1st_switch, &cb) <= 0) {
1208 strbuf_release(&cb.buf);
1209 return;
1210 }
1211
1212 if (dwim_ref(cb.buf.buf, cb.buf.len, sha1, &ref) == 1 &&
1213 /* sha1 is a commit? match without further lookup */
1214 (!hashcmp(cb.nsha1, sha1) ||
1215 /* perhaps sha1 is a tag, try to dereference to a commit */
1216 ((commit = lookup_commit_reference_gently(sha1, 1)) != NULL &&
1217 !hashcmp(cb.nsha1, commit->object.sha1)))) {
1218 int ofs;
1219 if (starts_with(ref, "refs/tags/"))
1220 ofs = strlen("refs/tags/");
1221 else if (starts_with(ref, "refs/remotes/"))
1222 ofs = strlen("refs/remotes/");
1223 else
1224 ofs = 0;
1225 state->detached_from = xstrdup(ref + ofs);
1226 } else
1227 state->detached_from =
1228 xstrdup(find_unique_abbrev(cb.nsha1, DEFAULT_ABBREV));
1229 hashcpy(state->detached_sha1, cb.nsha1);
1230
1231 free(ref);
1232 strbuf_release(&cb.buf);
1233 }
1234
1235 void wt_status_get_state(struct wt_status_state *state,
1236 int get_detached_from)
1237 {
1238 struct stat st;
1239 unsigned char sha1[20];
1240
1241 if (!stat(git_path("MERGE_HEAD"), &st)) {
1242 state->merge_in_progress = 1;
1243 } else if (!stat(git_path("rebase-apply"), &st)) {
1244 if (!stat(git_path("rebase-apply/applying"), &st)) {
1245 state->am_in_progress = 1;
1246 if (!stat(git_path("rebase-apply/patch"), &st) && !st.st_size)
1247 state->am_empty_patch = 1;
1248 } else {
1249 state->rebase_in_progress = 1;
1250 state->branch = read_and_strip_branch("rebase-apply/head-name");
1251 state->onto = read_and_strip_branch("rebase-apply/onto");
1252 }
1253 } else if (!stat(git_path("rebase-merge"), &st)) {
1254 if (!stat(git_path("rebase-merge/interactive"), &st))
1255 state->rebase_interactive_in_progress = 1;
1256 else
1257 state->rebase_in_progress = 1;
1258 state->branch = read_and_strip_branch("rebase-merge/head-name");
1259 state->onto = read_and_strip_branch("rebase-merge/onto");
1260 } else if (!stat(git_path("CHERRY_PICK_HEAD"), &st) &&
1261 !get_sha1("CHERRY_PICK_HEAD", sha1)) {
1262 state->cherry_pick_in_progress = 1;
1263 hashcpy(state->cherry_pick_head_sha1, sha1);
1264 }
1265 if (!stat(git_path("BISECT_LOG"), &st)) {
1266 state->bisect_in_progress = 1;
1267 state->branch = read_and_strip_branch("BISECT_START");
1268 }
1269 if (!stat(git_path("REVERT_HEAD"), &st) &&
1270 !get_sha1("REVERT_HEAD", sha1)) {
1271 state->revert_in_progress = 1;
1272 hashcpy(state->revert_head_sha1, sha1);
1273 }
1274
1275 if (get_detached_from)
1276 wt_status_get_detached_from(state);
1277 }
1278
1279 static void wt_status_print_state(struct wt_status *s,
1280 struct wt_status_state *state)
1281 {
1282 const char *state_color = color(WT_STATUS_HEADER, s);
1283 if (state->merge_in_progress)
1284 show_merge_in_progress(s, state, state_color);
1285 else if (state->am_in_progress)
1286 show_am_in_progress(s, state, state_color);
1287 else if (state->rebase_in_progress || state->rebase_interactive_in_progress)
1288 show_rebase_in_progress(s, state, state_color);
1289 else if (state->cherry_pick_in_progress)
1290 show_cherry_pick_in_progress(s, state, state_color);
1291 else if (state->revert_in_progress)
1292 show_revert_in_progress(s, state, state_color);
1293 if (state->bisect_in_progress)
1294 show_bisect_in_progress(s, state, state_color);
1295 }
1296
1297 void wt_status_print(struct wt_status *s)
1298 {
1299 const char *branch_color = color(WT_STATUS_ONBRANCH, s);
1300 const char *branch_status_color = color(WT_STATUS_HEADER, s);
1301 struct wt_status_state state;
1302
1303 memset(&state, 0, sizeof(state));
1304 wt_status_get_state(&state,
1305 s->branch && !strcmp(s->branch, "HEAD"));
1306
1307 if (s->branch) {
1308 const char *on_what = _("On branch ");
1309 const char *branch_name = s->branch;
1310 if (starts_with(branch_name, "refs/heads/"))
1311 branch_name += 11;
1312 else if (!strcmp(branch_name, "HEAD")) {
1313 branch_status_color = color(WT_STATUS_NOBRANCH, s);
1314 if (state.rebase_in_progress || state.rebase_interactive_in_progress) {
1315 on_what = _("rebase in progress; onto ");
1316 branch_name = state.onto;
1317 } else if (state.detached_from) {
1318 unsigned char sha1[20];
1319 branch_name = state.detached_from;
1320 if (!get_sha1("HEAD", sha1) &&
1321 !hashcmp(sha1, state.detached_sha1))
1322 on_what = _("HEAD detached at ");
1323 else
1324 on_what = _("HEAD detached from ");
1325 } else {
1326 branch_name = "";
1327 on_what = _("Not currently on any branch.");
1328 }
1329 }
1330 status_printf(s, color(WT_STATUS_HEADER, s), "%s", "");
1331 status_printf_more(s, branch_status_color, "%s", on_what);
1332 status_printf_more(s, branch_color, "%s\n", branch_name);
1333 if (!s->is_initial)
1334 wt_status_print_tracking(s);
1335 }
1336
1337 wt_status_print_state(s, &state);
1338 free(state.branch);
1339 free(state.onto);
1340 free(state.detached_from);
1341
1342 if (s->is_initial) {
1343 status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", "");
1344 status_printf_ln(s, color(WT_STATUS_HEADER, s), _("Initial commit"));
1345 status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", "");
1346 }
1347
1348 wt_status_print_updated(s);
1349 wt_status_print_unmerged(s);
1350 wt_status_print_changed(s);
1351 if (s->submodule_summary &&
1352 (!s->ignore_submodule_arg ||
1353 strcmp(s->ignore_submodule_arg, "all"))) {
1354 wt_status_print_submodule_summary(s, 0); /* staged */
1355 wt_status_print_submodule_summary(s, 1); /* unstaged */
1356 }
1357 if (s->show_untracked_files) {
1358 wt_status_print_other(s, &s->untracked, _("Untracked files"), "add");
1359 if (s->show_ignored_files)
1360 wt_status_print_other(s, &s->ignored, _("Ignored files"), "add -f");
1361 if (advice_status_u_option && 2000 < s->untracked_in_ms) {
1362 status_printf_ln(s, GIT_COLOR_NORMAL, "%s", "");
1363 status_printf_ln(s, GIT_COLOR_NORMAL,
1364 _("It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1365 "may speed it up, but you have to be careful not to forget to add\n"
1366 "new files yourself (see 'git help status')."),
1367 s->untracked_in_ms / 1000.0);
1368 }
1369 } else if (s->commitable)
1370 status_printf_ln(s, GIT_COLOR_NORMAL, _("Untracked files not listed%s"),
1371 s->hints
1372 ? _(" (use -u option to show untracked files)") : "");
1373
1374 if (s->verbose)
1375 wt_status_print_verbose(s);
1376 if (!s->commitable) {
1377 if (s->amend)
1378 status_printf_ln(s, GIT_COLOR_NORMAL, _("No changes"));
1379 else if (s->nowarn)
1380 ; /* nothing */
1381 else if (s->workdir_dirty) {
1382 if (s->hints)
1383 printf(_("no changes added to commit "
1384 "(use \"git add\" and/or \"git commit -a\")\n"));
1385 else
1386 printf(_("no changes added to commit\n"));
1387 } else if (s->untracked.nr) {
1388 if (s->hints)
1389 printf(_("nothing added to commit but untracked files "
1390 "present (use \"git add\" to track)\n"));
1391 else
1392 printf(_("nothing added to commit but untracked files present\n"));
1393 } else if (s->is_initial) {
1394 if (s->hints)
1395 printf(_("nothing to commit (create/copy files "
1396 "and use \"git add\" to track)\n"));
1397 else
1398 printf(_("nothing to commit\n"));
1399 } else if (!s->show_untracked_files) {
1400 if (s->hints)
1401 printf(_("nothing to commit (use -u to show untracked files)\n"));
1402 else
1403 printf(_("nothing to commit\n"));
1404 } else
1405 printf(_("nothing to commit, working directory clean\n"));
1406 }
1407 }
1408
1409 static void wt_shortstatus_unmerged(struct string_list_item *it,
1410 struct wt_status *s)
1411 {
1412 struct wt_status_change_data *d = it->util;
1413 const char *how = "??";
1414
1415 switch (d->stagemask) {
1416 case 1: how = "DD"; break; /* both deleted */
1417 case 2: how = "AU"; break; /* added by us */
1418 case 3: how = "UD"; break; /* deleted by them */
1419 case 4: how = "UA"; break; /* added by them */
1420 case 5: how = "DU"; break; /* deleted by us */
1421 case 6: how = "AA"; break; /* both added */
1422 case 7: how = "UU"; break; /* both modified */
1423 }
1424 color_fprintf(s->fp, color(WT_STATUS_UNMERGED, s), "%s", how);
1425 if (s->null_termination) {
1426 fprintf(stdout, " %s%c", it->string, 0);
1427 } else {
1428 struct strbuf onebuf = STRBUF_INIT;
1429 const char *one;
1430 one = quote_path(it->string, s->prefix, &onebuf);
1431 printf(" %s\n", one);
1432 strbuf_release(&onebuf);
1433 }
1434 }
1435
1436 static void wt_shortstatus_status(struct string_list_item *it,
1437 struct wt_status *s)
1438 {
1439 struct wt_status_change_data *d = it->util;
1440
1441 if (d->index_status)
1442 color_fprintf(s->fp, color(WT_STATUS_UPDATED, s), "%c", d->index_status);
1443 else
1444 putchar(' ');
1445 if (d->worktree_status)
1446 color_fprintf(s->fp, color(WT_STATUS_CHANGED, s), "%c", d->worktree_status);
1447 else
1448 putchar(' ');
1449 putchar(' ');
1450 if (s->null_termination) {
1451 fprintf(stdout, "%s%c", it->string, 0);
1452 if (d->head_path)
1453 fprintf(stdout, "%s%c", d->head_path, 0);
1454 } else {
1455 struct strbuf onebuf = STRBUF_INIT;
1456 const char *one;
1457 if (d->head_path) {
1458 one = quote_path(d->head_path, s->prefix, &onebuf);
1459 if (*one != '"' && strchr(one, ' ') != NULL) {
1460 putchar('"');
1461 strbuf_addch(&onebuf, '"');
1462 one = onebuf.buf;
1463 }
1464 printf("%s -> ", one);
1465 strbuf_release(&onebuf);
1466 }
1467 one = quote_path(it->string, s->prefix, &onebuf);
1468 if (*one != '"' && strchr(one, ' ') != NULL) {
1469 putchar('"');
1470 strbuf_addch(&onebuf, '"');
1471 one = onebuf.buf;
1472 }
1473 printf("%s\n", one);
1474 strbuf_release(&onebuf);
1475 }
1476 }
1477
1478 static void wt_shortstatus_other(struct string_list_item *it,
1479 struct wt_status *s, const char *sign)
1480 {
1481 if (s->null_termination) {
1482 fprintf(stdout, "%s %s%c", sign, it->string, 0);
1483 } else {
1484 struct strbuf onebuf = STRBUF_INIT;
1485 const char *one;
1486 one = quote_path(it->string, s->prefix, &onebuf);
1487 color_fprintf(s->fp, color(WT_STATUS_UNTRACKED, s), "%s", sign);
1488 printf(" %s\n", one);
1489 strbuf_release(&onebuf);
1490 }
1491 }
1492
1493 static void wt_shortstatus_print_tracking(struct wt_status *s)
1494 {
1495 struct branch *branch;
1496 const char *header_color = color(WT_STATUS_HEADER, s);
1497 const char *branch_color_local = color(WT_STATUS_LOCAL_BRANCH, s);
1498 const char *branch_color_remote = color(WT_STATUS_REMOTE_BRANCH, s);
1499
1500 const char *base;
1501 const char *branch_name;
1502 int num_ours, num_theirs;
1503 int upstream_is_gone = 0;
1504
1505 color_fprintf(s->fp, color(WT_STATUS_HEADER, s), "## ");
1506
1507 if (!s->branch)
1508 return;
1509 branch_name = s->branch;
1510
1511 if (starts_with(branch_name, "refs/heads/"))
1512 branch_name += 11;
1513 else if (!strcmp(branch_name, "HEAD")) {
1514 branch_name = _("HEAD (no branch)");
1515 branch_color_local = color(WT_STATUS_NOBRANCH, s);
1516 }
1517
1518 branch = branch_get(s->branch + 11);
1519 if (s->is_initial)
1520 color_fprintf(s->fp, header_color, _("Initial commit on "));
1521
1522 color_fprintf(s->fp, branch_color_local, "%s", branch_name);
1523
1524 switch (stat_tracking_info(branch, &num_ours, &num_theirs)) {
1525 case 0:
1526 /* no base */
1527 fputc(s->null_termination ? '\0' : '\n', s->fp);
1528 return;
1529 case -1:
1530 /* with "gone" base */
1531 upstream_is_gone = 1;
1532 break;
1533 default:
1534 /* with base */
1535 break;
1536 }
1537
1538 base = branch->merge[0]->dst;
1539 base = shorten_unambiguous_ref(base, 0);
1540 color_fprintf(s->fp, header_color, "...");
1541 color_fprintf(s->fp, branch_color_remote, "%s", base);
1542
1543 if (!upstream_is_gone && !num_ours && !num_theirs) {
1544 fputc(s->null_termination ? '\0' : '\n', s->fp);
1545 return;
1546 }
1547
1548 #define LABEL(string) (s->no_gettext ? (string) : _(string))
1549
1550 color_fprintf(s->fp, header_color, " [");
1551 if (upstream_is_gone) {
1552 color_fprintf(s->fp, header_color, LABEL(N_("gone")));
1553 } else if (!num_ours) {
1554 color_fprintf(s->fp, header_color, LABEL(N_("behind ")));
1555 color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
1556 } else if (!num_theirs) {
1557 color_fprintf(s->fp, header_color, LABEL(N_(("ahead "))));
1558 color_fprintf(s->fp, branch_color_local, "%d", num_ours);
1559 } else {
1560 color_fprintf(s->fp, header_color, LABEL(N_(("ahead "))));
1561 color_fprintf(s->fp, branch_color_local, "%d", num_ours);
1562 color_fprintf(s->fp, header_color, ", %s", LABEL(N_("behind ")));
1563 color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
1564 }
1565
1566 color_fprintf(s->fp, header_color, "]");
1567 fputc(s->null_termination ? '\0' : '\n', s->fp);
1568 }
1569
1570 void wt_shortstatus_print(struct wt_status *s)
1571 {
1572 int i;
1573
1574 if (s->show_branch)
1575 wt_shortstatus_print_tracking(s);
1576
1577 for (i = 0; i < s->change.nr; i++) {
1578 struct wt_status_change_data *d;
1579 struct string_list_item *it;
1580
1581 it = &(s->change.items[i]);
1582 d = it->util;
1583 if (d->stagemask)
1584 wt_shortstatus_unmerged(it, s);
1585 else
1586 wt_shortstatus_status(it, s);
1587 }
1588 for (i = 0; i < s->untracked.nr; i++) {
1589 struct string_list_item *it;
1590
1591 it = &(s->untracked.items[i]);
1592 wt_shortstatus_other(it, s, "??");
1593 }
1594 for (i = 0; i < s->ignored.nr; i++) {
1595 struct string_list_item *it;
1596
1597 it = &(s->ignored.items[i]);
1598 wt_shortstatus_other(it, s, "!!");
1599 }
1600 }
1601
1602 void wt_porcelain_print(struct wt_status *s)
1603 {
1604 s->use_color = 0;
1605 s->relative_paths = 0;
1606 s->prefix = NULL;
1607 s->no_gettext = 1;
1608 wt_shortstatus_print(s);
1609 }
Michael J Gruber's git tree