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