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