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