wt-status.c: set commitable bit if there is a meaningful merge.
[git/git.git] / wt-status.c
CommitLineData
85023577 1#include "cache.h"
15b55ae0 2#include "pathspec.h"
c91f0d92 3#include "wt-status.h"
c91f0d92
JK
4#include "object.h"
5#include "dir.h"
6#include "commit.h"
7#include "diff.h"
8#include "revision.h"
9#include "diffcore.h"
a734d0b1 10#include "quote.h"
ac8d5afc 11#include "run-command.h"
bb7e32e3 12#include "argv-array.h"
b6975ab5 13#include "remote.h"
05a59a08 14#include "refs.h"
46a958b3 15#include "submodule.h"
323d0530 16#include "column.h"
2d1cceba 17#include "strbuf.h"
3651e45c 18#include "utf8.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
4d4d5726
JH
142static void wt_status_print_unmerged_header(struct wt_status *s)
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
f26a0012 194static void wt_status_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
bb914b14 210static void wt_status_print_dirty_header(struct wt_status *s,
9297f77e
JL
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
1b908b6f
JH
229static void wt_status_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
f26a0012 241static void wt_status_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:
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
8f17f5b2
JN
307static void wt_status_print_unmerged_data(struct wt_status *s,
308 struct string_list_item *it)
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
50b7e70f
JH
334static void wt_status_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
JK
380 default:
381 die("BUG: unhandled change_type %d in wt_status_print_change_data",
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)
355ec7a1 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))
435 d->new_submodule_commits = !!hashcmp(p->one->sha1, p->two->sha1);
c91f0d92 436 }
c91f0d92
JK
437}
438
4d4d5726
JH
439static int unmerged_mask(const char *path)
440{
441 int pos, mask;
9c5e6c80 442 const struct cache_entry *ce;
4d4d5726
JH
443
444 pos = cache_name_pos(path, strlen(path));
445 if (0 <= pos)
446 return 0;
447
448 mask = 0;
449 pos = -pos-1;
450 while (pos < active_nr) {
451 ce = active_cache[pos++];
452 if (strcmp(ce->name, path) || !ce_stage(ce))
453 break;
454 mask |= (1 << (ce_stage(ce) - 1));
455 }
456 return mask;
457}
458
50b7e70f
JH
459static void wt_status_collect_updated_cb(struct diff_queue_struct *q,
460 struct diff_options *options,
461 void *data)
c91f0d92 462{
6e458bf6 463 struct wt_status *s = data;
c91f0d92 464 int i;
50b7e70f
JH
465
466 for (i = 0; i < q->nr; i++) {
467 struct diff_filepair *p;
468 struct string_list_item *it;
469 struct wt_status_change_data *d;
470
471 p = q->queue[i];
78a395d3 472 it = string_list_insert(&s->change, p->two->path);
50b7e70f
JH
473 d = it->util;
474 if (!d) {
475 d = xcalloc(1, sizeof(*d));
476 it->util = d;
477 }
478 if (!d->index_status)
479 d->index_status = p->status;
480 switch (p->status) {
481 case DIFF_STATUS_COPIED:
482 case DIFF_STATUS_RENAMED:
483 d->head_path = xstrdup(p->one->path);
484 break;
4d4d5726
JH
485 case DIFF_STATUS_UNMERGED:
486 d->stagemask = unmerged_mask(p->two->path);
487 break;
50b7e70f 488 }
6e458bf6 489 }
c91f0d92
JK
490}
491
50b7e70f 492static void wt_status_collect_changes_worktree(struct wt_status *s)
c91f0d92
JK
493{
494 struct rev_info rev;
50b7e70f
JH
495
496 init_revisions(&rev, NULL);
497 setup_revisions(0, NULL, &rev, NULL);
498 rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
9297f77e 499 DIFF_OPT_SET(&rev.diffopt, DIRTY_SUBMODULES);
3bfc4504
JL
500 if (!s->show_untracked_files)
501 DIFF_OPT_SET(&rev.diffopt, IGNORE_UNTRACKED_IN_SUBMODULES);
aee9c7d6
JL
502 if (s->ignore_submodule_arg) {
503 DIFF_OPT_SET(&rev.diffopt, OVERRIDE_SUBMODULE_CONFIG);
46a958b3 504 handle_ignore_submodules_arg(&rev.diffopt, s->ignore_submodule_arg);
c4c42f2c 505 }
50b7e70f
JH
506 rev.diffopt.format_callback = wt_status_collect_changed_cb;
507 rev.diffopt.format_callback_data = s;
15b55ae0 508 copy_pathspec(&rev.prune_data, &s->pathspec);
50b7e70f
JH
509 run_diff_files(&rev, 0);
510}
511
512static void wt_status_collect_changes_index(struct wt_status *s)
513{
514 struct rev_info rev;
32962c9b 515 struct setup_revision_opt opt;
50b7e70f 516
c91f0d92 517 init_revisions(&rev, NULL);
32962c9b
JH
518 memset(&opt, 0, sizeof(opt));
519 opt.def = s->is_initial ? EMPTY_TREE_SHA1_HEX : s->reference;
520 setup_revisions(0, NULL, &rev, &opt);
521
1d2f393a 522 DIFF_OPT_SET(&rev.diffopt, OVERRIDE_SUBMODULE_CONFIG);
aee9c7d6 523 if (s->ignore_submodule_arg) {
46a958b3 524 handle_ignore_submodules_arg(&rev.diffopt, s->ignore_submodule_arg);
1d2f393a
JL
525 } else {
526 /*
527 * Unless the user did explicitly request a submodule ignore
528 * mode by passing a command line option we do not ignore any
529 * changed submodule SHA-1s when comparing index and HEAD, no
530 * matter what is configured. Otherwise the user won't be
531 * shown any submodules she manually added (and which are
532 * staged to be committed), which would be really confusing.
533 */
534 handle_ignore_submodules_arg(&rev.diffopt, "dirty");
aee9c7d6 535 }
46a958b3 536
c91f0d92 537 rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
50b7e70f 538 rev.diffopt.format_callback = wt_status_collect_updated_cb;
c91f0d92
JK
539 rev.diffopt.format_callback_data = s;
540 rev.diffopt.detect_rename = 1;
50705915 541 rev.diffopt.rename_limit = 200;
f714fb84 542 rev.diffopt.break_opt = 0;
15b55ae0 543 copy_pathspec(&rev.prune_data, &s->pathspec);
c91f0d92
JK
544 run_diff_index(&rev, 1);
545}
546
50b7e70f
JH
547static void wt_status_collect_changes_initial(struct wt_status *s)
548{
549 int i;
550
551 for (i = 0; i < active_nr; i++) {
552 struct string_list_item *it;
553 struct wt_status_change_data *d;
9c5e6c80 554 const struct cache_entry *ce = active_cache[i];
50b7e70f 555
429bb40a 556 if (!ce_path_match(ce, &s->pathspec, NULL))
76e2f7ce 557 continue;
78a395d3 558 it = string_list_insert(&s->change, ce->name);
50b7e70f
JH
559 d = it->util;
560 if (!d) {
561 d = xcalloc(1, sizeof(*d));
562 it->util = d;
563 }
4d4d5726 564 if (ce_stage(ce)) {
50b7e70f 565 d->index_status = DIFF_STATUS_UNMERGED;
4d4d5726
JH
566 d->stagemask |= (1 << (ce_stage(ce) - 1));
567 }
50b7e70f
JH
568 else
569 d->index_status = DIFF_STATUS_ADDED;
570 }
571}
572
76378683
JH
573static void wt_status_collect_untracked(struct wt_status *s)
574{
575 int i;
576 struct dir_struct dir;
132d41e6 577 uint64_t t_begin = getnanotime();
76378683
JH
578
579 if (!s->show_untracked_files)
580 return;
6a38ef2c 581
76378683
JH
582 memset(&dir, 0, sizeof(dir));
583 if (s->show_untracked_files != SHOW_ALL_UNTRACKED_FILES)
584 dir.flags |=
585 DIR_SHOW_OTHER_DIRECTORIES | DIR_HIDE_EMPTY_DIRECTORIES;
0aaf62b6
KB
586 if (s->show_ignored_files)
587 dir.flags |= DIR_SHOW_IGNORED_TOO;
76378683
JH
588 setup_standard_excludes(&dir);
589
7327d3d1 590 fill_directory(&dir, &s->pathspec);
0aaf62b6 591
eeefa7c9 592 for (i = 0; i < dir.nr; i++) {
76378683 593 struct dir_entry *ent = dir.entries[i];
b822423e 594 if (cache_name_is_other(ent->name, ent->len) &&
ebb32893 595 dir_path_match(ent, &s->pathspec, 0, NULL))
b822423e 596 string_list_insert(&s->untracked, ent->name);
f5b26b1d 597 free(ent);
76378683 598 }
f5b26b1d 599
0aaf62b6
KB
600 for (i = 0; i < dir.ignored_nr; i++) {
601 struct dir_entry *ent = dir.ignored[i];
602 if (cache_name_is_other(ent->name, ent->len) &&
ebb32893 603 dir_path_match(ent, &s->pathspec, 0, NULL))
0aaf62b6
KB
604 string_list_insert(&s->ignored, ent->name);
605 free(ent);
6cb3f6b2
JH
606 }
607
f5b26b1d 608 free(dir.entries);
0aaf62b6
KB
609 free(dir.ignored);
610 clear_directory(&dir);
6a38ef2c 611
132d41e6
KB
612 if (advice_status_u_option)
613 s->untracked_in_ms = (getnanotime() - t_begin) / 1000000;
76378683
JH
614}
615
616void wt_status_collect(struct wt_status *s)
50b7e70f
JH
617{
618 wt_status_collect_changes_worktree(s);
619
620 if (s->is_initial)
621 wt_status_collect_changes_initial(s);
622 else
623 wt_status_collect_changes_index(s);
76378683 624 wt_status_collect_untracked(s);
50b7e70f
JH
625}
626
4d4d5726
JH
627static void wt_status_print_unmerged(struct wt_status *s)
628{
629 int shown_header = 0;
630 int i;
631
632 for (i = 0; i < s->change.nr; i++) {
633 struct wt_status_change_data *d;
634 struct string_list_item *it;
635 it = &(s->change.items[i]);
636 d = it->util;
637 if (!d->stagemask)
638 continue;
639 if (!shown_header) {
640 wt_status_print_unmerged_header(s);
641 shown_header = 1;
642 }
643 wt_status_print_unmerged_data(s, it);
644 }
645 if (shown_header)
646 wt_status_print_trailer(s);
647
648}
649
50b7e70f
JH
650static void wt_status_print_updated(struct wt_status *s)
651{
652 int shown_header = 0;
653 int i;
654
655 for (i = 0; i < s->change.nr; i++) {
656 struct wt_status_change_data *d;
657 struct string_list_item *it;
658 it = &(s->change.items[i]);
659 d = it->util;
660 if (!d->index_status ||
661 d->index_status == DIFF_STATUS_UNMERGED)
662 continue;
663 if (!shown_header) {
664 wt_status_print_cached_header(s);
665 s->commitable = 1;
666 shown_header = 1;
667 }
668 wt_status_print_change_data(s, WT_STATUS_UPDATED, it);
669 }
670 if (shown_header)
671 wt_status_print_trailer(s);
672}
673
674/*
675 * -1 : has delete
676 * 0 : no change
677 * 1 : some change but no delete
678 */
9297f77e
JL
679static int wt_status_check_worktree_changes(struct wt_status *s,
680 int *dirty_submodules)
50b7e70f
JH
681{
682 int i;
683 int changes = 0;
684
9297f77e
JL
685 *dirty_submodules = 0;
686
50b7e70f
JH
687 for (i = 0; i < s->change.nr; i++) {
688 struct wt_status_change_data *d;
689 d = s->change.items[i].util;
4d4d5726
JH
690 if (!d->worktree_status ||
691 d->worktree_status == DIFF_STATUS_UNMERGED)
50b7e70f 692 continue;
9297f77e
JL
693 if (!changes)
694 changes = 1;
695 if (d->dirty_submodule)
696 *dirty_submodules = 1;
50b7e70f 697 if (d->worktree_status == DIFF_STATUS_DELETED)
9297f77e 698 changes = -1;
50b7e70f
JH
699 }
700 return changes;
701}
702
c91f0d92
JK
703static void wt_status_print_changed(struct wt_status *s)
704{
9297f77e
JL
705 int i, dirty_submodules;
706 int worktree_changes = wt_status_check_worktree_changes(s, &dirty_submodules);
50b7e70f
JH
707
708 if (!worktree_changes)
709 return;
710
9297f77e 711 wt_status_print_dirty_header(s, worktree_changes < 0, dirty_submodules);
50b7e70f
JH
712
713 for (i = 0; i < s->change.nr; i++) {
714 struct wt_status_change_data *d;
715 struct string_list_item *it;
716 it = &(s->change.items[i]);
717 d = it->util;
4d4d5726
JH
718 if (!d->worktree_status ||
719 d->worktree_status == DIFF_STATUS_UNMERGED)
50b7e70f
JH
720 continue;
721 wt_status_print_change_data(s, WT_STATUS_CHANGED, it);
722 }
723 wt_status_print_trailer(s);
c91f0d92
JK
724}
725
f17a5d34 726static void wt_status_print_submodule_summary(struct wt_status *s, int uncommitted)
ac8d5afc 727{
d3180279 728 struct child_process sm_summary = CHILD_PROCESS_INIT;
3ba7407b
MM
729 struct strbuf cmd_stdout = STRBUF_INIT;
730 struct strbuf summary = STRBUF_INIT;
731 char *summary_content;
ac8d5afc 732
a9154590
RS
733 argv_array_pushf(&sm_summary.env_array, "GIT_INDEX_FILE=%s",
734 s->index_file);
ac8d5afc 735
a2bae2dc
RS
736 argv_array_push(&sm_summary.args, "submodule");
737 argv_array_push(&sm_summary.args, "summary");
738 argv_array_push(&sm_summary.args, uncommitted ? "--files" : "--cached");
739 argv_array_push(&sm_summary.args, "--for-status");
740 argv_array_push(&sm_summary.args, "--summary-limit");
741 argv_array_pushf(&sm_summary.args, "%d", s->submodule_summary);
bb7e32e3 742 if (!uncommitted)
a2bae2dc 743 argv_array_push(&sm_summary.args, s->amend ? "HEAD^" : "HEAD");
bb7e32e3 744
ac8d5afc
PY
745 sm_summary.git_cmd = 1;
746 sm_summary.no_stdin = 1;
3ba7407b 747
5c950e9b 748 capture_command(&sm_summary, &cmd_stdout, 1024);
3ba7407b
MM
749
750 /* prepend header, only if there's an actual output */
d56d966b 751 if (cmd_stdout.len) {
3ba7407b
MM
752 if (uncommitted)
753 strbuf_addstr(&summary, _("Submodules changed but not updated:"));
754 else
755 strbuf_addstr(&summary, _("Submodule changes to be committed:"));
756 strbuf_addstr(&summary, "\n\n");
757 }
758 strbuf_addbuf(&summary, &cmd_stdout);
759 strbuf_release(&cmd_stdout);
760
2556b996 761 if (s->display_comment_prefix) {
d56d966b 762 size_t len;
2556b996
MM
763 summary_content = strbuf_detach(&summary, &len);
764 strbuf_add_commented_lines(&summary, summary_content, len);
765 free(summary_content);
766 }
3ba7407b
MM
767
768 fputs(summary.buf, s->fp);
769 strbuf_release(&summary);
ac8d5afc
PY
770}
771
1b908b6f
JH
772static void wt_status_print_other(struct wt_status *s,
773 struct string_list *l,
774 const char *what,
775 const char *how)
c91f0d92 776{
c91f0d92 777 int i;
f285a2d7 778 struct strbuf buf = STRBUF_INIT;
323d0530
NTND
779 static struct string_list output = STRING_LIST_INIT_DUP;
780 struct column_options copts;
c91f0d92 781
1282988b 782 if (!l->nr)
76378683 783 return;
c91f0d92 784
1b908b6f
JH
785 wt_status_print_other_header(s, what, how);
786
787 for (i = 0; i < l->nr; i++) {
76378683 788 struct string_list_item *it;
323d0530 789 const char *path;
1b908b6f 790 it = &(l->items[i]);
39598f99 791 path = quote_path(it->string, s->prefix, &buf);
323d0530
NTND
792 if (column_active(s->colopts)) {
793 string_list_append(&output, path);
794 continue;
795 }
b926c0d1
JN
796 status_printf(s, color(WT_STATUS_HEADER, s), "\t");
797 status_printf_more(s, color(WT_STATUS_UNTRACKED, s),
323d0530 798 "%s\n", path);
c91f0d92 799 }
323d0530
NTND
800
801 strbuf_release(&buf);
802 if (!column_active(s->colopts))
2f0f7f1c 803 goto conclude;
323d0530 804
2556b996 805 strbuf_addf(&buf, "%s%s\t%s",
323d0530 806 color(WT_STATUS_HEADER, s),
2556b996 807 s->display_comment_prefix ? "#" : "",
323d0530
NTND
808 color(WT_STATUS_UNTRACKED, s));
809 memset(&copts, 0, sizeof(copts));
810 copts.padding = 1;
811 copts.indent = buf.buf;
812 if (want_color(s->use_color))
813 copts.nl = GIT_COLOR_RESET "\n";
814 print_columns(&output, s->colopts, &copts);
815 string_list_clear(&output, 0);
367c9886 816 strbuf_release(&buf);
2f0f7f1c 817conclude:
7d7d6802 818 status_printf_ln(s, GIT_COLOR_NORMAL, "%s", "");
c91f0d92
JK
819}
820
1a72cfd7
JL
821void wt_status_truncate_message_at_cut_line(struct strbuf *buf)
822{
823 const char *p;
824 struct strbuf pattern = STRBUF_INIT;
825
fbfa0973
SG
826 strbuf_addf(&pattern, "\n%c %s", comment_line_char, cut_line);
827 if (starts_with(buf->buf, pattern.buf + 1))
828 strbuf_setlen(buf, 0);
829 else if ((p = strstr(buf->buf, pattern.buf)))
830 strbuf_setlen(buf, p - buf->buf + 1);
1a72cfd7
JL
831 strbuf_release(&pattern);
832}
833
fcef9312
NTND
834void wt_status_add_cut_line(FILE *fp)
835{
836 const char *explanation = _("Do not touch the line above.\nEverything below will be removed.");
837 struct strbuf buf = STRBUF_INIT;
838
839 fprintf(fp, "%c %s", comment_line_char, cut_line);
840 strbuf_add_commented_lines(&buf, explanation, strlen(explanation));
841 fputs(buf.buf, fp);
842 strbuf_release(&buf);
843}
844
c91f0d92
JK
845static void wt_status_print_verbose(struct wt_status *s)
846{
847 struct rev_info rev;
32962c9b 848 struct setup_revision_opt opt;
40555000
MG
849 int dirty_submodules;
850 const char *c = color(WT_STATUS_HEADER, s);
99a12694 851
c91f0d92 852 init_revisions(&rev, NULL);
5ec11af6 853 DIFF_OPT_SET(&rev.diffopt, ALLOW_TEXTCONV);
32962c9b
JH
854
855 memset(&opt, 0, sizeof(opt));
856 opt.def = s->is_initial ? EMPTY_TREE_SHA1_HEX : s->reference;
857 setup_revisions(0, NULL, &rev, &opt);
858
c91f0d92
JK
859 rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
860 rev.diffopt.detect_rename = 1;
4ba0cb27
KH
861 rev.diffopt.file = s->fp;
862 rev.diffopt.close_file = 0;
4f672ad6
JK
863 /*
864 * If we're not going to stdout, then we definitely don't
865 * want color, since we are going to the commit message
866 * file (and even the "auto" setting won't work, since it
1a72cfd7
JL
867 * will have checked isatty on stdout). But we then do want
868 * to insert the scissor line here to reliably remove the
869 * diff before committing.
4f672ad6 870 */
1a72cfd7 871 if (s->fp != stdout) {
f1c96261 872 rev.diffopt.use_color = 0;
fcef9312 873 wt_status_add_cut_line(s->fp);
1a72cfd7 874 }
40555000
MG
875 if (s->verbose > 1 && s->commitable) {
876 /* print_updated() printed a header, so do we */
877 if (s->fp != stdout)
878 wt_status_print_trailer(s);
879 status_printf_ln(s, c, _("Changes to be committed:"));
880 rev.diffopt.a_prefix = "c/";
881 rev.diffopt.b_prefix = "i/";
882 } /* else use prefix as per user config */
c91f0d92 883 run_diff_index(&rev, 1);
40555000
MG
884 if (s->verbose > 1 &&
885 wt_status_check_worktree_changes(s, &dirty_submodules)) {
886 status_printf_ln(s, c,
887 "--------------------------------------------------");
888 status_printf_ln(s, c, _("Changes not staged for commit:"));
889 setup_work_tree();
890 rev.diffopt.a_prefix = "i/";
891 rev.diffopt.b_prefix = "w/";
892 run_diff_files(&rev, 0);
893 }
c91f0d92
JK
894}
895
b6975ab5
JH
896static void wt_status_print_tracking(struct wt_status *s)
897{
898 struct strbuf sb = STRBUF_INIT;
899 const char *cp, *ep;
900 struct branch *branch;
2556b996
MM
901 char comment_line_string[3];
902 int i;
b6975ab5
JH
903
904 assert(s->branch && !s->is_initial);
59556548 905 if (!starts_with(s->branch, "refs/heads/"))
b6975ab5
JH
906 return;
907 branch = branch_get(s->branch + 11);
908 if (!format_tracking_info(branch, &sb))
909 return;
910
2556b996
MM
911 i = 0;
912 if (s->display_comment_prefix) {
913 comment_line_string[i++] = comment_line_char;
914 comment_line_string[i++] = ' ';
915 }
916 comment_line_string[i] = '\0';
917
b6975ab5 918 for (cp = sb.buf; (ep = strchr(cp, '\n')) != NULL; cp = ep + 1)
d249b098 919 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s),
2556b996 920 "%s%.*s", comment_line_string,
eff80a9f 921 (int)(ep - cp), cp);
2556b996
MM
922 if (s->display_comment_prefix)
923 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s), "%c",
924 comment_line_char);
925 else
7d7d6802 926 fputs("", s->fp);
b6975ab5
JH
927}
928
83c750ac
LK
929static int has_unmerged(struct wt_status *s)
930{
931 int i;
932
933 for (i = 0; i < s->change.nr; i++) {
934 struct wt_status_change_data *d;
935 d = s->change.items[i].util;
936 if (d->stagemask)
937 return 1;
938 }
939 return 0;
940}
941
942static void show_merge_in_progress(struct wt_status *s,
943 struct wt_status_state *state,
944 const char *color)
945{
946 if (has_unmerged(s)) {
947 status_printf_ln(s, color, _("You have unmerged paths."));
6a964f57 948 if (s->hints)
83c750ac
LK
949 status_printf_ln(s, color,
950 _(" (fix conflicts and run \"git commit\")"));
951 } else {
8dc874b2 952 s-> commitable = 1;
83c750ac
LK
953 status_printf_ln(s, color,
954 _("All conflicts fixed but you are still merging."));
6a964f57 955 if (s->hints)
83c750ac
LK
956 status_printf_ln(s, color,
957 _(" (use \"git commit\" to conclude merge)"));
958 }
959 wt_status_print_trailer(s);
960}
961
962static void show_am_in_progress(struct wt_status *s,
963 struct wt_status_state *state,
964 const char *color)
965{
966 status_printf_ln(s, color,
967 _("You are in the middle of an am session."));
968 if (state->am_empty_patch)
969 status_printf_ln(s, color,
970 _("The current patch is empty."));
6a964f57 971 if (s->hints) {
83c750ac
LK
972 if (!state->am_empty_patch)
973 status_printf_ln(s, color,
8ceb6fbd 974 _(" (fix conflicts and then run \"git am --continue\")"));
83c750ac
LK
975 status_printf_ln(s, color,
976 _(" (use \"git am --skip\" to skip this patch)"));
977 status_printf_ln(s, color,
978 _(" (use \"git am --abort\" to restore the original branch)"));
979 }
980 wt_status_print_trailer(s);
981}
982
2d1cceba
LK
983static char *read_line_from_git_path(const char *filename)
984{
985 struct strbuf buf = STRBUF_INIT;
986 FILE *fp = fopen(git_path("%s", filename), "r");
987 if (!fp) {
988 strbuf_release(&buf);
989 return NULL;
990 }
991 strbuf_getline(&buf, fp, '\n');
992 if (!fclose(fp)) {
993 return strbuf_detach(&buf, NULL);
994 } else {
995 strbuf_release(&buf);
996 return NULL;
997 }
998}
999
1000static int split_commit_in_progress(struct wt_status *s)
1001{
1002 int split_in_progress = 0;
1003 char *head = read_line_from_git_path("HEAD");
1004 char *orig_head = read_line_from_git_path("ORIG_HEAD");
1005 char *rebase_amend = read_line_from_git_path("rebase-merge/amend");
1006 char *rebase_orig_head = read_line_from_git_path("rebase-merge/orig-head");
1007
1008 if (!head || !orig_head || !rebase_amend || !rebase_orig_head ||
1009 !s->branch || strcmp(s->branch, "HEAD"))
1010 return split_in_progress;
1011
1012 if (!strcmp(rebase_amend, rebase_orig_head)) {
1013 if (strcmp(head, rebase_amend))
1014 split_in_progress = 1;
1015 } else if (strcmp(orig_head, rebase_orig_head)) {
1016 split_in_progress = 1;
1017 }
1018
1019 if (!s->amend && !s->nowarn && !s->workdir_dirty)
1020 split_in_progress = 0;
1021
1022 free(head);
1023 free(orig_head);
1024 free(rebase_amend);
1025 free(rebase_orig_head);
1026 return split_in_progress;
1027}
1028
83c750ac
LK
1029static void show_rebase_in_progress(struct wt_status *s,
1030 struct wt_status_state *state,
1031 const char *color)
1032{
1033 struct stat st;
1034
1035 if (has_unmerged(s)) {
0722c805
NTND
1036 if (state->branch)
1037 status_printf_ln(s, color,
1038 _("You are currently rebasing branch '%s' on '%s'."),
1039 state->branch,
1040 state->onto);
1041 else
1042 status_printf_ln(s, color,
1043 _("You are currently rebasing."));
6a964f57 1044 if (s->hints) {
83c750ac
LK
1045 status_printf_ln(s, color,
1046 _(" (fix conflicts and then run \"git rebase --continue\")"));
1047 status_printf_ln(s, color,
1048 _(" (use \"git rebase --skip\" to skip this patch)"));
1049 status_printf_ln(s, color,
1050 _(" (use \"git rebase --abort\" to check out the original branch)"));
1051 }
1052 } else if (state->rebase_in_progress || !stat(git_path("MERGE_MSG"), &st)) {
0722c805
NTND
1053 if (state->branch)
1054 status_printf_ln(s, color,
1055 _("You are currently rebasing branch '%s' on '%s'."),
1056 state->branch,
1057 state->onto);
1058 else
1059 status_printf_ln(s, color,
1060 _("You are currently rebasing."));
6a964f57 1061 if (s->hints)
83c750ac
LK
1062 status_printf_ln(s, color,
1063 _(" (all conflicts fixed: run \"git rebase --continue\")"));
2d1cceba 1064 } else if (split_commit_in_progress(s)) {
0722c805
NTND
1065 if (state->branch)
1066 status_printf_ln(s, color,
1067 _("You are currently splitting a commit while rebasing branch '%s' on '%s'."),
1068 state->branch,
1069 state->onto);
1070 else
1071 status_printf_ln(s, color,
1072 _("You are currently splitting a commit during a rebase."));
6a964f57 1073 if (s->hints)
2d1cceba
LK
1074 status_printf_ln(s, color,
1075 _(" (Once your working directory is clean, run \"git rebase --continue\")"));
83c750ac 1076 } else {
0722c805
NTND
1077 if (state->branch)
1078 status_printf_ln(s, color,
1079 _("You are currently editing a commit while rebasing branch '%s' on '%s'."),
1080 state->branch,
1081 state->onto);
1082 else
1083 status_printf_ln(s, color,
1084 _("You are currently editing a commit during a rebase."));
6a964f57 1085 if (s->hints && !s->amend) {
83c750ac
LK
1086 status_printf_ln(s, color,
1087 _(" (use \"git commit --amend\" to amend the current commit)"));
1088 status_printf_ln(s, color,
1089 _(" (use \"git rebase --continue\" once you are satisfied with your changes)"));
1090 }
1091 }
1092 wt_status_print_trailer(s);
1093}
1094
1095static void show_cherry_pick_in_progress(struct wt_status *s,
1096 struct wt_status_state *state,
1097 const char *color)
1098{
bffd8098
RT
1099 status_printf_ln(s, color, _("You are currently cherry-picking commit %s."),
1100 find_unique_abbrev(state->cherry_pick_head_sha1, DEFAULT_ABBREV));
6a964f57 1101 if (s->hints) {
83c750ac
LK
1102 if (has_unmerged(s))
1103 status_printf_ln(s, color,
b95e66f5 1104 _(" (fix conflicts and run \"git cherry-pick --continue\")"));
83c750ac
LK
1105 else
1106 status_printf_ln(s, color,
b95e66f5
RT
1107 _(" (all conflicts fixed: run \"git cherry-pick --continue\")"));
1108 status_printf_ln(s, color,
1109 _(" (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"));
83c750ac
LK
1110 }
1111 wt_status_print_trailer(s);
1112}
1113
db4ef449
MM
1114static void show_revert_in_progress(struct wt_status *s,
1115 struct wt_status_state *state,
1116 const char *color)
1117{
87e139c0
MM
1118 status_printf_ln(s, color, _("You are currently reverting commit %s."),
1119 find_unique_abbrev(state->revert_head_sha1, DEFAULT_ABBREV));
6a964f57 1120 if (s->hints) {
db4ef449
MM
1121 if (has_unmerged(s))
1122 status_printf_ln(s, color,
1123 _(" (fix conflicts and run \"git revert --continue\")"));
1124 else
1125 status_printf_ln(s, color,
1126 _(" (all conflicts fixed: run \"git revert --continue\")"));
1127 status_printf_ln(s, color,
1128 _(" (use \"git revert --abort\" to cancel the revert operation)"));
1129 }
1130 wt_status_print_trailer(s);
1131}
1132
83c750ac
LK
1133static void show_bisect_in_progress(struct wt_status *s,
1134 struct wt_status_state *state,
1135 const char *color)
1136{
0722c805
NTND
1137 if (state->branch)
1138 status_printf_ln(s, color,
6deab24d 1139 _("You are currently bisecting, started from branch '%s'."),
0722c805
NTND
1140 state->branch);
1141 else
1142 status_printf_ln(s, color,
1143 _("You are currently bisecting."));
6a964f57 1144 if (s->hints)
83c750ac
LK
1145 status_printf_ln(s, color,
1146 _(" (use \"git bisect reset\" to get back to the original branch)"));
1147 wt_status_print_trailer(s);
1148}
1149
0722c805
NTND
1150/*
1151 * Extract branch information from rebase/bisect
1152 */
8b87cfd0 1153static char *read_and_strip_branch(const char *path)
0722c805 1154{
8b87cfd0 1155 struct strbuf sb = STRBUF_INIT;
0722c805
NTND
1156 unsigned char sha1[20];
1157
8b87cfd0
NTND
1158 if (strbuf_read_file(&sb, git_path("%s", path), 0) <= 0)
1159 goto got_nothing;
0722c805 1160
66ec904b 1161 while (sb.len && sb.buf[sb.len - 1] == '\n')
8b87cfd0
NTND
1162 strbuf_setlen(&sb, sb.len - 1);
1163 if (!sb.len)
1164 goto got_nothing;
59556548 1165 if (starts_with(sb.buf, "refs/heads/"))
8b87cfd0 1166 strbuf_remove(&sb,0, strlen("refs/heads/"));
59556548 1167 else if (starts_with(sb.buf, "refs/"))
8b87cfd0
NTND
1168 ;
1169 else if (!get_sha1_hex(sb.buf, sha1)) {
0722c805
NTND
1170 const char *abbrev;
1171 abbrev = find_unique_abbrev(sha1, DEFAULT_ABBREV);
8b87cfd0
NTND
1172 strbuf_reset(&sb);
1173 strbuf_addstr(&sb, abbrev);
1174 } else if (!strcmp(sb.buf, "detached HEAD")) /* rebase */
1175 goto got_nothing;
0722c805 1176 else /* bisect */
8b87cfd0
NTND
1177 ;
1178 return strbuf_detach(&sb, NULL);
1179
1180got_nothing:
1181 strbuf_release(&sb);
1182 return NULL;
0722c805
NTND
1183}
1184
b397ea48 1185struct grab_1st_switch_cbdata {
b397ea48
NTND
1186 struct strbuf buf;
1187 unsigned char nsha1[20];
1188};
1189
1190static int grab_1st_switch(unsigned char *osha1, unsigned char *nsha1,
1191 const char *email, unsigned long timestamp, int tz,
1192 const char *message, void *cb_data)
83c750ac 1193{
b397ea48
NTND
1194 struct grab_1st_switch_cbdata *cb = cb_data;
1195 const char *target = NULL, *end;
83c750ac 1196
59556548 1197 if (!starts_with(message, "checkout: moving from "))
b397ea48
NTND
1198 return 0;
1199 message += strlen("checkout: moving from ");
1200 target = strstr(message, " to ");
1201 if (!target)
1202 return 0;
1203 target += strlen(" to ");
1204 strbuf_reset(&cb->buf);
1205 hashcpy(cb->nsha1, nsha1);
1206 for (end = target; *end && *end != '\n'; end++)
1207 ;
1208 strbuf_add(&cb->buf, target, end - target);
b397ea48
NTND
1209 return 1;
1210}
1211
1212static void wt_status_get_detached_from(struct wt_status_state *state)
1213{
1214 struct grab_1st_switch_cbdata cb;
1215 struct commit *commit;
1216 unsigned char sha1[20];
1217 char *ref = NULL;
1218
1219 strbuf_init(&cb.buf, 0);
1220 if (for_each_reflog_ent_reverse("HEAD", grab_1st_switch, &cb) <= 0) {
1221 strbuf_release(&cb.buf);
1222 return;
1223 }
1224
1225 if (dwim_ref(cb.buf.buf, cb.buf.len, sha1, &ref) == 1 &&
1226 /* sha1 is a commit? match without further lookup */
1227 (!hashcmp(cb.nsha1, sha1) ||
1228 /* perhaps sha1 is a tag, try to dereference to a commit */
1229 ((commit = lookup_commit_reference_gently(sha1, 1)) != NULL &&
1230 !hashcmp(cb.nsha1, commit->object.sha1)))) {
1231 int ofs;
59556548 1232 if (starts_with(ref, "refs/tags/"))
b397ea48 1233 ofs = strlen("refs/tags/");
59556548 1234 else if (starts_with(ref, "refs/remotes/"))
b397ea48
NTND
1235 ofs = strlen("refs/remotes/");
1236 else
1237 ofs = 0;
1238 state->detached_from = xstrdup(ref + ofs);
1239 } else
1240 state->detached_from =
1241 xstrdup(find_unique_abbrev(cb.nsha1, DEFAULT_ABBREV));
1242 hashcpy(state->detached_sha1, cb.nsha1);
970399e7
MG
1243 state->detached_at = !get_sha1("HEAD", sha1) &&
1244 !hashcmp(sha1, state->detached_sha1);
b397ea48
NTND
1245
1246 free(ref);
1247 strbuf_release(&cb.buf);
1248}
1249
1250void wt_status_get_state(struct wt_status_state *state,
1251 int get_detached_from)
83c750ac 1252{
83c750ac 1253 struct stat st;
87e139c0 1254 unsigned char sha1[20];
83c750ac
LK
1255
1256 if (!stat(git_path("MERGE_HEAD"), &st)) {
b9691db4 1257 state->merge_in_progress = 1;
83c750ac
LK
1258 } else if (!stat(git_path("rebase-apply"), &st)) {
1259 if (!stat(git_path("rebase-apply/applying"), &st)) {
b9691db4 1260 state->am_in_progress = 1;
83c750ac 1261 if (!stat(git_path("rebase-apply/patch"), &st) && !st.st_size)
b9691db4 1262 state->am_empty_patch = 1;
83c750ac 1263 } else {
b9691db4
NTND
1264 state->rebase_in_progress = 1;
1265 state->branch = read_and_strip_branch("rebase-apply/head-name");
1266 state->onto = read_and_strip_branch("rebase-apply/onto");
83c750ac
LK
1267 }
1268 } else if (!stat(git_path("rebase-merge"), &st)) {
1269 if (!stat(git_path("rebase-merge/interactive"), &st))
b9691db4 1270 state->rebase_interactive_in_progress = 1;
83c750ac 1271 else
b9691db4
NTND
1272 state->rebase_in_progress = 1;
1273 state->branch = read_and_strip_branch("rebase-merge/head-name");
1274 state->onto = read_and_strip_branch("rebase-merge/onto");
bffd8098
RT
1275 } else if (!stat(git_path("CHERRY_PICK_HEAD"), &st) &&
1276 !get_sha1("CHERRY_PICK_HEAD", sha1)) {
b9691db4 1277 state->cherry_pick_in_progress = 1;
bffd8098 1278 hashcpy(state->cherry_pick_head_sha1, sha1);
83c750ac 1279 }
0722c805 1280 if (!stat(git_path("BISECT_LOG"), &st)) {
b9691db4
NTND
1281 state->bisect_in_progress = 1;
1282 state->branch = read_and_strip_branch("BISECT_START");
0722c805 1283 }
87e139c0
MM
1284 if (!stat(git_path("REVERT_HEAD"), &st) &&
1285 !get_sha1("REVERT_HEAD", sha1)) {
db4ef449 1286 state->revert_in_progress = 1;
87e139c0 1287 hashcpy(state->revert_head_sha1, sha1);
db4ef449 1288 }
83c750ac 1289
b397ea48
NTND
1290 if (get_detached_from)
1291 wt_status_get_detached_from(state);
b9691db4
NTND
1292}
1293
3b691ccc
NTND
1294static void wt_status_print_state(struct wt_status *s,
1295 struct wt_status_state *state)
b9691db4
NTND
1296{
1297 const char *state_color = color(WT_STATUS_HEADER, s);
3b691ccc
NTND
1298 if (state->merge_in_progress)
1299 show_merge_in_progress(s, state, state_color);
1300 else if (state->am_in_progress)
1301 show_am_in_progress(s, state, state_color);
1302 else if (state->rebase_in_progress || state->rebase_interactive_in_progress)
1303 show_rebase_in_progress(s, state, state_color);
1304 else if (state->cherry_pick_in_progress)
1305 show_cherry_pick_in_progress(s, state, state_color);
db4ef449
MM
1306 else if (state->revert_in_progress)
1307 show_revert_in_progress(s, state, state_color);
3b691ccc
NTND
1308 if (state->bisect_in_progress)
1309 show_bisect_in_progress(s, state, state_color);
83c750ac
LK
1310}
1311
c91f0d92
JK
1312void wt_status_print(struct wt_status *s)
1313{
1d282327
AA
1314 const char *branch_color = color(WT_STATUS_ONBRANCH, s);
1315 const char *branch_status_color = color(WT_STATUS_HEADER, s);
3b691ccc
NTND
1316 struct wt_status_state state;
1317
1318 memset(&state, 0, sizeof(state));
b397ea48
NTND
1319 wt_status_get_state(&state,
1320 s->branch && !strcmp(s->branch, "HEAD"));
98bf8a47 1321
bda324cf 1322 if (s->branch) {
355ec7a1 1323 const char *on_what = _("On branch ");
bda324cf 1324 const char *branch_name = s->branch;
59556548 1325 if (starts_with(branch_name, "refs/heads/"))
bda324cf
JH
1326 branch_name += 11;
1327 else if (!strcmp(branch_name, "HEAD")) {
1d282327 1328 branch_status_color = color(WT_STATUS_NOBRANCH, s);
ec506310
RR
1329 if (state.rebase_in_progress || state.rebase_interactive_in_progress) {
1330 on_what = _("rebase in progress; onto ");
1331 branch_name = state.onto;
1332 } else if (state.detached_from) {
b397ea48 1333 branch_name = state.detached_from;
970399e7 1334 if (state.detached_at)
b397ea48
NTND
1335 on_what = _("HEAD detached at ");
1336 else
1337 on_what = _("HEAD detached from ");
1338 } else {
1339 branch_name = "";
1340 on_what = _("Not currently on any branch.");
1341 }
bda324cf 1342 }
7d7d6802 1343 status_printf(s, color(WT_STATUS_HEADER, s), "%s", "");
b926c0d1
JN
1344 status_printf_more(s, branch_status_color, "%s", on_what);
1345 status_printf_more(s, branch_color, "%s\n", branch_name);
b6975ab5
JH
1346 if (!s->is_initial)
1347 wt_status_print_tracking(s);
bda324cf 1348 }
c91f0d92 1349
3b691ccc
NTND
1350 wt_status_print_state(s, &state);
1351 free(state.branch);
1352 free(state.onto);
b397ea48 1353 free(state.detached_from);
3b691ccc 1354
c91f0d92 1355 if (s->is_initial) {
7d7d6802 1356 status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", "");
b3b298af 1357 status_printf_ln(s, color(WT_STATUS_HEADER, s), _("Initial commit"));
7d7d6802 1358 status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", "");
c91f0d92
JK
1359 }
1360
c1e255b7 1361 wt_status_print_updated(s);
228e7b5d 1362 wt_status_print_unmerged(s);
c91f0d92 1363 wt_status_print_changed(s);
46a958b3
JL
1364 if (s->submodule_summary &&
1365 (!s->ignore_submodule_arg ||
1366 strcmp(s->ignore_submodule_arg, "all"))) {
f17a5d34
JL
1367 wt_status_print_submodule_summary(s, 0); /* staged */
1368 wt_status_print_submodule_summary(s, 1); /* unstaged */
1369 }
2381e39e 1370 if (s->show_untracked_files) {
50bd8b7e 1371 wt_status_print_other(s, &s->untracked, _("Untracked files"), "add");
2381e39e 1372 if (s->show_ignored_files)
50bd8b7e 1373 wt_status_print_other(s, &s->ignored, _("Ignored files"), "add -f");
6a38ef2c 1374 if (advice_status_u_option && 2000 < s->untracked_in_ms) {
7d7d6802 1375 status_printf_ln(s, GIT_COLOR_NORMAL, "%s", "");
6a38ef2c 1376 status_printf_ln(s, GIT_COLOR_NORMAL,
62901179
JX
1377 _("It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1378 "may speed it up, but you have to be careful not to forget to add\n"
1379 "new files yourself (see 'git help status')."),
1380 s->untracked_in_ms / 1000.0);
6a38ef2c 1381 }
2381e39e 1382 } else if (s->commitable)
355ec7a1 1383 status_printf_ln(s, GIT_COLOR_NORMAL, _("Untracked files not listed%s"),
6a964f57 1384 s->hints
355ec7a1 1385 ? _(" (use -u option to show untracked files)") : "");
c91f0d92 1386
1324fb6f 1387 if (s->verbose)
c91f0d92 1388 wt_status_print_verbose(s);
6e458bf6
JR
1389 if (!s->commitable) {
1390 if (s->amend)
355ec7a1 1391 status_printf_ln(s, GIT_COLOR_NORMAL, _("No changes"));
37d07f8f
JH
1392 else if (s->nowarn)
1393 ; /* nothing */
50bd8b7e 1394 else if (s->workdir_dirty) {
6a964f57 1395 if (s->hints)
50bd8b7e
NTND
1396 printf(_("no changes added to commit "
1397 "(use \"git add\" and/or \"git commit -a\")\n"));
1398 else
1399 printf(_("no changes added to commit\n"));
1400 } else if (s->untracked.nr) {
6a964f57 1401 if (s->hints)
50bd8b7e
NTND
1402 printf(_("nothing added to commit but untracked files "
1403 "present (use \"git add\" to track)\n"));
1404 else
1405 printf(_("nothing added to commit but untracked files present\n"));
1406 } else if (s->is_initial) {
6a964f57 1407 if (s->hints)
50bd8b7e
NTND
1408 printf(_("nothing to commit (create/copy files "
1409 "and use \"git add\" to track)\n"));
1410 else
1411 printf(_("nothing to commit\n"));
1412 } else if (!s->show_untracked_files) {
6a964f57 1413 if (s->hints)
50bd8b7e
NTND
1414 printf(_("nothing to commit (use -u to show untracked files)\n"));
1415 else
1416 printf(_("nothing to commit\n"));
1417 } else
1418 printf(_("nothing to commit, working directory clean\n"));
6e458bf6 1419 }
c91f0d92 1420}
84dbe7b8 1421
3207a3a2 1422static void wt_shortstatus_unmerged(struct string_list_item *it,
84dbe7b8
MG
1423 struct wt_status *s)
1424{
1425 struct wt_status_change_data *d = it->util;
1426 const char *how = "??";
1427
1428 switch (d->stagemask) {
1429 case 1: how = "DD"; break; /* both deleted */
1430 case 2: how = "AU"; break; /* added by us */
1431 case 3: how = "UD"; break; /* deleted by them */
1432 case 4: how = "UA"; break; /* added by them */
1433 case 5: how = "DU"; break; /* deleted by us */
1434 case 6: how = "AA"; break; /* both added */
1435 case 7: how = "UU"; break; /* both modified */
1436 }
3fe2a894 1437 color_fprintf(s->fp, color(WT_STATUS_UNMERGED, s), "%s", how);
3207a3a2 1438 if (s->null_termination) {
3fe2a894 1439 fprintf(stdout, " %s%c", it->string, 0);
84dbe7b8
MG
1440 } else {
1441 struct strbuf onebuf = STRBUF_INIT;
1442 const char *one;
39598f99 1443 one = quote_path(it->string, s->prefix, &onebuf);
3fe2a894 1444 printf(" %s\n", one);
84dbe7b8
MG
1445 strbuf_release(&onebuf);
1446 }
1447}
1448
3207a3a2 1449static void wt_shortstatus_status(struct string_list_item *it,
84dbe7b8
MG
1450 struct wt_status *s)
1451{
1452 struct wt_status_change_data *d = it->util;
1453
3fe2a894
MG
1454 if (d->index_status)
1455 color_fprintf(s->fp, color(WT_STATUS_UPDATED, s), "%c", d->index_status);
1456 else
1457 putchar(' ');
1458 if (d->worktree_status)
1459 color_fprintf(s->fp, color(WT_STATUS_CHANGED, s), "%c", d->worktree_status);
1460 else
1461 putchar(' ');
1462 putchar(' ');
3207a3a2 1463 if (s->null_termination) {
84dbe7b8
MG
1464 fprintf(stdout, "%s%c", it->string, 0);
1465 if (d->head_path)
1466 fprintf(stdout, "%s%c", d->head_path, 0);
1467 } else {
1468 struct strbuf onebuf = STRBUF_INIT;
1469 const char *one;
1470 if (d->head_path) {
39598f99 1471 one = quote_path(d->head_path, s->prefix, &onebuf);
dbfdc625
KB
1472 if (*one != '"' && strchr(one, ' ') != NULL) {
1473 putchar('"');
1474 strbuf_addch(&onebuf, '"');
1475 one = onebuf.buf;
1476 }
84dbe7b8
MG
1477 printf("%s -> ", one);
1478 strbuf_release(&onebuf);
1479 }
39598f99 1480 one = quote_path(it->string, s->prefix, &onebuf);
dbfdc625
KB
1481 if (*one != '"' && strchr(one, ' ') != NULL) {
1482 putchar('"');
1483 strbuf_addch(&onebuf, '"');
1484 one = onebuf.buf;
1485 }
84dbe7b8
MG
1486 printf("%s\n", one);
1487 strbuf_release(&onebuf);
1488 }
1489}
1490
3207a3a2 1491static void wt_shortstatus_other(struct string_list_item *it,
2381e39e 1492 struct wt_status *s, const char *sign)
84dbe7b8 1493{
3207a3a2 1494 if (s->null_termination) {
2381e39e 1495 fprintf(stdout, "%s %s%c", sign, it->string, 0);
84dbe7b8
MG
1496 } else {
1497 struct strbuf onebuf = STRBUF_INIT;
1498 const char *one;
39598f99 1499 one = quote_path(it->string, s->prefix, &onebuf);
c1909e72 1500 color_fprintf(s->fp, color(WT_STATUS_UNTRACKED, s), "%s", sign);
3fe2a894 1501 printf(" %s\n", one);
84dbe7b8
MG
1502 strbuf_release(&onebuf);
1503 }
1504}
1505
05a59a08
DKF
1506static void wt_shortstatus_print_tracking(struct wt_status *s)
1507{
1508 struct branch *branch;
1509 const char *header_color = color(WT_STATUS_HEADER, s);
1510 const char *branch_color_local = color(WT_STATUS_LOCAL_BRANCH, s);
1511 const char *branch_color_remote = color(WT_STATUS_REMOTE_BRANCH, s);
1512
1513 const char *base;
1514 const char *branch_name;
1515 int num_ours, num_theirs;
f2e08739 1516 int upstream_is_gone = 0;
05a59a08
DKF
1517
1518 color_fprintf(s->fp, color(WT_STATUS_HEADER, s), "## ");
1519
1520 if (!s->branch)
1521 return;
1522 branch_name = s->branch;
1523
59556548 1524 if (starts_with(branch_name, "refs/heads/"))
05a59a08
DKF
1525 branch_name += 11;
1526 else if (!strcmp(branch_name, "HEAD")) {
98f5e24b 1527 branch_name = _("HEAD (no branch)");
05a59a08
DKF
1528 branch_color_local = color(WT_STATUS_NOBRANCH, s);
1529 }
1530
1531 branch = branch_get(s->branch + 11);
1532 if (s->is_initial)
98f5e24b 1533 color_fprintf(s->fp, header_color, _("Initial commit on "));
f2e08739
JX
1534
1535 color_fprintf(s->fp, branch_color_local, "%s", branch_name);
1536
1537 switch (stat_tracking_info(branch, &num_ours, &num_theirs)) {
1538 case 0:
1539 /* no base */
a5985237 1540 fputc(s->null_termination ? '\0' : '\n', s->fp);
05a59a08 1541 return;
f2e08739
JX
1542 case -1:
1543 /* with "gone" base */
1544 upstream_is_gone = 1;
1545 break;
1546 default:
f2e08739
JX
1547 /* with base */
1548 break;
05a59a08
DKF
1549 }
1550
1551 base = branch->merge[0]->dst;
1552 base = shorten_unambiguous_ref(base, 0);
05a59a08
DKF
1553 color_fprintf(s->fp, header_color, "...");
1554 color_fprintf(s->fp, branch_color_remote, "%s", base);
0e32d4b3 1555 free((char *)base);
05a59a08 1556
f223459b
JX
1557 if (!upstream_is_gone && !num_ours && !num_theirs) {
1558 fputc(s->null_termination ? '\0' : '\n', s->fp);
1559 return;
1560 }
1561
7a76c28f
MM
1562#define LABEL(string) (s->no_gettext ? (string) : _(string))
1563
05a59a08 1564 color_fprintf(s->fp, header_color, " [");
f2e08739 1565 if (upstream_is_gone) {
7a76c28f 1566 color_fprintf(s->fp, header_color, LABEL(N_("gone")));
f2e08739 1567 } else if (!num_ours) {
7a76c28f 1568 color_fprintf(s->fp, header_color, LABEL(N_("behind ")));
05a59a08
DKF
1569 color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
1570 } else if (!num_theirs) {
7a76c28f 1571 color_fprintf(s->fp, header_color, LABEL(N_(("ahead "))));
05a59a08
DKF
1572 color_fprintf(s->fp, branch_color_local, "%d", num_ours);
1573 } else {
7a76c28f 1574 color_fprintf(s->fp, header_color, LABEL(N_(("ahead "))));
05a59a08 1575 color_fprintf(s->fp, branch_color_local, "%d", num_ours);
7a76c28f 1576 color_fprintf(s->fp, header_color, ", %s", LABEL(N_("behind ")));
05a59a08
DKF
1577 color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
1578 }
1579
a5985237
JK
1580 color_fprintf(s->fp, header_color, "]");
1581 fputc(s->null_termination ? '\0' : '\n', s->fp);
05a59a08
DKF
1582}
1583
d4a6bf1f 1584void wt_shortstatus_print(struct wt_status *s)
84dbe7b8
MG
1585{
1586 int i;
05a59a08 1587
d4a6bf1f 1588 if (s->show_branch)
05a59a08
DKF
1589 wt_shortstatus_print_tracking(s);
1590
84dbe7b8
MG
1591 for (i = 0; i < s->change.nr; i++) {
1592 struct wt_status_change_data *d;
1593 struct string_list_item *it;
1594
1595 it = &(s->change.items[i]);
1596 d = it->util;
1597 if (d->stagemask)
3207a3a2 1598 wt_shortstatus_unmerged(it, s);
84dbe7b8 1599 else
3207a3a2 1600 wt_shortstatus_status(it, s);
84dbe7b8
MG
1601 }
1602 for (i = 0; i < s->untracked.nr; i++) {
1603 struct string_list_item *it;
1604
1605 it = &(s->untracked.items[i]);
3207a3a2 1606 wt_shortstatus_other(it, s, "??");
2381e39e
JH
1607 }
1608 for (i = 0; i < s->ignored.nr; i++) {
1609 struct string_list_item *it;
1610
1611 it = &(s->ignored.items[i]);
3207a3a2 1612 wt_shortstatus_other(it, s, "!!");
84dbe7b8
MG
1613 }
1614}
4a7cc2fd 1615
3207a3a2 1616void wt_porcelain_print(struct wt_status *s)
4a7cc2fd
JK
1617{
1618 s->use_color = 0;
8661768f
JK
1619 s->relative_paths = 0;
1620 s->prefix = NULL;
7a76c28f 1621 s->no_gettext = 1;
d4a6bf1f 1622 wt_shortstatus_print(s);
4a7cc2fd 1623}