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