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