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