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