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