?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
Skip tests that fail due to incomplete implementations, missing tools...
[git/mingw/j6t.git] / wt-status.c
blob435fc2806ec0a59acf390ee89ed2efc79f229a0e
1 #include "cache.h"
2 #include "wt-status.h"
3 #include "object.h"
4 #include "dir.h"
5 #include "commit.h"
6 #include "diff.h"
7 #include "revision.h"
8 #include "diffcore.h"
9 #include "quote.h"
10 #include "run-command.h"
11 #include "argv-array.h"
12 #include "remote.h"
13 #include "refs.h"
14 #include "submodule.h"
15 #include "column.h"
16 #include "strbuf.h"
17 #include "utf8.h"
18
19 static const char cut_line[] =
20 "------------------------ >8 ------------------------\n";
21
22 static char default_wt_status_colors[][COLOR_MAXLEN] = {
23 GIT_COLOR_NORMAL, /* WT_STATUS_HEADER */
24 GIT_COLOR_GREEN, /* WT_STATUS_UPDATED */
25 GIT_COLOR_RED, /* WT_STATUS_CHANGED */
26 GIT_COLOR_RED, /* WT_STATUS_UNTRACKED */
27 GIT_COLOR_RED, /* WT_STATUS_NOBRANCH */
28 GIT_COLOR_RED, /* WT_STATUS_UNMERGED */
29 GIT_COLOR_GREEN, /* WT_STATUS_LOCAL_BRANCH */
30 GIT_COLOR_RED, /* WT_STATUS_REMOTE_BRANCH */
31 GIT_COLOR_NIL, /* WT_STATUS_ONBRANCH */
32 };
33
34 static const char *color(int slot, struct wt_status *s)
35 {
36 const char *c = "";
37 if (want_color(s->use_color))
38 c = s->color_palette[slot];
39 if (slot == WT_STATUS_ONBRANCH && color_is_nil(c))
40 c = s->color_palette[WT_STATUS_HEADER];
41 return c;
42 }
43
44 static void status_vprintf(struct wt_status *s, int at_bol, const char *color,
45 const char *fmt, va_list ap, const char *trail)
46 {
47 struct strbuf sb = STRBUF_INIT;
48 struct strbuf linebuf = STRBUF_INIT;
49 const char *line, *eol;
50
51 strbuf_vaddf(&sb, fmt, ap);
52 if (!sb.len) {
53 if (s->display_comment_prefix) {
54 strbuf_addch(&sb, comment_line_char);
55 if (!trail)
56 strbuf_addch(&sb, ' ');
57 }
58 color_print_strbuf(s->fp, color, &sb);
59 if (trail)
60 fprintf(s->fp, "%s", trail);
61 strbuf_release(&sb);
62 return;
63 }
64 for (line = sb.buf; *line; line = eol + 1) {
65 eol = strchr(line, '\n');
66
67 strbuf_reset(&linebuf);
68 if (at_bol && s->display_comment_prefix) {
69 strbuf_addch(&linebuf, comment_line_char);
70 if (*line != '\n' && *line != '\t')
71 strbuf_addch(&linebuf, ' ');
72 }
73 if (eol)
74 strbuf_add(&linebuf, line, eol - line);
75 else
76 strbuf_addstr(&linebuf, line);
77 color_print_strbuf(s->fp, color, &linebuf);
78 if (eol)
79 fprintf(s->fp, "\n");
80 else
81 break;
82 at_bol = 1;
83 }
84 if (trail)
85 fprintf(s->fp, "%s", trail);
86 strbuf_release(&linebuf);
87 strbuf_release(&sb);
88 }
89
90 void status_printf_ln(struct wt_status *s, const char *color,
91 const char *fmt, ...)
92 {
93 va_list ap;
94
95 va_start(ap, fmt);
96 status_vprintf(s, 1, color, fmt, ap, "\n");
97 va_end(ap);
98 }
99
100 void status_printf(struct wt_status *s, const char *color,
101 const char *fmt, ...)
102 {
103 va_list ap;
104
105 va_start(ap, fmt);
106 status_vprintf(s, 1, color, fmt, ap, NULL);
107 va_end(ap);
108 }
109
110 static void status_printf_more(struct wt_status *s, const char *color,
111 const char *fmt, ...)
112 {
113 va_list ap;
114
115 va_start(ap, fmt);
116 status_vprintf(s, 0, color, fmt, ap, NULL);
117 va_end(ap);
118 }
119
120 void wt_status_prepare(struct wt_status *s)
121 {
122 unsigned char sha1[20];
123
124 memset(s, 0, sizeof(*s));
125 memcpy(s->color_palette, default_wt_status_colors,
126 sizeof(default_wt_status_colors));
127 s->show_untracked_files = SHOW_NORMAL_UNTRACKED_FILES;
128 s->use_color = -1;
129 s->relative_paths = 1;
130 s->branch = resolve_refdup("HEAD", 0, sha1, NULL);
131 s->reference = "HEAD";
132 s->fp = stdout;
133 s->index_file = get_index_file();
134 s->change.strdup_strings = 1;
135 s->untracked.strdup_strings = 1;
136 s->ignored.strdup_strings = 1;
137 s->show_branch = -1; /* unspecified */
138 s->display_comment_prefix = 0;
139 }
140
141 static void wt_status_print_unmerged_header(struct wt_status *s)
142 {
143 int i;
144 int del_mod_conflict = 0;
145 int both_deleted = 0;
146 int not_deleted = 0;
147 const char *c = color(WT_STATUS_HEADER, s);
148
149 status_printf_ln(s, c, _("Unmerged paths:"));
150
151 for (i = 0; i < s->change.nr; i++) {
152 struct string_list_item *it = &(s->change.items[i]);
153 struct wt_status_change_data *d = it->util;
154
155 switch (d->stagemask) {
156 case 0:
157 break;
158 case 1:
159 both_deleted = 1;
160 break;
161 case 3:
162 case 5:
163 del_mod_conflict = 1;
164 break;
165 default:
166 not_deleted = 1;
167 break;
168 }
169 }
170
171 if (!s->hints)
172 return;
173 if (s->whence != FROM_COMMIT)
174 ;
175 else if (!s->is_initial)
176 status_printf_ln(s, c, _(" (use \"git reset %s <file>...\" to unstage)"), s->reference);
177 else
178 status_printf_ln(s, c, _(" (use \"git rm --cached <file>...\" to unstage)"));
179
180 if (!both_deleted) {
181 if (!del_mod_conflict)
182 status_printf_ln(s, c, _(" (use \"git add <file>...\" to mark resolution)"));
183 else
184 status_printf_ln(s, c, _(" (use \"git add/rm <file>...\" as appropriate to mark resolution)"));
185 } else if (!del_mod_conflict && !not_deleted) {
186 status_printf_ln(s, c, _(" (use \"git rm <file>...\" to mark resolution)"));
187 } else {
188 status_printf_ln(s, c, _(" (use \"git add/rm <file>...\" as appropriate to mark resolution)"));
189 }
190 status_printf_ln(s, c, "%s", "");
191 }
192
193 static void wt_status_print_cached_header(struct wt_status *s)
194 {
195 const char *c = color(WT_STATUS_HEADER, s);
196
197 status_printf_ln(s, c, _("Changes to be committed:"));
198 if (!s->hints)
199 return;
200 if (s->whence != FROM_COMMIT)
201 ; /* NEEDSWORK: use "git reset --unresolve"??? */
202 else if (!s->is_initial)
203 status_printf_ln(s, c, _(" (use \"git reset %s <file>...\" to unstage)"), s->reference);
204 else
205 status_printf_ln(s, c, _(" (use \"git rm --cached <file>...\" to unstage)"));
206 status_printf_ln(s, c, "%s", "");
207 }
208
209 static void wt_status_print_dirty_header(struct wt_status *s,
210 int has_deleted,
211 int has_dirty_submodules)
212 {
213 const char *c = color(WT_STATUS_HEADER, s);
214
215 status_printf_ln(s, c, _("Changes not staged for commit:"));
216 if (!s->hints)
217 return;
218 if (!has_deleted)
219 status_printf_ln(s, c, _(" (use \"git add <file>...\" to update what will be committed)"));
220 else
221 status_printf_ln(s, c, _(" (use \"git add/rm <file>...\" to update what will be committed)"));
222 status_printf_ln(s, c, _(" (use \"git checkout -- <file>...\" to discard changes in working directory)"));
223 if (has_dirty_submodules)
224 status_printf_ln(s, c, _(" (commit or discard the untracked or modified content in submodules)"));
225 status_printf_ln(s, c, "%s", "");
226 }
227
228 static void wt_status_print_other_header(struct wt_status *s,
229 const char *what,
230 const char *how)
231 {
232 const char *c = color(WT_STATUS_HEADER, s);
233 status_printf_ln(s, c, "%s:", what);
234 if (!s->hints)
235 return;
236 status_printf_ln(s, c, _(" (use \"git %s <file>...\" to include in what will be committed)"), how);
237 status_printf_ln(s, c, "%s", "");
238 }
239
240 static void wt_status_print_trailer(struct wt_status *s)
241 {
242 status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", "");
243 }
244
245 #define quote_path quote_path_relative
246
247 static const char *wt_status_unmerged_status_string(int stagemask)
248 {
249 switch (stagemask) {
250 case 1:
251 return _("both deleted:");
252 case 2:
253 return _("added by us:");
254 case 3:
255 return _("deleted by them:");
256 case 4:
257 return _("added by them:");
258 case 5:
259 return _("deleted by us:");
260 case 6:
261 return _("both added:");
262 case 7:
263 return _("both modified:");
264 default:
265 die(_("bug: unhandled unmerged status %x"), stagemask);
266 }
267 }
268
269 static const char *wt_status_diff_status_string(int status)
270 {
271 switch (status) {
272 case DIFF_STATUS_ADDED:
273 return _("new file:");
274 case DIFF_STATUS_COPIED:
275 return _("copied:");
276 case DIFF_STATUS_DELETED:
277 return _("deleted:");
278 case DIFF_STATUS_MODIFIED:
279 return _("modified:");
280 case DIFF_STATUS_RENAMED:
281 return _("renamed:");
282 case DIFF_STATUS_TYPE_CHANGED:
283 return _("typechange:");
284 case DIFF_STATUS_UNKNOWN:
285 return _("unknown:");
286 case DIFF_STATUS_UNMERGED:
287 return _("unmerged:");
288 default:
289 return NULL;
290 }
291 }
292
293 static int maxwidth(const char *(*label)(int), int minval, int maxval)
294 {
295 int result = 0, i;
296
297 for (i = minval; i <= maxval; i++) {
298 const char *s = label(i);
299 int len = s ? utf8_strwidth(s) : 0;
300 if (len > result)
301 result = len;
302 }
303 return result;
304 }
305
306 static void wt_status_print_unmerged_data(struct wt_status *s,
307 struct string_list_item *it)
308 {
309 const char *c = color(WT_STATUS_UNMERGED, s);
310 struct wt_status_change_data *d = it->util;
311 struct strbuf onebuf = STRBUF_INIT;
312 static char *padding;
313 static int label_width;
314 const char *one, *how;
315 int len;
316
317 if (!padding) {
318 label_width = maxwidth(wt_status_unmerged_status_string, 1, 7);
319 label_width += strlen(" ");
320 padding = xmallocz(label_width);
321 memset(padding, ' ', label_width);
322 }
323
324 one = quote_path(it->string, s->prefix, &onebuf);
325 status_printf(s, color(WT_STATUS_HEADER, s), "\t");
326
327 how = wt_status_unmerged_status_string(d->stagemask);
328 len = label_width - utf8_strwidth(how);
329 status_printf_more(s, c, "%s%.*s%s\n", how, len, padding, one);
330 strbuf_release(&onebuf);
331 }
332
333 static void wt_status_print_change_data(struct wt_status *s,
334 int change_type,
335 struct string_list_item *it)
336 {
337 struct wt_status_change_data *d = it->util;
338 const char *c = color(change_type, s);
339 int status;
340 char *one_name;
341 char *two_name;
342 const char *one, *two;
343 struct strbuf onebuf = STRBUF_INIT, twobuf = STRBUF_INIT;
344 struct strbuf extra = STRBUF_INIT;
345 static char *padding;
346 static int label_width;
347 const char *what;
348 int len;
349
350 if (!padding) {
351 /* If DIFF_STATUS_* uses outside the range [A..Z], we're in trouble */
352 label_width = maxwidth(wt_status_diff_status_string, 'A', 'Z');
353 label_width += strlen(" ");
354 padding = xmallocz(label_width);
355 memset(padding, ' ', label_width);
356 }
357
358 one_name = two_name = it->string;
359 switch (change_type) {
360 case WT_STATUS_UPDATED:
361 status = d->index_status;
362 if (d->head_path)
363 one_name = d->head_path;
364 break;
365 case WT_STATUS_CHANGED:
366 if (d->new_submodule_commits || d->dirty_submodule) {
367 strbuf_addstr(&extra, " (");
368 if (d->new_submodule_commits)
369 strbuf_addf(&extra, _("new commits, "));
370 if (d->dirty_submodule & DIRTY_SUBMODULE_MODIFIED)
371 strbuf_addf(&extra, _("modified content, "));
372 if (d->dirty_submodule & DIRTY_SUBMODULE_UNTRACKED)
373 strbuf_addf(&extra, _("untracked content, "));
374 strbuf_setlen(&extra, extra.len - 2);
375 strbuf_addch(&extra, ')');
376 }
377 status = d->worktree_status;
378 break;
379 default:
380 die("BUG: unhandled change_type %d in wt_status_print_change_data",
381 change_type);
382 }
383
384 one = quote_path(one_name, s->prefix, &onebuf);
385 two = quote_path(two_name, s->prefix, &twobuf);
386
387 status_printf(s, color(WT_STATUS_HEADER, s), "\t");
388 what = wt_status_diff_status_string(status);
389 if (!what)
390 die(_("bug: unhandled diff status %c"), status);
391 len = label_width - utf8_strwidth(what);
392 assert(len >= 0);
393 if (status == DIFF_STATUS_COPIED || status == DIFF_STATUS_RENAMED)
394 status_printf_more(s, c, "%s%.*s%s -> %s",
395 what, len, padding, one, two);
396 else
397 status_printf_more(s, c, "%s%.*s%s",
398 what, len, padding, one);
399 if (extra.len) {
400 status_printf_more(s, color(WT_STATUS_HEADER, s), "%s", extra.buf);
401 strbuf_release(&extra);
402 }
403 status_printf_more(s, GIT_COLOR_NORMAL, "\n");
404 strbuf_release(&onebuf);
405 strbuf_release(&twobuf);
406 }
407
408 static void wt_status_collect_changed_cb(struct diff_queue_struct *q,
409 struct diff_options *options,
410 void *data)
411 {
412 struct wt_status *s = data;
413 int i;
414
415 if (!q->nr)
416 return;
417 s->workdir_dirty = 1;
418 for (i = 0; i < q->nr; i++) {
419 struct diff_filepair *p;
420 struct string_list_item *it;
421 struct wt_status_change_data *d;
422
423 p = q->queue[i];
424 it = string_list_insert(&s->change, p->one->path);
425 d = it->util;
426 if (!d) {
427 d = xcalloc(1, sizeof(*d));
428 it->util = d;
429 }
430 if (!d->worktree_status)
431 d->worktree_status = p->status;
432 d->dirty_submodule = p->two->dirty_submodule;
433 if (S_ISGITLINK(p->two->mode))
434 d->new_submodule_commits = !!hashcmp(p->one->sha1, p->two->sha1);
435 }
436 }
437
438 static int unmerged_mask(const char *path)
439 {
440 int pos, mask;
441 const struct cache_entry *ce;
442
443 pos = cache_name_pos(path, strlen(path));
444 if (0 <= pos)
445 return 0;
446
447 mask = 0;
448 pos = -pos-1;
449 while (pos < active_nr) {
450 ce = active_cache[pos++];
451 if (strcmp(ce->name, path) || !ce_stage(ce))
452 break;
453 mask |= (1 << (ce_stage(ce) - 1));
454 }
455 return mask;
456 }
457
458 static void wt_status_collect_updated_cb(struct diff_queue_struct *q,
459 struct diff_options *options,
460 void *data)
461 {
462 struct wt_status *s = data;
463 int i;
464
465 for (i = 0; i < q->nr; i++) {
466 struct diff_filepair *p;
467 struct string_list_item *it;
468 struct wt_status_change_data *d;
469
470 p = q->queue[i];
471 it = string_list_insert(&s->change, p->two->path);
472 d = it->util;
473 if (!d) {
474 d = xcalloc(1, sizeof(*d));
475 it->util = d;
476 }
477 if (!d->index_status)
478 d->index_status = p->status;
479 switch (p->status) {
480 case DIFF_STATUS_COPIED:
481 case DIFF_STATUS_RENAMED:
482 d->head_path = xstrdup(p->one->path);
483 break;
484 case DIFF_STATUS_UNMERGED:
485 d->stagemask = unmerged_mask(p->two->path);
486 break;
487 }
488 }
489 }
490
491 static void wt_status_collect_changes_worktree(struct wt_status *s)
492 {
493 struct rev_info rev;
494
495 init_revisions(&rev, NULL);
496 setup_revisions(0, NULL, &rev, NULL);
497 rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
498 DIFF_OPT_SET(&rev.diffopt, DIRTY_SUBMODULES);
499 if (!s->show_untracked_files)
500 DIFF_OPT_SET(&rev.diffopt, IGNORE_UNTRACKED_IN_SUBMODULES);
501 if (s->ignore_submodule_arg) {
502 DIFF_OPT_SET(&rev.diffopt, OVERRIDE_SUBMODULE_CONFIG);
503 handle_ignore_submodules_arg(&rev.diffopt, s->ignore_submodule_arg);
504 }
505 rev.diffopt.format_callback = wt_status_collect_changed_cb;
506 rev.diffopt.format_callback_data = s;
507 copy_pathspec(&rev.prune_data, &s->pathspec);
508 run_diff_files(&rev, 0);
509 }
510
511 static void wt_status_collect_changes_index(struct wt_status *s)
512 {
513 struct rev_info rev;
514 struct setup_revision_opt opt;
515
516 init_revisions(&rev, NULL);
517 memset(&opt, 0, sizeof(opt));
518 opt.def = s->is_initial ? EMPTY_TREE_SHA1_HEX : s->reference;
519 setup_revisions(0, NULL, &rev, &opt);
520
521 DIFF_OPT_SET(&rev.diffopt, OVERRIDE_SUBMODULE_CONFIG);
522 if (s->ignore_submodule_arg) {
523 handle_ignore_submodules_arg(&rev.diffopt, s->ignore_submodule_arg);
524 } else {
525 /*
526 * Unless the user did explicitly request a submodule ignore
527 * mode by passing a command line option we do not ignore any
528 * changed submodule SHA-1s when comparing index and HEAD, no
529 * matter what is configured. Otherwise the user won't be
530 * shown any submodules she manually added (and which are
531 * staged to be committed), which would be really confusing.
532 */
533 handle_ignore_submodules_arg(&rev.diffopt, "dirty");
534 }
535
536 rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
537 rev.diffopt.format_callback = wt_status_collect_updated_cb;
538 rev.diffopt.format_callback_data = s;
539 rev.diffopt.detect_rename = 1;
540 rev.diffopt.rename_limit = 200;
541 rev.diffopt.break_opt = 0;
542 copy_pathspec(&rev.prune_data, &s->pathspec);
543 run_diff_index(&rev, 1);
544 }
545
546 static void wt_status_collect_changes_initial(struct wt_status *s)
547 {
548 int i;
549
550 for (i = 0; i < active_nr; i++) {
551 struct string_list_item *it;
552 struct wt_status_change_data *d;
553 const struct cache_entry *ce = active_cache[i];
554
555 if (!ce_path_match(ce, &s->pathspec, NULL))
556 continue;
557 it = string_list_insert(&s->change, ce->name);
558 d = it->util;
559 if (!d) {
560 d = xcalloc(1, sizeof(*d));
561 it->util = d;
562 }
563 if (ce_stage(ce)) {
564 d->index_status = DIFF_STATUS_UNMERGED;
565 d->stagemask |= (1 << (ce_stage(ce) - 1));
566 }
567 else
568 d->index_status = DIFF_STATUS_ADDED;
569 }
570 }
571
572 static void wt_status_collect_untracked(struct wt_status *s)
573 {
574 int i;
575 struct dir_struct dir;
576 uint64_t t_begin = getnanotime();
577
578 if (!s->show_untracked_files)
579 return;
580
581 memset(&dir, 0, sizeof(dir));
582 if (s->show_untracked_files != SHOW_ALL_UNTRACKED_FILES)
583 dir.flags |=
584 DIR_SHOW_OTHER_DIRECTORIES | DIR_HIDE_EMPTY_DIRECTORIES;
585 if (s->show_ignored_files)
586 dir.flags |= DIR_SHOW_IGNORED_TOO;
587 else
588 dir.untracked = the_index.untracked;
589 setup_standard_excludes(&dir);
590
591 fill_directory(&dir, &s->pathspec);
592
593 for (i = 0; i < dir.nr; i++) {
594 struct dir_entry *ent = dir.entries[i];
595 if (cache_name_is_other(ent->name, ent->len) &&
596 dir_path_match(ent, &s->pathspec, 0, NULL))
597 string_list_insert(&s->untracked, ent->name);
598 free(ent);
599 }
600
601 for (i = 0; i < dir.ignored_nr; i++) {
602 struct dir_entry *ent = dir.ignored[i];
603 if (cache_name_is_other(ent->name, ent->len) &&
604 dir_path_match(ent, &s->pathspec, 0, NULL))
605 string_list_insert(&s->ignored, ent->name);
606 free(ent);
607 }
608
609 free(dir.entries);
610 free(dir.ignored);
611 clear_directory(&dir);
612
613 if (advice_status_u_option)
614 s->untracked_in_ms = (getnanotime() - t_begin) / 1000000;
615 }
616
617 void wt_status_collect(struct wt_status *s)
618 {
619 wt_status_collect_changes_worktree(s);
620
621 if (s->is_initial)
622 wt_status_collect_changes_initial(s);
623 else
624 wt_status_collect_changes_index(s);
625 wt_status_collect_untracked(s);
626 }
627
628 static void wt_status_print_unmerged(struct wt_status *s)
629 {
630 int shown_header = 0;
631 int i;
632
633 for (i = 0; i < s->change.nr; i++) {
634 struct wt_status_change_data *d;
635 struct string_list_item *it;
636 it = &(s->change.items[i]);
637 d = it->util;
638 if (!d->stagemask)
639 continue;
640 if (!shown_header) {
641 wt_status_print_unmerged_header(s);
642 shown_header = 1;
643 }
644 wt_status_print_unmerged_data(s, it);
645 }
646 if (shown_header)
647 wt_status_print_trailer(s);
648
649 }
650
651 static void wt_status_print_updated(struct wt_status *s)
652 {
653 int shown_header = 0;
654 int i;
655
656 for (i = 0; i < s->change.nr; i++) {
657 struct wt_status_change_data *d;
658 struct string_list_item *it;
659 it = &(s->change.items[i]);
660 d = it->util;
661 if (!d->index_status ||
662 d->index_status == DIFF_STATUS_UNMERGED)
663 continue;
664 if (!shown_header) {
665 wt_status_print_cached_header(s);
666 s->commitable = 1;
667 shown_header = 1;
668 }
669 wt_status_print_change_data(s, WT_STATUS_UPDATED, it);
670 }
671 if (shown_header)
672 wt_status_print_trailer(s);
673 }
674
675 /*
676 * -1 : has delete
677 * 0 : no change
678 * 1 : some change but no delete
679 */
680 static int wt_status_check_worktree_changes(struct wt_status *s,
681 int *dirty_submodules)
682 {
683 int i;
684 int changes = 0;
685
686 *dirty_submodules = 0;
687
688 for (i = 0; i < s->change.nr; i++) {
689 struct wt_status_change_data *d;
690 d = s->change.items[i].util;
691 if (!d->worktree_status ||
692 d->worktree_status == DIFF_STATUS_UNMERGED)
693 continue;
694 if (!changes)
695 changes = 1;
696 if (d->dirty_submodule)
697 *dirty_submodules = 1;
698 if (d->worktree_status == DIFF_STATUS_DELETED)
699 changes = -1;
700 }
701 return changes;
702 }
703
704 static void wt_status_print_changed(struct wt_status *s)
705 {
706 int i, dirty_submodules;
707 int worktree_changes = wt_status_check_worktree_changes(s, &dirty_submodules);
708
709 if (!worktree_changes)
710 return;
711
712 wt_status_print_dirty_header(s, worktree_changes < 0, dirty_submodules);
713
714 for (i = 0; i < s->change.nr; i++) {
715 struct wt_status_change_data *d;
716 struct string_list_item *it;
717 it = &(s->change.items[i]);
718 d = it->util;
719 if (!d->worktree_status ||
720 d->worktree_status == DIFF_STATUS_UNMERGED)
721 continue;
722 wt_status_print_change_data(s, WT_STATUS_CHANGED, it);
723 }
724 wt_status_print_trailer(s);
725 }
726
727 static void wt_status_print_submodule_summary(struct wt_status *s, int uncommitted)
728 {
729 struct child_process sm_summary = CHILD_PROCESS_INIT;
730 struct strbuf cmd_stdout = STRBUF_INIT;
731 struct strbuf summary = STRBUF_INIT;
732 char *summary_content;
733
734 argv_array_pushf(&sm_summary.env_array, "GIT_INDEX_FILE=%s",
735 s->index_file);
736
737 argv_array_push(&sm_summary.args, "submodule");
738 argv_array_push(&sm_summary.args, "summary");
739 argv_array_push(&sm_summary.args, uncommitted ? "--files" : "--cached");
740 argv_array_push(&sm_summary.args, "--for-status");
741 argv_array_push(&sm_summary.args, "--summary-limit");
742 argv_array_pushf(&sm_summary.args, "%d", s->submodule_summary);
743 if (!uncommitted)
744 argv_array_push(&sm_summary.args, s->amend ? "HEAD^" : "HEAD");
745
746 sm_summary.git_cmd = 1;
747 sm_summary.no_stdin = 1;
748
749 capture_command(&sm_summary, &cmd_stdout, 1024);
750
751 /* prepend header, only if there's an actual output */
752 if (cmd_stdout.len) {
753 if (uncommitted)
754 strbuf_addstr(&summary, _("Submodules changed but not updated:"));
755 else
756 strbuf_addstr(&summary, _("Submodule changes to be committed:"));
757 strbuf_addstr(&summary, "\n\n");
758 }
759 strbuf_addbuf(&summary, &cmd_stdout);
760 strbuf_release(&cmd_stdout);
761
762 if (s->display_comment_prefix) {
763 size_t len;
764 summary_content = strbuf_detach(&summary, &len);
765 strbuf_add_commented_lines(&summary, summary_content, len);
766 free(summary_content);
767 }
768
769 fputs(summary.buf, s->fp);
770 strbuf_release(&summary);
771 }
772
773 static void wt_status_print_other(struct wt_status *s,
774 struct string_list *l,
775 const char *what,
776 const char *how)
777 {
778 int i;
779 struct strbuf buf = STRBUF_INIT;
780 static struct string_list output = STRING_LIST_INIT_DUP;
781 struct column_options copts;
782
783 if (!l->nr)
784 return;
785
786 wt_status_print_other_header(s, what, how);
787
788 for (i = 0; i < l->nr; i++) {
789 struct string_list_item *it;
790 const char *path;
791 it = &(l->items[i]);
792 path = quote_path(it->string, s->prefix, &buf);
793 if (column_active(s->colopts)) {
794 string_list_append(&output, path);
795 continue;
796 }
797 status_printf(s, color(WT_STATUS_HEADER, s), "\t");
798 status_printf_more(s, color(WT_STATUS_UNTRACKED, s),
799 "%s\n", path);
800 }
801
802 strbuf_release(&buf);
803 if (!column_active(s->colopts))
804 goto conclude;
805
806 strbuf_addf(&buf, "%s%s\t%s",
807 color(WT_STATUS_HEADER, s),
808 s->display_comment_prefix ? "#" : "",
809 color(WT_STATUS_UNTRACKED, s));
810 memset(&copts, 0, sizeof(copts));
811 copts.padding = 1;
812 copts.indent = buf.buf;
813 if (want_color(s->use_color))
814 copts.nl = GIT_COLOR_RESET "\n";
815 print_columns(&output, s->colopts, &copts);
816 string_list_clear(&output, 0);
817 strbuf_release(&buf);
818 conclude:
819 status_printf_ln(s, GIT_COLOR_NORMAL, "%s", "");
820 }
821
822 void wt_status_truncate_message_at_cut_line(struct strbuf *buf)
823 {
824 const char *p;
825 struct strbuf pattern = STRBUF_INIT;
826
827 strbuf_addf(&pattern, "\n%c %s", comment_line_char, cut_line);
828 if (starts_with(buf->buf, pattern.buf + 1))
829 strbuf_setlen(buf, 0);
830 else if ((p = strstr(buf->buf, pattern.buf)))
831 strbuf_setlen(buf, p - buf->buf + 1);
832 strbuf_release(&pattern);
833 }
834
835 void wt_status_add_cut_line(FILE *fp)
836 {
837 const char *explanation = _("Do not touch the line above.\nEverything below will be removed.");
838 struct strbuf buf = STRBUF_INIT;
839
840 fprintf(fp, "%c %s", comment_line_char, cut_line);
841 strbuf_add_commented_lines(&buf, explanation, strlen(explanation));
842 fputs(buf.buf, fp);
843 strbuf_release(&buf);
844 }
845
846 static void wt_status_print_verbose(struct wt_status *s)
847 {
848 struct rev_info rev;
849 struct setup_revision_opt opt;
850 int dirty_submodules;
851 const char *c = color(WT_STATUS_HEADER, s);
852
853 init_revisions(&rev, NULL);
854 DIFF_OPT_SET(&rev.diffopt, ALLOW_TEXTCONV);
855
856 memset(&opt, 0, sizeof(opt));
857 opt.def = s->is_initial ? EMPTY_TREE_SHA1_HEX : s->reference;
858 setup_revisions(0, NULL, &rev, &opt);
859
860 rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
861 rev.diffopt.detect_rename = 1;
862 rev.diffopt.file = s->fp;
863 rev.diffopt.close_file = 0;
864 /*
865 * If we're not going to stdout, then we definitely don't
866 * want color, since we are going to the commit message
867 * file (and even the "auto" setting won't work, since it
868 * will have checked isatty on stdout). But we then do want
869 * to insert the scissor line here to reliably remove the
870 * diff before committing.
871 */
872 if (s->fp != stdout) {
873 rev.diffopt.use_color = 0;
874 wt_status_add_cut_line(s->fp);
875 }
876 if (s->verbose > 1 && s->commitable) {
877 /* print_updated() printed a header, so do we */
878 if (s->fp != stdout)
879 wt_status_print_trailer(s);
880 status_printf_ln(s, c, _("Changes to be committed:"));
881 rev.diffopt.a_prefix = "c/";
882 rev.diffopt.b_prefix = "i/";
883 } /* else use prefix as per user config */
884 run_diff_index(&rev, 1);
885 if (s->verbose > 1 &&
886 wt_status_check_worktree_changes(s, &dirty_submodules)) {
887 status_printf_ln(s, c,
888 "--------------------------------------------------");
889 status_printf_ln(s, c, _("Changes not staged for commit:"));
890 setup_work_tree();
891 rev.diffopt.a_prefix = "i/";
892 rev.diffopt.b_prefix = "w/";
893 run_diff_files(&rev, 0);
894 }
895 }
896
897 static void wt_status_print_tracking(struct wt_status *s)
898 {
899 struct strbuf sb = STRBUF_INIT;
900 const char *cp, *ep, *branch_name;
901 struct branch *branch;
902 char comment_line_string[3];
903 int i;
904
905 assert(s->branch && !s->is_initial);
906 if (!skip_prefix(s->branch, "refs/heads/", &branch_name))
907 return;
908 branch = branch_get(branch_name);
909 if (!format_tracking_info(branch, &sb))
910 return;
911
912 i = 0;
913 if (s->display_comment_prefix) {
914 comment_line_string[i++] = comment_line_char;
915 comment_line_string[i++] = ' ';
916 }
917 comment_line_string[i] = '\0';
918
919 for (cp = sb.buf; (ep = strchr(cp, '\n')) != NULL; cp = ep + 1)
920 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s),
921 "%s%.*s", comment_line_string,
922 (int)(ep - cp), cp);
923 if (s->display_comment_prefix)
924 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s), "%c",
925 comment_line_char);
926 else
927 fputs("", s->fp);
928 }
929
930 static int has_unmerged(struct wt_status *s)
931 {
932 int i;
933
934 for (i = 0; i < s->change.nr; i++) {
935 struct wt_status_change_data *d;
936 d = s->change.items[i].util;
937 if (d->stagemask)
938 return 1;
939 }
940 return 0;
941 }
942
943 static void show_merge_in_progress(struct wt_status *s,
944 struct wt_status_state *state,
945 const char *color)
946 {
947 if (has_unmerged(s)) {
948 status_printf_ln(s, color, _("You have unmerged paths."));
949 if (s->hints)
950 status_printf_ln(s, color,
951 _(" (fix conflicts and run \"git commit\")"));
952 } else {
953 status_printf_ln(s, color,
954 _("All conflicts fixed but you are still merging."));
955 if (s->hints)
956 status_printf_ln(s, color,
957 _(" (use \"git commit\" to conclude merge)"));
958 }
959 wt_status_print_trailer(s);
960 }
961
962 static void show_am_in_progress(struct wt_status *s,
963 struct wt_status_state *state,
964 const char *color)
965 {
966 status_printf_ln(s, color,
967 _("You are in the middle of an am session."));
968 if (state->am_empty_patch)
969 status_printf_ln(s, color,
970 _("The current patch is empty."));
971 if (s->hints) {
972 if (!state->am_empty_patch)
973 status_printf_ln(s, color,
974 _(" (fix conflicts and then run \"git am --continue\")"));
975 status_printf_ln(s, color,
976 _(" (use \"git am --skip\" to skip this patch)"));
977 status_printf_ln(s, color,
978 _(" (use \"git am --abort\" to restore the original branch)"));
979 }
980 wt_status_print_trailer(s);
981 }
982
983 static char *read_line_from_git_path(const char *filename)
984 {
985 struct strbuf buf = STRBUF_INIT;
986 FILE *fp = fopen(git_path("%s", filename), "r");
987 if (!fp) {
988 strbuf_release(&buf);
989 return NULL;
990 }
991 strbuf_getline(&buf, fp, '\n');
992 if (!fclose(fp)) {
993 return strbuf_detach(&buf, NULL);
994 } else {
995 strbuf_release(&buf);
996 return NULL;
997 }
998 }
999
1000 static int split_commit_in_progress(struct wt_status *s)
1001 {
1002 int split_in_progress = 0;
1003 char *head = read_line_from_git_path("HEAD");
1004 char *orig_head = read_line_from_git_path("ORIG_HEAD");
1005 char *rebase_amend = read_line_from_git_path("rebase-merge/amend");
1006 char *rebase_orig_head = read_line_from_git_path("rebase-merge/orig-head");
1007
1008 if (!head || !orig_head || !rebase_amend || !rebase_orig_head ||
1009 !s->branch || strcmp(s->branch, "HEAD"))
1010 return split_in_progress;
1011
1012 if (!strcmp(rebase_amend, rebase_orig_head)) {
1013 if (strcmp(head, rebase_amend))
1014 split_in_progress = 1;
1015 } else if (strcmp(orig_head, rebase_orig_head)) {
1016 split_in_progress = 1;
1017 }
1018
1019 if (!s->amend && !s->nowarn && !s->workdir_dirty)
1020 split_in_progress = 0;
1021
1022 free(head);
1023 free(orig_head);
1024 free(rebase_amend);
1025 free(rebase_orig_head);
1026 return split_in_progress;
1027 }
1028
1029 /*
1030 * Turn
1031 * "pick d6a2f0303e897ec257dd0e0a39a5ccb709bc2047 some message"
1032 * into
1033 * "pick d6a2f03 some message"
1034 *
1035 * The function assumes that the line does not contain useless spaces
1036 * before or after the command.
1037 */
1038 static void abbrev_sha1_in_line(struct strbuf *line)
1039 {
1040 struct strbuf **split;
1041 int i;
1042
1043 if (starts_with(line->buf, "exec ") ||
1044 starts_with(line->buf, "x "))
1045 return;
1046
1047 split = strbuf_split_max(line, ' ', 3);
1048 if (split[0] && split[1]) {
1049 unsigned char sha1[20];
1050 const char *abbrev;
1051
1052 /*
1053 * strbuf_split_max left a space. Trim it and re-add
1054 * it after abbreviation.
1055 */
1056 strbuf_trim(split[1]);
1057 if (!get_sha1(split[1]->buf, sha1)) {
1058 abbrev = find_unique_abbrev(sha1, DEFAULT_ABBREV);
1059 strbuf_reset(split[1]);
1060 strbuf_addf(split[1], "%s ", abbrev);
1061 strbuf_reset(line);
1062 for (i = 0; split[i]; i++)
1063 strbuf_addf(line, "%s", split[i]->buf);
1064 }
1065 }
1066 for (i = 0; split[i]; i++)
1067 strbuf_release(split[i]);
1068
1069 }
1070
1071 static void read_rebase_todolist(const char *fname, struct string_list *lines)
1072 {
1073 struct strbuf line = STRBUF_INIT;
1074 FILE *f = fopen(git_path("%s", fname), "r");
1075
1076 if (!f)
1077 die_errno("Could not open file %s for reading",
1078 git_path("%s", fname));
1079 while (!strbuf_getline(&line, f, '\n')) {
1080 if (line.len && line.buf[0] == comment_line_char)
1081 continue;
1082 strbuf_trim(&line);
1083 if (!line.len)
1084 continue;
1085 abbrev_sha1_in_line(&line);
1086 string_list_append(lines, line.buf);
1087 }
1088 }
1089
1090 static void show_rebase_information(struct wt_status *s,
1091 struct wt_status_state *state,
1092 const char *color)
1093 {
1094 if (state->rebase_interactive_in_progress) {
1095 int i;
1096 int nr_lines_to_show = 2;
1097
1098 struct string_list have_done = STRING_LIST_INIT_DUP;
1099 struct string_list yet_to_do = STRING_LIST_INIT_DUP;
1100
1101 read_rebase_todolist("rebase-merge/done", &have_done);
1102 read_rebase_todolist("rebase-merge/git-rebase-todo", &yet_to_do);
1103
1104 if (have_done.nr == 0)
1105 status_printf_ln(s, color, _("No commands done."));
1106 else {
1107 status_printf_ln(s, color,
1108 Q_("Last command done (%d command done):",
1109 "Last commands done (%d commands done):",
1110 have_done.nr),
1111 have_done.nr);
1112 for (i = (have_done.nr > nr_lines_to_show)
1113 ? have_done.nr - nr_lines_to_show : 0;
1114 i < have_done.nr;
1115 i++)
1116 status_printf_ln(s, color, " %s", have_done.items[i].string);
1117 if (have_done.nr > nr_lines_to_show && s->hints)
1118 status_printf_ln(s, color,
1119 _(" (see more in file %s)"), git_path("rebase-merge/done"));
1120 }
1121
1122 if (yet_to_do.nr == 0)
1123 status_printf_ln(s, color,
1124 _("No commands remaining."));
1125 else {
1126 status_printf_ln(s, color,
1127 Q_("Next command to do (%d remaining command):",
1128 "Next commands to do (%d remaining commands):",
1129 yet_to_do.nr),
1130 yet_to_do.nr);
1131 for (i = 0; i < nr_lines_to_show && i < yet_to_do.nr; i++)
1132 status_printf_ln(s, color, " %s", yet_to_do.items[i].string);
1133 if (s->hints)
1134 status_printf_ln(s, color,
1135 _(" (use \"git rebase --edit-todo\" to view and edit)"));
1136 }
1137 string_list_clear(&yet_to_do, 0);
1138 string_list_clear(&have_done, 0);
1139 }
1140 }
1141
1142 static void print_rebase_state(struct wt_status *s,
1143 struct wt_status_state *state,
1144 const char *color)
1145 {
1146 if (state->branch)
1147 status_printf_ln(s, color,
1148 _("You are currently rebasing branch '%s' on '%s'."),
1149 state->branch,
1150 state->onto);
1151 else
1152 status_printf_ln(s, color,
1153 _("You are currently rebasing."));
1154 }
1155
1156 static void show_rebase_in_progress(struct wt_status *s,
1157 struct wt_status_state *state,
1158 const char *color)
1159 {
1160 struct stat st;
1161
1162 show_rebase_information(s, state, color);
1163 if (has_unmerged(s)) {
1164 print_rebase_state(s, state, color);
1165 if (s->hints) {
1166 status_printf_ln(s, color,
1167 _(" (fix conflicts and then run \"git rebase --continue\")"));
1168 status_printf_ln(s, color,
1169 _(" (use \"git rebase --skip\" to skip this patch)"));
1170 status_printf_ln(s, color,
1171 _(" (use \"git rebase --abort\" to check out the original branch)"));
1172 }
1173 } else if (state->rebase_in_progress || !stat(git_path_merge_msg(), &st)) {
1174 print_rebase_state(s, state, color);
1175 if (s->hints)
1176 status_printf_ln(s, color,
1177 _(" (all conflicts fixed: run \"git rebase --continue\")"));
1178 } else if (split_commit_in_progress(s)) {
1179 if (state->branch)
1180 status_printf_ln(s, color,
1181 _("You are currently splitting a commit while rebasing branch '%s' on '%s'."),
1182 state->branch,
1183 state->onto);
1184 else
1185 status_printf_ln(s, color,
1186 _("You are currently splitting a commit during a rebase."));
1187 if (s->hints)
1188 status_printf_ln(s, color,
1189 _(" (Once your working directory is clean, run \"git rebase --continue\")"));
1190 } else {
1191 if (state->branch)
1192 status_printf_ln(s, color,
1193 _("You are currently editing a commit while rebasing branch '%s' on '%s'."),
1194 state->branch,
1195 state->onto);
1196 else
1197 status_printf_ln(s, color,
1198 _("You are currently editing a commit during a rebase."));
1199 if (s->hints && !s->amend) {
1200 status_printf_ln(s, color,
1201 _(" (use \"git commit --amend\" to amend the current commit)"));
1202 status_printf_ln(s, color,
1203 _(" (use \"git rebase --continue\" once you are satisfied with your changes)"));
1204 }
1205 }
1206 wt_status_print_trailer(s);
1207 }
1208
1209 static void show_cherry_pick_in_progress(struct wt_status *s,
1210 struct wt_status_state *state,
1211 const char *color)
1212 {
1213 status_printf_ln(s, color, _("You are currently cherry-picking commit %s."),
1214 find_unique_abbrev(state->cherry_pick_head_sha1, DEFAULT_ABBREV));
1215 if (s->hints) {
1216 if (has_unmerged(s))
1217 status_printf_ln(s, color,
1218 _(" (fix conflicts and run \"git cherry-pick --continue\")"));
1219 else
1220 status_printf_ln(s, color,
1221 _(" (all conflicts fixed: run \"git cherry-pick --continue\")"));
1222 status_printf_ln(s, color,
1223 _(" (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"));
1224 }
1225 wt_status_print_trailer(s);
1226 }
1227
1228 static void show_revert_in_progress(struct wt_status *s,
1229 struct wt_status_state *state,
1230 const char *color)
1231 {
1232 status_printf_ln(s, color, _("You are currently reverting commit %s."),
1233 find_unique_abbrev(state->revert_head_sha1, DEFAULT_ABBREV));
1234 if (s->hints) {
1235 if (has_unmerged(s))
1236 status_printf_ln(s, color,
1237 _(" (fix conflicts and run \"git revert --continue\")"));
1238 else
1239 status_printf_ln(s, color,
1240 _(" (all conflicts fixed: run \"git revert --continue\")"));
1241 status_printf_ln(s, color,
1242 _(" (use \"git revert --abort\" to cancel the revert operation)"));
1243 }
1244 wt_status_print_trailer(s);
1245 }
1246
1247 static void show_bisect_in_progress(struct wt_status *s,
1248 struct wt_status_state *state,
1249 const char *color)
1250 {
1251 if (state->branch)
1252 status_printf_ln(s, color,
1253 _("You are currently bisecting, started from branch '%s'."),
1254 state->branch);
1255 else
1256 status_printf_ln(s, color,
1257 _("You are currently bisecting."));
1258 if (s->hints)
1259 status_printf_ln(s, color,
1260 _(" (use \"git bisect reset\" to get back to the original branch)"));
1261 wt_status_print_trailer(s);
1262 }
1263
1264 /*
1265 * Extract branch information from rebase/bisect
1266 */
1267 static char *read_and_strip_branch(const char *path)
1268 {
1269 struct strbuf sb = STRBUF_INIT;
1270 unsigned char sha1[20];
1271 const char *branch_name;
1272
1273 if (strbuf_read_file(&sb, git_path("%s", path), 0) <= 0)
1274 goto got_nothing;
1275
1276 while (sb.len && sb.buf[sb.len - 1] == '\n')
1277 strbuf_setlen(&sb, sb.len - 1);
1278 if (!sb.len)
1279 goto got_nothing;
1280 if (skip_prefix(sb.buf, "refs/heads/", &branch_name))
1281 strbuf_remove(&sb, 0, branch_name - sb.buf);
1282 else if (starts_with(sb.buf, "refs/"))
1283 ;
1284 else if (!get_sha1_hex(sb.buf, sha1)) {
1285 const char *abbrev;
1286 abbrev = find_unique_abbrev(sha1, DEFAULT_ABBREV);
1287 strbuf_reset(&sb);
1288 strbuf_addstr(&sb, abbrev);
1289 } else if (!strcmp(sb.buf, "detached HEAD")) /* rebase */
1290 goto got_nothing;
1291 else /* bisect */
1292 ;
1293 return strbuf_detach(&sb, NULL);
1294
1295 got_nothing:
1296 strbuf_release(&sb);
1297 return NULL;
1298 }
1299
1300 struct grab_1st_switch_cbdata {
1301 struct strbuf buf;
1302 unsigned char nsha1[20];
1303 };
1304
1305 static int grab_1st_switch(unsigned char *osha1, unsigned char *nsha1,
1306 const char *email, unsigned long timestamp, int tz,
1307 const char *message, void *cb_data)
1308 {
1309 struct grab_1st_switch_cbdata *cb = cb_data;
1310 const char *target = NULL, *end;
1311
1312 if (!skip_prefix(message, "checkout: moving from ", &message))
1313 return 0;
1314 target = strstr(message, " to ");
1315 if (!target)
1316 return 0;
1317 target += strlen(" to ");
1318 strbuf_reset(&cb->buf);
1319 hashcpy(cb->nsha1, nsha1);
1320 for (end = target; *end && *end != '\n'; end++)
1321 ;
1322 if (!memcmp(target, "HEAD", end - target)) {
1323 /* HEAD is relative. Resolve it to the right reflog entry. */
1324 strbuf_addstr(&cb->buf,
1325 find_unique_abbrev(nsha1, DEFAULT_ABBREV));
1326 return 1;
1327 }
1328 strbuf_add(&cb->buf, target, end - target);
1329 return 1;
1330 }
1331
1332 static void wt_status_get_detached_from(struct wt_status_state *state)
1333 {
1334 struct grab_1st_switch_cbdata cb;
1335 struct commit *commit;
1336 unsigned char sha1[20];
1337 char *ref = NULL;
1338
1339 strbuf_init(&cb.buf, 0);
1340 if (for_each_reflog_ent_reverse("HEAD", grab_1st_switch, &cb) <= 0) {
1341 strbuf_release(&cb.buf);
1342 return;
1343 }
1344
1345 if (dwim_ref(cb.buf.buf, cb.buf.len, sha1, &ref) == 1 &&
1346 /* sha1 is a commit? match without further lookup */
1347 (!hashcmp(cb.nsha1, sha1) ||
1348 /* perhaps sha1 is a tag, try to dereference to a commit */
1349 ((commit = lookup_commit_reference_gently(sha1, 1)) != NULL &&
1350 !hashcmp(cb.nsha1, commit->object.sha1)))) {
1351 const char *from = ref;
1352 if (!skip_prefix(from, "refs/tags/", &from))
1353 skip_prefix(from, "refs/remotes/", &from);
1354 state->detached_from = xstrdup(from);
1355 } else
1356 state->detached_from =
1357 xstrdup(find_unique_abbrev(cb.nsha1, DEFAULT_ABBREV));
1358 hashcpy(state->detached_sha1, cb.nsha1);
1359 state->detached_at = !get_sha1("HEAD", sha1) &&
1360 !hashcmp(sha1, state->detached_sha1);
1361
1362 free(ref);
1363 strbuf_release(&cb.buf);
1364 }
1365
1366 void wt_status_get_state(struct wt_status_state *state,
1367 int get_detached_from)
1368 {
1369 struct stat st;
1370 unsigned char sha1[20];
1371
1372 if (!stat(git_path_merge_head(), &st)) {
1373 state->merge_in_progress = 1;
1374 } else if (!stat(git_path("rebase-apply"), &st)) {
1375 if (!stat(git_path("rebase-apply/applying"), &st)) {
1376 state->am_in_progress = 1;
1377 if (!stat(git_path("rebase-apply/patch"), &st) && !st.st_size)
1378 state->am_empty_patch = 1;
1379 } else {
1380 state->rebase_in_progress = 1;
1381 state->branch = read_and_strip_branch("rebase-apply/head-name");
1382 state->onto = read_and_strip_branch("rebase-apply/onto");
1383 }
1384 } else if (!stat(git_path("rebase-merge"), &st)) {
1385 if (!stat(git_path("rebase-merge/interactive"), &st))
1386 state->rebase_interactive_in_progress = 1;
1387 else
1388 state->rebase_in_progress = 1;
1389 state->branch = read_and_strip_branch("rebase-merge/head-name");
1390 state->onto = read_and_strip_branch("rebase-merge/onto");
1391 } else if (!stat(git_path_cherry_pick_head(), &st) &&
1392 !get_sha1("CHERRY_PICK_HEAD", sha1)) {
1393 state->cherry_pick_in_progress = 1;
1394 hashcpy(state->cherry_pick_head_sha1, sha1);
1395 }
1396 if (!stat(git_path("BISECT_LOG"), &st)) {
1397 state->bisect_in_progress = 1;
1398 state->branch = read_and_strip_branch("BISECT_START");
1399 }
1400 if (!stat(git_path_revert_head(), &st) &&
1401 !get_sha1("REVERT_HEAD", sha1)) {
1402 state->revert_in_progress = 1;
1403 hashcpy(state->revert_head_sha1, sha1);
1404 }
1405
1406 if (get_detached_from)
1407 wt_status_get_detached_from(state);
1408 }
1409
1410 static void wt_status_print_state(struct wt_status *s,
1411 struct wt_status_state *state)
1412 {
1413 const char *state_color = color(WT_STATUS_HEADER, s);
1414 if (state->merge_in_progress)
1415 show_merge_in_progress(s, state, state_color);
1416 else if (state->am_in_progress)
1417 show_am_in_progress(s, state, state_color);
1418 else if (state->rebase_in_progress || state->rebase_interactive_in_progress)
1419 show_rebase_in_progress(s, state, state_color);
1420 else if (state->cherry_pick_in_progress)
1421 show_cherry_pick_in_progress(s, state, state_color);
1422 else if (state->revert_in_progress)
1423 show_revert_in_progress(s, state, state_color);
1424 if (state->bisect_in_progress)
1425 show_bisect_in_progress(s, state, state_color);
1426 }
1427
1428 void wt_status_print(struct wt_status *s)
1429 {
1430 const char *branch_color = color(WT_STATUS_ONBRANCH, s);
1431 const char *branch_status_color = color(WT_STATUS_HEADER, s);
1432 struct wt_status_state state;
1433
1434 memset(&state, 0, sizeof(state));
1435 wt_status_get_state(&state,
1436 s->branch && !strcmp(s->branch, "HEAD"));
1437
1438 if (s->branch) {
1439 const char *on_what = _("On branch ");
1440 const char *branch_name = s->branch;
1441 if (!strcmp(branch_name, "HEAD")) {
1442 branch_status_color = color(WT_STATUS_NOBRANCH, s);
1443 if (state.rebase_in_progress || state.rebase_interactive_in_progress) {
1444 if (state.rebase_interactive_in_progress)
1445 on_what = _("interactive rebase in progress; onto ");
1446 else
1447 on_what = _("rebase in progress; onto ");
1448 branch_name = state.onto;
1449 } else if (state.detached_from) {
1450 branch_name = state.detached_from;
1451 if (state.detached_at)
1452 on_what = _("HEAD detached at ");
1453 else
1454 on_what = _("HEAD detached from ");
1455 } else {
1456 branch_name = "";
1457 on_what = _("Not currently on any branch.");
1458 }
1459 } else
1460 skip_prefix(branch_name, "refs/heads/", &branch_name);
1461 status_printf(s, color(WT_STATUS_HEADER, s), "%s", "");
1462 status_printf_more(s, branch_status_color, "%s", on_what);
1463 status_printf_more(s, branch_color, "%s\n", branch_name);
1464 if (!s->is_initial)
1465 wt_status_print_tracking(s);
1466 }
1467
1468 wt_status_print_state(s, &state);
1469 free(state.branch);
1470 free(state.onto);
1471 free(state.detached_from);
1472
1473 if (s->is_initial) {
1474 status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", "");
1475 status_printf_ln(s, color(WT_STATUS_HEADER, s), _("Initial commit"));
1476 status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", "");
1477 }
1478
1479 wt_status_print_updated(s);
1480 wt_status_print_unmerged(s);
1481 wt_status_print_changed(s);
1482 if (s->submodule_summary &&
1483 (!s->ignore_submodule_arg ||
1484 strcmp(s->ignore_submodule_arg, "all"))) {
1485 wt_status_print_submodule_summary(s, 0); /* staged */
1486 wt_status_print_submodule_summary(s, 1); /* unstaged */
1487 }
1488 if (s->show_untracked_files) {
1489 wt_status_print_other(s, &s->untracked, _("Untracked files"), "add");
1490 if (s->show_ignored_files)
1491 wt_status_print_other(s, &s->ignored, _("Ignored files"), "add -f");
1492 if (advice_status_u_option && 2000 < s->untracked_in_ms) {
1493 status_printf_ln(s, GIT_COLOR_NORMAL, "%s", "");
1494 status_printf_ln(s, GIT_COLOR_NORMAL,
1495 _("It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1496 "may speed it up, but you have to be careful not to forget to add\n"
1497 "new files yourself (see 'git help status')."),
1498 s->untracked_in_ms / 1000.0);
1499 }
1500 } else if (s->commitable)
1501 status_printf_ln(s, GIT_COLOR_NORMAL, _("Untracked files not listed%s"),
1502 s->hints
1503 ? _(" (use -u option to show untracked files)") : "");
1504
1505 if (s->verbose)
1506 wt_status_print_verbose(s);
1507 if (!s->commitable) {
1508 if (s->amend)
1509 status_printf_ln(s, GIT_COLOR_NORMAL, _("No changes"));
1510 else if (s->nowarn)
1511 ; /* nothing */
1512 else if (s->workdir_dirty) {
1513 if (s->hints)
1514 printf(_("no changes added to commit "
1515 "(use \"git add\" and/or \"git commit -a\")\n"));
1516 else
1517 printf(_("no changes added to commit\n"));
1518 } else if (s->untracked.nr) {
1519 if (s->hints)
1520 printf(_("nothing added to commit but untracked files "
1521 "present (use \"git add\" to track)\n"));
1522 else
1523 printf(_("nothing added to commit but untracked files present\n"));
1524 } else if (s->is_initial) {
1525 if (s->hints)
1526 printf(_("nothing to commit (create/copy files "
1527 "and use \"git add\" to track)\n"));
1528 else
1529 printf(_("nothing to commit\n"));
1530 } else if (!s->show_untracked_files) {
1531 if (s->hints)
1532 printf(_("nothing to commit (use -u to show untracked files)\n"));
1533 else
1534 printf(_("nothing to commit\n"));
1535 } else
1536 printf(_("nothing to commit, working directory clean\n"));
1537 }
1538 }
1539
1540 static void wt_shortstatus_unmerged(struct string_list_item *it,
1541 struct wt_status *s)
1542 {
1543 struct wt_status_change_data *d = it->util;
1544 const char *how = "??";
1545
1546 switch (d->stagemask) {
1547 case 1: how = "DD"; break; /* both deleted */
1548 case 2: how = "AU"; break; /* added by us */
1549 case 3: how = "UD"; break; /* deleted by them */
1550 case 4: how = "UA"; break; /* added by them */
1551 case 5: how = "DU"; break; /* deleted by us */
1552 case 6: how = "AA"; break; /* both added */
1553 case 7: how = "UU"; break; /* both modified */
1554 }
1555 color_fprintf(s->fp, color(WT_STATUS_UNMERGED, s), "%s", how);
1556 if (s->null_termination) {
1557 fprintf(stdout, " %s%c", it->string, 0);
1558 } else {
1559 struct strbuf onebuf = STRBUF_INIT;
1560 const char *one;
1561 one = quote_path(it->string, s->prefix, &onebuf);
1562 printf(" %s\n", one);
1563 strbuf_release(&onebuf);
1564 }
1565 }
1566
1567 static void wt_shortstatus_status(struct string_list_item *it,
1568 struct wt_status *s)
1569 {
1570 struct wt_status_change_data *d = it->util;
1571
1572 if (d->index_status)
1573 color_fprintf(s->fp, color(WT_STATUS_UPDATED, s), "%c", d->index_status);
1574 else
1575 putchar(' ');
1576 if (d->worktree_status)
1577 color_fprintf(s->fp, color(WT_STATUS_CHANGED, s), "%c", d->worktree_status);
1578 else
1579 putchar(' ');
1580 putchar(' ');
1581 if (s->null_termination) {
1582 fprintf(stdout, "%s%c", it->string, 0);
1583 if (d->head_path)
1584 fprintf(stdout, "%s%c", d->head_path, 0);
1585 } else {
1586 struct strbuf onebuf = STRBUF_INIT;
1587 const char *one;
1588 if (d->head_path) {
1589 one = quote_path(d->head_path, s->prefix, &onebuf);
1590 if (*one != '"' && strchr(one, ' ') != NULL) {
1591 putchar('"');
1592 strbuf_addch(&onebuf, '"');
1593 one = onebuf.buf;
1594 }
1595 printf("%s -> ", one);
1596 strbuf_release(&onebuf);
1597 }
1598 one = quote_path(it->string, s->prefix, &onebuf);
1599 if (*one != '"' && strchr(one, ' ') != NULL) {
1600 putchar('"');
1601 strbuf_addch(&onebuf, '"');
1602 one = onebuf.buf;
1603 }
1604 printf("%s\n", one);
1605 strbuf_release(&onebuf);
1606 }
1607 }
1608
1609 static void wt_shortstatus_other(struct string_list_item *it,
1610 struct wt_status *s, const char *sign)
1611 {
1612 if (s->null_termination) {
1613 fprintf(stdout, "%s %s%c", sign, it->string, 0);
1614 } else {
1615 struct strbuf onebuf = STRBUF_INIT;
1616 const char *one;
1617 one = quote_path(it->string, s->prefix, &onebuf);
1618 color_fprintf(s->fp, color(WT_STATUS_UNTRACKED, s), "%s", sign);
1619 printf(" %s\n", one);
1620 strbuf_release(&onebuf);
1621 }
1622 }
1623
1624 static void wt_shortstatus_print_tracking(struct wt_status *s)
1625 {
1626 struct branch *branch;
1627 const char *header_color = color(WT_STATUS_HEADER, s);
1628 const char *branch_color_local = color(WT_STATUS_LOCAL_BRANCH, s);
1629 const char *branch_color_remote = color(WT_STATUS_REMOTE_BRANCH, s);
1630
1631 const char *base;
1632 const char *branch_name;
1633 int num_ours, num_theirs;
1634 int upstream_is_gone = 0;
1635
1636 color_fprintf(s->fp, color(WT_STATUS_HEADER, s), "## ");
1637
1638 if (!s->branch)
1639 return;
1640 branch_name = s->branch;
1641
1642 if (s->is_initial)
1643 color_fprintf(s->fp, header_color, _("Initial commit on "));
1644
1645 if (!strcmp(s->branch, "HEAD")) {
1646 color_fprintf(s->fp, color(WT_STATUS_NOBRANCH, s), "%s",
1647 _("HEAD (no branch)"));
1648 goto conclude;
1649 }
1650
1651 skip_prefix(branch_name, "refs/heads/", &branch_name);
1652
1653 branch = branch_get(branch_name);
1654
1655 color_fprintf(s->fp, branch_color_local, "%s", branch_name);
1656
1657 if (stat_tracking_info(branch, &num_ours, &num_theirs, &base) < 0) {
1658 if (!base)
1659 goto conclude;
1660
1661 upstream_is_gone = 1;
1662 }
1663
1664 base = shorten_unambiguous_ref(base, 0);
1665 color_fprintf(s->fp, header_color, "...");
1666 color_fprintf(s->fp, branch_color_remote, "%s", base);
1667 free((char *)base);
1668
1669 if (!upstream_is_gone && !num_ours && !num_theirs)
1670 goto conclude;
1671
1672 #define LABEL(string) (s->no_gettext ? (string) : _(string))
1673
1674 color_fprintf(s->fp, header_color, " [");
1675 if (upstream_is_gone) {
1676 color_fprintf(s->fp, header_color, LABEL(N_("gone")));
1677 } else if (!num_ours) {
1678 color_fprintf(s->fp, header_color, LABEL(N_("behind ")));
1679 color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
1680 } else if (!num_theirs) {
1681 color_fprintf(s->fp, header_color, LABEL(N_(("ahead "))));
1682 color_fprintf(s->fp, branch_color_local, "%d", num_ours);
1683 } else {
1684 color_fprintf(s->fp, header_color, LABEL(N_(("ahead "))));
1685 color_fprintf(s->fp, branch_color_local, "%d", num_ours);
1686 color_fprintf(s->fp, header_color, ", %s", LABEL(N_("behind ")));
1687 color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
1688 }
1689
1690 color_fprintf(s->fp, header_color, "]");
1691 conclude:
1692 fputc(s->null_termination ? '\0' : '\n', s->fp);
1693 }
1694
1695 void wt_shortstatus_print(struct wt_status *s)
1696 {
1697 int i;
1698
1699 if (s->show_branch)
1700 wt_shortstatus_print_tracking(s);
1701
1702 for (i = 0; i < s->change.nr; i++) {
1703 struct wt_status_change_data *d;
1704 struct string_list_item *it;
1705
1706 it = &(s->change.items[i]);
1707 d = it->util;
1708 if (d->stagemask)
1709 wt_shortstatus_unmerged(it, s);
1710 else
1711 wt_shortstatus_status(it, s);
1712 }
1713 for (i = 0; i < s->untracked.nr; i++) {
1714 struct string_list_item *it;
1715
1716 it = &(s->untracked.items[i]);
1717 wt_shortstatus_other(it, s, "??");
1718 }
1719 for (i = 0; i < s->ignored.nr; i++) {
1720 struct string_list_item *it;
1721
1722 it = &(s->ignored.items[i]);
1723 wt_shortstatus_other(it, s, "!!");
1724 }
1725 }
1726
1727 void wt_porcelain_print(struct wt_status *s)
1728 {
1729 s->use_color = 0;
1730 s->relative_paths = 0;
1731 s->prefix = NULL;
1732 s->no_gettext = 1;
1733 wt_shortstatus_print(s);
1734 }
Extra changes on top of the MinGW port of git