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