?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
Merge branch 'js/trace2-fetch-push'
[git.git] / wt-status.c
blobcc6f94504d9fa9f7ec80f5131996a10c878c26cb
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 --skip\" to skip this patch)"));
1438 status_printf_ln(s, color,
1439 _(" (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"));
1440 }
1441 wt_longstatus_print_trailer(s);
1442 }
1443
1444 static void show_revert_in_progress(struct wt_status *s,
1445 const char *color)
1446 {
1447 if (is_null_oid(&s->state.revert_head_oid))
1448 status_printf_ln(s, color,
1449 _("Revert currently in progress."));
1450 else
1451 status_printf_ln(s, color,
1452 _("You are currently reverting commit %s."),
1453 find_unique_abbrev(&s->state.revert_head_oid,
1454 DEFAULT_ABBREV));
1455 if (s->hints) {
1456 if (has_unmerged(s))
1457 status_printf_ln(s, color,
1458 _(" (fix conflicts and run \"git revert --continue\")"));
1459 else if (is_null_oid(&s->state.revert_head_oid))
1460 status_printf_ln(s, color,
1461 _(" (run \"git revert --continue\" to continue)"));
1462 else
1463 status_printf_ln(s, color,
1464 _(" (all conflicts fixed: run \"git revert --continue\")"));
1465 status_printf_ln(s, color,
1466 _(" (use \"git revert --skip\" to skip this patch)"));
1467 status_printf_ln(s, color,
1468 _(" (use \"git revert --abort\" to cancel the revert operation)"));
1469 }
1470 wt_longstatus_print_trailer(s);
1471 }
1472
1473 static void show_bisect_in_progress(struct wt_status *s,
1474 const char *color)
1475 {
1476 if (s->state.branch)
1477 status_printf_ln(s, color,
1478 _("You are currently bisecting, started from branch '%s'."),
1479 s->state.branch);
1480 else
1481 status_printf_ln(s, color,
1482 _("You are currently bisecting."));
1483 if (s->hints)
1484 status_printf_ln(s, color,
1485 _(" (use \"git bisect reset\" to get back to the original branch)"));
1486 wt_longstatus_print_trailer(s);
1487 }
1488
1489 /*
1490 * Extract branch information from rebase/bisect
1491 */
1492 static char *get_branch(const struct worktree *wt, const char *path)
1493 {
1494 struct strbuf sb = STRBUF_INIT;
1495 struct object_id oid;
1496 const char *branch_name;
1497
1498 if (strbuf_read_file(&sb, worktree_git_path(wt, "%s", path), 0) <= 0)
1499 goto got_nothing;
1500
1501 while (sb.len && sb.buf[sb.len - 1] == '\n')
1502 strbuf_setlen(&sb, sb.len - 1);
1503 if (!sb.len)
1504 goto got_nothing;
1505 if (skip_prefix(sb.buf, "refs/heads/", &branch_name))
1506 strbuf_remove(&sb, 0, branch_name - sb.buf);
1507 else if (starts_with(sb.buf, "refs/"))
1508 ;
1509 else if (!get_oid_hex(sb.buf, &oid)) {
1510 strbuf_reset(&sb);
1511 strbuf_add_unique_abbrev(&sb, &oid, DEFAULT_ABBREV);
1512 } else if (!strcmp(sb.buf, "detached HEAD")) /* rebase */
1513 goto got_nothing;
1514 else /* bisect */
1515 ;
1516 return strbuf_detach(&sb, NULL);
1517
1518 got_nothing:
1519 strbuf_release(&sb);
1520 return NULL;
1521 }
1522
1523 struct grab_1st_switch_cbdata {
1524 struct strbuf buf;
1525 struct object_id noid;
1526 };
1527
1528 static int grab_1st_switch(struct object_id *ooid, struct object_id *noid,
1529 const char *email, timestamp_t timestamp, int tz,
1530 const char *message, void *cb_data)
1531 {
1532 struct grab_1st_switch_cbdata *cb = cb_data;
1533 const char *target = NULL, *end;
1534
1535 if (!skip_prefix(message, "checkout: moving from ", &message))
1536 return 0;
1537 target = strstr(message, " to ");
1538 if (!target)
1539 return 0;
1540 target += strlen(" to ");
1541 strbuf_reset(&cb->buf);
1542 oidcpy(&cb->noid, noid);
1543 end = strchrnul(target, '\n');
1544 strbuf_add(&cb->buf, target, end - target);
1545 if (!strcmp(cb->buf.buf, "HEAD")) {
1546 /* HEAD is relative. Resolve it to the right reflog entry. */
1547 strbuf_reset(&cb->buf);
1548 strbuf_add_unique_abbrev(&cb->buf, noid, DEFAULT_ABBREV);
1549 }
1550 return 1;
1551 }
1552
1553 static void wt_status_get_detached_from(struct repository *r,
1554 struct wt_status_state *state)
1555 {
1556 struct grab_1st_switch_cbdata cb;
1557 struct commit *commit;
1558 struct object_id oid;
1559 char *ref = NULL;
1560
1561 strbuf_init(&cb.buf, 0);
1562 if (for_each_reflog_ent_reverse("HEAD", grab_1st_switch, &cb) <= 0) {
1563 strbuf_release(&cb.buf);
1564 return;
1565 }
1566
1567 if (dwim_ref(cb.buf.buf, cb.buf.len, &oid, &ref) == 1 &&
1568 /* sha1 is a commit? match without further lookup */
1569 (oideq(&cb.noid, &oid) ||
1570 /* perhaps sha1 is a tag, try to dereference to a commit */
1571 ((commit = lookup_commit_reference_gently(r, &oid, 1)) != NULL &&
1572 oideq(&cb.noid, &commit->object.oid)))) {
1573 const char *from = ref;
1574 if (!skip_prefix(from, "refs/tags/", &from))
1575 skip_prefix(from, "refs/remotes/", &from);
1576 state->detached_from = xstrdup(from);
1577 } else
1578 state->detached_from =
1579 xstrdup(find_unique_abbrev(&cb.noid, DEFAULT_ABBREV));
1580 oidcpy(&state->detached_oid, &cb.noid);
1581 state->detached_at = !get_oid("HEAD", &oid) &&
1582 oideq(&oid, &state->detached_oid);
1583
1584 free(ref);
1585 strbuf_release(&cb.buf);
1586 }
1587
1588 int wt_status_check_rebase(const struct worktree *wt,
1589 struct wt_status_state *state)
1590 {
1591 struct stat st;
1592
1593 if (!stat(worktree_git_path(wt, "rebase-apply"), &st)) {
1594 if (!stat(worktree_git_path(wt, "rebase-apply/applying"), &st)) {
1595 state->am_in_progress = 1;
1596 if (!stat(worktree_git_path(wt, "rebase-apply/patch"), &st) && !st.st_size)
1597 state->am_empty_patch = 1;
1598 } else {
1599 state->rebase_in_progress = 1;
1600 state->branch = get_branch(wt, "rebase-apply/head-name");
1601 state->onto = get_branch(wt, "rebase-apply/onto");
1602 }
1603 } else if (!stat(worktree_git_path(wt, "rebase-merge"), &st)) {
1604 if (!stat(worktree_git_path(wt, "rebase-merge/interactive"), &st))
1605 state->rebase_interactive_in_progress = 1;
1606 else
1607 state->rebase_in_progress = 1;
1608 state->branch = get_branch(wt, "rebase-merge/head-name");
1609 state->onto = get_branch(wt, "rebase-merge/onto");
1610 } else
1611 return 0;
1612 return 1;
1613 }
1614
1615 int wt_status_check_bisect(const struct worktree *wt,
1616 struct wt_status_state *state)
1617 {
1618 struct stat st;
1619
1620 if (!stat(worktree_git_path(wt, "BISECT_LOG"), &st)) {
1621 state->bisect_in_progress = 1;
1622 state->branch = get_branch(wt, "BISECT_START");
1623 return 1;
1624 }
1625 return 0;
1626 }
1627
1628 void wt_status_get_state(struct repository *r,
1629 struct wt_status_state *state,
1630 int get_detached_from)
1631 {
1632 struct stat st;
1633 struct object_id oid;
1634 enum replay_action action;
1635
1636 if (!stat(git_path_merge_head(r), &st)) {
1637 wt_status_check_rebase(NULL, state);
1638 state->merge_in_progress = 1;
1639 } else if (wt_status_check_rebase(NULL, state)) {
1640 ; /* all set */
1641 } else if (!stat(git_path_cherry_pick_head(r), &st) &&
1642 !get_oid("CHERRY_PICK_HEAD", &oid)) {
1643 state->cherry_pick_in_progress = 1;
1644 oidcpy(&state->cherry_pick_head_oid, &oid);
1645 }
1646 wt_status_check_bisect(NULL, state);
1647 if (!stat(git_path_revert_head(r), &st) &&
1648 !get_oid("REVERT_HEAD", &oid)) {
1649 state->revert_in_progress = 1;
1650 oidcpy(&state->revert_head_oid, &oid);
1651 }
1652 if (!sequencer_get_last_command(r, &action)) {
1653 if (action == REPLAY_PICK) {
1654 state->cherry_pick_in_progress = 1;
1655 oidcpy(&state->cherry_pick_head_oid, &null_oid);
1656 } else {
1657 state->revert_in_progress = 1;
1658 oidcpy(&state->revert_head_oid, &null_oid);
1659 }
1660 }
1661 if (get_detached_from)
1662 wt_status_get_detached_from(r, state);
1663 }
1664
1665 static void wt_longstatus_print_state(struct wt_status *s)
1666 {
1667 const char *state_color = color(WT_STATUS_HEADER, s);
1668 struct wt_status_state *state = &s->state;
1669
1670 if (state->merge_in_progress) {
1671 if (state->rebase_interactive_in_progress) {
1672 show_rebase_information(s, state_color);
1673 fputs("\n", s->fp);
1674 }
1675 show_merge_in_progress(s, state_color);
1676 } else if (state->am_in_progress)
1677 show_am_in_progress(s, state_color);
1678 else if (state->rebase_in_progress || state->rebase_interactive_in_progress)
1679 show_rebase_in_progress(s, state_color);
1680 else if (state->cherry_pick_in_progress)
1681 show_cherry_pick_in_progress(s, state_color);
1682 else if (state->revert_in_progress)
1683 show_revert_in_progress(s, state_color);
1684 if (state->bisect_in_progress)
1685 show_bisect_in_progress(s, state_color);
1686 }
1687
1688 static void wt_longstatus_print(struct wt_status *s)
1689 {
1690 const char *branch_color = color(WT_STATUS_ONBRANCH, s);
1691 const char *branch_status_color = color(WT_STATUS_HEADER, s);
1692
1693 if (s->branch) {
1694 const char *on_what = _("On branch ");
1695 const char *branch_name = s->branch;
1696 if (!strcmp(branch_name, "HEAD")) {
1697 branch_status_color = color(WT_STATUS_NOBRANCH, s);
1698 if (s->state.rebase_in_progress ||
1699 s->state.rebase_interactive_in_progress) {
1700 if (s->state.rebase_interactive_in_progress)
1701 on_what = _("interactive rebase in progress; onto ");
1702 else
1703 on_what = _("rebase in progress; onto ");
1704 branch_name = s->state.onto;
1705 } else if (s->state.detached_from) {
1706 branch_name = s->state.detached_from;
1707 if (s->state.detached_at)
1708 on_what = HEAD_DETACHED_AT;
1709 else
1710 on_what = HEAD_DETACHED_FROM;
1711 } else {
1712 branch_name = "";
1713 on_what = _("Not currently on any branch.");
1714 }
1715 } else
1716 skip_prefix(branch_name, "refs/heads/", &branch_name);
1717 status_printf(s, color(WT_STATUS_HEADER, s), "%s", "");
1718 status_printf_more(s, branch_status_color, "%s", on_what);
1719 status_printf_more(s, branch_color, "%s\n", branch_name);
1720 if (!s->is_initial)
1721 wt_longstatus_print_tracking(s);
1722 }
1723
1724 wt_longstatus_print_state(s);
1725
1726 if (s->is_initial) {
1727 status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", "");
1728 status_printf_ln(s, color(WT_STATUS_HEADER, s),
1729 s->commit_template
1730 ? _("Initial commit")
1731 : _("No commits yet"));
1732 status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", "");
1733 }
1734
1735 wt_longstatus_print_updated(s);
1736 wt_longstatus_print_unmerged(s);
1737 wt_longstatus_print_changed(s);
1738 if (s->submodule_summary &&
1739 (!s->ignore_submodule_arg ||
1740 strcmp(s->ignore_submodule_arg, "all"))) {
1741 wt_longstatus_print_submodule_summary(s, 0); /* staged */
1742 wt_longstatus_print_submodule_summary(s, 1); /* unstaged */
1743 }
1744 if (s->show_untracked_files) {
1745 wt_longstatus_print_other(s, &s->untracked, _("Untracked files"), "add");
1746 if (s->show_ignored_mode)
1747 wt_longstatus_print_other(s, &s->ignored, _("Ignored files"), "add -f");
1748 if (advice_status_u_option && 2000 < s->untracked_in_ms) {
1749 status_printf_ln(s, GIT_COLOR_NORMAL, "%s", "");
1750 status_printf_ln(s, GIT_COLOR_NORMAL,
1751 _("It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1752 "may speed it up, but you have to be careful not to forget to add\n"
1753 "new files yourself (see 'git help status')."),
1754 s->untracked_in_ms / 1000.0);
1755 }
1756 } else if (s->committable)
1757 status_printf_ln(s, GIT_COLOR_NORMAL, _("Untracked files not listed%s"),
1758 s->hints
1759 ? _(" (use -u option to show untracked files)") : "");
1760
1761 if (s->verbose)
1762 wt_longstatus_print_verbose(s);
1763 if (!s->committable) {
1764 if (s->amend)
1765 status_printf_ln(s, GIT_COLOR_NORMAL, _("No changes"));
1766 else if (s->nowarn)
1767 ; /* nothing */
1768 else if (s->workdir_dirty) {
1769 if (s->hints)
1770 printf(_("no changes added to commit "
1771 "(use \"git add\" and/or \"git commit -a\")\n"));
1772 else
1773 printf(_("no changes added to commit\n"));
1774 } else if (s->untracked.nr) {
1775 if (s->hints)
1776 printf(_("nothing added to commit but untracked files "
1777 "present (use \"git add\" to track)\n"));
1778 else
1779 printf(_("nothing added to commit but untracked files present\n"));
1780 } else if (s->is_initial) {
1781 if (s->hints)
1782 printf(_("nothing to commit (create/copy files "
1783 "and use \"git add\" to track)\n"));
1784 else
1785 printf(_("nothing to commit\n"));
1786 } else if (!s->show_untracked_files) {
1787 if (s->hints)
1788 printf(_("nothing to commit (use -u to show untracked files)\n"));
1789 else
1790 printf(_("nothing to commit\n"));
1791 } else
1792 printf(_("nothing to commit, working tree clean\n"));
1793 }
1794 if(s->show_stash)
1795 wt_longstatus_print_stash_summary(s);
1796 }
1797
1798 static void wt_shortstatus_unmerged(struct string_list_item *it,
1799 struct wt_status *s)
1800 {
1801 struct wt_status_change_data *d = it->util;
1802 const char *how = "??";
1803
1804 switch (d->stagemask) {
1805 case 1: how = "DD"; break; /* both deleted */
1806 case 2: how = "AU"; break; /* added by us */
1807 case 3: how = "UD"; break; /* deleted by them */
1808 case 4: how = "UA"; break; /* added by them */
1809 case 5: how = "DU"; break; /* deleted by us */
1810 case 6: how = "AA"; break; /* both added */
1811 case 7: how = "UU"; break; /* both modified */
1812 }
1813 color_fprintf(s->fp, color(WT_STATUS_UNMERGED, s), "%s", how);
1814 if (s->null_termination) {
1815 fprintf(stdout, " %s%c", it->string, 0);
1816 } else {
1817 struct strbuf onebuf = STRBUF_INIT;
1818 const char *one;
1819 one = quote_path(it->string, s->prefix, &onebuf);
1820 printf(" %s\n", one);
1821 strbuf_release(&onebuf);
1822 }
1823 }
1824
1825 static void wt_shortstatus_status(struct string_list_item *it,
1826 struct wt_status *s)
1827 {
1828 struct wt_status_change_data *d = it->util;
1829
1830 if (d->index_status)
1831 color_fprintf(s->fp, color(WT_STATUS_UPDATED, s), "%c", d->index_status);
1832 else
1833 putchar(' ');
1834 if (d->worktree_status)
1835 color_fprintf(s->fp, color(WT_STATUS_CHANGED, s), "%c", d->worktree_status);
1836 else
1837 putchar(' ');
1838 putchar(' ');
1839 if (s->null_termination) {
1840 fprintf(stdout, "%s%c", it->string, 0);
1841 if (d->rename_source)
1842 fprintf(stdout, "%s%c", d->rename_source, 0);
1843 } else {
1844 struct strbuf onebuf = STRBUF_INIT;
1845 const char *one;
1846
1847 if (d->rename_source) {
1848 one = quote_path(d->rename_source, s->prefix, &onebuf);
1849 if (*one != '"' && strchr(one, ' ') != NULL) {
1850 putchar('"');
1851 strbuf_addch(&onebuf, '"');
1852 one = onebuf.buf;
1853 }
1854 printf("%s -> ", one);
1855 strbuf_release(&onebuf);
1856 }
1857 one = quote_path(it->string, s->prefix, &onebuf);
1858 if (*one != '"' && strchr(one, ' ') != NULL) {
1859 putchar('"');
1860 strbuf_addch(&onebuf, '"');
1861 one = onebuf.buf;
1862 }
1863 printf("%s\n", one);
1864 strbuf_release(&onebuf);
1865 }
1866 }
1867
1868 static void wt_shortstatus_other(struct string_list_item *it,
1869 struct wt_status *s, const char *sign)
1870 {
1871 if (s->null_termination) {
1872 fprintf(stdout, "%s %s%c", sign, it->string, 0);
1873 } else {
1874 struct strbuf onebuf = STRBUF_INIT;
1875 const char *one;
1876 one = quote_path(it->string, s->prefix, &onebuf);
1877 color_fprintf(s->fp, color(WT_STATUS_UNTRACKED, s), "%s", sign);
1878 printf(" %s\n", one);
1879 strbuf_release(&onebuf);
1880 }
1881 }
1882
1883 static void wt_shortstatus_print_tracking(struct wt_status *s)
1884 {
1885 struct branch *branch;
1886 const char *header_color = color(WT_STATUS_HEADER, s);
1887 const char *branch_color_local = color(WT_STATUS_LOCAL_BRANCH, s);
1888 const char *branch_color_remote = color(WT_STATUS_REMOTE_BRANCH, s);
1889
1890 const char *base;
1891 char *short_base;
1892 const char *branch_name;
1893 int num_ours, num_theirs, sti;
1894 int upstream_is_gone = 0;
1895
1896 color_fprintf(s->fp, color(WT_STATUS_HEADER, s), "## ");
1897
1898 if (!s->branch)
1899 return;
1900 branch_name = s->branch;
1901
1902 #define LABEL(string) (s->no_gettext ? (string) : _(string))
1903
1904 if (s->is_initial)
1905 color_fprintf(s->fp, header_color, LABEL(N_("No commits yet on ")));
1906
1907 if (!strcmp(s->branch, "HEAD")) {
1908 color_fprintf(s->fp, color(WT_STATUS_NOBRANCH, s), "%s",
1909 LABEL(N_("HEAD (no branch)")));
1910 goto conclude;
1911 }
1912
1913 skip_prefix(branch_name, "refs/heads/", &branch_name);
1914
1915 branch = branch_get(branch_name);
1916
1917 color_fprintf(s->fp, branch_color_local, "%s", branch_name);
1918
1919 sti = stat_tracking_info(branch, &num_ours, &num_theirs, &base,
1920 0, s->ahead_behind_flags);
1921 if (sti < 0) {
1922 if (!base)
1923 goto conclude;
1924
1925 upstream_is_gone = 1;
1926 }
1927
1928 short_base = shorten_unambiguous_ref(base, 0);
1929 color_fprintf(s->fp, header_color, "...");
1930 color_fprintf(s->fp, branch_color_remote, "%s", short_base);
1931 free(short_base);
1932
1933 if (!upstream_is_gone && !sti)
1934 goto conclude;
1935
1936 color_fprintf(s->fp, header_color, " [");
1937 if (upstream_is_gone) {
1938 color_fprintf(s->fp, header_color, LABEL(N_("gone")));
1939 } else if (s->ahead_behind_flags == AHEAD_BEHIND_QUICK) {
1940 color_fprintf(s->fp, header_color, LABEL(N_("different")));
1941 } else if (!num_ours) {
1942 color_fprintf(s->fp, header_color, LABEL(N_("behind ")));
1943 color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
1944 } else if (!num_theirs) {
1945 color_fprintf(s->fp, header_color, LABEL(N_("ahead ")));
1946 color_fprintf(s->fp, branch_color_local, "%d", num_ours);
1947 } else {
1948 color_fprintf(s->fp, header_color, LABEL(N_("ahead ")));
1949 color_fprintf(s->fp, branch_color_local, "%d", num_ours);
1950 color_fprintf(s->fp, header_color, ", %s", LABEL(N_("behind ")));
1951 color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
1952 }
1953
1954 color_fprintf(s->fp, header_color, "]");
1955 conclude:
1956 fputc(s->null_termination ? '\0' : '\n', s->fp);
1957 }
1958
1959 static void wt_shortstatus_print(struct wt_status *s)
1960 {
1961 struct string_list_item *it;
1962
1963 if (s->show_branch)
1964 wt_shortstatus_print_tracking(s);
1965
1966 for_each_string_list_item(it, &s->change) {
1967 struct wt_status_change_data *d = it->util;
1968
1969 if (d->stagemask)
1970 wt_shortstatus_unmerged(it, s);
1971 else
1972 wt_shortstatus_status(it, s);
1973 }
1974 for_each_string_list_item(it, &s->untracked)
1975 wt_shortstatus_other(it, s, "??");
1976
1977 for_each_string_list_item(it, &s->ignored)
1978 wt_shortstatus_other(it, s, "!!");
1979 }
1980
1981 static void wt_porcelain_print(struct wt_status *s)
1982 {
1983 s->use_color = 0;
1984 s->relative_paths = 0;
1985 s->prefix = NULL;
1986 s->no_gettext = 1;
1987 wt_shortstatus_print(s);
1988 }
1989
1990 /*
1991 * Print branch information for porcelain v2 output. These lines
1992 * are printed when the '--branch' parameter is given.
1993 *
1994 * # branch.oid <commit><eol>
1995 * # branch.head <head><eol>
1996 * [# branch.upstream <upstream><eol>
1997 * [# branch.ab +<ahead> -<behind><eol>]]
1998 *
1999 * <commit> ::= the current commit hash or the the literal
2000 * "(initial)" to indicate an initialized repo
2001 * with no commits.
2002 *
2003 * <head> ::= <branch_name> the current branch name or
2004 * "(detached)" literal when detached head or
2005 * "(unknown)" when something is wrong.
2006 *
2007 * <upstream> ::= the upstream branch name, when set.
2008 *
2009 * <ahead> ::= integer ahead value or '?'.
2010 *
2011 * <behind> ::= integer behind value or '?'.
2012 *
2013 * The end-of-line is defined by the -z flag.
2014 *
2015 * <eol> ::= NUL when -z,
2016 * LF when NOT -z.
2017 *
2018 * When an upstream is set and present, the 'branch.ab' line will
2019 * be printed with the ahead/behind counts for the branch and the
2020 * upstream. When AHEAD_BEHIND_QUICK is requested and the branches
2021 * are different, '?' will be substituted for the actual count.
2022 */
2023 static void wt_porcelain_v2_print_tracking(struct wt_status *s)
2024 {
2025 struct branch *branch;
2026 const char *base;
2027 const char *branch_name;
2028 int ab_info, nr_ahead, nr_behind;
2029 char eol = s->null_termination ? '\0' : '\n';
2030
2031 fprintf(s->fp, "# branch.oid %s%c",
2032 (s->is_initial ? "(initial)" : oid_to_hex(&s->oid_commit)),
2033 eol);
2034
2035 if (!s->branch)
2036 fprintf(s->fp, "# branch.head %s%c", "(unknown)", eol);
2037 else {
2038 if (!strcmp(s->branch, "HEAD")) {
2039 fprintf(s->fp, "# branch.head %s%c", "(detached)", eol);
2040
2041 if (s->state.rebase_in_progress ||
2042 s->state.rebase_interactive_in_progress)
2043 branch_name = s->state.onto;
2044 else if (s->state.detached_from)
2045 branch_name = s->state.detached_from;
2046 else
2047 branch_name = "";
2048 } else {
2049 branch_name = NULL;
2050 skip_prefix(s->branch, "refs/heads/", &branch_name);
2051
2052 fprintf(s->fp, "# branch.head %s%c", branch_name, eol);
2053 }
2054
2055 /* Lookup stats on the upstream tracking branch, if set. */
2056 branch = branch_get(branch_name);
2057 base = NULL;
2058 ab_info = stat_tracking_info(branch, &nr_ahead, &nr_behind,
2059 &base, 0, s->ahead_behind_flags);
2060 if (base) {
2061 base = shorten_unambiguous_ref(base, 0);
2062 fprintf(s->fp, "# branch.upstream %s%c", base, eol);
2063 free((char *)base);
2064
2065 if (ab_info > 0) {
2066 /* different */
2067 if (nr_ahead || nr_behind)
2068 fprintf(s->fp, "# branch.ab +%d -%d%c",
2069 nr_ahead, nr_behind, eol);
2070 else
2071 fprintf(s->fp, "# branch.ab +? -?%c",
2072 eol);
2073 } else if (!ab_info) {
2074 /* same */
2075 fprintf(s->fp, "# branch.ab +0 -0%c", eol);
2076 }
2077 }
2078 }
2079 }
2080
2081 /*
2082 * Convert various submodule status values into a
2083 * fixed-length string of characters in the buffer provided.
2084 */
2085 static void wt_porcelain_v2_submodule_state(
2086 struct wt_status_change_data *d,
2087 char sub[5])
2088 {
2089 if (S_ISGITLINK(d->mode_head) ||
2090 S_ISGITLINK(d->mode_index) ||
2091 S_ISGITLINK(d->mode_worktree)) {
2092 sub[0] = 'S';
2093 sub[1] = d->new_submodule_commits ? 'C' : '.';
2094 sub[2] = (d->dirty_submodule & DIRTY_SUBMODULE_MODIFIED) ? 'M' : '.';
2095 sub[3] = (d->dirty_submodule & DIRTY_SUBMODULE_UNTRACKED) ? 'U' : '.';
2096 } else {
2097 sub[0] = 'N';
2098 sub[1] = '.';
2099 sub[2] = '.';
2100 sub[3] = '.';
2101 }
2102 sub[4] = 0;
2103 }
2104
2105 /*
2106 * Fix-up changed entries before we print them.
2107 */
2108 static void wt_porcelain_v2_fix_up_changed(struct string_list_item *it)
2109 {
2110 struct wt_status_change_data *d = it->util;
2111
2112 if (!d->index_status) {
2113 /*
2114 * This entry is unchanged in the index (relative to the head).
2115 * Therefore, the collect_updated_cb was never called for this
2116 * entry (during the head-vs-index scan) and so the head column
2117 * fields were never set.
2118 *
2119 * We must have data for the index column (from the
2120 * index-vs-worktree scan (otherwise, this entry should not be
2121 * in the list of changes)).
2122 *
2123 * Copy index column fields to the head column, so that our
2124 * output looks complete.
2125 */
2126 assert(d->mode_head == 0);
2127 d->mode_head = d->mode_index;
2128 oidcpy(&d->oid_head, &d->oid_index);
2129 }
2130
2131 if (!d->worktree_status) {
2132 /*
2133 * This entry is unchanged in the worktree (relative to the index).
2134 * Therefore, the collect_changed_cb was never called for this entry
2135 * (during the index-vs-worktree scan) and so the worktree column
2136 * fields were never set.
2137 *
2138 * We must have data for the index column (from the head-vs-index
2139 * scan).
2140 *
2141 * Copy the index column fields to the worktree column so that
2142 * our output looks complete.
2143 *
2144 * Note that we only have a mode field in the worktree column
2145 * because the scan code tries really hard to not have to compute it.
2146 */
2147 assert(d->mode_worktree == 0);
2148 d->mode_worktree = d->mode_index;
2149 }
2150 }
2151
2152 /*
2153 * Print porcelain v2 info for tracked entries with changes.
2154 */
2155 static void wt_porcelain_v2_print_changed_entry(
2156 struct string_list_item *it,
2157 struct wt_status *s)
2158 {
2159 struct wt_status_change_data *d = it->util;
2160 struct strbuf buf = STRBUF_INIT;
2161 struct strbuf buf_from = STRBUF_INIT;
2162 const char *path = NULL;
2163 const char *path_from = NULL;
2164 char key[3];
2165 char submodule_token[5];
2166 char sep_char, eol_char;
2167
2168 wt_porcelain_v2_fix_up_changed(it);
2169 wt_porcelain_v2_submodule_state(d, submodule_token);
2170
2171 key[0] = d->index_status ? d->index_status : '.';
2172 key[1] = d->worktree_status ? d->worktree_status : '.';
2173 key[2] = 0;
2174
2175 if (s->null_termination) {
2176 /*
2177 * In -z mode, we DO NOT C-quote pathnames. Current path is ALWAYS first.
2178 * A single NUL character separates them.
2179 */
2180 sep_char = '\0';
2181 eol_char = '\0';
2182 path = it->string;
2183 path_from = d->rename_source;
2184 } else {
2185 /*
2186 * Path(s) are C-quoted if necessary. Current path is ALWAYS first.
2187 * The source path is only present when necessary.
2188 * A single TAB separates them (because paths can contain spaces
2189 * which are not escaped and C-quoting does escape TAB characters).
2190 */
2191 sep_char = '\t';
2192 eol_char = '\n';
2193 path = quote_path(it->string, s->prefix, &buf);
2194 if (d->rename_source)
2195 path_from = quote_path(d->rename_source, s->prefix, &buf_from);
2196 }
2197
2198 if (path_from)
2199 fprintf(s->fp, "2 %s %s %06o %06o %06o %s %s %c%d %s%c%s%c",
2200 key, submodule_token,
2201 d->mode_head, d->mode_index, d->mode_worktree,
2202 oid_to_hex(&d->oid_head), oid_to_hex(&d->oid_index),
2203 d->rename_status, d->rename_score,
2204 path, sep_char, path_from, eol_char);
2205 else
2206 fprintf(s->fp, "1 %s %s %06o %06o %06o %s %s %s%c",
2207 key, submodule_token,
2208 d->mode_head, d->mode_index, d->mode_worktree,
2209 oid_to_hex(&d->oid_head), oid_to_hex(&d->oid_index),
2210 path, eol_char);
2211
2212 strbuf_release(&buf);
2213 strbuf_release(&buf_from);
2214 }
2215
2216 /*
2217 * Print porcelain v2 status info for unmerged entries.
2218 */
2219 static void wt_porcelain_v2_print_unmerged_entry(
2220 struct string_list_item *it,
2221 struct wt_status *s)
2222 {
2223 struct wt_status_change_data *d = it->util;
2224 struct index_state *istate = s->repo->index;
2225 const struct cache_entry *ce;
2226 struct strbuf buf_index = STRBUF_INIT;
2227 const char *path_index = NULL;
2228 int pos, stage, sum;
2229 struct {
2230 int mode;
2231 struct object_id oid;
2232 } stages[3];
2233 char *key;
2234 char submodule_token[5];
2235 char unmerged_prefix = 'u';
2236 char eol_char = s->null_termination ? '\0' : '\n';
2237
2238 wt_porcelain_v2_submodule_state(d, submodule_token);
2239
2240 switch (d->stagemask) {
2241 case 1: key = "DD"; break; /* both deleted */
2242 case 2: key = "AU"; break; /* added by us */
2243 case 3: key = "UD"; break; /* deleted by them */
2244 case 4: key = "UA"; break; /* added by them */
2245 case 5: key = "DU"; break; /* deleted by us */
2246 case 6: key = "AA"; break; /* both added */
2247 case 7: key = "UU"; break; /* both modified */
2248 default:
2249 BUG("unhandled unmerged status %x", d->stagemask);
2250 }
2251
2252 /*
2253 * Disregard d.aux.porcelain_v2 data that we accumulated
2254 * for the head and index columns during the scans and
2255 * replace with the actual stage data.
2256 *
2257 * Note that this is a last-one-wins for each the individual
2258 * stage [123] columns in the event of multiple cache entries
2259 * for same stage.
2260 */
2261 memset(stages, 0, sizeof(stages));
2262 sum = 0;
2263 pos = index_name_pos(istate, it->string, strlen(it->string));
2264 assert(pos < 0);
2265 pos = -pos-1;
2266 while (pos < istate->cache_nr) {
2267 ce = istate->cache[pos++];
2268 stage = ce_stage(ce);
2269 if (strcmp(ce->name, it->string) || !stage)
2270 break;
2271 stages[stage - 1].mode = ce->ce_mode;
2272 oidcpy(&stages[stage - 1].oid, &ce->oid);
2273 sum |= (1 << (stage - 1));
2274 }
2275 if (sum != d->stagemask)
2276 BUG("observed stagemask 0x%x != expected stagemask 0x%x", sum, d->stagemask);
2277
2278 if (s->null_termination)
2279 path_index = it->string;
2280 else
2281 path_index = quote_path(it->string, s->prefix, &buf_index);
2282
2283 fprintf(s->fp, "%c %s %s %06o %06o %06o %06o %s %s %s %s%c",
2284 unmerged_prefix, key, submodule_token,
2285 stages[0].mode, /* stage 1 */
2286 stages[1].mode, /* stage 2 */
2287 stages[2].mode, /* stage 3 */
2288 d->mode_worktree,
2289 oid_to_hex(&stages[0].oid), /* stage 1 */
2290 oid_to_hex(&stages[1].oid), /* stage 2 */
2291 oid_to_hex(&stages[2].oid), /* stage 3 */
2292 path_index,
2293 eol_char);
2294
2295 strbuf_release(&buf_index);
2296 }
2297
2298 /*
2299 * Print porcelain V2 status info for untracked and ignored entries.
2300 */
2301 static void wt_porcelain_v2_print_other(
2302 struct string_list_item *it,
2303 struct wt_status *s,
2304 char prefix)
2305 {
2306 struct strbuf buf = STRBUF_INIT;
2307 const char *path;
2308 char eol_char;
2309
2310 if (s->null_termination) {
2311 path = it->string;
2312 eol_char = '\0';
2313 } else {
2314 path = quote_path(it->string, s->prefix, &buf);
2315 eol_char = '\n';
2316 }
2317
2318 fprintf(s->fp, "%c %s%c", prefix, path, eol_char);
2319
2320 strbuf_release(&buf);
2321 }
2322
2323 /*
2324 * Print porcelain V2 status.
2325 *
2326 * [<v2_branch>]
2327 * [<v2_changed_items>]*
2328 * [<v2_unmerged_items>]*
2329 * [<v2_untracked_items>]*
2330 * [<v2_ignored_items>]*
2331 *
2332 */
2333 static void wt_porcelain_v2_print(struct wt_status *s)
2334 {
2335 struct wt_status_change_data *d;
2336 struct string_list_item *it;
2337 int i;
2338
2339 if (s->show_branch)
2340 wt_porcelain_v2_print_tracking(s);
2341
2342 for (i = 0; i < s->change.nr; i++) {
2343 it = &(s->change.items[i]);
2344 d = it->util;
2345 if (!d->stagemask)
2346 wt_porcelain_v2_print_changed_entry(it, s);
2347 }
2348
2349 for (i = 0; i < s->change.nr; i++) {
2350 it = &(s->change.items[i]);
2351 d = it->util;
2352 if (d->stagemask)
2353 wt_porcelain_v2_print_unmerged_entry(it, s);
2354 }
2355
2356 for (i = 0; i < s->untracked.nr; i++) {
2357 it = &(s->untracked.items[i]);
2358 wt_porcelain_v2_print_other(it, s, '?');
2359 }
2360
2361 for (i = 0; i < s->ignored.nr; i++) {
2362 it = &(s->ignored.items[i]);
2363 wt_porcelain_v2_print_other(it, s, '!');
2364 }
2365 }
2366
2367 void wt_status_print(struct wt_status *s)
2368 {
2369 trace2_data_intmax("status", s->repo, "count/changed", s->change.nr);
2370 trace2_data_intmax("status", s->repo, "count/untracked",
2371 s->untracked.nr);
2372 trace2_data_intmax("status", s->repo, "count/ignored", s->ignored.nr);
2373
2374 trace2_region_enter("status", "print", s->repo);
2375
2376 switch (s->status_format) {
2377 case STATUS_FORMAT_SHORT:
2378 wt_shortstatus_print(s);
2379 break;
2380 case STATUS_FORMAT_PORCELAIN:
2381 wt_porcelain_print(s);
2382 break;
2383 case STATUS_FORMAT_PORCELAIN_V2:
2384 wt_porcelain_v2_print(s);
2385 break;
2386 case STATUS_FORMAT_UNSPECIFIED:
2387 BUG("finalize_deferred_config() should have been called");
2388 break;
2389 case STATUS_FORMAT_NONE:
2390 case STATUS_FORMAT_LONG:
2391 wt_longstatus_print(s);
2392 break;
2393 }
2394
2395 trace2_region_leave("status", "print", s->repo);
2396 }
2397
2398 /**
2399 * Returns 1 if there are unstaged changes, 0 otherwise.
2400 */
2401 int has_unstaged_changes(struct repository *r, int ignore_submodules)
2402 {
2403 struct rev_info rev_info;
2404 int result;
2405
2406 repo_init_revisions(r, &rev_info, NULL);
2407 if (ignore_submodules) {
2408 rev_info.diffopt.flags.ignore_submodules = 1;
2409 rev_info.diffopt.flags.override_submodule_config = 1;
2410 }
2411 rev_info.diffopt.flags.quick = 1;
2412 diff_setup_done(&rev_info.diffopt);
2413 result = run_diff_files(&rev_info, 0);
2414 return diff_result_code(&rev_info.diffopt, result);
2415 }
2416
2417 /**
2418 * Returns 1 if there are uncommitted changes, 0 otherwise.
2419 */
2420 int has_uncommitted_changes(struct repository *r,
2421 int ignore_submodules)
2422 {
2423 struct rev_info rev_info;
2424 int result;
2425
2426 if (is_index_unborn(r->index))
2427 return 0;
2428
2429 repo_init_revisions(r, &rev_info, NULL);
2430 if (ignore_submodules)
2431 rev_info.diffopt.flags.ignore_submodules = 1;
2432 rev_info.diffopt.flags.quick = 1;
2433
2434 add_head_to_pending(&rev_info);
2435 if (!rev_info.pending.nr) {
2436 /*
2437 * We have no head (or it's corrupt); use the empty tree,
2438 * which will complain if the index is non-empty.
2439 */
2440 struct tree *tree = lookup_tree(r, the_hash_algo->empty_tree);
2441 add_pending_object(&rev_info, &tree->object, "");
2442 }
2443
2444 diff_setup_done(&rev_info.diffopt);
2445 result = run_diff_index(&rev_info, 1);
2446 return diff_result_code(&rev_info.diffopt, result);
2447 }
2448
2449 /**
2450 * If the work tree has unstaged or uncommitted changes, dies with the
2451 * appropriate message.
2452 */
2453 int require_clean_work_tree(struct repository *r,
2454 const char *action,
2455 const char *hint,
2456 int ignore_submodules,
2457 int gently)
2458 {
2459 struct lock_file lock_file = LOCK_INIT;
2460 int err = 0, fd;
2461
2462 fd = repo_hold_locked_index(r, &lock_file, 0);
2463 refresh_index(r->index, REFRESH_QUIET, NULL, NULL, NULL);
2464 if (0 <= fd)
2465 repo_update_index_if_able(r, &lock_file);
2466 rollback_lock_file(&lock_file);
2467
2468 if (has_unstaged_changes(r, ignore_submodules)) {
2469 /* TRANSLATORS: the action is e.g. "pull with rebase" */
2470 error(_("cannot %s: You have unstaged changes."), _(action));
2471 err = 1;
2472 }
2473
2474 if (has_uncommitted_changes(r, ignore_submodules)) {
2475 if (err)
2476 error(_("additionally, your index contains uncommitted changes."));
2477 else
2478 error(_("cannot %s: Your index contains uncommitted changes."),
2479 _(action));
2480 err = 1;
2481 }
2482
2483 if (err) {
2484 if (hint)
2485 error("%s", hint);
2486 if (!gently)
2487 exit(128);
2488 }
2489
2490 return err;
2491 }
The Best VCS Around