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