completion: complete merge-base options
[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 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 void wt_status_print_unmerged_data(struct wt_status *s,
249                                           struct string_list_item *it)
250 {
251         const char *c = color(WT_STATUS_UNMERGED, s);
252         struct wt_status_change_data *d = it->util;
253         struct strbuf onebuf = STRBUF_INIT;
254         const char *one, *how = _("bug");
255
256         one = quote_path(it->string, s->prefix, &onebuf);
257         status_printf(s, color(WT_STATUS_HEADER, s), "\t");
258         switch (d->stagemask) {
259         case 1: how = _("both deleted:"); break;
260         case 2: how = _("added by us:"); break;
261         case 3: how = _("deleted by them:"); break;
262         case 4: how = _("added by them:"); break;
263         case 5: how = _("deleted by us:"); break;
264         case 6: how = _("both added:"); break;
265         case 7: how = _("both modified:"); break;
266         }
267         status_printf_more(s, c, "%-20s%s\n", how, one);
268         strbuf_release(&onebuf);
269 }
270
271 static const char *wt_status_diff_status_string(int status)
272 {
273         switch (status) {
274         case DIFF_STATUS_ADDED:
275                 return _("new file");
276         case DIFF_STATUS_COPIED:
277                 return _("copied");
278         case DIFF_STATUS_DELETED:
279                 return _("deleted");
280         case DIFF_STATUS_MODIFIED:
281                 return _("modified");
282         case DIFF_STATUS_RENAMED:
283                 return _("renamed");
284         case DIFF_STATUS_TYPE_CHANGED:
285                 return _("typechange");
286         case DIFF_STATUS_UNKNOWN:
287                 return _("unknown");
288         case DIFF_STATUS_UNMERGED:
289                 return _("unmerged");
290         default:
291                 return NULL;
292         }
293 }
294
295 static void wt_status_print_change_data(struct wt_status *s,
296                                         int change_type,
297                                         struct string_list_item *it)
298 {
299         struct wt_status_change_data *d = it->util;
300         const char *c = color(change_type, s);
301         int status;
302         char *one_name;
303         char *two_name;
304         const char *one, *two;
305         struct strbuf onebuf = STRBUF_INIT, twobuf = STRBUF_INIT;
306         struct strbuf extra = STRBUF_INIT;
307         static char *padding;
308         const char *what;
309         int len;
310
311         if (!padding) {
312                 int width = 0;
313                 /* If DIFF_STATUS_* uses outside this range, we're in trouble */
314                 for (status = 'A'; status <= 'Z'; status++) {
315                         what = wt_status_diff_status_string(status);
316                         len = what ? strlen(what) : 0;
317                         if (len > width)
318                                 width = len;
319                 }
320                 width += 2;     /* colon and a space */
321                 padding = xmallocz(width);
322                 memset(padding, ' ', width);
323         }
324
325         one_name = two_name = it->string;
326         switch (change_type) {
327         case WT_STATUS_UPDATED:
328                 status = d->index_status;
329                 if (d->head_path)
330                         one_name = d->head_path;
331                 break;
332         case WT_STATUS_CHANGED:
333                 if (d->new_submodule_commits || d->dirty_submodule) {
334                         strbuf_addstr(&extra, " (");
335                         if (d->new_submodule_commits)
336                                 strbuf_addf(&extra, _("new commits, "));
337                         if (d->dirty_submodule & DIRTY_SUBMODULE_MODIFIED)
338                                 strbuf_addf(&extra, _("modified content, "));
339                         if (d->dirty_submodule & DIRTY_SUBMODULE_UNTRACKED)
340                                 strbuf_addf(&extra, _("untracked content, "));
341                         strbuf_setlen(&extra, extra.len - 2);
342                         strbuf_addch(&extra, ')');
343                 }
344                 status = d->worktree_status;
345                 break;
346         default:
347                 die("BUG: unhandled change_type %d in wt_status_print_change_data",
348                     change_type);
349         }
350
351         one = quote_path(one_name, s->prefix, &onebuf);
352         two = quote_path(two_name, s->prefix, &twobuf);
353
354         status_printf(s, color(WT_STATUS_HEADER, s), "\t");
355         what = wt_status_diff_status_string(status);
356         if (!what)
357                 die(_("bug: unhandled diff status %c"), status);
358         /* 1 for colon, which is not part of "what" */
359         len = strlen(padding) - (utf8_strwidth(what) + 1);
360         assert(len >= 0);
361         if (status == DIFF_STATUS_COPIED || status == DIFF_STATUS_RENAMED)
362                 status_printf_more(s, c, "%s:%.*s%s -> %s",
363                                    what, len, padding, one, two);
364         else
365                 status_printf_more(s, c, "%s:%.*s%s",
366                                    what, len, padding, one);
367         if (extra.len) {
368                 status_printf_more(s, color(WT_STATUS_HEADER, s), "%s", extra.buf);
369                 strbuf_release(&extra);
370         }
371         status_printf_more(s, GIT_COLOR_NORMAL, "\n");
372         strbuf_release(&onebuf);
373         strbuf_release(&twobuf);
374 }
375
376 static void wt_status_collect_changed_cb(struct diff_queue_struct *q,
377                                          struct diff_options *options,
378                                          void *data)
379 {
380         struct wt_status *s = data;
381         int i;
382
383         if (!q->nr)
384                 return;
385         s->workdir_dirty = 1;
386         for (i = 0; i < q->nr; i++) {
387                 struct diff_filepair *p;
388                 struct string_list_item *it;
389                 struct wt_status_change_data *d;
390
391                 p = q->queue[i];
392                 it = string_list_insert(&s->change, p->one->path);
393                 d = it->util;
394                 if (!d) {
395                         d = xcalloc(1, sizeof(*d));
396                         it->util = d;
397                 }
398                 if (!d->worktree_status)
399                         d->worktree_status = p->status;
400                 d->dirty_submodule = p->two->dirty_submodule;
401                 if (S_ISGITLINK(p->two->mode))
402                         d->new_submodule_commits = !!hashcmp(p->one->sha1, p->two->sha1);
403         }
404 }
405
406 static int unmerged_mask(const char *path)
407 {
408         int pos, mask;
409         const struct cache_entry *ce;
410
411         pos = cache_name_pos(path, strlen(path));
412         if (0 <= pos)
413                 return 0;
414
415         mask = 0;
416         pos = -pos-1;
417         while (pos < active_nr) {
418                 ce = active_cache[pos++];
419                 if (strcmp(ce->name, path) || !ce_stage(ce))
420                         break;
421                 mask |= (1 << (ce_stage(ce) - 1));
422         }
423         return mask;
424 }
425
426 static void wt_status_collect_updated_cb(struct diff_queue_struct *q,
427                                          struct diff_options *options,
428                                          void *data)
429 {
430         struct wt_status *s = data;
431         int i;
432
433         for (i = 0; i < q->nr; i++) {
434                 struct diff_filepair *p;
435                 struct string_list_item *it;
436                 struct wt_status_change_data *d;
437
438                 p = q->queue[i];
439                 it = string_list_insert(&s->change, p->two->path);
440                 d = it->util;
441                 if (!d) {
442                         d = xcalloc(1, sizeof(*d));
443                         it->util = d;
444                 }
445                 if (!d->index_status)
446                         d->index_status = p->status;
447                 switch (p->status) {
448                 case DIFF_STATUS_COPIED:
449                 case DIFF_STATUS_RENAMED:
450                         d->head_path = xstrdup(p->one->path);
451                         break;
452                 case DIFF_STATUS_UNMERGED:
453                         d->stagemask = unmerged_mask(p->two->path);
454                         break;
455                 }
456         }
457 }
458
459 static void wt_status_collect_changes_worktree(struct wt_status *s)
460 {
461         struct rev_info rev;
462
463         init_revisions(&rev, NULL);
464         setup_revisions(0, NULL, &rev, NULL);
465         rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
466         DIFF_OPT_SET(&rev.diffopt, DIRTY_SUBMODULES);
467         if (!s->show_untracked_files)
468                 DIFF_OPT_SET(&rev.diffopt, IGNORE_UNTRACKED_IN_SUBMODULES);
469         if (s->ignore_submodule_arg) {
470                 DIFF_OPT_SET(&rev.diffopt, OVERRIDE_SUBMODULE_CONFIG);
471                 handle_ignore_submodules_arg(&rev.diffopt, s->ignore_submodule_arg);
472         }
473         rev.diffopt.format_callback = wt_status_collect_changed_cb;
474         rev.diffopt.format_callback_data = s;
475         copy_pathspec(&rev.prune_data, &s->pathspec);
476         run_diff_files(&rev, 0);
477 }
478
479 static void wt_status_collect_changes_index(struct wt_status *s)
480 {
481         struct rev_info rev;
482         struct setup_revision_opt opt;
483
484         init_revisions(&rev, NULL);
485         memset(&opt, 0, sizeof(opt));
486         opt.def = s->is_initial ? EMPTY_TREE_SHA1_HEX : s->reference;
487         setup_revisions(0, NULL, &rev, &opt);
488
489         if (s->ignore_submodule_arg) {
490                 DIFF_OPT_SET(&rev.diffopt, OVERRIDE_SUBMODULE_CONFIG);
491                 handle_ignore_submodules_arg(&rev.diffopt, s->ignore_submodule_arg);
492         }
493
494         rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
495         rev.diffopt.format_callback = wt_status_collect_updated_cb;
496         rev.diffopt.format_callback_data = s;
497         rev.diffopt.detect_rename = 1;
498         rev.diffopt.rename_limit = 200;
499         rev.diffopt.break_opt = 0;
500         copy_pathspec(&rev.prune_data, &s->pathspec);
501         run_diff_index(&rev, 1);
502 }
503
504 static void wt_status_collect_changes_initial(struct wt_status *s)
505 {
506         int i;
507
508         for (i = 0; i < active_nr; i++) {
509                 struct string_list_item *it;
510                 struct wt_status_change_data *d;
511                 const struct cache_entry *ce = active_cache[i];
512
513                 if (!ce_path_match(ce, &s->pathspec))
514                         continue;
515                 it = string_list_insert(&s->change, ce->name);
516                 d = it->util;
517                 if (!d) {
518                         d = xcalloc(1, sizeof(*d));
519                         it->util = d;
520                 }
521                 if (ce_stage(ce)) {
522                         d->index_status = DIFF_STATUS_UNMERGED;
523                         d->stagemask |= (1 << (ce_stage(ce) - 1));
524                 }
525                 else
526                         d->index_status = DIFF_STATUS_ADDED;
527         }
528 }
529
530 static void wt_status_collect_untracked(struct wt_status *s)
531 {
532         int i;
533         struct dir_struct dir;
534         struct timeval t_begin;
535
536         if (!s->show_untracked_files)
537                 return;
538
539         if (advice_status_u_option)
540                 gettimeofday(&t_begin, NULL);
541
542         memset(&dir, 0, sizeof(dir));
543         if (s->show_untracked_files != SHOW_ALL_UNTRACKED_FILES)
544                 dir.flags |=
545                         DIR_SHOW_OTHER_DIRECTORIES | DIR_HIDE_EMPTY_DIRECTORIES;
546         if (s->show_ignored_files)
547                 dir.flags |= DIR_SHOW_IGNORED_TOO;
548         setup_standard_excludes(&dir);
549
550         fill_directory(&dir, &s->pathspec);
551
552         for (i = 0; i < dir.nr; i++) {
553                 struct dir_entry *ent = dir.entries[i];
554                 if (cache_name_is_other(ent->name, ent->len) &&
555                     match_pathspec_depth(&s->pathspec, ent->name, ent->len, 0, NULL))
556                         string_list_insert(&s->untracked, ent->name);
557                 free(ent);
558         }
559
560         for (i = 0; i < dir.ignored_nr; i++) {
561                 struct dir_entry *ent = dir.ignored[i];
562                 if (cache_name_is_other(ent->name, ent->len) &&
563                     match_pathspec_depth(&s->pathspec, ent->name, ent->len, 0, NULL))
564                         string_list_insert(&s->ignored, ent->name);
565                 free(ent);
566         }
567
568         free(dir.entries);
569         free(dir.ignored);
570         clear_directory(&dir);
571
572         if (advice_status_u_option) {
573                 struct timeval t_end;
574                 gettimeofday(&t_end, NULL);
575                 s->untracked_in_ms =
576                         (uint64_t)t_end.tv_sec * 1000 + t_end.tv_usec / 1000 -
577                         ((uint64_t)t_begin.tv_sec * 1000 + t_begin.tv_usec / 1000);
578         }
579 }
580
581 void wt_status_collect(struct wt_status *s)
582 {
583         wt_status_collect_changes_worktree(s);
584
585         if (s->is_initial)
586                 wt_status_collect_changes_initial(s);
587         else
588                 wt_status_collect_changes_index(s);
589         wt_status_collect_untracked(s);
590 }
591
592 static void wt_status_print_unmerged(struct wt_status *s)
593 {
594         int shown_header = 0;
595         int i;
596
597         for (i = 0; i < s->change.nr; i++) {
598                 struct wt_status_change_data *d;
599                 struct string_list_item *it;
600                 it = &(s->change.items[i]);
601                 d = it->util;
602                 if (!d->stagemask)
603                         continue;
604                 if (!shown_header) {
605                         wt_status_print_unmerged_header(s);
606                         shown_header = 1;
607                 }
608                 wt_status_print_unmerged_data(s, it);
609         }
610         if (shown_header)
611                 wt_status_print_trailer(s);
612
613 }
614
615 static void wt_status_print_updated(struct wt_status *s)
616 {
617         int shown_header = 0;
618         int i;
619
620         for (i = 0; i < s->change.nr; i++) {
621                 struct wt_status_change_data *d;
622                 struct string_list_item *it;
623                 it = &(s->change.items[i]);
624                 d = it->util;
625                 if (!d->index_status ||
626                     d->index_status == DIFF_STATUS_UNMERGED)
627                         continue;
628                 if (!shown_header) {
629                         wt_status_print_cached_header(s);
630                         s->commitable = 1;
631                         shown_header = 1;
632                 }
633                 wt_status_print_change_data(s, WT_STATUS_UPDATED, it);
634         }
635         if (shown_header)
636                 wt_status_print_trailer(s);
637 }
638
639 /*
640  * -1 : has delete
641  *  0 : no change
642  *  1 : some change but no delete
643  */
644 static int wt_status_check_worktree_changes(struct wt_status *s,
645                                              int *dirty_submodules)
646 {
647         int i;
648         int changes = 0;
649
650         *dirty_submodules = 0;
651
652         for (i = 0; i < s->change.nr; i++) {
653                 struct wt_status_change_data *d;
654                 d = s->change.items[i].util;
655                 if (!d->worktree_status ||
656                     d->worktree_status == DIFF_STATUS_UNMERGED)
657                         continue;
658                 if (!changes)
659                         changes = 1;
660                 if (d->dirty_submodule)
661                         *dirty_submodules = 1;
662                 if (d->worktree_status == DIFF_STATUS_DELETED)
663                         changes = -1;
664         }
665         return changes;
666 }
667
668 static void wt_status_print_changed(struct wt_status *s)
669 {
670         int i, dirty_submodules;
671         int worktree_changes = wt_status_check_worktree_changes(s, &dirty_submodules);
672
673         if (!worktree_changes)
674                 return;
675
676         wt_status_print_dirty_header(s, worktree_changes < 0, dirty_submodules);
677
678         for (i = 0; i < s->change.nr; i++) {
679                 struct wt_status_change_data *d;
680                 struct string_list_item *it;
681                 it = &(s->change.items[i]);
682                 d = it->util;
683                 if (!d->worktree_status ||
684                     d->worktree_status == DIFF_STATUS_UNMERGED)
685                         continue;
686                 wt_status_print_change_data(s, WT_STATUS_CHANGED, it);
687         }
688         wt_status_print_trailer(s);
689 }
690
691 static void wt_status_print_submodule_summary(struct wt_status *s, int uncommitted)
692 {
693         struct child_process sm_summary;
694         char summary_limit[64];
695         char index[PATH_MAX];
696         const char *env[] = { NULL, NULL };
697         struct argv_array argv = ARGV_ARRAY_INIT;
698         struct strbuf cmd_stdout = STRBUF_INIT;
699         struct strbuf summary = STRBUF_INIT;
700         char *summary_content;
701         size_t len;
702
703         sprintf(summary_limit, "%d", s->submodule_summary);
704         snprintf(index, sizeof(index), "GIT_INDEX_FILE=%s", s->index_file);
705
706         env[0] = index;
707         argv_array_push(&argv, "submodule");
708         argv_array_push(&argv, "summary");
709         argv_array_push(&argv, uncommitted ? "--files" : "--cached");
710         argv_array_push(&argv, "--for-status");
711         argv_array_push(&argv, "--summary-limit");
712         argv_array_push(&argv, summary_limit);
713         if (!uncommitted)
714                 argv_array_push(&argv, s->amend ? "HEAD^" : "HEAD");
715
716         memset(&sm_summary, 0, sizeof(sm_summary));
717         sm_summary.argv = argv.argv;
718         sm_summary.env = env;
719         sm_summary.git_cmd = 1;
720         sm_summary.no_stdin = 1;
721         fflush(s->fp);
722         sm_summary.out = -1;
723
724         run_command(&sm_summary);
725         argv_array_clear(&argv);
726
727         len = strbuf_read(&cmd_stdout, sm_summary.out, 1024);
728
729         /* prepend header, only if there's an actual output */
730         if (len) {
731                 if (uncommitted)
732                         strbuf_addstr(&summary, _("Submodules changed but not updated:"));
733                 else
734                         strbuf_addstr(&summary, _("Submodule changes to be committed:"));
735                 strbuf_addstr(&summary, "\n\n");
736         }
737         strbuf_addbuf(&summary, &cmd_stdout);
738         strbuf_release(&cmd_stdout);
739
740         if (s->display_comment_prefix) {
741                 summary_content = strbuf_detach(&summary, &len);
742                 strbuf_add_commented_lines(&summary, summary_content, len);
743                 free(summary_content);
744         }
745
746         fputs(summary.buf, s->fp);
747         strbuf_release(&summary);
748 }
749
750 static void wt_status_print_other(struct wt_status *s,
751                                   struct string_list *l,
752                                   const char *what,
753                                   const char *how)
754 {
755         int i;
756         struct strbuf buf = STRBUF_INIT;
757         static struct string_list output = STRING_LIST_INIT_DUP;
758         struct column_options copts;
759
760         if (!l->nr)
761                 return;
762
763         wt_status_print_other_header(s, what, how);
764
765         for (i = 0; i < l->nr; i++) {
766                 struct string_list_item *it;
767                 const char *path;
768                 it = &(l->items[i]);
769                 path = quote_path(it->string, s->prefix, &buf);
770                 if (column_active(s->colopts)) {
771                         string_list_append(&output, path);
772                         continue;
773                 }
774                 status_printf(s, color(WT_STATUS_HEADER, s), "\t");
775                 status_printf_more(s, color(WT_STATUS_UNTRACKED, s),
776                                    "%s\n", path);
777         }
778
779         strbuf_release(&buf);
780         if (!column_active(s->colopts))
781                 goto conclude;
782
783         strbuf_addf(&buf, "%s%s\t%s",
784                     color(WT_STATUS_HEADER, s),
785                     s->display_comment_prefix ? "#" : "",
786                     color(WT_STATUS_UNTRACKED, s));
787         memset(&copts, 0, sizeof(copts));
788         copts.padding = 1;
789         copts.indent = buf.buf;
790         if (want_color(s->use_color))
791                 copts.nl = GIT_COLOR_RESET "\n";
792         print_columns(&output, s->colopts, &copts);
793         string_list_clear(&output, 0);
794         strbuf_release(&buf);
795 conclude:
796         status_printf_ln(s, GIT_COLOR_NORMAL, "");
797 }
798
799 void wt_status_truncate_message_at_cut_line(struct strbuf *buf)
800 {
801         const char *p;
802         struct strbuf pattern = STRBUF_INIT;
803
804         strbuf_addf(&pattern, "%c %s", comment_line_char, cut_line);
805         p = strstr(buf->buf, pattern.buf);
806         if (p && (p == buf->buf || p[-1] == '\n'))
807                 strbuf_setlen(buf, p - buf->buf);
808         strbuf_release(&pattern);
809 }
810
811 static void wt_status_print_verbose(struct wt_status *s)
812 {
813         struct rev_info rev;
814         struct setup_revision_opt opt;
815
816         init_revisions(&rev, NULL);
817         DIFF_OPT_SET(&rev.diffopt, ALLOW_TEXTCONV);
818
819         memset(&opt, 0, sizeof(opt));
820         opt.def = s->is_initial ? EMPTY_TREE_SHA1_HEX : s->reference;
821         setup_revisions(0, NULL, &rev, &opt);
822
823         rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
824         rev.diffopt.detect_rename = 1;
825         rev.diffopt.file = s->fp;
826         rev.diffopt.close_file = 0;
827         /*
828          * If we're not going to stdout, then we definitely don't
829          * want color, since we are going to the commit message
830          * file (and even the "auto" setting won't work, since it
831          * will have checked isatty on stdout). But we then do want
832          * to insert the scissor line here to reliably remove the
833          * diff before committing.
834          */
835         if (s->fp != stdout) {
836                 const char *explanation = _("Do not touch the line above.\nEverything below will be removed.");
837                 struct strbuf buf = STRBUF_INIT;
838
839                 rev.diffopt.use_color = 0;
840                 fprintf(s->fp, "%c %s", comment_line_char, cut_line);
841                 strbuf_add_commented_lines(&buf, explanation, strlen(explanation));
842                 fputs(buf.buf, s->fp);
843                 strbuf_release(&buf);
844         }
845         run_diff_index(&rev, 1);
846 }
847
848 static void wt_status_print_tracking(struct wt_status *s)
849 {
850         struct strbuf sb = STRBUF_INIT;
851         const char *cp, *ep;
852         struct branch *branch;
853         char comment_line_string[3];
854         int i;
855
856         assert(s->branch && !s->is_initial);
857         if (!starts_with(s->branch, "refs/heads/"))
858                 return;
859         branch = branch_get(s->branch + 11);
860         if (!format_tracking_info(branch, &sb))
861                 return;
862
863         i = 0;
864         if (s->display_comment_prefix) {
865                 comment_line_string[i++] = comment_line_char;
866                 comment_line_string[i++] = ' ';
867         }
868         comment_line_string[i] = '\0';
869
870         for (cp = sb.buf; (ep = strchr(cp, '\n')) != NULL; cp = ep + 1)
871                 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s),
872                                  "%s%.*s", comment_line_string,
873                                  (int)(ep - cp), cp);
874         if (s->display_comment_prefix)
875                 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s), "%c",
876                                  comment_line_char);
877         else
878                 fprintf_ln(s->fp, "");
879 }
880
881 static int has_unmerged(struct wt_status *s)
882 {
883         int i;
884
885         for (i = 0; i < s->change.nr; i++) {
886                 struct wt_status_change_data *d;
887                 d = s->change.items[i].util;
888                 if (d->stagemask)
889                         return 1;
890         }
891         return 0;
892 }
893
894 static void show_merge_in_progress(struct wt_status *s,
895                                 struct wt_status_state *state,
896                                 const char *color)
897 {
898         if (has_unmerged(s)) {
899                 status_printf_ln(s, color, _("You have unmerged paths."));
900                 if (s->hints)
901                         status_printf_ln(s, color,
902                                 _("  (fix conflicts and run \"git commit\")"));
903         } else {
904                 status_printf_ln(s, color,
905                         _("All conflicts fixed but you are still merging."));
906                 if (s->hints)
907                         status_printf_ln(s, color,
908                                 _("  (use \"git commit\" to conclude merge)"));
909         }
910         wt_status_print_trailer(s);
911 }
912
913 static void show_am_in_progress(struct wt_status *s,
914                                 struct wt_status_state *state,
915                                 const char *color)
916 {
917         status_printf_ln(s, color,
918                 _("You are in the middle of an am session."));
919         if (state->am_empty_patch)
920                 status_printf_ln(s, color,
921                         _("The current patch is empty."));
922         if (s->hints) {
923                 if (!state->am_empty_patch)
924                         status_printf_ln(s, color,
925                                 _("  (fix conflicts and then run \"git am --continue\")"));
926                 status_printf_ln(s, color,
927                         _("  (use \"git am --skip\" to skip this patch)"));
928                 status_printf_ln(s, color,
929                         _("  (use \"git am --abort\" to restore the original branch)"));
930         }
931         wt_status_print_trailer(s);
932 }
933
934 static char *read_line_from_git_path(const char *filename)
935 {
936         struct strbuf buf = STRBUF_INIT;
937         FILE *fp = fopen(git_path("%s", filename), "r");
938         if (!fp) {
939                 strbuf_release(&buf);
940                 return NULL;
941         }
942         strbuf_getline(&buf, fp, '\n');
943         if (!fclose(fp)) {
944                 return strbuf_detach(&buf, NULL);
945         } else {
946                 strbuf_release(&buf);
947                 return NULL;
948         }
949 }
950
951 static int split_commit_in_progress(struct wt_status *s)
952 {
953         int split_in_progress = 0;
954         char *head = read_line_from_git_path("HEAD");
955         char *orig_head = read_line_from_git_path("ORIG_HEAD");
956         char *rebase_amend = read_line_from_git_path("rebase-merge/amend");
957         char *rebase_orig_head = read_line_from_git_path("rebase-merge/orig-head");
958
959         if (!head || !orig_head || !rebase_amend || !rebase_orig_head ||
960             !s->branch || strcmp(s->branch, "HEAD"))
961                 return split_in_progress;
962
963         if (!strcmp(rebase_amend, rebase_orig_head)) {
964                 if (strcmp(head, rebase_amend))
965                         split_in_progress = 1;
966         } else if (strcmp(orig_head, rebase_orig_head)) {
967                 split_in_progress = 1;
968         }
969
970         if (!s->amend && !s->nowarn && !s->workdir_dirty)
971                 split_in_progress = 0;
972
973         free(head);
974         free(orig_head);
975         free(rebase_amend);
976         free(rebase_orig_head);
977         return split_in_progress;
978 }
979
980 static void show_rebase_in_progress(struct wt_status *s,
981                                 struct wt_status_state *state,
982                                 const char *color)
983 {
984         struct stat st;
985
986         if (has_unmerged(s)) {
987                 if (state->branch)
988                         status_printf_ln(s, color,
989                                          _("You are currently rebasing branch '%s' on '%s'."),
990                                          state->branch,
991                                          state->onto);
992                 else
993                         status_printf_ln(s, color,
994                                          _("You are currently rebasing."));
995                 if (s->hints) {
996                         status_printf_ln(s, color,
997                                 _("  (fix conflicts and then run \"git rebase --continue\")"));
998                         status_printf_ln(s, color,
999                                 _("  (use \"git rebase --skip\" to skip this patch)"));
1000                         status_printf_ln(s, color,
1001                                 _("  (use \"git rebase --abort\" to check out the original branch)"));
1002                 }
1003         } else if (state->rebase_in_progress || !stat(git_path("MERGE_MSG"), &st)) {
1004                 if (state->branch)
1005                         status_printf_ln(s, color,
1006                                          _("You are currently rebasing branch '%s' on '%s'."),
1007                                          state->branch,
1008                                          state->onto);
1009                 else
1010                         status_printf_ln(s, color,
1011                                          _("You are currently rebasing."));
1012                 if (s->hints)
1013                         status_printf_ln(s, color,
1014                                 _("  (all conflicts fixed: run \"git rebase --continue\")"));
1015         } else if (split_commit_in_progress(s)) {
1016                 if (state->branch)
1017                         status_printf_ln(s, color,
1018                                          _("You are currently splitting a commit while rebasing branch '%s' on '%s'."),
1019                                          state->branch,
1020                                          state->onto);
1021                 else
1022                         status_printf_ln(s, color,
1023                                          _("You are currently splitting a commit during a rebase."));
1024                 if (s->hints)
1025                         status_printf_ln(s, color,
1026                                 _("  (Once your working directory is clean, run \"git rebase --continue\")"));
1027         } else {
1028                 if (state->branch)
1029                         status_printf_ln(s, color,
1030                                          _("You are currently editing a commit while rebasing branch '%s' on '%s'."),
1031                                          state->branch,
1032                                          state->onto);
1033                 else
1034                         status_printf_ln(s, color,
1035                                          _("You are currently editing a commit during a rebase."));
1036                 if (s->hints && !s->amend) {
1037                         status_printf_ln(s, color,
1038                                 _("  (use \"git commit --amend\" to amend the current commit)"));
1039                         status_printf_ln(s, color,
1040                                 _("  (use \"git rebase --continue\" once you are satisfied with your changes)"));
1041                 }
1042         }
1043         wt_status_print_trailer(s);
1044 }
1045
1046 static void show_cherry_pick_in_progress(struct wt_status *s,
1047                                         struct wt_status_state *state,
1048                                         const char *color)
1049 {
1050         status_printf_ln(s, color, _("You are currently cherry-picking commit %s."),
1051                         find_unique_abbrev(state->cherry_pick_head_sha1, DEFAULT_ABBREV));
1052         if (s->hints) {
1053                 if (has_unmerged(s))
1054                         status_printf_ln(s, color,
1055                                 _("  (fix conflicts and run \"git cherry-pick --continue\")"));
1056                 else
1057                         status_printf_ln(s, color,
1058                                 _("  (all conflicts fixed: run \"git cherry-pick --continue\")"));
1059                 status_printf_ln(s, color,
1060                         _("  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"));
1061         }
1062         wt_status_print_trailer(s);
1063 }
1064
1065 static void show_revert_in_progress(struct wt_status *s,
1066                                         struct wt_status_state *state,
1067                                         const char *color)
1068 {
1069         status_printf_ln(s, color, _("You are currently reverting commit %s."),
1070                          find_unique_abbrev(state->revert_head_sha1, DEFAULT_ABBREV));
1071         if (s->hints) {
1072                 if (has_unmerged(s))
1073                         status_printf_ln(s, color,
1074                                 _("  (fix conflicts and run \"git revert --continue\")"));
1075                 else
1076                         status_printf_ln(s, color,
1077                                 _("  (all conflicts fixed: run \"git revert --continue\")"));
1078                 status_printf_ln(s, color,
1079                         _("  (use \"git revert --abort\" to cancel the revert operation)"));
1080         }
1081         wt_status_print_trailer(s);
1082 }
1083
1084 static void show_bisect_in_progress(struct wt_status *s,
1085                                 struct wt_status_state *state,
1086                                 const char *color)
1087 {
1088         if (state->branch)
1089                 status_printf_ln(s, color,
1090                                  _("You are currently bisecting, started from branch '%s'."),
1091                                  state->branch);
1092         else
1093                 status_printf_ln(s, color,
1094                                  _("You are currently bisecting."));
1095         if (s->hints)
1096                 status_printf_ln(s, color,
1097                         _("  (use \"git bisect reset\" to get back to the original branch)"));
1098         wt_status_print_trailer(s);
1099 }
1100
1101 /*
1102  * Extract branch information from rebase/bisect
1103  */
1104 static char *read_and_strip_branch(const char *path)
1105 {
1106         struct strbuf sb = STRBUF_INIT;
1107         unsigned char sha1[20];
1108
1109         if (strbuf_read_file(&sb, git_path("%s", path), 0) <= 0)
1110                 goto got_nothing;
1111
1112         while (&sb.len && sb.buf[sb.len - 1] == '\n')
1113                 strbuf_setlen(&sb, sb.len - 1);
1114         if (!sb.len)
1115                 goto got_nothing;
1116         if (starts_with(sb.buf, "refs/heads/"))
1117                 strbuf_remove(&sb,0, strlen("refs/heads/"));
1118         else if (starts_with(sb.buf, "refs/"))
1119                 ;
1120         else if (!get_sha1_hex(sb.buf, sha1)) {
1121                 const char *abbrev;
1122                 abbrev = find_unique_abbrev(sha1, DEFAULT_ABBREV);
1123                 strbuf_reset(&sb);
1124                 strbuf_addstr(&sb, abbrev);
1125         } else if (!strcmp(sb.buf, "detached HEAD")) /* rebase */
1126                 goto got_nothing;
1127         else                    /* bisect */
1128                 ;
1129         return strbuf_detach(&sb, NULL);
1130
1131 got_nothing:
1132         strbuf_release(&sb);
1133         return NULL;
1134 }
1135
1136 struct grab_1st_switch_cbdata {
1137         struct strbuf buf;
1138         unsigned char nsha1[20];
1139 };
1140
1141 static int grab_1st_switch(unsigned char *osha1, unsigned char *nsha1,
1142                            const char *email, unsigned long timestamp, int tz,
1143                            const char *message, void *cb_data)
1144 {
1145         struct grab_1st_switch_cbdata *cb = cb_data;
1146         const char *target = NULL, *end;
1147
1148         if (!starts_with(message, "checkout: moving from "))
1149                 return 0;
1150         message += strlen("checkout: moving from ");
1151         target = strstr(message, " to ");
1152         if (!target)
1153                 return 0;
1154         target += strlen(" to ");
1155         strbuf_reset(&cb->buf);
1156         hashcpy(cb->nsha1, nsha1);
1157         for (end = target; *end && *end != '\n'; end++)
1158                 ;
1159         strbuf_add(&cb->buf, target, end - target);
1160         return 1;
1161 }
1162
1163 static void wt_status_get_detached_from(struct wt_status_state *state)
1164 {
1165         struct grab_1st_switch_cbdata cb;
1166         struct commit *commit;
1167         unsigned char sha1[20];
1168         char *ref = NULL;
1169
1170         strbuf_init(&cb.buf, 0);
1171         if (for_each_reflog_ent_reverse("HEAD", grab_1st_switch, &cb) <= 0) {
1172                 strbuf_release(&cb.buf);
1173                 return;
1174         }
1175
1176         if (dwim_ref(cb.buf.buf, cb.buf.len, sha1, &ref) == 1 &&
1177             /* sha1 is a commit? match without further lookup */
1178             (!hashcmp(cb.nsha1, sha1) ||
1179              /* perhaps sha1 is a tag, try to dereference to a commit */
1180              ((commit = lookup_commit_reference_gently(sha1, 1)) != NULL &&
1181               !hashcmp(cb.nsha1, commit->object.sha1)))) {
1182                 int ofs;
1183                 if (starts_with(ref, "refs/tags/"))
1184                         ofs = strlen("refs/tags/");
1185                 else if (starts_with(ref, "refs/remotes/"))
1186                         ofs = strlen("refs/remotes/");
1187                 else
1188                         ofs = 0;
1189                 state->detached_from = xstrdup(ref + ofs);
1190         } else
1191                 state->detached_from =
1192                         xstrdup(find_unique_abbrev(cb.nsha1, DEFAULT_ABBREV));
1193         hashcpy(state->detached_sha1, cb.nsha1);
1194
1195         free(ref);
1196         strbuf_release(&cb.buf);
1197 }
1198
1199 void wt_status_get_state(struct wt_status_state *state,
1200                          int get_detached_from)
1201 {
1202         struct stat st;
1203         unsigned char sha1[20];
1204
1205         if (!stat(git_path("MERGE_HEAD"), &st)) {
1206                 state->merge_in_progress = 1;
1207         } else if (!stat(git_path("rebase-apply"), &st)) {
1208                 if (!stat(git_path("rebase-apply/applying"), &st)) {
1209                         state->am_in_progress = 1;
1210                         if (!stat(git_path("rebase-apply/patch"), &st) && !st.st_size)
1211                                 state->am_empty_patch = 1;
1212                 } else {
1213                         state->rebase_in_progress = 1;
1214                         state->branch = read_and_strip_branch("rebase-apply/head-name");
1215                         state->onto = read_and_strip_branch("rebase-apply/onto");
1216                 }
1217         } else if (!stat(git_path("rebase-merge"), &st)) {
1218                 if (!stat(git_path("rebase-merge/interactive"), &st))
1219                         state->rebase_interactive_in_progress = 1;
1220                 else
1221                         state->rebase_in_progress = 1;
1222                 state->branch = read_and_strip_branch("rebase-merge/head-name");
1223                 state->onto = read_and_strip_branch("rebase-merge/onto");
1224         } else if (!stat(git_path("CHERRY_PICK_HEAD"), &st) &&
1225                         !get_sha1("CHERRY_PICK_HEAD", sha1)) {
1226                 state->cherry_pick_in_progress = 1;
1227                 hashcpy(state->cherry_pick_head_sha1, sha1);
1228         }
1229         if (!stat(git_path("BISECT_LOG"), &st)) {
1230                 state->bisect_in_progress = 1;
1231                 state->branch = read_and_strip_branch("BISECT_START");
1232         }
1233         if (!stat(git_path("REVERT_HEAD"), &st) &&
1234             !get_sha1("REVERT_HEAD", sha1)) {
1235                 state->revert_in_progress = 1;
1236                 hashcpy(state->revert_head_sha1, sha1);
1237         }
1238
1239         if (get_detached_from)
1240                 wt_status_get_detached_from(state);
1241 }
1242
1243 static void wt_status_print_state(struct wt_status *s,
1244                                   struct wt_status_state *state)
1245 {
1246         const char *state_color = color(WT_STATUS_HEADER, s);
1247         if (state->merge_in_progress)
1248                 show_merge_in_progress(s, state, state_color);
1249         else if (state->am_in_progress)
1250                 show_am_in_progress(s, state, state_color);
1251         else if (state->rebase_in_progress || state->rebase_interactive_in_progress)
1252                 show_rebase_in_progress(s, state, state_color);
1253         else if (state->cherry_pick_in_progress)
1254                 show_cherry_pick_in_progress(s, state, state_color);
1255         else if (state->revert_in_progress)
1256                 show_revert_in_progress(s, state, state_color);
1257         if (state->bisect_in_progress)
1258                 show_bisect_in_progress(s, state, state_color);
1259 }
1260
1261 void wt_status_print(struct wt_status *s)
1262 {
1263         const char *branch_color = color(WT_STATUS_ONBRANCH, s);
1264         const char *branch_status_color = color(WT_STATUS_HEADER, s);
1265         struct wt_status_state state;
1266
1267         memset(&state, 0, sizeof(state));
1268         wt_status_get_state(&state,
1269                             s->branch && !strcmp(s->branch, "HEAD"));
1270
1271         if (s->branch) {
1272                 const char *on_what = _("On branch ");
1273                 const char *branch_name = s->branch;
1274                 if (starts_with(branch_name, "refs/heads/"))
1275                         branch_name += 11;
1276                 else if (!strcmp(branch_name, "HEAD")) {
1277                         branch_status_color = color(WT_STATUS_NOBRANCH, s);
1278                         if (state.rebase_in_progress || state.rebase_interactive_in_progress) {
1279                                 on_what = _("rebase in progress; onto ");
1280                                 branch_name = state.onto;
1281                         } else if (state.detached_from) {
1282                                 unsigned char sha1[20];
1283                                 branch_name = state.detached_from;
1284                                 if (!get_sha1("HEAD", sha1) &&
1285                                     !hashcmp(sha1, state.detached_sha1))
1286                                         on_what = _("HEAD detached at ");
1287                                 else
1288                                         on_what = _("HEAD detached from ");
1289                         } else {
1290                                 branch_name = "";
1291                                 on_what = _("Not currently on any branch.");
1292                         }
1293                 }
1294                 status_printf(s, color(WT_STATUS_HEADER, s), "");
1295                 status_printf_more(s, branch_status_color, "%s", on_what);
1296                 status_printf_more(s, branch_color, "%s\n", branch_name);
1297                 if (!s->is_initial)
1298                         wt_status_print_tracking(s);
1299         }
1300
1301         wt_status_print_state(s, &state);
1302         free(state.branch);
1303         free(state.onto);
1304         free(state.detached_from);
1305
1306         if (s->is_initial) {
1307                 status_printf_ln(s, color(WT_STATUS_HEADER, s), "");
1308                 status_printf_ln(s, color(WT_STATUS_HEADER, s), _("Initial commit"));
1309                 status_printf_ln(s, color(WT_STATUS_HEADER, s), "");
1310         }
1311
1312         wt_status_print_updated(s);
1313         wt_status_print_unmerged(s);
1314         wt_status_print_changed(s);
1315         if (s->submodule_summary &&
1316             (!s->ignore_submodule_arg ||
1317              strcmp(s->ignore_submodule_arg, "all"))) {
1318                 wt_status_print_submodule_summary(s, 0);  /* staged */
1319                 wt_status_print_submodule_summary(s, 1);  /* unstaged */
1320         }
1321         if (s->show_untracked_files) {
1322                 wt_status_print_other(s, &s->untracked, _("Untracked files"), "add");
1323                 if (s->show_ignored_files)
1324                         wt_status_print_other(s, &s->ignored, _("Ignored files"), "add -f");
1325                 if (advice_status_u_option && 2000 < s->untracked_in_ms) {
1326                         status_printf_ln(s, GIT_COLOR_NORMAL, "");
1327                         status_printf_ln(s, GIT_COLOR_NORMAL,
1328                                          _("It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1329                                            "may speed it up, but you have to be careful not to forget to add\n"
1330                                            "new files yourself (see 'git help status')."),
1331                                          s->untracked_in_ms / 1000.0);
1332                 }
1333         } else if (s->commitable)
1334                 status_printf_ln(s, GIT_COLOR_NORMAL, _("Untracked files not listed%s"),
1335                         s->hints
1336                         ? _(" (use -u option to show untracked files)") : "");
1337
1338         if (s->verbose)
1339                 wt_status_print_verbose(s);
1340         if (!s->commitable) {
1341                 if (s->amend)
1342                         status_printf_ln(s, GIT_COLOR_NORMAL, _("No changes"));
1343                 else if (s->nowarn)
1344                         ; /* nothing */
1345                 else if (s->workdir_dirty) {
1346                         if (s->hints)
1347                                 printf(_("no changes added to commit "
1348                                          "(use \"git add\" and/or \"git commit -a\")\n"));
1349                         else
1350                                 printf(_("no changes added to commit\n"));
1351                 } else if (s->untracked.nr) {
1352                         if (s->hints)
1353                                 printf(_("nothing added to commit but untracked files "
1354                                          "present (use \"git add\" to track)\n"));
1355                         else
1356                                 printf(_("nothing added to commit but untracked files present\n"));
1357                 } else if (s->is_initial) {
1358                         if (s->hints)
1359                                 printf(_("nothing to commit (create/copy files "
1360                                          "and use \"git add\" to track)\n"));
1361                         else
1362                                 printf(_("nothing to commit\n"));
1363                 } else if (!s->show_untracked_files) {
1364                         if (s->hints)
1365                                 printf(_("nothing to commit (use -u to show untracked files)\n"));
1366                         else
1367                                 printf(_("nothing to commit\n"));
1368                 } else
1369                         printf(_("nothing to commit, working directory clean\n"));
1370         }
1371 }
1372
1373 static void wt_shortstatus_unmerged(struct string_list_item *it,
1374                            struct wt_status *s)
1375 {
1376         struct wt_status_change_data *d = it->util;
1377         const char *how = "??";
1378
1379         switch (d->stagemask) {
1380         case 1: how = "DD"; break; /* both deleted */
1381         case 2: how = "AU"; break; /* added by us */
1382         case 3: how = "UD"; break; /* deleted by them */
1383         case 4: how = "UA"; break; /* added by them */
1384         case 5: how = "DU"; break; /* deleted by us */
1385         case 6: how = "AA"; break; /* both added */
1386         case 7: how = "UU"; break; /* both modified */
1387         }
1388         color_fprintf(s->fp, color(WT_STATUS_UNMERGED, s), "%s", how);
1389         if (s->null_termination) {
1390                 fprintf(stdout, " %s%c", it->string, 0);
1391         } else {
1392                 struct strbuf onebuf = STRBUF_INIT;
1393                 const char *one;
1394                 one = quote_path(it->string, s->prefix, &onebuf);
1395                 printf(" %s\n", one);
1396                 strbuf_release(&onebuf);
1397         }
1398 }
1399
1400 static void wt_shortstatus_status(struct string_list_item *it,
1401                          struct wt_status *s)
1402 {
1403         struct wt_status_change_data *d = it->util;
1404
1405         if (d->index_status)
1406                 color_fprintf(s->fp, color(WT_STATUS_UPDATED, s), "%c", d->index_status);
1407         else
1408                 putchar(' ');
1409         if (d->worktree_status)
1410                 color_fprintf(s->fp, color(WT_STATUS_CHANGED, s), "%c", d->worktree_status);
1411         else
1412                 putchar(' ');
1413         putchar(' ');
1414         if (s->null_termination) {
1415                 fprintf(stdout, "%s%c", it->string, 0);
1416                 if (d->head_path)
1417                         fprintf(stdout, "%s%c", d->head_path, 0);
1418         } else {
1419                 struct strbuf onebuf = STRBUF_INIT;
1420                 const char *one;
1421                 if (d->head_path) {
1422                         one = quote_path(d->head_path, s->prefix, &onebuf);
1423                         if (*one != '"' && strchr(one, ' ') != NULL) {
1424                                 putchar('"');
1425                                 strbuf_addch(&onebuf, '"');
1426                                 one = onebuf.buf;
1427                         }
1428                         printf("%s -> ", one);
1429                         strbuf_release(&onebuf);
1430                 }
1431                 one = quote_path(it->string, s->prefix, &onebuf);
1432                 if (*one != '"' && strchr(one, ' ') != NULL) {
1433                         putchar('"');
1434                         strbuf_addch(&onebuf, '"');
1435                         one = onebuf.buf;
1436                 }
1437                 printf("%s\n", one);
1438                 strbuf_release(&onebuf);
1439         }
1440 }
1441
1442 static void wt_shortstatus_other(struct string_list_item *it,
1443                                  struct wt_status *s, const char *sign)
1444 {
1445         if (s->null_termination) {
1446                 fprintf(stdout, "%s %s%c", sign, it->string, 0);
1447         } else {
1448                 struct strbuf onebuf = STRBUF_INIT;
1449                 const char *one;
1450                 one = quote_path(it->string, s->prefix, &onebuf);
1451                 color_fprintf(s->fp, color(WT_STATUS_UNTRACKED, s), "%s", sign);
1452                 printf(" %s\n", one);
1453                 strbuf_release(&onebuf);
1454         }
1455 }
1456
1457 static void wt_shortstatus_print_tracking(struct wt_status *s)
1458 {
1459         struct branch *branch;
1460         const char *header_color = color(WT_STATUS_HEADER, s);
1461         const char *branch_color_local = color(WT_STATUS_LOCAL_BRANCH, s);
1462         const char *branch_color_remote = color(WT_STATUS_REMOTE_BRANCH, s);
1463
1464         const char *base;
1465         const char *branch_name;
1466         int num_ours, num_theirs;
1467         int upstream_is_gone = 0;
1468
1469         color_fprintf(s->fp, color(WT_STATUS_HEADER, s), "## ");
1470
1471         if (!s->branch)
1472                 return;
1473         branch_name = s->branch;
1474
1475         if (starts_with(branch_name, "refs/heads/"))
1476                 branch_name += 11;
1477         else if (!strcmp(branch_name, "HEAD")) {
1478                 branch_name = _("HEAD (no branch)");
1479                 branch_color_local = color(WT_STATUS_NOBRANCH, s);
1480         }
1481
1482         branch = branch_get(s->branch + 11);
1483         if (s->is_initial)
1484                 color_fprintf(s->fp, header_color, _("Initial commit on "));
1485
1486         color_fprintf(s->fp, branch_color_local, "%s", branch_name);
1487
1488         switch (stat_tracking_info(branch, &num_ours, &num_theirs)) {
1489         case 0:
1490                 /* no base */
1491                 fputc(s->null_termination ? '\0' : '\n', s->fp);
1492                 return;
1493         case -1:
1494                 /* with "gone" base */
1495                 upstream_is_gone = 1;
1496                 break;
1497         default:
1498                 /* with base */
1499                 break;
1500         }
1501
1502         base = branch->merge[0]->dst;
1503         base = shorten_unambiguous_ref(base, 0);
1504         color_fprintf(s->fp, header_color, "...");
1505         color_fprintf(s->fp, branch_color_remote, "%s", base);
1506
1507         if (!upstream_is_gone && !num_ours && !num_theirs) {
1508                 fputc(s->null_termination ? '\0' : '\n', s->fp);
1509                 return;
1510         }
1511
1512         color_fprintf(s->fp, header_color, " [");
1513         if (upstream_is_gone) {
1514                 color_fprintf(s->fp, header_color, _("gone"));
1515         } else if (!num_ours) {
1516                 color_fprintf(s->fp, header_color, _("behind "));
1517                 color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
1518         } else if (!num_theirs) {
1519                 color_fprintf(s->fp, header_color, _("ahead "));
1520                 color_fprintf(s->fp, branch_color_local, "%d", num_ours);
1521         } else {
1522                 color_fprintf(s->fp, header_color, _("ahead "));
1523                 color_fprintf(s->fp, branch_color_local, "%d", num_ours);
1524                 color_fprintf(s->fp, header_color, _(", behind "));
1525                 color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
1526         }
1527
1528         color_fprintf(s->fp, header_color, "]");
1529         fputc(s->null_termination ? '\0' : '\n', s->fp);
1530 }
1531
1532 void wt_shortstatus_print(struct wt_status *s)
1533 {
1534         int i;
1535
1536         if (s->show_branch)
1537                 wt_shortstatus_print_tracking(s);
1538
1539         for (i = 0; i < s->change.nr; i++) {
1540                 struct wt_status_change_data *d;
1541                 struct string_list_item *it;
1542
1543                 it = &(s->change.items[i]);
1544                 d = it->util;
1545                 if (d->stagemask)
1546                         wt_shortstatus_unmerged(it, s);
1547                 else
1548                         wt_shortstatus_status(it, s);
1549         }
1550         for (i = 0; i < s->untracked.nr; i++) {
1551                 struct string_list_item *it;
1552
1553                 it = &(s->untracked.items[i]);
1554                 wt_shortstatus_other(it, s, "??");
1555         }
1556         for (i = 0; i < s->ignored.nr; i++) {
1557                 struct string_list_item *it;
1558
1559                 it = &(s->ignored.items[i]);
1560                 wt_shortstatus_other(it, s, "!!");
1561         }
1562 }
1563
1564 void wt_porcelain_print(struct wt_status *s)
1565 {
1566         s->use_color = 0;
1567         s->relative_paths = 0;
1568         s->prefix = NULL;
1569         wt_shortstatus_print(s);
1570 }