]>
Commit | Line | Data |
---|---|---|
85023577 | 1 | #include "cache.h" |
c91f0d92 JK |
2 | #include "wt-status.h" |
3 | #include "color.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" |
b6975ab5 | 12 | #include "remote.h" |
c91f0d92 | 13 | |
46f721c8 | 14 | int wt_status_relative_paths = 1; |
6b2f2d98 | 15 | int wt_status_use_color = -1; |
ac8d5afc | 16 | int wt_status_submodule_summary; |
c91f0d92 | 17 | static char wt_status_colors[][COLOR_MAXLEN] = { |
dc6ebd4c AL |
18 | GIT_COLOR_NORMAL, /* WT_STATUS_HEADER */ |
19 | GIT_COLOR_GREEN, /* WT_STATUS_UPDATED */ | |
20 | GIT_COLOR_RED, /* WT_STATUS_CHANGED */ | |
21 | GIT_COLOR_RED, /* WT_STATUS_UNTRACKED */ | |
22 | GIT_COLOR_RED, /* WT_STATUS_NOBRANCH */ | |
c91f0d92 | 23 | }; |
4d229653 | 24 | |
4bfee30a | 25 | enum untracked_status_type show_untracked_files = SHOW_NORMAL_UNTRACKED_FILES; |
c91f0d92 JK |
26 | |
27 | static int parse_status_slot(const char *var, int offset) | |
28 | { | |
29 | if (!strcasecmp(var+offset, "header")) | |
30 | return WT_STATUS_HEADER; | |
82dca848 SP |
31 | if (!strcasecmp(var+offset, "updated") |
32 | || !strcasecmp(var+offset, "added")) | |
c91f0d92 JK |
33 | return WT_STATUS_UPDATED; |
34 | if (!strcasecmp(var+offset, "changed")) | |
35 | return WT_STATUS_CHANGED; | |
36 | if (!strcasecmp(var+offset, "untracked")) | |
37 | return WT_STATUS_UNTRACKED; | |
950ce2e2 CP |
38 | if (!strcasecmp(var+offset, "nobranch")) |
39 | return WT_STATUS_NOBRANCH; | |
c91f0d92 JK |
40 | die("bad config variable '%s'", var); |
41 | } | |
42 | ||
43 | static const char* color(int slot) | |
44 | { | |
6b2f2d98 | 45 | return wt_status_use_color > 0 ? wt_status_colors[slot] : ""; |
c91f0d92 JK |
46 | } |
47 | ||
48 | void wt_status_prepare(struct wt_status *s) | |
49 | { | |
50 | unsigned char sha1[20]; | |
51 | const char *head; | |
52 | ||
cc46a743 | 53 | memset(s, 0, sizeof(*s)); |
8da19775 | 54 | head = resolve_ref("HEAD", sha1, 0, NULL); |
f62363fb | 55 | s->branch = head ? xstrdup(head) : NULL; |
c91f0d92 | 56 | s->reference = "HEAD"; |
f26a0012 | 57 | s->fp = stdout; |
0f729f21 | 58 | s->index_file = get_index_file(); |
c91f0d92 JK |
59 | } |
60 | ||
f26a0012 | 61 | static void wt_status_print_cached_header(struct wt_status *s) |
3c1eb9cb JR |
62 | { |
63 | const char *c = color(WT_STATUS_HEADER); | |
f26a0012 | 64 | color_fprintf_ln(s->fp, c, "# Changes to be committed:"); |
ff58b9aa | 65 | if (!s->is_initial) { |
f26a0012 | 66 | color_fprintf_ln(s->fp, c, "# (use \"git reset %s <file>...\" to unstage)", s->reference); |
3c1eb9cb | 67 | } else { |
f26a0012 | 68 | color_fprintf_ln(s->fp, c, "# (use \"git rm --cached <file>...\" to unstage)"); |
3c1eb9cb | 69 | } |
f26a0012 | 70 | color_fprintf_ln(s->fp, c, "#"); |
3c1eb9cb JR |
71 | } |
72 | ||
bb914b14 AM |
73 | static void wt_status_print_dirty_header(struct wt_status *s, |
74 | int has_deleted) | |
c91f0d92 JK |
75 | { |
76 | const char *c = color(WT_STATUS_HEADER); | |
bb914b14 AM |
77 | color_fprintf_ln(s->fp, c, "# Changed but not updated:"); |
78 | if (!has_deleted) | |
79 | color_fprintf_ln(s->fp, c, "# (use \"git add <file>...\" to update what will be committed)"); | |
80 | else | |
81 | color_fprintf_ln(s->fp, c, "# (use \"git add/rm <file>...\" to update what will be committed)"); | |
4d6e4c4d | 82 | color_fprintf_ln(s->fp, c, "# (use \"git checkout -- <file>...\" to discard changes in working directory)"); |
bb914b14 AM |
83 | color_fprintf_ln(s->fp, c, "#"); |
84 | } | |
85 | ||
86 | static void wt_status_print_untracked_header(struct wt_status *s) | |
87 | { | |
88 | const char *c = color(WT_STATUS_HEADER); | |
89 | color_fprintf_ln(s->fp, c, "# Untracked files:"); | |
90 | color_fprintf_ln(s->fp, c, "# (use \"git add <file>...\" to include in what will be committed)"); | |
f26a0012 | 91 | color_fprintf_ln(s->fp, c, "#"); |
c91f0d92 JK |
92 | } |
93 | ||
f26a0012 | 94 | static void wt_status_print_trailer(struct wt_status *s) |
c91f0d92 | 95 | { |
f26a0012 | 96 | color_fprintf_ln(s->fp, color(WT_STATUS_HEADER), "#"); |
c91f0d92 JK |
97 | } |
98 | ||
a734d0b1 | 99 | #define quote_path quote_path_relative |
3a946802 | 100 | |
f26a0012 KH |
101 | static void wt_status_print_filepair(struct wt_status *s, |
102 | int t, struct diff_filepair *p) | |
c91f0d92 JK |
103 | { |
104 | const char *c = color(t); | |
3a946802 | 105 | const char *one, *two; |
f285a2d7 | 106 | struct strbuf onebuf = STRBUF_INIT, twobuf = STRBUF_INIT; |
3a946802 | 107 | |
367c9886 JS |
108 | one = quote_path(p->one->path, -1, &onebuf, s->prefix); |
109 | two = quote_path(p->two->path, -1, &twobuf, s->prefix); | |
3a946802 | 110 | |
f26a0012 | 111 | color_fprintf(s->fp, color(WT_STATUS_HEADER), "#\t"); |
c91f0d92 JK |
112 | switch (p->status) { |
113 | case DIFF_STATUS_ADDED: | |
f26a0012 | 114 | color_fprintf(s->fp, c, "new file: %s", one); |
3a946802 | 115 | break; |
c91f0d92 | 116 | case DIFF_STATUS_COPIED: |
f26a0012 | 117 | color_fprintf(s->fp, c, "copied: %s -> %s", one, two); |
c91f0d92 JK |
118 | break; |
119 | case DIFF_STATUS_DELETED: | |
f26a0012 | 120 | color_fprintf(s->fp, c, "deleted: %s", one); |
3a946802 | 121 | break; |
c91f0d92 | 122 | case DIFF_STATUS_MODIFIED: |
f26a0012 | 123 | color_fprintf(s->fp, c, "modified: %s", one); |
3a946802 | 124 | break; |
c91f0d92 | 125 | case DIFF_STATUS_RENAMED: |
f26a0012 | 126 | color_fprintf(s->fp, c, "renamed: %s -> %s", one, two); |
c91f0d92 JK |
127 | break; |
128 | case DIFF_STATUS_TYPE_CHANGED: | |
f26a0012 | 129 | color_fprintf(s->fp, c, "typechange: %s", one); |
3a946802 | 130 | break; |
c91f0d92 | 131 | case DIFF_STATUS_UNKNOWN: |
f26a0012 | 132 | color_fprintf(s->fp, c, "unknown: %s", one); |
3a946802 | 133 | break; |
c91f0d92 | 134 | case DIFF_STATUS_UNMERGED: |
f26a0012 | 135 | color_fprintf(s->fp, c, "unmerged: %s", one); |
3a946802 | 136 | break; |
c91f0d92 JK |
137 | default: |
138 | die("bug: unhandled diff status %c", p->status); | |
139 | } | |
f26a0012 | 140 | fprintf(s->fp, "\n"); |
367c9886 JS |
141 | strbuf_release(&onebuf); |
142 | strbuf_release(&twobuf); | |
c91f0d92 JK |
143 | } |
144 | ||
145 | static void wt_status_print_updated_cb(struct diff_queue_struct *q, | |
146 | struct diff_options *options, | |
147 | void *data) | |
148 | { | |
149 | struct wt_status *s = data; | |
150 | int shown_header = 0; | |
151 | int i; | |
c91f0d92 JK |
152 | for (i = 0; i < q->nr; i++) { |
153 | if (q->queue[i]->status == 'U') | |
154 | continue; | |
155 | if (!shown_header) { | |
f26a0012 | 156 | wt_status_print_cached_header(s); |
c91f0d92 JK |
157 | s->commitable = 1; |
158 | shown_header = 1; | |
159 | } | |
f26a0012 | 160 | wt_status_print_filepair(s, WT_STATUS_UPDATED, q->queue[i]); |
c91f0d92 JK |
161 | } |
162 | if (shown_header) | |
f26a0012 | 163 | wt_status_print_trailer(s); |
c91f0d92 JK |
164 | } |
165 | ||
166 | static void wt_status_print_changed_cb(struct diff_queue_struct *q, | |
167 | struct diff_options *options, | |
168 | void *data) | |
169 | { | |
6e458bf6 | 170 | struct wt_status *s = data; |
c91f0d92 | 171 | int i; |
6e458bf6 | 172 | if (q->nr) { |
bb914b14 | 173 | int has_deleted = 0; |
2a3a3c24 | 174 | s->workdir_dirty = 1; |
4d229653 JH |
175 | for (i = 0; i < q->nr; i++) |
176 | if (q->queue[i]->status == DIFF_STATUS_DELETED) { | |
bb914b14 | 177 | has_deleted = 1; |
4d229653 JH |
178 | break; |
179 | } | |
bb914b14 | 180 | wt_status_print_dirty_header(s, has_deleted); |
6e458bf6 | 181 | } |
c91f0d92 | 182 | for (i = 0; i < q->nr; i++) |
f26a0012 | 183 | wt_status_print_filepair(s, WT_STATUS_CHANGED, q->queue[i]); |
c91f0d92 | 184 | if (q->nr) |
f26a0012 | 185 | wt_status_print_trailer(s); |
c91f0d92 JK |
186 | } |
187 | ||
c91f0d92 JK |
188 | static void wt_status_print_updated(struct wt_status *s) |
189 | { | |
190 | struct rev_info rev; | |
c91f0d92 | 191 | init_revisions(&rev, NULL); |
c1e255b7 JK |
192 | setup_revisions(0, NULL, &rev, |
193 | s->is_initial ? EMPTY_TREE_SHA1_HEX : s->reference); | |
c91f0d92 JK |
194 | rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK; |
195 | rev.diffopt.format_callback = wt_status_print_updated_cb; | |
196 | rev.diffopt.format_callback_data = s; | |
197 | rev.diffopt.detect_rename = 1; | |
50705915 | 198 | rev.diffopt.rename_limit = 200; |
f714fb84 | 199 | rev.diffopt.break_opt = 0; |
c91f0d92 JK |
200 | run_diff_index(&rev, 1); |
201 | } | |
202 | ||
203 | static void wt_status_print_changed(struct wt_status *s) | |
204 | { | |
205 | struct rev_info rev; | |
c91f0d92 | 206 | init_revisions(&rev, ""); |
49b8b292 | 207 | setup_revisions(0, NULL, &rev, NULL); |
c91f0d92 JK |
208 | rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK; |
209 | rev.diffopt.format_callback = wt_status_print_changed_cb; | |
210 | rev.diffopt.format_callback_data = s; | |
211 | run_diff_files(&rev, 0); | |
212 | } | |
213 | ||
ac8d5afc PY |
214 | static void wt_status_print_submodule_summary(struct wt_status *s) |
215 | { | |
216 | struct child_process sm_summary; | |
217 | char summary_limit[64]; | |
218 | char index[PATH_MAX]; | |
219 | const char *env[] = { index, NULL }; | |
220 | const char *argv[] = { | |
221 | "submodule", | |
222 | "summary", | |
223 | "--cached", | |
224 | "--for-status", | |
225 | "--summary-limit", | |
226 | summary_limit, | |
227 | s->amend ? "HEAD^" : "HEAD", | |
228 | NULL | |
229 | }; | |
230 | ||
231 | sprintf(summary_limit, "%d", wt_status_submodule_summary); | |
232 | snprintf(index, sizeof(index), "GIT_INDEX_FILE=%s", s->index_file); | |
233 | ||
234 | memset(&sm_summary, 0, sizeof(sm_summary)); | |
235 | sm_summary.argv = argv; | |
236 | sm_summary.env = env; | |
237 | sm_summary.git_cmd = 1; | |
238 | sm_summary.no_stdin = 1; | |
239 | fflush(s->fp); | |
240 | sm_summary.out = dup(fileno(s->fp)); /* run_command closes it */ | |
241 | run_command(&sm_summary); | |
242 | } | |
243 | ||
6e458bf6 | 244 | static void wt_status_print_untracked(struct wt_status *s) |
c91f0d92 JK |
245 | { |
246 | struct dir_struct dir; | |
c91f0d92 JK |
247 | int i; |
248 | int shown_header = 0; | |
f285a2d7 | 249 | struct strbuf buf = STRBUF_INIT; |
c91f0d92 JK |
250 | |
251 | memset(&dir, 0, sizeof(dir)); | |
252 | ||
7c4c97c0 JS |
253 | if (!s->untracked) |
254 | dir.flags |= | |
255 | DIR_SHOW_OTHER_DIRECTORIES | DIR_HIDE_EMPTY_DIRECTORIES; | |
039bc64e | 256 | setup_standard_excludes(&dir); |
c91f0d92 | 257 | |
9fc42d60 | 258 | read_directory(&dir, ".", "", 0, NULL); |
c91f0d92 | 259 | for(i = 0; i < dir.nr; i++) { |
c91f0d92 | 260 | struct dir_entry *ent = dir.entries[i]; |
98fa4738 JK |
261 | if (!cache_name_is_other(ent->name, ent->len)) |
262 | continue; | |
c91f0d92 | 263 | if (!shown_header) { |
2a3a3c24 | 264 | s->workdir_untracked = 1; |
bb914b14 | 265 | wt_status_print_untracked_header(s); |
c91f0d92 JK |
266 | shown_header = 1; |
267 | } | |
f26a0012 | 268 | color_fprintf(s->fp, color(WT_STATUS_HEADER), "#\t"); |
367c9886 JS |
269 | color_fprintf_ln(s->fp, color(WT_STATUS_UNTRACKED), "%s", |
270 | quote_path(ent->name, ent->len, | |
271 | &buf, s->prefix)); | |
c91f0d92 | 272 | } |
367c9886 | 273 | strbuf_release(&buf); |
c91f0d92 JK |
274 | } |
275 | ||
276 | static void wt_status_print_verbose(struct wt_status *s) | |
277 | { | |
278 | struct rev_info rev; | |
99a12694 | 279 | |
c91f0d92 | 280 | init_revisions(&rev, NULL); |
5ec11af6 | 281 | DIFF_OPT_SET(&rev.diffopt, ALLOW_TEXTCONV); |
1324fb6f JK |
282 | setup_revisions(0, NULL, &rev, |
283 | s->is_initial ? EMPTY_TREE_SHA1_HEX : s->reference); | |
c91f0d92 JK |
284 | rev.diffopt.output_format |= DIFF_FORMAT_PATCH; |
285 | rev.diffopt.detect_rename = 1; | |
4ba0cb27 KH |
286 | rev.diffopt.file = s->fp; |
287 | rev.diffopt.close_file = 0; | |
4f672ad6 JK |
288 | /* |
289 | * If we're not going to stdout, then we definitely don't | |
290 | * want color, since we are going to the commit message | |
291 | * file (and even the "auto" setting won't work, since it | |
292 | * will have checked isatty on stdout). | |
293 | */ | |
294 | if (s->fp != stdout) | |
295 | DIFF_OPT_CLR(&rev.diffopt, COLOR_DIFF); | |
c91f0d92 JK |
296 | run_diff_index(&rev, 1); |
297 | } | |
298 | ||
b6975ab5 JH |
299 | static void wt_status_print_tracking(struct wt_status *s) |
300 | { | |
301 | struct strbuf sb = STRBUF_INIT; | |
302 | const char *cp, *ep; | |
303 | struct branch *branch; | |
304 | ||
305 | assert(s->branch && !s->is_initial); | |
306 | if (prefixcmp(s->branch, "refs/heads/")) | |
307 | return; | |
308 | branch = branch_get(s->branch + 11); | |
309 | if (!format_tracking_info(branch, &sb)) | |
310 | return; | |
311 | ||
312 | for (cp = sb.buf; (ep = strchr(cp, '\n')) != NULL; cp = ep + 1) | |
313 | color_fprintf_ln(s->fp, color(WT_STATUS_HEADER), | |
314 | "# %.*s", (int)(ep - cp), cp); | |
315 | color_fprintf_ln(s->fp, color(WT_STATUS_HEADER), "#"); | |
316 | } | |
317 | ||
c91f0d92 JK |
318 | void wt_status_print(struct wt_status *s) |
319 | { | |
98bf8a47 | 320 | unsigned char sha1[20]; |
950ce2e2 | 321 | const char *branch_color = color(WT_STATUS_HEADER); |
98bf8a47 | 322 | |
950ce2e2 | 323 | s->is_initial = get_sha1(s->reference, sha1) ? 1 : 0; |
bda324cf JH |
324 | if (s->branch) { |
325 | const char *on_what = "On branch "; | |
326 | const char *branch_name = s->branch; | |
cc44c765 | 327 | if (!prefixcmp(branch_name, "refs/heads/")) |
bda324cf JH |
328 | branch_name += 11; |
329 | else if (!strcmp(branch_name, "HEAD")) { | |
330 | branch_name = ""; | |
950ce2e2 | 331 | branch_color = color(WT_STATUS_NOBRANCH); |
bda324cf JH |
332 | on_what = "Not currently on any branch."; |
333 | } | |
950ce2e2 CP |
334 | color_fprintf(s->fp, color(WT_STATUS_HEADER), "# "); |
335 | color_fprintf_ln(s->fp, branch_color, "%s%s", on_what, branch_name); | |
b6975ab5 JH |
336 | if (!s->is_initial) |
337 | wt_status_print_tracking(s); | |
bda324cf | 338 | } |
c91f0d92 JK |
339 | |
340 | if (s->is_initial) { | |
f26a0012 KH |
341 | color_fprintf_ln(s->fp, color(WT_STATUS_HEADER), "#"); |
342 | color_fprintf_ln(s->fp, color(WT_STATUS_HEADER), "# Initial commit"); | |
343 | color_fprintf_ln(s->fp, color(WT_STATUS_HEADER), "#"); | |
c91f0d92 JK |
344 | } |
345 | ||
c1e255b7 | 346 | wt_status_print_updated(s); |
c91f0d92 | 347 | wt_status_print_changed(s); |
ac8d5afc PY |
348 | if (wt_status_submodule_summary) |
349 | wt_status_print_submodule_summary(s); | |
6c2ce048 MSO |
350 | if (show_untracked_files) |
351 | wt_status_print_untracked(s); | |
352 | else if (s->commitable) | |
353 | fprintf(s->fp, "# Untracked files not listed (use -u option to show untracked files)\n"); | |
c91f0d92 | 354 | |
1324fb6f | 355 | if (s->verbose) |
c91f0d92 | 356 | wt_status_print_verbose(s); |
6e458bf6 JR |
357 | if (!s->commitable) { |
358 | if (s->amend) | |
f26a0012 | 359 | fprintf(s->fp, "# No changes\n"); |
37d07f8f JH |
360 | else if (s->nowarn) |
361 | ; /* nothing */ | |
2a3a3c24 | 362 | else if (s->workdir_dirty) |
dcbc7bbe | 363 | printf("no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"); |
2a3a3c24 JR |
364 | else if (s->workdir_untracked) |
365 | printf("nothing added to commit but untracked files present (use \"git add\" to track)\n"); | |
366 | else if (s->is_initial) | |
367 | printf("nothing to commit (create/copy files and use \"git add\" to track)\n"); | |
6c2ce048 MSO |
368 | else if (!show_untracked_files) |
369 | printf("nothing to commit (use -u to show untracked files)\n"); | |
2a3a3c24 JR |
370 | else |
371 | printf("nothing to commit (working directory clean)\n"); | |
6e458bf6 | 372 | } |
c91f0d92 JK |
373 | } |
374 | ||
ef90d6d4 | 375 | int git_status_config(const char *k, const char *v, void *cb) |
c91f0d92 | 376 | { |
ac8d5afc PY |
377 | if (!strcmp(k, "status.submodulesummary")) { |
378 | int is_bool; | |
379 | wt_status_submodule_summary = git_config_bool_or_int(k, v, &is_bool); | |
380 | if (is_bool && wt_status_submodule_summary) | |
381 | wt_status_submodule_summary = -1; | |
382 | return 0; | |
383 | } | |
a159ca0c | 384 | if (!strcmp(k, "status.color") || !strcmp(k, "color.status")) { |
0f6f5a40 | 385 | wt_status_use_color = git_config_colorbool(k, v, -1); |
c91f0d92 JK |
386 | return 0; |
387 | } | |
1968d77d | 388 | if (!prefixcmp(k, "status.color.") || !prefixcmp(k, "color.status.")) { |
c91f0d92 | 389 | int slot = parse_status_slot(k, 13); |
451d36bb JH |
390 | if (!v) |
391 | return config_error_nonbool(k); | |
c91f0d92 | 392 | color_parse(v, k, wt_status_colors[slot]); |
46f721c8 JK |
393 | return 0; |
394 | } | |
395 | if (!strcmp(k, "status.relativepaths")) { | |
396 | wt_status_relative_paths = git_config_bool(k, v); | |
397 | return 0; | |
c91f0d92 | 398 | } |
d6293d1f MSO |
399 | if (!strcmp(k, "status.showuntrackedfiles")) { |
400 | if (!v) | |
c96a6d36 | 401 | return config_error_nonbool(k); |
d6293d1f MSO |
402 | else if (!strcmp(v, "no")) |
403 | show_untracked_files = SHOW_NO_UNTRACKED_FILES; | |
404 | else if (!strcmp(v, "normal")) | |
405 | show_untracked_files = SHOW_NORMAL_UNTRACKED_FILES; | |
406 | else if (!strcmp(v, "all")) | |
407 | show_untracked_files = SHOW_ALL_UNTRACKED_FILES; | |
408 | else | |
409 | return error("Invalid untracked files mode '%s'", v); | |
410 | return 0; | |
411 | } | |
4f672ad6 | 412 | return git_diff_ui_config(k, v, cb); |
c91f0d92 | 413 | } |