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