repository.c: replace hold_locked_index() with repo_hold_locked_index()
[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
JH
750{
751 wt_status_collect_changes_worktree(s);
50b7e70f
JH
752 if (s->is_initial)
753 wt_status_collect_changes_initial(s);
754 else
755 wt_status_collect_changes_index(s);
76378683 756 wt_status_collect_untracked(s);
f3bd35fa 757
78845457 758 wt_status_get_state(s->repo, &s->state, s->branch && !strcmp(s->branch, "HEAD"));
73ba5d78 759 if (s->state.merge_in_progress && !has_unmerged(s))
f3bd35fa 760 s->committable = 1;
50b7e70f
JH
761}
762
73ba5d78
SS
763void wt_status_collect_free_buffers(struct wt_status *s)
764{
765 free(s->state.branch);
766 free(s->state.onto);
767 free(s->state.detached_from);
50b7e70f
JH
768}
769
957a0fe2 770static void wt_longstatus_print_unmerged(struct wt_status *s)
4d4d5726
JH
771{
772 int shown_header = 0;
773 int i;
774
775 for (i = 0; i < s->change.nr; i++) {
776 struct wt_status_change_data *d;
777 struct string_list_item *it;
778 it = &(s->change.items[i]);
779 d = it->util;
780 if (!d->stagemask)
781 continue;
782 if (!shown_header) {
957a0fe2 783 wt_longstatus_print_unmerged_header(s);
4d4d5726
JH
784 shown_header = 1;
785 }
957a0fe2 786 wt_longstatus_print_unmerged_data(s, it);
4d4d5726
JH
787 }
788 if (shown_header)
957a0fe2 789 wt_longstatus_print_trailer(s);
4d4d5726
JH
790
791}
792
957a0fe2 793static void wt_longstatus_print_updated(struct wt_status *s)
50b7e70f
JH
794{
795 int shown_header = 0;
796 int i;
797
798 for (i = 0; i < s->change.nr; i++) {
799 struct wt_status_change_data *d;
800 struct string_list_item *it;
801 it = &(s->change.items[i]);
802 d = it->util;
803 if (!d->index_status ||
804 d->index_status == DIFF_STATUS_UNMERGED)
805 continue;
806 if (!shown_header) {
957a0fe2 807 wt_longstatus_print_cached_header(s);
50b7e70f
JH
808 shown_header = 1;
809 }
957a0fe2 810 wt_longstatus_print_change_data(s, WT_STATUS_UPDATED, it);
50b7e70f
JH
811 }
812 if (shown_header)
957a0fe2 813 wt_longstatus_print_trailer(s);
50b7e70f
JH
814}
815
816/*
817 * -1 : has delete
818 * 0 : no change
819 * 1 : some change but no delete
820 */
9297f77e
JL
821static int wt_status_check_worktree_changes(struct wt_status *s,
822 int *dirty_submodules)
50b7e70f
JH
823{
824 int i;
825 int changes = 0;
826
9297f77e
JL
827 *dirty_submodules = 0;
828
50b7e70f
JH
829 for (i = 0; i < s->change.nr; i++) {
830 struct wt_status_change_data *d;
831 d = s->change.items[i].util;
4d4d5726
JH
832 if (!d->worktree_status ||
833 d->worktree_status == DIFF_STATUS_UNMERGED)
50b7e70f 834 continue;
9297f77e
JL
835 if (!changes)
836 changes = 1;
837 if (d->dirty_submodule)
838 *dirty_submodules = 1;
50b7e70f 839 if (d->worktree_status == DIFF_STATUS_DELETED)
9297f77e 840 changes = -1;
50b7e70f
JH
841 }
842 return changes;
843}
844
957a0fe2 845static void wt_longstatus_print_changed(struct wt_status *s)
c91f0d92 846{
9297f77e
JL
847 int i, dirty_submodules;
848 int worktree_changes = wt_status_check_worktree_changes(s, &dirty_submodules);
50b7e70f
JH
849
850 if (!worktree_changes)
851 return;
852
957a0fe2 853 wt_longstatus_print_dirty_header(s, worktree_changes < 0, dirty_submodules);
50b7e70f
JH
854
855 for (i = 0; i < s->change.nr; i++) {
856 struct wt_status_change_data *d;
857 struct string_list_item *it;
858 it = &(s->change.items[i]);
859 d = it->util;
4d4d5726
JH
860 if (!d->worktree_status ||
861 d->worktree_status == DIFF_STATUS_UNMERGED)
50b7e70f 862 continue;
957a0fe2 863 wt_longstatus_print_change_data(s, WT_STATUS_CHANGED, it);
50b7e70f 864 }
957a0fe2 865 wt_longstatus_print_trailer(s);
c91f0d92
JK
866}
867
c1b5d019
LB
868static int stash_count_refs(struct object_id *ooid, struct object_id *noid,
869 const char *email, timestamp_t timestamp, int tz,
870 const char *message, void *cb_data)
871{
872 int *c = cb_data;
873 (*c)++;
874 return 0;
875}
876
877static void wt_longstatus_print_stash_summary(struct wt_status *s)
878{
879 int stash_count = 0;
880
881 for_each_reflog_ent("refs/stash", stash_count_refs, &stash_count);
882 if (stash_count > 0)
883 status_printf_ln(s, GIT_COLOR_NORMAL,
884 Q_("Your stash currently has %d entry",
885 "Your stash currently has %d entries", stash_count),
886 stash_count);
887}
888
957a0fe2 889static void wt_longstatus_print_submodule_summary(struct wt_status *s, int uncommitted)
ac8d5afc 890{
d3180279 891 struct child_process sm_summary = CHILD_PROCESS_INIT;
3ba7407b
MM
892 struct strbuf cmd_stdout = STRBUF_INIT;
893 struct strbuf summary = STRBUF_INIT;
894 char *summary_content;
ac8d5afc 895
a9154590
RS
896 argv_array_pushf(&sm_summary.env_array, "GIT_INDEX_FILE=%s",
897 s->index_file);
ac8d5afc 898
a2bae2dc
RS
899 argv_array_push(&sm_summary.args, "submodule");
900 argv_array_push(&sm_summary.args, "summary");
901 argv_array_push(&sm_summary.args, uncommitted ? "--files" : "--cached");
902 argv_array_push(&sm_summary.args, "--for-status");
903 argv_array_push(&sm_summary.args, "--summary-limit");
904 argv_array_pushf(&sm_summary.args, "%d", s->submodule_summary);
bb7e32e3 905 if (!uncommitted)
a2bae2dc 906 argv_array_push(&sm_summary.args, s->amend ? "HEAD^" : "HEAD");
bb7e32e3 907
ac8d5afc
PY
908 sm_summary.git_cmd = 1;
909 sm_summary.no_stdin = 1;
3ba7407b 910
5c950e9b 911 capture_command(&sm_summary, &cmd_stdout, 1024);
3ba7407b
MM
912
913 /* prepend header, only if there's an actual output */
d56d966b 914 if (cmd_stdout.len) {
3ba7407b
MM
915 if (uncommitted)
916 strbuf_addstr(&summary, _("Submodules changed but not updated:"));
917 else
918 strbuf_addstr(&summary, _("Submodule changes to be committed:"));
919 strbuf_addstr(&summary, "\n\n");
920 }
921 strbuf_addbuf(&summary, &cmd_stdout);
922 strbuf_release(&cmd_stdout);
923
2556b996 924 if (s->display_comment_prefix) {
d56d966b 925 size_t len;
2556b996
MM
926 summary_content = strbuf_detach(&summary, &len);
927 strbuf_add_commented_lines(&summary, summary_content, len);
928 free(summary_content);
929 }
3ba7407b
MM
930
931 fputs(summary.buf, s->fp);
932 strbuf_release(&summary);
ac8d5afc
PY
933}
934
957a0fe2
JH
935static void wt_longstatus_print_other(struct wt_status *s,
936 struct string_list *l,
937 const char *what,
938 const char *how)
c91f0d92 939{
c91f0d92 940 int i;
f285a2d7 941 struct strbuf buf = STRBUF_INIT;
323d0530
NTND
942 static struct string_list output = STRING_LIST_INIT_DUP;
943 struct column_options copts;
c91f0d92 944
1282988b 945 if (!l->nr)
76378683 946 return;
c91f0d92 947
957a0fe2 948 wt_longstatus_print_other_header(s, what, how);
1b908b6f
JH
949
950 for (i = 0; i < l->nr; i++) {
76378683 951 struct string_list_item *it;
323d0530 952 const char *path;
1b908b6f 953 it = &(l->items[i]);
39598f99 954 path = quote_path(it->string, s->prefix, &buf);
323d0530
NTND
955 if (column_active(s->colopts)) {
956 string_list_append(&output, path);
957 continue;
958 }
b926c0d1
JN
959 status_printf(s, color(WT_STATUS_HEADER, s), "\t");
960 status_printf_more(s, color(WT_STATUS_UNTRACKED, s),
323d0530 961 "%s\n", path);
c91f0d92 962 }
323d0530
NTND
963
964 strbuf_release(&buf);
965 if (!column_active(s->colopts))
2f0f7f1c 966 goto conclude;
323d0530 967
2556b996 968 strbuf_addf(&buf, "%s%s\t%s",
323d0530 969 color(WT_STATUS_HEADER, s),
2556b996 970 s->display_comment_prefix ? "#" : "",
323d0530
NTND
971 color(WT_STATUS_UNTRACKED, s));
972 memset(&copts, 0, sizeof(copts));
973 copts.padding = 1;
974 copts.indent = buf.buf;
975 if (want_color(s->use_color))
976 copts.nl = GIT_COLOR_RESET "\n";
977 print_columns(&output, s->colopts, &copts);
978 string_list_clear(&output, 0);
367c9886 979 strbuf_release(&buf);
2f0f7f1c 980conclude:
7d7d6802 981 status_printf_ln(s, GIT_COLOR_NORMAL, "%s", "");
c91f0d92
JK
982}
983
d76650b8 984size_t wt_status_locate_end(const char *s, size_t len)
1a72cfd7
JL
985{
986 const char *p;
987 struct strbuf pattern = STRBUF_INIT;
988
fbfa0973 989 strbuf_addf(&pattern, "\n%c %s", comment_line_char, cut_line);
d76650b8
BM
990 if (starts_with(s, pattern.buf + 1))
991 len = 0;
992 else if ((p = strstr(s, pattern.buf)))
993 len = p - s + 1;
1a72cfd7 994 strbuf_release(&pattern);
d76650b8 995 return len;
1a72cfd7
JL
996}
997
fcef9312
NTND
998void wt_status_add_cut_line(FILE *fp)
999{
8c4b1a35 1000 const char *explanation = _("Do not modify or remove the line above.\nEverything below it will be ignored.");
fcef9312
NTND
1001 struct strbuf buf = STRBUF_INIT;
1002
1003 fprintf(fp, "%c %s", comment_line_char, cut_line);
1004 strbuf_add_commented_lines(&buf, explanation, strlen(explanation));
1005 fputs(buf.buf, fp);
1006 strbuf_release(&buf);
1007}
1008
957a0fe2 1009static void wt_longstatus_print_verbose(struct wt_status *s)
c91f0d92
JK
1010{
1011 struct rev_info rev;
32962c9b 1012 struct setup_revision_opt opt;
40555000
MG
1013 int dirty_submodules;
1014 const char *c = color(WT_STATUS_HEADER, s);
99a12694 1015
5b02ca38 1016 repo_init_revisions(s->repo, &rev, NULL);
0d1e0e78 1017 rev.diffopt.flags.allow_textconv = 1;
425a28e0 1018 rev.diffopt.ita_invisible_in_index = 1;
32962c9b
JH
1019
1020 memset(&opt, 0, sizeof(opt));
f2e51195 1021 opt.def = s->is_initial ? empty_tree_oid_hex() : s->reference;
32962c9b
JH
1022 setup_revisions(0, NULL, &rev, &opt);
1023
c91f0d92 1024 rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
e8b2dc2c
BP
1025 rev.diffopt.detect_rename = s->detect_rename >= 0 ? s->detect_rename : rev.diffopt.detect_rename;
1026 rev.diffopt.rename_limit = s->rename_limit >= 0 ? s->rename_limit : rev.diffopt.rename_limit;
1027 rev.diffopt.rename_score = s->rename_score >= 0 ? s->rename_score : rev.diffopt.rename_score;
4ba0cb27
KH
1028 rev.diffopt.file = s->fp;
1029 rev.diffopt.close_file = 0;
4f672ad6
JK
1030 /*
1031 * If we're not going to stdout, then we definitely don't
1032 * want color, since we are going to the commit message
1033 * file (and even the "auto" setting won't work, since it
1a72cfd7
JL
1034 * will have checked isatty on stdout). But we then do want
1035 * to insert the scissor line here to reliably remove the
1036 * diff before committing.
4f672ad6 1037 */
1a72cfd7 1038 if (s->fp != stdout) {
f1c96261 1039 rev.diffopt.use_color = 0;
fcef9312 1040 wt_status_add_cut_line(s->fp);
1a72cfd7 1041 }
6fa90194 1042 if (s->verbose > 1 && s->committable) {
40555000
MG
1043 /* print_updated() printed a header, so do we */
1044 if (s->fp != stdout)
957a0fe2 1045 wt_longstatus_print_trailer(s);
40555000
MG
1046 status_printf_ln(s, c, _("Changes to be committed:"));
1047 rev.diffopt.a_prefix = "c/";
1048 rev.diffopt.b_prefix = "i/";
1049 } /* else use prefix as per user config */
c91f0d92 1050 run_diff_index(&rev, 1);
40555000
MG
1051 if (s->verbose > 1 &&
1052 wt_status_check_worktree_changes(s, &dirty_submodules)) {
1053 status_printf_ln(s, c,
1054 "--------------------------------------------------");
1055 status_printf_ln(s, c, _("Changes not staged for commit:"));
1056 setup_work_tree();
1057 rev.diffopt.a_prefix = "i/";
1058 rev.diffopt.b_prefix = "w/";
1059 run_diff_files(&rev, 0);
1060 }
c91f0d92
JK
1061}
1062
957a0fe2 1063static void wt_longstatus_print_tracking(struct wt_status *s)
b6975ab5
JH
1064{
1065 struct strbuf sb = STRBUF_INIT;
c72b49df 1066 const char *cp, *ep, *branch_name;
b6975ab5 1067 struct branch *branch;
2556b996
MM
1068 char comment_line_string[3];
1069 int i;
b6975ab5
JH
1070
1071 assert(s->branch && !s->is_initial);
c72b49df 1072 if (!skip_prefix(s->branch, "refs/heads/", &branch_name))
b6975ab5 1073 return;
c72b49df 1074 branch = branch_get(branch_name);
f39a757d 1075 if (!format_tracking_info(branch, &sb, s->ahead_behind_flags))
b6975ab5
JH
1076 return;
1077
2556b996
MM
1078 i = 0;
1079 if (s->display_comment_prefix) {
1080 comment_line_string[i++] = comment_line_char;
1081 comment_line_string[i++] = ' ';
1082 }
1083 comment_line_string[i] = '\0';
1084
b6975ab5 1085 for (cp = sb.buf; (ep = strchr(cp, '\n')) != NULL; cp = ep + 1)
d249b098 1086 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s),
2556b996 1087 "%s%.*s", comment_line_string,
eff80a9f 1088 (int)(ep - cp), cp);
2556b996
MM
1089 if (s->display_comment_prefix)
1090 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s), "%c",
1091 comment_line_char);
1092 else
75177c85 1093 fputs("\n", s->fp);
b6ec3071 1094 strbuf_release(&sb);
b6975ab5
JH
1095}
1096
83c750ac 1097static void show_merge_in_progress(struct wt_status *s,
73ba5d78 1098 const char *color)
83c750ac
LK
1099{
1100 if (has_unmerged(s)) {
1101 status_printf_ln(s, color, _("You have unmerged paths."));
b0a61ab2 1102 if (s->hints) {
83c750ac 1103 status_printf_ln(s, color,
b0a61ab2 1104 _(" (fix conflicts and run \"git commit\")"));
83c750ac 1105 status_printf_ln(s, color,
b0a61ab2
MM
1106 _(" (use \"git merge --abort\" to abort the merge)"));
1107 }
83c750ac
LK
1108 } else {
1109 status_printf_ln(s, color,
1110 _("All conflicts fixed but you are still merging."));
6a964f57 1111 if (s->hints)
83c750ac
LK
1112 status_printf_ln(s, color,
1113 _(" (use \"git commit\" to conclude merge)"));
1114 }
957a0fe2 1115 wt_longstatus_print_trailer(s);
83c750ac
LK
1116}
1117
1118static void show_am_in_progress(struct wt_status *s,
83c750ac
LK
1119 const char *color)
1120{
1121 status_printf_ln(s, color,
1122 _("You are in the middle of an am session."));
73ba5d78 1123 if (s->state.am_empty_patch)
83c750ac
LK
1124 status_printf_ln(s, color,
1125 _("The current patch is empty."));
6a964f57 1126 if (s->hints) {
73ba5d78 1127 if (!s->state.am_empty_patch)
83c750ac 1128 status_printf_ln(s, color,
8ceb6fbd 1129 _(" (fix conflicts and then run \"git am --continue\")"));
83c750ac
LK
1130 status_printf_ln(s, color,
1131 _(" (use \"git am --skip\" to skip this patch)"));
1132 status_printf_ln(s, color,
1133 _(" (use \"git am --abort\" to restore the original branch)"));
1134 }
957a0fe2 1135 wt_longstatus_print_trailer(s);
83c750ac
LK
1136}
1137
2d1cceba
LK
1138static char *read_line_from_git_path(const char *filename)
1139{
1140 struct strbuf buf = STRBUF_INIT;
e9d983f1
NTND
1141 FILE *fp = fopen_or_warn(git_path("%s", filename), "r");
1142
2d1cceba
LK
1143 if (!fp) {
1144 strbuf_release(&buf);
1145 return NULL;
1146 }
8f309aeb 1147 strbuf_getline_lf(&buf, fp);
2d1cceba
LK
1148 if (!fclose(fp)) {
1149 return strbuf_detach(&buf, NULL);
1150 } else {
1151 strbuf_release(&buf);
1152 return NULL;
1153 }
1154}
1155
1156static int split_commit_in_progress(struct wt_status *s)
1157{
1158 int split_in_progress = 0;
41fc6b33 1159 char *head, *orig_head, *rebase_amend, *rebase_orig_head;
2d1cceba 1160
41fc6b33 1161 if ((!s->amend && !s->nowarn && !s->workdir_dirty) ||
2d1cceba 1162 !s->branch || strcmp(s->branch, "HEAD"))
41fc6b33 1163 return 0;
2d1cceba 1164
41fc6b33
JS
1165 head = read_line_from_git_path("HEAD");
1166 orig_head = read_line_from_git_path("ORIG_HEAD");
1167 rebase_amend = read_line_from_git_path("rebase-merge/amend");
1168 rebase_orig_head = read_line_from_git_path("rebase-merge/orig-head");
2d1cceba 1169
41fc6b33
JS
1170 if (!head || !orig_head || !rebase_amend || !rebase_orig_head)
1171 ; /* fall through, no split in progress */
1172 else if (!strcmp(rebase_amend, rebase_orig_head))
1173 split_in_progress = !!strcmp(head, rebase_amend);
1174 else if (strcmp(orig_head, rebase_orig_head))
1175 split_in_progress = 1;
2d1cceba
LK
1176
1177 free(head);
1178 free(orig_head);
1179 free(rebase_amend);
1180 free(rebase_orig_head);
41fc6b33 1181
2d1cceba
LK
1182 return split_in_progress;
1183}
1184
84e6fb9d
GP
1185/*
1186 * Turn
1187 * "pick d6a2f0303e897ec257dd0e0a39a5ccb709bc2047 some message"
1188 * into
1189 * "pick d6a2f03 some message"
1190 *
1191 * The function assumes that the line does not contain useless spaces
1192 * before or after the command.
1193 */
1194static void abbrev_sha1_in_line(struct strbuf *line)
1195{
1196 struct strbuf **split;
1197 int i;
1198
1199 if (starts_with(line->buf, "exec ") ||
1200 starts_with(line->buf, "x "))
1201 return;
1202
1203 split = strbuf_split_max(line, ' ', 3);
1204 if (split[0] && split[1]) {
e86ab2c1 1205 struct object_id oid;
84e6fb9d
GP
1206
1207 /*
1208 * strbuf_split_max left a space. Trim it and re-add
1209 * it after abbreviation.
1210 */
1211 strbuf_trim(split[1]);
e86ab2c1 1212 if (!get_oid(split[1]->buf, &oid)) {
84e6fb9d 1213 strbuf_reset(split[1]);
30e677e0 1214 strbuf_add_unique_abbrev(split[1], &oid,
a94bb683
RS
1215 DEFAULT_ABBREV);
1216 strbuf_addch(split[1], ' ');
84e6fb9d
GP
1217 strbuf_reset(line);
1218 for (i = 0; split[i]; i++)
8109984d 1219 strbuf_addbuf(line, split[i]);
84e6fb9d
GP
1220 }
1221 }
6eb6078b 1222 strbuf_list_free(split);
84e6fb9d
GP
1223}
1224
df9ded49 1225static int read_rebase_todolist(const char *fname, struct string_list *lines)
84e6fb9d
GP
1226{
1227 struct strbuf line = STRBUF_INIT;
1228 FILE *f = fopen(git_path("%s", fname), "r");
1229
df9ded49
JS
1230 if (!f) {
1231 if (errno == ENOENT)
1232 return -1;
84e6fb9d
GP
1233 die_errno("Could not open file %s for reading",
1234 git_path("%s", fname));
df9ded49 1235 }
8f309aeb 1236 while (!strbuf_getline_lf(&line, f)) {
84e6fb9d
GP
1237 if (line.len && line.buf[0] == comment_line_char)
1238 continue;
1239 strbuf_trim(&line);
1240 if (!line.len)
1241 continue;
1242 abbrev_sha1_in_line(&line);
1243 string_list_append(lines, line.buf);
1244 }
e7b65e20 1245 fclose(f);
6f49541d 1246 strbuf_release(&line);
df9ded49 1247 return 0;
84e6fb9d
GP
1248}
1249
1250static void show_rebase_information(struct wt_status *s,
73ba5d78 1251 const char *color)
84e6fb9d 1252{
73ba5d78 1253 if (s->state.rebase_interactive_in_progress) {
84e6fb9d
GP
1254 int i;
1255 int nr_lines_to_show = 2;
1256
1257 struct string_list have_done = STRING_LIST_INIT_DUP;
1258 struct string_list yet_to_do = STRING_LIST_INIT_DUP;
1259
1260 read_rebase_todolist("rebase-merge/done", &have_done);
df9ded49
JS
1261 if (read_rebase_todolist("rebase-merge/git-rebase-todo",
1262 &yet_to_do))
1263 status_printf_ln(s, color,
1264 _("git-rebase-todo is missing."));
84e6fb9d
GP
1265 if (have_done.nr == 0)
1266 status_printf_ln(s, color, _("No commands done."));
1267 else {
1268 status_printf_ln(s, color,
1269 Q_("Last command done (%d command done):",
1270 "Last commands done (%d commands done):",
1271 have_done.nr),
1272 have_done.nr);
1273 for (i = (have_done.nr > nr_lines_to_show)
1274 ? have_done.nr - nr_lines_to_show : 0;
1275 i < have_done.nr;
1276 i++)
1277 status_printf_ln(s, color, " %s", have_done.items[i].string);
1278 if (have_done.nr > nr_lines_to_show && s->hints)
1279 status_printf_ln(s, color,
1280 _(" (see more in file %s)"), git_path("rebase-merge/done"));
1281 }
1282
1283 if (yet_to_do.nr == 0)
1284 status_printf_ln(s, color,
1285 _("No commands remaining."));
1286 else {
1287 status_printf_ln(s, color,
1288 Q_("Next command to do (%d remaining command):",
1289 "Next commands to do (%d remaining commands):",
1290 yet_to_do.nr),
1291 yet_to_do.nr);
1292 for (i = 0; i < nr_lines_to_show && i < yet_to_do.nr; i++)
1293 status_printf_ln(s, color, " %s", yet_to_do.items[i].string);
1294 if (s->hints)
1295 status_printf_ln(s, color,
1296 _(" (use \"git rebase --edit-todo\" to view and edit)"));
1297 }
1298 string_list_clear(&yet_to_do, 0);
1299 string_list_clear(&have_done, 0);
1300 }
1301}
1302
05eb5635 1303static void print_rebase_state(struct wt_status *s,
73ba5d78 1304 const char *color)
05eb5635 1305{
73ba5d78 1306 if (s->state.branch)
05eb5635
GP
1307 status_printf_ln(s, color,
1308 _("You are currently rebasing branch '%s' on '%s'."),
73ba5d78
SS
1309 s->state.branch,
1310 s->state.onto);
05eb5635
GP
1311 else
1312 status_printf_ln(s, color,
1313 _("You are currently rebasing."));
1314}
1315
83c750ac 1316static void show_rebase_in_progress(struct wt_status *s,
73ba5d78 1317 const char *color)
83c750ac
LK
1318{
1319 struct stat st;
1320
73ba5d78 1321 show_rebase_information(s, color);
83c750ac 1322 if (has_unmerged(s)) {
73ba5d78 1323 print_rebase_state(s, color);
6a964f57 1324 if (s->hints) {
83c750ac
LK
1325 status_printf_ln(s, color,
1326 _(" (fix conflicts and then run \"git rebase --continue\")"));
1327 status_printf_ln(s, color,
1328 _(" (use \"git rebase --skip\" to skip this patch)"));
1329 status_printf_ln(s, color,
1330 _(" (use \"git rebase --abort\" to check out the original branch)"));
1331 }
73ba5d78 1332 } else if (s->state.rebase_in_progress ||
5b02ca38 1333 !stat(git_path_merge_msg(s->repo), &st)) {
73ba5d78 1334 print_rebase_state(s, color);
6a964f57 1335 if (s->hints)
83c750ac
LK
1336 status_printf_ln(s, color,
1337 _(" (all conflicts fixed: run \"git rebase --continue\")"));
2d1cceba 1338 } else if (split_commit_in_progress(s)) {
73ba5d78 1339 if (s->state.branch)
0722c805
NTND
1340 status_printf_ln(s, color,
1341 _("You are currently splitting a commit while rebasing branch '%s' on '%s'."),
73ba5d78
SS
1342 s->state.branch,
1343 s->state.onto);
0722c805
NTND
1344 else
1345 status_printf_ln(s, color,
1346 _("You are currently splitting a commit during a rebase."));
6a964f57 1347 if (s->hints)
2d1cceba
LK
1348 status_printf_ln(s, color,
1349 _(" (Once your working directory is clean, run \"git rebase --continue\")"));
83c750ac 1350 } else {
73ba5d78 1351 if (s->state.branch)
0722c805
NTND
1352 status_printf_ln(s, color,
1353 _("You are currently editing a commit while rebasing branch '%s' on '%s'."),
73ba5d78
SS
1354 s->state.branch,
1355 s->state.onto);
0722c805
NTND
1356 else
1357 status_printf_ln(s, color,
1358 _("You are currently editing a commit during a rebase."));
6a964f57 1359 if (s->hints && !s->amend) {
83c750ac
LK
1360 status_printf_ln(s, color,
1361 _(" (use \"git commit --amend\" to amend the current commit)"));
1362 status_printf_ln(s, color,
1363 _(" (use \"git rebase --continue\" once you are satisfied with your changes)"));
1364 }
1365 }
957a0fe2 1366 wt_longstatus_print_trailer(s);
83c750ac
LK
1367}
1368
1369static void show_cherry_pick_in_progress(struct wt_status *s,
73ba5d78 1370 const char *color)
83c750ac 1371{
bffd8098 1372 status_printf_ln(s, color, _("You are currently cherry-picking commit %s."),
73ba5d78 1373 find_unique_abbrev(&s->state.cherry_pick_head_oid, DEFAULT_ABBREV));
6a964f57 1374 if (s->hints) {
83c750ac
LK
1375 if (has_unmerged(s))
1376 status_printf_ln(s, color,
b95e66f5 1377 _(" (fix conflicts and run \"git cherry-pick --continue\")"));
83c750ac
LK
1378 else
1379 status_printf_ln(s, color,
b95e66f5
RT
1380 _(" (all conflicts fixed: run \"git cherry-pick --continue\")"));
1381 status_printf_ln(s, color,
1382 _(" (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"));
83c750ac 1383 }
957a0fe2 1384 wt_longstatus_print_trailer(s);
83c750ac
LK
1385}
1386
db4ef449 1387static void show_revert_in_progress(struct wt_status *s,
73ba5d78 1388 const char *color)
db4ef449 1389{
87e139c0 1390 status_printf_ln(s, color, _("You are currently reverting commit %s."),
73ba5d78 1391 find_unique_abbrev(&s->state.revert_head_oid, DEFAULT_ABBREV));
6a964f57 1392 if (s->hints) {
db4ef449
MM
1393 if (has_unmerged(s))
1394 status_printf_ln(s, color,
1395 _(" (fix conflicts and run \"git revert --continue\")"));
1396 else
1397 status_printf_ln(s, color,
1398 _(" (all conflicts fixed: run \"git revert --continue\")"));
1399 status_printf_ln(s, color,
1400 _(" (use \"git revert --abort\" to cancel the revert operation)"));
1401 }
957a0fe2 1402 wt_longstatus_print_trailer(s);
db4ef449
MM
1403}
1404
83c750ac 1405static void show_bisect_in_progress(struct wt_status *s,
73ba5d78 1406 const char *color)
83c750ac 1407{
73ba5d78 1408 if (s->state.branch)
0722c805 1409 status_printf_ln(s, color,
6deab24d 1410 _("You are currently bisecting, started from branch '%s'."),
73ba5d78 1411 s->state.branch);
0722c805
NTND
1412 else
1413 status_printf_ln(s, color,
1414 _("You are currently bisecting."));
6a964f57 1415 if (s->hints)
83c750ac
LK
1416 status_printf_ln(s, color,
1417 _(" (use \"git bisect reset\" to get back to the original branch)"));
957a0fe2 1418 wt_longstatus_print_trailer(s);
83c750ac
LK
1419}
1420
0722c805
NTND
1421/*
1422 * Extract branch information from rebase/bisect
1423 */
81eff27b 1424static char *get_branch(const struct worktree *wt, const char *path)
0722c805 1425{
8b87cfd0 1426 struct strbuf sb = STRBUF_INIT;
e86ab2c1 1427 struct object_id oid;
c72b49df 1428 const char *branch_name;
0722c805 1429
81eff27b 1430 if (strbuf_read_file(&sb, worktree_git_path(wt, "%s", path), 0) <= 0)
8b87cfd0 1431 goto got_nothing;
0722c805 1432
66ec904b 1433 while (sb.len && sb.buf[sb.len - 1] == '\n')
8b87cfd0
NTND
1434 strbuf_setlen(&sb, sb.len - 1);
1435 if (!sb.len)
1436 goto got_nothing;
c72b49df
RS
1437 if (skip_prefix(sb.buf, "refs/heads/", &branch_name))
1438 strbuf_remove(&sb, 0, branch_name - sb.buf);
59556548 1439 else if (starts_with(sb.buf, "refs/"))
8b87cfd0 1440 ;
e86ab2c1 1441 else if (!get_oid_hex(sb.buf, &oid)) {
8b87cfd0 1442 strbuf_reset(&sb);
30e677e0 1443 strbuf_add_unique_abbrev(&sb, &oid, DEFAULT_ABBREV);
8b87cfd0
NTND
1444 } else if (!strcmp(sb.buf, "detached HEAD")) /* rebase */
1445 goto got_nothing;
0722c805 1446 else /* bisect */
8b87cfd0
NTND
1447 ;
1448 return strbuf_detach(&sb, NULL);
1449
1450got_nothing:
1451 strbuf_release(&sb);
1452 return NULL;
0722c805
NTND
1453}
1454
b397ea48 1455struct grab_1st_switch_cbdata {
b397ea48 1456 struct strbuf buf;
e86ab2c1 1457 struct object_id noid;
b397ea48
NTND
1458};
1459
9461d272 1460static int grab_1st_switch(struct object_id *ooid, struct object_id *noid,
dddbad72 1461 const char *email, timestamp_t timestamp, int tz,
b397ea48 1462 const char *message, void *cb_data)
83c750ac 1463{
b397ea48
NTND
1464 struct grab_1st_switch_cbdata *cb = cb_data;
1465 const char *target = NULL, *end;
83c750ac 1466
c72b49df 1467 if (!skip_prefix(message, "checkout: moving from ", &message))
b397ea48 1468 return 0;
b397ea48
NTND
1469 target = strstr(message, " to ");
1470 if (!target)
1471 return 0;
1472 target += strlen(" to ");
1473 strbuf_reset(&cb->buf);
e86ab2c1 1474 oidcpy(&cb->noid, noid);
904de44c
RS
1475 end = strchrnul(target, '\n');
1476 strbuf_add(&cb->buf, target, end - target);
1477 if (!strcmp(cb->buf.buf, "HEAD")) {
0eb8548f 1478 /* HEAD is relative. Resolve it to the right reflog entry. */
904de44c 1479 strbuf_reset(&cb->buf);
30e677e0 1480 strbuf_add_unique_abbrev(&cb->buf, noid, DEFAULT_ABBREV);
0eb8548f 1481 }
b397ea48
NTND
1482 return 1;
1483}
1484
78845457
NTND
1485static void wt_status_get_detached_from(struct repository *r,
1486 struct wt_status_state *state)
b397ea48
NTND
1487{
1488 struct grab_1st_switch_cbdata cb;
1489 struct commit *commit;
e86ab2c1 1490 struct object_id oid;
b397ea48
NTND
1491 char *ref = NULL;
1492
1493 strbuf_init(&cb.buf, 0);
1494 if (for_each_reflog_ent_reverse("HEAD", grab_1st_switch, &cb) <= 0) {
1495 strbuf_release(&cb.buf);
1496 return;
1497 }
1498
cca5fa64 1499 if (dwim_ref(cb.buf.buf, cb.buf.len, &oid, &ref) == 1 &&
b397ea48 1500 /* sha1 is a commit? match without further lookup */
4a7e27e9 1501 (oideq(&cb.noid, &oid) ||
b397ea48 1502 /* perhaps sha1 is a tag, try to dereference to a commit */
78845457 1503 ((commit = lookup_commit_reference_gently(r, &oid, 1)) != NULL &&
4a7e27e9 1504 oideq(&cb.noid, &commit->object.oid)))) {
c72b49df
RS
1505 const char *from = ref;
1506 if (!skip_prefix(from, "refs/tags/", &from))
1507 skip_prefix(from, "refs/remotes/", &from);
1508 state->detached_from = xstrdup(from);
b397ea48
NTND
1509 } else
1510 state->detached_from =
aab9583f 1511 xstrdup(find_unique_abbrev(&cb.noid, DEFAULT_ABBREV));
40f5555c 1512 oidcpy(&state->detached_oid, &cb.noid);
e86ab2c1 1513 state->detached_at = !get_oid("HEAD", &oid) &&
4a7e27e9 1514 oideq(&oid, &state->detached_oid);
b397ea48
NTND
1515
1516 free(ref);
1517 strbuf_release(&cb.buf);
1518}
1519
81eff27b
NTND
1520int wt_status_check_rebase(const struct worktree *wt,
1521 struct wt_status_state *state)
83c750ac 1522{
83c750ac 1523 struct stat st;
83c750ac 1524
81eff27b
NTND
1525 if (!stat(worktree_git_path(wt, "rebase-apply"), &st)) {
1526 if (!stat(worktree_git_path(wt, "rebase-apply/applying"), &st)) {
b9691db4 1527 state->am_in_progress = 1;
81eff27b 1528 if (!stat(worktree_git_path(wt, "rebase-apply/patch"), &st) && !st.st_size)
b9691db4 1529 state->am_empty_patch = 1;
83c750ac 1530 } else {
b9691db4 1531 state->rebase_in_progress = 1;
81eff27b
NTND
1532 state->branch = get_branch(wt, "rebase-apply/head-name");
1533 state->onto = get_branch(wt, "rebase-apply/onto");
83c750ac 1534 }
81eff27b
NTND
1535 } else if (!stat(worktree_git_path(wt, "rebase-merge"), &st)) {
1536 if (!stat(worktree_git_path(wt, "rebase-merge/interactive"), &st))
b9691db4 1537 state->rebase_interactive_in_progress = 1;
83c750ac 1538 else
b9691db4 1539 state->rebase_in_progress = 1;
81eff27b
NTND
1540 state->branch = get_branch(wt, "rebase-merge/head-name");
1541 state->onto = get_branch(wt, "rebase-merge/onto");
bcd522a1
NTND
1542 } else
1543 return 0;
1544 return 1;
1545}
1546
f5d067a2
NTND
1547int wt_status_check_bisect(const struct worktree *wt,
1548 struct wt_status_state *state)
1549{
1550 struct stat st;
1551
1552 if (!stat(worktree_git_path(wt, "BISECT_LOG"), &st)) {
1553 state->bisect_in_progress = 1;
1554 state->branch = get_branch(wt, "BISECT_START");
1555 return 1;
1556 }
1557 return 0;
1558}
1559
78845457
NTND
1560void wt_status_get_state(struct repository *r,
1561 struct wt_status_state *state,
bcd522a1
NTND
1562 int get_detached_from)
1563{
1564 struct stat st;
e86ab2c1 1565 struct object_id oid;
bcd522a1 1566
78845457 1567 if (!stat(git_path_merge_head(r), &st)) {
982288e9 1568 wt_status_check_rebase(NULL, state);
bcd522a1 1569 state->merge_in_progress = 1;
81eff27b 1570 } else if (wt_status_check_rebase(NULL, state)) {
bcd522a1 1571 ; /* all set */
78845457 1572 } else if (!stat(git_path_cherry_pick_head(r), &st) &&
e86ab2c1 1573 !get_oid("CHERRY_PICK_HEAD", &oid)) {
b9691db4 1574 state->cherry_pick_in_progress = 1;
40f5555c 1575 oidcpy(&state->cherry_pick_head_oid, &oid);
83c750ac 1576 }
f5d067a2 1577 wt_status_check_bisect(NULL, state);
78845457 1578 if (!stat(git_path_revert_head(r), &st) &&
e86ab2c1 1579 !get_oid("REVERT_HEAD", &oid)) {
db4ef449 1580 state->revert_in_progress = 1;
40f5555c 1581 oidcpy(&state->revert_head_oid, &oid);
db4ef449 1582 }
83c750ac 1583
b397ea48 1584 if (get_detached_from)
78845457 1585 wt_status_get_detached_from(r, state);
b9691db4
NTND
1586}
1587
73ba5d78 1588static void wt_longstatus_print_state(struct wt_status *s)
b9691db4
NTND
1589{
1590 const char *state_color = color(WT_STATUS_HEADER, s);
73ba5d78
SS
1591 struct wt_status_state *state = &s->state;
1592
982288e9
JS
1593 if (state->merge_in_progress) {
1594 if (state->rebase_interactive_in_progress) {
1595 show_rebase_information(s, state_color);
1596 fputs("\n", s->fp);
1597 }
73ba5d78 1598 show_merge_in_progress(s, state_color);
982288e9 1599 } else if (state->am_in_progress)
73ba5d78 1600 show_am_in_progress(s, state_color);
3b691ccc 1601 else if (state->rebase_in_progress || state->rebase_interactive_in_progress)
73ba5d78 1602 show_rebase_in_progress(s, state_color);
3b691ccc 1603 else if (state->cherry_pick_in_progress)
73ba5d78 1604 show_cherry_pick_in_progress(s, state_color);
db4ef449 1605 else if (state->revert_in_progress)
73ba5d78 1606 show_revert_in_progress(s, state_color);
3b691ccc 1607 if (state->bisect_in_progress)
73ba5d78 1608 show_bisect_in_progress(s, state_color);
83c750ac
LK
1609}
1610
be7e795e 1611static void wt_longstatus_print(struct wt_status *s)
c91f0d92 1612{
1d282327
AA
1613 const char *branch_color = color(WT_STATUS_ONBRANCH, s);
1614 const char *branch_status_color = color(WT_STATUS_HEADER, s);
98bf8a47 1615
bda324cf 1616 if (s->branch) {
355ec7a1 1617 const char *on_what = _("On branch ");
bda324cf 1618 const char *branch_name = s->branch;
c72b49df 1619 if (!strcmp(branch_name, "HEAD")) {
1d282327 1620 branch_status_color = color(WT_STATUS_NOBRANCH, s);
73ba5d78
SS
1621 if (s->state.rebase_in_progress ||
1622 s->state.rebase_interactive_in_progress) {
1623 if (s->state.rebase_interactive_in_progress)
df25e947
GP
1624 on_what = _("interactive rebase in progress; onto ");
1625 else
1626 on_what = _("rebase in progress; onto ");
73ba5d78
SS
1627 branch_name = s->state.onto;
1628 } else if (s->state.detached_from) {
1629 branch_name = s->state.detached_from;
1630 if (s->state.detached_at)
b397ea48
NTND
1631 on_what = _("HEAD detached at ");
1632 else
1633 on_what = _("HEAD detached from ");
1634 } else {
1635 branch_name = "";
1636 on_what = _("Not currently on any branch.");
1637 }
c72b49df
RS
1638 } else
1639 skip_prefix(branch_name, "refs/heads/", &branch_name);
7d7d6802 1640 status_printf(s, color(WT_STATUS_HEADER, s), "%s", "");
b926c0d1
JN
1641 status_printf_more(s, branch_status_color, "%s", on_what);
1642 status_printf_more(s, branch_color, "%s\n", branch_name);
b6975ab5 1643 if (!s->is_initial)
957a0fe2 1644 wt_longstatus_print_tracking(s);
bda324cf 1645 }
c91f0d92 1646
73ba5d78 1647 wt_longstatus_print_state(s);
3b691ccc 1648
c91f0d92 1649 if (s->is_initial) {
7d7d6802 1650 status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", "");
4ddb1354
KS
1651 status_printf_ln(s, color(WT_STATUS_HEADER, s),
1652 s->commit_template
1653 ? _("Initial commit")
1654 : _("No commits yet"));
7d7d6802 1655 status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", "");
c91f0d92
JK
1656 }
1657
957a0fe2
JH
1658 wt_longstatus_print_updated(s);
1659 wt_longstatus_print_unmerged(s);
1660 wt_longstatus_print_changed(s);
46a958b3
JL
1661 if (s->submodule_summary &&
1662 (!s->ignore_submodule_arg ||
1663 strcmp(s->ignore_submodule_arg, "all"))) {
957a0fe2
JH
1664 wt_longstatus_print_submodule_summary(s, 0); /* staged */
1665 wt_longstatus_print_submodule_summary(s, 1); /* unstaged */
f17a5d34 1666 }
2381e39e 1667 if (s->show_untracked_files) {
957a0fe2 1668 wt_longstatus_print_other(s, &s->untracked, _("Untracked files"), "add");
eec0f7f2 1669 if (s->show_ignored_mode)
957a0fe2 1670 wt_longstatus_print_other(s, &s->ignored, _("Ignored files"), "add -f");
6a38ef2c 1671 if (advice_status_u_option && 2000 < s->untracked_in_ms) {
7d7d6802 1672 status_printf_ln(s, GIT_COLOR_NORMAL, "%s", "");
6a38ef2c 1673 status_printf_ln(s, GIT_COLOR_NORMAL,
62901179
JX
1674 _("It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1675 "may speed it up, but you have to be careful not to forget to add\n"
1676 "new files yourself (see 'git help status')."),
1677 s->untracked_in_ms / 1000.0);
6a38ef2c 1678 }
6fa90194 1679 } else if (s->committable)
355ec7a1 1680 status_printf_ln(s, GIT_COLOR_NORMAL, _("Untracked files not listed%s"),
6a964f57 1681 s->hints
355ec7a1 1682 ? _(" (use -u option to show untracked files)") : "");
c91f0d92 1683
1324fb6f 1684 if (s->verbose)
957a0fe2 1685 wt_longstatus_print_verbose(s);
6fa90194 1686 if (!s->committable) {
6e458bf6 1687 if (s->amend)
355ec7a1 1688 status_printf_ln(s, GIT_COLOR_NORMAL, _("No changes"));
37d07f8f
JH
1689 else if (s->nowarn)
1690 ; /* nothing */
50bd8b7e 1691 else if (s->workdir_dirty) {
6a964f57 1692 if (s->hints)
50bd8b7e
NTND
1693 printf(_("no changes added to commit "
1694 "(use \"git add\" and/or \"git commit -a\")\n"));
1695 else
1696 printf(_("no changes added to commit\n"));
1697 } else if (s->untracked.nr) {
6a964f57 1698 if (s->hints)
50bd8b7e
NTND
1699 printf(_("nothing added to commit but untracked files "
1700 "present (use \"git add\" to track)\n"));
1701 else
1702 printf(_("nothing added to commit but untracked files present\n"));
1703 } else if (s->is_initial) {
6a964f57 1704 if (s->hints)
50bd8b7e
NTND
1705 printf(_("nothing to commit (create/copy files "
1706 "and use \"git add\" to track)\n"));
1707 else
1708 printf(_("nothing to commit\n"));
1709 } else if (!s->show_untracked_files) {
6a964f57 1710 if (s->hints)
50bd8b7e
NTND
1711 printf(_("nothing to commit (use -u to show untracked files)\n"));
1712 else
1713 printf(_("nothing to commit\n"));
1714 } else
2a0e6cde 1715 printf(_("nothing to commit, working tree clean\n"));
6e458bf6 1716 }
c1b5d019
LB
1717 if(s->show_stash)
1718 wt_longstatus_print_stash_summary(s);
c91f0d92 1719}
84dbe7b8 1720
3207a3a2 1721static void wt_shortstatus_unmerged(struct string_list_item *it,
84dbe7b8
MG
1722 struct wt_status *s)
1723{
1724 struct wt_status_change_data *d = it->util;
1725 const char *how = "??";
1726
1727 switch (d->stagemask) {
1728 case 1: how = "DD"; break; /* both deleted */
1729 case 2: how = "AU"; break; /* added by us */
1730 case 3: how = "UD"; break; /* deleted by them */
1731 case 4: how = "UA"; break; /* added by them */
1732 case 5: how = "DU"; break; /* deleted by us */
1733 case 6: how = "AA"; break; /* both added */
1734 case 7: how = "UU"; break; /* both modified */
1735 }
3fe2a894 1736 color_fprintf(s->fp, color(WT_STATUS_UNMERGED, s), "%s", how);
3207a3a2 1737 if (s->null_termination) {
3fe2a894 1738 fprintf(stdout, " %s%c", it->string, 0);
84dbe7b8
MG
1739 } else {
1740 struct strbuf onebuf = STRBUF_INIT;
1741 const char *one;
39598f99 1742 one = quote_path(it->string, s->prefix, &onebuf);
3fe2a894 1743 printf(" %s\n", one);
84dbe7b8
MG
1744 strbuf_release(&onebuf);
1745 }
1746}
1747
3207a3a2 1748static void wt_shortstatus_status(struct string_list_item *it,
84dbe7b8
MG
1749 struct wt_status *s)
1750{
1751 struct wt_status_change_data *d = it->util;
1752
3fe2a894
MG
1753 if (d->index_status)
1754 color_fprintf(s->fp, color(WT_STATUS_UPDATED, s), "%c", d->index_status);
1755 else
1756 putchar(' ');
1757 if (d->worktree_status)
1758 color_fprintf(s->fp, color(WT_STATUS_CHANGED, s), "%c", d->worktree_status);
1759 else
1760 putchar(' ');
1761 putchar(' ');
3207a3a2 1762 if (s->null_termination) {
84dbe7b8 1763 fprintf(stdout, "%s%c", it->string, 0);
5134ccde
NTND
1764 if (d->rename_source)
1765 fprintf(stdout, "%s%c", d->rename_source, 0);
84dbe7b8
MG
1766 } else {
1767 struct strbuf onebuf = STRBUF_INIT;
1768 const char *one;
5134ccde
NTND
1769
1770 if (d->rename_source) {
1771 one = quote_path(d->rename_source, s->prefix, &onebuf);
dbfdc625
KB
1772 if (*one != '"' && strchr(one, ' ') != NULL) {
1773 putchar('"');
1774 strbuf_addch(&onebuf, '"');
1775 one = onebuf.buf;
1776 }
84dbe7b8
MG
1777 printf("%s -> ", one);
1778 strbuf_release(&onebuf);
1779 }
39598f99 1780 one = quote_path(it->string, s->prefix, &onebuf);
dbfdc625
KB
1781 if (*one != '"' && strchr(one, ' ') != NULL) {
1782 putchar('"');
1783 strbuf_addch(&onebuf, '"');
1784 one = onebuf.buf;
1785 }
84dbe7b8
MG
1786 printf("%s\n", one);
1787 strbuf_release(&onebuf);
1788 }
1789}
1790
3207a3a2 1791static void wt_shortstatus_other(struct string_list_item *it,
2381e39e 1792 struct wt_status *s, const char *sign)
84dbe7b8 1793{
3207a3a2 1794 if (s->null_termination) {
2381e39e 1795 fprintf(stdout, "%s %s%c", sign, it->string, 0);
84dbe7b8
MG
1796 } else {
1797 struct strbuf onebuf = STRBUF_INIT;
1798 const char *one;
39598f99 1799 one = quote_path(it->string, s->prefix, &onebuf);
c1909e72 1800 color_fprintf(s->fp, color(WT_STATUS_UNTRACKED, s), "%s", sign);
3fe2a894 1801 printf(" %s\n", one);
84dbe7b8
MG
1802 strbuf_release(&onebuf);
1803 }
1804}
1805
05a59a08
DKF
1806static void wt_shortstatus_print_tracking(struct wt_status *s)
1807{
1808 struct branch *branch;
1809 const char *header_color = color(WT_STATUS_HEADER, s);
1810 const char *branch_color_local = color(WT_STATUS_LOCAL_BRANCH, s);
1811 const char *branch_color_remote = color(WT_STATUS_REMOTE_BRANCH, s);
1812
1813 const char *base;
5e8d2729 1814 char *short_base;
05a59a08 1815 const char *branch_name;
3ca1897c 1816 int num_ours, num_theirs, sti;
f2e08739 1817 int upstream_is_gone = 0;
05a59a08
DKF
1818
1819 color_fprintf(s->fp, color(WT_STATUS_HEADER, s), "## ");
1820
1821 if (!s->branch)
1822 return;
1823 branch_name = s->branch;
1824
b9e2bc56
MG
1825#define LABEL(string) (s->no_gettext ? (string) : _(string))
1826
05a59a08 1827 if (s->is_initial)
4ddb1354 1828 color_fprintf(s->fp, header_color, LABEL(N_("No commits yet on ")));
f2e08739 1829
baf0a3e4
RS
1830 if (!strcmp(s->branch, "HEAD")) {
1831 color_fprintf(s->fp, color(WT_STATUS_NOBRANCH, s), "%s",
b9e2bc56 1832 LABEL(N_("HEAD (no branch)")));
baf0a3e4
RS
1833 goto conclude;
1834 }
1835
c72b49df 1836 skip_prefix(branch_name, "refs/heads/", &branch_name);
05a59a08 1837
8d8325f8 1838 branch = branch_get(branch_name);
f2e08739
JX
1839
1840 color_fprintf(s->fp, branch_color_local, "%s", branch_name);
1841
3ca1897c
JH
1842 sti = stat_tracking_info(branch, &num_ours, &num_theirs, &base,
1843 s->ahead_behind_flags);
1844 if (sti < 0) {
bcf8cc25
RS
1845 if (!base)
1846 goto conclude;
979cb245 1847
f2e08739 1848 upstream_is_gone = 1;
05a59a08
DKF
1849 }
1850
5e8d2729 1851 short_base = shorten_unambiguous_ref(base, 0);
05a59a08 1852 color_fprintf(s->fp, header_color, "...");
5e8d2729
RS
1853 color_fprintf(s->fp, branch_color_remote, "%s", short_base);
1854 free(short_base);
05a59a08 1855
3ca1897c 1856 if (!upstream_is_gone && !sti)
bcf8cc25 1857 goto conclude;
f223459b 1858
05a59a08 1859 color_fprintf(s->fp, header_color, " [");
f2e08739 1860 if (upstream_is_gone) {
7a76c28f 1861 color_fprintf(s->fp, header_color, LABEL(N_("gone")));
3ca1897c
JH
1862 } else if (s->ahead_behind_flags == AHEAD_BEHIND_QUICK) {
1863 color_fprintf(s->fp, header_color, LABEL(N_("different")));
f2e08739 1864 } else if (!num_ours) {
7a76c28f 1865 color_fprintf(s->fp, header_color, LABEL(N_("behind ")));
05a59a08
DKF
1866 color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
1867 } else if (!num_theirs) {
df227241 1868 color_fprintf(s->fp, header_color, LABEL(N_("ahead ")));
05a59a08
DKF
1869 color_fprintf(s->fp, branch_color_local, "%d", num_ours);
1870 } else {
df227241 1871 color_fprintf(s->fp, header_color, LABEL(N_("ahead ")));
05a59a08 1872 color_fprintf(s->fp, branch_color_local, "%d", num_ours);
7a76c28f 1873 color_fprintf(s->fp, header_color, ", %s", LABEL(N_("behind ")));
05a59a08
DKF
1874 color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
1875 }
1876
a5985237 1877 color_fprintf(s->fp, header_color, "]");
bcf8cc25 1878 conclude:
a5985237 1879 fputc(s->null_termination ? '\0' : '\n', s->fp);
05a59a08
DKF
1880}
1881
be7e795e 1882static void wt_shortstatus_print(struct wt_status *s)
84dbe7b8 1883{
d4aae459 1884 struct string_list_item *it;
05a59a08 1885
d4a6bf1f 1886 if (s->show_branch)
05a59a08
DKF
1887 wt_shortstatus_print_tracking(s);
1888
d4aae459
SB
1889 for_each_string_list_item(it, &s->change) {
1890 struct wt_status_change_data *d = it->util;
84dbe7b8 1891
84dbe7b8 1892 if (d->stagemask)
3207a3a2 1893 wt_shortstatus_unmerged(it, s);
84dbe7b8 1894 else
3207a3a2 1895 wt_shortstatus_status(it, s);
84dbe7b8 1896 }
d4aae459 1897 for_each_string_list_item(it, &s->untracked)
3207a3a2 1898 wt_shortstatus_other(it, s, "??");
2381e39e 1899
d4aae459 1900 for_each_string_list_item(it, &s->ignored)
3207a3a2 1901 wt_shortstatus_other(it, s, "!!");
84dbe7b8 1902}
4a7cc2fd 1903
be7e795e 1904static void wt_porcelain_print(struct wt_status *s)
4a7cc2fd
JK
1905{
1906 s->use_color = 0;
8661768f
JK
1907 s->relative_paths = 0;
1908 s->prefix = NULL;
7a76c28f 1909 s->no_gettext = 1;
d4a6bf1f 1910 wt_shortstatus_print(s);
4a7cc2fd 1911}
be7e795e 1912
d9fc746c
JH
1913/*
1914 * Print branch information for porcelain v2 output. These lines
1915 * are printed when the '--branch' parameter is given.
1916 *
1917 * # branch.oid <commit><eol>
1918 * # branch.head <head><eol>
1919 * [# branch.upstream <upstream><eol>
1920 * [# branch.ab +<ahead> -<behind><eol>]]
1921 *
1922 * <commit> ::= the current commit hash or the the literal
1923 * "(initial)" to indicate an initialized repo
1924 * with no commits.
1925 *
1926 * <head> ::= <branch_name> the current branch name or
1927 * "(detached)" literal when detached head or
1928 * "(unknown)" when something is wrong.
1929 *
1930 * <upstream> ::= the upstream branch name, when set.
1931 *
fd9b544a 1932 * <ahead> ::= integer ahead value or '?'.
d9fc746c 1933 *
fd9b544a 1934 * <behind> ::= integer behind value or '?'.
d9fc746c
JH
1935 *
1936 * The end-of-line is defined by the -z flag.
1937 *
1938 * <eol> ::= NUL when -z,
1939 * LF when NOT -z.
1940 *
fd9b544a
JH
1941 * When an upstream is set and present, the 'branch.ab' line will
1942 * be printed with the ahead/behind counts for the branch and the
1943 * upstream. When AHEAD_BEHIND_QUICK is requested and the branches
1944 * are different, '?' will be substituted for the actual count.
d9fc746c
JH
1945 */
1946static void wt_porcelain_v2_print_tracking(struct wt_status *s)
1947{
1948 struct branch *branch;
1949 const char *base;
1950 const char *branch_name;
d9fc746c
JH
1951 int ab_info, nr_ahead, nr_behind;
1952 char eol = s->null_termination ? '\0' : '\n';
1953
d9fc746c
JH
1954 fprintf(s->fp, "# branch.oid %s%c",
1955 (s->is_initial ? "(initial)" : sha1_to_hex(s->sha1_commit)),
1956 eol);
1957
1958 if (!s->branch)
1959 fprintf(s->fp, "# branch.head %s%c", "(unknown)", eol);
1960 else {
1961 if (!strcmp(s->branch, "HEAD")) {
1962 fprintf(s->fp, "# branch.head %s%c", "(detached)", eol);
1963
73ba5d78
SS
1964 if (s->state.rebase_in_progress ||
1965 s->state.rebase_interactive_in_progress)
1966 branch_name = s->state.onto;
1967 else if (s->state.detached_from)
1968 branch_name = s->state.detached_from;
d9fc746c
JH
1969 else
1970 branch_name = "";
1971 } else {
1972 branch_name = NULL;
1973 skip_prefix(s->branch, "refs/heads/", &branch_name);
1974
1975 fprintf(s->fp, "# branch.head %s%c", branch_name, eol);
1976 }
1977
1978 /* Lookup stats on the upstream tracking branch, if set. */
1979 branch = branch_get(branch_name);
1980 base = NULL;
fd9b544a
JH
1981 ab_info = stat_tracking_info(branch, &nr_ahead, &nr_behind,
1982 &base, s->ahead_behind_flags);
d9fc746c
JH
1983 if (base) {
1984 base = shorten_unambiguous_ref(base, 0);
1985 fprintf(s->fp, "# branch.upstream %s%c", base, eol);
1986 free((char *)base);
1987
fd9b544a
JH
1988 if (ab_info > 0) {
1989 /* different */
1990 if (nr_ahead || nr_behind)
1991 fprintf(s->fp, "# branch.ab +%d -%d%c",
1992 nr_ahead, nr_behind, eol);
1993 else
1994 fprintf(s->fp, "# branch.ab +? -?%c",
1995 eol);
1996 } else if (!ab_info) {
1997 /* same */
1998 fprintf(s->fp, "# branch.ab +0 -0%c", eol);
1999 }
d9fc746c
JH
2000 }
2001 }
d9fc746c
JH
2002}
2003
24959bad
JH
2004/*
2005 * Convert various submodule status values into a
2006 * fixed-length string of characters in the buffer provided.
2007 */
2008static void wt_porcelain_v2_submodule_state(
2009 struct wt_status_change_data *d,
2010 char sub[5])
2011{
2012 if (S_ISGITLINK(d->mode_head) ||
2013 S_ISGITLINK(d->mode_index) ||
2014 S_ISGITLINK(d->mode_worktree)) {
2015 sub[0] = 'S';
2016 sub[1] = d->new_submodule_commits ? 'C' : '.';
2017 sub[2] = (d->dirty_submodule & DIRTY_SUBMODULE_MODIFIED) ? 'M' : '.';
2018 sub[3] = (d->dirty_submodule & DIRTY_SUBMODULE_UNTRACKED) ? 'U' : '.';
2019 } else {
2020 sub[0] = 'N';
2021 sub[1] = '.';
2022 sub[2] = '.';
2023 sub[3] = '.';
2024 }
2025 sub[4] = 0;
2026}
2027
2028/*
2029 * Fix-up changed entries before we print them.
2030 */
2031static void wt_porcelain_v2_fix_up_changed(
2032 struct string_list_item *it,
2033 struct wt_status *s)
2034{
2035 struct wt_status_change_data *d = it->util;
2036
2037 if (!d->index_status) {
2038 /*
2039 * This entry is unchanged in the index (relative to the head).
2040 * Therefore, the collect_updated_cb was never called for this
2041 * entry (during the head-vs-index scan) and so the head column
2042 * fields were never set.
2043 *
2044 * We must have data for the index column (from the
2045 * index-vs-worktree scan (otherwise, this entry should not be
2046 * in the list of changes)).
2047 *
2048 * Copy index column fields to the head column, so that our
2049 * output looks complete.
2050 */
2051 assert(d->mode_head == 0);
2052 d->mode_head = d->mode_index;
2053 oidcpy(&d->oid_head, &d->oid_index);
2054 }
2055
2056 if (!d->worktree_status) {
2057 /*
2058 * This entry is unchanged in the worktree (relative to the index).
2059 * Therefore, the collect_changed_cb was never called for this entry
2060 * (during the index-vs-worktree scan) and so the worktree column
2061 * fields were never set.
2062 *
2063 * We must have data for the index column (from the head-vs-index
2064 * scan).
2065 *
2066 * Copy the index column fields to the worktree column so that
2067 * our output looks complete.
2068 *
2069 * Note that we only have a mode field in the worktree column
2070 * because the scan code tries really hard to not have to compute it.
2071 */
2072 assert(d->mode_worktree == 0);
2073 d->mode_worktree = d->mode_index;
2074 }
2075}
2076
2077/*
2078 * Print porcelain v2 info for tracked entries with changes.
2079 */
2080static void wt_porcelain_v2_print_changed_entry(
2081 struct string_list_item *it,
2082 struct wt_status *s)
2083{
2084 struct wt_status_change_data *d = it->util;
5134ccde
NTND
2085 struct strbuf buf = STRBUF_INIT;
2086 struct strbuf buf_from = STRBUF_INIT;
2087 const char *path = NULL;
2088 const char *path_from = NULL;
24959bad
JH
2089 char key[3];
2090 char submodule_token[5];
2091 char sep_char, eol_char;
2092
2093 wt_porcelain_v2_fix_up_changed(it, s);
2094 wt_porcelain_v2_submodule_state(d, submodule_token);
2095
2096 key[0] = d->index_status ? d->index_status : '.';
2097 key[1] = d->worktree_status ? d->worktree_status : '.';
2098 key[2] = 0;
2099
2100 if (s->null_termination) {
2101 /*
2102 * In -z mode, we DO NOT C-quote pathnames. Current path is ALWAYS first.
2103 * A single NUL character separates them.
2104 */
2105 sep_char = '\0';
2106 eol_char = '\0';
5134ccde
NTND
2107 path = it->string;
2108 path_from = d->rename_source;
24959bad
JH
2109 } else {
2110 /*
2111 * Path(s) are C-quoted if necessary. Current path is ALWAYS first.
2112 * The source path is only present when necessary.
2113 * A single TAB separates them (because paths can contain spaces
2114 * which are not escaped and C-quoting does escape TAB characters).
2115 */
2116 sep_char = '\t';
2117 eol_char = '\n';
5134ccde
NTND
2118 path = quote_path(it->string, s->prefix, &buf);
2119 if (d->rename_source)
2120 path_from = quote_path(d->rename_source, s->prefix, &buf_from);
24959bad
JH
2121 }
2122
5134ccde 2123 if (path_from)
24959bad
JH
2124 fprintf(s->fp, "2 %s %s %06o %06o %06o %s %s %c%d %s%c%s%c",
2125 key, submodule_token,
2126 d->mode_head, d->mode_index, d->mode_worktree,
2127 oid_to_hex(&d->oid_head), oid_to_hex(&d->oid_index),
5134ccde
NTND
2128 d->rename_status, d->rename_score,
2129 path, sep_char, path_from, eol_char);
24959bad
JH
2130 else
2131 fprintf(s->fp, "1 %s %s %06o %06o %06o %s %s %s%c",
2132 key, submodule_token,
2133 d->mode_head, d->mode_index, d->mode_worktree,
2134 oid_to_hex(&d->oid_head), oid_to_hex(&d->oid_index),
5134ccde 2135 path, eol_char);
24959bad 2136
5134ccde
NTND
2137 strbuf_release(&buf);
2138 strbuf_release(&buf_from);
24959bad
JH
2139}
2140
2141/*
2142 * Print porcelain v2 status info for unmerged entries.
2143 */
2144static void wt_porcelain_v2_print_unmerged_entry(
2145 struct string_list_item *it,
2146 struct wt_status *s)
2147{
2148 struct wt_status_change_data *d = it->util;
5b02ca38 2149 struct index_state *istate = s->repo->index;
24959bad
JH
2150 const struct cache_entry *ce;
2151 struct strbuf buf_index = STRBUF_INIT;
2152 const char *path_index = NULL;
2153 int pos, stage, sum;
2154 struct {
2155 int mode;
2156 struct object_id oid;
2157 } stages[3];
2158 char *key;
2159 char submodule_token[5];
2160 char unmerged_prefix = 'u';
2161 char eol_char = s->null_termination ? '\0' : '\n';
2162
2163 wt_porcelain_v2_submodule_state(d, submodule_token);
2164
2165 switch (d->stagemask) {
2166 case 1: key = "DD"; break; /* both deleted */
2167 case 2: key = "AU"; break; /* added by us */
2168 case 3: key = "UD"; break; /* deleted by them */
2169 case 4: key = "UA"; break; /* added by them */
2170 case 5: key = "DU"; break; /* deleted by us */
2171 case 6: key = "AA"; break; /* both added */
2172 case 7: key = "UU"; break; /* both modified */
2173 default:
033abf97 2174 BUG("unhandled unmerged status %x", d->stagemask);
24959bad
JH
2175 }
2176
2177 /*
2178 * Disregard d.aux.porcelain_v2 data that we accumulated
2179 * for the head and index columns during the scans and
2180 * replace with the actual stage data.
2181 *
2182 * Note that this is a last-one-wins for each the individual
2183 * stage [123] columns in the event of multiple cache entries
2184 * for same stage.
2185 */
2186 memset(stages, 0, sizeof(stages));
2187 sum = 0;
5b02ca38 2188 pos = index_name_pos(istate, it->string, strlen(it->string));
24959bad
JH
2189 assert(pos < 0);
2190 pos = -pos-1;
5b02ca38
NTND
2191 while (pos < istate->cache_nr) {
2192 ce = istate->cache[pos++];
24959bad
JH
2193 stage = ce_stage(ce);
2194 if (strcmp(ce->name, it->string) || !stage)
2195 break;
2196 stages[stage - 1].mode = ce->ce_mode;
8694769f 2197 oidcpy(&stages[stage - 1].oid, &ce->oid);
24959bad
JH
2198 sum |= (1 << (stage - 1));
2199 }
2200 if (sum != d->stagemask)
033abf97 2201 BUG("observed stagemask 0x%x != expected stagemask 0x%x", sum, d->stagemask);
24959bad
JH
2202
2203 if (s->null_termination)
2204 path_index = it->string;
2205 else
2206 path_index = quote_path(it->string, s->prefix, &buf_index);
2207
2208 fprintf(s->fp, "%c %s %s %06o %06o %06o %06o %s %s %s %s%c",
2209 unmerged_prefix, key, submodule_token,
2210 stages[0].mode, /* stage 1 */
2211 stages[1].mode, /* stage 2 */
2212 stages[2].mode, /* stage 3 */
2213 d->mode_worktree,
2214 oid_to_hex(&stages[0].oid), /* stage 1 */
2215 oid_to_hex(&stages[1].oid), /* stage 2 */
2216 oid_to_hex(&stages[2].oid), /* stage 3 */
2217 path_index,
2218 eol_char);
2219
2220 strbuf_release(&buf_index);
2221}
2222
2223/*
2224 * Print porcelain V2 status info for untracked and ignored entries.
2225 */
2226static void wt_porcelain_v2_print_other(
2227 struct string_list_item *it,
2228 struct wt_status *s,
2229 char prefix)
2230{
2231 struct strbuf buf = STRBUF_INIT;
2232 const char *path;
2233 char eol_char;
2234
2235 if (s->null_termination) {
2236 path = it->string;
2237 eol_char = '\0';
2238 } else {
2239 path = quote_path(it->string, s->prefix, &buf);
2240 eol_char = '\n';
2241 }
2242
2243 fprintf(s->fp, "%c %s%c", prefix, path, eol_char);
2244
2245 strbuf_release(&buf);
2246}
2247
2248/*
2249 * Print porcelain V2 status.
2250 *
d9fc746c 2251 * [<v2_branch>]
24959bad
JH
2252 * [<v2_changed_items>]*
2253 * [<v2_unmerged_items>]*
2254 * [<v2_untracked_items>]*
2255 * [<v2_ignored_items>]*
2256 *
2257 */
2258static void wt_porcelain_v2_print(struct wt_status *s)
2259{
2260 struct wt_status_change_data *d;
2261 struct string_list_item *it;
2262 int i;
2263
d9fc746c
JH
2264 if (s->show_branch)
2265 wt_porcelain_v2_print_tracking(s);
2266
24959bad
JH
2267 for (i = 0; i < s->change.nr; i++) {
2268 it = &(s->change.items[i]);
2269 d = it->util;
2270 if (!d->stagemask)
2271 wt_porcelain_v2_print_changed_entry(it, s);
2272 }
2273
2274 for (i = 0; i < s->change.nr; i++) {
2275 it = &(s->change.items[i]);
2276 d = it->util;
2277 if (d->stagemask)
2278 wt_porcelain_v2_print_unmerged_entry(it, s);
2279 }
2280
2281 for (i = 0; i < s->untracked.nr; i++) {
2282 it = &(s->untracked.items[i]);
2283 wt_porcelain_v2_print_other(it, s, '?');
2284 }
2285
2286 for (i = 0; i < s->ignored.nr; i++) {
2287 it = &(s->ignored.items[i]);
2288 wt_porcelain_v2_print_other(it, s, '!');
2289 }
2290}
2291
be7e795e
JH
2292void wt_status_print(struct wt_status *s)
2293{
2294 switch (s->status_format) {
2295 case STATUS_FORMAT_SHORT:
2296 wt_shortstatus_print(s);
2297 break;
2298 case STATUS_FORMAT_PORCELAIN:
2299 wt_porcelain_print(s);
2300 break;
1ecdecce 2301 case STATUS_FORMAT_PORCELAIN_V2:
24959bad 2302 wt_porcelain_v2_print(s);
1ecdecce 2303 break;
be7e795e 2304 case STATUS_FORMAT_UNSPECIFIED:
033abf97 2305 BUG("finalize_deferred_config() should have been called");
be7e795e
JH
2306 break;
2307 case STATUS_FORMAT_NONE:
2308 case STATUS_FORMAT_LONG:
2309 wt_longstatus_print(s);
2310 break;
2311 }
2312}
fd84986f
JS
2313
2314/**
2315 * Returns 1 if there are unstaged changes, 0 otherwise.
2316 */
5b02ca38 2317int has_unstaged_changes(struct repository *r, int ignore_submodules)
fd84986f
JS
2318{
2319 struct rev_info rev_info;
2320 int result;
2321
5b02ca38 2322 repo_init_revisions(r, &rev_info, NULL);
c6d8ccf3 2323 if (ignore_submodules) {
0d1e0e78 2324 rev_info.diffopt.flags.ignore_submodules = 1;
b50d82b0 2325 rev_info.diffopt.flags.override_submodule_config = 1;
c6d8ccf3 2326 }
0d1e0e78 2327 rev_info.diffopt.flags.quick = 1;
fd84986f
JS
2328 diff_setup_done(&rev_info.diffopt);
2329 result = run_diff_files(&rev_info, 0);
2330 return diff_result_code(&rev_info.diffopt, result);
2331}
2332
2333/**
2334 * Returns 1 if there are uncommitted changes, 0 otherwise.
2335 */
5b02ca38
NTND
2336int has_uncommitted_changes(struct repository *r,
2337 int ignore_submodules)
fd84986f
JS
2338{
2339 struct rev_info rev_info;
2340 int result;
2341
5b02ca38 2342 if (is_index_unborn(r->index))
fd84986f
JS
2343 return 0;
2344
5b02ca38 2345 repo_init_revisions(r, &rev_info, NULL);
d8cc92ab 2346 if (ignore_submodules)
0d1e0e78
BW
2347 rev_info.diffopt.flags.ignore_submodules = 1;
2348 rev_info.diffopt.flags.quick = 1;
3506dc94 2349
fd84986f 2350 add_head_to_pending(&rev_info);
3506dc94
JK
2351 if (!rev_info.pending.nr) {
2352 /*
2353 * We have no head (or it's corrupt); use the empty tree,
2354 * which will complain if the index is non-empty.
2355 */
5b02ca38 2356 struct tree *tree = lookup_tree(r, the_hash_algo->empty_tree);
3506dc94
JK
2357 add_pending_object(&rev_info, &tree->object, "");
2358 }
2359
fd84986f
JS
2360 diff_setup_done(&rev_info.diffopt);
2361 result = run_diff_index(&rev_info, 1);
2362 return diff_result_code(&rev_info.diffopt, result);
2363}
2364
2365/**
2366 * If the work tree has unstaged or uncommitted changes, dies with the
2367 * appropriate message.
2368 */
5b02ca38
NTND
2369int require_clean_work_tree(struct repository *r,
2370 const char *action,
2371 const char *hint,
2372 int ignore_submodules,
2373 int gently)
fd84986f 2374{
837e34eb 2375 struct lock_file lock_file = LOCK_INIT;
89d38fb2 2376 int err = 0, fd;
fd84986f 2377
3a95f31d 2378 fd = repo_hold_locked_index(r, &lock_file, 0);
5b02ca38 2379 refresh_index(r->index, REFRESH_QUIET, NULL, NULL, NULL);
89d38fb2 2380 if (0 <= fd)
5b02ca38 2381 update_index_if_able(r->index, &lock_file);
837e34eb 2382 rollback_lock_file(&lock_file);
fd84986f 2383
5b02ca38 2384 if (has_unstaged_changes(r, ignore_submodules)) {
fd84986f 2385 /* TRANSLATORS: the action is e.g. "pull with rebase" */
4777e175 2386 error(_("cannot %s: You have unstaged changes."), _(action));
fd84986f
JS
2387 err = 1;
2388 }
2389
5b02ca38 2390 if (has_uncommitted_changes(r, ignore_submodules)) {
fd84986f 2391 if (err)
4777e175 2392 error(_("additionally, your index contains uncommitted changes."));
fd84986f 2393 else
4777e175 2394 error(_("cannot %s: Your index contains uncommitted changes."),
fd84986f
JS
2395 _(action));
2396 err = 1;
2397 }
2398
2399 if (err) {
2400 if (hint)
2401 error("%s", hint);
2402 if (!gently)
2403 exit(128);
2404 }
2405
2406 return err;
2407}