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