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