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