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