?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
commit: don't be fooled by ita entries when creating initial commit
[git/raj.git] / wt-status.c
blob5b0965ef27556bbb99052044dab8840350fd3274
1 #include "cache.h"
2 #include "wt-status.h"
3 #include "object.h"
4 #include "dir.h"
5 #include "commit.h"
6 #include "diff.h"
7 #include "revision.h"
8 #include "diffcore.h"
9 #include "quote.h"
10 #include "run-command.h"
11 #include "argv-array.h"
12 #include "remote.h"
13 #include "refs.h"
14 #include "submodule.h"
15 #include "column.h"
16 #include "strbuf.h"
17 #include "utf8.h"
18 #include "worktree.h"
19
20 static const 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", 0, sha1, 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_longstatus_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, "%s", "");
192 }
193
194 static void wt_longstatus_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, "%s", "");
208 }
209
210 static void wt_longstatus_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, "%s", "");
227 }
228
229 static void wt_longstatus_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, "%s", "");
239 }
240
241 static void wt_longstatus_print_trailer(struct wt_status *s)
242 {
243 status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", "");
244 }
245
246 #define quote_path quote_path_relative
247
248 static const char *wt_status_unmerged_status_string(int stagemask)
249 {
250 switch (stagemask) {
251 case 1:
252 return _("both deleted:");
253 case 2:
254 return _("added by us:");
255 case 3:
256 return _("deleted by them:");
257 case 4:
258 return _("added by them:");
259 case 5:
260 return _("deleted by us:");
261 case 6:
262 return _("both added:");
263 case 7:
264 return _("both modified:");
265 default:
266 die("BUG: unhandled unmerged status %x", stagemask);
267 }
268 }
269
270 static const char *wt_status_diff_status_string(int status)
271 {
272 switch (status) {
273 case DIFF_STATUS_ADDED:
274 return _("new file:");
275 case DIFF_STATUS_COPIED:
276 return _("copied:");
277 case DIFF_STATUS_DELETED:
278 return _("deleted:");
279 case DIFF_STATUS_MODIFIED:
280 return _("modified:");
281 case DIFF_STATUS_RENAMED:
282 return _("renamed:");
283 case DIFF_STATUS_TYPE_CHANGED:
284 return _("typechange:");
285 case DIFF_STATUS_UNKNOWN:
286 return _("unknown:");
287 case DIFF_STATUS_UNMERGED:
288 return _("unmerged:");
289 default:
290 return NULL;
291 }
292 }
293
294 static int maxwidth(const char *(*label)(int), int minval, int maxval)
295 {
296 int result = 0, i;
297
298 for (i = minval; i <= maxval; i++) {
299 const char *s = label(i);
300 int len = s ? utf8_strwidth(s) : 0;
301 if (len > result)
302 result = len;
303 }
304 return result;
305 }
306
307 static void wt_longstatus_print_unmerged_data(struct wt_status *s,
308 struct string_list_item *it)
309 {
310 const char *c = color(WT_STATUS_UNMERGED, s);
311 struct wt_status_change_data *d = it->util;
312 struct strbuf onebuf = STRBUF_INIT;
313 static char *padding;
314 static int label_width;
315 const char *one, *how;
316 int len;
317
318 if (!padding) {
319 label_width = maxwidth(wt_status_unmerged_status_string, 1, 7);
320 label_width += strlen(" ");
321 padding = xmallocz(label_width);
322 memset(padding, ' ', label_width);
323 }
324
325 one = quote_path(it->string, s->prefix, &onebuf);
326 status_printf(s, color(WT_STATUS_HEADER, s), "\t");
327
328 how = wt_status_unmerged_status_string(d->stagemask);
329 len = label_width - utf8_strwidth(how);
330 status_printf_more(s, c, "%s%.*s%s\n", how, len, padding, one);
331 strbuf_release(&onebuf);
332 }
333
334 static void wt_longstatus_print_change_data(struct wt_status *s,
335 int change_type,
336 struct string_list_item *it)
337 {
338 struct wt_status_change_data *d = it->util;
339 const char *c = color(change_type, s);
340 int status;
341 char *one_name;
342 char *two_name;
343 const char *one, *two;
344 struct strbuf onebuf = STRBUF_INIT, twobuf = STRBUF_INIT;
345 struct strbuf extra = STRBUF_INIT;
346 static char *padding;
347 static int label_width;
348 const char *what;
349 int len;
350
351 if (!padding) {
352 /* If DIFF_STATUS_* uses outside the range [A..Z], we're in trouble */
353 label_width = maxwidth(wt_status_diff_status_string, 'A', 'Z');
354 label_width += strlen(" ");
355 padding = xmallocz(label_width);
356 memset(padding, ' ', label_width);
357 }
358
359 one_name = two_name = it->string;
360 switch (change_type) {
361 case WT_STATUS_UPDATED:
362 status = d->index_status;
363 if (d->head_path)
364 one_name = d->head_path;
365 break;
366 case WT_STATUS_CHANGED:
367 if (d->new_submodule_commits || d->dirty_submodule) {
368 strbuf_addstr(&extra, " (");
369 if (d->new_submodule_commits)
370 strbuf_addstr(&extra, _("new commits, "));
371 if (d->dirty_submodule & DIRTY_SUBMODULE_MODIFIED)
372 strbuf_addstr(&extra, _("modified content, "));
373 if (d->dirty_submodule & DIRTY_SUBMODULE_UNTRACKED)
374 strbuf_addstr(&extra, _("untracked content, "));
375 strbuf_setlen(&extra, extra.len - 2);
376 strbuf_addch(&extra, ')');
377 }
378 status = d->worktree_status;
379 break;
380 default:
381 die("BUG: unhandled change_type %d in wt_longstatus_print_change_data",
382 change_type);
383 }
384
385 one = quote_path(one_name, s->prefix, &onebuf);
386 two = quote_path(two_name, s->prefix, &twobuf);
387
388 status_printf(s, color(WT_STATUS_HEADER, s), "\t");
389 what = wt_status_diff_status_string(status);
390 if (!what)
391 die("BUG: unhandled diff status %c", status);
392 len = label_width - utf8_strwidth(what);
393 assert(len >= 0);
394 if (status == DIFF_STATUS_COPIED || status == DIFF_STATUS_RENAMED)
395 status_printf_more(s, c, "%s%.*s%s -> %s",
396 what, len, padding, one, two);
397 else
398 status_printf_more(s, c, "%s%.*s%s",
399 what, len, padding, one);
400 if (extra.len) {
401 status_printf_more(s, color(WT_STATUS_HEADER, s), "%s", extra.buf);
402 strbuf_release(&extra);
403 }
404 status_printf_more(s, GIT_COLOR_NORMAL, "\n");
405 strbuf_release(&onebuf);
406 strbuf_release(&twobuf);
407 }
408
409 static void wt_status_collect_changed_cb(struct diff_queue_struct *q,
410 struct diff_options *options,
411 void *data)
412 {
413 struct wt_status *s = data;
414 int i;
415
416 if (!q->nr)
417 return;
418 s->workdir_dirty = 1;
419 for (i = 0; i < q->nr; i++) {
420 struct diff_filepair *p;
421 struct string_list_item *it;
422 struct wt_status_change_data *d;
423
424 p = q->queue[i];
425 it = string_list_insert(&s->change, p->one->path);
426 d = it->util;
427 if (!d) {
428 d = xcalloc(1, sizeof(*d));
429 it->util = d;
430 }
431 if (!d->worktree_status)
432 d->worktree_status = p->status;
433 d->dirty_submodule = p->two->dirty_submodule;
434 if (S_ISGITLINK(p->two->mode))
435 d->new_submodule_commits = !!oidcmp(&p->one->oid,
436 &p->two->oid);
437
438 switch (p->status) {
439 case DIFF_STATUS_ADDED:
440 d->mode_worktree = p->two->mode;
441 break;
442
443 case DIFF_STATUS_DELETED:
444 d->mode_index = p->one->mode;
445 oidcpy(&d->oid_index, &p->one->oid);
446 /* mode_worktree is zero for a delete. */
447 break;
448
449 case DIFF_STATUS_MODIFIED:
450 case DIFF_STATUS_TYPE_CHANGED:
451 case DIFF_STATUS_UNMERGED:
452 d->mode_index = p->one->mode;
453 d->mode_worktree = p->two->mode;
454 oidcpy(&d->oid_index, &p->one->oid);
455 break;
456
457 case DIFF_STATUS_UNKNOWN:
458 die("BUG: worktree status unknown???");
459 break;
460 }
461
462 }
463 }
464
465 static int unmerged_mask(const char *path)
466 {
467 int pos, mask;
468 const struct cache_entry *ce;
469
470 pos = cache_name_pos(path, strlen(path));
471 if (0 <= pos)
472 return 0;
473
474 mask = 0;
475 pos = -pos-1;
476 while (pos < active_nr) {
477 ce = active_cache[pos++];
478 if (strcmp(ce->name, path) || !ce_stage(ce))
479 break;
480 mask |= (1 << (ce_stage(ce) - 1));
481 }
482 return mask;
483 }
484
485 static void wt_status_collect_updated_cb(struct diff_queue_struct *q,
486 struct diff_options *options,
487 void *data)
488 {
489 struct wt_status *s = data;
490 int i;
491
492 for (i = 0; i < q->nr; i++) {
493 struct diff_filepair *p;
494 struct string_list_item *it;
495 struct wt_status_change_data *d;
496
497 p = q->queue[i];
498 it = string_list_insert(&s->change, p->two->path);
499 d = it->util;
500 if (!d) {
501 d = xcalloc(1, sizeof(*d));
502 it->util = d;
503 }
504 if (!d->index_status)
505 d->index_status = p->status;
506 switch (p->status) {
507 case DIFF_STATUS_ADDED:
508 /* Leave {mode,oid}_head zero for an add. */
509 d->mode_index = p->two->mode;
510 oidcpy(&d->oid_index, &p->two->oid);
511 break;
512 case DIFF_STATUS_DELETED:
513 d->mode_head = p->one->mode;
514 oidcpy(&d->oid_head, &p->one->oid);
515 /* Leave {mode,oid}_index zero for a delete. */
516 break;
517
518 case DIFF_STATUS_COPIED:
519 case DIFF_STATUS_RENAMED:
520 d->head_path = xstrdup(p->one->path);
521 d->score = p->score * 100 / MAX_SCORE;
522 /* fallthru */
523 case DIFF_STATUS_MODIFIED:
524 case DIFF_STATUS_TYPE_CHANGED:
525 d->mode_head = p->one->mode;
526 d->mode_index = p->two->mode;
527 oidcpy(&d->oid_head, &p->one->oid);
528 oidcpy(&d->oid_index, &p->two->oid);
529 break;
530 case DIFF_STATUS_UNMERGED:
531 d->stagemask = unmerged_mask(p->two->path);
532 /*
533 * Don't bother setting {mode,oid}_{head,index} since the print
534 * code will output the stage values directly and not use the
535 * values in these fields.
536 */
537 break;
538 }
539 }
540 }
541
542 static void wt_status_collect_changes_worktree(struct wt_status *s)
543 {
544 struct rev_info rev;
545
546 init_revisions(&rev, NULL);
547 setup_revisions(0, NULL, &rev, NULL);
548 rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
549 DIFF_OPT_SET(&rev.diffopt, DIRTY_SUBMODULES);
550 rev.diffopt.ita_invisible_in_index = 1;
551 if (!s->show_untracked_files)
552 DIFF_OPT_SET(&rev.diffopt, IGNORE_UNTRACKED_IN_SUBMODULES);
553 if (s->ignore_submodule_arg) {
554 DIFF_OPT_SET(&rev.diffopt, OVERRIDE_SUBMODULE_CONFIG);
555 handle_ignore_submodules_arg(&rev.diffopt, s->ignore_submodule_arg);
556 }
557 rev.diffopt.format_callback = wt_status_collect_changed_cb;
558 rev.diffopt.format_callback_data = s;
559 copy_pathspec(&rev.prune_data, &s->pathspec);
560 run_diff_files(&rev, 0);
561 }
562
563 static void wt_status_collect_changes_index(struct wt_status *s)
564 {
565 struct rev_info rev;
566 struct setup_revision_opt opt;
567
568 init_revisions(&rev, NULL);
569 memset(&opt, 0, sizeof(opt));
570 opt.def = s->is_initial ? EMPTY_TREE_SHA1_HEX : s->reference;
571 setup_revisions(0, NULL, &rev, &opt);
572
573 DIFF_OPT_SET(&rev.diffopt, OVERRIDE_SUBMODULE_CONFIG);
574 rev.diffopt.ita_invisible_in_index = 1;
575 if (s->ignore_submodule_arg) {
576 handle_ignore_submodules_arg(&rev.diffopt, s->ignore_submodule_arg);
577 } else {
578 /*
579 * Unless the user did explicitly request a submodule ignore
580 * mode by passing a command line option we do not ignore any
581 * changed submodule SHA-1s when comparing index and HEAD, no
582 * matter what is configured. Otherwise the user won't be
583 * shown any submodules she manually added (and which are
584 * staged to be committed), which would be really confusing.
585 */
586 handle_ignore_submodules_arg(&rev.diffopt, "dirty");
587 }
588
589 rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
590 rev.diffopt.format_callback = wt_status_collect_updated_cb;
591 rev.diffopt.format_callback_data = s;
592 rev.diffopt.detect_rename = 1;
593 rev.diffopt.rename_limit = 200;
594 rev.diffopt.break_opt = 0;
595 copy_pathspec(&rev.prune_data, &s->pathspec);
596 run_diff_index(&rev, 1);
597 }
598
599 static void wt_status_collect_changes_initial(struct wt_status *s)
600 {
601 int i;
602
603 for (i = 0; i < active_nr; i++) {
604 struct string_list_item *it;
605 struct wt_status_change_data *d;
606 const struct cache_entry *ce = active_cache[i];
607
608 if (!ce_path_match(ce, &s->pathspec, NULL))
609 continue;
610 if (ce_intent_to_add(ce))
611 continue;
612 it = string_list_insert(&s->change, ce->name);
613 d = it->util;
614 if (!d) {
615 d = xcalloc(1, sizeof(*d));
616 it->util = d;
617 }
618 if (ce_stage(ce)) {
619 d->index_status = DIFF_STATUS_UNMERGED;
620 d->stagemask |= (1 << (ce_stage(ce) - 1));
621 /*
622 * Don't bother setting {mode,oid}_{head,index} since the print
623 * code will output the stage values directly and not use the
624 * values in these fields.
625 */
626 } else {
627 d->index_status = DIFF_STATUS_ADDED;
628 /* Leave {mode,oid}_head zero for adds. */
629 d->mode_index = ce->ce_mode;
630 hashcpy(d->oid_index.hash, ce->oid.hash);
631 }
632 }
633 }
634
635 static void wt_status_collect_untracked(struct wt_status *s)
636 {
637 int i;
638 struct dir_struct dir;
639 uint64_t t_begin = getnanotime();
640
641 if (!s->show_untracked_files)
642 return;
643
644 memset(&dir, 0, sizeof(dir));
645 if (s->show_untracked_files != SHOW_ALL_UNTRACKED_FILES)
646 dir.flags |=
647 DIR_SHOW_OTHER_DIRECTORIES | DIR_HIDE_EMPTY_DIRECTORIES;
648 if (s->show_ignored_files)
649 dir.flags |= DIR_SHOW_IGNORED_TOO;
650 else
651 dir.untracked = the_index.untracked;
652 setup_standard_excludes(&dir);
653
654 fill_directory(&dir, &s->pathspec);
655
656 for (i = 0; i < dir.nr; i++) {
657 struct dir_entry *ent = dir.entries[i];
658 if (cache_name_is_other(ent->name, ent->len) &&
659 dir_path_match(ent, &s->pathspec, 0, NULL))
660 string_list_insert(&s->untracked, ent->name);
661 free(ent);
662 }
663
664 for (i = 0; i < dir.ignored_nr; i++) {
665 struct dir_entry *ent = dir.ignored[i];
666 if (cache_name_is_other(ent->name, ent->len) &&
667 dir_path_match(ent, &s->pathspec, 0, NULL))
668 string_list_insert(&s->ignored, ent->name);
669 free(ent);
670 }
671
672 free(dir.entries);
673 free(dir.ignored);
674 clear_directory(&dir);
675
676 if (advice_status_u_option)
677 s->untracked_in_ms = (getnanotime() - t_begin) / 1000000;
678 }
679
680 void wt_status_collect(struct wt_status *s)
681 {
682 wt_status_collect_changes_worktree(s);
683
684 if (s->is_initial)
685 wt_status_collect_changes_initial(s);
686 else
687 wt_status_collect_changes_index(s);
688 wt_status_collect_untracked(s);
689 }
690
691 static void wt_longstatus_print_unmerged(struct wt_status *s)
692 {
693 int shown_header = 0;
694 int i;
695
696 for (i = 0; i < s->change.nr; i++) {
697 struct wt_status_change_data *d;
698 struct string_list_item *it;
699 it = &(s->change.items[i]);
700 d = it->util;
701 if (!d->stagemask)
702 continue;
703 if (!shown_header) {
704 wt_longstatus_print_unmerged_header(s);
705 shown_header = 1;
706 }
707 wt_longstatus_print_unmerged_data(s, it);
708 }
709 if (shown_header)
710 wt_longstatus_print_trailer(s);
711
712 }
713
714 static void wt_longstatus_print_updated(struct wt_status *s)
715 {
716 int shown_header = 0;
717 int i;
718
719 for (i = 0; i < s->change.nr; i++) {
720 struct wt_status_change_data *d;
721 struct string_list_item *it;
722 it = &(s->change.items[i]);
723 d = it->util;
724 if (!d->index_status ||
725 d->index_status == DIFF_STATUS_UNMERGED)
726 continue;
727 if (!shown_header) {
728 wt_longstatus_print_cached_header(s);
729 s->commitable = 1;
730 shown_header = 1;
731 }
732 wt_longstatus_print_change_data(s, WT_STATUS_UPDATED, it);
733 }
734 if (shown_header)
735 wt_longstatus_print_trailer(s);
736 }
737
738 /*
739 * -1 : has delete
740 * 0 : no change
741 * 1 : some change but no delete
742 */
743 static int wt_status_check_worktree_changes(struct wt_status *s,
744 int *dirty_submodules)
745 {
746 int i;
747 int changes = 0;
748
749 *dirty_submodules = 0;
750
751 for (i = 0; i < s->change.nr; i++) {
752 struct wt_status_change_data *d;
753 d = s->change.items[i].util;
754 if (!d->worktree_status ||
755 d->worktree_status == DIFF_STATUS_UNMERGED)
756 continue;
757 if (!changes)
758 changes = 1;
759 if (d->dirty_submodule)
760 *dirty_submodules = 1;
761 if (d->worktree_status == DIFF_STATUS_DELETED)
762 changes = -1;
763 }
764 return changes;
765 }
766
767 static void wt_longstatus_print_changed(struct wt_status *s)
768 {
769 int i, dirty_submodules;
770 int worktree_changes = wt_status_check_worktree_changes(s, &dirty_submodules);
771
772 if (!worktree_changes)
773 return;
774
775 wt_longstatus_print_dirty_header(s, worktree_changes < 0, dirty_submodules);
776
777 for (i = 0; i < s->change.nr; i++) {
778 struct wt_status_change_data *d;
779 struct string_list_item *it;
780 it = &(s->change.items[i]);
781 d = it->util;
782 if (!d->worktree_status ||
783 d->worktree_status == DIFF_STATUS_UNMERGED)
784 continue;
785 wt_longstatus_print_change_data(s, WT_STATUS_CHANGED, it);
786 }
787 wt_longstatus_print_trailer(s);
788 }
789
790 static void wt_longstatus_print_submodule_summary(struct wt_status *s, int uncommitted)
791 {
792 struct child_process sm_summary = CHILD_PROCESS_INIT;
793 struct strbuf cmd_stdout = STRBUF_INIT;
794 struct strbuf summary = STRBUF_INIT;
795 char *summary_content;
796
797 argv_array_pushf(&sm_summary.env_array, "GIT_INDEX_FILE=%s",
798 s->index_file);
799
800 argv_array_push(&sm_summary.args, "submodule");
801 argv_array_push(&sm_summary.args, "summary");
802 argv_array_push(&sm_summary.args, uncommitted ? "--files" : "--cached");
803 argv_array_push(&sm_summary.args, "--for-status");
804 argv_array_push(&sm_summary.args, "--summary-limit");
805 argv_array_pushf(&sm_summary.args, "%d", s->submodule_summary);
806 if (!uncommitted)
807 argv_array_push(&sm_summary.args, s->amend ? "HEAD^" : "HEAD");
808
809 sm_summary.git_cmd = 1;
810 sm_summary.no_stdin = 1;
811
812 capture_command(&sm_summary, &cmd_stdout, 1024);
813
814 /* prepend header, only if there's an actual output */
815 if (cmd_stdout.len) {
816 if (uncommitted)
817 strbuf_addstr(&summary, _("Submodules changed but not updated:"));
818 else
819 strbuf_addstr(&summary, _("Submodule changes to be committed:"));
820 strbuf_addstr(&summary, "\n\n");
821 }
822 strbuf_addbuf(&summary, &cmd_stdout);
823 strbuf_release(&cmd_stdout);
824
825 if (s->display_comment_prefix) {
826 size_t len;
827 summary_content = strbuf_detach(&summary, &len);
828 strbuf_add_commented_lines(&summary, summary_content, len);
829 free(summary_content);
830 }
831
832 fputs(summary.buf, s->fp);
833 strbuf_release(&summary);
834 }
835
836 static void wt_longstatus_print_other(struct wt_status *s,
837 struct string_list *l,
838 const char *what,
839 const char *how)
840 {
841 int i;
842 struct strbuf buf = STRBUF_INIT;
843 static struct string_list output = STRING_LIST_INIT_DUP;
844 struct column_options copts;
845
846 if (!l->nr)
847 return;
848
849 wt_longstatus_print_other_header(s, what, how);
850
851 for (i = 0; i < l->nr; i++) {
852 struct string_list_item *it;
853 const char *path;
854 it = &(l->items[i]);
855 path = quote_path(it->string, s->prefix, &buf);
856 if (column_active(s->colopts)) {
857 string_list_append(&output, path);
858 continue;
859 }
860 status_printf(s, color(WT_STATUS_HEADER, s), "\t");
861 status_printf_more(s, color(WT_STATUS_UNTRACKED, s),
862 "%s\n", path);
863 }
864
865 strbuf_release(&buf);
866 if (!column_active(s->colopts))
867 goto conclude;
868
869 strbuf_addf(&buf, "%s%s\t%s",
870 color(WT_STATUS_HEADER, s),
871 s->display_comment_prefix ? "#" : "",
872 color(WT_STATUS_UNTRACKED, s));
873 memset(&copts, 0, sizeof(copts));
874 copts.padding = 1;
875 copts.indent = buf.buf;
876 if (want_color(s->use_color))
877 copts.nl = GIT_COLOR_RESET "\n";
878 print_columns(&output, s->colopts, &copts);
879 string_list_clear(&output, 0);
880 strbuf_release(&buf);
881 conclude:
882 status_printf_ln(s, GIT_COLOR_NORMAL, "%s", "");
883 }
884
885 void wt_status_truncate_message_at_cut_line(struct strbuf *buf)
886 {
887 const char *p;
888 struct strbuf pattern = STRBUF_INIT;
889
890 strbuf_addf(&pattern, "\n%c %s", comment_line_char, cut_line);
891 if (starts_with(buf->buf, pattern.buf + 1))
892 strbuf_setlen(buf, 0);
893 else if ((p = strstr(buf->buf, pattern.buf)))
894 strbuf_setlen(buf, p - buf->buf + 1);
895 strbuf_release(&pattern);
896 }
897
898 void wt_status_add_cut_line(FILE *fp)
899 {
900 const char *explanation = _("Do not touch the line above.\nEverything below will be removed.");
901 struct strbuf buf = STRBUF_INIT;
902
903 fprintf(fp, "%c %s", comment_line_char, cut_line);
904 strbuf_add_commented_lines(&buf, explanation, strlen(explanation));
905 fputs(buf.buf, fp);
906 strbuf_release(&buf);
907 }
908
909 static void wt_longstatus_print_verbose(struct wt_status *s)
910 {
911 struct rev_info rev;
912 struct setup_revision_opt opt;
913 int dirty_submodules;
914 const char *c = color(WT_STATUS_HEADER, s);
915
916 init_revisions(&rev, NULL);
917 DIFF_OPT_SET(&rev.diffopt, ALLOW_TEXTCONV);
918 rev.diffopt.ita_invisible_in_index = 1;
919
920 memset(&opt, 0, sizeof(opt));
921 opt.def = s->is_initial ? EMPTY_TREE_SHA1_HEX : s->reference;
922 setup_revisions(0, NULL, &rev, &opt);
923
924 rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
925 rev.diffopt.detect_rename = 1;
926 rev.diffopt.file = s->fp;
927 rev.diffopt.close_file = 0;
928 /*
929 * If we're not going to stdout, then we definitely don't
930 * want color, since we are going to the commit message
931 * file (and even the "auto" setting won't work, since it
932 * will have checked isatty on stdout). But we then do want
933 * to insert the scissor line here to reliably remove the
934 * diff before committing.
935 */
936 if (s->fp != stdout) {
937 rev.diffopt.use_color = 0;
938 wt_status_add_cut_line(s->fp);
939 }
940 if (s->verbose > 1 && s->commitable) {
941 /* print_updated() printed a header, so do we */
942 if (s->fp != stdout)
943 wt_longstatus_print_trailer(s);
944 status_printf_ln(s, c, _("Changes to be committed:"));
945 rev.diffopt.a_prefix = "c/";
946 rev.diffopt.b_prefix = "i/";
947 } /* else use prefix as per user config */
948 run_diff_index(&rev, 1);
949 if (s->verbose > 1 &&
950 wt_status_check_worktree_changes(s, &dirty_submodules)) {
951 status_printf_ln(s, c,
952 "--------------------------------------------------");
953 status_printf_ln(s, c, _("Changes not staged for commit:"));
954 setup_work_tree();
955 rev.diffopt.a_prefix = "i/";
956 rev.diffopt.b_prefix = "w/";
957 run_diff_files(&rev, 0);
958 }
959 }
960
961 static void wt_longstatus_print_tracking(struct wt_status *s)
962 {
963 struct strbuf sb = STRBUF_INIT;
964 const char *cp, *ep, *branch_name;
965 struct branch *branch;
966 char comment_line_string[3];
967 int i;
968
969 assert(s->branch && !s->is_initial);
970 if (!skip_prefix(s->branch, "refs/heads/", &branch_name))
971 return;
972 branch = branch_get(branch_name);
973 if (!format_tracking_info(branch, &sb))
974 return;
975
976 i = 0;
977 if (s->display_comment_prefix) {
978 comment_line_string[i++] = comment_line_char;
979 comment_line_string[i++] = ' ';
980 }
981 comment_line_string[i] = '\0';
982
983 for (cp = sb.buf; (ep = strchr(cp, '\n')) != NULL; cp = ep + 1)
984 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s),
985 "%s%.*s", comment_line_string,
986 (int)(ep - cp), cp);
987 if (s->display_comment_prefix)
988 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s), "%c",
989 comment_line_char);
990 else
991 fputs("", s->fp);
992 }
993
994 static int has_unmerged(struct wt_status *s)
995 {
996 int i;
997
998 for (i = 0; i < s->change.nr; i++) {
999 struct wt_status_change_data *d;
1000 d = s->change.items[i].util;
1001 if (d->stagemask)
1002 return 1;
1003 }
1004 return 0;
1005 }
1006
1007 static void show_merge_in_progress(struct wt_status *s,
1008 struct wt_status_state *state,
1009 const char *color)
1010 {
1011 if (has_unmerged(s)) {
1012 status_printf_ln(s, color, _("You have unmerged paths."));
1013 if (s->hints) {
1014 status_printf_ln(s, color,
1015 _(" (fix conflicts and run \"git commit\")"));
1016 status_printf_ln(s, color,
1017 _(" (use \"git merge --abort\" to abort the merge)"));
1018 }
1019 } else {
1020 s-> commitable = 1;
1021 status_printf_ln(s, color,
1022 _("All conflicts fixed but you are still merging."));
1023 if (s->hints)
1024 status_printf_ln(s, color,
1025 _(" (use \"git commit\" to conclude merge)"));
1026 }
1027 wt_longstatus_print_trailer(s);
1028 }
1029
1030 static void show_am_in_progress(struct wt_status *s,
1031 struct wt_status_state *state,
1032 const char *color)
1033 {
1034 status_printf_ln(s, color,
1035 _("You are in the middle of an am session."));
1036 if (state->am_empty_patch)
1037 status_printf_ln(s, color,
1038 _("The current patch is empty."));
1039 if (s->hints) {
1040 if (!state->am_empty_patch)
1041 status_printf_ln(s, color,
1042 _(" (fix conflicts and then run \"git am --continue\")"));
1043 status_printf_ln(s, color,
1044 _(" (use \"git am --skip\" to skip this patch)"));
1045 status_printf_ln(s, color,
1046 _(" (use \"git am --abort\" to restore the original branch)"));
1047 }
1048 wt_longstatus_print_trailer(s);
1049 }
1050
1051 static char *read_line_from_git_path(const char *filename)
1052 {
1053 struct strbuf buf = STRBUF_INIT;
1054 FILE *fp = fopen(git_path("%s", filename), "r");
1055 if (!fp) {
1056 strbuf_release(&buf);
1057 return NULL;
1058 }
1059 strbuf_getline_lf(&buf, fp);
1060 if (!fclose(fp)) {
1061 return strbuf_detach(&buf, NULL);
1062 } else {
1063 strbuf_release(&buf);
1064 return NULL;
1065 }
1066 }
1067
1068 static int split_commit_in_progress(struct wt_status *s)
1069 {
1070 int split_in_progress = 0;
1071 char *head = read_line_from_git_path("HEAD");
1072 char *orig_head = read_line_from_git_path("ORIG_HEAD");
1073 char *rebase_amend = read_line_from_git_path("rebase-merge/amend");
1074 char *rebase_orig_head = read_line_from_git_path("rebase-merge/orig-head");
1075
1076 if (!head || !orig_head || !rebase_amend || !rebase_orig_head ||
1077 !s->branch || strcmp(s->branch, "HEAD"))
1078 return split_in_progress;
1079
1080 if (!strcmp(rebase_amend, rebase_orig_head)) {
1081 if (strcmp(head, rebase_amend))
1082 split_in_progress = 1;
1083 } else if (strcmp(orig_head, rebase_orig_head)) {
1084 split_in_progress = 1;
1085 }
1086
1087 if (!s->amend && !s->nowarn && !s->workdir_dirty)
1088 split_in_progress = 0;
1089
1090 free(head);
1091 free(orig_head);
1092 free(rebase_amend);
1093 free(rebase_orig_head);
1094 return split_in_progress;
1095 }
1096
1097 /*
1098 * Turn
1099 * "pick d6a2f0303e897ec257dd0e0a39a5ccb709bc2047 some message"
1100 * into
1101 * "pick d6a2f03 some message"
1102 *
1103 * The function assumes that the line does not contain useless spaces
1104 * before or after the command.
1105 */
1106 static void abbrev_sha1_in_line(struct strbuf *line)
1107 {
1108 struct strbuf **split;
1109 int i;
1110
1111 if (starts_with(line->buf, "exec ") ||
1112 starts_with(line->buf, "x "))
1113 return;
1114
1115 split = strbuf_split_max(line, ' ', 3);
1116 if (split[0] && split[1]) {
1117 unsigned char sha1[20];
1118 const char *abbrev;
1119
1120 /*
1121 * strbuf_split_max left a space. Trim it and re-add
1122 * it after abbreviation.
1123 */
1124 strbuf_trim(split[1]);
1125 if (!get_sha1(split[1]->buf, sha1)) {
1126 abbrev = find_unique_abbrev(sha1, DEFAULT_ABBREV);
1127 strbuf_reset(split[1]);
1128 strbuf_addf(split[1], "%s ", abbrev);
1129 strbuf_reset(line);
1130 for (i = 0; split[i]; i++)
1131 strbuf_addbuf(line, split[i]);
1132 }
1133 }
1134 strbuf_list_free(split);
1135 }
1136
1137 static void read_rebase_todolist(const char *fname, struct string_list *lines)
1138 {
1139 struct strbuf line = STRBUF_INIT;
1140 FILE *f = fopen(git_path("%s", fname), "r");
1141
1142 if (!f)
1143 die_errno("Could not open file %s for reading",
1144 git_path("%s", fname));
1145 while (!strbuf_getline_lf(&line, f)) {
1146 if (line.len && line.buf[0] == comment_line_char)
1147 continue;
1148 strbuf_trim(&line);
1149 if (!line.len)
1150 continue;
1151 abbrev_sha1_in_line(&line);
1152 string_list_append(lines, line.buf);
1153 }
1154 }
1155
1156 static void show_rebase_information(struct wt_status *s,
1157 struct wt_status_state *state,
1158 const char *color)
1159 {
1160 if (state->rebase_interactive_in_progress) {
1161 int i;
1162 int nr_lines_to_show = 2;
1163
1164 struct string_list have_done = STRING_LIST_INIT_DUP;
1165 struct string_list yet_to_do = STRING_LIST_INIT_DUP;
1166
1167 read_rebase_todolist("rebase-merge/done", &have_done);
1168 read_rebase_todolist("rebase-merge/git-rebase-todo", &yet_to_do);
1169
1170 if (have_done.nr == 0)
1171 status_printf_ln(s, color, _("No commands done."));
1172 else {
1173 status_printf_ln(s, color,
1174 Q_("Last command done (%d command done):",
1175 "Last commands done (%d commands done):",
1176 have_done.nr),
1177 have_done.nr);
1178 for (i = (have_done.nr > nr_lines_to_show)
1179 ? have_done.nr - nr_lines_to_show : 0;
1180 i < have_done.nr;
1181 i++)
1182 status_printf_ln(s, color, " %s", have_done.items[i].string);
1183 if (have_done.nr > nr_lines_to_show && s->hints)
1184 status_printf_ln(s, color,
1185 _(" (see more in file %s)"), git_path("rebase-merge/done"));
1186 }
1187
1188 if (yet_to_do.nr == 0)
1189 status_printf_ln(s, color,
1190 _("No commands remaining."));
1191 else {
1192 status_printf_ln(s, color,
1193 Q_("Next command to do (%d remaining command):",
1194 "Next commands to do (%d remaining commands):",
1195 yet_to_do.nr),
1196 yet_to_do.nr);
1197 for (i = 0; i < nr_lines_to_show && i < yet_to_do.nr; i++)
1198 status_printf_ln(s, color, " %s", yet_to_do.items[i].string);
1199 if (s->hints)
1200 status_printf_ln(s, color,
1201 _(" (use \"git rebase --edit-todo\" to view and edit)"));
1202 }
1203 string_list_clear(&yet_to_do, 0);
1204 string_list_clear(&have_done, 0);
1205 }
1206 }
1207
1208 static void print_rebase_state(struct wt_status *s,
1209 struct wt_status_state *state,
1210 const char *color)
1211 {
1212 if (state->branch)
1213 status_printf_ln(s, color,
1214 _("You are currently rebasing branch '%s' on '%s'."),
1215 state->branch,
1216 state->onto);
1217 else
1218 status_printf_ln(s, color,
1219 _("You are currently rebasing."));
1220 }
1221
1222 static void show_rebase_in_progress(struct wt_status *s,
1223 struct wt_status_state *state,
1224 const char *color)
1225 {
1226 struct stat st;
1227
1228 show_rebase_information(s, state, color);
1229 if (has_unmerged(s)) {
1230 print_rebase_state(s, state, color);
1231 if (s->hints) {
1232 status_printf_ln(s, color,
1233 _(" (fix conflicts and then run \"git rebase --continue\")"));
1234 status_printf_ln(s, color,
1235 _(" (use \"git rebase --skip\" to skip this patch)"));
1236 status_printf_ln(s, color,
1237 _(" (use \"git rebase --abort\" to check out the original branch)"));
1238 }
1239 } else if (state->rebase_in_progress || !stat(git_path_merge_msg(), &st)) {
1240 print_rebase_state(s, state, color);
1241 if (s->hints)
1242 status_printf_ln(s, color,
1243 _(" (all conflicts fixed: run \"git rebase --continue\")"));
1244 } else if (split_commit_in_progress(s)) {
1245 if (state->branch)
1246 status_printf_ln(s, color,
1247 _("You are currently splitting a commit while rebasing branch '%s' on '%s'."),
1248 state->branch,
1249 state->onto);
1250 else
1251 status_printf_ln(s, color,
1252 _("You are currently splitting a commit during a rebase."));
1253 if (s->hints)
1254 status_printf_ln(s, color,
1255 _(" (Once your working directory is clean, run \"git rebase --continue\")"));
1256 } else {
1257 if (state->branch)
1258 status_printf_ln(s, color,
1259 _("You are currently editing a commit while rebasing branch '%s' on '%s'."),
1260 state->branch,
1261 state->onto);
1262 else
1263 status_printf_ln(s, color,
1264 _("You are currently editing a commit during a rebase."));
1265 if (s->hints && !s->amend) {
1266 status_printf_ln(s, color,
1267 _(" (use \"git commit --amend\" to amend the current commit)"));
1268 status_printf_ln(s, color,
1269 _(" (use \"git rebase --continue\" once you are satisfied with your changes)"));
1270 }
1271 }
1272 wt_longstatus_print_trailer(s);
1273 }
1274
1275 static void show_cherry_pick_in_progress(struct wt_status *s,
1276 struct wt_status_state *state,
1277 const char *color)
1278 {
1279 status_printf_ln(s, color, _("You are currently cherry-picking commit %s."),
1280 find_unique_abbrev(state->cherry_pick_head_sha1, DEFAULT_ABBREV));
1281 if (s->hints) {
1282 if (has_unmerged(s))
1283 status_printf_ln(s, color,
1284 _(" (fix conflicts and run \"git cherry-pick --continue\")"));
1285 else
1286 status_printf_ln(s, color,
1287 _(" (all conflicts fixed: run \"git cherry-pick --continue\")"));
1288 status_printf_ln(s, color,
1289 _(" (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"));
1290 }
1291 wt_longstatus_print_trailer(s);
1292 }
1293
1294 static void show_revert_in_progress(struct wt_status *s,
1295 struct wt_status_state *state,
1296 const char *color)
1297 {
1298 status_printf_ln(s, color, _("You are currently reverting commit %s."),
1299 find_unique_abbrev(state->revert_head_sha1, DEFAULT_ABBREV));
1300 if (s->hints) {
1301 if (has_unmerged(s))
1302 status_printf_ln(s, color,
1303 _(" (fix conflicts and run \"git revert --continue\")"));
1304 else
1305 status_printf_ln(s, color,
1306 _(" (all conflicts fixed: run \"git revert --continue\")"));
1307 status_printf_ln(s, color,
1308 _(" (use \"git revert --abort\" to cancel the revert operation)"));
1309 }
1310 wt_longstatus_print_trailer(s);
1311 }
1312
1313 static void show_bisect_in_progress(struct wt_status *s,
1314 struct wt_status_state *state,
1315 const char *color)
1316 {
1317 if (state->branch)
1318 status_printf_ln(s, color,
1319 _("You are currently bisecting, started from branch '%s'."),
1320 state->branch);
1321 else
1322 status_printf_ln(s, color,
1323 _("You are currently bisecting."));
1324 if (s->hints)
1325 status_printf_ln(s, color,
1326 _(" (use \"git bisect reset\" to get back to the original branch)"));
1327 wt_longstatus_print_trailer(s);
1328 }
1329
1330 /*
1331 * Extract branch information from rebase/bisect
1332 */
1333 static char *get_branch(const struct worktree *wt, const char *path)
1334 {
1335 struct strbuf sb = STRBUF_INIT;
1336 unsigned char sha1[20];
1337 const char *branch_name;
1338
1339 if (strbuf_read_file(&sb, worktree_git_path(wt, "%s", path), 0) <= 0)
1340 goto got_nothing;
1341
1342 while (sb.len && sb.buf[sb.len - 1] == '\n')
1343 strbuf_setlen(&sb, sb.len - 1);
1344 if (!sb.len)
1345 goto got_nothing;
1346 if (skip_prefix(sb.buf, "refs/heads/", &branch_name))
1347 strbuf_remove(&sb, 0, branch_name - sb.buf);
1348 else if (starts_with(sb.buf, "refs/"))
1349 ;
1350 else if (!get_sha1_hex(sb.buf, sha1)) {
1351 const char *abbrev;
1352 abbrev = find_unique_abbrev(sha1, DEFAULT_ABBREV);
1353 strbuf_reset(&sb);
1354 strbuf_addstr(&sb, abbrev);
1355 } else if (!strcmp(sb.buf, "detached HEAD")) /* rebase */
1356 goto got_nothing;
1357 else /* bisect */
1358 ;
1359 return strbuf_detach(&sb, NULL);
1360
1361 got_nothing:
1362 strbuf_release(&sb);
1363 return NULL;
1364 }
1365
1366 struct grab_1st_switch_cbdata {
1367 struct strbuf buf;
1368 unsigned char nsha1[20];
1369 };
1370
1371 static int grab_1st_switch(unsigned char *osha1, unsigned char *nsha1,
1372 const char *email, unsigned long timestamp, int tz,
1373 const char *message, void *cb_data)
1374 {
1375 struct grab_1st_switch_cbdata *cb = cb_data;
1376 const char *target = NULL, *end;
1377
1378 if (!skip_prefix(message, "checkout: moving from ", &message))
1379 return 0;
1380 target = strstr(message, " to ");
1381 if (!target)
1382 return 0;
1383 target += strlen(" to ");
1384 strbuf_reset(&cb->buf);
1385 hashcpy(cb->nsha1, nsha1);
1386 end = strchrnul(target, '\n');
1387 strbuf_add(&cb->buf, target, end - target);
1388 if (!strcmp(cb->buf.buf, "HEAD")) {
1389 /* HEAD is relative. Resolve it to the right reflog entry. */
1390 strbuf_reset(&cb->buf);
1391 strbuf_addstr(&cb->buf,
1392 find_unique_abbrev(nsha1, DEFAULT_ABBREV));
1393 }
1394 return 1;
1395 }
1396
1397 static void wt_status_get_detached_from(struct wt_status_state *state)
1398 {
1399 struct grab_1st_switch_cbdata cb;
1400 struct commit *commit;
1401 unsigned char sha1[20];
1402 char *ref = NULL;
1403
1404 strbuf_init(&cb.buf, 0);
1405 if (for_each_reflog_ent_reverse("HEAD", grab_1st_switch, &cb) <= 0) {
1406 strbuf_release(&cb.buf);
1407 return;
1408 }
1409
1410 if (dwim_ref(cb.buf.buf, cb.buf.len, sha1, &ref) == 1 &&
1411 /* sha1 is a commit? match without further lookup */
1412 (!hashcmp(cb.nsha1, sha1) ||
1413 /* perhaps sha1 is a tag, try to dereference to a commit */
1414 ((commit = lookup_commit_reference_gently(sha1, 1)) != NULL &&
1415 !hashcmp(cb.nsha1, commit->object.oid.hash)))) {
1416 const char *from = ref;
1417 if (!skip_prefix(from, "refs/tags/", &from))
1418 skip_prefix(from, "refs/remotes/", &from);
1419 state->detached_from = xstrdup(from);
1420 } else
1421 state->detached_from =
1422 xstrdup(find_unique_abbrev(cb.nsha1, DEFAULT_ABBREV));
1423 hashcpy(state->detached_sha1, cb.nsha1);
1424 state->detached_at = !get_sha1("HEAD", sha1) &&
1425 !hashcmp(sha1, state->detached_sha1);
1426
1427 free(ref);
1428 strbuf_release(&cb.buf);
1429 }
1430
1431 int wt_status_check_rebase(const struct worktree *wt,
1432 struct wt_status_state *state)
1433 {
1434 struct stat st;
1435
1436 if (!stat(worktree_git_path(wt, "rebase-apply"), &st)) {
1437 if (!stat(worktree_git_path(wt, "rebase-apply/applying"), &st)) {
1438 state->am_in_progress = 1;
1439 if (!stat(worktree_git_path(wt, "rebase-apply/patch"), &st) && !st.st_size)
1440 state->am_empty_patch = 1;
1441 } else {
1442 state->rebase_in_progress = 1;
1443 state->branch = get_branch(wt, "rebase-apply/head-name");
1444 state->onto = get_branch(wt, "rebase-apply/onto");
1445 }
1446 } else if (!stat(worktree_git_path(wt, "rebase-merge"), &st)) {
1447 if (!stat(worktree_git_path(wt, "rebase-merge/interactive"), &st))
1448 state->rebase_interactive_in_progress = 1;
1449 else
1450 state->rebase_in_progress = 1;
1451 state->branch = get_branch(wt, "rebase-merge/head-name");
1452 state->onto = get_branch(wt, "rebase-merge/onto");
1453 } else
1454 return 0;
1455 return 1;
1456 }
1457
1458 int wt_status_check_bisect(const struct worktree *wt,
1459 struct wt_status_state *state)
1460 {
1461 struct stat st;
1462
1463 if (!stat(worktree_git_path(wt, "BISECT_LOG"), &st)) {
1464 state->bisect_in_progress = 1;
1465 state->branch = get_branch(wt, "BISECT_START");
1466 return 1;
1467 }
1468 return 0;
1469 }
1470
1471 void wt_status_get_state(struct wt_status_state *state,
1472 int get_detached_from)
1473 {
1474 struct stat st;
1475 unsigned char sha1[20];
1476
1477 if (!stat(git_path_merge_head(), &st)) {
1478 state->merge_in_progress = 1;
1479 } else if (wt_status_check_rebase(NULL, state)) {
1480 ; /* all set */
1481 } else if (!stat(git_path_cherry_pick_head(), &st) &&
1482 !get_sha1("CHERRY_PICK_HEAD", sha1)) {
1483 state->cherry_pick_in_progress = 1;
1484 hashcpy(state->cherry_pick_head_sha1, sha1);
1485 }
1486 wt_status_check_bisect(NULL, state);
1487 if (!stat(git_path_revert_head(), &st) &&
1488 !get_sha1("REVERT_HEAD", sha1)) {
1489 state->revert_in_progress = 1;
1490 hashcpy(state->revert_head_sha1, sha1);
1491 }
1492
1493 if (get_detached_from)
1494 wt_status_get_detached_from(state);
1495 }
1496
1497 static void wt_longstatus_print_state(struct wt_status *s,
1498 struct wt_status_state *state)
1499 {
1500 const char *state_color = color(WT_STATUS_HEADER, s);
1501 if (state->merge_in_progress)
1502 show_merge_in_progress(s, state, state_color);
1503 else if (state->am_in_progress)
1504 show_am_in_progress(s, state, state_color);
1505 else if (state->rebase_in_progress || state->rebase_interactive_in_progress)
1506 show_rebase_in_progress(s, state, state_color);
1507 else if (state->cherry_pick_in_progress)
1508 show_cherry_pick_in_progress(s, state, state_color);
1509 else if (state->revert_in_progress)
1510 show_revert_in_progress(s, state, state_color);
1511 if (state->bisect_in_progress)
1512 show_bisect_in_progress(s, state, state_color);
1513 }
1514
1515 static void wt_longstatus_print(struct wt_status *s)
1516 {
1517 const char *branch_color = color(WT_STATUS_ONBRANCH, s);
1518 const char *branch_status_color = color(WT_STATUS_HEADER, s);
1519 struct wt_status_state state;
1520
1521 memset(&state, 0, sizeof(state));
1522 wt_status_get_state(&state,
1523 s->branch && !strcmp(s->branch, "HEAD"));
1524
1525 if (s->branch) {
1526 const char *on_what = _("On branch ");
1527 const char *branch_name = s->branch;
1528 if (!strcmp(branch_name, "HEAD")) {
1529 branch_status_color = color(WT_STATUS_NOBRANCH, s);
1530 if (state.rebase_in_progress || state.rebase_interactive_in_progress) {
1531 if (state.rebase_interactive_in_progress)
1532 on_what = _("interactive rebase in progress; onto ");
1533 else
1534 on_what = _("rebase in progress; onto ");
1535 branch_name = state.onto;
1536 } else if (state.detached_from) {
1537 branch_name = state.detached_from;
1538 if (state.detached_at)
1539 on_what = _("HEAD detached at ");
1540 else
1541 on_what = _("HEAD detached from ");
1542 } else {
1543 branch_name = "";
1544 on_what = _("Not currently on any branch.");
1545 }
1546 } else
1547 skip_prefix(branch_name, "refs/heads/", &branch_name);
1548 status_printf(s, color(WT_STATUS_HEADER, s), "%s", "");
1549 status_printf_more(s, branch_status_color, "%s", on_what);
1550 status_printf_more(s, branch_color, "%s\n", branch_name);
1551 if (!s->is_initial)
1552 wt_longstatus_print_tracking(s);
1553 }
1554
1555 wt_longstatus_print_state(s, &state);
1556 free(state.branch);
1557 free(state.onto);
1558 free(state.detached_from);
1559
1560 if (s->is_initial) {
1561 status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", "");
1562 status_printf_ln(s, color(WT_STATUS_HEADER, s), _("Initial commit"));
1563 status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", "");
1564 }
1565
1566 wt_longstatus_print_updated(s);
1567 wt_longstatus_print_unmerged(s);
1568 wt_longstatus_print_changed(s);
1569 if (s->submodule_summary &&
1570 (!s->ignore_submodule_arg ||
1571 strcmp(s->ignore_submodule_arg, "all"))) {
1572 wt_longstatus_print_submodule_summary(s, 0); /* staged */
1573 wt_longstatus_print_submodule_summary(s, 1); /* unstaged */
1574 }
1575 if (s->show_untracked_files) {
1576 wt_longstatus_print_other(s, &s->untracked, _("Untracked files"), "add");
1577 if (s->show_ignored_files)
1578 wt_longstatus_print_other(s, &s->ignored, _("Ignored files"), "add -f");
1579 if (advice_status_u_option && 2000 < s->untracked_in_ms) {
1580 status_printf_ln(s, GIT_COLOR_NORMAL, "%s", "");
1581 status_printf_ln(s, GIT_COLOR_NORMAL,
1582 _("It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1583 "may speed it up, but you have to be careful not to forget to add\n"
1584 "new files yourself (see 'git help status')."),
1585 s->untracked_in_ms / 1000.0);
1586 }
1587 } else if (s->commitable)
1588 status_printf_ln(s, GIT_COLOR_NORMAL, _("Untracked files not listed%s"),
1589 s->hints
1590 ? _(" (use -u option to show untracked files)") : "");
1591
1592 if (s->verbose)
1593 wt_longstatus_print_verbose(s);
1594 if (!s->commitable) {
1595 if (s->amend)
1596 status_printf_ln(s, GIT_COLOR_NORMAL, _("No changes"));
1597 else if (s->nowarn)
1598 ; /* nothing */
1599 else if (s->workdir_dirty) {
1600 if (s->hints)
1601 printf(_("no changes added to commit "
1602 "(use \"git add\" and/or \"git commit -a\")\n"));
1603 else
1604 printf(_("no changes added to commit\n"));
1605 } else if (s->untracked.nr) {
1606 if (s->hints)
1607 printf(_("nothing added to commit but untracked files "
1608 "present (use \"git add\" to track)\n"));
1609 else
1610 printf(_("nothing added to commit but untracked files present\n"));
1611 } else if (s->is_initial) {
1612 if (s->hints)
1613 printf(_("nothing to commit (create/copy files "
1614 "and use \"git add\" to track)\n"));
1615 else
1616 printf(_("nothing to commit\n"));
1617 } else if (!s->show_untracked_files) {
1618 if (s->hints)
1619 printf(_("nothing to commit (use -u to show untracked files)\n"));
1620 else
1621 printf(_("nothing to commit\n"));
1622 } else
1623 printf(_("nothing to commit, working tree clean\n"));
1624 }
1625 }
1626
1627 static void wt_shortstatus_unmerged(struct string_list_item *it,
1628 struct wt_status *s)
1629 {
1630 struct wt_status_change_data *d = it->util;
1631 const char *how = "??";
1632
1633 switch (d->stagemask) {
1634 case 1: how = "DD"; break; /* both deleted */
1635 case 2: how = "AU"; break; /* added by us */
1636 case 3: how = "UD"; break; /* deleted by them */
1637 case 4: how = "UA"; break; /* added by them */
1638 case 5: how = "DU"; break; /* deleted by us */
1639 case 6: how = "AA"; break; /* both added */
1640 case 7: how = "UU"; break; /* both modified */
1641 }
1642 color_fprintf(s->fp, color(WT_STATUS_UNMERGED, s), "%s", how);
1643 if (s->null_termination) {
1644 fprintf(stdout, " %s%c", it->string, 0);
1645 } else {
1646 struct strbuf onebuf = STRBUF_INIT;
1647 const char *one;
1648 one = quote_path(it->string, s->prefix, &onebuf);
1649 printf(" %s\n", one);
1650 strbuf_release(&onebuf);
1651 }
1652 }
1653
1654 static void wt_shortstatus_status(struct string_list_item *it,
1655 struct wt_status *s)
1656 {
1657 struct wt_status_change_data *d = it->util;
1658
1659 if (d->index_status)
1660 color_fprintf(s->fp, color(WT_STATUS_UPDATED, s), "%c", d->index_status);
1661 else
1662 putchar(' ');
1663 if (d->worktree_status)
1664 color_fprintf(s->fp, color(WT_STATUS_CHANGED, s), "%c", d->worktree_status);
1665 else
1666 putchar(' ');
1667 putchar(' ');
1668 if (s->null_termination) {
1669 fprintf(stdout, "%s%c", it->string, 0);
1670 if (d->head_path)
1671 fprintf(stdout, "%s%c", d->head_path, 0);
1672 } else {
1673 struct strbuf onebuf = STRBUF_INIT;
1674 const char *one;
1675 if (d->head_path) {
1676 one = quote_path(d->head_path, s->prefix, &onebuf);
1677 if (*one != '"' && strchr(one, ' ') != NULL) {
1678 putchar('"');
1679 strbuf_addch(&onebuf, '"');
1680 one = onebuf.buf;
1681 }
1682 printf("%s -> ", one);
1683 strbuf_release(&onebuf);
1684 }
1685 one = quote_path(it->string, s->prefix, &onebuf);
1686 if (*one != '"' && strchr(one, ' ') != NULL) {
1687 putchar('"');
1688 strbuf_addch(&onebuf, '"');
1689 one = onebuf.buf;
1690 }
1691 printf("%s\n", one);
1692 strbuf_release(&onebuf);
1693 }
1694 }
1695
1696 static void wt_shortstatus_other(struct string_list_item *it,
1697 struct wt_status *s, const char *sign)
1698 {
1699 if (s->null_termination) {
1700 fprintf(stdout, "%s %s%c", sign, it->string, 0);
1701 } else {
1702 struct strbuf onebuf = STRBUF_INIT;
1703 const char *one;
1704 one = quote_path(it->string, s->prefix, &onebuf);
1705 color_fprintf(s->fp, color(WT_STATUS_UNTRACKED, s), "%s", sign);
1706 printf(" %s\n", one);
1707 strbuf_release(&onebuf);
1708 }
1709 }
1710
1711 static void wt_shortstatus_print_tracking(struct wt_status *s)
1712 {
1713 struct branch *branch;
1714 const char *header_color = color(WT_STATUS_HEADER, s);
1715 const char *branch_color_local = color(WT_STATUS_LOCAL_BRANCH, s);
1716 const char *branch_color_remote = color(WT_STATUS_REMOTE_BRANCH, s);
1717
1718 const char *base;
1719 const char *branch_name;
1720 int num_ours, num_theirs;
1721 int upstream_is_gone = 0;
1722
1723 color_fprintf(s->fp, color(WT_STATUS_HEADER, s), "## ");
1724
1725 if (!s->branch)
1726 return;
1727 branch_name = s->branch;
1728
1729 if (s->is_initial)
1730 color_fprintf(s->fp, header_color, _("Initial commit on "));
1731
1732 if (!strcmp(s->branch, "HEAD")) {
1733 color_fprintf(s->fp, color(WT_STATUS_NOBRANCH, s), "%s",
1734 _("HEAD (no branch)"));
1735 goto conclude;
1736 }
1737
1738 skip_prefix(branch_name, "refs/heads/", &branch_name);
1739
1740 branch = branch_get(branch_name);
1741
1742 color_fprintf(s->fp, branch_color_local, "%s", branch_name);
1743
1744 if (stat_tracking_info(branch, &num_ours, &num_theirs, &base) < 0) {
1745 if (!base)
1746 goto conclude;
1747
1748 upstream_is_gone = 1;
1749 }
1750
1751 base = shorten_unambiguous_ref(base, 0);
1752 color_fprintf(s->fp, header_color, "...");
1753 color_fprintf(s->fp, branch_color_remote, "%s", base);
1754 free((char *)base);
1755
1756 if (!upstream_is_gone && !num_ours && !num_theirs)
1757 goto conclude;
1758
1759 #define LABEL(string) (s->no_gettext ? (string) : _(string))
1760
1761 color_fprintf(s->fp, header_color, " [");
1762 if (upstream_is_gone) {
1763 color_fprintf(s->fp, header_color, LABEL(N_("gone")));
1764 } else if (!num_ours) {
1765 color_fprintf(s->fp, header_color, LABEL(N_("behind ")));
1766 color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
1767 } else if (!num_theirs) {
1768 color_fprintf(s->fp, header_color, LABEL(N_("ahead ")));
1769 color_fprintf(s->fp, branch_color_local, "%d", num_ours);
1770 } else {
1771 color_fprintf(s->fp, header_color, LABEL(N_("ahead ")));
1772 color_fprintf(s->fp, branch_color_local, "%d", num_ours);
1773 color_fprintf(s->fp, header_color, ", %s", LABEL(N_("behind ")));
1774 color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
1775 }
1776
1777 color_fprintf(s->fp, header_color, "]");
1778 conclude:
1779 fputc(s->null_termination ? '\0' : '\n', s->fp);
1780 }
1781
1782 static void wt_shortstatus_print(struct wt_status *s)
1783 {
1784 int i;
1785
1786 if (s->show_branch)
1787 wt_shortstatus_print_tracking(s);
1788
1789 for (i = 0; i < s->change.nr; i++) {
1790 struct wt_status_change_data *d;
1791 struct string_list_item *it;
1792
1793 it = &(s->change.items[i]);
1794 d = it->util;
1795 if (d->stagemask)
1796 wt_shortstatus_unmerged(it, s);
1797 else
1798 wt_shortstatus_status(it, s);
1799 }
1800 for (i = 0; i < s->untracked.nr; i++) {
1801 struct string_list_item *it;
1802
1803 it = &(s->untracked.items[i]);
1804 wt_shortstatus_other(it, s, "??");
1805 }
1806 for (i = 0; i < s->ignored.nr; i++) {
1807 struct string_list_item *it;
1808
1809 it = &(s->ignored.items[i]);
1810 wt_shortstatus_other(it, s, "!!");
1811 }
1812 }
1813
1814 static void wt_porcelain_print(struct wt_status *s)
1815 {
1816 s->use_color = 0;
1817 s->relative_paths = 0;
1818 s->prefix = NULL;
1819 s->no_gettext = 1;
1820 wt_shortstatus_print(s);
1821 }
1822
1823 /*
1824 * Print branch information for porcelain v2 output. These lines
1825 * are printed when the '--branch' parameter is given.
1826 *
1827 * # branch.oid <commit><eol>
1828 * # branch.head <head><eol>
1829 * [# branch.upstream <upstream><eol>
1830 * [# branch.ab +<ahead> -<behind><eol>]]
1831 *
1832 * <commit> ::= the current commit hash or the the literal
1833 * "(initial)" to indicate an initialized repo
1834 * with no commits.
1835 *
1836 * <head> ::= <branch_name> the current branch name or
1837 * "(detached)" literal when detached head or
1838 * "(unknown)" when something is wrong.
1839 *
1840 * <upstream> ::= the upstream branch name, when set.
1841 *
1842 * <ahead> ::= integer ahead value, when upstream set
1843 * and the commit is present (not gone).
1844 *
1845 * <behind> ::= integer behind value, when upstream set
1846 * and commit is present.
1847 *
1848 *
1849 * The end-of-line is defined by the -z flag.
1850 *
1851 * <eol> ::= NUL when -z,
1852 * LF when NOT -z.
1853 *
1854 */
1855 static void wt_porcelain_v2_print_tracking(struct wt_status *s)
1856 {
1857 struct branch *branch;
1858 const char *base;
1859 const char *branch_name;
1860 struct wt_status_state state;
1861 int ab_info, nr_ahead, nr_behind;
1862 char eol = s->null_termination ? '\0' : '\n';
1863
1864 memset(&state, 0, sizeof(state));
1865 wt_status_get_state(&state, s->branch && !strcmp(s->branch, "HEAD"));
1866
1867 fprintf(s->fp, "# branch.oid %s%c",
1868 (s->is_initial ? "(initial)" : sha1_to_hex(s->sha1_commit)),
1869 eol);
1870
1871 if (!s->branch)
1872 fprintf(s->fp, "# branch.head %s%c", "(unknown)", eol);
1873 else {
1874 if (!strcmp(s->branch, "HEAD")) {
1875 fprintf(s->fp, "# branch.head %s%c", "(detached)", eol);
1876
1877 if (state.rebase_in_progress || state.rebase_interactive_in_progress)
1878 branch_name = state.onto;
1879 else if (state.detached_from)
1880 branch_name = state.detached_from;
1881 else
1882 branch_name = "";
1883 } else {
1884 branch_name = NULL;
1885 skip_prefix(s->branch, "refs/heads/", &branch_name);
1886
1887 fprintf(s->fp, "# branch.head %s%c", branch_name, eol);
1888 }
1889
1890 /* Lookup stats on the upstream tracking branch, if set. */
1891 branch = branch_get(branch_name);
1892 base = NULL;
1893 ab_info = (stat_tracking_info(branch, &nr_ahead, &nr_behind, &base) == 0);
1894 if (base) {
1895 base = shorten_unambiguous_ref(base, 0);
1896 fprintf(s->fp, "# branch.upstream %s%c", base, eol);
1897 free((char *)base);
1898
1899 if (ab_info)
1900 fprintf(s->fp, "# branch.ab +%d -%d%c", nr_ahead, nr_behind, eol);
1901 }
1902 }
1903
1904 free(state.branch);
1905 free(state.onto);
1906 free(state.detached_from);
1907 }
1908
1909 /*
1910 * Convert various submodule status values into a
1911 * fixed-length string of characters in the buffer provided.
1912 */
1913 static void wt_porcelain_v2_submodule_state(
1914 struct wt_status_change_data *d,
1915 char sub[5])
1916 {
1917 if (S_ISGITLINK(d->mode_head) ||
1918 S_ISGITLINK(d->mode_index) ||
1919 S_ISGITLINK(d->mode_worktree)) {
1920 sub[0] = 'S';
1921 sub[1] = d->new_submodule_commits ? 'C' : '.';
1922 sub[2] = (d->dirty_submodule & DIRTY_SUBMODULE_MODIFIED) ? 'M' : '.';
1923 sub[3] = (d->dirty_submodule & DIRTY_SUBMODULE_UNTRACKED) ? 'U' : '.';
1924 } else {
1925 sub[0] = 'N';
1926 sub[1] = '.';
1927 sub[2] = '.';
1928 sub[3] = '.';
1929 }
1930 sub[4] = 0;
1931 }
1932
1933 /*
1934 * Fix-up changed entries before we print them.
1935 */
1936 static void wt_porcelain_v2_fix_up_changed(
1937 struct string_list_item *it,
1938 struct wt_status *s)
1939 {
1940 struct wt_status_change_data *d = it->util;
1941
1942 if (!d->index_status) {
1943 /*
1944 * This entry is unchanged in the index (relative to the head).
1945 * Therefore, the collect_updated_cb was never called for this
1946 * entry (during the head-vs-index scan) and so the head column
1947 * fields were never set.
1948 *
1949 * We must have data for the index column (from the
1950 * index-vs-worktree scan (otherwise, this entry should not be
1951 * in the list of changes)).
1952 *
1953 * Copy index column fields to the head column, so that our
1954 * output looks complete.
1955 */
1956 assert(d->mode_head == 0);
1957 d->mode_head = d->mode_index;
1958 oidcpy(&d->oid_head, &d->oid_index);
1959 }
1960
1961 if (!d->worktree_status) {
1962 /*
1963 * This entry is unchanged in the worktree (relative to the index).
1964 * Therefore, the collect_changed_cb was never called for this entry
1965 * (during the index-vs-worktree scan) and so the worktree column
1966 * fields were never set.
1967 *
1968 * We must have data for the index column (from the head-vs-index
1969 * scan).
1970 *
1971 * Copy the index column fields to the worktree column so that
1972 * our output looks complete.
1973 *
1974 * Note that we only have a mode field in the worktree column
1975 * because the scan code tries really hard to not have to compute it.
1976 */
1977 assert(d->mode_worktree == 0);
1978 d->mode_worktree = d->mode_index;
1979 }
1980 }
1981
1982 /*
1983 * Print porcelain v2 info for tracked entries with changes.
1984 */
1985 static void wt_porcelain_v2_print_changed_entry(
1986 struct string_list_item *it,
1987 struct wt_status *s)
1988 {
1989 struct wt_status_change_data *d = it->util;
1990 struct strbuf buf_index = STRBUF_INIT;
1991 struct strbuf buf_head = STRBUF_INIT;
1992 const char *path_index = NULL;
1993 const char *path_head = NULL;
1994 char key[3];
1995 char submodule_token[5];
1996 char sep_char, eol_char;
1997
1998 wt_porcelain_v2_fix_up_changed(it, s);
1999 wt_porcelain_v2_submodule_state(d, submodule_token);
2000
2001 key[0] = d->index_status ? d->index_status : '.';
2002 key[1] = d->worktree_status ? d->worktree_status : '.';
2003 key[2] = 0;
2004
2005 if (s->null_termination) {
2006 /*
2007 * In -z mode, we DO NOT C-quote pathnames. Current path is ALWAYS first.
2008 * A single NUL character separates them.
2009 */
2010 sep_char = '\0';
2011 eol_char = '\0';
2012 path_index = it->string;
2013 path_head = d->head_path;
2014 } else {
2015 /*
2016 * Path(s) are C-quoted if necessary. Current path is ALWAYS first.
2017 * The source path is only present when necessary.
2018 * A single TAB separates them (because paths can contain spaces
2019 * which are not escaped and C-quoting does escape TAB characters).
2020 */
2021 sep_char = '\t';
2022 eol_char = '\n';
2023 path_index = quote_path(it->string, s->prefix, &buf_index);
2024 if (d->head_path)
2025 path_head = quote_path(d->head_path, s->prefix, &buf_head);
2026 }
2027
2028 if (path_head)
2029 fprintf(s->fp, "2 %s %s %06o %06o %06o %s %s %c%d %s%c%s%c",
2030 key, submodule_token,
2031 d->mode_head, d->mode_index, d->mode_worktree,
2032 oid_to_hex(&d->oid_head), oid_to_hex(&d->oid_index),
2033 key[0], d->score,
2034 path_index, sep_char, path_head, eol_char);
2035 else
2036 fprintf(s->fp, "1 %s %s %06o %06o %06o %s %s %s%c",
2037 key, submodule_token,
2038 d->mode_head, d->mode_index, d->mode_worktree,
2039 oid_to_hex(&d->oid_head), oid_to_hex(&d->oid_index),
2040 path_index, eol_char);
2041
2042 strbuf_release(&buf_index);
2043 strbuf_release(&buf_head);
2044 }
2045
2046 /*
2047 * Print porcelain v2 status info for unmerged entries.
2048 */
2049 static void wt_porcelain_v2_print_unmerged_entry(
2050 struct string_list_item *it,
2051 struct wt_status *s)
2052 {
2053 struct wt_status_change_data *d = it->util;
2054 const struct cache_entry *ce;
2055 struct strbuf buf_index = STRBUF_INIT;
2056 const char *path_index = NULL;
2057 int pos, stage, sum;
2058 struct {
2059 int mode;
2060 struct object_id oid;
2061 } stages[3];
2062 char *key;
2063 char submodule_token[5];
2064 char unmerged_prefix = 'u';
2065 char eol_char = s->null_termination ? '\0' : '\n';
2066
2067 wt_porcelain_v2_submodule_state(d, submodule_token);
2068
2069 switch (d->stagemask) {
2070 case 1: key = "DD"; break; /* both deleted */
2071 case 2: key = "AU"; break; /* added by us */
2072 case 3: key = "UD"; break; /* deleted by them */
2073 case 4: key = "UA"; break; /* added by them */
2074 case 5: key = "DU"; break; /* deleted by us */
2075 case 6: key = "AA"; break; /* both added */
2076 case 7: key = "UU"; break; /* both modified */
2077 default:
2078 die("BUG: unhandled unmerged status %x", d->stagemask);
2079 }
2080
2081 /*
2082 * Disregard d.aux.porcelain_v2 data that we accumulated
2083 * for the head and index columns during the scans and
2084 * replace with the actual stage data.
2085 *
2086 * Note that this is a last-one-wins for each the individual
2087 * stage [123] columns in the event of multiple cache entries
2088 * for same stage.
2089 */
2090 memset(stages, 0, sizeof(stages));
2091 sum = 0;
2092 pos = cache_name_pos(it->string, strlen(it->string));
2093 assert(pos < 0);
2094 pos = -pos-1;
2095 while (pos < active_nr) {
2096 ce = active_cache[pos++];
2097 stage = ce_stage(ce);
2098 if (strcmp(ce->name, it->string) || !stage)
2099 break;
2100 stages[stage - 1].mode = ce->ce_mode;
2101 hashcpy(stages[stage - 1].oid.hash, ce->oid.hash);
2102 sum |= (1 << (stage - 1));
2103 }
2104 if (sum != d->stagemask)
2105 die("BUG: observed stagemask 0x%x != expected stagemask 0x%x", sum, d->stagemask);
2106
2107 if (s->null_termination)
2108 path_index = it->string;
2109 else
2110 path_index = quote_path(it->string, s->prefix, &buf_index);
2111
2112 fprintf(s->fp, "%c %s %s %06o %06o %06o %06o %s %s %s %s%c",
2113 unmerged_prefix, key, submodule_token,
2114 stages[0].mode, /* stage 1 */
2115 stages[1].mode, /* stage 2 */
2116 stages[2].mode, /* stage 3 */
2117 d->mode_worktree,
2118 oid_to_hex(&stages[0].oid), /* stage 1 */
2119 oid_to_hex(&stages[1].oid), /* stage 2 */
2120 oid_to_hex(&stages[2].oid), /* stage 3 */
2121 path_index,
2122 eol_char);
2123
2124 strbuf_release(&buf_index);
2125 }
2126
2127 /*
2128 * Print porcelain V2 status info for untracked and ignored entries.
2129 */
2130 static void wt_porcelain_v2_print_other(
2131 struct string_list_item *it,
2132 struct wt_status *s,
2133 char prefix)
2134 {
2135 struct strbuf buf = STRBUF_INIT;
2136 const char *path;
2137 char eol_char;
2138
2139 if (s->null_termination) {
2140 path = it->string;
2141 eol_char = '\0';
2142 } else {
2143 path = quote_path(it->string, s->prefix, &buf);
2144 eol_char = '\n';
2145 }
2146
2147 fprintf(s->fp, "%c %s%c", prefix, path, eol_char);
2148
2149 strbuf_release(&buf);
2150 }
2151
2152 /*
2153 * Print porcelain V2 status.
2154 *
2155 * [<v2_branch>]
2156 * [<v2_changed_items>]*
2157 * [<v2_unmerged_items>]*
2158 * [<v2_untracked_items>]*
2159 * [<v2_ignored_items>]*
2160 *
2161 */
2162 static void wt_porcelain_v2_print(struct wt_status *s)
2163 {
2164 struct wt_status_change_data *d;
2165 struct string_list_item *it;
2166 int i;
2167
2168 if (s->show_branch)
2169 wt_porcelain_v2_print_tracking(s);
2170
2171 for (i = 0; i < s->change.nr; i++) {
2172 it = &(s->change.items[i]);
2173 d = it->util;
2174 if (!d->stagemask)
2175 wt_porcelain_v2_print_changed_entry(it, s);
2176 }
2177
2178 for (i = 0; i < s->change.nr; i++) {
2179 it = &(s->change.items[i]);
2180 d = it->util;
2181 if (d->stagemask)
2182 wt_porcelain_v2_print_unmerged_entry(it, s);
2183 }
2184
2185 for (i = 0; i < s->untracked.nr; i++) {
2186 it = &(s->untracked.items[i]);
2187 wt_porcelain_v2_print_other(it, s, '?');
2188 }
2189
2190 for (i = 0; i < s->ignored.nr; i++) {
2191 it = &(s->ignored.items[i]);
2192 wt_porcelain_v2_print_other(it, s, '!');
2193 }
2194 }
2195
2196 void wt_status_print(struct wt_status *s)
2197 {
2198 switch (s->status_format) {
2199 case STATUS_FORMAT_SHORT:
2200 wt_shortstatus_print(s);
2201 break;
2202 case STATUS_FORMAT_PORCELAIN:
2203 wt_porcelain_print(s);
2204 break;
2205 case STATUS_FORMAT_PORCELAIN_V2:
2206 wt_porcelain_v2_print(s);
2207 break;
2208 case STATUS_FORMAT_UNSPECIFIED:
2209 die("BUG: finalize_deferred_config() should have been called");
2210 break;
2211 case STATUS_FORMAT_NONE:
2212 case STATUS_FORMAT_LONG:
2213 wt_longstatus_print(s);
2214 break;
2215 }
2216 }
ramsay's fork of git