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