?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
fetch-pack: in partial clone, pass --promisor
[git.git] / wt-status.c
blobd75399085dead1ad52b36a12b505eef02b2036cc
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 "strvec.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 string_list_insert(&s->untracked, ent->name);
727 free(ent);
728 }
729
730 for (i = 0; i < dir.ignored_nr; i++) {
731 struct dir_entry *ent = dir.ignored[i];
732 if (index_name_is_other(istate, ent->name, ent->len))
733 string_list_insert(&s->ignored, ent->name);
734 free(ent);
735 }
736
737 free(dir.entries);
738 free(dir.ignored);
739 clear_directory(&dir);
740
741 if (advice_status_u_option)
742 s->untracked_in_ms = (getnanotime() - t_begin) / 1000000;
743 }
744
745 static int has_unmerged(struct wt_status *s)
746 {
747 int i;
748
749 for (i = 0; i < s->change.nr; i++) {
750 struct wt_status_change_data *d;
751 d = s->change.items[i].util;
752 if (d->stagemask)
753 return 1;
754 }
755 return 0;
756 }
757
758 void wt_status_collect(struct wt_status *s)
759 {
760 trace2_region_enter("status", "worktrees", s->repo);
761 wt_status_collect_changes_worktree(s);
762 trace2_region_leave("status", "worktrees", s->repo);
763
764 if (s->is_initial) {
765 trace2_region_enter("status", "initial", s->repo);
766 wt_status_collect_changes_initial(s);
767 trace2_region_leave("status", "initial", s->repo);
768 } else {
769 trace2_region_enter("status", "index", s->repo);
770 wt_status_collect_changes_index(s);
771 trace2_region_leave("status", "index", s->repo);
772 }
773
774 trace2_region_enter("status", "untracked", s->repo);
775 wt_status_collect_untracked(s);
776 trace2_region_leave("status", "untracked", s->repo);
777
778 wt_status_get_state(s->repo, &s->state, s->branch && !strcmp(s->branch, "HEAD"));
779 if (s->state.merge_in_progress && !has_unmerged(s))
780 s->committable = 1;
781 }
782
783 void wt_status_collect_free_buffers(struct wt_status *s)
784 {
785 free(s->state.branch);
786 free(s->state.onto);
787 free(s->state.detached_from);
788 }
789
790 static void wt_longstatus_print_unmerged(struct wt_status *s)
791 {
792 int shown_header = 0;
793 int i;
794
795 for (i = 0; i < s->change.nr; i++) {
796 struct wt_status_change_data *d;
797 struct string_list_item *it;
798 it = &(s->change.items[i]);
799 d = it->util;
800 if (!d->stagemask)
801 continue;
802 if (!shown_header) {
803 wt_longstatus_print_unmerged_header(s);
804 shown_header = 1;
805 }
806 wt_longstatus_print_unmerged_data(s, it);
807 }
808 if (shown_header)
809 wt_longstatus_print_trailer(s);
810
811 }
812
813 static void wt_longstatus_print_updated(struct wt_status *s)
814 {
815 int shown_header = 0;
816 int i;
817
818 for (i = 0; i < s->change.nr; i++) {
819 struct wt_status_change_data *d;
820 struct string_list_item *it;
821 it = &(s->change.items[i]);
822 d = it->util;
823 if (!d->index_status ||
824 d->index_status == DIFF_STATUS_UNMERGED)
825 continue;
826 if (!shown_header) {
827 wt_longstatus_print_cached_header(s);
828 shown_header = 1;
829 }
830 wt_longstatus_print_change_data(s, WT_STATUS_UPDATED, it);
831 }
832 if (shown_header)
833 wt_longstatus_print_trailer(s);
834 }
835
836 /*
837 * -1 : has delete
838 * 0 : no change
839 * 1 : some change but no delete
840 */
841 static int wt_status_check_worktree_changes(struct wt_status *s,
842 int *dirty_submodules)
843 {
844 int i;
845 int changes = 0;
846
847 *dirty_submodules = 0;
848
849 for (i = 0; i < s->change.nr; i++) {
850 struct wt_status_change_data *d;
851 d = s->change.items[i].util;
852 if (!d->worktree_status ||
853 d->worktree_status == DIFF_STATUS_UNMERGED)
854 continue;
855 if (!changes)
856 changes = 1;
857 if (d->dirty_submodule)
858 *dirty_submodules = 1;
859 if (d->worktree_status == DIFF_STATUS_DELETED)
860 changes = -1;
861 }
862 return changes;
863 }
864
865 static void wt_longstatus_print_changed(struct wt_status *s)
866 {
867 int i, dirty_submodules;
868 int worktree_changes = wt_status_check_worktree_changes(s, &dirty_submodules);
869
870 if (!worktree_changes)
871 return;
872
873 wt_longstatus_print_dirty_header(s, worktree_changes < 0, dirty_submodules);
874
875 for (i = 0; i < s->change.nr; i++) {
876 struct wt_status_change_data *d;
877 struct string_list_item *it;
878 it = &(s->change.items[i]);
879 d = it->util;
880 if (!d->worktree_status ||
881 d->worktree_status == DIFF_STATUS_UNMERGED)
882 continue;
883 wt_longstatus_print_change_data(s, WT_STATUS_CHANGED, it);
884 }
885 wt_longstatus_print_trailer(s);
886 }
887
888 static int stash_count_refs(struct object_id *ooid, struct object_id *noid,
889 const char *email, timestamp_t timestamp, int tz,
890 const char *message, void *cb_data)
891 {
892 int *c = cb_data;
893 (*c)++;
894 return 0;
895 }
896
897 static void wt_longstatus_print_stash_summary(struct wt_status *s)
898 {
899 int stash_count = 0;
900
901 for_each_reflog_ent("refs/stash", stash_count_refs, &stash_count);
902 if (stash_count > 0)
903 status_printf_ln(s, GIT_COLOR_NORMAL,
904 Q_("Your stash currently has %d entry",
905 "Your stash currently has %d entries", stash_count),
906 stash_count);
907 }
908
909 static void wt_longstatus_print_submodule_summary(struct wt_status *s, int uncommitted)
910 {
911 struct child_process sm_summary = CHILD_PROCESS_INIT;
912 struct strbuf cmd_stdout = STRBUF_INIT;
913 struct strbuf summary = STRBUF_INIT;
914 char *summary_content;
915
916 strvec_pushf(&sm_summary.env_array, "GIT_INDEX_FILE=%s", s->index_file);
917
918 strvec_push(&sm_summary.args, "submodule");
919 strvec_push(&sm_summary.args, "summary");
920 strvec_push(&sm_summary.args, uncommitted ? "--files" : "--cached");
921 strvec_push(&sm_summary.args, "--for-status");
922 strvec_push(&sm_summary.args, "--summary-limit");
923 strvec_pushf(&sm_summary.args, "%d", s->submodule_summary);
924 if (!uncommitted)
925 strvec_push(&sm_summary.args, s->amend ? "HEAD^" : "HEAD");
926
927 sm_summary.git_cmd = 1;
928 sm_summary.no_stdin = 1;
929
930 capture_command(&sm_summary, &cmd_stdout, 1024);
931
932 /* prepend header, only if there's an actual output */
933 if (cmd_stdout.len) {
934 if (uncommitted)
935 strbuf_addstr(&summary, _("Submodules changed but not updated:"));
936 else
937 strbuf_addstr(&summary, _("Submodule changes to be committed:"));
938 strbuf_addstr(&summary, "\n\n");
939 }
940 strbuf_addbuf(&summary, &cmd_stdout);
941 strbuf_release(&cmd_stdout);
942
943 if (s->display_comment_prefix) {
944 size_t len;
945 summary_content = strbuf_detach(&summary, &len);
946 strbuf_add_commented_lines(&summary, summary_content, len);
947 free(summary_content);
948 }
949
950 fputs(summary.buf, s->fp);
951 strbuf_release(&summary);
952 }
953
954 static void wt_longstatus_print_other(struct wt_status *s,
955 struct string_list *l,
956 const char *what,
957 const char *how)
958 {
959 int i;
960 struct strbuf buf = STRBUF_INIT;
961 static struct string_list output = STRING_LIST_INIT_DUP;
962 struct column_options copts;
963
964 if (!l->nr)
965 return;
966
967 wt_longstatus_print_other_header(s, what, how);
968
969 for (i = 0; i < l->nr; i++) {
970 struct string_list_item *it;
971 const char *path;
972 it = &(l->items[i]);
973 path = quote_path(it->string, s->prefix, &buf);
974 if (column_active(s->colopts)) {
975 string_list_append(&output, path);
976 continue;
977 }
978 status_printf(s, color(WT_STATUS_HEADER, s), "\t");
979 status_printf_more(s, color(WT_STATUS_UNTRACKED, s),
980 "%s\n", path);
981 }
982
983 strbuf_release(&buf);
984 if (!column_active(s->colopts))
985 goto conclude;
986
987 strbuf_addf(&buf, "%s%s\t%s",
988 color(WT_STATUS_HEADER, s),
989 s->display_comment_prefix ? "#" : "",
990 color(WT_STATUS_UNTRACKED, s));
991 memset(&copts, 0, sizeof(copts));
992 copts.padding = 1;
993 copts.indent = buf.buf;
994 if (want_color(s->use_color))
995 copts.nl = GIT_COLOR_RESET "\n";
996 print_columns(&output, s->colopts, &copts);
997 string_list_clear(&output, 0);
998 strbuf_release(&buf);
999 conclude:
1000 status_printf_ln(s, GIT_COLOR_NORMAL, "%s", "");
1001 }
1002
1003 size_t wt_status_locate_end(const char *s, size_t len)
1004 {
1005 const char *p;
1006 struct strbuf pattern = STRBUF_INIT;
1007
1008 strbuf_addf(&pattern, "\n%c %s", comment_line_char, cut_line);
1009 if (starts_with(s, pattern.buf + 1))
1010 len = 0;
1011 else if ((p = strstr(s, pattern.buf)))
1012 len = p - s + 1;
1013 strbuf_release(&pattern);
1014 return len;
1015 }
1016
1017 void wt_status_append_cut_line(struct strbuf *buf)
1018 {
1019 const char *explanation = _("Do not modify or remove the line above.\nEverything below it will be ignored.");
1020
1021 strbuf_commented_addf(buf, "%s", cut_line);
1022 strbuf_add_commented_lines(buf, explanation, strlen(explanation));
1023 }
1024
1025 void wt_status_add_cut_line(FILE *fp)
1026 {
1027 struct strbuf buf = STRBUF_INIT;
1028
1029 wt_status_append_cut_line(&buf);
1030 fputs(buf.buf, fp);
1031 strbuf_release(&buf);
1032 }
1033
1034 static void wt_longstatus_print_verbose(struct wt_status *s)
1035 {
1036 struct rev_info rev;
1037 struct setup_revision_opt opt;
1038 int dirty_submodules;
1039 const char *c = color(WT_STATUS_HEADER, s);
1040
1041 repo_init_revisions(s->repo, &rev, NULL);
1042 rev.diffopt.flags.allow_textconv = 1;
1043 rev.diffopt.ita_invisible_in_index = 1;
1044
1045 memset(&opt, 0, sizeof(opt));
1046 opt.def = s->is_initial ? empty_tree_oid_hex() : s->reference;
1047 setup_revisions(0, NULL, &rev, &opt);
1048
1049 rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
1050 rev.diffopt.detect_rename = s->detect_rename >= 0 ? s->detect_rename : rev.diffopt.detect_rename;
1051 rev.diffopt.rename_limit = s->rename_limit >= 0 ? s->rename_limit : rev.diffopt.rename_limit;
1052 rev.diffopt.rename_score = s->rename_score >= 0 ? s->rename_score : rev.diffopt.rename_score;
1053 rev.diffopt.file = s->fp;
1054 rev.diffopt.close_file = 0;
1055 /*
1056 * If we're not going to stdout, then we definitely don't
1057 * want color, since we are going to the commit message
1058 * file (and even the "auto" setting won't work, since it
1059 * will have checked isatty on stdout). But we then do want
1060 * to insert the scissor line here to reliably remove the
1061 * diff before committing.
1062 */
1063 if (s->fp != stdout) {
1064 rev.diffopt.use_color = 0;
1065 wt_status_add_cut_line(s->fp);
1066 }
1067 if (s->verbose > 1 && s->committable) {
1068 /* print_updated() printed a header, so do we */
1069 if (s->fp != stdout)
1070 wt_longstatus_print_trailer(s);
1071 status_printf_ln(s, c, _("Changes to be committed:"));
1072 rev.diffopt.a_prefix = "c/";
1073 rev.diffopt.b_prefix = "i/";
1074 } /* else use prefix as per user config */
1075 run_diff_index(&rev, 1);
1076 if (s->verbose > 1 &&
1077 wt_status_check_worktree_changes(s, &dirty_submodules)) {
1078 status_printf_ln(s, c,
1079 "--------------------------------------------------");
1080 status_printf_ln(s, c, _("Changes not staged for commit:"));
1081 setup_work_tree();
1082 rev.diffopt.a_prefix = "i/";
1083 rev.diffopt.b_prefix = "w/";
1084 run_diff_files(&rev, 0);
1085 }
1086 }
1087
1088 static void wt_longstatus_print_tracking(struct wt_status *s)
1089 {
1090 struct strbuf sb = STRBUF_INIT;
1091 const char *cp, *ep, *branch_name;
1092 struct branch *branch;
1093 char comment_line_string[3];
1094 int i;
1095 uint64_t t_begin = 0;
1096
1097 assert(s->branch && !s->is_initial);
1098 if (!skip_prefix(s->branch, "refs/heads/", &branch_name))
1099 return;
1100 branch = branch_get(branch_name);
1101
1102 t_begin = getnanotime();
1103
1104 if (!format_tracking_info(branch, &sb, s->ahead_behind_flags))
1105 return;
1106
1107 if (advice_status_ahead_behind_warning &&
1108 s->ahead_behind_flags == AHEAD_BEHIND_FULL) {
1109 uint64_t t_delta_in_ms = (getnanotime() - t_begin) / 1000000;
1110 if (t_delta_in_ms > AB_DELAY_WARNING_IN_MS) {
1111 strbuf_addf(&sb, _("\n"
1112 "It took %.2f seconds to compute the branch ahead/behind values.\n"
1113 "You can use '--no-ahead-behind' to avoid this.\n"),
1114 t_delta_in_ms / 1000.0);
1115 }
1116 }
1117
1118 i = 0;
1119 if (s->display_comment_prefix) {
1120 comment_line_string[i++] = comment_line_char;
1121 comment_line_string[i++] = ' ';
1122 }
1123 comment_line_string[i] = '\0';
1124
1125 for (cp = sb.buf; (ep = strchr(cp, '\n')) != NULL; cp = ep + 1)
1126 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s),
1127 "%s%.*s", comment_line_string,
1128 (int)(ep - cp), cp);
1129 if (s->display_comment_prefix)
1130 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s), "%c",
1131 comment_line_char);
1132 else
1133 fputs("\n", s->fp);
1134 strbuf_release(&sb);
1135 }
1136
1137 static void show_merge_in_progress(struct wt_status *s,
1138 const char *color)
1139 {
1140 if (has_unmerged(s)) {
1141 status_printf_ln(s, color, _("You have unmerged paths."));
1142 if (s->hints) {
1143 status_printf_ln(s, color,
1144 _(" (fix conflicts and run \"git commit\")"));
1145 status_printf_ln(s, color,
1146 _(" (use \"git merge --abort\" to abort the merge)"));
1147 }
1148 } else {
1149 status_printf_ln(s, color,
1150 _("All conflicts fixed but you are still merging."));
1151 if (s->hints)
1152 status_printf_ln(s, color,
1153 _(" (use \"git commit\" to conclude merge)"));
1154 }
1155 wt_longstatus_print_trailer(s);
1156 }
1157
1158 static void show_am_in_progress(struct wt_status *s,
1159 const char *color)
1160 {
1161 status_printf_ln(s, color,
1162 _("You are in the middle of an am session."));
1163 if (s->state.am_empty_patch)
1164 status_printf_ln(s, color,
1165 _("The current patch is empty."));
1166 if (s->hints) {
1167 if (!s->state.am_empty_patch)
1168 status_printf_ln(s, color,
1169 _(" (fix conflicts and then run \"git am --continue\")"));
1170 status_printf_ln(s, color,
1171 _(" (use \"git am --skip\" to skip this patch)"));
1172 status_printf_ln(s, color,
1173 _(" (use \"git am --abort\" to restore the original branch)"));
1174 }
1175 wt_longstatus_print_trailer(s);
1176 }
1177
1178 static char *read_line_from_git_path(const char *filename)
1179 {
1180 struct strbuf buf = STRBUF_INIT;
1181 FILE *fp = fopen_or_warn(git_path("%s", filename), "r");
1182
1183 if (!fp) {
1184 strbuf_release(&buf);
1185 return NULL;
1186 }
1187 strbuf_getline_lf(&buf, fp);
1188 if (!fclose(fp)) {
1189 return strbuf_detach(&buf, NULL);
1190 } else {
1191 strbuf_release(&buf);
1192 return NULL;
1193 }
1194 }
1195
1196 static int split_commit_in_progress(struct wt_status *s)
1197 {
1198 int split_in_progress = 0;
1199 char *head, *orig_head, *rebase_amend, *rebase_orig_head;
1200
1201 if ((!s->amend && !s->nowarn && !s->workdir_dirty) ||
1202 !s->branch || strcmp(s->branch, "HEAD"))
1203 return 0;
1204
1205 head = read_line_from_git_path("HEAD");
1206 orig_head = read_line_from_git_path("ORIG_HEAD");
1207 rebase_amend = read_line_from_git_path("rebase-merge/amend");
1208 rebase_orig_head = read_line_from_git_path("rebase-merge/orig-head");
1209
1210 if (!head || !orig_head || !rebase_amend || !rebase_orig_head)
1211 ; /* fall through, no split in progress */
1212 else if (!strcmp(rebase_amend, rebase_orig_head))
1213 split_in_progress = !!strcmp(head, rebase_amend);
1214 else if (strcmp(orig_head, rebase_orig_head))
1215 split_in_progress = 1;
1216
1217 free(head);
1218 free(orig_head);
1219 free(rebase_amend);
1220 free(rebase_orig_head);
1221
1222 return split_in_progress;
1223 }
1224
1225 /*
1226 * Turn
1227 * "pick d6a2f0303e897ec257dd0e0a39a5ccb709bc2047 some message"
1228 * into
1229 * "pick d6a2f03 some message"
1230 *
1231 * The function assumes that the line does not contain useless spaces
1232 * before or after the command.
1233 */
1234 static void abbrev_sha1_in_line(struct strbuf *line)
1235 {
1236 struct strbuf **split;
1237 int i;
1238
1239 if (starts_with(line->buf, "exec ") ||
1240 starts_with(line->buf, "x ") ||
1241 starts_with(line->buf, "label ") ||
1242 starts_with(line->buf, "l "))
1243 return;
1244
1245 split = strbuf_split_max(line, ' ', 3);
1246 if (split[0] && split[1]) {
1247 struct object_id oid;
1248
1249 /*
1250 * strbuf_split_max left a space. Trim it and re-add
1251 * it after abbreviation.
1252 */
1253 strbuf_trim(split[1]);
1254 if (!get_oid(split[1]->buf, &oid)) {
1255 strbuf_reset(split[1]);
1256 strbuf_add_unique_abbrev(split[1], &oid,
1257 DEFAULT_ABBREV);
1258 strbuf_addch(split[1], ' ');
1259 strbuf_reset(line);
1260 for (i = 0; split[i]; i++)
1261 strbuf_addbuf(line, split[i]);
1262 }
1263 }
1264 strbuf_list_free(split);
1265 }
1266
1267 static int read_rebase_todolist(const char *fname, struct string_list *lines)
1268 {
1269 struct strbuf line = STRBUF_INIT;
1270 FILE *f = fopen(git_path("%s", fname), "r");
1271
1272 if (!f) {
1273 if (errno == ENOENT)
1274 return -1;
1275 die_errno("Could not open file %s for reading",
1276 git_path("%s", fname));
1277 }
1278 while (!strbuf_getline_lf(&line, f)) {
1279 if (line.len && line.buf[0] == comment_line_char)
1280 continue;
1281 strbuf_trim(&line);
1282 if (!line.len)
1283 continue;
1284 abbrev_sha1_in_line(&line);
1285 string_list_append(lines, line.buf);
1286 }
1287 fclose(f);
1288 strbuf_release(&line);
1289 return 0;
1290 }
1291
1292 static void show_rebase_information(struct wt_status *s,
1293 const char *color)
1294 {
1295 if (s->state.rebase_interactive_in_progress) {
1296 int i;
1297 int nr_lines_to_show = 2;
1298
1299 struct string_list have_done = STRING_LIST_INIT_DUP;
1300 struct string_list yet_to_do = STRING_LIST_INIT_DUP;
1301
1302 read_rebase_todolist("rebase-merge/done", &have_done);
1303 if (read_rebase_todolist("rebase-merge/git-rebase-todo",
1304 &yet_to_do))
1305 status_printf_ln(s, color,
1306 _("git-rebase-todo is missing."));
1307 if (have_done.nr == 0)
1308 status_printf_ln(s, color, _("No commands done."));
1309 else {
1310 status_printf_ln(s, color,
1311 Q_("Last command done (%d command done):",
1312 "Last commands done (%d commands done):",
1313 have_done.nr),
1314 have_done.nr);
1315 for (i = (have_done.nr > nr_lines_to_show)
1316 ? have_done.nr - nr_lines_to_show : 0;
1317 i < have_done.nr;
1318 i++)
1319 status_printf_ln(s, color, " %s", have_done.items[i].string);
1320 if (have_done.nr > nr_lines_to_show && s->hints)
1321 status_printf_ln(s, color,
1322 _(" (see more in file %s)"), git_path("rebase-merge/done"));
1323 }
1324
1325 if (yet_to_do.nr == 0)
1326 status_printf_ln(s, color,
1327 _("No commands remaining."));
1328 else {
1329 status_printf_ln(s, color,
1330 Q_("Next command to do (%d remaining command):",
1331 "Next commands to do (%d remaining commands):",
1332 yet_to_do.nr),
1333 yet_to_do.nr);
1334 for (i = 0; i < nr_lines_to_show && i < yet_to_do.nr; i++)
1335 status_printf_ln(s, color, " %s", yet_to_do.items[i].string);
1336 if (s->hints)
1337 status_printf_ln(s, color,
1338 _(" (use \"git rebase --edit-todo\" to view and edit)"));
1339 }
1340 string_list_clear(&yet_to_do, 0);
1341 string_list_clear(&have_done, 0);
1342 }
1343 }
1344
1345 static void print_rebase_state(struct wt_status *s,
1346 const char *color)
1347 {
1348 if (s->state.branch)
1349 status_printf_ln(s, color,
1350 _("You are currently rebasing branch '%s' on '%s'."),
1351 s->state.branch,
1352 s->state.onto);
1353 else
1354 status_printf_ln(s, color,
1355 _("You are currently rebasing."));
1356 }
1357
1358 static void show_rebase_in_progress(struct wt_status *s,
1359 const char *color)
1360 {
1361 struct stat st;
1362
1363 show_rebase_information(s, color);
1364 if (has_unmerged(s)) {
1365 print_rebase_state(s, color);
1366 if (s->hints) {
1367 status_printf_ln(s, color,
1368 _(" (fix conflicts and then run \"git rebase --continue\")"));
1369 status_printf_ln(s, color,
1370 _(" (use \"git rebase --skip\" to skip this patch)"));
1371 status_printf_ln(s, color,
1372 _(" (use \"git rebase --abort\" to check out the original branch)"));
1373 }
1374 } else if (s->state.rebase_in_progress ||
1375 !stat(git_path_merge_msg(s->repo), &st)) {
1376 print_rebase_state(s, color);
1377 if (s->hints)
1378 status_printf_ln(s, color,
1379 _(" (all conflicts fixed: run \"git rebase --continue\")"));
1380 } else if (split_commit_in_progress(s)) {
1381 if (s->state.branch)
1382 status_printf_ln(s, color,
1383 _("You are currently splitting a commit while rebasing branch '%s' on '%s'."),
1384 s->state.branch,
1385 s->state.onto);
1386 else
1387 status_printf_ln(s, color,
1388 _("You are currently splitting a commit during a rebase."));
1389 if (s->hints)
1390 status_printf_ln(s, color,
1391 _(" (Once your working directory is clean, run \"git rebase --continue\")"));
1392 } else {
1393 if (s->state.branch)
1394 status_printf_ln(s, color,
1395 _("You are currently editing a commit while rebasing branch '%s' on '%s'."),
1396 s->state.branch,
1397 s->state.onto);
1398 else
1399 status_printf_ln(s, color,
1400 _("You are currently editing a commit during a rebase."));
1401 if (s->hints && !s->amend) {
1402 status_printf_ln(s, color,
1403 _(" (use \"git commit --amend\" to amend the current commit)"));
1404 status_printf_ln(s, color,
1405 _(" (use \"git rebase --continue\" once you are satisfied with your changes)"));
1406 }
1407 }
1408 wt_longstatus_print_trailer(s);
1409 }
1410
1411 static void show_cherry_pick_in_progress(struct wt_status *s,
1412 const char *color)
1413 {
1414 if (is_null_oid(&s->state.cherry_pick_head_oid))
1415 status_printf_ln(s, color,
1416 _("Cherry-pick currently in progress."));
1417 else
1418 status_printf_ln(s, color,
1419 _("You are currently cherry-picking commit %s."),
1420 find_unique_abbrev(&s->state.cherry_pick_head_oid,
1421 DEFAULT_ABBREV));
1422
1423 if (s->hints) {
1424 if (has_unmerged(s))
1425 status_printf_ln(s, color,
1426 _(" (fix conflicts and run \"git cherry-pick --continue\")"));
1427 else if (is_null_oid(&s->state.cherry_pick_head_oid))
1428 status_printf_ln(s, color,
1429 _(" (run \"git cherry-pick --continue\" to continue)"));
1430 else
1431 status_printf_ln(s, color,
1432 _(" (all conflicts fixed: run \"git cherry-pick --continue\")"));
1433 status_printf_ln(s, color,
1434 _(" (use \"git cherry-pick --skip\" to skip this patch)"));
1435 status_printf_ln(s, color,
1436 _(" (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"));
1437 }
1438 wt_longstatus_print_trailer(s);
1439 }
1440
1441 static void show_revert_in_progress(struct wt_status *s,
1442 const char *color)
1443 {
1444 if (is_null_oid(&s->state.revert_head_oid))
1445 status_printf_ln(s, color,
1446 _("Revert currently in progress."));
1447 else
1448 status_printf_ln(s, color,
1449 _("You are currently reverting commit %s."),
1450 find_unique_abbrev(&s->state.revert_head_oid,
1451 DEFAULT_ABBREV));
1452 if (s->hints) {
1453 if (has_unmerged(s))
1454 status_printf_ln(s, color,
1455 _(" (fix conflicts and run \"git revert --continue\")"));
1456 else if (is_null_oid(&s->state.revert_head_oid))
1457 status_printf_ln(s, color,
1458 _(" (run \"git revert --continue\" to continue)"));
1459 else
1460 status_printf_ln(s, color,
1461 _(" (all conflicts fixed: run \"git revert --continue\")"));
1462 status_printf_ln(s, color,
1463 _(" (use \"git revert --skip\" to skip this patch)"));
1464 status_printf_ln(s, color,
1465 _(" (use \"git revert --abort\" to cancel the revert operation)"));
1466 }
1467 wt_longstatus_print_trailer(s);
1468 }
1469
1470 static void show_bisect_in_progress(struct wt_status *s,
1471 const char *color)
1472 {
1473 if (s->state.branch)
1474 status_printf_ln(s, color,
1475 _("You are currently bisecting, started from branch '%s'."),
1476 s->state.branch);
1477 else
1478 status_printf_ln(s, color,
1479 _("You are currently bisecting."));
1480 if (s->hints)
1481 status_printf_ln(s, color,
1482 _(" (use \"git bisect reset\" to get back to the original branch)"));
1483 wt_longstatus_print_trailer(s);
1484 }
1485
1486 static void show_sparse_checkout_in_use(struct wt_status *s,
1487 const char *color)
1488 {
1489 if (s->state.sparse_checkout_percentage == SPARSE_CHECKOUT_DISABLED)
1490 return;
1491
1492 status_printf_ln(s, color,
1493 _("You are in a sparse checkout with %d%% of tracked files present."),
1494 s->state.sparse_checkout_percentage);
1495 wt_longstatus_print_trailer(s);
1496 }
1497
1498 /*
1499 * Extract branch information from rebase/bisect
1500 */
1501 static char *get_branch(const struct worktree *wt, const char *path)
1502 {
1503 struct strbuf sb = STRBUF_INIT;
1504 struct object_id oid;
1505 const char *branch_name;
1506
1507 if (strbuf_read_file(&sb, worktree_git_path(wt, "%s", path), 0) <= 0)
1508 goto got_nothing;
1509
1510 while (sb.len && sb.buf[sb.len - 1] == '\n')
1511 strbuf_setlen(&sb, sb.len - 1);
1512 if (!sb.len)
1513 goto got_nothing;
1514 if (skip_prefix(sb.buf, "refs/heads/", &branch_name))
1515 strbuf_remove(&sb, 0, branch_name - sb.buf);
1516 else if (starts_with(sb.buf, "refs/"))
1517 ;
1518 else if (!get_oid_hex(sb.buf, &oid)) {
1519 strbuf_reset(&sb);
1520 strbuf_add_unique_abbrev(&sb, &oid, DEFAULT_ABBREV);
1521 } else if (!strcmp(sb.buf, "detached HEAD")) /* rebase */
1522 goto got_nothing;
1523 else /* bisect */
1524 ;
1525 return strbuf_detach(&sb, NULL);
1526
1527 got_nothing:
1528 strbuf_release(&sb);
1529 return NULL;
1530 }
1531
1532 struct grab_1st_switch_cbdata {
1533 struct strbuf buf;
1534 struct object_id noid;
1535 };
1536
1537 static int grab_1st_switch(struct object_id *ooid, struct object_id *noid,
1538 const char *email, timestamp_t timestamp, int tz,
1539 const char *message, void *cb_data)
1540 {
1541 struct grab_1st_switch_cbdata *cb = cb_data;
1542 const char *target = NULL, *end;
1543
1544 if (!skip_prefix(message, "checkout: moving from ", &message))
1545 return 0;
1546 target = strstr(message, " to ");
1547 if (!target)
1548 return 0;
1549 target += strlen(" to ");
1550 strbuf_reset(&cb->buf);
1551 oidcpy(&cb->noid, noid);
1552 end = strchrnul(target, '\n');
1553 strbuf_add(&cb->buf, target, end - target);
1554 if (!strcmp(cb->buf.buf, "HEAD")) {
1555 /* HEAD is relative. Resolve it to the right reflog entry. */
1556 strbuf_reset(&cb->buf);
1557 strbuf_add_unique_abbrev(&cb->buf, noid, DEFAULT_ABBREV);
1558 }
1559 return 1;
1560 }
1561
1562 static void wt_status_get_detached_from(struct repository *r,
1563 struct wt_status_state *state)
1564 {
1565 struct grab_1st_switch_cbdata cb;
1566 struct commit *commit;
1567 struct object_id oid;
1568 char *ref = NULL;
1569
1570 strbuf_init(&cb.buf, 0);
1571 if (for_each_reflog_ent_reverse("HEAD", grab_1st_switch, &cb) <= 0) {
1572 strbuf_release(&cb.buf);
1573 return;
1574 }
1575
1576 if (dwim_ref(cb.buf.buf, cb.buf.len, &oid, &ref) == 1 &&
1577 /* sha1 is a commit? match without further lookup */
1578 (oideq(&cb.noid, &oid) ||
1579 /* perhaps sha1 is a tag, try to dereference to a commit */
1580 ((commit = lookup_commit_reference_gently(r, &oid, 1)) != NULL &&
1581 oideq(&cb.noid, &commit->object.oid)))) {
1582 const char *from = ref;
1583 if (!skip_prefix(from, "refs/tags/", &from))
1584 skip_prefix(from, "refs/remotes/", &from);
1585 state->detached_from = xstrdup(from);
1586 } else
1587 state->detached_from =
1588 xstrdup(find_unique_abbrev(&cb.noid, DEFAULT_ABBREV));
1589 oidcpy(&state->detached_oid, &cb.noid);
1590 state->detached_at = !get_oid("HEAD", &oid) &&
1591 oideq(&oid, &state->detached_oid);
1592
1593 free(ref);
1594 strbuf_release(&cb.buf);
1595 }
1596
1597 int wt_status_check_rebase(const struct worktree *wt,
1598 struct wt_status_state *state)
1599 {
1600 struct stat st;
1601
1602 if (!stat(worktree_git_path(wt, "rebase-apply"), &st)) {
1603 if (!stat(worktree_git_path(wt, "rebase-apply/applying"), &st)) {
1604 state->am_in_progress = 1;
1605 if (!stat(worktree_git_path(wt, "rebase-apply/patch"), &st) && !st.st_size)
1606 state->am_empty_patch = 1;
1607 } else {
1608 state->rebase_in_progress = 1;
1609 state->branch = get_branch(wt, "rebase-apply/head-name");
1610 state->onto = get_branch(wt, "rebase-apply/onto");
1611 }
1612 } else if (!stat(worktree_git_path(wt, "rebase-merge"), &st)) {
1613 if (!stat(worktree_git_path(wt, "rebase-merge/interactive"), &st))
1614 state->rebase_interactive_in_progress = 1;
1615 else
1616 state->rebase_in_progress = 1;
1617 state->branch = get_branch(wt, "rebase-merge/head-name");
1618 state->onto = get_branch(wt, "rebase-merge/onto");
1619 } else
1620 return 0;
1621 return 1;
1622 }
1623
1624 int wt_status_check_bisect(const struct worktree *wt,
1625 struct wt_status_state *state)
1626 {
1627 struct stat st;
1628
1629 if (!stat(worktree_git_path(wt, "BISECT_LOG"), &st)) {
1630 state->bisect_in_progress = 1;
1631 state->branch = get_branch(wt, "BISECT_START");
1632 return 1;
1633 }
1634 return 0;
1635 }
1636
1637 static void wt_status_check_sparse_checkout(struct repository *r,
1638 struct wt_status_state *state)
1639 {
1640 int skip_worktree = 0;
1641 int i;
1642
1643 if (!core_apply_sparse_checkout || r->index->cache_nr == 0) {
1644 /*
1645 * Don't compute percentage of checked out files if we
1646 * aren't in a sparse checkout or would get division by 0.
1647 */
1648 state->sparse_checkout_percentage = SPARSE_CHECKOUT_DISABLED;
1649 return;
1650 }
1651
1652 for (i = 0; i < r->index->cache_nr; i++) {
1653 struct cache_entry *ce = r->index->cache[i];
1654 if (ce_skip_worktree(ce))
1655 skip_worktree++;
1656 }
1657
1658 state->sparse_checkout_percentage =
1659 100 - (100 * skip_worktree)/r->index->cache_nr;
1660 }
1661
1662 void wt_status_get_state(struct repository *r,
1663 struct wt_status_state *state,
1664 int get_detached_from)
1665 {
1666 struct stat st;
1667 struct object_id oid;
1668 enum replay_action action;
1669
1670 if (!stat(git_path_merge_head(r), &st)) {
1671 wt_status_check_rebase(NULL, state);
1672 state->merge_in_progress = 1;
1673 } else if (wt_status_check_rebase(NULL, state)) {
1674 ; /* all set */
1675 } else if (!stat(git_path_cherry_pick_head(r), &st) &&
1676 !get_oid("CHERRY_PICK_HEAD", &oid)) {
1677 state->cherry_pick_in_progress = 1;
1678 oidcpy(&state->cherry_pick_head_oid, &oid);
1679 }
1680 wt_status_check_bisect(NULL, state);
1681 if (!stat(git_path_revert_head(r), &st) &&
1682 !get_oid("REVERT_HEAD", &oid)) {
1683 state->revert_in_progress = 1;
1684 oidcpy(&state->revert_head_oid, &oid);
1685 }
1686 if (!sequencer_get_last_command(r, &action)) {
1687 if (action == REPLAY_PICK) {
1688 state->cherry_pick_in_progress = 1;
1689 oidcpy(&state->cherry_pick_head_oid, &null_oid);
1690 } else {
1691 state->revert_in_progress = 1;
1692 oidcpy(&state->revert_head_oid, &null_oid);
1693 }
1694 }
1695 if (get_detached_from)
1696 wt_status_get_detached_from(r, state);
1697 wt_status_check_sparse_checkout(r, state);
1698 }
1699
1700 static void wt_longstatus_print_state(struct wt_status *s)
1701 {
1702 const char *state_color = color(WT_STATUS_HEADER, s);
1703 struct wt_status_state *state = &s->state;
1704
1705 if (state->merge_in_progress) {
1706 if (state->rebase_interactive_in_progress) {
1707 show_rebase_information(s, state_color);
1708 fputs("\n", s->fp);
1709 }
1710 show_merge_in_progress(s, state_color);
1711 } else if (state->am_in_progress)
1712 show_am_in_progress(s, state_color);
1713 else if (state->rebase_in_progress || state->rebase_interactive_in_progress)
1714 show_rebase_in_progress(s, state_color);
1715 else if (state->cherry_pick_in_progress)
1716 show_cherry_pick_in_progress(s, state_color);
1717 else if (state->revert_in_progress)
1718 show_revert_in_progress(s, state_color);
1719 if (state->bisect_in_progress)
1720 show_bisect_in_progress(s, state_color);
1721
1722 if (state->sparse_checkout_percentage != SPARSE_CHECKOUT_DISABLED)
1723 show_sparse_checkout_in_use(s, state_color);
1724 }
1725
1726 static void wt_longstatus_print(struct wt_status *s)
1727 {
1728 const char *branch_color = color(WT_STATUS_ONBRANCH, s);
1729 const char *branch_status_color = color(WT_STATUS_HEADER, s);
1730
1731 if (s->branch) {
1732 const char *on_what = _("On branch ");
1733 const char *branch_name = s->branch;
1734 if (!strcmp(branch_name, "HEAD")) {
1735 branch_status_color = color(WT_STATUS_NOBRANCH, s);
1736 if (s->state.rebase_in_progress ||
1737 s->state.rebase_interactive_in_progress) {
1738 if (s->state.rebase_interactive_in_progress)
1739 on_what = _("interactive rebase in progress; onto ");
1740 else
1741 on_what = _("rebase in progress; onto ");
1742 branch_name = s->state.onto;
1743 } else if (s->state.detached_from) {
1744 branch_name = s->state.detached_from;
1745 if (s->state.detached_at)
1746 on_what = HEAD_DETACHED_AT;
1747 else
1748 on_what = HEAD_DETACHED_FROM;
1749 } else {
1750 branch_name = "";
1751 on_what = _("Not currently on any branch.");
1752 }
1753 } else
1754 skip_prefix(branch_name, "refs/heads/", &branch_name);
1755 status_printf(s, color(WT_STATUS_HEADER, s), "%s", "");
1756 status_printf_more(s, branch_status_color, "%s", on_what);
1757 status_printf_more(s, branch_color, "%s\n", branch_name);
1758 if (!s->is_initial)
1759 wt_longstatus_print_tracking(s);
1760 }
1761
1762 wt_longstatus_print_state(s);
1763
1764 if (s->is_initial) {
1765 status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", "");
1766 status_printf_ln(s, color(WT_STATUS_HEADER, s),
1767 s->commit_template
1768 ? _("Initial commit")
1769 : _("No commits yet"));
1770 status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", "");
1771 }
1772
1773 wt_longstatus_print_updated(s);
1774 wt_longstatus_print_unmerged(s);
1775 wt_longstatus_print_changed(s);
1776 if (s->submodule_summary &&
1777 (!s->ignore_submodule_arg ||
1778 strcmp(s->ignore_submodule_arg, "all"))) {
1779 wt_longstatus_print_submodule_summary(s, 0); /* staged */
1780 wt_longstatus_print_submodule_summary(s, 1); /* unstaged */
1781 }
1782 if (s->show_untracked_files) {
1783 wt_longstatus_print_other(s, &s->untracked, _("Untracked files"), "add");
1784 if (s->show_ignored_mode)
1785 wt_longstatus_print_other(s, &s->ignored, _("Ignored files"), "add -f");
1786 if (advice_status_u_option && 2000 < s->untracked_in_ms) {
1787 status_printf_ln(s, GIT_COLOR_NORMAL, "%s", "");
1788 status_printf_ln(s, GIT_COLOR_NORMAL,
1789 _("It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1790 "may speed it up, but you have to be careful not to forget to add\n"
1791 "new files yourself (see 'git help status')."),
1792 s->untracked_in_ms / 1000.0);
1793 }
1794 } else if (s->committable)
1795 status_printf_ln(s, GIT_COLOR_NORMAL, _("Untracked files not listed%s"),
1796 s->hints
1797 ? _(" (use -u option to show untracked files)") : "");
1798
1799 if (s->verbose)
1800 wt_longstatus_print_verbose(s);
1801 if (!s->committable) {
1802 if (s->amend)
1803 status_printf_ln(s, GIT_COLOR_NORMAL, _("No changes"));
1804 else if (s->nowarn)
1805 ; /* nothing */
1806 else if (s->workdir_dirty) {
1807 if (s->hints)
1808 printf(_("no changes added to commit "
1809 "(use \"git add\" and/or \"git commit -a\")\n"));
1810 else
1811 printf(_("no changes added to commit\n"));
1812 } else if (s->untracked.nr) {
1813 if (s->hints)
1814 printf(_("nothing added to commit but untracked files "
1815 "present (use \"git add\" to track)\n"));
1816 else
1817 printf(_("nothing added to commit but untracked files present\n"));
1818 } else if (s->is_initial) {
1819 if (s->hints)
1820 printf(_("nothing to commit (create/copy files "
1821 "and use \"git add\" to track)\n"));
1822 else
1823 printf(_("nothing to commit\n"));
1824 } else if (!s->show_untracked_files) {
1825 if (s->hints)
1826 printf(_("nothing to commit (use -u to show untracked files)\n"));
1827 else
1828 printf(_("nothing to commit\n"));
1829 } else
1830 printf(_("nothing to commit, working tree clean\n"));
1831 }
1832 if(s->show_stash)
1833 wt_longstatus_print_stash_summary(s);
1834 }
1835
1836 static void wt_shortstatus_unmerged(struct string_list_item *it,
1837 struct wt_status *s)
1838 {
1839 struct wt_status_change_data *d = it->util;
1840 const char *how = "??";
1841
1842 switch (d->stagemask) {
1843 case 1: how = "DD"; break; /* both deleted */
1844 case 2: how = "AU"; break; /* added by us */
1845 case 3: how = "UD"; break; /* deleted by them */
1846 case 4: how = "UA"; break; /* added by them */
1847 case 5: how = "DU"; break; /* deleted by us */
1848 case 6: how = "AA"; break; /* both added */
1849 case 7: how = "UU"; break; /* both modified */
1850 }
1851 color_fprintf(s->fp, color(WT_STATUS_UNMERGED, s), "%s", how);
1852 if (s->null_termination) {
1853 fprintf(stdout, " %s%c", it->string, 0);
1854 } else {
1855 struct strbuf onebuf = STRBUF_INIT;
1856 const char *one;
1857 one = quote_path(it->string, s->prefix, &onebuf);
1858 printf(" %s\n", one);
1859 strbuf_release(&onebuf);
1860 }
1861 }
1862
1863 static void wt_shortstatus_status(struct string_list_item *it,
1864 struct wt_status *s)
1865 {
1866 struct wt_status_change_data *d = it->util;
1867
1868 if (d->index_status)
1869 color_fprintf(s->fp, color(WT_STATUS_UPDATED, s), "%c", d->index_status);
1870 else
1871 putchar(' ');
1872 if (d->worktree_status)
1873 color_fprintf(s->fp, color(WT_STATUS_CHANGED, s), "%c", d->worktree_status);
1874 else
1875 putchar(' ');
1876 putchar(' ');
1877 if (s->null_termination) {
1878 fprintf(stdout, "%s%c", it->string, 0);
1879 if (d->rename_source)
1880 fprintf(stdout, "%s%c", d->rename_source, 0);
1881 } else {
1882 struct strbuf onebuf = STRBUF_INIT;
1883 const char *one;
1884
1885 if (d->rename_source) {
1886 one = quote_path(d->rename_source, s->prefix, &onebuf);
1887 if (*one != '"' && strchr(one, ' ') != NULL) {
1888 putchar('"');
1889 strbuf_addch(&onebuf, '"');
1890 one = onebuf.buf;
1891 }
1892 printf("%s -> ", one);
1893 strbuf_release(&onebuf);
1894 }
1895 one = quote_path(it->string, s->prefix, &onebuf);
1896 if (*one != '"' && strchr(one, ' ') != NULL) {
1897 putchar('"');
1898 strbuf_addch(&onebuf, '"');
1899 one = onebuf.buf;
1900 }
1901 printf("%s\n", one);
1902 strbuf_release(&onebuf);
1903 }
1904 }
1905
1906 static void wt_shortstatus_other(struct string_list_item *it,
1907 struct wt_status *s, const char *sign)
1908 {
1909 if (s->null_termination) {
1910 fprintf(stdout, "%s %s%c", sign, it->string, 0);
1911 } else {
1912 struct strbuf onebuf = STRBUF_INIT;
1913 const char *one;
1914 one = quote_path(it->string, s->prefix, &onebuf);
1915 color_fprintf(s->fp, color(WT_STATUS_UNTRACKED, s), "%s", sign);
1916 printf(" %s\n", one);
1917 strbuf_release(&onebuf);
1918 }
1919 }
1920
1921 static void wt_shortstatus_print_tracking(struct wt_status *s)
1922 {
1923 struct branch *branch;
1924 const char *header_color = color(WT_STATUS_HEADER, s);
1925 const char *branch_color_local = color(WT_STATUS_LOCAL_BRANCH, s);
1926 const char *branch_color_remote = color(WT_STATUS_REMOTE_BRANCH, s);
1927
1928 const char *base;
1929 char *short_base;
1930 const char *branch_name;
1931 int num_ours, num_theirs, sti;
1932 int upstream_is_gone = 0;
1933
1934 color_fprintf(s->fp, color(WT_STATUS_HEADER, s), "## ");
1935
1936 if (!s->branch)
1937 return;
1938 branch_name = s->branch;
1939
1940 #define LABEL(string) (s->no_gettext ? (string) : _(string))
1941
1942 if (s->is_initial)
1943 color_fprintf(s->fp, header_color, LABEL(N_("No commits yet on ")));
1944
1945 if (!strcmp(s->branch, "HEAD")) {
1946 color_fprintf(s->fp, color(WT_STATUS_NOBRANCH, s), "%s",
1947 LABEL(N_("HEAD (no branch)")));
1948 goto conclude;
1949 }
1950
1951 skip_prefix(branch_name, "refs/heads/", &branch_name);
1952
1953 branch = branch_get(branch_name);
1954
1955 color_fprintf(s->fp, branch_color_local, "%s", branch_name);
1956
1957 sti = stat_tracking_info(branch, &num_ours, &num_theirs, &base,
1958 0, s->ahead_behind_flags);
1959 if (sti < 0) {
1960 if (!base)
1961 goto conclude;
1962
1963 upstream_is_gone = 1;
1964 }
1965
1966 short_base = shorten_unambiguous_ref(base, 0);
1967 color_fprintf(s->fp, header_color, "...");
1968 color_fprintf(s->fp, branch_color_remote, "%s", short_base);
1969 free(short_base);
1970
1971 if (!upstream_is_gone && !sti)
1972 goto conclude;
1973
1974 color_fprintf(s->fp, header_color, " [");
1975 if (upstream_is_gone) {
1976 color_fprintf(s->fp, header_color, LABEL(N_("gone")));
1977 } else if (s->ahead_behind_flags == AHEAD_BEHIND_QUICK) {
1978 color_fprintf(s->fp, header_color, LABEL(N_("different")));
1979 } else if (!num_ours) {
1980 color_fprintf(s->fp, header_color, LABEL(N_("behind ")));
1981 color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
1982 } else if (!num_theirs) {
1983 color_fprintf(s->fp, header_color, LABEL(N_("ahead ")));
1984 color_fprintf(s->fp, branch_color_local, "%d", num_ours);
1985 } else {
1986 color_fprintf(s->fp, header_color, LABEL(N_("ahead ")));
1987 color_fprintf(s->fp, branch_color_local, "%d", num_ours);
1988 color_fprintf(s->fp, header_color, ", %s", LABEL(N_("behind ")));
1989 color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
1990 }
1991
1992 color_fprintf(s->fp, header_color, "]");
1993 conclude:
1994 fputc(s->null_termination ? '\0' : '\n', s->fp);
1995 }
1996
1997 static void wt_shortstatus_print(struct wt_status *s)
1998 {
1999 struct string_list_item *it;
2000
2001 if (s->show_branch)
2002 wt_shortstatus_print_tracking(s);
2003
2004 for_each_string_list_item(it, &s->change) {
2005 struct wt_status_change_data *d = it->util;
2006
2007 if (d->stagemask)
2008 wt_shortstatus_unmerged(it, s);
2009 else
2010 wt_shortstatus_status(it, s);
2011 }
2012 for_each_string_list_item(it, &s->untracked)
2013 wt_shortstatus_other(it, s, "??");
2014
2015 for_each_string_list_item(it, &s->ignored)
2016 wt_shortstatus_other(it, s, "!!");
2017 }
2018
2019 static void wt_porcelain_print(struct wt_status *s)
2020 {
2021 s->use_color = 0;
2022 s->relative_paths = 0;
2023 s->prefix = NULL;
2024 s->no_gettext = 1;
2025 wt_shortstatus_print(s);
2026 }
2027
2028 /*
2029 * Print branch information for porcelain v2 output. These lines
2030 * are printed when the '--branch' parameter is given.
2031 *
2032 * # branch.oid <commit><eol>
2033 * # branch.head <head><eol>
2034 * [# branch.upstream <upstream><eol>
2035 * [# branch.ab +<ahead> -<behind><eol>]]
2036 *
2037 * <commit> ::= the current commit hash or the literal
2038 * "(initial)" to indicate an initialized repo
2039 * with no commits.
2040 *
2041 * <head> ::= <branch_name> the current branch name or
2042 * "(detached)" literal when detached head or
2043 * "(unknown)" when something is wrong.
2044 *
2045 * <upstream> ::= the upstream branch name, when set.
2046 *
2047 * <ahead> ::= integer ahead value or '?'.
2048 *
2049 * <behind> ::= integer behind value or '?'.
2050 *
2051 * The end-of-line is defined by the -z flag.
2052 *
2053 * <eol> ::= NUL when -z,
2054 * LF when NOT -z.
2055 *
2056 * When an upstream is set and present, the 'branch.ab' line will
2057 * be printed with the ahead/behind counts for the branch and the
2058 * upstream. When AHEAD_BEHIND_QUICK is requested and the branches
2059 * are different, '?' will be substituted for the actual count.
2060 */
2061 static void wt_porcelain_v2_print_tracking(struct wt_status *s)
2062 {
2063 struct branch *branch;
2064 const char *base;
2065 const char *branch_name;
2066 int ab_info, nr_ahead, nr_behind;
2067 char eol = s->null_termination ? '\0' : '\n';
2068
2069 fprintf(s->fp, "# branch.oid %s%c",
2070 (s->is_initial ? "(initial)" : oid_to_hex(&s->oid_commit)),
2071 eol);
2072
2073 if (!s->branch)
2074 fprintf(s->fp, "# branch.head %s%c", "(unknown)", eol);
2075 else {
2076 if (!strcmp(s->branch, "HEAD")) {
2077 fprintf(s->fp, "# branch.head %s%c", "(detached)", eol);
2078
2079 if (s->state.rebase_in_progress ||
2080 s->state.rebase_interactive_in_progress)
2081 branch_name = s->state.onto;
2082 else if (s->state.detached_from)
2083 branch_name = s->state.detached_from;
2084 else
2085 branch_name = "";
2086 } else {
2087 branch_name = NULL;
2088 skip_prefix(s->branch, "refs/heads/", &branch_name);
2089
2090 fprintf(s->fp, "# branch.head %s%c", branch_name, eol);
2091 }
2092
2093 /* Lookup stats on the upstream tracking branch, if set. */
2094 branch = branch_get(branch_name);
2095 base = NULL;
2096 ab_info = stat_tracking_info(branch, &nr_ahead, &nr_behind,
2097 &base, 0, s->ahead_behind_flags);
2098 if (base) {
2099 base = shorten_unambiguous_ref(base, 0);
2100 fprintf(s->fp, "# branch.upstream %s%c", base, eol);
2101 free((char *)base);
2102
2103 if (ab_info > 0) {
2104 /* different */
2105 if (nr_ahead || nr_behind)
2106 fprintf(s->fp, "# branch.ab +%d -%d%c",
2107 nr_ahead, nr_behind, eol);
2108 else
2109 fprintf(s->fp, "# branch.ab +? -?%c",
2110 eol);
2111 } else if (!ab_info) {
2112 /* same */
2113 fprintf(s->fp, "# branch.ab +0 -0%c", eol);
2114 }
2115 }
2116 }
2117 }
2118
2119 /*
2120 * Convert various submodule status values into a
2121 * fixed-length string of characters in the buffer provided.
2122 */
2123 static void wt_porcelain_v2_submodule_state(
2124 struct wt_status_change_data *d,
2125 char sub[5])
2126 {
2127 if (S_ISGITLINK(d->mode_head) ||
2128 S_ISGITLINK(d->mode_index) ||
2129 S_ISGITLINK(d->mode_worktree)) {
2130 sub[0] = 'S';
2131 sub[1] = d->new_submodule_commits ? 'C' : '.';
2132 sub[2] = (d->dirty_submodule & DIRTY_SUBMODULE_MODIFIED) ? 'M' : '.';
2133 sub[3] = (d->dirty_submodule & DIRTY_SUBMODULE_UNTRACKED) ? 'U' : '.';
2134 } else {
2135 sub[0] = 'N';
2136 sub[1] = '.';
2137 sub[2] = '.';
2138 sub[3] = '.';
2139 }
2140 sub[4] = 0;
2141 }
2142
2143 /*
2144 * Fix-up changed entries before we print them.
2145 */
2146 static void wt_porcelain_v2_fix_up_changed(struct string_list_item *it)
2147 {
2148 struct wt_status_change_data *d = it->util;
2149
2150 if (!d->index_status) {
2151 /*
2152 * This entry is unchanged in the index (relative to the head).
2153 * Therefore, the collect_updated_cb was never called for this
2154 * entry (during the head-vs-index scan) and so the head column
2155 * fields were never set.
2156 *
2157 * We must have data for the index column (from the
2158 * index-vs-worktree scan (otherwise, this entry should not be
2159 * in the list of changes)).
2160 *
2161 * Copy index column fields to the head column, so that our
2162 * output looks complete.
2163 */
2164 assert(d->mode_head == 0);
2165 d->mode_head = d->mode_index;
2166 oidcpy(&d->oid_head, &d->oid_index);
2167 }
2168
2169 if (!d->worktree_status) {
2170 /*
2171 * This entry is unchanged in the worktree (relative to the index).
2172 * Therefore, the collect_changed_cb was never called for this entry
2173 * (during the index-vs-worktree scan) and so the worktree column
2174 * fields were never set.
2175 *
2176 * We must have data for the index column (from the head-vs-index
2177 * scan).
2178 *
2179 * Copy the index column fields to the worktree column so that
2180 * our output looks complete.
2181 *
2182 * Note that we only have a mode field in the worktree column
2183 * because the scan code tries really hard to not have to compute it.
2184 */
2185 assert(d->mode_worktree == 0);
2186 d->mode_worktree = d->mode_index;
2187 }
2188 }
2189
2190 /*
2191 * Print porcelain v2 info for tracked entries with changes.
2192 */
2193 static void wt_porcelain_v2_print_changed_entry(
2194 struct string_list_item *it,
2195 struct wt_status *s)
2196 {
2197 struct wt_status_change_data *d = it->util;
2198 struct strbuf buf = STRBUF_INIT;
2199 struct strbuf buf_from = STRBUF_INIT;
2200 const char *path = NULL;
2201 const char *path_from = NULL;
2202 char key[3];
2203 char submodule_token[5];
2204 char sep_char, eol_char;
2205
2206 wt_porcelain_v2_fix_up_changed(it);
2207 wt_porcelain_v2_submodule_state(d, submodule_token);
2208
2209 key[0] = d->index_status ? d->index_status : '.';
2210 key[1] = d->worktree_status ? d->worktree_status : '.';
2211 key[2] = 0;
2212
2213 if (s->null_termination) {
2214 /*
2215 * In -z mode, we DO NOT C-quote pathnames. Current path is ALWAYS first.
2216 * A single NUL character separates them.
2217 */
2218 sep_char = '\0';
2219 eol_char = '\0';
2220 path = it->string;
2221 path_from = d->rename_source;
2222 } else {
2223 /*
2224 * Path(s) are C-quoted if necessary. Current path is ALWAYS first.
2225 * The source path is only present when necessary.
2226 * A single TAB separates them (because paths can contain spaces
2227 * which are not escaped and C-quoting does escape TAB characters).
2228 */
2229 sep_char = '\t';
2230 eol_char = '\n';
2231 path = quote_path(it->string, s->prefix, &buf);
2232 if (d->rename_source)
2233 path_from = quote_path(d->rename_source, s->prefix, &buf_from);
2234 }
2235
2236 if (path_from)
2237 fprintf(s->fp, "2 %s %s %06o %06o %06o %s %s %c%d %s%c%s%c",
2238 key, submodule_token,
2239 d->mode_head, d->mode_index, d->mode_worktree,
2240 oid_to_hex(&d->oid_head), oid_to_hex(&d->oid_index),
2241 d->rename_status, d->rename_score,
2242 path, sep_char, path_from, eol_char);
2243 else
2244 fprintf(s->fp, "1 %s %s %06o %06o %06o %s %s %s%c",
2245 key, submodule_token,
2246 d->mode_head, d->mode_index, d->mode_worktree,
2247 oid_to_hex(&d->oid_head), oid_to_hex(&d->oid_index),
2248 path, eol_char);
2249
2250 strbuf_release(&buf);
2251 strbuf_release(&buf_from);
2252 }
2253
2254 /*
2255 * Print porcelain v2 status info for unmerged entries.
2256 */
2257 static void wt_porcelain_v2_print_unmerged_entry(
2258 struct string_list_item *it,
2259 struct wt_status *s)
2260 {
2261 struct wt_status_change_data *d = it->util;
2262 struct index_state *istate = s->repo->index;
2263 const struct cache_entry *ce;
2264 struct strbuf buf_index = STRBUF_INIT;
2265 const char *path_index = NULL;
2266 int pos, stage, sum;
2267 struct {
2268 int mode;
2269 struct object_id oid;
2270 } stages[3];
2271 char *key;
2272 char submodule_token[5];
2273 char unmerged_prefix = 'u';
2274 char eol_char = s->null_termination ? '\0' : '\n';
2275
2276 wt_porcelain_v2_submodule_state(d, submodule_token);
2277
2278 switch (d->stagemask) {
2279 case 1: key = "DD"; break; /* both deleted */
2280 case 2: key = "AU"; break; /* added by us */
2281 case 3: key = "UD"; break; /* deleted by them */
2282 case 4: key = "UA"; break; /* added by them */
2283 case 5: key = "DU"; break; /* deleted by us */
2284 case 6: key = "AA"; break; /* both added */
2285 case 7: key = "UU"; break; /* both modified */
2286 default:
2287 BUG("unhandled unmerged status %x", d->stagemask);
2288 }
2289
2290 /*
2291 * Disregard d.aux.porcelain_v2 data that we accumulated
2292 * for the head and index columns during the scans and
2293 * replace with the actual stage data.
2294 *
2295 * Note that this is a last-one-wins for each the individual
2296 * stage [123] columns in the event of multiple cache entries
2297 * for same stage.
2298 */
2299 memset(stages, 0, sizeof(stages));
2300 sum = 0;
2301 pos = index_name_pos(istate, it->string, strlen(it->string));
2302 assert(pos < 0);
2303 pos = -pos-1;
2304 while (pos < istate->cache_nr) {
2305 ce = istate->cache[pos++];
2306 stage = ce_stage(ce);
2307 if (strcmp(ce->name, it->string) || !stage)
2308 break;
2309 stages[stage - 1].mode = ce->ce_mode;
2310 oidcpy(&stages[stage - 1].oid, &ce->oid);
2311 sum |= (1 << (stage - 1));
2312 }
2313 if (sum != d->stagemask)
2314 BUG("observed stagemask 0x%x != expected stagemask 0x%x", sum, d->stagemask);
2315
2316 if (s->null_termination)
2317 path_index = it->string;
2318 else
2319 path_index = quote_path(it->string, s->prefix, &buf_index);
2320
2321 fprintf(s->fp, "%c %s %s %06o %06o %06o %06o %s %s %s %s%c",
2322 unmerged_prefix, key, submodule_token,
2323 stages[0].mode, /* stage 1 */
2324 stages[1].mode, /* stage 2 */
2325 stages[2].mode, /* stage 3 */
2326 d->mode_worktree,
2327 oid_to_hex(&stages[0].oid), /* stage 1 */
2328 oid_to_hex(&stages[1].oid), /* stage 2 */
2329 oid_to_hex(&stages[2].oid), /* stage 3 */
2330 path_index,
2331 eol_char);
2332
2333 strbuf_release(&buf_index);
2334 }
2335
2336 /*
2337 * Print porcelain V2 status info for untracked and ignored entries.
2338 */
2339 static void wt_porcelain_v2_print_other(
2340 struct string_list_item *it,
2341 struct wt_status *s,
2342 char prefix)
2343 {
2344 struct strbuf buf = STRBUF_INIT;
2345 const char *path;
2346 char eol_char;
2347
2348 if (s->null_termination) {
2349 path = it->string;
2350 eol_char = '\0';
2351 } else {
2352 path = quote_path(it->string, s->prefix, &buf);
2353 eol_char = '\n';
2354 }
2355
2356 fprintf(s->fp, "%c %s%c", prefix, path, eol_char);
2357
2358 strbuf_release(&buf);
2359 }
2360
2361 /*
2362 * Print porcelain V2 status.
2363 *
2364 * [<v2_branch>]
2365 * [<v2_changed_items>]*
2366 * [<v2_unmerged_items>]*
2367 * [<v2_untracked_items>]*
2368 * [<v2_ignored_items>]*
2369 *
2370 */
2371 static void wt_porcelain_v2_print(struct wt_status *s)
2372 {
2373 struct wt_status_change_data *d;
2374 struct string_list_item *it;
2375 int i;
2376
2377 if (s->show_branch)
2378 wt_porcelain_v2_print_tracking(s);
2379
2380 for (i = 0; i < s->change.nr; i++) {
2381 it = &(s->change.items[i]);
2382 d = it->util;
2383 if (!d->stagemask)
2384 wt_porcelain_v2_print_changed_entry(it, s);
2385 }
2386
2387 for (i = 0; i < s->change.nr; i++) {
2388 it = &(s->change.items[i]);
2389 d = it->util;
2390 if (d->stagemask)
2391 wt_porcelain_v2_print_unmerged_entry(it, s);
2392 }
2393
2394 for (i = 0; i < s->untracked.nr; i++) {
2395 it = &(s->untracked.items[i]);
2396 wt_porcelain_v2_print_other(it, s, '?');
2397 }
2398
2399 for (i = 0; i < s->ignored.nr; i++) {
2400 it = &(s->ignored.items[i]);
2401 wt_porcelain_v2_print_other(it, s, '!');
2402 }
2403 }
2404
2405 void wt_status_print(struct wt_status *s)
2406 {
2407 trace2_data_intmax("status", s->repo, "count/changed", s->change.nr);
2408 trace2_data_intmax("status", s->repo, "count/untracked",
2409 s->untracked.nr);
2410 trace2_data_intmax("status", s->repo, "count/ignored", s->ignored.nr);
2411
2412 trace2_region_enter("status", "print", s->repo);
2413
2414 switch (s->status_format) {
2415 case STATUS_FORMAT_SHORT:
2416 wt_shortstatus_print(s);
2417 break;
2418 case STATUS_FORMAT_PORCELAIN:
2419 wt_porcelain_print(s);
2420 break;
2421 case STATUS_FORMAT_PORCELAIN_V2:
2422 wt_porcelain_v2_print(s);
2423 break;
2424 case STATUS_FORMAT_UNSPECIFIED:
2425 BUG("finalize_deferred_config() should have been called");
2426 break;
2427 case STATUS_FORMAT_NONE:
2428 case STATUS_FORMAT_LONG:
2429 wt_longstatus_print(s);
2430 break;
2431 }
2432
2433 trace2_region_leave("status", "print", s->repo);
2434 }
2435
2436 /**
2437 * Returns 1 if there are unstaged changes, 0 otherwise.
2438 */
2439 int has_unstaged_changes(struct repository *r, int ignore_submodules)
2440 {
2441 struct rev_info rev_info;
2442 int result;
2443
2444 repo_init_revisions(r, &rev_info, NULL);
2445 if (ignore_submodules) {
2446 rev_info.diffopt.flags.ignore_submodules = 1;
2447 rev_info.diffopt.flags.override_submodule_config = 1;
2448 }
2449 rev_info.diffopt.flags.quick = 1;
2450 diff_setup_done(&rev_info.diffopt);
2451 result = run_diff_files(&rev_info, 0);
2452 return diff_result_code(&rev_info.diffopt, result);
2453 }
2454
2455 /**
2456 * Returns 1 if there are uncommitted changes, 0 otherwise.
2457 */
2458 int has_uncommitted_changes(struct repository *r,
2459 int ignore_submodules)
2460 {
2461 struct rev_info rev_info;
2462 int result;
2463
2464 if (is_index_unborn(r->index))
2465 return 0;
2466
2467 repo_init_revisions(r, &rev_info, NULL);
2468 if (ignore_submodules)
2469 rev_info.diffopt.flags.ignore_submodules = 1;
2470 rev_info.diffopt.flags.quick = 1;
2471
2472 add_head_to_pending(&rev_info);
2473 if (!rev_info.pending.nr) {
2474 /*
2475 * We have no head (or it's corrupt); use the empty tree,
2476 * which will complain if the index is non-empty.
2477 */
2478 struct tree *tree = lookup_tree(r, the_hash_algo->empty_tree);
2479 add_pending_object(&rev_info, &tree->object, "");
2480 }
2481
2482 diff_setup_done(&rev_info.diffopt);
2483 result = run_diff_index(&rev_info, 1);
2484 return diff_result_code(&rev_info.diffopt, result);
2485 }
2486
2487 /**
2488 * If the work tree has unstaged or uncommitted changes, dies with the
2489 * appropriate message.
2490 */
2491 int require_clean_work_tree(struct repository *r,
2492 const char *action,
2493 const char *hint,
2494 int ignore_submodules,
2495 int gently)
2496 {
2497 struct lock_file lock_file = LOCK_INIT;
2498 int err = 0, fd;
2499
2500 fd = repo_hold_locked_index(r, &lock_file, 0);
2501 refresh_index(r->index, REFRESH_QUIET, NULL, NULL, NULL);
2502 if (0 <= fd)
2503 repo_update_index_if_able(r, &lock_file);
2504 rollback_lock_file(&lock_file);
2505
2506 if (has_unstaged_changes(r, ignore_submodules)) {
2507 /* TRANSLATORS: the action is e.g. "pull with rebase" */
2508 error(_("cannot %s: You have unstaged changes."), _(action));
2509 err = 1;
2510 }
2511
2512 if (has_uncommitted_changes(r, ignore_submodules)) {
2513 if (err)
2514 error(_("additionally, your index contains uncommitted changes."));
2515 else
2516 error(_("cannot %s: Your index contains uncommitted changes."),
2517 _(action));
2518 err = 1;
2519 }
2520
2521 if (err) {
2522 if (hint)
2523 error("%s", hint);
2524 if (!gently)
2525 exit(128);
2526 }
2527
2528 return err;
2529 }
The Best VCS Around