strbuf: introduce strbuf_getline_{lf,nul}()
[git/git.git] / wt-status.c
CommitLineData
85023577 1#include "cache.h"
c91f0d92 2#include "wt-status.h"
c91f0d92
JK
3#include "object.h"
4#include "dir.h"
5#include "commit.h"
6#include "diff.h"
7#include "revision.h"
8#include "diffcore.h"
a734d0b1 9#include "quote.h"
ac8d5afc 10#include "run-command.h"
bb7e32e3 11#include "argv-array.h"
b6975ab5 12#include "remote.h"
05a59a08 13#include "refs.h"
46a958b3 14#include "submodule.h"
323d0530 15#include "column.h"
2d1cceba 16#include "strbuf.h"
3651e45c 17#include "utf8.h"
c91f0d92 18
983dc697 19static const char cut_line[] =
1a72cfd7
JL
20"------------------------ >8 ------------------------\n";
21
23900a96 22static char default_wt_status_colors[][COLOR_MAXLEN] = {
dc6ebd4c
AL
23 GIT_COLOR_NORMAL, /* WT_STATUS_HEADER */
24 GIT_COLOR_GREEN, /* WT_STATUS_UPDATED */
25 GIT_COLOR_RED, /* WT_STATUS_CHANGED */
26 GIT_COLOR_RED, /* WT_STATUS_UNTRACKED */
27 GIT_COLOR_RED, /* WT_STATUS_NOBRANCH */
4d4d5726 28 GIT_COLOR_RED, /* WT_STATUS_UNMERGED */
05a59a08
DKF
29 GIT_COLOR_GREEN, /* WT_STATUS_LOCAL_BRANCH */
30 GIT_COLOR_RED, /* WT_STATUS_REMOTE_BRANCH */
148135fc 31 GIT_COLOR_NIL, /* WT_STATUS_ONBRANCH */
c91f0d92 32};
4d229653 33
d249b098 34static const char *color(int slot, struct wt_status *s)
c91f0d92 35{
daa0c3d9
JK
36 const char *c = "";
37 if (want_color(s->use_color))
38 c = s->color_palette[slot];
148135fc
JK
39 if (slot == WT_STATUS_ONBRANCH && color_is_nil(c))
40 c = s->color_palette[WT_STATUS_HEADER];
41 return c;
c91f0d92
JK
42}
43
becbdae8
JN
44static void status_vprintf(struct wt_status *s, int at_bol, const char *color,
45 const char *fmt, va_list ap, const char *trail)
46{
47 struct strbuf sb = STRBUF_INIT;
48 struct strbuf linebuf = STRBUF_INIT;
49 const char *line, *eol;
50
51 strbuf_vaddf(&sb, fmt, ap);
52 if (!sb.len) {
2556b996
MM
53 if (s->display_comment_prefix) {
54 strbuf_addch(&sb, comment_line_char);
55 if (!trail)
56 strbuf_addch(&sb, ' ');
57 }
becbdae8
JN
58 color_print_strbuf(s->fp, color, &sb);
59 if (trail)
60 fprintf(s->fp, "%s", trail);
61 strbuf_release(&sb);
62 return;
63 }
64 for (line = sb.buf; *line; line = eol + 1) {
65 eol = strchr(line, '\n');
66
67 strbuf_reset(&linebuf);
2556b996 68 if (at_bol && s->display_comment_prefix) {
eff80a9f 69 strbuf_addch(&linebuf, comment_line_char);
becbdae8
JN
70 if (*line != '\n' && *line != '\t')
71 strbuf_addch(&linebuf, ' ');
72 }
73 if (eol)
74 strbuf_add(&linebuf, line, eol - line);
75 else
76 strbuf_addstr(&linebuf, line);
77 color_print_strbuf(s->fp, color, &linebuf);
78 if (eol)
79 fprintf(s->fp, "\n");
80 else
81 break;
82 at_bol = 1;
83 }
84 if (trail)
85 fprintf(s->fp, "%s", trail);
86 strbuf_release(&linebuf);
87 strbuf_release(&sb);
88}
89
90void status_printf_ln(struct wt_status *s, const char *color,
91 const char *fmt, ...)
92{
93 va_list ap;
94
95 va_start(ap, fmt);
96 status_vprintf(s, 1, color, fmt, ap, "\n");
97 va_end(ap);
98}
99
100void status_printf(struct wt_status *s, const char *color,
101 const char *fmt, ...)
102{
103 va_list ap;
104
105 va_start(ap, fmt);
106 status_vprintf(s, 1, color, fmt, ap, NULL);
107 va_end(ap);
108}
109
1e24845c
JH
110static void status_printf_more(struct wt_status *s, const char *color,
111 const char *fmt, ...)
becbdae8
JN
112{
113 va_list ap;
114
115 va_start(ap, fmt);
116 status_vprintf(s, 0, color, fmt, ap, NULL);
117 va_end(ap);
118}
119
c91f0d92
JK
120void wt_status_prepare(struct wt_status *s)
121{
122 unsigned char sha1[20];
c91f0d92 123
cc46a743 124 memset(s, 0, sizeof(*s));
23900a96
JH
125 memcpy(s->color_palette, default_wt_status_colors,
126 sizeof(default_wt_status_colors));
d249b098
JH
127 s->show_untracked_files = SHOW_NORMAL_UNTRACKED_FILES;
128 s->use_color = -1;
129 s->relative_paths = 1;
7695d118 130 s->branch = resolve_refdup("HEAD", 0, sha1, NULL);
c91f0d92 131 s->reference = "HEAD";
f26a0012 132 s->fp = stdout;
0f729f21 133 s->index_file = get_index_file();
50b7e70f 134 s->change.strdup_strings = 1;
76378683 135 s->untracked.strdup_strings = 1;
6cb3f6b2 136 s->ignored.strdup_strings = 1;
84b4202d 137 s->show_branch = -1; /* unspecified */
2556b996 138 s->display_comment_prefix = 0;
c91f0d92
JK
139}
140
4d4d5726
JH
141static void wt_status_print_unmerged_header(struct wt_status *s)
142{
96b0ec1a
LK
143 int i;
144 int del_mod_conflict = 0;
145 int both_deleted = 0;
146 int not_deleted = 0;
d249b098 147 const char *c = color(WT_STATUS_HEADER, s);
3c588453 148
355ec7a1 149 status_printf_ln(s, c, _("Unmerged paths:"));
96b0ec1a
LK
150
151 for (i = 0; i < s->change.nr; i++) {
152 struct string_list_item *it = &(s->change.items[i]);
153 struct wt_status_change_data *d = it->util;
154
155 switch (d->stagemask) {
156 case 0:
157 break;
158 case 1:
159 both_deleted = 1;
160 break;
161 case 3:
162 case 5:
163 del_mod_conflict = 1;
164 break;
165 default:
166 not_deleted = 1;
167 break;
168 }
169 }
170
6a964f57 171 if (!s->hints)
edf563fb 172 return;
37f7a857 173 if (s->whence != FROM_COMMIT)
3c588453
JH
174 ;
175 else if (!s->is_initial)
355ec7a1 176 status_printf_ln(s, c, _(" (use \"git reset %s <file>...\" to unstage)"), s->reference);
4d4d5726 177 else
355ec7a1 178 status_printf_ln(s, c, _(" (use \"git rm --cached <file>...\" to unstage)"));
96b0ec1a
LK
179
180 if (!both_deleted) {
181 if (!del_mod_conflict)
182 status_printf_ln(s, c, _(" (use \"git add <file>...\" to mark resolution)"));
183 else
184 status_printf_ln(s, c, _(" (use \"git add/rm <file>...\" as appropriate to mark resolution)"));
185 } else if (!del_mod_conflict && !not_deleted) {
186 status_printf_ln(s, c, _(" (use \"git rm <file>...\" to mark resolution)"));
187 } else {
188 status_printf_ln(s, c, _(" (use \"git add/rm <file>...\" as appropriate to mark resolution)"));
189 }
7d7d6802 190 status_printf_ln(s, c, "%s", "");
4d4d5726
JH
191}
192
f26a0012 193static void wt_status_print_cached_header(struct wt_status *s)
3c1eb9cb 194{
d249b098 195 const char *c = color(WT_STATUS_HEADER, s);
3c588453 196
919a4ce0 197 status_printf_ln(s, c, _("Changes to be committed:"));
6a964f57 198 if (!s->hints)
edf563fb 199 return;
37f7a857 200 if (s->whence != FROM_COMMIT)
3c588453
JH
201 ; /* NEEDSWORK: use "git reset --unresolve"??? */
202 else if (!s->is_initial)
355ec7a1 203 status_printf_ln(s, c, _(" (use \"git reset %s <file>...\" to unstage)"), s->reference);
3c588453 204 else
355ec7a1 205 status_printf_ln(s, c, _(" (use \"git rm --cached <file>...\" to unstage)"));
7d7d6802 206 status_printf_ln(s, c, "%s", "");
3c1eb9cb
JR
207}
208
bb914b14 209static void wt_status_print_dirty_header(struct wt_status *s,
9297f77e
JL
210 int has_deleted,
211 int has_dirty_submodules)
c91f0d92 212{
d249b098 213 const char *c = color(WT_STATUS_HEADER, s);
3c588453 214
355ec7a1 215 status_printf_ln(s, c, _("Changes not staged for commit:"));
6a964f57 216 if (!s->hints)
edf563fb 217 return;
bb914b14 218 if (!has_deleted)
355ec7a1 219 status_printf_ln(s, c, _(" (use \"git add <file>...\" to update what will be committed)"));
bb914b14 220 else
355ec7a1
ÆAB
221 status_printf_ln(s, c, _(" (use \"git add/rm <file>...\" to update what will be committed)"));
222 status_printf_ln(s, c, _(" (use \"git checkout -- <file>...\" to discard changes in working directory)"));
9297f77e 223 if (has_dirty_submodules)
355ec7a1 224 status_printf_ln(s, c, _(" (commit or discard the untracked or modified content in submodules)"));
7d7d6802 225 status_printf_ln(s, c, "%s", "");
bb914b14
AM
226}
227
1b908b6f
JH
228static void wt_status_print_other_header(struct wt_status *s,
229 const char *what,
230 const char *how)
bb914b14 231{
d249b098 232 const char *c = color(WT_STATUS_HEADER, s);
50bd8b7e 233 status_printf_ln(s, c, "%s:", what);
6a964f57 234 if (!s->hints)
edf563fb 235 return;
355ec7a1 236 status_printf_ln(s, c, _(" (use \"git %s <file>...\" to include in what will be committed)"), how);
7d7d6802 237 status_printf_ln(s, c, "%s", "");
c91f0d92
JK
238}
239
f26a0012 240static void wt_status_print_trailer(struct wt_status *s)
c91f0d92 241{
7d7d6802 242 status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", "");
c91f0d92
JK
243}
244
a734d0b1 245#define quote_path quote_path_relative
3a946802 246
8f17f5b2 247static const char *wt_status_unmerged_status_string(int stagemask)
4d4d5726 248{
8f17f5b2
JN
249 switch (stagemask) {
250 case 1:
251 return _("both deleted:");
252 case 2:
253 return _("added by us:");
254 case 3:
255 return _("deleted by them:");
256 case 4:
257 return _("added by them:");
258 case 5:
259 return _("deleted by us:");
260 case 6:
261 return _("both added:");
262 case 7:
263 return _("both modified:");
264 default:
265 die(_("bug: unhandled unmerged status %x"), stagemask);
4d4d5726 266 }
4d4d5726
JH
267}
268
3651e45c
NTND
269static const char *wt_status_diff_status_string(int status)
270{
271 switch (status) {
272 case DIFF_STATUS_ADDED:
d52cb576 273 return _("new file:");
3651e45c 274 case DIFF_STATUS_COPIED:
d52cb576 275 return _("copied:");
3651e45c 276 case DIFF_STATUS_DELETED:
d52cb576 277 return _("deleted:");
3651e45c 278 case DIFF_STATUS_MODIFIED:
d52cb576 279 return _("modified:");
3651e45c 280 case DIFF_STATUS_RENAMED:
d52cb576 281 return _("renamed:");
3651e45c 282 case DIFF_STATUS_TYPE_CHANGED:
d52cb576 283 return _("typechange:");
3651e45c 284 case DIFF_STATUS_UNKNOWN:
d52cb576 285 return _("unknown:");
3651e45c 286 case DIFF_STATUS_UNMERGED:
d52cb576 287 return _("unmerged:");
3651e45c
NTND
288 default:
289 return NULL;
290 }
291}
292
335e8250
JN
293static int maxwidth(const char *(*label)(int), int minval, int maxval)
294{
295 int result = 0, i;
296
297 for (i = minval; i <= maxval; i++) {
298 const char *s = label(i);
299 int len = s ? utf8_strwidth(s) : 0;
300 if (len > result)
301 result = len;
302 }
303 return result;
304}
305
8f17f5b2
JN
306static void wt_status_print_unmerged_data(struct wt_status *s,
307 struct string_list_item *it)
308{
309 const char *c = color(WT_STATUS_UNMERGED, s);
310 struct wt_status_change_data *d = it->util;
311 struct strbuf onebuf = STRBUF_INIT;
312 static char *padding;
313 static int label_width;
314 const char *one, *how;
315 int len;
316
317 if (!padding) {
318 label_width = maxwidth(wt_status_unmerged_status_string, 1, 7);
319 label_width += strlen(" ");
8f17f5b2
JN
320 padding = xmallocz(label_width);
321 memset(padding, ' ', label_width);
322 }
323
324 one = quote_path(it->string, s->prefix, &onebuf);
325 status_printf(s, color(WT_STATUS_HEADER, s), "\t");
326
327 how = wt_status_unmerged_status_string(d->stagemask);
328 len = label_width - utf8_strwidth(how);
329 status_printf_more(s, c, "%s%.*s%s\n", how, len, padding, one);
330 strbuf_release(&onebuf);
331}
332
50b7e70f
JH
333static void wt_status_print_change_data(struct wt_status *s,
334 int change_type,
335 struct string_list_item *it)
c91f0d92 336{
50b7e70f 337 struct wt_status_change_data *d = it->util;
d249b098 338 const char *c = color(change_type, s);
b8527d5f 339 int status;
50b7e70f
JH
340 char *one_name;
341 char *two_name;
3a946802 342 const char *one, *two;
f285a2d7 343 struct strbuf onebuf = STRBUF_INIT, twobuf = STRBUF_INIT;
9297f77e 344 struct strbuf extra = STRBUF_INIT;
3651e45c 345 static char *padding;
d52cb576 346 static int label_width;
3651e45c
NTND
347 const char *what;
348 int len;
349
350 if (!padding) {
335e8250
JN
351 /* If DIFF_STATUS_* uses outside the range [A..Z], we're in trouble */
352 label_width = maxwidth(wt_status_diff_status_string, 'A', 'Z');
d52cb576
JH
353 label_width += strlen(" ");
354 padding = xmallocz(label_width);
355 memset(padding, ' ', label_width);
3651e45c 356 }
3a946802 357
50b7e70f
JH
358 one_name = two_name = it->string;
359 switch (change_type) {
360 case WT_STATUS_UPDATED:
361 status = d->index_status;
362 if (d->head_path)
363 one_name = d->head_path;
364 break;
365 case WT_STATUS_CHANGED:
9297f77e
JL
366 if (d->new_submodule_commits || d->dirty_submodule) {
367 strbuf_addstr(&extra, " (");
368 if (d->new_submodule_commits)
355ec7a1 369 strbuf_addf(&extra, _("new commits, "));
9297f77e 370 if (d->dirty_submodule & DIRTY_SUBMODULE_MODIFIED)
355ec7a1 371 strbuf_addf(&extra, _("modified content, "));
9297f77e 372 if (d->dirty_submodule & DIRTY_SUBMODULE_UNTRACKED)
355ec7a1 373 strbuf_addf(&extra, _("untracked content, "));
9297f77e
JL
374 strbuf_setlen(&extra, extra.len - 2);
375 strbuf_addch(&extra, ')');
376 }
50b7e70f
JH
377 status = d->worktree_status;
378 break;
b8527d5f
JK
379 default:
380 die("BUG: unhandled change_type %d in wt_status_print_change_data",
381 change_type);
50b7e70f
JH
382 }
383
39598f99
JX
384 one = quote_path(one_name, s->prefix, &onebuf);
385 two = quote_path(two_name, s->prefix, &twobuf);
3a946802 386
b926c0d1 387 status_printf(s, color(WT_STATUS_HEADER, s), "\t");
3651e45c
NTND
388 what = wt_status_diff_status_string(status);
389 if (!what)
355ec7a1 390 die(_("bug: unhandled diff status %c"), status);
d52cb576 391 len = label_width - utf8_strwidth(what);
3651e45c
NTND
392 assert(len >= 0);
393 if (status == DIFF_STATUS_COPIED || status == DIFF_STATUS_RENAMED)
d52cb576 394 status_printf_more(s, c, "%s%.*s%s -> %s",
3651e45c
NTND
395 what, len, padding, one, two);
396 else
d52cb576 397 status_printf_more(s, c, "%s%.*s%s",
3651e45c 398 what, len, padding, one);
9297f77e 399 if (extra.len) {
b926c0d1 400 status_printf_more(s, color(WT_STATUS_HEADER, s), "%s", extra.buf);
9297f77e
JL
401 strbuf_release(&extra);
402 }
b926c0d1 403 status_printf_more(s, GIT_COLOR_NORMAL, "\n");
367c9886
JS
404 strbuf_release(&onebuf);
405 strbuf_release(&twobuf);
c91f0d92
JK
406}
407
50b7e70f
JH
408static void wt_status_collect_changed_cb(struct diff_queue_struct *q,
409 struct diff_options *options,
410 void *data)
c91f0d92
JK
411{
412 struct wt_status *s = data;
c91f0d92 413 int i;
50b7e70f
JH
414
415 if (!q->nr)
416 return;
417 s->workdir_dirty = 1;
c91f0d92 418 for (i = 0; i < q->nr; i++) {
50b7e70f
JH
419 struct diff_filepair *p;
420 struct string_list_item *it;
421 struct wt_status_change_data *d;
422
423 p = q->queue[i];
78a395d3 424 it = string_list_insert(&s->change, p->one->path);
50b7e70f
JH
425 d = it->util;
426 if (!d) {
427 d = xcalloc(1, sizeof(*d));
428 it->util = d;
c91f0d92 429 }
50b7e70f
JH
430 if (!d->worktree_status)
431 d->worktree_status = p->status;
9297f77e
JL
432 d->dirty_submodule = p->two->dirty_submodule;
433 if (S_ISGITLINK(p->two->mode))
434 d->new_submodule_commits = !!hashcmp(p->one->sha1, p->two->sha1);
c91f0d92 435 }
c91f0d92
JK
436}
437
4d4d5726
JH
438static int unmerged_mask(const char *path)
439{
440 int pos, mask;
9c5e6c80 441 const struct cache_entry *ce;
4d4d5726
JH
442
443 pos = cache_name_pos(path, strlen(path));
444 if (0 <= pos)
445 return 0;
446
447 mask = 0;
448 pos = -pos-1;
449 while (pos < active_nr) {
450 ce = active_cache[pos++];
451 if (strcmp(ce->name, path) || !ce_stage(ce))
452 break;
453 mask |= (1 << (ce_stage(ce) - 1));
454 }
455 return mask;
456}
457
50b7e70f
JH
458static void wt_status_collect_updated_cb(struct diff_queue_struct *q,
459 struct diff_options *options,
460 void *data)
c91f0d92 461{
6e458bf6 462 struct wt_status *s = data;
c91f0d92 463 int i;
50b7e70f
JH
464
465 for (i = 0; i < q->nr; i++) {
466 struct diff_filepair *p;
467 struct string_list_item *it;
468 struct wt_status_change_data *d;
469
470 p = q->queue[i];
78a395d3 471 it = string_list_insert(&s->change, p->two->path);
50b7e70f
JH
472 d = it->util;
473 if (!d) {
474 d = xcalloc(1, sizeof(*d));
475 it->util = d;
476 }
477 if (!d->index_status)
478 d->index_status = p->status;
479 switch (p->status) {
480 case DIFF_STATUS_COPIED:
481 case DIFF_STATUS_RENAMED:
482 d->head_path = xstrdup(p->one->path);
483 break;
4d4d5726
JH
484 case DIFF_STATUS_UNMERGED:
485 d->stagemask = unmerged_mask(p->two->path);
486 break;
50b7e70f 487 }
6e458bf6 488 }
c91f0d92
JK
489}
490
50b7e70f 491static void wt_status_collect_changes_worktree(struct wt_status *s)
c91f0d92
JK
492{
493 struct rev_info rev;
50b7e70f
JH
494
495 init_revisions(&rev, NULL);
496 setup_revisions(0, NULL, &rev, NULL);
497 rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
9297f77e 498 DIFF_OPT_SET(&rev.diffopt, DIRTY_SUBMODULES);
3bfc4504
JL
499 if (!s->show_untracked_files)
500 DIFF_OPT_SET(&rev.diffopt, IGNORE_UNTRACKED_IN_SUBMODULES);
aee9c7d6
JL
501 if (s->ignore_submodule_arg) {
502 DIFF_OPT_SET(&rev.diffopt, OVERRIDE_SUBMODULE_CONFIG);
46a958b3 503 handle_ignore_submodules_arg(&rev.diffopt, s->ignore_submodule_arg);
c4c42f2c 504 }
50b7e70f
JH
505 rev.diffopt.format_callback = wt_status_collect_changed_cb;
506 rev.diffopt.format_callback_data = s;
15b55ae0 507 copy_pathspec(&rev.prune_data, &s->pathspec);
50b7e70f
JH
508 run_diff_files(&rev, 0);
509}
510
511static void wt_status_collect_changes_index(struct wt_status *s)
512{
513 struct rev_info rev;
32962c9b 514 struct setup_revision_opt opt;
50b7e70f 515
c91f0d92 516 init_revisions(&rev, NULL);
32962c9b
JH
517 memset(&opt, 0, sizeof(opt));
518 opt.def = s->is_initial ? EMPTY_TREE_SHA1_HEX : s->reference;
519 setup_revisions(0, NULL, &rev, &opt);
520
1d2f393a 521 DIFF_OPT_SET(&rev.diffopt, OVERRIDE_SUBMODULE_CONFIG);
aee9c7d6 522 if (s->ignore_submodule_arg) {
46a958b3 523 handle_ignore_submodules_arg(&rev.diffopt, s->ignore_submodule_arg);
1d2f393a
JL
524 } else {
525 /*
526 * Unless the user did explicitly request a submodule ignore
527 * mode by passing a command line option we do not ignore any
528 * changed submodule SHA-1s when comparing index and HEAD, no
529 * matter what is configured. Otherwise the user won't be
530 * shown any submodules she manually added (and which are
531 * staged to be committed), which would be really confusing.
532 */
533 handle_ignore_submodules_arg(&rev.diffopt, "dirty");
aee9c7d6 534 }
46a958b3 535
c91f0d92 536 rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
50b7e70f 537 rev.diffopt.format_callback = wt_status_collect_updated_cb;
c91f0d92
JK
538 rev.diffopt.format_callback_data = s;
539 rev.diffopt.detect_rename = 1;
50705915 540 rev.diffopt.rename_limit = 200;
f714fb84 541 rev.diffopt.break_opt = 0;
15b55ae0 542 copy_pathspec(&rev.prune_data, &s->pathspec);
c91f0d92
JK
543 run_diff_index(&rev, 1);
544}
545
50b7e70f
JH
546static void wt_status_collect_changes_initial(struct wt_status *s)
547{
548 int i;
549
550 for (i = 0; i < active_nr; i++) {
551 struct string_list_item *it;
552 struct wt_status_change_data *d;
9c5e6c80 553 const struct cache_entry *ce = active_cache[i];
50b7e70f 554
429bb40a 555 if (!ce_path_match(ce, &s->pathspec, NULL))
76e2f7ce 556 continue;
78a395d3 557 it = string_list_insert(&s->change, ce->name);
50b7e70f
JH
558 d = it->util;
559 if (!d) {
560 d = xcalloc(1, sizeof(*d));
561 it->util = d;
562 }
4d4d5726 563 if (ce_stage(ce)) {
50b7e70f 564 d->index_status = DIFF_STATUS_UNMERGED;
4d4d5726
JH
565 d->stagemask |= (1 << (ce_stage(ce) - 1));
566 }
50b7e70f
JH
567 else
568 d->index_status = DIFF_STATUS_ADDED;
569 }
570}
571
76378683
JH
572static void wt_status_collect_untracked(struct wt_status *s)
573{
574 int i;
575 struct dir_struct dir;
132d41e6 576 uint64_t t_begin = getnanotime();
76378683
JH
577
578 if (!s->show_untracked_files)
579 return;
6a38ef2c 580
76378683
JH
581 memset(&dir, 0, sizeof(dir));
582 if (s->show_untracked_files != SHOW_ALL_UNTRACKED_FILES)
583 dir.flags |=
584 DIR_SHOW_OTHER_DIRECTORIES | DIR_HIDE_EMPTY_DIRECTORIES;
0aaf62b6
KB
585 if (s->show_ignored_files)
586 dir.flags |= DIR_SHOW_IGNORED_TOO;
226c051a
NTND
587 else
588 dir.untracked = the_index.untracked;
76378683
JH
589 setup_standard_excludes(&dir);
590
7327d3d1 591 fill_directory(&dir, &s->pathspec);
0aaf62b6 592
eeefa7c9 593 for (i = 0; i < dir.nr; i++) {
76378683 594 struct dir_entry *ent = dir.entries[i];
b822423e 595 if (cache_name_is_other(ent->name, ent->len) &&
ebb32893 596 dir_path_match(ent, &s->pathspec, 0, NULL))
b822423e 597 string_list_insert(&s->untracked, ent->name);
f5b26b1d 598 free(ent);
76378683 599 }
f5b26b1d 600
0aaf62b6
KB
601 for (i = 0; i < dir.ignored_nr; i++) {
602 struct dir_entry *ent = dir.ignored[i];
603 if (cache_name_is_other(ent->name, ent->len) &&
ebb32893 604 dir_path_match(ent, &s->pathspec, 0, NULL))
0aaf62b6
KB
605 string_list_insert(&s->ignored, ent->name);
606 free(ent);
6cb3f6b2
JH
607 }
608
f5b26b1d 609 free(dir.entries);
0aaf62b6
KB
610 free(dir.ignored);
611 clear_directory(&dir);
6a38ef2c 612
132d41e6
KB
613 if (advice_status_u_option)
614 s->untracked_in_ms = (getnanotime() - t_begin) / 1000000;
76378683
JH
615}
616
617void wt_status_collect(struct wt_status *s)
50b7e70f
JH
618{
619 wt_status_collect_changes_worktree(s);
620
621 if (s->is_initial)
622 wt_status_collect_changes_initial(s);
623 else
624 wt_status_collect_changes_index(s);
76378683 625 wt_status_collect_untracked(s);
50b7e70f
JH
626}
627
4d4d5726
JH
628static void wt_status_print_unmerged(struct wt_status *s)
629{
630 int shown_header = 0;
631 int i;
632
633 for (i = 0; i < s->change.nr; i++) {
634 struct wt_status_change_data *d;
635 struct string_list_item *it;
636 it = &(s->change.items[i]);
637 d = it->util;
638 if (!d->stagemask)
639 continue;
640 if (!shown_header) {
641 wt_status_print_unmerged_header(s);
642 shown_header = 1;
643 }
644 wt_status_print_unmerged_data(s, it);
645 }
646 if (shown_header)
647 wt_status_print_trailer(s);
648
649}
650
50b7e70f
JH
651static void wt_status_print_updated(struct wt_status *s)
652{
653 int shown_header = 0;
654 int i;
655
656 for (i = 0; i < s->change.nr; i++) {
657 struct wt_status_change_data *d;
658 struct string_list_item *it;
659 it = &(s->change.items[i]);
660 d = it->util;
661 if (!d->index_status ||
662 d->index_status == DIFF_STATUS_UNMERGED)
663 continue;
664 if (!shown_header) {
665 wt_status_print_cached_header(s);
666 s->commitable = 1;
667 shown_header = 1;
668 }
669 wt_status_print_change_data(s, WT_STATUS_UPDATED, it);
670 }
671 if (shown_header)
672 wt_status_print_trailer(s);
673}
674
675/*
676 * -1 : has delete
677 * 0 : no change
678 * 1 : some change but no delete
679 */
9297f77e
JL
680static int wt_status_check_worktree_changes(struct wt_status *s,
681 int *dirty_submodules)
50b7e70f
JH
682{
683 int i;
684 int changes = 0;
685
9297f77e
JL
686 *dirty_submodules = 0;
687
50b7e70f
JH
688 for (i = 0; i < s->change.nr; i++) {
689 struct wt_status_change_data *d;
690 d = s->change.items[i].util;
4d4d5726
JH
691 if (!d->worktree_status ||
692 d->worktree_status == DIFF_STATUS_UNMERGED)
50b7e70f 693 continue;
9297f77e
JL
694 if (!changes)
695 changes = 1;
696 if (d->dirty_submodule)
697 *dirty_submodules = 1;
50b7e70f 698 if (d->worktree_status == DIFF_STATUS_DELETED)
9297f77e 699 changes = -1;
50b7e70f
JH
700 }
701 return changes;
702}
703
c91f0d92
JK
704static void wt_status_print_changed(struct wt_status *s)
705{
9297f77e
JL
706 int i, dirty_submodules;
707 int worktree_changes = wt_status_check_worktree_changes(s, &dirty_submodules);
50b7e70f
JH
708
709 if (!worktree_changes)
710 return;
711
9297f77e 712 wt_status_print_dirty_header(s, worktree_changes < 0, dirty_submodules);
50b7e70f
JH
713
714 for (i = 0; i < s->change.nr; i++) {
715 struct wt_status_change_data *d;
716 struct string_list_item *it;
717 it = &(s->change.items[i]);
718 d = it->util;
4d4d5726
JH
719 if (!d->worktree_status ||
720 d->worktree_status == DIFF_STATUS_UNMERGED)
50b7e70f
JH
721 continue;
722 wt_status_print_change_data(s, WT_STATUS_CHANGED, it);
723 }
724 wt_status_print_trailer(s);
c91f0d92
JK
725}
726
f17a5d34 727static void wt_status_print_submodule_summary(struct wt_status *s, int uncommitted)
ac8d5afc 728{
d3180279 729 struct child_process sm_summary = CHILD_PROCESS_INIT;
3ba7407b
MM
730 struct strbuf cmd_stdout = STRBUF_INIT;
731 struct strbuf summary = STRBUF_INIT;
732 char *summary_content;
ac8d5afc 733
a9154590
RS
734 argv_array_pushf(&sm_summary.env_array, "GIT_INDEX_FILE=%s",
735 s->index_file);
ac8d5afc 736
a2bae2dc
RS
737 argv_array_push(&sm_summary.args, "submodule");
738 argv_array_push(&sm_summary.args, "summary");
739 argv_array_push(&sm_summary.args, uncommitted ? "--files" : "--cached");
740 argv_array_push(&sm_summary.args, "--for-status");
741 argv_array_push(&sm_summary.args, "--summary-limit");
742 argv_array_pushf(&sm_summary.args, "%d", s->submodule_summary);
bb7e32e3 743 if (!uncommitted)
a2bae2dc 744 argv_array_push(&sm_summary.args, s->amend ? "HEAD^" : "HEAD");
bb7e32e3 745
ac8d5afc
PY
746 sm_summary.git_cmd = 1;
747 sm_summary.no_stdin = 1;
3ba7407b 748
5c950e9b 749 capture_command(&sm_summary, &cmd_stdout, 1024);
3ba7407b
MM
750
751 /* prepend header, only if there's an actual output */
d56d966b 752 if (cmd_stdout.len) {
3ba7407b
MM
753 if (uncommitted)
754 strbuf_addstr(&summary, _("Submodules changed but not updated:"));
755 else
756 strbuf_addstr(&summary, _("Submodule changes to be committed:"));
757 strbuf_addstr(&summary, "\n\n");
758 }
759 strbuf_addbuf(&summary, &cmd_stdout);
760 strbuf_release(&cmd_stdout);
761
2556b996 762 if (s->display_comment_prefix) {
d56d966b 763 size_t len;
2556b996
MM
764 summary_content = strbuf_detach(&summary, &len);
765 strbuf_add_commented_lines(&summary, summary_content, len);
766 free(summary_content);
767 }
3ba7407b
MM
768
769 fputs(summary.buf, s->fp);
770 strbuf_release(&summary);
ac8d5afc
PY
771}
772
1b908b6f
JH
773static void wt_status_print_other(struct wt_status *s,
774 struct string_list *l,
775 const char *what,
776 const char *how)
c91f0d92 777{
c91f0d92 778 int i;
f285a2d7 779 struct strbuf buf = STRBUF_INIT;
323d0530
NTND
780 static struct string_list output = STRING_LIST_INIT_DUP;
781 struct column_options copts;
c91f0d92 782
1282988b 783 if (!l->nr)
76378683 784 return;
c91f0d92 785
1b908b6f
JH
786 wt_status_print_other_header(s, what, how);
787
788 for (i = 0; i < l->nr; i++) {
76378683 789 struct string_list_item *it;
323d0530 790 const char *path;
1b908b6f 791 it = &(l->items[i]);
39598f99 792 path = quote_path(it->string, s->prefix, &buf);
323d0530
NTND
793 if (column_active(s->colopts)) {
794 string_list_append(&output, path);
795 continue;
796 }
b926c0d1
JN
797 status_printf(s, color(WT_STATUS_HEADER, s), "\t");
798 status_printf_more(s, color(WT_STATUS_UNTRACKED, s),
323d0530 799 "%s\n", path);
c91f0d92 800 }
323d0530
NTND
801
802 strbuf_release(&buf);
803 if (!column_active(s->colopts))
2f0f7f1c 804 goto conclude;
323d0530 805
2556b996 806 strbuf_addf(&buf, "%s%s\t%s",
323d0530 807 color(WT_STATUS_HEADER, s),
2556b996 808 s->display_comment_prefix ? "#" : "",
323d0530
NTND
809 color(WT_STATUS_UNTRACKED, s));
810 memset(&copts, 0, sizeof(copts));
811 copts.padding = 1;
812 copts.indent = buf.buf;
813 if (want_color(s->use_color))
814 copts.nl = GIT_COLOR_RESET "\n";
815 print_columns(&output, s->colopts, &copts);
816 string_list_clear(&output, 0);
367c9886 817 strbuf_release(&buf);
2f0f7f1c 818conclude:
7d7d6802 819 status_printf_ln(s, GIT_COLOR_NORMAL, "%s", "");
c91f0d92
JK
820}
821
1a72cfd7
JL
822void wt_status_truncate_message_at_cut_line(struct strbuf *buf)
823{
824 const char *p;
825 struct strbuf pattern = STRBUF_INIT;
826
fbfa0973
SG
827 strbuf_addf(&pattern, "\n%c %s", comment_line_char, cut_line);
828 if (starts_with(buf->buf, pattern.buf + 1))
829 strbuf_setlen(buf, 0);
830 else if ((p = strstr(buf->buf, pattern.buf)))
831 strbuf_setlen(buf, p - buf->buf + 1);
1a72cfd7
JL
832 strbuf_release(&pattern);
833}
834
fcef9312
NTND
835void wt_status_add_cut_line(FILE *fp)
836{
837 const char *explanation = _("Do not touch the line above.\nEverything below will be removed.");
838 struct strbuf buf = STRBUF_INIT;
839
840 fprintf(fp, "%c %s", comment_line_char, cut_line);
841 strbuf_add_commented_lines(&buf, explanation, strlen(explanation));
842 fputs(buf.buf, fp);
843 strbuf_release(&buf);
844}
845
c91f0d92
JK
846static void wt_status_print_verbose(struct wt_status *s)
847{
848 struct rev_info rev;
32962c9b 849 struct setup_revision_opt opt;
40555000
MG
850 int dirty_submodules;
851 const char *c = color(WT_STATUS_HEADER, s);
99a12694 852
c91f0d92 853 init_revisions(&rev, NULL);
5ec11af6 854 DIFF_OPT_SET(&rev.diffopt, ALLOW_TEXTCONV);
32962c9b
JH
855
856 memset(&opt, 0, sizeof(opt));
857 opt.def = s->is_initial ? EMPTY_TREE_SHA1_HEX : s->reference;
858 setup_revisions(0, NULL, &rev, &opt);
859
c91f0d92
JK
860 rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
861 rev.diffopt.detect_rename = 1;
4ba0cb27
KH
862 rev.diffopt.file = s->fp;
863 rev.diffopt.close_file = 0;
4f672ad6
JK
864 /*
865 * If we're not going to stdout, then we definitely don't
866 * want color, since we are going to the commit message
867 * file (and even the "auto" setting won't work, since it
1a72cfd7
JL
868 * will have checked isatty on stdout). But we then do want
869 * to insert the scissor line here to reliably remove the
870 * diff before committing.
4f672ad6 871 */
1a72cfd7 872 if (s->fp != stdout) {
f1c96261 873 rev.diffopt.use_color = 0;
fcef9312 874 wt_status_add_cut_line(s->fp);
1a72cfd7 875 }
40555000
MG
876 if (s->verbose > 1 && s->commitable) {
877 /* print_updated() printed a header, so do we */
878 if (s->fp != stdout)
879 wt_status_print_trailer(s);
880 status_printf_ln(s, c, _("Changes to be committed:"));
881 rev.diffopt.a_prefix = "c/";
882 rev.diffopt.b_prefix = "i/";
883 } /* else use prefix as per user config */
c91f0d92 884 run_diff_index(&rev, 1);
40555000
MG
885 if (s->verbose > 1 &&
886 wt_status_check_worktree_changes(s, &dirty_submodules)) {
887 status_printf_ln(s, c,
888 "--------------------------------------------------");
889 status_printf_ln(s, c, _("Changes not staged for commit:"));
890 setup_work_tree();
891 rev.diffopt.a_prefix = "i/";
892 rev.diffopt.b_prefix = "w/";
893 run_diff_files(&rev, 0);
894 }
c91f0d92
JK
895}
896
b6975ab5
JH
897static void wt_status_print_tracking(struct wt_status *s)
898{
899 struct strbuf sb = STRBUF_INIT;
c72b49df 900 const char *cp, *ep, *branch_name;
b6975ab5 901 struct branch *branch;
2556b996
MM
902 char comment_line_string[3];
903 int i;
b6975ab5
JH
904
905 assert(s->branch && !s->is_initial);
c72b49df 906 if (!skip_prefix(s->branch, "refs/heads/", &branch_name))
b6975ab5 907 return;
c72b49df 908 branch = branch_get(branch_name);
b6975ab5
JH
909 if (!format_tracking_info(branch, &sb))
910 return;
911
2556b996
MM
912 i = 0;
913 if (s->display_comment_prefix) {
914 comment_line_string[i++] = comment_line_char;
915 comment_line_string[i++] = ' ';
916 }
917 comment_line_string[i] = '\0';
918
b6975ab5 919 for (cp = sb.buf; (ep = strchr(cp, '\n')) != NULL; cp = ep + 1)
d249b098 920 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s),
2556b996 921 "%s%.*s", comment_line_string,
eff80a9f 922 (int)(ep - cp), cp);
2556b996
MM
923 if (s->display_comment_prefix)
924 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s), "%c",
925 comment_line_char);
926 else
7d7d6802 927 fputs("", s->fp);
b6975ab5
JH
928}
929
83c750ac
LK
930static int has_unmerged(struct wt_status *s)
931{
932 int i;
933
934 for (i = 0; i < s->change.nr; i++) {
935 struct wt_status_change_data *d;
936 d = s->change.items[i].util;
937 if (d->stagemask)
938 return 1;
939 }
940 return 0;
941}
942
943static void show_merge_in_progress(struct wt_status *s,
944 struct wt_status_state *state,
945 const char *color)
946{
947 if (has_unmerged(s)) {
948 status_printf_ln(s, color, _("You have unmerged paths."));
6a964f57 949 if (s->hints)
83c750ac
LK
950 status_printf_ln(s, color,
951 _(" (fix conflicts and run \"git commit\")"));
952 } else {
953 status_printf_ln(s, color,
954 _("All conflicts fixed but you are still merging."));
6a964f57 955 if (s->hints)
83c750ac
LK
956 status_printf_ln(s, color,
957 _(" (use \"git commit\" to conclude merge)"));
958 }
959 wt_status_print_trailer(s);
960}
961
962static void show_am_in_progress(struct wt_status *s,
963 struct wt_status_state *state,
964 const char *color)
965{
966 status_printf_ln(s, color,
967 _("You are in the middle of an am session."));
968 if (state->am_empty_patch)
969 status_printf_ln(s, color,
970 _("The current patch is empty."));
6a964f57 971 if (s->hints) {
83c750ac
LK
972 if (!state->am_empty_patch)
973 status_printf_ln(s, color,
8ceb6fbd 974 _(" (fix conflicts and then run \"git am --continue\")"));
83c750ac
LK
975 status_printf_ln(s, color,
976 _(" (use \"git am --skip\" to skip this patch)"));
977 status_printf_ln(s, color,
978 _(" (use \"git am --abort\" to restore the original branch)"));
979 }
980 wt_status_print_trailer(s);
981}
982
2d1cceba
LK
983static char *read_line_from_git_path(const char *filename)
984{
985 struct strbuf buf = STRBUF_INIT;
986 FILE *fp = fopen(git_path("%s", filename), "r");
987 if (!fp) {
988 strbuf_release(&buf);
989 return NULL;
990 }
8f309aeb 991 strbuf_getline_lf(&buf, fp);
2d1cceba
LK
992 if (!fclose(fp)) {
993 return strbuf_detach(&buf, NULL);
994 } else {
995 strbuf_release(&buf);
996 return NULL;
997 }
998}
999
1000static int split_commit_in_progress(struct wt_status *s)
1001{
1002 int split_in_progress = 0;
1003 char *head = read_line_from_git_path("HEAD");
1004 char *orig_head = read_line_from_git_path("ORIG_HEAD");
1005 char *rebase_amend = read_line_from_git_path("rebase-merge/amend");
1006 char *rebase_orig_head = read_line_from_git_path("rebase-merge/orig-head");
1007
1008 if (!head || !orig_head || !rebase_amend || !rebase_orig_head ||
1009 !s->branch || strcmp(s->branch, "HEAD"))
1010 return split_in_progress;
1011
1012 if (!strcmp(rebase_amend, rebase_orig_head)) {
1013 if (strcmp(head, rebase_amend))
1014 split_in_progress = 1;
1015 } else if (strcmp(orig_head, rebase_orig_head)) {
1016 split_in_progress = 1;
1017 }
1018
1019 if (!s->amend && !s->nowarn && !s->workdir_dirty)
1020 split_in_progress = 0;
1021
1022 free(head);
1023 free(orig_head);
1024 free(rebase_amend);
1025 free(rebase_orig_head);
1026 return split_in_progress;
1027}
1028
84e6fb9d
GP
1029/*
1030 * Turn
1031 * "pick d6a2f0303e897ec257dd0e0a39a5ccb709bc2047 some message"
1032 * into
1033 * "pick d6a2f03 some message"
1034 *
1035 * The function assumes that the line does not contain useless spaces
1036 * before or after the command.
1037 */
1038static void abbrev_sha1_in_line(struct strbuf *line)
1039{
1040 struct strbuf **split;
1041 int i;
1042
1043 if (starts_with(line->buf, "exec ") ||
1044 starts_with(line->buf, "x "))
1045 return;
1046
1047 split = strbuf_split_max(line, ' ', 3);
1048 if (split[0] && split[1]) {
1049 unsigned char sha1[20];
1050 const char *abbrev;
1051
1052 /*
1053 * strbuf_split_max left a space. Trim it and re-add
1054 * it after abbreviation.
1055 */
1056 strbuf_trim(split[1]);
1057 if (!get_sha1(split[1]->buf, sha1)) {
1058 abbrev = find_unique_abbrev(sha1, DEFAULT_ABBREV);
1059 strbuf_reset(split[1]);
1060 strbuf_addf(split[1], "%s ", abbrev);
1061 strbuf_reset(line);
1062 for (i = 0; split[i]; i++)
1063 strbuf_addf(line, "%s", split[i]->buf);
1064 }
1065 }
1066 for (i = 0; split[i]; i++)
1067 strbuf_release(split[i]);
1068
1069}
1070
1071static void read_rebase_todolist(const char *fname, struct string_list *lines)
1072{
1073 struct strbuf line = STRBUF_INIT;
1074 FILE *f = fopen(git_path("%s", fname), "r");
1075
1076 if (!f)
1077 die_errno("Could not open file %s for reading",
1078 git_path("%s", fname));
8f309aeb 1079 while (!strbuf_getline_lf(&line, f)) {
84e6fb9d
GP
1080 if (line.len && line.buf[0] == comment_line_char)
1081 continue;
1082 strbuf_trim(&line);
1083 if (!line.len)
1084 continue;
1085 abbrev_sha1_in_line(&line);
1086 string_list_append(lines, line.buf);
1087 }
1088}
1089
1090static void show_rebase_information(struct wt_status *s,
1091 struct wt_status_state *state,
1092 const char *color)
1093{
1094 if (state->rebase_interactive_in_progress) {
1095 int i;
1096 int nr_lines_to_show = 2;
1097
1098 struct string_list have_done = STRING_LIST_INIT_DUP;
1099 struct string_list yet_to_do = STRING_LIST_INIT_DUP;
1100
1101 read_rebase_todolist("rebase-merge/done", &have_done);
1102 read_rebase_todolist("rebase-merge/git-rebase-todo", &yet_to_do);
1103
1104 if (have_done.nr == 0)
1105 status_printf_ln(s, color, _("No commands done."));
1106 else {
1107 status_printf_ln(s, color,
1108 Q_("Last command done (%d command done):",
1109 "Last commands done (%d commands done):",
1110 have_done.nr),
1111 have_done.nr);
1112 for (i = (have_done.nr > nr_lines_to_show)
1113 ? have_done.nr - nr_lines_to_show : 0;
1114 i < have_done.nr;
1115 i++)
1116 status_printf_ln(s, color, " %s", have_done.items[i].string);
1117 if (have_done.nr > nr_lines_to_show && s->hints)
1118 status_printf_ln(s, color,
1119 _(" (see more in file %s)"), git_path("rebase-merge/done"));
1120 }
1121
1122 if (yet_to_do.nr == 0)
1123 status_printf_ln(s, color,
1124 _("No commands remaining."));
1125 else {
1126 status_printf_ln(s, color,
1127 Q_("Next command to do (%d remaining command):",
1128 "Next commands to do (%d remaining commands):",
1129 yet_to_do.nr),
1130 yet_to_do.nr);
1131 for (i = 0; i < nr_lines_to_show && i < yet_to_do.nr; i++)
1132 status_printf_ln(s, color, " %s", yet_to_do.items[i].string);
1133 if (s->hints)
1134 status_printf_ln(s, color,
1135 _(" (use \"git rebase --edit-todo\" to view and edit)"));
1136 }
1137 string_list_clear(&yet_to_do, 0);
1138 string_list_clear(&have_done, 0);
1139 }
1140}
1141
05eb5635
GP
1142static void print_rebase_state(struct wt_status *s,
1143 struct wt_status_state *state,
1144 const char *color)
1145{
1146 if (state->branch)
1147 status_printf_ln(s, color,
1148 _("You are currently rebasing branch '%s' on '%s'."),
1149 state->branch,
1150 state->onto);
1151 else
1152 status_printf_ln(s, color,
1153 _("You are currently rebasing."));
1154}
1155
83c750ac
LK
1156static void show_rebase_in_progress(struct wt_status *s,
1157 struct wt_status_state *state,
1158 const char *color)
1159{
1160 struct stat st;
1161
84e6fb9d 1162 show_rebase_information(s, state, color);
83c750ac 1163 if (has_unmerged(s)) {
05eb5635 1164 print_rebase_state(s, state, color);
6a964f57 1165 if (s->hints) {
83c750ac
LK
1166 status_printf_ln(s, color,
1167 _(" (fix conflicts and then run \"git rebase --continue\")"));
1168 status_printf_ln(s, color,
1169 _(" (use \"git rebase --skip\" to skip this patch)"));
1170 status_printf_ln(s, color,
1171 _(" (use \"git rebase --abort\" to check out the original branch)"));
1172 }
f932729c 1173 } else if (state->rebase_in_progress || !stat(git_path_merge_msg(), &st)) {
05eb5635 1174 print_rebase_state(s, state, color);
6a964f57 1175 if (s->hints)
83c750ac
LK
1176 status_printf_ln(s, color,
1177 _(" (all conflicts fixed: run \"git rebase --continue\")"));
2d1cceba 1178 } else if (split_commit_in_progress(s)) {
0722c805
NTND
1179 if (state->branch)
1180 status_printf_ln(s, color,
1181 _("You are currently splitting a commit while rebasing branch '%s' on '%s'."),
1182 state->branch,
1183 state->onto);
1184 else
1185 status_printf_ln(s, color,
1186 _("You are currently splitting a commit during a rebase."));
6a964f57 1187 if (s->hints)
2d1cceba
LK
1188 status_printf_ln(s, color,
1189 _(" (Once your working directory is clean, run \"git rebase --continue\")"));
83c750ac 1190 } else {
0722c805
NTND
1191 if (state->branch)
1192 status_printf_ln(s, color,
1193 _("You are currently editing a commit while rebasing branch '%s' on '%s'."),
1194 state->branch,
1195 state->onto);
1196 else
1197 status_printf_ln(s, color,
1198 _("You are currently editing a commit during a rebase."));
6a964f57 1199 if (s->hints && !s->amend) {
83c750ac
LK
1200 status_printf_ln(s, color,
1201 _(" (use \"git commit --amend\" to amend the current commit)"));
1202 status_printf_ln(s, color,
1203 _(" (use \"git rebase --continue\" once you are satisfied with your changes)"));
1204 }
1205 }
1206 wt_status_print_trailer(s);
1207}
1208
1209static void show_cherry_pick_in_progress(struct wt_status *s,
1210 struct wt_status_state *state,
1211 const char *color)
1212{
bffd8098
RT
1213 status_printf_ln(s, color, _("You are currently cherry-picking commit %s."),
1214 find_unique_abbrev(state->cherry_pick_head_sha1, DEFAULT_ABBREV));
6a964f57 1215 if (s->hints) {
83c750ac
LK
1216 if (has_unmerged(s))
1217 status_printf_ln(s, color,
b95e66f5 1218 _(" (fix conflicts and run \"git cherry-pick --continue\")"));
83c750ac
LK
1219 else
1220 status_printf_ln(s, color,
b95e66f5
RT
1221 _(" (all conflicts fixed: run \"git cherry-pick --continue\")"));
1222 status_printf_ln(s, color,
1223 _(" (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"));
83c750ac
LK
1224 }
1225 wt_status_print_trailer(s);
1226}
1227
db4ef449
MM
1228static void show_revert_in_progress(struct wt_status *s,
1229 struct wt_status_state *state,
1230 const char *color)
1231{
87e139c0
MM
1232 status_printf_ln(s, color, _("You are currently reverting commit %s."),
1233 find_unique_abbrev(state->revert_head_sha1, DEFAULT_ABBREV));
6a964f57 1234 if (s->hints) {
db4ef449
MM
1235 if (has_unmerged(s))
1236 status_printf_ln(s, color,
1237 _(" (fix conflicts and run \"git revert --continue\")"));
1238 else
1239 status_printf_ln(s, color,
1240 _(" (all conflicts fixed: run \"git revert --continue\")"));
1241 status_printf_ln(s, color,
1242 _(" (use \"git revert --abort\" to cancel the revert operation)"));
1243 }
1244 wt_status_print_trailer(s);
1245}
1246
83c750ac
LK
1247static void show_bisect_in_progress(struct wt_status *s,
1248 struct wt_status_state *state,
1249 const char *color)
1250{
0722c805
NTND
1251 if (state->branch)
1252 status_printf_ln(s, color,
6deab24d 1253 _("You are currently bisecting, started from branch '%s'."),
0722c805
NTND
1254 state->branch);
1255 else
1256 status_printf_ln(s, color,
1257 _("You are currently bisecting."));
6a964f57 1258 if (s->hints)
83c750ac
LK
1259 status_printf_ln(s, color,
1260 _(" (use \"git bisect reset\" to get back to the original branch)"));
1261 wt_status_print_trailer(s);
1262}
1263
0722c805
NTND
1264/*
1265 * Extract branch information from rebase/bisect
1266 */
8b87cfd0 1267static char *read_and_strip_branch(const char *path)
0722c805 1268{
8b87cfd0 1269 struct strbuf sb = STRBUF_INIT;
0722c805 1270 unsigned char sha1[20];
c72b49df 1271 const char *branch_name;
0722c805 1272
8b87cfd0
NTND
1273 if (strbuf_read_file(&sb, git_path("%s", path), 0) <= 0)
1274 goto got_nothing;
0722c805 1275
66ec904b 1276 while (sb.len && sb.buf[sb.len - 1] == '\n')
8b87cfd0
NTND
1277 strbuf_setlen(&sb, sb.len - 1);
1278 if (!sb.len)
1279 goto got_nothing;
c72b49df
RS
1280 if (skip_prefix(sb.buf, "refs/heads/", &branch_name))
1281 strbuf_remove(&sb, 0, branch_name - sb.buf);
59556548 1282 else if (starts_with(sb.buf, "refs/"))
8b87cfd0
NTND
1283 ;
1284 else if (!get_sha1_hex(sb.buf, sha1)) {
0722c805
NTND
1285 const char *abbrev;
1286 abbrev = find_unique_abbrev(sha1, DEFAULT_ABBREV);
8b87cfd0
NTND
1287 strbuf_reset(&sb);
1288 strbuf_addstr(&sb, abbrev);
1289 } else if (!strcmp(sb.buf, "detached HEAD")) /* rebase */
1290 goto got_nothing;
0722c805 1291 else /* bisect */
8b87cfd0
NTND
1292 ;
1293 return strbuf_detach(&sb, NULL);
1294
1295got_nothing:
1296 strbuf_release(&sb);
1297 return NULL;
0722c805
NTND
1298}
1299
b397ea48 1300struct grab_1st_switch_cbdata {
b397ea48
NTND
1301 struct strbuf buf;
1302 unsigned char nsha1[20];
1303};
1304
1305static int grab_1st_switch(unsigned char *osha1, unsigned char *nsha1,
1306 const char *email, unsigned long timestamp, int tz,
1307 const char *message, void *cb_data)
83c750ac 1308{
b397ea48
NTND
1309 struct grab_1st_switch_cbdata *cb = cb_data;
1310 const char *target = NULL, *end;
83c750ac 1311
c72b49df 1312 if (!skip_prefix(message, "checkout: moving from ", &message))
b397ea48 1313 return 0;
b397ea48
NTND
1314 target = strstr(message, " to ");
1315 if (!target)
1316 return 0;
1317 target += strlen(" to ");
1318 strbuf_reset(&cb->buf);
1319 hashcpy(cb->nsha1, nsha1);
904de44c
RS
1320 end = strchrnul(target, '\n');
1321 strbuf_add(&cb->buf, target, end - target);
1322 if (!strcmp(cb->buf.buf, "HEAD")) {
0eb8548f 1323 /* HEAD is relative. Resolve it to the right reflog entry. */
904de44c 1324 strbuf_reset(&cb->buf);
0eb8548f
MM
1325 strbuf_addstr(&cb->buf,
1326 find_unique_abbrev(nsha1, DEFAULT_ABBREV));
0eb8548f 1327 }
b397ea48
NTND
1328 return 1;
1329}
1330
1331static void wt_status_get_detached_from(struct wt_status_state *state)
1332{
1333 struct grab_1st_switch_cbdata cb;
1334 struct commit *commit;
1335 unsigned char sha1[20];
1336 char *ref = NULL;
1337
1338 strbuf_init(&cb.buf, 0);
1339 if (for_each_reflog_ent_reverse("HEAD", grab_1st_switch, &cb) <= 0) {
1340 strbuf_release(&cb.buf);
1341 return;
1342 }
1343
1344 if (dwim_ref(cb.buf.buf, cb.buf.len, sha1, &ref) == 1 &&
1345 /* sha1 is a commit? match without further lookup */
1346 (!hashcmp(cb.nsha1, sha1) ||
1347 /* perhaps sha1 is a tag, try to dereference to a commit */
1348 ((commit = lookup_commit_reference_gently(sha1, 1)) != NULL &&
ed1c9977 1349 !hashcmp(cb.nsha1, commit->object.oid.hash)))) {
c72b49df
RS
1350 const char *from = ref;
1351 if (!skip_prefix(from, "refs/tags/", &from))
1352 skip_prefix(from, "refs/remotes/", &from);
1353 state->detached_from = xstrdup(from);
b397ea48
NTND
1354 } else
1355 state->detached_from =
1356 xstrdup(find_unique_abbrev(cb.nsha1, DEFAULT_ABBREV));
1357 hashcpy(state->detached_sha1, cb.nsha1);
970399e7
MG
1358 state->detached_at = !get_sha1("HEAD", sha1) &&
1359 !hashcmp(sha1, state->detached_sha1);
b397ea48
NTND
1360
1361 free(ref);
1362 strbuf_release(&cb.buf);
1363}
1364
1365void wt_status_get_state(struct wt_status_state *state,
1366 int get_detached_from)
83c750ac 1367{
83c750ac 1368 struct stat st;
87e139c0 1369 unsigned char sha1[20];
83c750ac 1370
f932729c 1371 if (!stat(git_path_merge_head(), &st)) {
b9691db4 1372 state->merge_in_progress = 1;
83c750ac
LK
1373 } else if (!stat(git_path("rebase-apply"), &st)) {
1374 if (!stat(git_path("rebase-apply/applying"), &st)) {
b9691db4 1375 state->am_in_progress = 1;
83c750ac 1376 if (!stat(git_path("rebase-apply/patch"), &st) && !st.st_size)
b9691db4 1377 state->am_empty_patch = 1;
83c750ac 1378 } else {
b9691db4
NTND
1379 state->rebase_in_progress = 1;
1380 state->branch = read_and_strip_branch("rebase-apply/head-name");
1381 state->onto = read_and_strip_branch("rebase-apply/onto");
83c750ac
LK
1382 }
1383 } else if (!stat(git_path("rebase-merge"), &st)) {
1384 if (!stat(git_path("rebase-merge/interactive"), &st))
b9691db4 1385 state->rebase_interactive_in_progress = 1;
83c750ac 1386 else
b9691db4
NTND
1387 state->rebase_in_progress = 1;
1388 state->branch = read_and_strip_branch("rebase-merge/head-name");
1389 state->onto = read_and_strip_branch("rebase-merge/onto");
f932729c 1390 } else if (!stat(git_path_cherry_pick_head(), &st) &&
bffd8098 1391 !get_sha1("CHERRY_PICK_HEAD", sha1)) {
b9691db4 1392 state->cherry_pick_in_progress = 1;
bffd8098 1393 hashcpy(state->cherry_pick_head_sha1, sha1);
83c750ac 1394 }
0722c805 1395 if (!stat(git_path("BISECT_LOG"), &st)) {
b9691db4
NTND
1396 state->bisect_in_progress = 1;
1397 state->branch = read_and_strip_branch("BISECT_START");
0722c805 1398 }
f932729c 1399 if (!stat(git_path_revert_head(), &st) &&
87e139c0 1400 !get_sha1("REVERT_HEAD", sha1)) {
db4ef449 1401 state->revert_in_progress = 1;
87e139c0 1402 hashcpy(state->revert_head_sha1, sha1);
db4ef449 1403 }
83c750ac 1404
b397ea48
NTND
1405 if (get_detached_from)
1406 wt_status_get_detached_from(state);
b9691db4
NTND
1407}
1408
3b691ccc
NTND
1409static void wt_status_print_state(struct wt_status *s,
1410 struct wt_status_state *state)
b9691db4
NTND
1411{
1412 const char *state_color = color(WT_STATUS_HEADER, s);
3b691ccc
NTND
1413 if (state->merge_in_progress)
1414 show_merge_in_progress(s, state, state_color);
1415 else if (state->am_in_progress)
1416 show_am_in_progress(s, state, state_color);
1417 else if (state->rebase_in_progress || state->rebase_interactive_in_progress)
1418 show_rebase_in_progress(s, state, state_color);
1419 else if (state->cherry_pick_in_progress)
1420 show_cherry_pick_in_progress(s, state, state_color);
db4ef449
MM
1421 else if (state->revert_in_progress)
1422 show_revert_in_progress(s, state, state_color);
3b691ccc
NTND
1423 if (state->bisect_in_progress)
1424 show_bisect_in_progress(s, state, state_color);
83c750ac
LK
1425}
1426
c91f0d92
JK
1427void wt_status_print(struct wt_status *s)
1428{
1d282327
AA
1429 const char *branch_color = color(WT_STATUS_ONBRANCH, s);
1430 const char *branch_status_color = color(WT_STATUS_HEADER, s);
3b691ccc
NTND
1431 struct wt_status_state state;
1432
1433 memset(&state, 0, sizeof(state));
b397ea48
NTND
1434 wt_status_get_state(&state,
1435 s->branch && !strcmp(s->branch, "HEAD"));
98bf8a47 1436
bda324cf 1437 if (s->branch) {
355ec7a1 1438 const char *on_what = _("On branch ");
bda324cf 1439 const char *branch_name = s->branch;
c72b49df 1440 if (!strcmp(branch_name, "HEAD")) {
1d282327 1441 branch_status_color = color(WT_STATUS_NOBRANCH, s);
ec506310 1442 if (state.rebase_in_progress || state.rebase_interactive_in_progress) {
df25e947
GP
1443 if (state.rebase_interactive_in_progress)
1444 on_what = _("interactive rebase in progress; onto ");
1445 else
1446 on_what = _("rebase in progress; onto ");
ec506310
RR
1447 branch_name = state.onto;
1448 } else if (state.detached_from) {
b397ea48 1449 branch_name = state.detached_from;
970399e7 1450 if (state.detached_at)
b397ea48
NTND
1451 on_what = _("HEAD detached at ");
1452 else
1453 on_what = _("HEAD detached from ");
1454 } else {
1455 branch_name = "";
1456 on_what = _("Not currently on any branch.");
1457 }
c72b49df
RS
1458 } else
1459 skip_prefix(branch_name, "refs/heads/", &branch_name);
7d7d6802 1460 status_printf(s, color(WT_STATUS_HEADER, s), "%s", "");
b926c0d1
JN
1461 status_printf_more(s, branch_status_color, "%s", on_what);
1462 status_printf_more(s, branch_color, "%s\n", branch_name);
b6975ab5
JH
1463 if (!s->is_initial)
1464 wt_status_print_tracking(s);
bda324cf 1465 }
c91f0d92 1466
3b691ccc
NTND
1467 wt_status_print_state(s, &state);
1468 free(state.branch);
1469 free(state.onto);
b397ea48 1470 free(state.detached_from);
3b691ccc 1471
c91f0d92 1472 if (s->is_initial) {
7d7d6802 1473 status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", "");
b3b298af 1474 status_printf_ln(s, color(WT_STATUS_HEADER, s), _("Initial commit"));
7d7d6802 1475 status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", "");
c91f0d92
JK
1476 }
1477
c1e255b7 1478 wt_status_print_updated(s);
228e7b5d 1479 wt_status_print_unmerged(s);
c91f0d92 1480 wt_status_print_changed(s);
46a958b3
JL
1481 if (s->submodule_summary &&
1482 (!s->ignore_submodule_arg ||
1483 strcmp(s->ignore_submodule_arg, "all"))) {
f17a5d34
JL
1484 wt_status_print_submodule_summary(s, 0); /* staged */
1485 wt_status_print_submodule_summary(s, 1); /* unstaged */
1486 }
2381e39e 1487 if (s->show_untracked_files) {
50bd8b7e 1488 wt_status_print_other(s, &s->untracked, _("Untracked files"), "add");
2381e39e 1489 if (s->show_ignored_files)
50bd8b7e 1490 wt_status_print_other(s, &s->ignored, _("Ignored files"), "add -f");
6a38ef2c 1491 if (advice_status_u_option && 2000 < s->untracked_in_ms) {
7d7d6802 1492 status_printf_ln(s, GIT_COLOR_NORMAL, "%s", "");
6a38ef2c 1493 status_printf_ln(s, GIT_COLOR_NORMAL,
62901179
JX
1494 _("It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1495 "may speed it up, but you have to be careful not to forget to add\n"
1496 "new files yourself (see 'git help status')."),
1497 s->untracked_in_ms / 1000.0);
6a38ef2c 1498 }
2381e39e 1499 } else if (s->commitable)
355ec7a1 1500 status_printf_ln(s, GIT_COLOR_NORMAL, _("Untracked files not listed%s"),
6a964f57 1501 s->hints
355ec7a1 1502 ? _(" (use -u option to show untracked files)") : "");
c91f0d92 1503
1324fb6f 1504 if (s->verbose)
c91f0d92 1505 wt_status_print_verbose(s);
6e458bf6
JR
1506 if (!s->commitable) {
1507 if (s->amend)
355ec7a1 1508 status_printf_ln(s, GIT_COLOR_NORMAL, _("No changes"));
37d07f8f
JH
1509 else if (s->nowarn)
1510 ; /* nothing */
50bd8b7e 1511 else if (s->workdir_dirty) {
6a964f57 1512 if (s->hints)
50bd8b7e
NTND
1513 printf(_("no changes added to commit "
1514 "(use \"git add\" and/or \"git commit -a\")\n"));
1515 else
1516 printf(_("no changes added to commit\n"));
1517 } else if (s->untracked.nr) {
6a964f57 1518 if (s->hints)
50bd8b7e
NTND
1519 printf(_("nothing added to commit but untracked files "
1520 "present (use \"git add\" to track)\n"));
1521 else
1522 printf(_("nothing added to commit but untracked files present\n"));
1523 } else if (s->is_initial) {
6a964f57 1524 if (s->hints)
50bd8b7e
NTND
1525 printf(_("nothing to commit (create/copy files "
1526 "and use \"git add\" to track)\n"));
1527 else
1528 printf(_("nothing to commit\n"));
1529 } else if (!s->show_untracked_files) {
6a964f57 1530 if (s->hints)
50bd8b7e
NTND
1531 printf(_("nothing to commit (use -u to show untracked files)\n"));
1532 else
1533 printf(_("nothing to commit\n"));
1534 } else
1535 printf(_("nothing to commit, working directory clean\n"));
6e458bf6 1536 }
c91f0d92 1537}
84dbe7b8 1538
3207a3a2 1539static void wt_shortstatus_unmerged(struct string_list_item *it,
84dbe7b8
MG
1540 struct wt_status *s)
1541{
1542 struct wt_status_change_data *d = it->util;
1543 const char *how = "??";
1544
1545 switch (d->stagemask) {
1546 case 1: how = "DD"; break; /* both deleted */
1547 case 2: how = "AU"; break; /* added by us */
1548 case 3: how = "UD"; break; /* deleted by them */
1549 case 4: how = "UA"; break; /* added by them */
1550 case 5: how = "DU"; break; /* deleted by us */
1551 case 6: how = "AA"; break; /* both added */
1552 case 7: how = "UU"; break; /* both modified */
1553 }
3fe2a894 1554 color_fprintf(s->fp, color(WT_STATUS_UNMERGED, s), "%s", how);
3207a3a2 1555 if (s->null_termination) {
3fe2a894 1556 fprintf(stdout, " %s%c", it->string, 0);
84dbe7b8
MG
1557 } else {
1558 struct strbuf onebuf = STRBUF_INIT;
1559 const char *one;
39598f99 1560 one = quote_path(it->string, s->prefix, &onebuf);
3fe2a894 1561 printf(" %s\n", one);
84dbe7b8
MG
1562 strbuf_release(&onebuf);
1563 }
1564}
1565
3207a3a2 1566static void wt_shortstatus_status(struct string_list_item *it,
84dbe7b8
MG
1567 struct wt_status *s)
1568{
1569 struct wt_status_change_data *d = it->util;
1570
3fe2a894
MG
1571 if (d->index_status)
1572 color_fprintf(s->fp, color(WT_STATUS_UPDATED, s), "%c", d->index_status);
1573 else
1574 putchar(' ');
1575 if (d->worktree_status)
1576 color_fprintf(s->fp, color(WT_STATUS_CHANGED, s), "%c", d->worktree_status);
1577 else
1578 putchar(' ');
1579 putchar(' ');
3207a3a2 1580 if (s->null_termination) {
84dbe7b8
MG
1581 fprintf(stdout, "%s%c", it->string, 0);
1582 if (d->head_path)
1583 fprintf(stdout, "%s%c", d->head_path, 0);
1584 } else {
1585 struct strbuf onebuf = STRBUF_INIT;
1586 const char *one;
1587 if (d->head_path) {
39598f99 1588 one = quote_path(d->head_path, s->prefix, &onebuf);
dbfdc625
KB
1589 if (*one != '"' && strchr(one, ' ') != NULL) {
1590 putchar('"');
1591 strbuf_addch(&onebuf, '"');
1592 one = onebuf.buf;
1593 }
84dbe7b8
MG
1594 printf("%s -> ", one);
1595 strbuf_release(&onebuf);
1596 }
39598f99 1597 one = quote_path(it->string, s->prefix, &onebuf);
dbfdc625
KB
1598 if (*one != '"' && strchr(one, ' ') != NULL) {
1599 putchar('"');
1600 strbuf_addch(&onebuf, '"');
1601 one = onebuf.buf;
1602 }
84dbe7b8
MG
1603 printf("%s\n", one);
1604 strbuf_release(&onebuf);
1605 }
1606}
1607
3207a3a2 1608static void wt_shortstatus_other(struct string_list_item *it,
2381e39e 1609 struct wt_status *s, const char *sign)
84dbe7b8 1610{
3207a3a2 1611 if (s->null_termination) {
2381e39e 1612 fprintf(stdout, "%s %s%c", sign, it->string, 0);
84dbe7b8
MG
1613 } else {
1614 struct strbuf onebuf = STRBUF_INIT;
1615 const char *one;
39598f99 1616 one = quote_path(it->string, s->prefix, &onebuf);
c1909e72 1617 color_fprintf(s->fp, color(WT_STATUS_UNTRACKED, s), "%s", sign);
3fe2a894 1618 printf(" %s\n", one);
84dbe7b8
MG
1619 strbuf_release(&onebuf);
1620 }
1621}
1622
05a59a08
DKF
1623static void wt_shortstatus_print_tracking(struct wt_status *s)
1624{
1625 struct branch *branch;
1626 const char *header_color = color(WT_STATUS_HEADER, s);
1627 const char *branch_color_local = color(WT_STATUS_LOCAL_BRANCH, s);
1628 const char *branch_color_remote = color(WT_STATUS_REMOTE_BRANCH, s);
1629
1630 const char *base;
1631 const char *branch_name;
1632 int num_ours, num_theirs;
f2e08739 1633 int upstream_is_gone = 0;
05a59a08
DKF
1634
1635 color_fprintf(s->fp, color(WT_STATUS_HEADER, s), "## ");
1636
1637 if (!s->branch)
1638 return;
1639 branch_name = s->branch;
1640
05a59a08 1641 if (s->is_initial)
98f5e24b 1642 color_fprintf(s->fp, header_color, _("Initial commit on "));
f2e08739 1643
baf0a3e4
RS
1644 if (!strcmp(s->branch, "HEAD")) {
1645 color_fprintf(s->fp, color(WT_STATUS_NOBRANCH, s), "%s",
1646 _("HEAD (no branch)"));
1647 goto conclude;
1648 }
1649
c72b49df 1650 skip_prefix(branch_name, "refs/heads/", &branch_name);
05a59a08 1651
8d8325f8 1652 branch = branch_get(branch_name);
f2e08739
JX
1653
1654 color_fprintf(s->fp, branch_color_local, "%s", branch_name);
1655
979cb245 1656 if (stat_tracking_info(branch, &num_ours, &num_theirs, &base) < 0) {
bcf8cc25
RS
1657 if (!base)
1658 goto conclude;
979cb245 1659
f2e08739 1660 upstream_is_gone = 1;
05a59a08
DKF
1661 }
1662
05a59a08 1663 base = shorten_unambiguous_ref(base, 0);
05a59a08
DKF
1664 color_fprintf(s->fp, header_color, "...");
1665 color_fprintf(s->fp, branch_color_remote, "%s", base);
0e32d4b3 1666 free((char *)base);
05a59a08 1667
bcf8cc25
RS
1668 if (!upstream_is_gone && !num_ours && !num_theirs)
1669 goto conclude;
f223459b 1670
7a76c28f
MM
1671#define LABEL(string) (s->no_gettext ? (string) : _(string))
1672
05a59a08 1673 color_fprintf(s->fp, header_color, " [");
f2e08739 1674 if (upstream_is_gone) {
7a76c28f 1675 color_fprintf(s->fp, header_color, LABEL(N_("gone")));
f2e08739 1676 } else if (!num_ours) {
7a76c28f 1677 color_fprintf(s->fp, header_color, LABEL(N_("behind ")));
05a59a08
DKF
1678 color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
1679 } else if (!num_theirs) {
7a76c28f 1680 color_fprintf(s->fp, header_color, LABEL(N_(("ahead "))));
05a59a08
DKF
1681 color_fprintf(s->fp, branch_color_local, "%d", num_ours);
1682 } else {
7a76c28f 1683 color_fprintf(s->fp, header_color, LABEL(N_(("ahead "))));
05a59a08 1684 color_fprintf(s->fp, branch_color_local, "%d", num_ours);
7a76c28f 1685 color_fprintf(s->fp, header_color, ", %s", LABEL(N_("behind ")));
05a59a08
DKF
1686 color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
1687 }
1688
a5985237 1689 color_fprintf(s->fp, header_color, "]");
bcf8cc25 1690 conclude:
a5985237 1691 fputc(s->null_termination ? '\0' : '\n', s->fp);
05a59a08
DKF
1692}
1693
d4a6bf1f 1694void wt_shortstatus_print(struct wt_status *s)
84dbe7b8
MG
1695{
1696 int i;
05a59a08 1697
d4a6bf1f 1698 if (s->show_branch)
05a59a08
DKF
1699 wt_shortstatus_print_tracking(s);
1700
84dbe7b8
MG
1701 for (i = 0; i < s->change.nr; i++) {
1702 struct wt_status_change_data *d;
1703 struct string_list_item *it;
1704
1705 it = &(s->change.items[i]);
1706 d = it->util;
1707 if (d->stagemask)
3207a3a2 1708 wt_shortstatus_unmerged(it, s);
84dbe7b8 1709 else
3207a3a2 1710 wt_shortstatus_status(it, s);
84dbe7b8
MG
1711 }
1712 for (i = 0; i < s->untracked.nr; i++) {
1713 struct string_list_item *it;
1714
1715 it = &(s->untracked.items[i]);
3207a3a2 1716 wt_shortstatus_other(it, s, "??");
2381e39e
JH
1717 }
1718 for (i = 0; i < s->ignored.nr; i++) {
1719 struct string_list_item *it;
1720
1721 it = &(s->ignored.items[i]);
3207a3a2 1722 wt_shortstatus_other(it, s, "!!");
84dbe7b8
MG
1723 }
1724}
4a7cc2fd 1725
3207a3a2 1726void wt_porcelain_print(struct wt_status *s)
4a7cc2fd
JK
1727{
1728 s->use_color = 0;
8661768f
JK
1729 s->relative_paths = 0;
1730 s->prefix = NULL;
7a76c28f 1731 s->no_gettext = 1;
d4a6bf1f 1732 wt_shortstatus_print(s);
4a7cc2fd 1733}