Submodules: Add the new "ignore" config option for diff and status
[git/git.git] / wt-status.c
CommitLineData
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 15static 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 26static 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
31void 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
52static 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 69static 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 85static 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
104static 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 116static 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
123static 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
146static 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
223static 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
253static 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
273static 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 306static 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);
aee9c7d6
JL
316 if (s->ignore_submodule_arg) {
317 DIFF_OPT_SET(&rev.diffopt, OVERRIDE_SUBMODULE_CONFIG);
46a958b3 318 handle_ignore_submodules_arg(&rev.diffopt, s->ignore_submodule_arg);
aee9c7d6 319 }
50b7e70f
JH
320 rev.diffopt.format_callback = wt_status_collect_changed_cb;
321 rev.diffopt.format_callback_data = s;
76e2f7ce 322 rev.prune_data = s->pathspec;
50b7e70f
JH
323 run_diff_files(&rev, 0);
324}
325
326static void wt_status_collect_changes_index(struct wt_status *s)
327{
328 struct rev_info rev;
32962c9b 329 struct setup_revision_opt opt;
50b7e70f 330
c91f0d92 331 init_revisions(&rev, NULL);
32962c9b
JH
332 memset(&opt, 0, sizeof(opt));
333 opt.def = s->is_initial ? EMPTY_TREE_SHA1_HEX : s->reference;
334 setup_revisions(0, NULL, &rev, &opt);
335
aee9c7d6
JL
336 if (s->ignore_submodule_arg) {
337 DIFF_OPT_SET(&rev.diffopt, OVERRIDE_SUBMODULE_CONFIG);
46a958b3 338 handle_ignore_submodules_arg(&rev.diffopt, s->ignore_submodule_arg);
aee9c7d6 339 }
46a958b3 340
c91f0d92 341 rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
50b7e70f 342 rev.diffopt.format_callback = wt_status_collect_updated_cb;
c91f0d92
JK
343 rev.diffopt.format_callback_data = s;
344 rev.diffopt.detect_rename = 1;
50705915 345 rev.diffopt.rename_limit = 200;
f714fb84 346 rev.diffopt.break_opt = 0;
76e2f7ce 347 rev.prune_data = s->pathspec;
c91f0d92
JK
348 run_diff_index(&rev, 1);
349}
350
50b7e70f
JH
351static void wt_status_collect_changes_initial(struct wt_status *s)
352{
353 int i;
354
355 for (i = 0; i < active_nr; i++) {
356 struct string_list_item *it;
357 struct wt_status_change_data *d;
358 struct cache_entry *ce = active_cache[i];
359
76e2f7ce
JH
360 if (!ce_path_match(ce, s->pathspec))
361 continue;
78a395d3 362 it = string_list_insert(&s->change, ce->name);
50b7e70f
JH
363 d = it->util;
364 if (!d) {
365 d = xcalloc(1, sizeof(*d));
366 it->util = d;
367 }
4d4d5726 368 if (ce_stage(ce)) {
50b7e70f 369 d->index_status = DIFF_STATUS_UNMERGED;
4d4d5726
JH
370 d->stagemask |= (1 << (ce_stage(ce) - 1));
371 }
50b7e70f
JH
372 else
373 d->index_status = DIFF_STATUS_ADDED;
374 }
375}
376
76378683
JH
377static void wt_status_collect_untracked(struct wt_status *s)
378{
379 int i;
380 struct dir_struct dir;
381
382 if (!s->show_untracked_files)
383 return;
384 memset(&dir, 0, sizeof(dir));
385 if (s->show_untracked_files != SHOW_ALL_UNTRACKED_FILES)
386 dir.flags |=
387 DIR_SHOW_OTHER_DIRECTORIES | DIR_HIDE_EMPTY_DIRECTORIES;
388 setup_standard_excludes(&dir);
389
688cd6d2 390 fill_directory(&dir, s->pathspec);
eeefa7c9 391 for (i = 0; i < dir.nr; i++) {
76378683
JH
392 struct dir_entry *ent = dir.entries[i];
393 if (!cache_name_is_other(ent->name, ent->len))
394 continue;
76e2f7ce
JH
395 if (!match_pathspec(s->pathspec, ent->name, ent->len, 0, NULL))
396 continue;
78a395d3 397 string_list_insert(&s->untracked, ent->name);
f5b26b1d 398 free(ent);
76378683 399 }
f5b26b1d 400
6cb3f6b2
JH
401 if (s->show_ignored_files) {
402 dir.nr = 0;
403 dir.flags = DIR_SHOW_IGNORED | DIR_SHOW_OTHER_DIRECTORIES;
404 fill_directory(&dir, s->pathspec);
405 for (i = 0; i < dir.nr; i++) {
406 struct dir_entry *ent = dir.entries[i];
407 if (!cache_name_is_other(ent->name, ent->len))
408 continue;
409 if (!match_pathspec(s->pathspec, ent->name, ent->len, 0, NULL))
410 continue;
78a395d3 411 string_list_insert(&s->ignored, ent->name);
6cb3f6b2
JH
412 free(ent);
413 }
414 }
415
f5b26b1d 416 free(dir.entries);
76378683
JH
417}
418
419void wt_status_collect(struct wt_status *s)
50b7e70f
JH
420{
421 wt_status_collect_changes_worktree(s);
422
423 if (s->is_initial)
424 wt_status_collect_changes_initial(s);
425 else
426 wt_status_collect_changes_index(s);
76378683 427 wt_status_collect_untracked(s);
50b7e70f
JH
428}
429
4d4d5726
JH
430static void wt_status_print_unmerged(struct wt_status *s)
431{
432 int shown_header = 0;
433 int i;
434
435 for (i = 0; i < s->change.nr; i++) {
436 struct wt_status_change_data *d;
437 struct string_list_item *it;
438 it = &(s->change.items[i]);
439 d = it->util;
440 if (!d->stagemask)
441 continue;
442 if (!shown_header) {
443 wt_status_print_unmerged_header(s);
444 shown_header = 1;
445 }
446 wt_status_print_unmerged_data(s, it);
447 }
448 if (shown_header)
449 wt_status_print_trailer(s);
450
451}
452
50b7e70f
JH
453static void wt_status_print_updated(struct wt_status *s)
454{
455 int shown_header = 0;
456 int i;
457
458 for (i = 0; i < s->change.nr; i++) {
459 struct wt_status_change_data *d;
460 struct string_list_item *it;
461 it = &(s->change.items[i]);
462 d = it->util;
463 if (!d->index_status ||
464 d->index_status == DIFF_STATUS_UNMERGED)
465 continue;
466 if (!shown_header) {
467 wt_status_print_cached_header(s);
468 s->commitable = 1;
469 shown_header = 1;
470 }
471 wt_status_print_change_data(s, WT_STATUS_UPDATED, it);
472 }
473 if (shown_header)
474 wt_status_print_trailer(s);
475}
476
477/*
478 * -1 : has delete
479 * 0 : no change
480 * 1 : some change but no delete
481 */
9297f77e
JL
482static int wt_status_check_worktree_changes(struct wt_status *s,
483 int *dirty_submodules)
50b7e70f
JH
484{
485 int i;
486 int changes = 0;
487
9297f77e
JL
488 *dirty_submodules = 0;
489
50b7e70f
JH
490 for (i = 0; i < s->change.nr; i++) {
491 struct wt_status_change_data *d;
492 d = s->change.items[i].util;
4d4d5726
JH
493 if (!d->worktree_status ||
494 d->worktree_status == DIFF_STATUS_UNMERGED)
50b7e70f 495 continue;
9297f77e
JL
496 if (!changes)
497 changes = 1;
498 if (d->dirty_submodule)
499 *dirty_submodules = 1;
50b7e70f 500 if (d->worktree_status == DIFF_STATUS_DELETED)
9297f77e 501 changes = -1;
50b7e70f
JH
502 }
503 return changes;
504}
505
c91f0d92
JK
506static void wt_status_print_changed(struct wt_status *s)
507{
9297f77e
JL
508 int i, dirty_submodules;
509 int worktree_changes = wt_status_check_worktree_changes(s, &dirty_submodules);
50b7e70f
JH
510
511 if (!worktree_changes)
512 return;
513
9297f77e 514 wt_status_print_dirty_header(s, worktree_changes < 0, dirty_submodules);
50b7e70f
JH
515
516 for (i = 0; i < s->change.nr; i++) {
517 struct wt_status_change_data *d;
518 struct string_list_item *it;
519 it = &(s->change.items[i]);
520 d = it->util;
4d4d5726
JH
521 if (!d->worktree_status ||
522 d->worktree_status == DIFF_STATUS_UNMERGED)
50b7e70f
JH
523 continue;
524 wt_status_print_change_data(s, WT_STATUS_CHANGED, it);
525 }
526 wt_status_print_trailer(s);
c91f0d92
JK
527}
528
f17a5d34 529static void wt_status_print_submodule_summary(struct wt_status *s, int uncommitted)
ac8d5afc
PY
530{
531 struct child_process sm_summary;
532 char summary_limit[64];
533 char index[PATH_MAX];
66dbfd55
GV
534 const char *env[] = { NULL, NULL };
535 const char *argv[8];
536
537 env[0] = index;
538 argv[0] = "submodule";
539 argv[1] = "summary";
540 argv[2] = uncommitted ? "--files" : "--cached";
541 argv[3] = "--for-status";
542 argv[4] = "--summary-limit";
543 argv[5] = summary_limit;
544 argv[6] = uncommitted ? NULL : (s->amend ? "HEAD^" : "HEAD");
545 argv[7] = NULL;
ac8d5afc 546
d249b098 547 sprintf(summary_limit, "%d", s->submodule_summary);
ac8d5afc
PY
548 snprintf(index, sizeof(index), "GIT_INDEX_FILE=%s", s->index_file);
549
550 memset(&sm_summary, 0, sizeof(sm_summary));
551 sm_summary.argv = argv;
552 sm_summary.env = env;
553 sm_summary.git_cmd = 1;
554 sm_summary.no_stdin = 1;
555 fflush(s->fp);
556 sm_summary.out = dup(fileno(s->fp)); /* run_command closes it */
557 run_command(&sm_summary);
558}
559
1b908b6f
JH
560static void wt_status_print_other(struct wt_status *s,
561 struct string_list *l,
562 const char *what,
563 const char *how)
c91f0d92 564{
c91f0d92 565 int i;
f285a2d7 566 struct strbuf buf = STRBUF_INIT;
c91f0d92 567
76378683
JH
568 if (!s->untracked.nr)
569 return;
c91f0d92 570
1b908b6f
JH
571 wt_status_print_other_header(s, what, how);
572
573 for (i = 0; i < l->nr; i++) {
76378683 574 struct string_list_item *it;
1b908b6f 575 it = &(l->items[i]);
d249b098
JH
576 color_fprintf(s->fp, color(WT_STATUS_HEADER, s), "#\t");
577 color_fprintf_ln(s->fp, color(WT_STATUS_UNTRACKED, s), "%s",
76378683
JH
578 quote_path(it->string, strlen(it->string),
579 &buf, s->prefix));
c91f0d92 580 }
367c9886 581 strbuf_release(&buf);
c91f0d92
JK
582}
583
584static void wt_status_print_verbose(struct wt_status *s)
585{
586 struct rev_info rev;
32962c9b 587 struct setup_revision_opt opt;
99a12694 588
c91f0d92 589 init_revisions(&rev, NULL);
5ec11af6 590 DIFF_OPT_SET(&rev.diffopt, ALLOW_TEXTCONV);
32962c9b
JH
591
592 memset(&opt, 0, sizeof(opt));
593 opt.def = s->is_initial ? EMPTY_TREE_SHA1_HEX : s->reference;
594 setup_revisions(0, NULL, &rev, &opt);
595
c91f0d92
JK
596 rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
597 rev.diffopt.detect_rename = 1;
4ba0cb27
KH
598 rev.diffopt.file = s->fp;
599 rev.diffopt.close_file = 0;
4f672ad6
JK
600 /*
601 * If we're not going to stdout, then we definitely don't
602 * want color, since we are going to the commit message
603 * file (and even the "auto" setting won't work, since it
604 * will have checked isatty on stdout).
605 */
606 if (s->fp != stdout)
607 DIFF_OPT_CLR(&rev.diffopt, COLOR_DIFF);
c91f0d92
JK
608 run_diff_index(&rev, 1);
609}
610
b6975ab5
JH
611static void wt_status_print_tracking(struct wt_status *s)
612{
613 struct strbuf sb = STRBUF_INIT;
614 const char *cp, *ep;
615 struct branch *branch;
616
617 assert(s->branch && !s->is_initial);
618 if (prefixcmp(s->branch, "refs/heads/"))
619 return;
620 branch = branch_get(s->branch + 11);
621 if (!format_tracking_info(branch, &sb))
622 return;
623
624 for (cp = sb.buf; (ep = strchr(cp, '\n')) != NULL; cp = ep + 1)
d249b098 625 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s),
b6975ab5 626 "# %.*s", (int)(ep - cp), cp);
d249b098 627 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s), "#");
b6975ab5
JH
628}
629
c91f0d92
JK
630void wt_status_print(struct wt_status *s)
631{
d249b098 632 const char *branch_color = color(WT_STATUS_HEADER, s);
98bf8a47 633
bda324cf
JH
634 if (s->branch) {
635 const char *on_what = "On branch ";
636 const char *branch_name = s->branch;
cc44c765 637 if (!prefixcmp(branch_name, "refs/heads/"))
bda324cf
JH
638 branch_name += 11;
639 else if (!strcmp(branch_name, "HEAD")) {
640 branch_name = "";
d249b098 641 branch_color = color(WT_STATUS_NOBRANCH, s);
bda324cf
JH
642 on_what = "Not currently on any branch.";
643 }
d249b098 644 color_fprintf(s->fp, color(WT_STATUS_HEADER, s), "# ");
950ce2e2 645 color_fprintf_ln(s->fp, branch_color, "%s%s", on_what, branch_name);
b6975ab5
JH
646 if (!s->is_initial)
647 wt_status_print_tracking(s);
bda324cf 648 }
c91f0d92
JK
649
650 if (s->is_initial) {
d249b098
JH
651 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s), "#");
652 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s), "# Initial commit");
653 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s), "#");
c91f0d92
JK
654 }
655
c1e255b7 656 wt_status_print_updated(s);
228e7b5d 657 wt_status_print_unmerged(s);
c91f0d92 658 wt_status_print_changed(s);
46a958b3
JL
659 if (s->submodule_summary &&
660 (!s->ignore_submodule_arg ||
661 strcmp(s->ignore_submodule_arg, "all"))) {
f17a5d34
JL
662 wt_status_print_submodule_summary(s, 0); /* staged */
663 wt_status_print_submodule_summary(s, 1); /* unstaged */
664 }
2381e39e 665 if (s->show_untracked_files) {
1b908b6f 666 wt_status_print_other(s, &s->untracked, "Untracked", "add");
2381e39e
JH
667 if (s->show_ignored_files)
668 wt_status_print_other(s, &s->ignored, "Ignored", "add -f");
669 } else if (s->commitable)
980bde38
MG
670 fprintf(s->fp, "# Untracked files not listed%s\n",
671 advice_status_hints
672 ? " (use -u option to show untracked files)" : "");
c91f0d92 673
1324fb6f 674 if (s->verbose)
c91f0d92 675 wt_status_print_verbose(s);
6e458bf6
JR
676 if (!s->commitable) {
677 if (s->amend)
f26a0012 678 fprintf(s->fp, "# No changes\n");
37d07f8f
JH
679 else if (s->nowarn)
680 ; /* nothing */
2a3a3c24 681 else if (s->workdir_dirty)
980bde38
MG
682 printf("no changes added to commit%s\n",
683 advice_status_hints
684 ? " (use \"git add\" and/or \"git commit -a\")" : "");
76378683 685 else if (s->untracked.nr)
980bde38
MG
686 printf("nothing added to commit but untracked files present%s\n",
687 advice_status_hints
688 ? " (use \"git add\" to track)" : "");
2a3a3c24 689 else if (s->is_initial)
980bde38
MG
690 printf("nothing to commit%s\n", advice_status_hints
691 ? " (create/copy files and use \"git add\" to track)" : "");
d249b098 692 else if (!s->show_untracked_files)
980bde38
MG
693 printf("nothing to commit%s\n", advice_status_hints
694 ? " (use -u to show untracked files)" : "");
2a3a3c24 695 else
980bde38
MG
696 printf("nothing to commit%s\n", advice_status_hints
697 ? " (working directory clean)" : "");
6e458bf6 698 }
c91f0d92 699}
84dbe7b8
MG
700
701static void wt_shortstatus_unmerged(int null_termination, struct string_list_item *it,
702 struct wt_status *s)
703{
704 struct wt_status_change_data *d = it->util;
705 const char *how = "??";
706
707 switch (d->stagemask) {
708 case 1: how = "DD"; break; /* both deleted */
709 case 2: how = "AU"; break; /* added by us */
710 case 3: how = "UD"; break; /* deleted by them */
711 case 4: how = "UA"; break; /* added by them */
712 case 5: how = "DU"; break; /* deleted by us */
713 case 6: how = "AA"; break; /* both added */
714 case 7: how = "UU"; break; /* both modified */
715 }
3fe2a894 716 color_fprintf(s->fp, color(WT_STATUS_UNMERGED, s), "%s", how);
84dbe7b8 717 if (null_termination) {
3fe2a894 718 fprintf(stdout, " %s%c", it->string, 0);
84dbe7b8
MG
719 } else {
720 struct strbuf onebuf = STRBUF_INIT;
721 const char *one;
722 one = quote_path(it->string, -1, &onebuf, s->prefix);
3fe2a894 723 printf(" %s\n", one);
84dbe7b8
MG
724 strbuf_release(&onebuf);
725 }
726}
727
728static void wt_shortstatus_status(int null_termination, struct string_list_item *it,
729 struct wt_status *s)
730{
731 struct wt_status_change_data *d = it->util;
732
3fe2a894
MG
733 if (d->index_status)
734 color_fprintf(s->fp, color(WT_STATUS_UPDATED, s), "%c", d->index_status);
735 else
736 putchar(' ');
737 if (d->worktree_status)
738 color_fprintf(s->fp, color(WT_STATUS_CHANGED, s), "%c", d->worktree_status);
739 else
740 putchar(' ');
741 putchar(' ');
84dbe7b8
MG
742 if (null_termination) {
743 fprintf(stdout, "%s%c", it->string, 0);
744 if (d->head_path)
745 fprintf(stdout, "%s%c", d->head_path, 0);
746 } else {
747 struct strbuf onebuf = STRBUF_INIT;
748 const char *one;
749 if (d->head_path) {
750 one = quote_path(d->head_path, -1, &onebuf, s->prefix);
751 printf("%s -> ", one);
752 strbuf_release(&onebuf);
753 }
754 one = quote_path(it->string, -1, &onebuf, s->prefix);
755 printf("%s\n", one);
756 strbuf_release(&onebuf);
757 }
758}
759
2381e39e
JH
760static void wt_shortstatus_other(int null_termination, struct string_list_item *it,
761 struct wt_status *s, const char *sign)
84dbe7b8
MG
762{
763 if (null_termination) {
2381e39e 764 fprintf(stdout, "%s %s%c", sign, it->string, 0);
84dbe7b8
MG
765 } else {
766 struct strbuf onebuf = STRBUF_INIT;
767 const char *one;
768 one = quote_path(it->string, -1, &onebuf, s->prefix);
c1909e72 769 color_fprintf(s->fp, color(WT_STATUS_UNTRACKED, s), "%s", sign);
3fe2a894 770 printf(" %s\n", one);
84dbe7b8
MG
771 strbuf_release(&onebuf);
772 }
773}
774
05a59a08
DKF
775static void wt_shortstatus_print_tracking(struct wt_status *s)
776{
777 struct branch *branch;
778 const char *header_color = color(WT_STATUS_HEADER, s);
779 const char *branch_color_local = color(WT_STATUS_LOCAL_BRANCH, s);
780 const char *branch_color_remote = color(WT_STATUS_REMOTE_BRANCH, s);
781
782 const char *base;
783 const char *branch_name;
784 int num_ours, num_theirs;
785
786 color_fprintf(s->fp, color(WT_STATUS_HEADER, s), "## ");
787
788 if (!s->branch)
789 return;
790 branch_name = s->branch;
791
792 if (!prefixcmp(branch_name, "refs/heads/"))
793 branch_name += 11;
794 else if (!strcmp(branch_name, "HEAD")) {
795 branch_name = "HEAD (no branch)";
796 branch_color_local = color(WT_STATUS_NOBRANCH, s);
797 }
798
799 branch = branch_get(s->branch + 11);
800 if (s->is_initial)
801 color_fprintf(s->fp, header_color, "Initial commit on ");
802 if (!stat_tracking_info(branch, &num_ours, &num_theirs)) {
803 color_fprintf_ln(s->fp, branch_color_local,
804 "%s", branch_name);
805 return;
806 }
807
808 base = branch->merge[0]->dst;
809 base = shorten_unambiguous_ref(base, 0);
810 color_fprintf(s->fp, branch_color_local, "%s", branch_name);
811 color_fprintf(s->fp, header_color, "...");
812 color_fprintf(s->fp, branch_color_remote, "%s", base);
813
814 color_fprintf(s->fp, header_color, " [");
815 if (!num_ours) {
816 color_fprintf(s->fp, header_color, "behind ");
817 color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
818 } else if (!num_theirs) {
819 color_fprintf(s->fp, header_color, "ahead ");
820 color_fprintf(s->fp, branch_color_local, "%d", num_ours);
821 } else {
822 color_fprintf(s->fp, header_color, "ahead ");
823 color_fprintf(s->fp, branch_color_local, "%d", num_ours);
824 color_fprintf(s->fp, header_color, ", behind ");
825 color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
826 }
827
828 color_fprintf_ln(s->fp, header_color, "]");
829}
830
831void wt_shortstatus_print(struct wt_status *s, int null_termination, int show_branch)
84dbe7b8
MG
832{
833 int i;
05a59a08
DKF
834
835 if (show_branch)
836 wt_shortstatus_print_tracking(s);
837
84dbe7b8
MG
838 for (i = 0; i < s->change.nr; i++) {
839 struct wt_status_change_data *d;
840 struct string_list_item *it;
841
842 it = &(s->change.items[i]);
843 d = it->util;
844 if (d->stagemask)
845 wt_shortstatus_unmerged(null_termination, it, s);
846 else
847 wt_shortstatus_status(null_termination, it, s);
848 }
849 for (i = 0; i < s->untracked.nr; i++) {
850 struct string_list_item *it;
851
852 it = &(s->untracked.items[i]);
2381e39e
JH
853 wt_shortstatus_other(null_termination, it, s, "??");
854 }
855 for (i = 0; i < s->ignored.nr; i++) {
856 struct string_list_item *it;
857
858 it = &(s->ignored.items[i]);
859 wt_shortstatus_other(null_termination, it, s, "!!");
84dbe7b8
MG
860 }
861}
4a7cc2fd
JK
862
863void wt_porcelain_print(struct wt_status *s, int null_termination)
864{
865 s->use_color = 0;
8661768f
JK
866 s->relative_paths = 0;
867 s->prefix = NULL;
05a59a08 868 wt_shortstatus_print(s, null_termination, 0);
4a7cc2fd 869}