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