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