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