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