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