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