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