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