]> rtime.felk.cvut.cz Git - git.git/blob - wt-status.c
git status: ignoring untracked files must apply to submodules too
[git.git] / wt-status.c
1 #include "cache.h"
2 #include "wt-status.h"
3 #include "object.h"
4 #include "dir.h"
5 #include "commit.h"
6 #include "diff.h"
7 #include "revision.h"
8 #include "diffcore.h"
9 #include "quote.h"
10 #include "run-command.h"
11 #include "remote.h"
12
13 static char default_wt_status_colors[][COLOR_MAXLEN] = {
14         GIT_COLOR_NORMAL, /* WT_STATUS_HEADER */
15         GIT_COLOR_GREEN,  /* WT_STATUS_UPDATED */
16         GIT_COLOR_RED,    /* WT_STATUS_CHANGED */
17         GIT_COLOR_RED,    /* WT_STATUS_UNTRACKED */
18         GIT_COLOR_RED,    /* WT_STATUS_NOBRANCH */
19         GIT_COLOR_RED,    /* WT_STATUS_UNMERGED */
20 };
21
22 static const char *color(int slot, struct wt_status *s)
23 {
24         return s->use_color > 0 ? s->color_palette[slot] : "";
25 }
26
27 void wt_status_prepare(struct wt_status *s)
28 {
29         unsigned char sha1[20];
30         const char *head;
31
32         memset(s, 0, sizeof(*s));
33         memcpy(s->color_palette, default_wt_status_colors,
34                sizeof(default_wt_status_colors));
35         s->show_untracked_files = SHOW_NORMAL_UNTRACKED_FILES;
36         s->use_color = -1;
37         s->relative_paths = 1;
38         head = resolve_ref("HEAD", sha1, 0, NULL);
39         s->branch = head ? xstrdup(head) : NULL;
40         s->reference = "HEAD";
41         s->fp = stdout;
42         s->index_file = get_index_file();
43         s->change.strdup_strings = 1;
44         s->untracked.strdup_strings = 1;
45 }
46
47 static void wt_status_print_unmerged_header(struct wt_status *s)
48 {
49         const char *c = color(WT_STATUS_HEADER, s);
50
51         color_fprintf_ln(s->fp, c, "# Unmerged paths:");
52         if (!advice_status_hints)
53                 return;
54         if (s->in_merge)
55                 ;
56         else if (!s->is_initial)
57                 color_fprintf_ln(s->fp, c, "#   (use \"git reset %s <file>...\" to unstage)", s->reference);
58         else
59                 color_fprintf_ln(s->fp, c, "#   (use \"git rm --cached <file>...\" to unstage)");
60         color_fprintf_ln(s->fp, c, "#   (use \"git add/rm <file>...\" as appropriate to mark resolution)");
61         color_fprintf_ln(s->fp, c, "#");
62 }
63
64 static void wt_status_print_cached_header(struct wt_status *s)
65 {
66         const char *c = color(WT_STATUS_HEADER, s);
67
68         color_fprintf_ln(s->fp, c, "# Changes to be committed:");
69         if (!advice_status_hints)
70                 return;
71         if (s->in_merge)
72                 ; /* NEEDSWORK: use "git reset --unresolve"??? */
73         else if (!s->is_initial)
74                 color_fprintf_ln(s->fp, c, "#   (use \"git reset %s <file>...\" to unstage)", s->reference);
75         else
76                 color_fprintf_ln(s->fp, c, "#   (use \"git rm --cached <file>...\" to unstage)");
77         color_fprintf_ln(s->fp, c, "#");
78 }
79
80 static void wt_status_print_dirty_header(struct wt_status *s,
81                                          int has_deleted,
82                                          int has_dirty_submodules)
83 {
84         const char *c = color(WT_STATUS_HEADER, s);
85
86         color_fprintf_ln(s->fp, c, "# Changed but not updated:");
87         if (!advice_status_hints)
88                 return;
89         if (!has_deleted)
90                 color_fprintf_ln(s->fp, c, "#   (use \"git add <file>...\" to update what will be committed)");
91         else
92                 color_fprintf_ln(s->fp, c, "#   (use \"git add/rm <file>...\" to update what will be committed)");
93         color_fprintf_ln(s->fp, c, "#   (use \"git checkout -- <file>...\" to discard changes in working directory)");
94         if (has_dirty_submodules)
95                 color_fprintf_ln(s->fp, c, "#   (commit or discard the untracked or modified content in submodules)");
96         color_fprintf_ln(s->fp, c, "#");
97 }
98
99 static void wt_status_print_untracked_header(struct wt_status *s)
100 {
101         const char *c = color(WT_STATUS_HEADER, s);
102         color_fprintf_ln(s->fp, c, "# Untracked files:");
103         if (!advice_status_hints)
104                 return;
105         color_fprintf_ln(s->fp, c, "#   (use \"git add <file>...\" to include in what will be committed)");
106         color_fprintf_ln(s->fp, c, "#");
107 }
108
109 static void wt_status_print_trailer(struct wt_status *s)
110 {
111         color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s), "#");
112 }
113
114 #define quote_path quote_path_relative
115
116 static void wt_status_print_unmerged_data(struct wt_status *s,
117                                           struct string_list_item *it)
118 {
119         const char *c = color(WT_STATUS_UNMERGED, s);
120         struct wt_status_change_data *d = it->util;
121         struct strbuf onebuf = STRBUF_INIT;
122         const char *one, *how = "bug";
123
124         one = quote_path(it->string, -1, &onebuf, s->prefix);
125         color_fprintf(s->fp, color(WT_STATUS_HEADER, s), "#\t");
126         switch (d->stagemask) {
127         case 1: how = "both deleted:"; break;
128         case 2: how = "added by us:"; break;
129         case 3: how = "deleted by them:"; break;
130         case 4: how = "added by them:"; break;
131         case 5: how = "deleted by us:"; break;
132         case 6: how = "both added:"; break;
133         case 7: how = "both modified:"; break;
134         }
135         color_fprintf(s->fp, c, "%-20s%s\n", how, one);
136         strbuf_release(&onebuf);
137 }
138
139 static void wt_status_print_change_data(struct wt_status *s,
140                                         int change_type,
141                                         struct string_list_item *it)
142 {
143         struct wt_status_change_data *d = it->util;
144         const char *c = color(change_type, s);
145         int status = status;
146         char *one_name;
147         char *two_name;
148         const char *one, *two;
149         struct strbuf onebuf = STRBUF_INIT, twobuf = STRBUF_INIT;
150         struct strbuf extra = STRBUF_INIT;
151
152         one_name = two_name = it->string;
153         switch (change_type) {
154         case WT_STATUS_UPDATED:
155                 status = d->index_status;
156                 if (d->head_path)
157                         one_name = d->head_path;
158                 break;
159         case WT_STATUS_CHANGED:
160                 if (d->new_submodule_commits || d->dirty_submodule) {
161                         strbuf_addstr(&extra, " (");
162                         if (d->new_submodule_commits)
163                                 strbuf_addf(&extra, "new commits, ");
164                         if (d->dirty_submodule & DIRTY_SUBMODULE_MODIFIED)
165                                 strbuf_addf(&extra, "modified content, ");
166                         if (d->dirty_submodule & DIRTY_SUBMODULE_UNTRACKED)
167                                 strbuf_addf(&extra, "untracked content, ");
168                         strbuf_setlen(&extra, extra.len - 2);
169                         strbuf_addch(&extra, ')');
170                 }
171                 status = d->worktree_status;
172                 break;
173         }
174
175         one = quote_path(one_name, -1, &onebuf, s->prefix);
176         two = quote_path(two_name, -1, &twobuf, s->prefix);
177
178         color_fprintf(s->fp, color(WT_STATUS_HEADER, s), "#\t");
179         switch (status) {
180         case DIFF_STATUS_ADDED:
181                 color_fprintf(s->fp, c, "new file:   %s", one);
182                 break;
183         case DIFF_STATUS_COPIED:
184                 color_fprintf(s->fp, c, "copied:     %s -> %s", one, two);
185                 break;
186         case DIFF_STATUS_DELETED:
187                 color_fprintf(s->fp, c, "deleted:    %s", one);
188                 break;
189         case DIFF_STATUS_MODIFIED:
190                 color_fprintf(s->fp, c, "modified:   %s", one);
191                 break;
192         case DIFF_STATUS_RENAMED:
193                 color_fprintf(s->fp, c, "renamed:    %s -> %s", one, two);
194                 break;
195         case DIFF_STATUS_TYPE_CHANGED:
196                 color_fprintf(s->fp, c, "typechange: %s", one);
197                 break;
198         case DIFF_STATUS_UNKNOWN:
199                 color_fprintf(s->fp, c, "unknown:    %s", one);
200                 break;
201         case DIFF_STATUS_UNMERGED:
202                 color_fprintf(s->fp, c, "unmerged:   %s", one);
203                 break;
204         default:
205                 die("bug: unhandled diff status %c", status);
206         }
207         if (extra.len) {
208                 color_fprintf(s->fp, color(WT_STATUS_HEADER, s), "%s", extra.buf);
209                 strbuf_release(&extra);
210         }
211         fprintf(s->fp, "\n");
212         strbuf_release(&onebuf);
213         strbuf_release(&twobuf);
214 }
215
216 static void wt_status_collect_changed_cb(struct diff_queue_struct *q,
217                                          struct diff_options *options,
218                                          void *data)
219 {
220         struct wt_status *s = data;
221         int i;
222
223         if (!q->nr)
224                 return;
225         s->workdir_dirty = 1;
226         for (i = 0; i < q->nr; i++) {
227                 struct diff_filepair *p;
228                 struct string_list_item *it;
229                 struct wt_status_change_data *d;
230
231                 p = q->queue[i];
232                 it = string_list_insert(p->one->path, &s->change);
233                 d = it->util;
234                 if (!d) {
235                         d = xcalloc(1, sizeof(*d));
236                         it->util = d;
237                 }
238                 if (!d->worktree_status)
239                         d->worktree_status = p->status;
240                 d->dirty_submodule = p->two->dirty_submodule;
241                 if (S_ISGITLINK(p->two->mode))
242                         d->new_submodule_commits = !!hashcmp(p->one->sha1, p->two->sha1);
243         }
244 }
245
246 static int unmerged_mask(const char *path)
247 {
248         int pos, mask;
249         struct cache_entry *ce;
250
251         pos = cache_name_pos(path, strlen(path));
252         if (0 <= pos)
253                 return 0;
254
255         mask = 0;
256         pos = -pos-1;
257         while (pos < active_nr) {
258                 ce = active_cache[pos++];
259                 if (strcmp(ce->name, path) || !ce_stage(ce))
260                         break;
261                 mask |= (1 << (ce_stage(ce) - 1));
262         }
263         return mask;
264 }
265
266 static void wt_status_collect_updated_cb(struct diff_queue_struct *q,
267                                          struct diff_options *options,
268                                          void *data)
269 {
270         struct wt_status *s = data;
271         int i;
272
273         for (i = 0; i < q->nr; i++) {
274                 struct diff_filepair *p;
275                 struct string_list_item *it;
276                 struct wt_status_change_data *d;
277
278                 p = q->queue[i];
279                 it = string_list_insert(p->two->path, &s->change);
280                 d = it->util;
281                 if (!d) {
282                         d = xcalloc(1, sizeof(*d));
283                         it->util = d;
284                 }
285                 if (!d->index_status)
286                         d->index_status = p->status;
287                 switch (p->status) {
288                 case DIFF_STATUS_COPIED:
289                 case DIFF_STATUS_RENAMED:
290                         d->head_path = xstrdup(p->one->path);
291                         break;
292                 case DIFF_STATUS_UNMERGED:
293                         d->stagemask = unmerged_mask(p->two->path);
294                         break;
295                 }
296         }
297 }
298
299 static void wt_status_collect_changes_worktree(struct wt_status *s)
300 {
301         struct rev_info rev;
302
303         init_revisions(&rev, NULL);
304         setup_revisions(0, NULL, &rev, NULL);
305         rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
306         DIFF_OPT_SET(&rev.diffopt, DIRTY_SUBMODULES);
307         if (!s->show_untracked_files)
308                 DIFF_OPT_SET(&rev.diffopt, IGNORE_UNTRACKED_IN_SUBMODULES);
309         rev.diffopt.format_callback = wt_status_collect_changed_cb;
310         rev.diffopt.format_callback_data = s;
311         rev.prune_data = s->pathspec;
312         run_diff_files(&rev, 0);
313 }
314
315 static void wt_status_collect_changes_index(struct wt_status *s)
316 {
317         struct rev_info rev;
318
319         init_revisions(&rev, NULL);
320         setup_revisions(0, NULL, &rev,
321                 s->is_initial ? EMPTY_TREE_SHA1_HEX : s->reference);
322         rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
323         rev.diffopt.format_callback = wt_status_collect_updated_cb;
324         rev.diffopt.format_callback_data = s;
325         rev.diffopt.detect_rename = 1;
326         rev.diffopt.rename_limit = 200;
327         rev.diffopt.break_opt = 0;
328         rev.prune_data = s->pathspec;
329         run_diff_index(&rev, 1);
330 }
331
332 static void wt_status_collect_changes_initial(struct wt_status *s)
333 {
334         int i;
335
336         for (i = 0; i < active_nr; i++) {
337                 struct string_list_item *it;
338                 struct wt_status_change_data *d;
339                 struct cache_entry *ce = active_cache[i];
340
341                 if (!ce_path_match(ce, s->pathspec))
342                         continue;
343                 it = string_list_insert(ce->name, &s->change);
344                 d = it->util;
345                 if (!d) {
346                         d = xcalloc(1, sizeof(*d));
347                         it->util = d;
348                 }
349                 if (ce_stage(ce)) {
350                         d->index_status = DIFF_STATUS_UNMERGED;
351                         d->stagemask |= (1 << (ce_stage(ce) - 1));
352                 }
353                 else
354                         d->index_status = DIFF_STATUS_ADDED;
355         }
356 }
357
358 static void wt_status_collect_untracked(struct wt_status *s)
359 {
360         int i;
361         struct dir_struct dir;
362
363         if (!s->show_untracked_files)
364                 return;
365         memset(&dir, 0, sizeof(dir));
366         if (s->show_untracked_files != SHOW_ALL_UNTRACKED_FILES)
367                 dir.flags |=
368                         DIR_SHOW_OTHER_DIRECTORIES | DIR_HIDE_EMPTY_DIRECTORIES;
369         setup_standard_excludes(&dir);
370
371         fill_directory(&dir, s->pathspec);
372         for (i = 0; i < dir.nr; i++) {
373                 struct dir_entry *ent = dir.entries[i];
374                 if (!cache_name_is_other(ent->name, ent->len))
375                         continue;
376                 if (!match_pathspec(s->pathspec, ent->name, ent->len, 0, NULL))
377                         continue;
378                 s->workdir_untracked = 1;
379                 string_list_insert(ent->name, &s->untracked);
380         }
381 }
382
383 void wt_status_collect(struct wt_status *s)
384 {
385         wt_status_collect_changes_worktree(s);
386
387         if (s->is_initial)
388                 wt_status_collect_changes_initial(s);
389         else
390                 wt_status_collect_changes_index(s);
391         wt_status_collect_untracked(s);
392 }
393
394 static void wt_status_print_unmerged(struct wt_status *s)
395 {
396         int shown_header = 0;
397         int i;
398
399         for (i = 0; i < s->change.nr; i++) {
400                 struct wt_status_change_data *d;
401                 struct string_list_item *it;
402                 it = &(s->change.items[i]);
403                 d = it->util;
404                 if (!d->stagemask)
405                         continue;
406                 if (!shown_header) {
407                         wt_status_print_unmerged_header(s);
408                         shown_header = 1;
409                 }
410                 wt_status_print_unmerged_data(s, it);
411         }
412         if (shown_header)
413                 wt_status_print_trailer(s);
414
415 }
416
417 static void wt_status_print_updated(struct wt_status *s)
418 {
419         int shown_header = 0;
420         int i;
421
422         for (i = 0; i < s->change.nr; i++) {
423                 struct wt_status_change_data *d;
424                 struct string_list_item *it;
425                 it = &(s->change.items[i]);
426                 d = it->util;
427                 if (!d->index_status ||
428                     d->index_status == DIFF_STATUS_UNMERGED)
429                         continue;
430                 if (!shown_header) {
431                         wt_status_print_cached_header(s);
432                         s->commitable = 1;
433                         shown_header = 1;
434                 }
435                 wt_status_print_change_data(s, WT_STATUS_UPDATED, it);
436         }
437         if (shown_header)
438                 wt_status_print_trailer(s);
439 }
440
441 /*
442  * -1 : has delete
443  *  0 : no change
444  *  1 : some change but no delete
445  */
446 static int wt_status_check_worktree_changes(struct wt_status *s,
447                                              int *dirty_submodules)
448 {
449         int i;
450         int changes = 0;
451
452         *dirty_submodules = 0;
453
454         for (i = 0; i < s->change.nr; i++) {
455                 struct wt_status_change_data *d;
456                 d = s->change.items[i].util;
457                 if (!d->worktree_status ||
458                     d->worktree_status == DIFF_STATUS_UNMERGED)
459                         continue;
460                 if (!changes)
461                         changes = 1;
462                 if (d->dirty_submodule)
463                         *dirty_submodules = 1;
464                 if (d->worktree_status == DIFF_STATUS_DELETED)
465                         changes = -1;
466         }
467         return changes;
468 }
469
470 static void wt_status_print_changed(struct wt_status *s)
471 {
472         int i, dirty_submodules;
473         int worktree_changes = wt_status_check_worktree_changes(s, &dirty_submodules);
474
475         if (!worktree_changes)
476                 return;
477
478         wt_status_print_dirty_header(s, worktree_changes < 0, dirty_submodules);
479
480         for (i = 0; i < s->change.nr; i++) {
481                 struct wt_status_change_data *d;
482                 struct string_list_item *it;
483                 it = &(s->change.items[i]);
484                 d = it->util;
485                 if (!d->worktree_status ||
486                     d->worktree_status == DIFF_STATUS_UNMERGED)
487                         continue;
488                 wt_status_print_change_data(s, WT_STATUS_CHANGED, it);
489         }
490         wt_status_print_trailer(s);
491 }
492
493 static void wt_status_print_submodule_summary(struct wt_status *s, int uncommitted)
494 {
495         struct child_process sm_summary;
496         char summary_limit[64];
497         char index[PATH_MAX];
498         const char *env[] = { index, NULL };
499         const char *argv[] = {
500                 "submodule",
501                 "summary",
502                 uncommitted ? "--files" : "--cached",
503                 "--for-status",
504                 "--summary-limit",
505                 summary_limit,
506                 uncommitted ? NULL : (s->amend ? "HEAD^" : "HEAD"),
507                 NULL
508         };
509
510         sprintf(summary_limit, "%d", s->submodule_summary);
511         snprintf(index, sizeof(index), "GIT_INDEX_FILE=%s", s->index_file);
512
513         memset(&sm_summary, 0, sizeof(sm_summary));
514         sm_summary.argv = argv;
515         sm_summary.env = env;
516         sm_summary.git_cmd = 1;
517         sm_summary.no_stdin = 1;
518         fflush(s->fp);
519         sm_summary.out = dup(fileno(s->fp));    /* run_command closes it */
520         run_command(&sm_summary);
521 }
522
523 static void wt_status_print_untracked(struct wt_status *s)
524 {
525         int i;
526         struct strbuf buf = STRBUF_INIT;
527
528         if (!s->untracked.nr)
529                 return;
530
531         wt_status_print_untracked_header(s);
532         for (i = 0; i < s->untracked.nr; i++) {
533                 struct string_list_item *it;
534                 it = &(s->untracked.items[i]);
535                 color_fprintf(s->fp, color(WT_STATUS_HEADER, s), "#\t");
536                 color_fprintf_ln(s->fp, color(WT_STATUS_UNTRACKED, s), "%s",
537                                  quote_path(it->string, strlen(it->string),
538                                             &buf, s->prefix));
539         }
540         strbuf_release(&buf);
541 }
542
543 static void wt_status_print_verbose(struct wt_status *s)
544 {
545         struct rev_info rev;
546
547         init_revisions(&rev, NULL);
548         DIFF_OPT_SET(&rev.diffopt, ALLOW_TEXTCONV);
549         setup_revisions(0, NULL, &rev,
550                 s->is_initial ? EMPTY_TREE_SHA1_HEX : s->reference);
551         rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
552         rev.diffopt.detect_rename = 1;
553         rev.diffopt.file = s->fp;
554         rev.diffopt.close_file = 0;
555         /*
556          * If we're not going to stdout, then we definitely don't
557          * want color, since we are going to the commit message
558          * file (and even the "auto" setting won't work, since it
559          * will have checked isatty on stdout).
560          */
561         if (s->fp != stdout)
562                 DIFF_OPT_CLR(&rev.diffopt, COLOR_DIFF);
563         run_diff_index(&rev, 1);
564 }
565
566 static void wt_status_print_tracking(struct wt_status *s)
567 {
568         struct strbuf sb = STRBUF_INIT;
569         const char *cp, *ep;
570         struct branch *branch;
571
572         assert(s->branch && !s->is_initial);
573         if (prefixcmp(s->branch, "refs/heads/"))
574                 return;
575         branch = branch_get(s->branch + 11);
576         if (!format_tracking_info(branch, &sb))
577                 return;
578
579         for (cp = sb.buf; (ep = strchr(cp, '\n')) != NULL; cp = ep + 1)
580                 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s),
581                                  "# %.*s", (int)(ep - cp), cp);
582         color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s), "#");
583 }
584
585 void wt_status_print(struct wt_status *s)
586 {
587         const char *branch_color = color(WT_STATUS_HEADER, s);
588
589         if (s->branch) {
590                 const char *on_what = "On branch ";
591                 const char *branch_name = s->branch;
592                 if (!prefixcmp(branch_name, "refs/heads/"))
593                         branch_name += 11;
594                 else if (!strcmp(branch_name, "HEAD")) {
595                         branch_name = "";
596                         branch_color = color(WT_STATUS_NOBRANCH, s);
597                         on_what = "Not currently on any branch.";
598                 }
599                 color_fprintf(s->fp, color(WT_STATUS_HEADER, s), "# ");
600                 color_fprintf_ln(s->fp, branch_color, "%s%s", on_what, branch_name);
601                 if (!s->is_initial)
602                         wt_status_print_tracking(s);
603         }
604
605         if (s->is_initial) {
606                 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s), "#");
607                 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s), "# Initial commit");
608                 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s), "#");
609         }
610
611         wt_status_print_updated(s);
612         wt_status_print_unmerged(s);
613         wt_status_print_changed(s);
614         if (s->submodule_summary) {
615                 wt_status_print_submodule_summary(s, 0);  /* staged */
616                 wt_status_print_submodule_summary(s, 1);  /* unstaged */
617         }
618         if (s->show_untracked_files)
619                 wt_status_print_untracked(s);
620         else if (s->commitable)
621                  fprintf(s->fp, "# Untracked files not listed (use -u option to show untracked files)\n");
622
623         if (s->verbose)
624                 wt_status_print_verbose(s);
625         if (!s->commitable) {
626                 if (s->amend)
627                         fprintf(s->fp, "# No changes\n");
628                 else if (s->nowarn)
629                         ; /* nothing */
630                 else if (s->workdir_dirty)
631                         printf("no changes added to commit (use \"git add\" and/or \"git commit -a\")\n");
632                 else if (s->untracked.nr)
633                         printf("nothing added to commit but untracked files present (use \"git add\" to track)\n");
634                 else if (s->is_initial)
635                         printf("nothing to commit (create/copy files and use \"git add\" to track)\n");
636                 else if (!s->show_untracked_files)
637                         printf("nothing to commit (use -u to show untracked files)\n");
638                 else
639                         printf("nothing to commit (working directory clean)\n");
640         }
641 }
642
643 static void wt_shortstatus_unmerged(int null_termination, struct string_list_item *it,
644                            struct wt_status *s)
645 {
646         struct wt_status_change_data *d = it->util;
647         const char *how = "??";
648
649         switch (d->stagemask) {
650         case 1: how = "DD"; break; /* both deleted */
651         case 2: how = "AU"; break; /* added by us */
652         case 3: how = "UD"; break; /* deleted by them */
653         case 4: how = "UA"; break; /* added by them */
654         case 5: how = "DU"; break; /* deleted by us */
655         case 6: how = "AA"; break; /* both added */
656         case 7: how = "UU"; break; /* both modified */
657         }
658         color_fprintf(s->fp, color(WT_STATUS_UNMERGED, s), "%s", how);
659         if (null_termination) {
660                 fprintf(stdout, " %s%c", it->string, 0);
661         } else {
662                 struct strbuf onebuf = STRBUF_INIT;
663                 const char *one;
664                 one = quote_path(it->string, -1, &onebuf, s->prefix);
665                 printf(" %s\n", one);
666                 strbuf_release(&onebuf);
667         }
668 }
669
670 static void wt_shortstatus_status(int null_termination, struct string_list_item *it,
671                          struct wt_status *s)
672 {
673         struct wt_status_change_data *d = it->util;
674
675         if (d->index_status)
676                 color_fprintf(s->fp, color(WT_STATUS_UPDATED, s), "%c", d->index_status);
677         else
678                 putchar(' ');
679         if (d->worktree_status)
680                 color_fprintf(s->fp, color(WT_STATUS_CHANGED, s), "%c", d->worktree_status);
681         else
682                 putchar(' ');
683         putchar(' ');
684         if (null_termination) {
685                 fprintf(stdout, "%s%c", it->string, 0);
686                 if (d->head_path)
687                         fprintf(stdout, "%s%c", d->head_path, 0);
688         } else {
689                 struct strbuf onebuf = STRBUF_INIT;
690                 const char *one;
691                 if (d->head_path) {
692                         one = quote_path(d->head_path, -1, &onebuf, s->prefix);
693                         printf("%s -> ", one);
694                         strbuf_release(&onebuf);
695                 }
696                 one = quote_path(it->string, -1, &onebuf, s->prefix);
697                 printf("%s\n", one);
698                 strbuf_release(&onebuf);
699         }
700 }
701
702 static void wt_shortstatus_untracked(int null_termination, struct string_list_item *it,
703                             struct wt_status *s)
704 {
705         if (null_termination) {
706                 fprintf(stdout, "?? %s%c", it->string, 0);
707         } else {
708                 struct strbuf onebuf = STRBUF_INIT;
709                 const char *one;
710                 one = quote_path(it->string, -1, &onebuf, s->prefix);
711                 color_fprintf(s->fp, color(WT_STATUS_UNTRACKED, s), "??");
712                 printf(" %s\n", one);
713                 strbuf_release(&onebuf);
714         }
715 }
716
717 void wt_shortstatus_print(struct wt_status *s, int null_termination)
718 {
719         int i;
720         for (i = 0; i < s->change.nr; i++) {
721                 struct wt_status_change_data *d;
722                 struct string_list_item *it;
723
724                 it = &(s->change.items[i]);
725                 d = it->util;
726                 if (d->stagemask)
727                         wt_shortstatus_unmerged(null_termination, it, s);
728                 else
729                         wt_shortstatus_status(null_termination, it, s);
730         }
731         for (i = 0; i < s->untracked.nr; i++) {
732                 struct string_list_item *it;
733
734                 it = &(s->untracked.items[i]);
735                 wt_shortstatus_untracked(null_termination, it, s);
736         }
737 }
738
739 void wt_porcelain_print(struct wt_status *s, int null_termination)
740 {
741         s->use_color = 0;
742         s->relative_paths = 0;
743         s->prefix = NULL;
744         wt_shortstatus_print(s, null_termination);
745 }