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