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