Merge branch 'bc/hash-independent-tests-part-5'
[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"
fd84986f 19#include "lockfile.h"
4a72486d 20#include "sequencer.h"
c91f0d92 21
0a53561a
JH
22#define AB_DELAY_WARNING_IN_MS (2 * 1000)
23
983dc697 24static const char cut_line[] =
1a72cfd7
JL
25"------------------------ >8 ------------------------\n";
26
23900a96 27static char default_wt_status_colors[][COLOR_MAXLEN] = {
dc6ebd4c
AL
28 GIT_COLOR_NORMAL, /* WT_STATUS_HEADER */
29 GIT_COLOR_GREEN, /* WT_STATUS_UPDATED */
30 GIT_COLOR_RED, /* WT_STATUS_CHANGED */
31 GIT_COLOR_RED, /* WT_STATUS_UNTRACKED */
32 GIT_COLOR_RED, /* WT_STATUS_NOBRANCH */
4d4d5726 33 GIT_COLOR_RED, /* WT_STATUS_UNMERGED */
05a59a08
DKF
34 GIT_COLOR_GREEN, /* WT_STATUS_LOCAL_BRANCH */
35 GIT_COLOR_RED, /* WT_STATUS_REMOTE_BRANCH */
148135fc 36 GIT_COLOR_NIL, /* WT_STATUS_ONBRANCH */
c91f0d92 37};
4d229653 38
d249b098 39static const char *color(int slot, struct wt_status *s)
c91f0d92 40{
daa0c3d9
JK
41 const char *c = "";
42 if (want_color(s->use_color))
43 c = s->color_palette[slot];
148135fc
JK
44 if (slot == WT_STATUS_ONBRANCH && color_is_nil(c))
45 c = s->color_palette[WT_STATUS_HEADER];
46 return c;
c91f0d92
JK
47}
48
becbdae8
JN
49static void status_vprintf(struct wt_status *s, int at_bol, const char *color,
50 const char *fmt, va_list ap, const char *trail)
51{
52 struct strbuf sb = STRBUF_INIT;
53 struct strbuf linebuf = STRBUF_INIT;
54 const char *line, *eol;
55
56 strbuf_vaddf(&sb, fmt, ap);
57 if (!sb.len) {
2556b996
MM
58 if (s->display_comment_prefix) {
59 strbuf_addch(&sb, comment_line_char);
60 if (!trail)
61 strbuf_addch(&sb, ' ');
62 }
becbdae8
JN
63 color_print_strbuf(s->fp, color, &sb);
64 if (trail)
65 fprintf(s->fp, "%s", trail);
66 strbuf_release(&sb);
67 return;
68 }
69 for (line = sb.buf; *line; line = eol + 1) {
70 eol = strchr(line, '\n');
71
72 strbuf_reset(&linebuf);
2556b996 73 if (at_bol && s->display_comment_prefix) {
eff80a9f 74 strbuf_addch(&linebuf, comment_line_char);
becbdae8
JN
75 if (*line != '\n' && *line != '\t')
76 strbuf_addch(&linebuf, ' ');
77 }
78 if (eol)
79 strbuf_add(&linebuf, line, eol - line);
80 else
81 strbuf_addstr(&linebuf, line);
82 color_print_strbuf(s->fp, color, &linebuf);
83 if (eol)
84 fprintf(s->fp, "\n");
85 else
86 break;
87 at_bol = 1;
88 }
89 if (trail)
90 fprintf(s->fp, "%s", trail);
91 strbuf_release(&linebuf);
92 strbuf_release(&sb);
93}
94
95void status_printf_ln(struct wt_status *s, const char *color,
96 const char *fmt, ...)
97{
98 va_list ap;
99
100 va_start(ap, fmt);
101 status_vprintf(s, 1, color, fmt, ap, "\n");
102 va_end(ap);
103}
104
105void status_printf(struct wt_status *s, const char *color,
106 const char *fmt, ...)
107{
108 va_list ap;
109
110 va_start(ap, fmt);
111 status_vprintf(s, 1, color, fmt, ap, NULL);
112 va_end(ap);
113}
114
1e24845c
JH
115static void status_printf_more(struct wt_status *s, const char *color,
116 const char *fmt, ...)
becbdae8
JN
117{
118 va_list ap;
119
120 va_start(ap, fmt);
121 status_vprintf(s, 0, color, fmt, ap, NULL);
122 va_end(ap);
123}
124
5b02ca38 125void wt_status_prepare(struct repository *r, struct wt_status *s)
c91f0d92 126{
cc46a743 127 memset(s, 0, sizeof(*s));
5b02ca38 128 s->repo = r;
23900a96
JH
129 memcpy(s->color_palette, default_wt_status_colors,
130 sizeof(default_wt_status_colors));
d249b098
JH
131 s->show_untracked_files = SHOW_NORMAL_UNTRACKED_FILES;
132 s->use_color = -1;
133 s->relative_paths = 1;
efbd4fdf 134 s->branch = resolve_refdup("HEAD", 0, NULL, NULL);
c91f0d92 135 s->reference = "HEAD";
f26a0012 136 s->fp = stdout;
0f729f21 137 s->index_file = get_index_file();
50b7e70f 138 s->change.strdup_strings = 1;
76378683 139 s->untracked.strdup_strings = 1;
6cb3f6b2 140 s->ignored.strdup_strings = 1;
84b4202d 141 s->show_branch = -1; /* unspecified */
c1b5d019 142 s->show_stash = 0;
fd9b544a 143 s->ahead_behind_flags = AHEAD_BEHIND_UNSPECIFIED;
2556b996 144 s->display_comment_prefix = 0;
e8b2dc2c
BP
145 s->detect_rename = -1;
146 s->rename_score = -1;
147 s->rename_limit = -1;
c91f0d92
JK
148}
149
957a0fe2 150static void wt_longstatus_print_unmerged_header(struct wt_status *s)
4d4d5726 151{
96b0ec1a
LK
152 int i;
153 int del_mod_conflict = 0;
154 int both_deleted = 0;
155 int not_deleted = 0;
d249b098 156 const char *c = color(WT_STATUS_HEADER, s);
3c588453 157
355ec7a1 158 status_printf_ln(s, c, _("Unmerged paths:"));
96b0ec1a
LK
159
160 for (i = 0; i < s->change.nr; i++) {
161 struct string_list_item *it = &(s->change.items[i]);
162 struct wt_status_change_data *d = it->util;
163
164 switch (d->stagemask) {
165 case 0:
166 break;
167 case 1:
168 both_deleted = 1;
169 break;
170 case 3:
171 case 5:
172 del_mod_conflict = 1;
173 break;
174 default:
175 not_deleted = 1;
176 break;
177 }
178 }
179
6a964f57 180 if (!s->hints)
edf563fb 181 return;
37f7a857 182 if (s->whence != FROM_COMMIT)
3c588453 183 ;
80f537f7
NTND
184 else if (!s->is_initial) {
185 if (!strcmp(s->reference, "HEAD"))
186 status_printf_ln(s, c,
187 _(" (use \"git restore --staged <file>...\" to unstage)"));
188 else
189 status_printf_ln(s, c,
190 _(" (use \"git restore --source=%s --staged <file>...\" to unstage)"),
191 s->reference);
192 } else
355ec7a1 193 status_printf_ln(s, c, _(" (use \"git rm --cached <file>...\" to unstage)"));
96b0ec1a
LK
194
195 if (!both_deleted) {
196 if (!del_mod_conflict)
197 status_printf_ln(s, c, _(" (use \"git add <file>...\" to mark resolution)"));
198 else
199 status_printf_ln(s, c, _(" (use \"git add/rm <file>...\" as appropriate to mark resolution)"));
200 } else if (!del_mod_conflict && !not_deleted) {
201 status_printf_ln(s, c, _(" (use \"git rm <file>...\" to mark resolution)"));
202 } else {
203 status_printf_ln(s, c, _(" (use \"git add/rm <file>...\" as appropriate to mark resolution)"));
204 }
4d4d5726
JH
205}
206
957a0fe2 207static void wt_longstatus_print_cached_header(struct wt_status *s)
3c1eb9cb 208{
d249b098 209 const char *c = color(WT_STATUS_HEADER, s);
3c588453 210
919a4ce0 211 status_printf_ln(s, c, _("Changes to be committed:"));
6a964f57 212 if (!s->hints)
edf563fb 213 return;
37f7a857 214 if (s->whence != FROM_COMMIT)
3c588453 215 ; /* NEEDSWORK: use "git reset --unresolve"??? */
80f537f7
NTND
216 else if (!s->is_initial) {
217 if (!strcmp(s->reference, "HEAD"))
218 status_printf_ln(s, c
219 , _(" (use \"git restore --staged <file>...\" to unstage)"));
220 else
221 status_printf_ln(s, c,
222 _(" (use \"git restore --source=%s --staged <file>...\" to unstage)"),
223 s->reference);
224 } else
355ec7a1 225 status_printf_ln(s, c, _(" (use \"git rm --cached <file>...\" to unstage)"));
3c1eb9cb
JR
226}
227
957a0fe2
JH
228static void wt_longstatus_print_dirty_header(struct wt_status *s,
229 int has_deleted,
230 int has_dirty_submodules)
c91f0d92 231{
d249b098 232 const char *c = color(WT_STATUS_HEADER, s);
3c588453 233
355ec7a1 234 status_printf_ln(s, c, _("Changes not staged for commit:"));
6a964f57 235 if (!s->hints)
edf563fb 236 return;
bb914b14 237 if (!has_deleted)
355ec7a1 238 status_printf_ln(s, c, _(" (use \"git add <file>...\" to update what will be committed)"));
bb914b14 239 else
355ec7a1 240 status_printf_ln(s, c, _(" (use \"git add/rm <file>...\" to update what will be committed)"));
80f537f7 241 status_printf_ln(s, c, _(" (use \"git restore <file>...\" to discard changes in working directory)"));
9297f77e 242 if (has_dirty_submodules)
355ec7a1 243 status_printf_ln(s, c, _(" (commit or discard the untracked or modified content in submodules)"));
bb914b14
AM
244}
245
957a0fe2
JH
246static void wt_longstatus_print_other_header(struct wt_status *s,
247 const char *what,
248 const char *how)
bb914b14 249{
d249b098 250 const char *c = color(WT_STATUS_HEADER, s);
50bd8b7e 251 status_printf_ln(s, c, "%s:", what);
6a964f57 252 if (!s->hints)
edf563fb 253 return;
355ec7a1 254 status_printf_ln(s, c, _(" (use \"git %s <file>...\" to include in what will be committed)"), how);
c91f0d92
JK
255}
256
957a0fe2 257static void wt_longstatus_print_trailer(struct wt_status *s)
c91f0d92 258{
7d7d6802 259 status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", "");
c91f0d92
JK
260}
261
a734d0b1 262#define quote_path quote_path_relative
3a946802 263
8f17f5b2 264static const char *wt_status_unmerged_status_string(int stagemask)
4d4d5726 265{
8f17f5b2
JN
266 switch (stagemask) {
267 case 1:
268 return _("both deleted:");
269 case 2:
270 return _("added by us:");
271 case 3:
272 return _("deleted by them:");
273 case 4:
274 return _("added by them:");
275 case 5:
276 return _("deleted by us:");
277 case 6:
278 return _("both added:");
279 case 7:
280 return _("both modified:");
281 default:
033abf97 282 BUG("unhandled unmerged status %x", stagemask);
4d4d5726 283 }
4d4d5726
JH
284}
285
3651e45c
NTND
286static const char *wt_status_diff_status_string(int status)
287{
288 switch (status) {
289 case DIFF_STATUS_ADDED:
d52cb576 290 return _("new file:");
3651e45c 291 case DIFF_STATUS_COPIED:
d52cb576 292 return _("copied:");
3651e45c 293 case DIFF_STATUS_DELETED:
d52cb576 294 return _("deleted:");
3651e45c 295 case DIFF_STATUS_MODIFIED:
d52cb576 296 return _("modified:");
3651e45c 297 case DIFF_STATUS_RENAMED:
d52cb576 298 return _("renamed:");
3651e45c 299 case DIFF_STATUS_TYPE_CHANGED:
d52cb576 300 return _("typechange:");
3651e45c 301 case DIFF_STATUS_UNKNOWN:
d52cb576 302 return _("unknown:");
3651e45c 303 case DIFF_STATUS_UNMERGED:
d52cb576 304 return _("unmerged:");
3651e45c
NTND
305 default:
306 return NULL;
307 }
308}
309
335e8250
JN
310static int maxwidth(const char *(*label)(int), int minval, int maxval)
311{
312 int result = 0, i;
313
314 for (i = minval; i <= maxval; i++) {
315 const char *s = label(i);
316 int len = s ? utf8_strwidth(s) : 0;
317 if (len > result)
318 result = len;
319 }
320 return result;
321}
322
957a0fe2
JH
323static void wt_longstatus_print_unmerged_data(struct wt_status *s,
324 struct string_list_item *it)
8f17f5b2
JN
325{
326 const char *c = color(WT_STATUS_UNMERGED, s);
327 struct wt_status_change_data *d = it->util;
328 struct strbuf onebuf = STRBUF_INIT;
329 static char *padding;
330 static int label_width;
331 const char *one, *how;
332 int len;
333
334 if (!padding) {
335 label_width = maxwidth(wt_status_unmerged_status_string, 1, 7);
336 label_width += strlen(" ");
8f17f5b2
JN
337 padding = xmallocz(label_width);
338 memset(padding, ' ', label_width);
339 }
340
341 one = quote_path(it->string, s->prefix, &onebuf);
342 status_printf(s, color(WT_STATUS_HEADER, s), "\t");
343
344 how = wt_status_unmerged_status_string(d->stagemask);
345 len = label_width - utf8_strwidth(how);
346 status_printf_more(s, c, "%s%.*s%s\n", how, len, padding, one);
347 strbuf_release(&onebuf);
348}
349
957a0fe2
JH
350static void wt_longstatus_print_change_data(struct wt_status *s,
351 int change_type,
352 struct string_list_item *it)
c91f0d92 353{
50b7e70f 354 struct wt_status_change_data *d = it->util;
d249b098 355 const char *c = color(change_type, s);
b8527d5f 356 int status;
50b7e70f
JH
357 char *one_name;
358 char *two_name;
3a946802 359 const char *one, *two;
f285a2d7 360 struct strbuf onebuf = STRBUF_INIT, twobuf = STRBUF_INIT;
9297f77e 361 struct strbuf extra = STRBUF_INIT;
3651e45c 362 static char *padding;
d52cb576 363 static int label_width;
3651e45c
NTND
364 const char *what;
365 int len;
366
367 if (!padding) {
335e8250
JN
368 /* If DIFF_STATUS_* uses outside the range [A..Z], we're in trouble */
369 label_width = maxwidth(wt_status_diff_status_string, 'A', 'Z');
d52cb576
JH
370 label_width += strlen(" ");
371 padding = xmallocz(label_width);
372 memset(padding, ' ', label_width);
3651e45c 373 }
3a946802 374
50b7e70f
JH
375 one_name = two_name = it->string;
376 switch (change_type) {
377 case WT_STATUS_UPDATED:
378 status = d->index_status;
50b7e70f
JH
379 break;
380 case WT_STATUS_CHANGED:
9297f77e
JL
381 if (d->new_submodule_commits || d->dirty_submodule) {
382 strbuf_addstr(&extra, " (");
383 if (d->new_submodule_commits)
a22ae753 384 strbuf_addstr(&extra, _("new commits, "));
9297f77e 385 if (d->dirty_submodule & DIRTY_SUBMODULE_MODIFIED)
a22ae753 386 strbuf_addstr(&extra, _("modified content, "));
9297f77e 387 if (d->dirty_submodule & DIRTY_SUBMODULE_UNTRACKED)
a22ae753 388 strbuf_addstr(&extra, _("untracked content, "));
9297f77e
JL
389 strbuf_setlen(&extra, extra.len - 2);
390 strbuf_addch(&extra, ')');
391 }
50b7e70f
JH
392 status = d->worktree_status;
393 break;
b8527d5f 394 default:
033abf97 395 BUG("unhandled change_type %d in wt_longstatus_print_change_data",
b8527d5f 396 change_type);
50b7e70f
JH
397 }
398
176ea747
NTND
399 /*
400 * Only pick up the rename it's relevant. If the rename is for
401 * the changed section and we're printing the updated section,
402 * ignore it.
403 */
404 if (d->rename_status == status)
405 one_name = d->rename_source;
406
39598f99
JX
407 one = quote_path(one_name, s->prefix, &onebuf);
408 two = quote_path(two_name, s->prefix, &twobuf);
3a946802 409
b926c0d1 410 status_printf(s, color(WT_STATUS_HEADER, s), "\t");
3651e45c
NTND
411 what = wt_status_diff_status_string(status);
412 if (!what)
033abf97 413 BUG("unhandled diff status %c", status);
d52cb576 414 len = label_width - utf8_strwidth(what);
3651e45c 415 assert(len >= 0);
5134ccde 416 if (one_name != two_name)
d52cb576 417 status_printf_more(s, c, "%s%.*s%s -> %s",
3651e45c
NTND
418 what, len, padding, one, two);
419 else
d52cb576 420 status_printf_more(s, c, "%s%.*s%s",
3651e45c 421 what, len, padding, one);
9297f77e 422 if (extra.len) {
b926c0d1 423 status_printf_more(s, color(WT_STATUS_HEADER, s), "%s", extra.buf);
9297f77e
JL
424 strbuf_release(&extra);
425 }
b926c0d1 426 status_printf_more(s, GIT_COLOR_NORMAL, "\n");
367c9886
JS
427 strbuf_release(&onebuf);
428 strbuf_release(&twobuf);
c91f0d92
JK
429}
430
98bc94ec
NTND
431static char short_submodule_status(struct wt_status_change_data *d)
432{
dd6962dd
SB
433 if (d->new_submodule_commits)
434 return 'M';
435 if (d->dirty_submodule & DIRTY_SUBMODULE_MODIFIED)
436 return 'm';
437 if (d->dirty_submodule & DIRTY_SUBMODULE_UNTRACKED)
438 return '?';
439 return d->worktree_status;
440}
441
50b7e70f
JH
442static void wt_status_collect_changed_cb(struct diff_queue_struct *q,
443 struct diff_options *options,
444 void *data)
c91f0d92
JK
445{
446 struct wt_status *s = data;
c91f0d92 447 int i;
50b7e70f
JH
448
449 if (!q->nr)
450 return;
451 s->workdir_dirty = 1;
c91f0d92 452 for (i = 0; i < q->nr; i++) {
50b7e70f
JH
453 struct diff_filepair *p;
454 struct string_list_item *it;
455 struct wt_status_change_data *d;
456
457 p = q->queue[i];
176ea747 458 it = string_list_insert(&s->change, p->two->path);
50b7e70f
JH
459 d = it->util;
460 if (!d) {
461 d = xcalloc(1, sizeof(*d));
462 it->util = d;
c91f0d92 463 }
50b7e70f
JH
464 if (!d->worktree_status)
465 d->worktree_status = p->status;
dd6962dd
SB
466 if (S_ISGITLINK(p->two->mode)) {
467 d->dirty_submodule = p->two->dirty_submodule;
4a7e27e9
JK
468 d->new_submodule_commits = !oideq(&p->one->oid,
469 &p->two->oid);
dd6962dd
SB
470 if (s->status_format == STATUS_FORMAT_SHORT)
471 d->worktree_status = short_submodule_status(d);
472 }
1ecdecce
JH
473
474 switch (p->status) {
475 case DIFF_STATUS_ADDED:
425a28e0 476 d->mode_worktree = p->two->mode;
1ecdecce
JH
477 break;
478
479 case DIFF_STATUS_DELETED:
480 d->mode_index = p->one->mode;
481 oidcpy(&d->oid_index, &p->one->oid);
482 /* mode_worktree is zero for a delete. */
483 break;
484
176ea747
NTND
485 case DIFF_STATUS_COPIED:
486 case DIFF_STATUS_RENAMED:
487 if (d->rename_status)
033abf97 488 BUG("multiple renames on the same target? how?");
176ea747
NTND
489 d->rename_source = xstrdup(p->one->path);
490 d->rename_score = p->score * 100 / MAX_SCORE;
491 d->rename_status = p->status;
492 /* fallthru */
1ecdecce
JH
493 case DIFF_STATUS_MODIFIED:
494 case DIFF_STATUS_TYPE_CHANGED:
495 case DIFF_STATUS_UNMERGED:
496 d->mode_index = p->one->mode;
497 d->mode_worktree = p->two->mode;
498 oidcpy(&d->oid_index, &p->one->oid);
499 break;
500
ea56f977 501 default:
033abf97 502 BUG("unhandled diff-files status '%c'", p->status);
1ecdecce
JH
503 break;
504 }
505
c91f0d92 506 }
c91f0d92
JK
507}
508
5b02ca38 509static int unmerged_mask(struct index_state *istate, const char *path)
4d4d5726
JH
510{
511 int pos, mask;
9c5e6c80 512 const struct cache_entry *ce;
4d4d5726 513
5b02ca38 514 pos = index_name_pos(istate, path, strlen(path));
4d4d5726
JH
515 if (0 <= pos)
516 return 0;
517
518 mask = 0;
519 pos = -pos-1;
5b02ca38
NTND
520 while (pos < istate->cache_nr) {
521 ce = istate->cache[pos++];
4d4d5726
JH
522 if (strcmp(ce->name, path) || !ce_stage(ce))
523 break;
524 mask |= (1 << (ce_stage(ce) - 1));
525 }
526 return mask;
527}
528
50b7e70f
JH
529static void wt_status_collect_updated_cb(struct diff_queue_struct *q,
530 struct diff_options *options,
531 void *data)
c91f0d92 532{
6e458bf6 533 struct wt_status *s = data;
c91f0d92 534 int i;
50b7e70f
JH
535
536 for (i = 0; i < q->nr; i++) {
537 struct diff_filepair *p;
538 struct string_list_item *it;
539 struct wt_status_change_data *d;
540
541 p = q->queue[i];
78a395d3 542 it = string_list_insert(&s->change, p->two->path);
50b7e70f
JH
543 d = it->util;
544 if (!d) {
545 d = xcalloc(1, sizeof(*d));
546 it->util = d;
547 }
548 if (!d->index_status)
549 d->index_status = p->status;
550 switch (p->status) {
1ecdecce
JH
551 case DIFF_STATUS_ADDED:
552 /* Leave {mode,oid}_head zero for an add. */
553 d->mode_index = p->two->mode;
554 oidcpy(&d->oid_index, &p->two->oid);
f3bd35fa 555 s->committable = 1;
1ecdecce
JH
556 break;
557 case DIFF_STATUS_DELETED:
558 d->mode_head = p->one->mode;
559 oidcpy(&d->oid_head, &p->one->oid);
f3bd35fa 560 s->committable = 1;
1ecdecce
JH
561 /* Leave {mode,oid}_index zero for a delete. */
562 break;
563
50b7e70f
JH
564 case DIFF_STATUS_COPIED:
565 case DIFF_STATUS_RENAMED:
176ea747 566 if (d->rename_status)
033abf97 567 BUG("multiple renames on the same target? how?");
5134ccde
NTND
568 d->rename_source = xstrdup(p->one->path);
569 d->rename_score = p->score * 100 / MAX_SCORE;
570 d->rename_status = p->status;
1ecdecce
JH
571 /* fallthru */
572 case DIFF_STATUS_MODIFIED:
573 case DIFF_STATUS_TYPE_CHANGED:
574 d->mode_head = p->one->mode;
575 d->mode_index = p->two->mode;
576 oidcpy(&d->oid_head, &p->one->oid);
577 oidcpy(&d->oid_index, &p->two->oid);
f3bd35fa 578 s->committable = 1;
50b7e70f 579 break;
4d4d5726 580 case DIFF_STATUS_UNMERGED:
5b02ca38
NTND
581 d->stagemask = unmerged_mask(s->repo->index,
582 p->two->path);
1ecdecce
JH
583 /*
584 * Don't bother setting {mode,oid}_{head,index} since the print
585 * code will output the stage values directly and not use the
586 * values in these fields.
587 */
4d4d5726 588 break;
ea56f977
NTND
589
590 default:
033abf97 591 BUG("unhandled diff-index status '%c'", p->status);
ea56f977 592 break;
50b7e70f 593 }
6e458bf6 594 }
c91f0d92
JK
595}
596
50b7e70f 597static void wt_status_collect_changes_worktree(struct wt_status *s)
c91f0d92
JK
598{
599 struct rev_info rev;
50b7e70f 600
5b02ca38 601 repo_init_revisions(s->repo, &rev, NULL);
50b7e70f
JH
602 setup_revisions(0, NULL, &rev, NULL);
603 rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
0d1e0e78 604 rev.diffopt.flags.dirty_submodules = 1;
425a28e0 605 rev.diffopt.ita_invisible_in_index = 1;
3bfc4504 606 if (!s->show_untracked_files)
0d1e0e78 607 rev.diffopt.flags.ignore_untracked_in_submodules = 1;
aee9c7d6 608 if (s->ignore_submodule_arg) {
0d1e0e78 609 rev.diffopt.flags.override_submodule_config = 1;
46a958b3 610 handle_ignore_submodules_arg(&rev.diffopt, s->ignore_submodule_arg);
c4c42f2c 611 }
50b7e70f
JH
612 rev.diffopt.format_callback = wt_status_collect_changed_cb;
613 rev.diffopt.format_callback_data = s;
e8b2dc2c
BP
614 rev.diffopt.detect_rename = s->detect_rename >= 0 ? s->detect_rename : rev.diffopt.detect_rename;
615 rev.diffopt.rename_limit = s->rename_limit >= 0 ? s->rename_limit : rev.diffopt.rename_limit;
616 rev.diffopt.rename_score = s->rename_score >= 0 ? s->rename_score : rev.diffopt.rename_score;
15b55ae0 617 copy_pathspec(&rev.prune_data, &s->pathspec);
50b7e70f
JH
618 run_diff_files(&rev, 0);
619}
620
621static void wt_status_collect_changes_index(struct wt_status *s)
622{
623 struct rev_info rev;
32962c9b 624 struct setup_revision_opt opt;
50b7e70f 625
5b02ca38 626 repo_init_revisions(s->repo, &rev, NULL);
32962c9b 627 memset(&opt, 0, sizeof(opt));
f2e51195 628 opt.def = s->is_initial ? empty_tree_oid_hex() : s->reference;
32962c9b
JH
629 setup_revisions(0, NULL, &rev, &opt);
630
0d1e0e78 631 rev.diffopt.flags.override_submodule_config = 1;
425a28e0 632 rev.diffopt.ita_invisible_in_index = 1;
aee9c7d6 633 if (s->ignore_submodule_arg) {
46a958b3 634 handle_ignore_submodules_arg(&rev.diffopt, s->ignore_submodule_arg);
1d2f393a
JL
635 } else {
636 /*
637 * Unless the user did explicitly request a submodule ignore
638 * mode by passing a command line option we do not ignore any
639 * changed submodule SHA-1s when comparing index and HEAD, no
640 * matter what is configured. Otherwise the user won't be
641 * shown any submodules she manually added (and which are
642 * staged to be committed), which would be really confusing.
643 */
644 handle_ignore_submodules_arg(&rev.diffopt, "dirty");
aee9c7d6 645 }
46a958b3 646
c91f0d92 647 rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
50b7e70f 648 rev.diffopt.format_callback = wt_status_collect_updated_cb;
c91f0d92 649 rev.diffopt.format_callback_data = s;
e8b2dc2c
BP
650 rev.diffopt.detect_rename = s->detect_rename >= 0 ? s->detect_rename : rev.diffopt.detect_rename;
651 rev.diffopt.rename_limit = s->rename_limit >= 0 ? s->rename_limit : rev.diffopt.rename_limit;
652 rev.diffopt.rename_score = s->rename_score >= 0 ? s->rename_score : rev.diffopt.rename_score;
15b55ae0 653 copy_pathspec(&rev.prune_data, &s->pathspec);
c91f0d92
JK
654 run_diff_index(&rev, 1);
655}
656
50b7e70f
JH
657static void wt_status_collect_changes_initial(struct wt_status *s)
658{
5b02ca38 659 struct index_state *istate = s->repo->index;
50b7e70f
JH
660 int i;
661
5b02ca38 662 for (i = 0; i < istate->cache_nr; i++) {
50b7e70f
JH
663 struct string_list_item *it;
664 struct wt_status_change_data *d;
5b02ca38 665 const struct cache_entry *ce = istate->cache[i];
50b7e70f 666
5b02ca38 667 if (!ce_path_match(istate, ce, &s->pathspec, NULL))
76e2f7ce 668 continue;
425a28e0
NTND
669 if (ce_intent_to_add(ce))
670 continue;
78a395d3 671 it = string_list_insert(&s->change, ce->name);
50b7e70f
JH
672 d = it->util;
673 if (!d) {
674 d = xcalloc(1, sizeof(*d));
675 it->util = d;
676 }
4d4d5726 677 if (ce_stage(ce)) {
50b7e70f 678 d->index_status = DIFF_STATUS_UNMERGED;
4d4d5726 679 d->stagemask |= (1 << (ce_stage(ce) - 1));
1ecdecce
JH
680 /*
681 * Don't bother setting {mode,oid}_{head,index} since the print
682 * code will output the stage values directly and not use the
683 * values in these fields.
684 */
f3bd35fa 685 s->committable = 1;
1ecdecce 686 } else {
50b7e70f 687 d->index_status = DIFF_STATUS_ADDED;
1ecdecce
JH
688 /* Leave {mode,oid}_head zero for adds. */
689 d->mode_index = ce->ce_mode;
8694769f 690 oidcpy(&d->oid_index, &ce->oid);
f3bd35fa 691 s->committable = 1;
1ecdecce 692 }
50b7e70f
JH
693 }
694}
695
76378683
JH
696static void wt_status_collect_untracked(struct wt_status *s)
697{
698 int i;
699 struct dir_struct dir;
132d41e6 700 uint64_t t_begin = getnanotime();
5b02ca38 701 struct index_state *istate = s->repo->index;
76378683
JH
702
703 if (!s->show_untracked_files)
704 return;
6a38ef2c 705
76378683
JH
706 memset(&dir, 0, sizeof(dir));
707 if (s->show_untracked_files != SHOW_ALL_UNTRACKED_FILES)
708 dir.flags |=
709 DIR_SHOW_OTHER_DIRECTORIES | DIR_HIDE_EMPTY_DIRECTORIES;
eec0f7f2 710 if (s->show_ignored_mode) {
0aaf62b6 711 dir.flags |= DIR_SHOW_IGNORED_TOO;
eec0f7f2
JM
712
713 if (s->show_ignored_mode == SHOW_MATCHING_IGNORED)
714 dir.flags |= DIR_SHOW_IGNORED_TOO_MODE_MATCHING;
715 } else {
5b02ca38 716 dir.untracked = istate->untracked;
eec0f7f2
JM
717 }
718
76378683
JH
719 setup_standard_excludes(&dir);
720
5b02ca38 721 fill_directory(&dir, istate, &s->pathspec);
0aaf62b6 722
eeefa7c9 723 for (i = 0; i < dir.nr; i++) {
76378683 724 struct dir_entry *ent = dir.entries[i];
5b02ca38
NTND
725 if (index_name_is_other(istate, ent->name, ent->len) &&
726 dir_path_match(istate, ent, &s->pathspec, 0, NULL))
b822423e 727 string_list_insert(&s->untracked, ent->name);
f5b26b1d 728 free(ent);
76378683 729 }
f5b26b1d 730
0aaf62b6
KB
731 for (i = 0; i < dir.ignored_nr; i++) {
732 struct dir_entry *ent = dir.ignored[i];
5b02ca38
NTND
733 if (index_name_is_other(istate, ent->name, ent->len) &&
734 dir_path_match(istate, ent, &s->pathspec, 0, NULL))
0aaf62b6
KB
735 string_list_insert(&s->ignored, ent->name);
736 free(ent);
6cb3f6b2
JH
737 }
738
f5b26b1d 739 free(dir.entries);
0aaf62b6
KB
740 free(dir.ignored);
741 clear_directory(&dir);
6a38ef2c 742
132d41e6
KB
743 if (advice_status_u_option)
744 s->untracked_in_ms = (getnanotime() - t_begin) / 1000000;
76378683
JH
745}
746
c01d8f94
SS
747static int has_unmerged(struct wt_status *s)
748{
749 int i;
750
751 for (i = 0; i < s->change.nr; i++) {
752 struct wt_status_change_data *d;
753 d = s->change.items[i].util;
754 if (d->stagemask)
755 return 1;
756 }
757 return 0;
758}
759
76378683 760void wt_status_collect(struct wt_status *s)
50b7e70f 761{
942b2740 762 trace2_region_enter("status", "worktrees", s->repo);
50b7e70f 763 wt_status_collect_changes_worktree(s);
942b2740
JH
764 trace2_region_leave("status", "worktrees", s->repo);
765
766 if (s->is_initial) {
767 trace2_region_enter("status", "initial", s->repo);
50b7e70f 768 wt_status_collect_changes_initial(s);
942b2740
JH
769 trace2_region_leave("status", "initial", s->repo);
770 } else {
771 trace2_region_enter("status", "index", s->repo);
50b7e70f 772 wt_status_collect_changes_index(s);
942b2740
JH
773 trace2_region_leave("status", "index", s->repo);
774 }
775
776 trace2_region_enter("status", "untracked", s->repo);
76378683 777 wt_status_collect_untracked(s);
942b2740 778 trace2_region_leave("status", "untracked", s->repo);
f3bd35fa 779
78845457 780 wt_status_get_state(s->repo, &s->state, s->branch && !strcmp(s->branch, "HEAD"));
73ba5d78 781 if (s->state.merge_in_progress && !has_unmerged(s))
f3bd35fa 782 s->committable = 1;
50b7e70f
JH
783}
784
73ba5d78
SS
785void wt_status_collect_free_buffers(struct wt_status *s)
786{
787 free(s->state.branch);
788 free(s->state.onto);
789 free(s->state.detached_from);
50b7e70f
JH
790}
791
957a0fe2 792static void wt_longstatus_print_unmerged(struct wt_status *s)
4d4d5726
JH
793{
794 int shown_header = 0;
795 int i;
796
797 for (i = 0; i < s->change.nr; i++) {
798 struct wt_status_change_data *d;
799 struct string_list_item *it;
800 it = &(s->change.items[i]);
801 d = it->util;
802 if (!d->stagemask)
803 continue;
804 if (!shown_header) {
957a0fe2 805 wt_longstatus_print_unmerged_header(s);
4d4d5726
JH
806 shown_header = 1;
807 }
957a0fe2 808 wt_longstatus_print_unmerged_data(s, it);
4d4d5726
JH
809 }
810 if (shown_header)
957a0fe2 811 wt_longstatus_print_trailer(s);
4d4d5726
JH
812
813}
814
957a0fe2 815static void wt_longstatus_print_updated(struct wt_status *s)
50b7e70f
JH
816{
817 int shown_header = 0;
818 int i;
819
820 for (i = 0; i < s->change.nr; i++) {
821 struct wt_status_change_data *d;
822 struct string_list_item *it;
823 it = &(s->change.items[i]);
824 d = it->util;
825 if (!d->index_status ||
826 d->index_status == DIFF_STATUS_UNMERGED)
827 continue;
828 if (!shown_header) {
957a0fe2 829 wt_longstatus_print_cached_header(s);
50b7e70f
JH
830 shown_header = 1;
831 }
957a0fe2 832 wt_longstatus_print_change_data(s, WT_STATUS_UPDATED, it);
50b7e70f
JH
833 }
834 if (shown_header)
957a0fe2 835 wt_longstatus_print_trailer(s);
50b7e70f
JH
836}
837
838/*
839 * -1 : has delete
840 * 0 : no change
841 * 1 : some change but no delete
842 */
9297f77e
JL
843static int wt_status_check_worktree_changes(struct wt_status *s,
844 int *dirty_submodules)
50b7e70f
JH
845{
846 int i;
847 int changes = 0;
848
9297f77e
JL
849 *dirty_submodules = 0;
850
50b7e70f
JH
851 for (i = 0; i < s->change.nr; i++) {
852 struct wt_status_change_data *d;
853 d = s->change.items[i].util;
4d4d5726
JH
854 if (!d->worktree_status ||
855 d->worktree_status == DIFF_STATUS_UNMERGED)
50b7e70f 856 continue;
9297f77e
JL
857 if (!changes)
858 changes = 1;
859 if (d->dirty_submodule)
860 *dirty_submodules = 1;
50b7e70f 861 if (d->worktree_status == DIFF_STATUS_DELETED)
9297f77e 862 changes = -1;
50b7e70f
JH
863 }
864 return changes;
865}
866
957a0fe2 867static void wt_longstatus_print_changed(struct wt_status *s)
c91f0d92 868{
9297f77e
JL
869 int i, dirty_submodules;
870 int worktree_changes = wt_status_check_worktree_changes(s, &dirty_submodules);
50b7e70f
JH
871
872 if (!worktree_changes)
873 return;
874
957a0fe2 875 wt_longstatus_print_dirty_header(s, worktree_changes < 0, dirty_submodules);
50b7e70f
JH
876
877 for (i = 0; i < s->change.nr; i++) {
878 struct wt_status_change_data *d;
879 struct string_list_item *it;
880 it = &(s->change.items[i]);
881 d = it->util;
4d4d5726
JH
882 if (!d->worktree_status ||
883 d->worktree_status == DIFF_STATUS_UNMERGED)
50b7e70f 884 continue;
957a0fe2 885 wt_longstatus_print_change_data(s, WT_STATUS_CHANGED, it);
50b7e70f 886 }
957a0fe2 887 wt_longstatus_print_trailer(s);
c91f0d92
JK
888}
889
c1b5d019
LB
890static int stash_count_refs(struct object_id *ooid, struct object_id *noid,
891 const char *email, timestamp_t timestamp, int tz,
892 const char *message, void *cb_data)
893{
894 int *c = cb_data;
895 (*c)++;
896 return 0;
897}
898
899static void wt_longstatus_print_stash_summary(struct wt_status *s)
900{
901 int stash_count = 0;
902
903 for_each_reflog_ent("refs/stash", stash_count_refs, &stash_count);
904 if (stash_count > 0)
905 status_printf_ln(s, GIT_COLOR_NORMAL,
906 Q_("Your stash currently has %d entry",
907 "Your stash currently has %d entries", stash_count),
908 stash_count);
909}
910
957a0fe2 911static void wt_longstatus_print_submodule_summary(struct wt_status *s, int uncommitted)
ac8d5afc 912{
d3180279 913 struct child_process sm_summary = CHILD_PROCESS_INIT;
3ba7407b
MM
914 struct strbuf cmd_stdout = STRBUF_INIT;
915 struct strbuf summary = STRBUF_INIT;
916 char *summary_content;
ac8d5afc 917
a9154590
RS
918 argv_array_pushf(&sm_summary.env_array, "GIT_INDEX_FILE=%s",
919 s->index_file);
ac8d5afc 920
a2bae2dc
RS
921 argv_array_push(&sm_summary.args, "submodule");
922 argv_array_push(&sm_summary.args, "summary");
923 argv_array_push(&sm_summary.args, uncommitted ? "--files" : "--cached");
924 argv_array_push(&sm_summary.args, "--for-status");
925 argv_array_push(&sm_summary.args, "--summary-limit");
926 argv_array_pushf(&sm_summary.args, "%d", s->submodule_summary);
bb7e32e3 927 if (!uncommitted)
a2bae2dc 928 argv_array_push(&sm_summary.args, s->amend ? "HEAD^" : "HEAD");
bb7e32e3 929
ac8d5afc
PY
930 sm_summary.git_cmd = 1;
931 sm_summary.no_stdin = 1;
3ba7407b 932
5c950e9b 933 capture_command(&sm_summary, &cmd_stdout, 1024);
3ba7407b
MM
934
935 /* prepend header, only if there's an actual output */
d56d966b 936 if (cmd_stdout.len) {
3ba7407b
MM
937 if (uncommitted)
938 strbuf_addstr(&summary, _("Submodules changed but not updated:"));
939 else
940 strbuf_addstr(&summary, _("Submodule changes to be committed:"));
941 strbuf_addstr(&summary, "\n\n");
942 }
943 strbuf_addbuf(&summary, &cmd_stdout);
944 strbuf_release(&cmd_stdout);
945
2556b996 946 if (s->display_comment_prefix) {
d56d966b 947 size_t len;
2556b996
MM
948 summary_content = strbuf_detach(&summary, &len);
949 strbuf_add_commented_lines(&summary, summary_content, len);
950 free(summary_content);
951 }
3ba7407b
MM
952
953 fputs(summary.buf, s->fp);
954 strbuf_release(&summary);
ac8d5afc
PY
955}
956
957a0fe2
JH
957static void wt_longstatus_print_other(struct wt_status *s,
958 struct string_list *l,
959 const char *what,
960 const char *how)
c91f0d92 961{
c91f0d92 962 int i;
f285a2d7 963 struct strbuf buf = STRBUF_INIT;
323d0530
NTND
964 static struct string_list output = STRING_LIST_INIT_DUP;
965 struct column_options copts;
c91f0d92 966
1282988b 967 if (!l->nr)
76378683 968 return;
c91f0d92 969
957a0fe2 970 wt_longstatus_print_other_header(s, what, how);
1b908b6f
JH
971
972 for (i = 0; i < l->nr; i++) {
76378683 973 struct string_list_item *it;
323d0530 974 const char *path;
1b908b6f 975 it = &(l->items[i]);
39598f99 976 path = quote_path(it->string, s->prefix, &buf);
323d0530
NTND
977 if (column_active(s->colopts)) {
978 string_list_append(&output, path);
979 continue;
980 }
b926c0d1
JN
981 status_printf(s, color(WT_STATUS_HEADER, s), "\t");
982 status_printf_more(s, color(WT_STATUS_UNTRACKED, s),
323d0530 983 "%s\n", path);
c91f0d92 984 }
323d0530
NTND
985
986 strbuf_release(&buf);
987 if (!column_active(s->colopts))
2f0f7f1c 988 goto conclude;
323d0530 989
2556b996 990 strbuf_addf(&buf, "%s%s\t%s",
323d0530 991 color(WT_STATUS_HEADER, s),
2556b996 992 s->display_comment_prefix ? "#" : "",
323d0530
NTND
993 color(WT_STATUS_UNTRACKED, s));
994 memset(&copts, 0, sizeof(copts));
995 copts.padding = 1;
996 copts.indent = buf.buf;
997 if (want_color(s->use_color))
998 copts.nl = GIT_COLOR_RESET "\n";
999 print_columns(&output, s->colopts, &copts);
1000 string_list_clear(&output, 0);
367c9886 1001 strbuf_release(&buf);
2f0f7f1c 1002conclude:
7d7d6802 1003 status_printf_ln(s, GIT_COLOR_NORMAL, "%s", "");
c91f0d92
JK
1004}
1005
d76650b8 1006size_t wt_status_locate_end(const char *s, size_t len)
1a72cfd7
JL
1007{
1008 const char *p;
1009 struct strbuf pattern = STRBUF_INIT;
1010
fbfa0973 1011 strbuf_addf(&pattern, "\n%c %s", comment_line_char, cut_line);
d76650b8
BM
1012 if (starts_with(s, pattern.buf + 1))
1013 len = 0;
1014 else if ((p = strstr(s, pattern.buf)))
1015 len = p - s + 1;
1a72cfd7 1016 strbuf_release(&pattern);
d76650b8 1017 return len;
1a72cfd7
JL
1018}
1019
d540b70c 1020void wt_status_append_cut_line(struct strbuf *buf)
fcef9312 1021{
8c4b1a35 1022 const char *explanation = _("Do not modify or remove the line above.\nEverything below it will be ignored.");
d540b70c
DL
1023
1024 strbuf_commented_addf(buf, "%s", cut_line);
1025 strbuf_add_commented_lines(buf, explanation, strlen(explanation));
1026}
1027
1028void wt_status_add_cut_line(FILE *fp)
1029{
fcef9312
NTND
1030 struct strbuf buf = STRBUF_INIT;
1031
d540b70c 1032 wt_status_append_cut_line(&buf);
fcef9312
NTND
1033 fputs(buf.buf, fp);
1034 strbuf_release(&buf);
1035}
1036
957a0fe2 1037static void wt_longstatus_print_verbose(struct wt_status *s)
c91f0d92
JK
1038{
1039 struct rev_info rev;
32962c9b 1040 struct setup_revision_opt opt;
40555000
MG
1041 int dirty_submodules;
1042 const char *c = color(WT_STATUS_HEADER, s);
99a12694 1043
5b02ca38 1044 repo_init_revisions(s->repo, &rev, NULL);
0d1e0e78 1045 rev.diffopt.flags.allow_textconv = 1;
425a28e0 1046 rev.diffopt.ita_invisible_in_index = 1;
32962c9b
JH
1047
1048 memset(&opt, 0, sizeof(opt));
f2e51195 1049 opt.def = s->is_initial ? empty_tree_oid_hex() : s->reference;
32962c9b
JH
1050 setup_revisions(0, NULL, &rev, &opt);
1051
c91f0d92 1052 rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
e8b2dc2c
BP
1053 rev.diffopt.detect_rename = s->detect_rename >= 0 ? s->detect_rename : rev.diffopt.detect_rename;
1054 rev.diffopt.rename_limit = s->rename_limit >= 0 ? s->rename_limit : rev.diffopt.rename_limit;
1055 rev.diffopt.rename_score = s->rename_score >= 0 ? s->rename_score : rev.diffopt.rename_score;
4ba0cb27
KH
1056 rev.diffopt.file = s->fp;
1057 rev.diffopt.close_file = 0;
4f672ad6
JK
1058 /*
1059 * If we're not going to stdout, then we definitely don't
1060 * want color, since we are going to the commit message
1061 * file (and even the "auto" setting won't work, since it
1a72cfd7
JL
1062 * will have checked isatty on stdout). But we then do want
1063 * to insert the scissor line here to reliably remove the
1064 * diff before committing.
4f672ad6 1065 */
1a72cfd7 1066 if (s->fp != stdout) {
f1c96261 1067 rev.diffopt.use_color = 0;
fcef9312 1068 wt_status_add_cut_line(s->fp);
1a72cfd7 1069 }
6fa90194 1070 if (s->verbose > 1 && s->committable) {
40555000
MG
1071 /* print_updated() printed a header, so do we */
1072 if (s->fp != stdout)
957a0fe2 1073 wt_longstatus_print_trailer(s);
40555000
MG
1074 status_printf_ln(s, c, _("Changes to be committed:"));
1075 rev.diffopt.a_prefix = "c/";
1076 rev.diffopt.b_prefix = "i/";
1077 } /* else use prefix as per user config */
c91f0d92 1078 run_diff_index(&rev, 1);
40555000
MG
1079 if (s->verbose > 1 &&
1080 wt_status_check_worktree_changes(s, &dirty_submodules)) {
1081 status_printf_ln(s, c,
1082 "--------------------------------------------------");
1083 status_printf_ln(s, c, _("Changes not staged for commit:"));
1084 setup_work_tree();
1085 rev.diffopt.a_prefix = "i/";
1086 rev.diffopt.b_prefix = "w/";
1087 run_diff_files(&rev, 0);
1088 }
c91f0d92
JK
1089}
1090
957a0fe2 1091static void wt_longstatus_print_tracking(struct wt_status *s)
b6975ab5
JH
1092{
1093 struct strbuf sb = STRBUF_INIT;
c72b49df 1094 const char *cp, *ep, *branch_name;
b6975ab5 1095 struct branch *branch;
2556b996
MM
1096 char comment_line_string[3];
1097 int i;
0a53561a 1098 uint64_t t_begin = 0;
b6975ab5
JH
1099
1100 assert(s->branch && !s->is_initial);
c72b49df 1101 if (!skip_prefix(s->branch, "refs/heads/", &branch_name))
b6975ab5 1102 return;
c72b49df 1103 branch = branch_get(branch_name);
0a53561a
JH
1104
1105 t_begin = getnanotime();
1106
f39a757d 1107 if (!format_tracking_info(branch, &sb, s->ahead_behind_flags))
b6975ab5
JH
1108 return;
1109
0a53561a
JH
1110 if (advice_status_ahead_behind_warning &&
1111 s->ahead_behind_flags == AHEAD_BEHIND_FULL) {
1112 uint64_t t_delta_in_ms = (getnanotime() - t_begin) / 1000000;
1113 if (t_delta_in_ms > AB_DELAY_WARNING_IN_MS) {
1114 strbuf_addf(&sb, _("\n"
1115 "It took %.2f seconds to compute the branch ahead/behind values.\n"
1116 "You can use '--no-ahead-behind' to avoid this.\n"),
1117 t_delta_in_ms / 1000.0);
1118 }
1119 }
1120
2556b996
MM
1121 i = 0;
1122 if (s->display_comment_prefix) {
1123 comment_line_string[i++] = comment_line_char;
1124 comment_line_string[i++] = ' ';
1125 }
1126 comment_line_string[i] = '\0';
1127
b6975ab5 1128 for (cp = sb.buf; (ep = strchr(cp, '\n')) != NULL; cp = ep + 1)
d249b098 1129 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s),
2556b996 1130 "%s%.*s", comment_line_string,
eff80a9f 1131 (int)(ep - cp), cp);
2556b996
MM
1132 if (s->display_comment_prefix)
1133 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s), "%c",
1134 comment_line_char);
1135 else
75177c85 1136 fputs("\n", s->fp);
b6ec3071 1137 strbuf_release(&sb);
b6975ab5
JH
1138}
1139
83c750ac 1140static void show_merge_in_progress(struct wt_status *s,
73ba5d78 1141 const char *color)
83c750ac
LK
1142{
1143 if (has_unmerged(s)) {
1144 status_printf_ln(s, color, _("You have unmerged paths."));
b0a61ab2 1145 if (s->hints) {
83c750ac 1146 status_printf_ln(s, color,
b0a61ab2 1147 _(" (fix conflicts and run \"git commit\")"));
83c750ac 1148 status_printf_ln(s, color,
b0a61ab2
MM
1149 _(" (use \"git merge --abort\" to abort the merge)"));
1150 }
83c750ac
LK
1151 } else {
1152 status_printf_ln(s, color,
1153 _("All conflicts fixed but you are still merging."));
6a964f57 1154 if (s->hints)
83c750ac
LK
1155 status_printf_ln(s, color,
1156 _(" (use \"git commit\" to conclude merge)"));
1157 }
957a0fe2 1158 wt_longstatus_print_trailer(s);
83c750ac
LK
1159}
1160
1161static void show_am_in_progress(struct wt_status *s,
83c750ac
LK
1162 const char *color)
1163{
1164 status_printf_ln(s, color,
1165 _("You are in the middle of an am session."));
73ba5d78 1166 if (s->state.am_empty_patch)
83c750ac
LK
1167 status_printf_ln(s, color,
1168 _("The current patch is empty."));
6a964f57 1169 if (s->hints) {
73ba5d78 1170 if (!s->state.am_empty_patch)
83c750ac 1171 status_printf_ln(s, color,
8ceb6fbd 1172 _(" (fix conflicts and then run \"git am --continue\")"));
83c750ac
LK
1173 status_printf_ln(s, color,
1174 _(" (use \"git am --skip\" to skip this patch)"));
1175 status_printf_ln(s, color,
1176 _(" (use \"git am --abort\" to restore the original branch)"));
1177 }
957a0fe2 1178 wt_longstatus_print_trailer(s);
83c750ac
LK
1179}
1180
2d1cceba
LK
1181static char *read_line_from_git_path(const char *filename)
1182{
1183 struct strbuf buf = STRBUF_INIT;
e9d983f1
NTND
1184 FILE *fp = fopen_or_warn(git_path("%s", filename), "r");
1185
2d1cceba
LK
1186 if (!fp) {
1187 strbuf_release(&buf);
1188 return NULL;
1189 }
8f309aeb 1190 strbuf_getline_lf(&buf, fp);
2d1cceba
LK
1191 if (!fclose(fp)) {
1192 return strbuf_detach(&buf, NULL);
1193 } else {
1194 strbuf_release(&buf);
1195 return NULL;
1196 }
1197}
1198
1199static int split_commit_in_progress(struct wt_status *s)
1200{
1201 int split_in_progress = 0;
41fc6b33 1202 char *head, *orig_head, *rebase_amend, *rebase_orig_head;
2d1cceba 1203
41fc6b33 1204 if ((!s->amend && !s->nowarn && !s->workdir_dirty) ||
2d1cceba 1205 !s->branch || strcmp(s->branch, "HEAD"))
41fc6b33 1206 return 0;
2d1cceba 1207
41fc6b33
JS
1208 head = read_line_from_git_path("HEAD");
1209 orig_head = read_line_from_git_path("ORIG_HEAD");
1210 rebase_amend = read_line_from_git_path("rebase-merge/amend");
1211 rebase_orig_head = read_line_from_git_path("rebase-merge/orig-head");
2d1cceba 1212
41fc6b33
JS
1213 if (!head || !orig_head || !rebase_amend || !rebase_orig_head)
1214 ; /* fall through, no split in progress */
1215 else if (!strcmp(rebase_amend, rebase_orig_head))
1216 split_in_progress = !!strcmp(head, rebase_amend);
1217 else if (strcmp(orig_head, rebase_orig_head))
1218 split_in_progress = 1;
2d1cceba
LK
1219
1220 free(head);
1221 free(orig_head);
1222 free(rebase_amend);
1223 free(rebase_orig_head);
41fc6b33 1224
2d1cceba
LK
1225 return split_in_progress;
1226}
1227
84e6fb9d
GP
1228/*
1229 * Turn
1230 * "pick d6a2f0303e897ec257dd0e0a39a5ccb709bc2047 some message"
1231 * into
1232 * "pick d6a2f03 some message"
1233 *
1234 * The function assumes that the line does not contain useless spaces
1235 * before or after the command.
1236 */
1237static void abbrev_sha1_in_line(struct strbuf *line)
1238{
1239 struct strbuf **split;
1240 int i;
1241
1242 if (starts_with(line->buf, "exec ") ||
225a777a
JS
1243 starts_with(line->buf, "x ") ||
1244 starts_with(line->buf, "label ") ||
1245 starts_with(line->buf, "l "))
84e6fb9d
GP
1246 return;
1247
1248 split = strbuf_split_max(line, ' ', 3);
1249 if (split[0] && split[1]) {
e86ab2c1 1250 struct object_id oid;
84e6fb9d
GP
1251
1252 /*
1253 * strbuf_split_max left a space. Trim it and re-add
1254 * it after abbreviation.
1255 */
1256 strbuf_trim(split[1]);
e86ab2c1 1257 if (!get_oid(split[1]->buf, &oid)) {
84e6fb9d 1258 strbuf_reset(split[1]);
30e677e0 1259 strbuf_add_unique_abbrev(split[1], &oid,
a94bb683
RS
1260 DEFAULT_ABBREV);
1261 strbuf_addch(split[1], ' ');
84e6fb9d
GP
1262 strbuf_reset(line);
1263 for (i = 0; split[i]; i++)
8109984d 1264 strbuf_addbuf(line, split[i]);
84e6fb9d
GP
1265 }
1266 }
6eb6078b 1267 strbuf_list_free(split);
84e6fb9d
GP
1268}
1269
df9ded49 1270static int read_rebase_todolist(const char *fname, struct string_list *lines)
84e6fb9d
GP
1271{
1272 struct strbuf line = STRBUF_INIT;
1273 FILE *f = fopen(git_path("%s", fname), "r");
1274
df9ded49
JS
1275 if (!f) {
1276 if (errno == ENOENT)
1277 return -1;
84e6fb9d
GP
1278 die_errno("Could not open file %s for reading",
1279 git_path("%s", fname));
df9ded49 1280 }
8f309aeb 1281 while (!strbuf_getline_lf(&line, f)) {
84e6fb9d
GP
1282 if (line.len && line.buf[0] == comment_line_char)
1283 continue;
1284 strbuf_trim(&line);
1285 if (!line.len)
1286 continue;
1287 abbrev_sha1_in_line(&line);
1288 string_list_append(lines, line.buf);
1289 }
e7b65e20 1290 fclose(f);
6f49541d 1291 strbuf_release(&line);
df9ded49 1292 return 0;
84e6fb9d
GP
1293}
1294
1295static void show_rebase_information(struct wt_status *s,
73ba5d78 1296 const char *color)
84e6fb9d 1297{
73ba5d78 1298 if (s->state.rebase_interactive_in_progress) {
84e6fb9d
GP
1299 int i;
1300 int nr_lines_to_show = 2;
1301
1302 struct string_list have_done = STRING_LIST_INIT_DUP;
1303 struct string_list yet_to_do = STRING_LIST_INIT_DUP;
1304
1305 read_rebase_todolist("rebase-merge/done", &have_done);
df9ded49
JS
1306 if (read_rebase_todolist("rebase-merge/git-rebase-todo",
1307 &yet_to_do))
1308 status_printf_ln(s, color,
1309 _("git-rebase-todo is missing."));
84e6fb9d
GP
1310 if (have_done.nr == 0)
1311 status_printf_ln(s, color, _("No commands done."));
1312 else {
1313 status_printf_ln(s, color,
1314 Q_("Last command done (%d command done):",
1315 "Last commands done (%d commands done):",
1316 have_done.nr),
1317 have_done.nr);
1318 for (i = (have_done.nr > nr_lines_to_show)
1319 ? have_done.nr - nr_lines_to_show : 0;
1320 i < have_done.nr;
1321 i++)
1322 status_printf_ln(s, color, " %s", have_done.items[i].string);
1323 if (have_done.nr > nr_lines_to_show && s->hints)
1324 status_printf_ln(s, color,
1325 _(" (see more in file %s)"), git_path("rebase-merge/done"));
1326 }
1327
1328 if (yet_to_do.nr == 0)
1329 status_printf_ln(s, color,
1330 _("No commands remaining."));
1331 else {
1332 status_printf_ln(s, color,
1333 Q_("Next command to do (%d remaining command):",
1334 "Next commands to do (%d remaining commands):",
1335 yet_to_do.nr),
1336 yet_to_do.nr);
1337 for (i = 0; i < nr_lines_to_show && i < yet_to_do.nr; i++)
1338 status_printf_ln(s, color, " %s", yet_to_do.items[i].string);
1339 if (s->hints)
1340 status_printf_ln(s, color,
1341 _(" (use \"git rebase --edit-todo\" to view and edit)"));
1342 }
1343 string_list_clear(&yet_to_do, 0);
1344 string_list_clear(&have_done, 0);
1345 }
1346}
1347
05eb5635 1348static void print_rebase_state(struct wt_status *s,
73ba5d78 1349 const char *color)
05eb5635 1350{
73ba5d78 1351 if (s->state.branch)
05eb5635
GP
1352 status_printf_ln(s, color,
1353 _("You are currently rebasing branch '%s' on '%s'."),
73ba5d78
SS
1354 s->state.branch,
1355 s->state.onto);
05eb5635
GP
1356 else
1357 status_printf_ln(s, color,
1358 _("You are currently rebasing."));
1359}
1360
83c750ac 1361static void show_rebase_in_progress(struct wt_status *s,
73ba5d78 1362 const char *color)
83c750ac
LK
1363{
1364 struct stat st;
1365
73ba5d78 1366 show_rebase_information(s, color);
83c750ac 1367 if (has_unmerged(s)) {
73ba5d78 1368 print_rebase_state(s, color);
6a964f57 1369 if (s->hints) {
83c750ac
LK
1370 status_printf_ln(s, color,
1371 _(" (fix conflicts and then run \"git rebase --continue\")"));
1372 status_printf_ln(s, color,
1373 _(" (use \"git rebase --skip\" to skip this patch)"));
1374 status_printf_ln(s, color,
1375 _(" (use \"git rebase --abort\" to check out the original branch)"));
1376 }
73ba5d78 1377 } else if (s->state.rebase_in_progress ||
5b02ca38 1378 !stat(git_path_merge_msg(s->repo), &st)) {
73ba5d78 1379 print_rebase_state(s, color);
6a964f57 1380 if (s->hints)
83c750ac
LK
1381 status_printf_ln(s, color,
1382 _(" (all conflicts fixed: run \"git rebase --continue\")"));
2d1cceba 1383 } else if (split_commit_in_progress(s)) {
73ba5d78 1384 if (s->state.branch)
0722c805
NTND
1385 status_printf_ln(s, color,
1386 _("You are currently splitting a commit while rebasing branch '%s' on '%s'."),
73ba5d78
SS
1387 s->state.branch,
1388 s->state.onto);
0722c805
NTND
1389 else
1390 status_printf_ln(s, color,
1391 _("You are currently splitting a commit during a rebase."));
6a964f57 1392 if (s->hints)
2d1cceba
LK
1393 status_printf_ln(s, color,
1394 _(" (Once your working directory is clean, run \"git rebase --continue\")"));
83c750ac 1395 } else {
73ba5d78 1396 if (s->state.branch)
0722c805
NTND
1397 status_printf_ln(s, color,
1398 _("You are currently editing a commit while rebasing branch '%s' on '%s'."),
73ba5d78
SS
1399 s->state.branch,
1400 s->state.onto);
0722c805
NTND
1401 else
1402 status_printf_ln(s, color,
1403 _("You are currently editing a commit during a rebase."));
6a964f57 1404 if (s->hints && !s->amend) {
83c750ac
LK
1405 status_printf_ln(s, color,
1406 _(" (use \"git commit --amend\" to amend the current commit)"));
1407 status_printf_ln(s, color,
1408 _(" (use \"git rebase --continue\" once you are satisfied with your changes)"));
1409 }
1410 }
957a0fe2 1411 wt_longstatus_print_trailer(s);
83c750ac
LK
1412}
1413
1414static void show_cherry_pick_in_progress(struct wt_status *s,
73ba5d78 1415 const char *color)
83c750ac 1416{
4a72486d
PW
1417 if (is_null_oid(&s->state.cherry_pick_head_oid))
1418 status_printf_ln(s, color,
1419 _("Cherry-pick currently in progress."));
1420 else
1421 status_printf_ln(s, color,
1422 _("You are currently cherry-picking commit %s."),
1423 find_unique_abbrev(&s->state.cherry_pick_head_oid,
1424 DEFAULT_ABBREV));
1425
6a964f57 1426 if (s->hints) {
83c750ac
LK
1427 if (has_unmerged(s))
1428 status_printf_ln(s, color,
b95e66f5 1429 _(" (fix conflicts and run \"git cherry-pick --continue\")"));
4a72486d
PW
1430 else if (is_null_oid(&s->state.cherry_pick_head_oid))
1431 status_printf_ln(s, color,
1432 _(" (run \"git cherry-pick --continue\" to continue)"));
83c750ac
LK
1433 else
1434 status_printf_ln(s, color,
b95e66f5
RT
1435 _(" (all conflicts fixed: run \"git cherry-pick --continue\")"));
1436 status_printf_ln(s, color,
1437 _(" (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"));
83c750ac 1438 }
957a0fe2 1439 wt_longstatus_print_trailer(s);
83c750ac
LK
1440}
1441
db4ef449 1442static void show_revert_in_progress(struct wt_status *s,
73ba5d78 1443 const char *color)
db4ef449 1444{
4a72486d
PW
1445 if (is_null_oid(&s->state.revert_head_oid))
1446 status_printf_ln(s, color,
1447 _("Revert currently in progress."));
1448 else
1449 status_printf_ln(s, color,
1450 _("You are currently reverting commit %s."),
1451 find_unique_abbrev(&s->state.revert_head_oid,
1452 DEFAULT_ABBREV));
6a964f57 1453 if (s->hints) {
db4ef449
MM
1454 if (has_unmerged(s))
1455 status_printf_ln(s, color,
1456 _(" (fix conflicts and run \"git revert --continue\")"));
4a72486d
PW
1457 else if (is_null_oid(&s->state.revert_head_oid))
1458 status_printf_ln(s, color,
1459 _(" (run \"git revert --continue\" to continue)"));
db4ef449
MM
1460 else
1461 status_printf_ln(s, color,
1462 _(" (all conflicts fixed: run \"git revert --continue\")"));
1463 status_printf_ln(s, color,
1464 _(" (use \"git revert --abort\" to cancel the revert operation)"));
1465 }
957a0fe2 1466 wt_longstatus_print_trailer(s);
db4ef449
MM
1467}
1468
83c750ac 1469static void show_bisect_in_progress(struct wt_status *s,
73ba5d78 1470 const char *color)
83c750ac 1471{
73ba5d78 1472 if (s->state.branch)
0722c805 1473 status_printf_ln(s, color,
6deab24d 1474 _("You are currently bisecting, started from branch '%s'."),
73ba5d78 1475 s->state.branch);
0722c805
NTND
1476 else
1477 status_printf_ln(s, color,
1478 _("You are currently bisecting."));
6a964f57 1479 if (s->hints)
83c750ac
LK
1480 status_printf_ln(s, color,
1481 _(" (use \"git bisect reset\" to get back to the original branch)"));
957a0fe2 1482 wt_longstatus_print_trailer(s);
83c750ac
LK
1483}
1484
0722c805
NTND
1485/*
1486 * Extract branch information from rebase/bisect
1487 */
81eff27b 1488static char *get_branch(const struct worktree *wt, const char *path)
0722c805 1489{
8b87cfd0 1490 struct strbuf sb = STRBUF_INIT;
e86ab2c1 1491 struct object_id oid;
c72b49df 1492 const char *branch_name;
0722c805 1493
81eff27b 1494 if (strbuf_read_file(&sb, worktree_git_path(wt, "%s", path), 0) <= 0)
8b87cfd0 1495 goto got_nothing;
0722c805 1496
66ec904b 1497 while (sb.len && sb.buf[sb.len - 1] == '\n')
8b87cfd0
NTND
1498 strbuf_setlen(&sb, sb.len - 1);
1499 if (!sb.len)
1500 goto got_nothing;
c72b49df
RS
1501 if (skip_prefix(sb.buf, "refs/heads/", &branch_name))
1502 strbuf_remove(&sb, 0, branch_name - sb.buf);
59556548 1503 else if (starts_with(sb.buf, "refs/"))
8b87cfd0 1504 ;
e86ab2c1 1505 else if (!get_oid_hex(sb.buf, &oid)) {
8b87cfd0 1506 strbuf_reset(&sb);
30e677e0 1507 strbuf_add_unique_abbrev(&sb, &oid, DEFAULT_ABBREV);
8b87cfd0
NTND
1508 } else if (!strcmp(sb.buf, "detached HEAD")) /* rebase */
1509 goto got_nothing;
0722c805 1510 else /* bisect */
8b87cfd0
NTND
1511 ;
1512 return strbuf_detach(&sb, NULL);
1513
1514got_nothing:
1515 strbuf_release(&sb);
1516 return NULL;
0722c805
NTND
1517}
1518
b397ea48 1519struct grab_1st_switch_cbdata {
b397ea48 1520 struct strbuf buf;
e86ab2c1 1521 struct object_id noid;
b397ea48
NTND
1522};
1523
9461d272 1524static int grab_1st_switch(struct object_id *ooid, struct object_id *noid,
dddbad72 1525 const char *email, timestamp_t timestamp, int tz,
b397ea48 1526 const char *message, void *cb_data)
83c750ac 1527{
b397ea48
NTND
1528 struct grab_1st_switch_cbdata *cb = cb_data;
1529 const char *target = NULL, *end;
83c750ac 1530
c72b49df 1531 if (!skip_prefix(message, "checkout: moving from ", &message))
b397ea48 1532 return 0;
b397ea48
NTND
1533 target = strstr(message, " to ");
1534 if (!target)
1535 return 0;
1536 target += strlen(" to ");
1537 strbuf_reset(&cb->buf);
e86ab2c1 1538 oidcpy(&cb->noid, noid);
904de44c
RS
1539 end = strchrnul(target, '\n');
1540 strbuf_add(&cb->buf, target, end - target);
1541 if (!strcmp(cb->buf.buf, "HEAD")) {
0eb8548f 1542 /* HEAD is relative. Resolve it to the right reflog entry. */
904de44c 1543 strbuf_reset(&cb->buf);
30e677e0 1544 strbuf_add_unique_abbrev(&cb->buf, noid, DEFAULT_ABBREV);
0eb8548f 1545 }
b397ea48
NTND
1546 return 1;
1547}
1548
78845457
NTND
1549static void wt_status_get_detached_from(struct repository *r,
1550 struct wt_status_state *state)
b397ea48
NTND
1551{
1552 struct grab_1st_switch_cbdata cb;
1553 struct commit *commit;
e86ab2c1 1554 struct object_id oid;
b397ea48
NTND
1555 char *ref = NULL;
1556
1557 strbuf_init(&cb.buf, 0);
1558 if (for_each_reflog_ent_reverse("HEAD", grab_1st_switch, &cb) <= 0) {
1559 strbuf_release(&cb.buf);
1560 return;
1561 }
1562
cca5fa64 1563 if (dwim_ref(cb.buf.buf, cb.buf.len, &oid, &ref) == 1 &&
b397ea48 1564 /* sha1 is a commit? match without further lookup */
4a7e27e9 1565 (oideq(&cb.noid, &oid) ||
b397ea48 1566 /* perhaps sha1 is a tag, try to dereference to a commit */
78845457 1567 ((commit = lookup_commit_reference_gently(r, &oid, 1)) != NULL &&
4a7e27e9 1568 oideq(&cb.noid, &commit->object.oid)))) {
c72b49df
RS
1569 const char *from = ref;
1570 if (!skip_prefix(from, "refs/tags/", &from))
1571 skip_prefix(from, "refs/remotes/", &from);
1572 state->detached_from = xstrdup(from);
b397ea48
NTND
1573 } else
1574 state->detached_from =
aab9583f 1575 xstrdup(find_unique_abbrev(&cb.noid, DEFAULT_ABBREV));
40f5555c 1576 oidcpy(&state->detached_oid, &cb.noid);
e86ab2c1 1577 state->detached_at = !get_oid("HEAD", &oid) &&
4a7e27e9 1578 oideq(&oid, &state->detached_oid);
b397ea48
NTND
1579
1580 free(ref);
1581 strbuf_release(&cb.buf);
1582}
1583
81eff27b
NTND
1584int wt_status_check_rebase(const struct worktree *wt,
1585 struct wt_status_state *state)
83c750ac 1586{
83c750ac 1587 struct stat st;
83c750ac 1588
81eff27b
NTND
1589 if (!stat(worktree_git_path(wt, "rebase-apply"), &st)) {
1590 if (!stat(worktree_git_path(wt, "rebase-apply/applying"), &st)) {
b9691db4 1591 state->am_in_progress = 1;
81eff27b 1592 if (!stat(worktree_git_path(wt, "rebase-apply/patch"), &st) && !st.st_size)
b9691db4 1593 state->am_empty_patch = 1;
83c750ac 1594 } else {
b9691db4 1595 state->rebase_in_progress = 1;
81eff27b
NTND
1596 state->branch = get_branch(wt, "rebase-apply/head-name");
1597 state->onto = get_branch(wt, "rebase-apply/onto");
83c750ac 1598 }
81eff27b
NTND
1599 } else if (!stat(worktree_git_path(wt, "rebase-merge"), &st)) {
1600 if (!stat(worktree_git_path(wt, "rebase-merge/interactive"), &st))
b9691db4 1601 state->rebase_interactive_in_progress = 1;
83c750ac 1602 else
b9691db4 1603 state->rebase_in_progress = 1;
81eff27b
NTND
1604 state->branch = get_branch(wt, "rebase-merge/head-name");
1605 state->onto = get_branch(wt, "rebase-merge/onto");
bcd522a1
NTND
1606 } else
1607 return 0;
1608 return 1;
1609}
1610
f5d067a2
NTND
1611int wt_status_check_bisect(const struct worktree *wt,
1612 struct wt_status_state *state)
1613{
1614 struct stat st;
1615
1616 if (!stat(worktree_git_path(wt, "BISECT_LOG"), &st)) {
1617 state->bisect_in_progress = 1;
1618 state->branch = get_branch(wt, "BISECT_START");
1619 return 1;
1620 }
1621 return 0;
1622}
1623
78845457
NTND
1624void wt_status_get_state(struct repository *r,
1625 struct wt_status_state *state,
bcd522a1
NTND
1626 int get_detached_from)
1627{
1628 struct stat st;
e86ab2c1 1629 struct object_id oid;
4a72486d 1630 enum replay_action action;
bcd522a1 1631
78845457 1632 if (!stat(git_path_merge_head(r), &st)) {
982288e9 1633 wt_status_check_rebase(NULL, state);
bcd522a1 1634 state->merge_in_progress = 1;
81eff27b 1635 } else if (wt_status_check_rebase(NULL, state)) {
bcd522a1 1636 ; /* all set */
78845457 1637 } else if (!stat(git_path_cherry_pick_head(r), &st) &&
e86ab2c1 1638 !get_oid("CHERRY_PICK_HEAD", &oid)) {
b9691db4 1639 state->cherry_pick_in_progress = 1;
40f5555c 1640 oidcpy(&state->cherry_pick_head_oid, &oid);
83c750ac 1641 }
f5d067a2 1642 wt_status_check_bisect(NULL, state);
78845457 1643 if (!stat(git_path_revert_head(r), &st) &&
e86ab2c1 1644 !get_oid("REVERT_HEAD", &oid)) {
db4ef449 1645 state->revert_in_progress = 1;
40f5555c 1646 oidcpy(&state->revert_head_oid, &oid);
db4ef449 1647 }
4a72486d
PW
1648 if (!sequencer_get_last_command(r, &action)) {
1649 if (action == REPLAY_PICK) {
1650 state->cherry_pick_in_progress = 1;
1651 oidcpy(&state->cherry_pick_head_oid, &null_oid);
1652 } else {
1653 state->revert_in_progress = 1;
1654 oidcpy(&state->revert_head_oid, &null_oid);
1655 }
1656 }
b397ea48 1657 if (get_detached_from)
78845457 1658 wt_status_get_detached_from(r, state);
b9691db4
NTND
1659}
1660
73ba5d78 1661static void wt_longstatus_print_state(struct wt_status *s)
b9691db4
NTND
1662{
1663 const char *state_color = color(WT_STATUS_HEADER, s);
73ba5d78
SS
1664 struct wt_status_state *state = &s->state;
1665
982288e9
JS
1666 if (state->merge_in_progress) {
1667 if (state->rebase_interactive_in_progress) {
1668 show_rebase_information(s, state_color);
1669 fputs("\n", s->fp);
1670 }
73ba5d78 1671 show_merge_in_progress(s, state_color);
982288e9 1672 } else if (state->am_in_progress)
73ba5d78 1673 show_am_in_progress(s, state_color);
3b691ccc 1674 else if (state->rebase_in_progress || state->rebase_interactive_in_progress)
73ba5d78 1675 show_rebase_in_progress(s, state_color);
3b691ccc 1676 else if (state->cherry_pick_in_progress)
73ba5d78 1677 show_cherry_pick_in_progress(s, state_color);
db4ef449 1678 else if (state->revert_in_progress)
73ba5d78 1679 show_revert_in_progress(s, state_color);
3b691ccc 1680 if (state->bisect_in_progress)
73ba5d78 1681 show_bisect_in_progress(s, state_color);
83c750ac
LK
1682}
1683
be7e795e 1684static void wt_longstatus_print(struct wt_status *s)
c91f0d92 1685{
1d282327
AA
1686 const char *branch_color = color(WT_STATUS_ONBRANCH, s);
1687 const char *branch_status_color = color(WT_STATUS_HEADER, s);
98bf8a47 1688
bda324cf 1689 if (s->branch) {
355ec7a1 1690 const char *on_what = _("On branch ");
bda324cf 1691 const char *branch_name = s->branch;
c72b49df 1692 if (!strcmp(branch_name, "HEAD")) {
1d282327 1693 branch_status_color = color(WT_STATUS_NOBRANCH, s);
73ba5d78
SS
1694 if (s->state.rebase_in_progress ||
1695 s->state.rebase_interactive_in_progress) {
1696 if (s->state.rebase_interactive_in_progress)
df25e947
GP
1697 on_what = _("interactive rebase in progress; onto ");
1698 else
1699 on_what = _("rebase in progress; onto ");
73ba5d78
SS
1700 branch_name = s->state.onto;
1701 } else if (s->state.detached_from) {
1702 branch_name = s->state.detached_from;
1703 if (s->state.detached_at)
28438e84 1704 on_what = HEAD_DETACHED_AT;
b397ea48 1705 else
28438e84 1706 on_what = HEAD_DETACHED_FROM;
b397ea48
NTND
1707 } else {
1708 branch_name = "";
1709 on_what = _("Not currently on any branch.");
1710 }
c72b49df
RS
1711 } else
1712 skip_prefix(branch_name, "refs/heads/", &branch_name);
7d7d6802 1713 status_printf(s, color(WT_STATUS_HEADER, s), "%s", "");
b926c0d1
JN
1714 status_printf_more(s, branch_status_color, "%s", on_what);
1715 status_printf_more(s, branch_color, "%s\n", branch_name);
b6975ab5 1716 if (!s->is_initial)
957a0fe2 1717 wt_longstatus_print_tracking(s);
bda324cf 1718 }
c91f0d92 1719
73ba5d78 1720 wt_longstatus_print_state(s);
3b691ccc 1721
c91f0d92 1722 if (s->is_initial) {
7d7d6802 1723 status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", "");
4ddb1354
KS
1724 status_printf_ln(s, color(WT_STATUS_HEADER, s),
1725 s->commit_template
1726 ? _("Initial commit")
1727 : _("No commits yet"));
7d7d6802 1728 status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", "");
c91f0d92
JK
1729 }
1730
957a0fe2
JH
1731 wt_longstatus_print_updated(s);
1732 wt_longstatus_print_unmerged(s);
1733 wt_longstatus_print_changed(s);
46a958b3
JL
1734 if (s->submodule_summary &&
1735 (!s->ignore_submodule_arg ||
1736 strcmp(s->ignore_submodule_arg, "all"))) {
957a0fe2
JH
1737 wt_longstatus_print_submodule_summary(s, 0); /* staged */
1738 wt_longstatus_print_submodule_summary(s, 1); /* unstaged */
f17a5d34 1739 }
2381e39e 1740 if (s->show_untracked_files) {
957a0fe2 1741 wt_longstatus_print_other(s, &s->untracked, _("Untracked files"), "add");
eec0f7f2 1742 if (s->show_ignored_mode)
957a0fe2 1743 wt_longstatus_print_other(s, &s->ignored, _("Ignored files"), "add -f");
6a38ef2c 1744 if (advice_status_u_option && 2000 < s->untracked_in_ms) {
7d7d6802 1745 status_printf_ln(s, GIT_COLOR_NORMAL, "%s", "");
6a38ef2c 1746 status_printf_ln(s, GIT_COLOR_NORMAL,
62901179
JX
1747 _("It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1748 "may speed it up, but you have to be careful not to forget to add\n"
1749 "new files yourself (see 'git help status')."),
1750 s->untracked_in_ms / 1000.0);
6a38ef2c 1751 }
6fa90194 1752 } else if (s->committable)
355ec7a1 1753 status_printf_ln(s, GIT_COLOR_NORMAL, _("Untracked files not listed%s"),
6a964f57 1754 s->hints
355ec7a1 1755 ? _(" (use -u option to show untracked files)") : "");
c91f0d92 1756
1324fb6f 1757 if (s->verbose)
957a0fe2 1758 wt_longstatus_print_verbose(s);
6fa90194 1759 if (!s->committable) {
6e458bf6 1760 if (s->amend)
355ec7a1 1761 status_printf_ln(s, GIT_COLOR_NORMAL, _("No changes"));
37d07f8f
JH
1762 else if (s->nowarn)
1763 ; /* nothing */
50bd8b7e 1764 else if (s->workdir_dirty) {
6a964f57 1765 if (s->hints)
50bd8b7e
NTND
1766 printf(_("no changes added to commit "
1767 "(use \"git add\" and/or \"git commit -a\")\n"));
1768 else
1769 printf(_("no changes added to commit\n"));
1770 } else if (s->untracked.nr) {
6a964f57 1771 if (s->hints)
50bd8b7e
NTND
1772 printf(_("nothing added to commit but untracked files "
1773 "present (use \"git add\" to track)\n"));
1774 else
1775 printf(_("nothing added to commit but untracked files present\n"));
1776 } else if (s->is_initial) {
6a964f57 1777 if (s->hints)
50bd8b7e
NTND
1778 printf(_("nothing to commit (create/copy files "
1779 "and use \"git add\" to track)\n"));
1780 else
1781 printf(_("nothing to commit\n"));
1782 } else if (!s->show_untracked_files) {
6a964f57 1783 if (s->hints)
50bd8b7e
NTND
1784 printf(_("nothing to commit (use -u to show untracked files)\n"));
1785 else
1786 printf(_("nothing to commit\n"));
1787 } else
2a0e6cde 1788 printf(_("nothing to commit, working tree clean\n"));
6e458bf6 1789 }
c1b5d019
LB
1790 if(s->show_stash)
1791 wt_longstatus_print_stash_summary(s);
c91f0d92 1792}
84dbe7b8 1793
3207a3a2 1794static void wt_shortstatus_unmerged(struct string_list_item *it,
84dbe7b8
MG
1795 struct wt_status *s)
1796{
1797 struct wt_status_change_data *d = it->util;
1798 const char *how = "??";
1799
1800 switch (d->stagemask) {
1801 case 1: how = "DD"; break; /* both deleted */
1802 case 2: how = "AU"; break; /* added by us */
1803 case 3: how = "UD"; break; /* deleted by them */
1804 case 4: how = "UA"; break; /* added by them */
1805 case 5: how = "DU"; break; /* deleted by us */
1806 case 6: how = "AA"; break; /* both added */
1807 case 7: how = "UU"; break; /* both modified */
1808 }
3fe2a894 1809 color_fprintf(s->fp, color(WT_STATUS_UNMERGED, s), "%s", how);
3207a3a2 1810 if (s->null_termination) {
3fe2a894 1811 fprintf(stdout, " %s%c", it->string, 0);
84dbe7b8
MG
1812 } else {
1813 struct strbuf onebuf = STRBUF_INIT;
1814 const char *one;
39598f99 1815 one = quote_path(it->string, s->prefix, &onebuf);
3fe2a894 1816 printf(" %s\n", one);
84dbe7b8
MG
1817 strbuf_release(&onebuf);
1818 }
1819}
1820
3207a3a2 1821static void wt_shortstatus_status(struct string_list_item *it,
84dbe7b8
MG
1822 struct wt_status *s)
1823{
1824 struct wt_status_change_data *d = it->util;
1825
3fe2a894
MG
1826 if (d->index_status)
1827 color_fprintf(s->fp, color(WT_STATUS_UPDATED, s), "%c", d->index_status);
1828 else
1829 putchar(' ');
1830 if (d->worktree_status)
1831 color_fprintf(s->fp, color(WT_STATUS_CHANGED, s), "%c", d->worktree_status);
1832 else
1833 putchar(' ');
1834 putchar(' ');
3207a3a2 1835 if (s->null_termination) {
84dbe7b8 1836 fprintf(stdout, "%s%c", it->string, 0);
5134ccde
NTND
1837 if (d->rename_source)
1838 fprintf(stdout, "%s%c", d->rename_source, 0);
84dbe7b8
MG
1839 } else {
1840 struct strbuf onebuf = STRBUF_INIT;
1841 const char *one;
5134ccde
NTND
1842
1843 if (d->rename_source) {
1844 one = quote_path(d->rename_source, s->prefix, &onebuf);
dbfdc625
KB
1845 if (*one != '"' && strchr(one, ' ') != NULL) {
1846 putchar('"');
1847 strbuf_addch(&onebuf, '"');
1848 one = onebuf.buf;
1849 }
84dbe7b8
MG
1850 printf("%s -> ", one);
1851 strbuf_release(&onebuf);
1852 }
39598f99 1853 one = quote_path(it->string, s->prefix, &onebuf);
dbfdc625
KB
1854 if (*one != '"' && strchr(one, ' ') != NULL) {
1855 putchar('"');
1856 strbuf_addch(&onebuf, '"');
1857 one = onebuf.buf;
1858 }
84dbe7b8
MG
1859 printf("%s\n", one);
1860 strbuf_release(&onebuf);
1861 }
1862}
1863
3207a3a2 1864static void wt_shortstatus_other(struct string_list_item *it,
2381e39e 1865 struct wt_status *s, const char *sign)
84dbe7b8 1866{
3207a3a2 1867 if (s->null_termination) {
2381e39e 1868 fprintf(stdout, "%s %s%c", sign, it->string, 0);
84dbe7b8
MG
1869 } else {
1870 struct strbuf onebuf = STRBUF_INIT;
1871 const char *one;
39598f99 1872 one = quote_path(it->string, s->prefix, &onebuf);
c1909e72 1873 color_fprintf(s->fp, color(WT_STATUS_UNTRACKED, s), "%s", sign);
3fe2a894 1874 printf(" %s\n", one);
84dbe7b8
MG
1875 strbuf_release(&onebuf);
1876 }
1877}
1878
05a59a08
DKF
1879static void wt_shortstatus_print_tracking(struct wt_status *s)
1880{
1881 struct branch *branch;
1882 const char *header_color = color(WT_STATUS_HEADER, s);
1883 const char *branch_color_local = color(WT_STATUS_LOCAL_BRANCH, s);
1884 const char *branch_color_remote = color(WT_STATUS_REMOTE_BRANCH, s);
1885
1886 const char *base;
5e8d2729 1887 char *short_base;
05a59a08 1888 const char *branch_name;
3ca1897c 1889 int num_ours, num_theirs, sti;
f2e08739 1890 int upstream_is_gone = 0;
05a59a08
DKF
1891
1892 color_fprintf(s->fp, color(WT_STATUS_HEADER, s), "## ");
1893
1894 if (!s->branch)
1895 return;
1896 branch_name = s->branch;
1897
b9e2bc56
MG
1898#define LABEL(string) (s->no_gettext ? (string) : _(string))
1899
05a59a08 1900 if (s->is_initial)
4ddb1354 1901 color_fprintf(s->fp, header_color, LABEL(N_("No commits yet on ")));
f2e08739 1902
baf0a3e4
RS
1903 if (!strcmp(s->branch, "HEAD")) {
1904 color_fprintf(s->fp, color(WT_STATUS_NOBRANCH, s), "%s",
b9e2bc56 1905 LABEL(N_("HEAD (no branch)")));
baf0a3e4
RS
1906 goto conclude;
1907 }
1908
c72b49df 1909 skip_prefix(branch_name, "refs/heads/", &branch_name);
05a59a08 1910
8d8325f8 1911 branch = branch_get(branch_name);
f2e08739
JX
1912
1913 color_fprintf(s->fp, branch_color_local, "%s", branch_name);
1914
3ca1897c 1915 sti = stat_tracking_info(branch, &num_ours, &num_theirs, &base,
c646d093 1916 0, s->ahead_behind_flags);
3ca1897c 1917 if (sti < 0) {
bcf8cc25
RS
1918 if (!base)
1919 goto conclude;
979cb245 1920
f2e08739 1921 upstream_is_gone = 1;
05a59a08
DKF
1922 }
1923
5e8d2729 1924 short_base = shorten_unambiguous_ref(base, 0);
05a59a08 1925 color_fprintf(s->fp, header_color, "...");
5e8d2729
RS
1926 color_fprintf(s->fp, branch_color_remote, "%s", short_base);
1927 free(short_base);
05a59a08 1928
3ca1897c 1929 if (!upstream_is_gone && !sti)
bcf8cc25 1930 goto conclude;
f223459b 1931
05a59a08 1932 color_fprintf(s->fp, header_color, " [");
f2e08739 1933 if (upstream_is_gone) {
7a76c28f 1934 color_fprintf(s->fp, header_color, LABEL(N_("gone")));
3ca1897c
JH
1935 } else if (s->ahead_behind_flags == AHEAD_BEHIND_QUICK) {
1936 color_fprintf(s->fp, header_color, LABEL(N_("different")));
f2e08739 1937 } else if (!num_ours) {
7a76c28f 1938 color_fprintf(s->fp, header_color, LABEL(N_("behind ")));
05a59a08
DKF
1939 color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
1940 } else if (!num_theirs) {
df227241 1941 color_fprintf(s->fp, header_color, LABEL(N_("ahead ")));
05a59a08
DKF
1942 color_fprintf(s->fp, branch_color_local, "%d", num_ours);
1943 } else {
df227241 1944 color_fprintf(s->fp, header_color, LABEL(N_("ahead ")));
05a59a08 1945 color_fprintf(s->fp, branch_color_local, "%d", num_ours);
7a76c28f 1946 color_fprintf(s->fp, header_color, ", %s", LABEL(N_("behind ")));
05a59a08
DKF
1947 color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
1948 }
1949
a5985237 1950 color_fprintf(s->fp, header_color, "]");
bcf8cc25 1951 conclude:
a5985237 1952 fputc(s->null_termination ? '\0' : '\n', s->fp);
05a59a08
DKF
1953}
1954
be7e795e 1955static void wt_shortstatus_print(struct wt_status *s)
84dbe7b8 1956{
d4aae459 1957 struct string_list_item *it;
05a59a08 1958
d4a6bf1f 1959 if (s->show_branch)
05a59a08
DKF
1960 wt_shortstatus_print_tracking(s);
1961
d4aae459
SB
1962 for_each_string_list_item(it, &s->change) {
1963 struct wt_status_change_data *d = it->util;
84dbe7b8 1964
84dbe7b8 1965 if (d->stagemask)
3207a3a2 1966 wt_shortstatus_unmerged(it, s);
84dbe7b8 1967 else
3207a3a2 1968 wt_shortstatus_status(it, s);
84dbe7b8 1969 }
d4aae459 1970 for_each_string_list_item(it, &s->untracked)
3207a3a2 1971 wt_shortstatus_other(it, s, "??");
2381e39e 1972
d4aae459 1973 for_each_string_list_item(it, &s->ignored)
3207a3a2 1974 wt_shortstatus_other(it, s, "!!");
84dbe7b8 1975}
4a7cc2fd 1976
be7e795e 1977static void wt_porcelain_print(struct wt_status *s)
4a7cc2fd
JK
1978{
1979 s->use_color = 0;
8661768f
JK
1980 s->relative_paths = 0;
1981 s->prefix = NULL;
7a76c28f 1982 s->no_gettext = 1;
d4a6bf1f 1983 wt_shortstatus_print(s);
4a7cc2fd 1984}
be7e795e 1985
d9fc746c
JH
1986/*
1987 * Print branch information for porcelain v2 output. These lines
1988 * are printed when the '--branch' parameter is given.
1989 *
1990 * # branch.oid <commit><eol>
1991 * # branch.head <head><eol>
1992 * [# branch.upstream <upstream><eol>
1993 * [# branch.ab +<ahead> -<behind><eol>]]
1994 *
1995 * <commit> ::= the current commit hash or the the literal
1996 * "(initial)" to indicate an initialized repo
1997 * with no commits.
1998 *
1999 * <head> ::= <branch_name> the current branch name or
2000 * "(detached)" literal when detached head or
2001 * "(unknown)" when something is wrong.
2002 *
2003 * <upstream> ::= the upstream branch name, when set.
2004 *
fd9b544a 2005 * <ahead> ::= integer ahead value or '?'.
d9fc746c 2006 *
fd9b544a 2007 * <behind> ::= integer behind value or '?'.
d9fc746c
JH
2008 *
2009 * The end-of-line is defined by the -z flag.
2010 *
2011 * <eol> ::= NUL when -z,
2012 * LF when NOT -z.
2013 *
fd9b544a
JH
2014 * When an upstream is set and present, the 'branch.ab' line will
2015 * be printed with the ahead/behind counts for the branch and the
2016 * upstream. When AHEAD_BEHIND_QUICK is requested and the branches
2017 * are different, '?' will be substituted for the actual count.
d9fc746c
JH
2018 */
2019static void wt_porcelain_v2_print_tracking(struct wt_status *s)
2020{
2021 struct branch *branch;
2022 const char *base;
2023 const char *branch_name;
d9fc746c
JH
2024 int ab_info, nr_ahead, nr_behind;
2025 char eol = s->null_termination ? '\0' : '\n';
2026
d9fc746c
JH
2027 fprintf(s->fp, "# branch.oid %s%c",
2028 (s->is_initial ? "(initial)" : sha1_to_hex(s->sha1_commit)),
2029 eol);
2030
2031 if (!s->branch)
2032 fprintf(s->fp, "# branch.head %s%c", "(unknown)", eol);
2033 else {
2034 if (!strcmp(s->branch, "HEAD")) {
2035 fprintf(s->fp, "# branch.head %s%c", "(detached)", eol);
2036
73ba5d78
SS
2037 if (s->state.rebase_in_progress ||
2038 s->state.rebase_interactive_in_progress)
2039 branch_name = s->state.onto;
2040 else if (s->state.detached_from)
2041 branch_name = s->state.detached_from;
d9fc746c
JH
2042 else
2043 branch_name = "";
2044 } else {
2045 branch_name = NULL;
2046 skip_prefix(s->branch, "refs/heads/", &branch_name);
2047
2048 fprintf(s->fp, "# branch.head %s%c", branch_name, eol);
2049 }
2050
2051 /* Lookup stats on the upstream tracking branch, if set. */
2052 branch = branch_get(branch_name);
2053 base = NULL;
fd9b544a 2054 ab_info = stat_tracking_info(branch, &nr_ahead, &nr_behind,
c646d093 2055 &base, 0, s->ahead_behind_flags);
d9fc746c
JH
2056 if (base) {
2057 base = shorten_unambiguous_ref(base, 0);
2058 fprintf(s->fp, "# branch.upstream %s%c", base, eol);
2059 free((char *)base);
2060
fd9b544a
JH
2061 if (ab_info > 0) {
2062 /* different */
2063 if (nr_ahead || nr_behind)
2064 fprintf(s->fp, "# branch.ab +%d -%d%c",
2065 nr_ahead, nr_behind, eol);
2066 else
2067 fprintf(s->fp, "# branch.ab +? -?%c",
2068 eol);
2069 } else if (!ab_info) {
2070 /* same */
2071 fprintf(s->fp, "# branch.ab +0 -0%c", eol);
2072 }
d9fc746c
JH
2073 }
2074 }
d9fc746c
JH
2075}
2076
24959bad
JH
2077/*
2078 * Convert various submodule status values into a
2079 * fixed-length string of characters in the buffer provided.
2080 */
2081static void wt_porcelain_v2_submodule_state(
2082 struct wt_status_change_data *d,
2083 char sub[5])
2084{
2085 if (S_ISGITLINK(d->mode_head) ||
2086 S_ISGITLINK(d->mode_index) ||
2087 S_ISGITLINK(d->mode_worktree)) {
2088 sub[0] = 'S';
2089 sub[1] = d->new_submodule_commits ? 'C' : '.';
2090 sub[2] = (d->dirty_submodule & DIRTY_SUBMODULE_MODIFIED) ? 'M' : '.';
2091 sub[3] = (d->dirty_submodule & DIRTY_SUBMODULE_UNTRACKED) ? 'U' : '.';
2092 } else {
2093 sub[0] = 'N';
2094 sub[1] = '.';
2095 sub[2] = '.';
2096 sub[3] = '.';
2097 }
2098 sub[4] = 0;
2099}
2100
2101/*
2102 * Fix-up changed entries before we print them.
2103 */
13a17812 2104static void wt_porcelain_v2_fix_up_changed(struct string_list_item *it)
24959bad
JH
2105{
2106 struct wt_status_change_data *d = it->util;
2107
2108 if (!d->index_status) {
2109 /*
2110 * This entry is unchanged in the index (relative to the head).
2111 * Therefore, the collect_updated_cb was never called for this
2112 * entry (during the head-vs-index scan) and so the head column
2113 * fields were never set.
2114 *
2115 * We must have data for the index column (from the
2116 * index-vs-worktree scan (otherwise, this entry should not be
2117 * in the list of changes)).
2118 *
2119 * Copy index column fields to the head column, so that our
2120 * output looks complete.
2121 */
2122 assert(d->mode_head == 0);
2123 d->mode_head = d->mode_index;
2124 oidcpy(&d->oid_head, &d->oid_index);
2125 }
2126
2127 if (!d->worktree_status) {
2128 /*
2129 * This entry is unchanged in the worktree (relative to the index).
2130 * Therefore, the collect_changed_cb was never called for this entry
2131 * (during the index-vs-worktree scan) and so the worktree column
2132 * fields were never set.
2133 *
2134 * We must have data for the index column (from the head-vs-index
2135 * scan).
2136 *
2137 * Copy the index column fields to the worktree column so that
2138 * our output looks complete.
2139 *
2140 * Note that we only have a mode field in the worktree column
2141 * because the scan code tries really hard to not have to compute it.
2142 */
2143 assert(d->mode_worktree == 0);
2144 d->mode_worktree = d->mode_index;
2145 }
2146}
2147
2148/*
2149 * Print porcelain v2 info for tracked entries with changes.
2150 */
2151static void wt_porcelain_v2_print_changed_entry(
2152 struct string_list_item *it,
2153 struct wt_status *s)
2154{
2155 struct wt_status_change_data *d = it->util;
5134ccde
NTND
2156 struct strbuf buf = STRBUF_INIT;
2157 struct strbuf buf_from = STRBUF_INIT;
2158 const char *path = NULL;
2159 const char *path_from = NULL;
24959bad
JH
2160 char key[3];
2161 char submodule_token[5];
2162 char sep_char, eol_char;
2163
13a17812 2164 wt_porcelain_v2_fix_up_changed(it);
24959bad
JH
2165 wt_porcelain_v2_submodule_state(d, submodule_token);
2166
2167 key[0] = d->index_status ? d->index_status : '.';
2168 key[1] = d->worktree_status ? d->worktree_status : '.';
2169 key[2] = 0;
2170
2171 if (s->null_termination) {
2172 /*
2173 * In -z mode, we DO NOT C-quote pathnames. Current path is ALWAYS first.
2174 * A single NUL character separates them.
2175 */
2176 sep_char = '\0';
2177 eol_char = '\0';
5134ccde
NTND
2178 path = it->string;
2179 path_from = d->rename_source;
24959bad
JH
2180 } else {
2181 /*
2182 * Path(s) are C-quoted if necessary. Current path is ALWAYS first.
2183 * The source path is only present when necessary.
2184 * A single TAB separates them (because paths can contain spaces
2185 * which are not escaped and C-quoting does escape TAB characters).
2186 */
2187 sep_char = '\t';
2188 eol_char = '\n';
5134ccde
NTND
2189 path = quote_path(it->string, s->prefix, &buf);
2190 if (d->rename_source)
2191 path_from = quote_path(d->rename_source, s->prefix, &buf_from);
24959bad
JH
2192 }
2193
5134ccde 2194 if (path_from)
24959bad
JH
2195 fprintf(s->fp, "2 %s %s %06o %06o %06o %s %s %c%d %s%c%s%c",
2196 key, submodule_token,
2197 d->mode_head, d->mode_index, d->mode_worktree,
2198 oid_to_hex(&d->oid_head), oid_to_hex(&d->oid_index),
5134ccde
NTND
2199 d->rename_status, d->rename_score,
2200 path, sep_char, path_from, eol_char);
24959bad
JH
2201 else
2202 fprintf(s->fp, "1 %s %s %06o %06o %06o %s %s %s%c",
2203 key, submodule_token,
2204 d->mode_head, d->mode_index, d->mode_worktree,
2205 oid_to_hex(&d->oid_head), oid_to_hex(&d->oid_index),
5134ccde 2206 path, eol_char);
24959bad 2207
5134ccde
NTND
2208 strbuf_release(&buf);
2209 strbuf_release(&buf_from);
24959bad
JH
2210}
2211
2212/*
2213 * Print porcelain v2 status info for unmerged entries.
2214 */
2215static void wt_porcelain_v2_print_unmerged_entry(
2216 struct string_list_item *it,
2217 struct wt_status *s)
2218{
2219 struct wt_status_change_data *d = it->util;
5b02ca38 2220 struct index_state *istate = s->repo->index;
24959bad
JH
2221 const struct cache_entry *ce;
2222 struct strbuf buf_index = STRBUF_INIT;
2223 const char *path_index = NULL;
2224 int pos, stage, sum;
2225 struct {
2226 int mode;
2227 struct object_id oid;
2228 } stages[3];
2229 char *key;
2230 char submodule_token[5];
2231 char unmerged_prefix = 'u';
2232 char eol_char = s->null_termination ? '\0' : '\n';
2233
2234 wt_porcelain_v2_submodule_state(d, submodule_token);
2235
2236 switch (d->stagemask) {
2237 case 1: key = "DD"; break; /* both deleted */
2238 case 2: key = "AU"; break; /* added by us */
2239 case 3: key = "UD"; break; /* deleted by them */
2240 case 4: key = "UA"; break; /* added by them */
2241 case 5: key = "DU"; break; /* deleted by us */
2242 case 6: key = "AA"; break; /* both added */
2243 case 7: key = "UU"; break; /* both modified */
2244 default:
033abf97 2245 BUG("unhandled unmerged status %x", d->stagemask);
24959bad
JH
2246 }
2247
2248 /*
2249 * Disregard d.aux.porcelain_v2 data that we accumulated
2250 * for the head and index columns during the scans and
2251 * replace with the actual stage data.
2252 *
2253 * Note that this is a last-one-wins for each the individual
2254 * stage [123] columns in the event of multiple cache entries
2255 * for same stage.
2256 */
2257 memset(stages, 0, sizeof(stages));
2258 sum = 0;
5b02ca38 2259 pos = index_name_pos(istate, it->string, strlen(it->string));
24959bad
JH
2260 assert(pos < 0);
2261 pos = -pos-1;
5b02ca38
NTND
2262 while (pos < istate->cache_nr) {
2263 ce = istate->cache[pos++];
24959bad
JH
2264 stage = ce_stage(ce);
2265 if (strcmp(ce->name, it->string) || !stage)
2266 break;
2267 stages[stage - 1].mode = ce->ce_mode;
8694769f 2268 oidcpy(&stages[stage - 1].oid, &ce->oid);
24959bad
JH
2269 sum |= (1 << (stage - 1));
2270 }
2271 if (sum != d->stagemask)
033abf97 2272 BUG("observed stagemask 0x%x != expected stagemask 0x%x", sum, d->stagemask);
24959bad
JH
2273
2274 if (s->null_termination)
2275 path_index = it->string;
2276 else
2277 path_index = quote_path(it->string, s->prefix, &buf_index);
2278
2279 fprintf(s->fp, "%c %s %s %06o %06o %06o %06o %s %s %s %s%c",
2280 unmerged_prefix, key, submodule_token,
2281 stages[0].mode, /* stage 1 */
2282 stages[1].mode, /* stage 2 */
2283 stages[2].mode, /* stage 3 */
2284 d->mode_worktree,
2285 oid_to_hex(&stages[0].oid), /* stage 1 */
2286 oid_to_hex(&stages[1].oid), /* stage 2 */
2287 oid_to_hex(&stages[2].oid), /* stage 3 */
2288 path_index,
2289 eol_char);
2290
2291 strbuf_release(&buf_index);
2292}
2293
2294/*
2295 * Print porcelain V2 status info for untracked and ignored entries.
2296 */
2297static void wt_porcelain_v2_print_other(
2298 struct string_list_item *it,
2299 struct wt_status *s,
2300 char prefix)
2301{
2302 struct strbuf buf = STRBUF_INIT;
2303 const char *path;
2304 char eol_char;
2305
2306 if (s->null_termination) {
2307 path = it->string;
2308 eol_char = '\0';
2309 } else {
2310 path = quote_path(it->string, s->prefix, &buf);
2311 eol_char = '\n';
2312 }
2313
2314 fprintf(s->fp, "%c %s%c", prefix, path, eol_char);
2315
2316 strbuf_release(&buf);
2317}
2318
2319/*
2320 * Print porcelain V2 status.
2321 *
d9fc746c 2322 * [<v2_branch>]
24959bad
JH
2323 * [<v2_changed_items>]*
2324 * [<v2_unmerged_items>]*
2325 * [<v2_untracked_items>]*
2326 * [<v2_ignored_items>]*
2327 *
2328 */
2329static void wt_porcelain_v2_print(struct wt_status *s)
2330{
2331 struct wt_status_change_data *d;
2332 struct string_list_item *it;
2333 int i;
2334
d9fc746c
JH
2335 if (s->show_branch)
2336 wt_porcelain_v2_print_tracking(s);
2337
24959bad
JH
2338 for (i = 0; i < s->change.nr; i++) {
2339 it = &(s->change.items[i]);
2340 d = it->util;
2341 if (!d->stagemask)
2342 wt_porcelain_v2_print_changed_entry(it, s);
2343 }
2344
2345 for (i = 0; i < s->change.nr; i++) {
2346 it = &(s->change.items[i]);
2347 d = it->util;
2348 if (d->stagemask)
2349 wt_porcelain_v2_print_unmerged_entry(it, s);
2350 }
2351
2352 for (i = 0; i < s->untracked.nr; i++) {
2353 it = &(s->untracked.items[i]);
2354 wt_porcelain_v2_print_other(it, s, '?');
2355 }
2356
2357 for (i = 0; i < s->ignored.nr; i++) {
2358 it = &(s->ignored.items[i]);
2359 wt_porcelain_v2_print_other(it, s, '!');
2360 }
2361}
2362
be7e795e
JH
2363void wt_status_print(struct wt_status *s)
2364{
942b2740
JH
2365 trace2_data_intmax("status", s->repo, "count/changed", s->change.nr);
2366 trace2_data_intmax("status", s->repo, "count/untracked",
2367 s->untracked.nr);
2368 trace2_data_intmax("status", s->repo, "count/ignored", s->ignored.nr);
2369
2370 trace2_region_enter("status", "print", s->repo);
2371
be7e795e
JH
2372 switch (s->status_format) {
2373 case STATUS_FORMAT_SHORT:
2374 wt_shortstatus_print(s);
2375 break;
2376 case STATUS_FORMAT_PORCELAIN:
2377 wt_porcelain_print(s);
2378 break;
1ecdecce 2379 case STATUS_FORMAT_PORCELAIN_V2:
24959bad 2380 wt_porcelain_v2_print(s);
1ecdecce 2381 break;
be7e795e 2382 case STATUS_FORMAT_UNSPECIFIED:
033abf97 2383 BUG("finalize_deferred_config() should have been called");
be7e795e
JH
2384 break;
2385 case STATUS_FORMAT_NONE:
2386 case STATUS_FORMAT_LONG:
2387 wt_longstatus_print(s);
2388 break;
2389 }
942b2740
JH
2390
2391 trace2_region_leave("status", "print", s->repo);
be7e795e 2392}
fd84986f
JS
2393
2394/**
2395 * Returns 1 if there are unstaged changes, 0 otherwise.
2396 */
5b02ca38 2397int has_unstaged_changes(struct repository *r, int ignore_submodules)
fd84986f
JS
2398{
2399 struct rev_info rev_info;
2400 int result;
2401
5b02ca38 2402 repo_init_revisions(r, &rev_info, NULL);
c6d8ccf3 2403 if (ignore_submodules) {
0d1e0e78 2404 rev_info.diffopt.flags.ignore_submodules = 1;
b50d82b0 2405 rev_info.diffopt.flags.override_submodule_config = 1;
c6d8ccf3 2406 }
0d1e0e78 2407 rev_info.diffopt.flags.quick = 1;
fd84986f
JS
2408 diff_setup_done(&rev_info.diffopt);
2409 result = run_diff_files(&rev_info, 0);
2410 return diff_result_code(&rev_info.diffopt, result);
2411}
2412
2413/**
2414 * Returns 1 if there are uncommitted changes, 0 otherwise.
2415 */
5b02ca38
NTND
2416int has_uncommitted_changes(struct repository *r,
2417 int ignore_submodules)
fd84986f
JS
2418{
2419 struct rev_info rev_info;
2420 int result;
2421
5b02ca38 2422 if (is_index_unborn(r->index))
fd84986f
JS
2423 return 0;
2424
5b02ca38 2425 repo_init_revisions(r, &rev_info, NULL);
d8cc92ab 2426 if (ignore_submodules)
0d1e0e78
BW
2427 rev_info.diffopt.flags.ignore_submodules = 1;
2428 rev_info.diffopt.flags.quick = 1;
3506dc94 2429
fd84986f 2430 add_head_to_pending(&rev_info);
3506dc94
JK
2431 if (!rev_info.pending.nr) {
2432 /*
2433 * We have no head (or it's corrupt); use the empty tree,
2434 * which will complain if the index is non-empty.
2435 */
5b02ca38 2436 struct tree *tree = lookup_tree(r, the_hash_algo->empty_tree);
3506dc94
JK
2437 add_pending_object(&rev_info, &tree->object, "");
2438 }
2439
fd84986f
JS
2440 diff_setup_done(&rev_info.diffopt);
2441 result = run_diff_index(&rev_info, 1);
2442 return diff_result_code(&rev_info.diffopt, result);
2443}
2444
2445/**
2446 * If the work tree has unstaged or uncommitted changes, dies with the
2447 * appropriate message.
2448 */
5b02ca38
NTND
2449int require_clean_work_tree(struct repository *r,
2450 const char *action,
2451 const char *hint,
2452 int ignore_submodules,
2453 int gently)
fd84986f 2454{
837e34eb 2455 struct lock_file lock_file = LOCK_INIT;
89d38fb2 2456 int err = 0, fd;
fd84986f 2457
3a95f31d 2458 fd = repo_hold_locked_index(r, &lock_file, 0);
5b02ca38 2459 refresh_index(r->index, REFRESH_QUIET, NULL, NULL, NULL);
89d38fb2 2460 if (0 <= fd)
1b0d968b 2461 repo_update_index_if_able(r, &lock_file);
837e34eb 2462 rollback_lock_file(&lock_file);
fd84986f 2463
5b02ca38 2464 if (has_unstaged_changes(r, ignore_submodules)) {
fd84986f 2465 /* TRANSLATORS: the action is e.g. "pull with rebase" */
4777e175 2466 error(_("cannot %s: You have unstaged changes."), _(action));
fd84986f
JS
2467 err = 1;
2468 }
2469
5b02ca38 2470 if (has_uncommitted_changes(r, ignore_submodules)) {
fd84986f 2471 if (err)
4777e175 2472 error(_("additionally, your index contains uncommitted changes."));
fd84986f 2473 else
4777e175 2474 error(_("cannot %s: Your index contains uncommitted changes."),
fd84986f
JS
2475 _(action));
2476 err = 1;
2477 }
2478
2479 if (err) {
2480 if (hint)
2481 error("%s", hint);
2482 if (!gently)
2483 exit(128);
2484 }
2485
2486 return err;
2487}