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