?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
Merge branch 'mg/branch-set-upstream-previous' into maint
[git/jnareb-git.git] / wt-status.c
blob02377729c401fa6e041a713a89fe986fa0f562a0
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
15 static char default_wt_status_colors[][COLOR_MAXLEN] = {
16 GIT_COLOR_NORMAL, /* WT_STATUS_HEADER */
17 GIT_COLOR_GREEN, /* WT_STATUS_UPDATED */
18 GIT_COLOR_RED, /* WT_STATUS_CHANGED */
19 GIT_COLOR_RED, /* WT_STATUS_UNTRACKED */
20 GIT_COLOR_RED, /* WT_STATUS_NOBRANCH */
21 GIT_COLOR_RED, /* WT_STATUS_UNMERGED */
22 GIT_COLOR_GREEN, /* WT_STATUS_LOCAL_BRANCH */
23 GIT_COLOR_RED, /* WT_STATUS_REMOTE_BRANCH */
24 GIT_COLOR_NIL, /* WT_STATUS_ONBRANCH */
25 };
26
27 static const char *color(int slot, struct wt_status *s)
28 {
29 const char *c = s->use_color > 0 ? s->color_palette[slot] : "";
30 if (slot == WT_STATUS_ONBRANCH && color_is_nil(c))
31 c = s->color_palette[WT_STATUS_HEADER];
32 return c;
33 }
34
35 static void status_vprintf(struct wt_status *s, int at_bol, const char *color,
36 const char *fmt, va_list ap, const char *trail)
37 {
38 struct strbuf sb = STRBUF_INIT;
39 struct strbuf linebuf = STRBUF_INIT;
40 const char *line, *eol;
41
42 strbuf_vaddf(&sb, fmt, ap);
43 if (!sb.len) {
44 strbuf_addch(&sb, '#');
45 if (!trail)
46 strbuf_addch(&sb, ' ');
47 color_print_strbuf(s->fp, color, &sb);
48 if (trail)
49 fprintf(s->fp, "%s", trail);
50 strbuf_release(&sb);
51 return;
52 }
53 for (line = sb.buf; *line; line = eol + 1) {
54 eol = strchr(line, '\n');
55
56 strbuf_reset(&linebuf);
57 if (at_bol) {
58 strbuf_addch(&linebuf, '#');
59 if (*line != '\n' && *line != '\t')
60 strbuf_addch(&linebuf, ' ');
61 }
62 if (eol)
63 strbuf_add(&linebuf, line, eol - line);
64 else
65 strbuf_addstr(&linebuf, line);
66 color_print_strbuf(s->fp, color, &linebuf);
67 if (eol)
68 fprintf(s->fp, "\n");
69 else
70 break;
71 at_bol = 1;
72 }
73 if (trail)
74 fprintf(s->fp, "%s", trail);
75 strbuf_release(&linebuf);
76 strbuf_release(&sb);
77 }
78
79 void status_printf_ln(struct wt_status *s, const char *color,
80 const char *fmt, ...)
81 {
82 va_list ap;
83
84 va_start(ap, fmt);
85 status_vprintf(s, 1, color, fmt, ap, "\n");
86 va_end(ap);
87 }
88
89 void status_printf(struct wt_status *s, const char *color,
90 const char *fmt, ...)
91 {
92 va_list ap;
93
94 va_start(ap, fmt);
95 status_vprintf(s, 1, color, fmt, ap, NULL);
96 va_end(ap);
97 }
98
99 void status_printf_more(struct wt_status *s, const char *color,
100 const char *fmt, ...)
101 {
102 va_list ap;
103
104 va_start(ap, fmt);
105 status_vprintf(s, 0, color, fmt, ap, NULL);
106 va_end(ap);
107 }
108
109 void wt_status_prepare(struct wt_status *s)
110 {
111 unsigned char sha1[20];
112 const char *head;
113
114 memset(s, 0, sizeof(*s));
115 memcpy(s->color_palette, default_wt_status_colors,
116 sizeof(default_wt_status_colors));
117 s->show_untracked_files = SHOW_NORMAL_UNTRACKED_FILES;
118 s->use_color = -1;
119 s->relative_paths = 1;
120 head = resolve_ref("HEAD", sha1, 0, NULL);
121 s->branch = head ? xstrdup(head) : NULL;
122 s->reference = "HEAD";
123 s->fp = stdout;
124 s->index_file = get_index_file();
125 s->change.strdup_strings = 1;
126 s->untracked.strdup_strings = 1;
127 s->ignored.strdup_strings = 1;
128 }
129
130 static void wt_status_print_unmerged_header(struct wt_status *s)
131 {
132 const char *c = color(WT_STATUS_HEADER, s);
133
134 status_printf_ln(s, c, _("Unmerged paths:"));
135 if (!advice_status_hints)
136 return;
137 if (s->whence != FROM_COMMIT)
138 ;
139 else if (!s->is_initial)
140 status_printf_ln(s, c, _(" (use \"git reset %s <file>...\" to unstage)"), s->reference);
141 else
142 status_printf_ln(s, c, _(" (use \"git rm --cached <file>...\" to unstage)"));
143 status_printf_ln(s, c, _(" (use \"git add/rm <file>...\" as appropriate to mark resolution)"));
144 status_printf_ln(s, c, "");
145 }
146
147 static void wt_status_print_cached_header(struct wt_status *s)
148 {
149 const char *c = color(WT_STATUS_HEADER, s);
150
151 status_printf_ln(s, c, _("Changes to be committed:"));
152 if (!advice_status_hints)
153 return;
154 if (s->whence != FROM_COMMIT)
155 ; /* NEEDSWORK: use "git reset --unresolve"??? */
156 else if (!s->is_initial)
157 status_printf_ln(s, c, _(" (use \"git reset %s <file>...\" to unstage)"), s->reference);
158 else
159 status_printf_ln(s, c, _(" (use \"git rm --cached <file>...\" to unstage)"));
160 status_printf_ln(s, c, "");
161 }
162
163 static void wt_status_print_dirty_header(struct wt_status *s,
164 int has_deleted,
165 int has_dirty_submodules)
166 {
167 const char *c = color(WT_STATUS_HEADER, s);
168
169 status_printf_ln(s, c, _("Changes not staged for commit:"));
170 if (!advice_status_hints)
171 return;
172 if (!has_deleted)
173 status_printf_ln(s, c, _(" (use \"git add <file>...\" to update what will be committed)"));
174 else
175 status_printf_ln(s, c, _(" (use \"git add/rm <file>...\" to update what will be committed)"));
176 status_printf_ln(s, c, _(" (use \"git checkout -- <file>...\" to discard changes in working directory)"));
177 if (has_dirty_submodules)
178 status_printf_ln(s, c, _(" (commit or discard the untracked or modified content in submodules)"));
179 status_printf_ln(s, c, "");
180 }
181
182 static void wt_status_print_other_header(struct wt_status *s,
183 const char *what,
184 const char *how)
185 {
186 const char *c = color(WT_STATUS_HEADER, s);
187 status_printf_ln(s, c, _("%s files:"), what);
188 if (!advice_status_hints)
189 return;
190 status_printf_ln(s, c, _(" (use \"git %s <file>...\" to include in what will be committed)"), how);
191 status_printf_ln(s, c, "");
192 }
193
194 static void wt_status_print_trailer(struct wt_status *s)
195 {
196 status_printf_ln(s, color(WT_STATUS_HEADER, s), "");
197 }
198
199 #define quote_path quote_path_relative
200
201 static void wt_status_print_unmerged_data(struct wt_status *s,
202 struct string_list_item *it)
203 {
204 const char *c = color(WT_STATUS_UNMERGED, s);
205 struct wt_status_change_data *d = it->util;
206 struct strbuf onebuf = STRBUF_INIT;
207 const char *one, *how = _("bug");
208
209 one = quote_path(it->string, -1, &onebuf, s->prefix);
210 status_printf(s, color(WT_STATUS_HEADER, s), "\t");
211 switch (d->stagemask) {
212 case 1: how = _("both deleted:"); break;
213 case 2: how = _("added by us:"); break;
214 case 3: how = _("deleted by them:"); break;
215 case 4: how = _("added by them:"); break;
216 case 5: how = _("deleted by us:"); break;
217 case 6: how = _("both added:"); break;
218 case 7: how = _("both modified:"); break;
219 }
220 status_printf_more(s, c, "%-20s%s\n", how, one);
221 strbuf_release(&onebuf);
222 }
223
224 static void wt_status_print_change_data(struct wt_status *s,
225 int change_type,
226 struct string_list_item *it)
227 {
228 struct wt_status_change_data *d = it->util;
229 const char *c = color(change_type, s);
230 int status = status;
231 char *one_name;
232 char *two_name;
233 const char *one, *two;
234 struct strbuf onebuf = STRBUF_INIT, twobuf = STRBUF_INIT;
235 struct strbuf extra = STRBUF_INIT;
236
237 one_name = two_name = it->string;
238 switch (change_type) {
239 case WT_STATUS_UPDATED:
240 status = d->index_status;
241 if (d->head_path)
242 one_name = d->head_path;
243 break;
244 case WT_STATUS_CHANGED:
245 if (d->new_submodule_commits || d->dirty_submodule) {
246 strbuf_addstr(&extra, " (");
247 if (d->new_submodule_commits)
248 strbuf_addf(&extra, _("new commits, "));
249 if (d->dirty_submodule & DIRTY_SUBMODULE_MODIFIED)
250 strbuf_addf(&extra, _("modified content, "));
251 if (d->dirty_submodule & DIRTY_SUBMODULE_UNTRACKED)
252 strbuf_addf(&extra, _("untracked content, "));
253 strbuf_setlen(&extra, extra.len - 2);
254 strbuf_addch(&extra, ')');
255 }
256 status = d->worktree_status;
257 break;
258 }
259
260 one = quote_path(one_name, -1, &onebuf, s->prefix);
261 two = quote_path(two_name, -1, &twobuf, s->prefix);
262
263 status_printf(s, color(WT_STATUS_HEADER, s), "\t");
264 switch (status) {
265 case DIFF_STATUS_ADDED:
266 status_printf_more(s, c, _("new file: %s"), one);
267 break;
268 case DIFF_STATUS_COPIED:
269 status_printf_more(s, c, _("copied: %s -> %s"), one, two);
270 break;
271 case DIFF_STATUS_DELETED:
272 status_printf_more(s, c, _("deleted: %s"), one);
273 break;
274 case DIFF_STATUS_MODIFIED:
275 status_printf_more(s, c, _("modified: %s"), one);
276 break;
277 case DIFF_STATUS_RENAMED:
278 status_printf_more(s, c, _("renamed: %s -> %s"), one, two);
279 break;
280 case DIFF_STATUS_TYPE_CHANGED:
281 status_printf_more(s, c, _("typechange: %s"), one);
282 break;
283 case DIFF_STATUS_UNKNOWN:
284 status_printf_more(s, c, _("unknown: %s"), one);
285 break;
286 case DIFF_STATUS_UNMERGED:
287 status_printf_more(s, c, _("unmerged: %s"), one);
288 break;
289 default:
290 die(_("bug: unhandled diff status %c"), status);
291 }
292 if (extra.len) {
293 status_printf_more(s, color(WT_STATUS_HEADER, s), "%s", extra.buf);
294 strbuf_release(&extra);
295 }
296 status_printf_more(s, GIT_COLOR_NORMAL, "\n");
297 strbuf_release(&onebuf);
298 strbuf_release(&twobuf);
299 }
300
301 static void wt_status_collect_changed_cb(struct diff_queue_struct *q,
302 struct diff_options *options,
303 void *data)
304 {
305 struct wt_status *s = data;
306 int i;
307
308 if (!q->nr)
309 return;
310 s->workdir_dirty = 1;
311 for (i = 0; i < q->nr; i++) {
312 struct diff_filepair *p;
313 struct string_list_item *it;
314 struct wt_status_change_data *d;
315
316 p = q->queue[i];
317 it = string_list_insert(&s->change, p->one->path);
318 d = it->util;
319 if (!d) {
320 d = xcalloc(1, sizeof(*d));
321 it->util = d;
322 }
323 if (!d->worktree_status)
324 d->worktree_status = p->status;
325 d->dirty_submodule = p->two->dirty_submodule;
326 if (S_ISGITLINK(p->two->mode))
327 d->new_submodule_commits = !!hashcmp(p->one->sha1, p->two->sha1);
328 }
329 }
330
331 static int unmerged_mask(const char *path)
332 {
333 int pos, mask;
334 struct cache_entry *ce;
335
336 pos = cache_name_pos(path, strlen(path));
337 if (0 <= pos)
338 return 0;
339
340 mask = 0;
341 pos = -pos-1;
342 while (pos < active_nr) {
343 ce = active_cache[pos++];
344 if (strcmp(ce->name, path) || !ce_stage(ce))
345 break;
346 mask |= (1 << (ce_stage(ce) - 1));
347 }
348 return mask;
349 }
350
351 static void wt_status_collect_updated_cb(struct diff_queue_struct *q,
352 struct diff_options *options,
353 void *data)
354 {
355 struct wt_status *s = data;
356 int i;
357
358 for (i = 0; i < q->nr; i++) {
359 struct diff_filepair *p;
360 struct string_list_item *it;
361 struct wt_status_change_data *d;
362
363 p = q->queue[i];
364 it = string_list_insert(&s->change, p->two->path);
365 d = it->util;
366 if (!d) {
367 d = xcalloc(1, sizeof(*d));
368 it->util = d;
369 }
370 if (!d->index_status)
371 d->index_status = p->status;
372 switch (p->status) {
373 case DIFF_STATUS_COPIED:
374 case DIFF_STATUS_RENAMED:
375 d->head_path = xstrdup(p->one->path);
376 break;
377 case DIFF_STATUS_UNMERGED:
378 d->stagemask = unmerged_mask(p->two->path);
379 break;
380 }
381 }
382 }
383
384 static void wt_status_collect_changes_worktree(struct wt_status *s)
385 {
386 struct rev_info rev;
387
388 init_revisions(&rev, NULL);
389 setup_revisions(0, NULL, &rev, NULL);
390 rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
391 DIFF_OPT_SET(&rev.diffopt, DIRTY_SUBMODULES);
392 if (!s->show_untracked_files)
393 DIFF_OPT_SET(&rev.diffopt, IGNORE_UNTRACKED_IN_SUBMODULES);
394 if (s->ignore_submodule_arg) {
395 DIFF_OPT_SET(&rev.diffopt, OVERRIDE_SUBMODULE_CONFIG);
396 handle_ignore_submodules_arg(&rev.diffopt, s->ignore_submodule_arg);
397 }
398 rev.diffopt.format_callback = wt_status_collect_changed_cb;
399 rev.diffopt.format_callback_data = s;
400 init_pathspec(&rev.prune_data, s->pathspec);
401 run_diff_files(&rev, 0);
402 }
403
404 static void wt_status_collect_changes_index(struct wt_status *s)
405 {
406 struct rev_info rev;
407 struct setup_revision_opt opt;
408
409 init_revisions(&rev, NULL);
410 memset(&opt, 0, sizeof(opt));
411 opt.def = s->is_initial ? EMPTY_TREE_SHA1_HEX : s->reference;
412 setup_revisions(0, NULL, &rev, &opt);
413
414 if (s->ignore_submodule_arg) {
415 DIFF_OPT_SET(&rev.diffopt, OVERRIDE_SUBMODULE_CONFIG);
416 handle_ignore_submodules_arg(&rev.diffopt, s->ignore_submodule_arg);
417 }
418
419 rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
420 rev.diffopt.format_callback = wt_status_collect_updated_cb;
421 rev.diffopt.format_callback_data = s;
422 rev.diffopt.detect_rename = 1;
423 rev.diffopt.rename_limit = 200;
424 rev.diffopt.break_opt = 0;
425 init_pathspec(&rev.prune_data, s->pathspec);
426 run_diff_index(&rev, 1);
427 }
428
429 static void wt_status_collect_changes_initial(struct wt_status *s)
430 {
431 struct pathspec pathspec;
432 int i;
433
434 init_pathspec(&pathspec, s->pathspec);
435 for (i = 0; i < active_nr; i++) {
436 struct string_list_item *it;
437 struct wt_status_change_data *d;
438 struct cache_entry *ce = active_cache[i];
439
440 if (!ce_path_match(ce, &pathspec))
441 continue;
442 it = string_list_insert(&s->change, ce->name);
443 d = it->util;
444 if (!d) {
445 d = xcalloc(1, sizeof(*d));
446 it->util = d;
447 }
448 if (ce_stage(ce)) {
449 d->index_status = DIFF_STATUS_UNMERGED;
450 d->stagemask |= (1 << (ce_stage(ce) - 1));
451 }
452 else
453 d->index_status = DIFF_STATUS_ADDED;
454 }
455 free_pathspec(&pathspec);
456 }
457
458 static void wt_status_collect_untracked(struct wt_status *s)
459 {
460 int i;
461 struct dir_struct dir;
462
463 if (!s->show_untracked_files)
464 return;
465 memset(&dir, 0, sizeof(dir));
466 if (s->show_untracked_files != SHOW_ALL_UNTRACKED_FILES)
467 dir.flags |=
468 DIR_SHOW_OTHER_DIRECTORIES | DIR_HIDE_EMPTY_DIRECTORIES;
469 setup_standard_excludes(&dir);
470
471 fill_directory(&dir, s->pathspec);
472 for (i = 0; i < dir.nr; i++) {
473 struct dir_entry *ent = dir.entries[i];
474 if (cache_name_is_other(ent->name, ent->len) &&
475 match_pathspec(s->pathspec, ent->name, ent->len, 0, NULL))
476 string_list_insert(&s->untracked, ent->name);
477 free(ent);
478 }
479
480 if (s->show_ignored_files) {
481 dir.nr = 0;
482 dir.flags = DIR_SHOW_IGNORED | DIR_SHOW_OTHER_DIRECTORIES;
483 fill_directory(&dir, s->pathspec);
484 for (i = 0; i < dir.nr; i++) {
485 struct dir_entry *ent = dir.entries[i];
486 if (cache_name_is_other(ent->name, ent->len) &&
487 match_pathspec(s->pathspec, ent->name, ent->len, 0, NULL))
488 string_list_insert(&s->ignored, ent->name);
489 free(ent);
490 }
491 }
492
493 free(dir.entries);
494 }
495
496 void wt_status_collect(struct wt_status *s)
497 {
498 wt_status_collect_changes_worktree(s);
499
500 if (s->is_initial)
501 wt_status_collect_changes_initial(s);
502 else
503 wt_status_collect_changes_index(s);
504 wt_status_collect_untracked(s);
505 }
506
507 static void wt_status_print_unmerged(struct wt_status *s)
508 {
509 int shown_header = 0;
510 int i;
511
512 for (i = 0; i < s->change.nr; i++) {
513 struct wt_status_change_data *d;
514 struct string_list_item *it;
515 it = &(s->change.items[i]);
516 d = it->util;
517 if (!d->stagemask)
518 continue;
519 if (!shown_header) {
520 wt_status_print_unmerged_header(s);
521 shown_header = 1;
522 }
523 wt_status_print_unmerged_data(s, it);
524 }
525 if (shown_header)
526 wt_status_print_trailer(s);
527
528 }
529
530 static void wt_status_print_updated(struct wt_status *s)
531 {
532 int shown_header = 0;
533 int i;
534
535 for (i = 0; i < s->change.nr; i++) {
536 struct wt_status_change_data *d;
537 struct string_list_item *it;
538 it = &(s->change.items[i]);
539 d = it->util;
540 if (!d->index_status ||
541 d->index_status == DIFF_STATUS_UNMERGED)
542 continue;
543 if (!shown_header) {
544 wt_status_print_cached_header(s);
545 s->commitable = 1;
546 shown_header = 1;
547 }
548 wt_status_print_change_data(s, WT_STATUS_UPDATED, it);
549 }
550 if (shown_header)
551 wt_status_print_trailer(s);
552 }
553
554 /*
555 * -1 : has delete
556 * 0 : no change
557 * 1 : some change but no delete
558 */
559 static int wt_status_check_worktree_changes(struct wt_status *s,
560 int *dirty_submodules)
561 {
562 int i;
563 int changes = 0;
564
565 *dirty_submodules = 0;
566
567 for (i = 0; i < s->change.nr; i++) {
568 struct wt_status_change_data *d;
569 d = s->change.items[i].util;
570 if (!d->worktree_status ||
571 d->worktree_status == DIFF_STATUS_UNMERGED)
572 continue;
573 if (!changes)
574 changes = 1;
575 if (d->dirty_submodule)
576 *dirty_submodules = 1;
577 if (d->worktree_status == DIFF_STATUS_DELETED)
578 changes = -1;
579 }
580 return changes;
581 }
582
583 static void wt_status_print_changed(struct wt_status *s)
584 {
585 int i, dirty_submodules;
586 int worktree_changes = wt_status_check_worktree_changes(s, &dirty_submodules);
587
588 if (!worktree_changes)
589 return;
590
591 wt_status_print_dirty_header(s, worktree_changes < 0, dirty_submodules);
592
593 for (i = 0; i < s->change.nr; i++) {
594 struct wt_status_change_data *d;
595 struct string_list_item *it;
596 it = &(s->change.items[i]);
597 d = it->util;
598 if (!d->worktree_status ||
599 d->worktree_status == DIFF_STATUS_UNMERGED)
600 continue;
601 wt_status_print_change_data(s, WT_STATUS_CHANGED, it);
602 }
603 wt_status_print_trailer(s);
604 }
605
606 static void wt_status_print_submodule_summary(struct wt_status *s, int uncommitted)
607 {
608 struct child_process sm_summary;
609 char summary_limit[64];
610 char index[PATH_MAX];
611 const char *env[] = { NULL, NULL };
612 const char *argv[8];
613
614 env[0] = index;
615 argv[0] = "submodule";
616 argv[1] = "summary";
617 argv[2] = uncommitted ? "--files" : "--cached";
618 argv[3] = "--for-status";
619 argv[4] = "--summary-limit";
620 argv[5] = summary_limit;
621 argv[6] = uncommitted ? NULL : (s->amend ? "HEAD^" : "HEAD");
622 argv[7] = NULL;
623
624 sprintf(summary_limit, "%d", s->submodule_summary);
625 snprintf(index, sizeof(index), "GIT_INDEX_FILE=%s", s->index_file);
626
627 memset(&sm_summary, 0, sizeof(sm_summary));
628 sm_summary.argv = argv;
629 sm_summary.env = env;
630 sm_summary.git_cmd = 1;
631 sm_summary.no_stdin = 1;
632 fflush(s->fp);
633 sm_summary.out = dup(fileno(s->fp)); /* run_command closes it */
634 run_command(&sm_summary);
635 }
636
637 static void wt_status_print_other(struct wt_status *s,
638 struct string_list *l,
639 const char *what,
640 const char *how)
641 {
642 int i;
643 struct strbuf buf = STRBUF_INIT;
644
645 if (!l->nr)
646 return;
647
648 wt_status_print_other_header(s, what, how);
649
650 for (i = 0; i < l->nr; i++) {
651 struct string_list_item *it;
652 it = &(l->items[i]);
653 status_printf(s, color(WT_STATUS_HEADER, s), "\t");
654 status_printf_more(s, color(WT_STATUS_UNTRACKED, s),
655 "%s\n", quote_path(it->string, strlen(it->string),
656 &buf, s->prefix));
657 }
658 strbuf_release(&buf);
659 }
660
661 static void wt_status_print_verbose(struct wt_status *s)
662 {
663 struct rev_info rev;
664 struct setup_revision_opt opt;
665
666 init_revisions(&rev, NULL);
667 DIFF_OPT_SET(&rev.diffopt, ALLOW_TEXTCONV);
668
669 memset(&opt, 0, sizeof(opt));
670 opt.def = s->is_initial ? EMPTY_TREE_SHA1_HEX : s->reference;
671 setup_revisions(0, NULL, &rev, &opt);
672
673 rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
674 rev.diffopt.detect_rename = 1;
675 rev.diffopt.file = s->fp;
676 rev.diffopt.close_file = 0;
677 /*
678 * If we're not going to stdout, then we definitely don't
679 * want color, since we are going to the commit message
680 * file (and even the "auto" setting won't work, since it
681 * will have checked isatty on stdout).
682 */
683 if (s->fp != stdout)
684 DIFF_OPT_CLR(&rev.diffopt, COLOR_DIFF);
685 run_diff_index(&rev, 1);
686 }
687
688 static void wt_status_print_tracking(struct wt_status *s)
689 {
690 struct strbuf sb = STRBUF_INIT;
691 const char *cp, *ep;
692 struct branch *branch;
693
694 assert(s->branch && !s->is_initial);
695 if (prefixcmp(s->branch, "refs/heads/"))
696 return;
697 branch = branch_get(s->branch + 11);
698 if (!format_tracking_info(branch, &sb))
699 return;
700
701 for (cp = sb.buf; (ep = strchr(cp, '\n')) != NULL; cp = ep + 1)
702 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s),
703 "# %.*s", (int)(ep - cp), cp);
704 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s), "#");
705 }
706
707 void wt_status_print(struct wt_status *s)
708 {
709 const char *branch_color = color(WT_STATUS_ONBRANCH, s);
710 const char *branch_status_color = color(WT_STATUS_HEADER, s);
711
712 if (s->branch) {
713 const char *on_what = _("On branch ");
714 const char *branch_name = s->branch;
715 if (!prefixcmp(branch_name, "refs/heads/"))
716 branch_name += 11;
717 else if (!strcmp(branch_name, "HEAD")) {
718 branch_name = "";
719 branch_status_color = color(WT_STATUS_NOBRANCH, s);
720 on_what = _("Not currently on any branch.");
721 }
722 status_printf(s, color(WT_STATUS_HEADER, s), "");
723 status_printf_more(s, branch_status_color, "%s", on_what);
724 status_printf_more(s, branch_color, "%s\n", branch_name);
725 if (!s->is_initial)
726 wt_status_print_tracking(s);
727 }
728
729 if (s->is_initial) {
730 status_printf_ln(s, color(WT_STATUS_HEADER, s), "");
731 status_printf_ln(s, color(WT_STATUS_HEADER, s), _("Initial commit"));
732 status_printf_ln(s, color(WT_STATUS_HEADER, s), "");
733 }
734
735 wt_status_print_updated(s);
736 wt_status_print_unmerged(s);
737 wt_status_print_changed(s);
738 if (s->submodule_summary &&
739 (!s->ignore_submodule_arg ||
740 strcmp(s->ignore_submodule_arg, "all"))) {
741 wt_status_print_submodule_summary(s, 0); /* staged */
742 wt_status_print_submodule_summary(s, 1); /* unstaged */
743 }
744 if (s->show_untracked_files) {
745 wt_status_print_other(s, &s->untracked, _("Untracked"), "add");
746 if (s->show_ignored_files)
747 wt_status_print_other(s, &s->ignored, _("Ignored"), "add -f");
748 } else if (s->commitable)
749 status_printf_ln(s, GIT_COLOR_NORMAL, _("Untracked files not listed%s"),
750 advice_status_hints
751 ? _(" (use -u option to show untracked files)") : "");
752
753 if (s->verbose)
754 wt_status_print_verbose(s);
755 if (!s->commitable) {
756 if (s->amend)
757 status_printf_ln(s, GIT_COLOR_NORMAL, _("No changes"));
758 else if (s->nowarn)
759 ; /* nothing */
760 else if (s->workdir_dirty)
761 printf(_("no changes added to commit%s\n"),
762 advice_status_hints
763 ? _(" (use \"git add\" and/or \"git commit -a\")") : "");
764 else if (s->untracked.nr)
765 printf(_("nothing added to commit but untracked files present%s\n"),
766 advice_status_hints
767 ? _(" (use \"git add\" to track)") : "");
768 else if (s->is_initial)
769 printf(_("nothing to commit%s\n"), advice_status_hints
770 ? _(" (create/copy files and use \"git add\" to track)") : "");
771 else if (!s->show_untracked_files)
772 printf(_("nothing to commit%s\n"), advice_status_hints
773 ? _(" (use -u to show untracked files)") : "");
774 else
775 printf(_("nothing to commit%s\n"), advice_status_hints
776 ? _(" (working directory clean)") : "");
777 }
778 }
779
780 static void wt_shortstatus_unmerged(int null_termination, struct string_list_item *it,
781 struct wt_status *s)
782 {
783 struct wt_status_change_data *d = it->util;
784 const char *how = "??";
785
786 switch (d->stagemask) {
787 case 1: how = "DD"; break; /* both deleted */
788 case 2: how = "AU"; break; /* added by us */
789 case 3: how = "UD"; break; /* deleted by them */
790 case 4: how = "UA"; break; /* added by them */
791 case 5: how = "DU"; break; /* deleted by us */
792 case 6: how = "AA"; break; /* both added */
793 case 7: how = "UU"; break; /* both modified */
794 }
795 color_fprintf(s->fp, color(WT_STATUS_UNMERGED, s), "%s", how);
796 if (null_termination) {
797 fprintf(stdout, " %s%c", it->string, 0);
798 } else {
799 struct strbuf onebuf = STRBUF_INIT;
800 const char *one;
801 one = quote_path(it->string, -1, &onebuf, s->prefix);
802 printf(" %s\n", one);
803 strbuf_release(&onebuf);
804 }
805 }
806
807 static void wt_shortstatus_status(int null_termination, struct string_list_item *it,
808 struct wt_status *s)
809 {
810 struct wt_status_change_data *d = it->util;
811
812 if (d->index_status)
813 color_fprintf(s->fp, color(WT_STATUS_UPDATED, s), "%c", d->index_status);
814 else
815 putchar(' ');
816 if (d->worktree_status)
817 color_fprintf(s->fp, color(WT_STATUS_CHANGED, s), "%c", d->worktree_status);
818 else
819 putchar(' ');
820 putchar(' ');
821 if (null_termination) {
822 fprintf(stdout, "%s%c", it->string, 0);
823 if (d->head_path)
824 fprintf(stdout, "%s%c", d->head_path, 0);
825 } else {
826 struct strbuf onebuf = STRBUF_INIT;
827 const char *one;
828 if (d->head_path) {
829 one = quote_path(d->head_path, -1, &onebuf, s->prefix);
830 if (*one != '"' && strchr(one, ' ') != NULL) {
831 putchar('"');
832 strbuf_addch(&onebuf, '"');
833 one = onebuf.buf;
834 }
835 printf("%s -> ", one);
836 strbuf_release(&onebuf);
837 }
838 one = quote_path(it->string, -1, &onebuf, s->prefix);
839 if (*one != '"' && strchr(one, ' ') != NULL) {
840 putchar('"');
841 strbuf_addch(&onebuf, '"');
842 one = onebuf.buf;
843 }
844 printf("%s\n", one);
845 strbuf_release(&onebuf);
846 }
847 }
848
849 static void wt_shortstatus_other(int null_termination, struct string_list_item *it,
850 struct wt_status *s, const char *sign)
851 {
852 if (null_termination) {
853 fprintf(stdout, "%s %s%c", sign, it->string, 0);
854 } else {
855 struct strbuf onebuf = STRBUF_INIT;
856 const char *one;
857 one = quote_path(it->string, -1, &onebuf, s->prefix);
858 color_fprintf(s->fp, color(WT_STATUS_UNTRACKED, s), "%s", sign);
859 printf(" %s\n", one);
860 strbuf_release(&onebuf);
861 }
862 }
863
864 static void wt_shortstatus_print_tracking(struct wt_status *s)
865 {
866 struct branch *branch;
867 const char *header_color = color(WT_STATUS_HEADER, s);
868 const char *branch_color_local = color(WT_STATUS_LOCAL_BRANCH, s);
869 const char *branch_color_remote = color(WT_STATUS_REMOTE_BRANCH, s);
870
871 const char *base;
872 const char *branch_name;
873 int num_ours, num_theirs;
874
875 color_fprintf(s->fp, color(WT_STATUS_HEADER, s), "## ");
876
877 if (!s->branch)
878 return;
879 branch_name = s->branch;
880
881 if (!prefixcmp(branch_name, "refs/heads/"))
882 branch_name += 11;
883 else if (!strcmp(branch_name, "HEAD")) {
884 branch_name = _("HEAD (no branch)");
885 branch_color_local = color(WT_STATUS_NOBRANCH, s);
886 }
887
888 branch = branch_get(s->branch + 11);
889 if (s->is_initial)
890 color_fprintf(s->fp, header_color, _("Initial commit on "));
891 if (!stat_tracking_info(branch, &num_ours, &num_theirs)) {
892 color_fprintf_ln(s->fp, branch_color_local,
893 "%s", branch_name);
894 return;
895 }
896
897 base = branch->merge[0]->dst;
898 base = shorten_unambiguous_ref(base, 0);
899 color_fprintf(s->fp, branch_color_local, "%s", branch_name);
900 color_fprintf(s->fp, header_color, "...");
901 color_fprintf(s->fp, branch_color_remote, "%s", base);
902
903 color_fprintf(s->fp, header_color, " [");
904 if (!num_ours) {
905 color_fprintf(s->fp, header_color, _("behind "));
906 color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
907 } else if (!num_theirs) {
908 color_fprintf(s->fp, header_color, _("ahead "));
909 color_fprintf(s->fp, branch_color_local, "%d", num_ours);
910 } else {
911 color_fprintf(s->fp, header_color, _("ahead "));
912 color_fprintf(s->fp, branch_color_local, "%d", num_ours);
913 color_fprintf(s->fp, header_color, _(", behind "));
914 color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
915 }
916
917 color_fprintf_ln(s->fp, header_color, "]");
918 }
919
920 void wt_shortstatus_print(struct wt_status *s, int null_termination, int show_branch)
921 {
922 int i;
923
924 if (show_branch)
925 wt_shortstatus_print_tracking(s);
926
927 for (i = 0; i < s->change.nr; i++) {
928 struct wt_status_change_data *d;
929 struct string_list_item *it;
930
931 it = &(s->change.items[i]);
932 d = it->util;
933 if (d->stagemask)
934 wt_shortstatus_unmerged(null_termination, it, s);
935 else
936 wt_shortstatus_status(null_termination, it, s);
937 }
938 for (i = 0; i < s->untracked.nr; i++) {
939 struct string_list_item *it;
940
941 it = &(s->untracked.items[i]);
942 wt_shortstatus_other(null_termination, it, s, "??");
943 }
944 for (i = 0; i < s->ignored.nr; i++) {
945 struct string_list_item *it;
946
947 it = &(s->ignored.items[i]);
948 wt_shortstatus_other(null_termination, it, s, "!!");
949 }
950 }
951
952 void wt_porcelain_print(struct wt_status *s, int null_termination)
953 {
954 s->use_color = 0;
955 s->relative_paths = 0;
956 s->prefix = NULL;
957 wt_shortstatus_print(s, null_termination, 0);
958 }
git with Jakub Narębski modifications