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" |
Matthieu Moy | bb7e32e | 2013-09-06 19:43:05 +0200 | [diff] [blame] | 11 | #include "argv-array.h" |
Junio C Hamano | b6975ab | 2008-07-02 00:52:16 -0700 | [diff] [blame] | 12 | #include "remote.h" |
Daniel Knittl-Frank | 05a59a0 | 2010-05-25 15:45:51 +0200 | [diff] [blame] | 13 | #include "refs.h" |
Jens Lehmann | 46a958b | 2010-06-25 16:56:47 +0200 | [diff] [blame] | 14 | #include "submodule.h" |
Nguyễn Thái Ngọc Duy | 323d053 | 2012-04-13 17:54:39 +0700 | [diff] [blame] | 15 | #include "column.h" |
Lucien Kong | 2d1cceb | 2012-06-10 13:17:38 +0200 | [diff] [blame] | 16 | #include "strbuf.h" |
Nguyễn Thái Ngọc Duy | 3651e45 | 2013-11-05 09:07:29 +0700 | [diff] [blame] | 17 | #include "utf8.h" |
Jeff King | c91f0d9 | 2006-09-08 04:05:34 -0400 | [diff] [blame] | 18 | |
Nguyễn Thái Ngọc Duy | 983dc69 | 2014-02-17 19:15:30 +0700 | [diff] [blame] | 19 | static const char cut_line[] = |
Jens Lehmann | 1a72cfd | 2013-12-05 20:44:14 +0100 | [diff] [blame] | 20 | "------------------------ >8 ------------------------\n"; |
| 21 | |
Junio C Hamano | 23900a9 | 2009-08-09 23:08:40 -0700 | [diff] [blame] | 22 | static char default_wt_status_colors[][COLOR_MAXLEN] = { |
Arjen Laarhoven | dc6ebd4 | 2009-02-13 22:53:40 +0100 | [diff] [blame] | 23 | GIT_COLOR_NORMAL, /* WT_STATUS_HEADER */ |
| 24 | GIT_COLOR_GREEN, /* WT_STATUS_UPDATED */ |
| 25 | GIT_COLOR_RED, /* WT_STATUS_CHANGED */ |
| 26 | GIT_COLOR_RED, /* WT_STATUS_UNTRACKED */ |
| 27 | GIT_COLOR_RED, /* WT_STATUS_NOBRANCH */ |
Junio C Hamano | 4d4d572 | 2009-08-05 00:04:51 -0700 | [diff] [blame] | 28 | GIT_COLOR_RED, /* WT_STATUS_UNMERGED */ |
Daniel Knittl-Frank | 05a59a0 | 2010-05-25 15:45:51 +0200 | [diff] [blame] | 29 | GIT_COLOR_GREEN, /* WT_STATUS_LOCAL_BRANCH */ |
| 30 | GIT_COLOR_RED, /* WT_STATUS_REMOTE_BRANCH */ |
Jeff King | 148135f | 2010-12-09 12:27:08 -0500 | [diff] [blame] | 31 | GIT_COLOR_NIL, /* WT_STATUS_ONBRANCH */ |
Jeff King | c91f0d9 | 2006-09-08 04:05:34 -0400 | [diff] [blame] | 32 | }; |
Junio C Hamano | 4d22965 | 2007-01-11 15:34:41 -0800 | [diff] [blame] | 33 | |
Junio C Hamano | d249b09 | 2009-08-09 21:59:30 -0700 | [diff] [blame] | 34 | static const char *color(int slot, struct wt_status *s) |
Jeff King | c91f0d9 | 2006-09-08 04:05:34 -0400 | [diff] [blame] | 35 | { |
Jeff King | daa0c3d | 2011-08-17 22:04:23 -0700 | [diff] [blame] | 36 | const char *c = ""; |
| 37 | if (want_color(s->use_color)) |
| 38 | c = s->color_palette[slot]; |
Jeff King | 148135f | 2010-12-09 12:27:08 -0500 | [diff] [blame] | 39 | if (slot == WT_STATUS_ONBRANCH && color_is_nil(c)) |
| 40 | c = s->color_palette[WT_STATUS_HEADER]; |
| 41 | return c; |
Jeff King | c91f0d9 | 2006-09-08 04:05:34 -0400 | [diff] [blame] | 42 | } |
| 43 | |
Jonathan Nieder | becbdae | 2011-02-25 23:09:41 -0600 | [diff] [blame] | 44 | static void status_vprintf(struct wt_status *s, int at_bol, const char *color, |
| 45 | const char *fmt, va_list ap, const char *trail) |
| 46 | { |
| 47 | struct strbuf sb = STRBUF_INIT; |
| 48 | struct strbuf linebuf = STRBUF_INIT; |
| 49 | const char *line, *eol; |
| 50 | |
| 51 | strbuf_vaddf(&sb, fmt, ap); |
| 52 | if (!sb.len) { |
Matthieu Moy | 2556b99 | 2013-09-06 19:43:07 +0200 | [diff] [blame] | 53 | if (s->display_comment_prefix) { |
| 54 | strbuf_addch(&sb, comment_line_char); |
| 55 | if (!trail) |
| 56 | strbuf_addch(&sb, ' '); |
| 57 | } |
Jonathan Nieder | becbdae | 2011-02-25 23:09:41 -0600 | [diff] [blame] | 58 | color_print_strbuf(s->fp, color, &sb); |
| 59 | if (trail) |
| 60 | fprintf(s->fp, "%s", trail); |
| 61 | strbuf_release(&sb); |
| 62 | return; |
| 63 | } |
| 64 | for (line = sb.buf; *line; line = eol + 1) { |
| 65 | eol = strchr(line, '\n'); |
| 66 | |
| 67 | strbuf_reset(&linebuf); |
Matthieu Moy | 2556b99 | 2013-09-06 19:43:07 +0200 | [diff] [blame] | 68 | if (at_bol && s->display_comment_prefix) { |
Junio C Hamano | eff80a9 | 2013-01-16 20:18:48 +0100 | [diff] [blame] | 69 | strbuf_addch(&linebuf, comment_line_char); |
Jonathan Nieder | becbdae | 2011-02-25 23:09:41 -0600 | [diff] [blame] | 70 | if (*line != '\n' && *line != '\t') |
| 71 | strbuf_addch(&linebuf, ' '); |
| 72 | } |
| 73 | if (eol) |
| 74 | strbuf_add(&linebuf, line, eol - line); |
| 75 | else |
| 76 | strbuf_addstr(&linebuf, line); |
| 77 | color_print_strbuf(s->fp, color, &linebuf); |
| 78 | if (eol) |
| 79 | fprintf(s->fp, "\n"); |
| 80 | else |
| 81 | break; |
| 82 | at_bol = 1; |
| 83 | } |
| 84 | if (trail) |
| 85 | fprintf(s->fp, "%s", trail); |
| 86 | strbuf_release(&linebuf); |
| 87 | strbuf_release(&sb); |
| 88 | } |
| 89 | |
| 90 | void status_printf_ln(struct wt_status *s, const char *color, |
| 91 | const char *fmt, ...) |
| 92 | { |
| 93 | va_list ap; |
| 94 | |
| 95 | va_start(ap, fmt); |
| 96 | status_vprintf(s, 1, color, fmt, ap, "\n"); |
| 97 | va_end(ap); |
| 98 | } |
| 99 | |
| 100 | void status_printf(struct wt_status *s, const char *color, |
| 101 | const char *fmt, ...) |
| 102 | { |
| 103 | va_list ap; |
| 104 | |
| 105 | va_start(ap, fmt); |
| 106 | status_vprintf(s, 1, color, fmt, ap, NULL); |
| 107 | va_end(ap); |
| 108 | } |
| 109 | |
Junio C Hamano | 1e24845 | 2012-09-15 22:46:26 -0700 | [diff] [blame] | 110 | static void status_printf_more(struct wt_status *s, const char *color, |
| 111 | const char *fmt, ...) |
Jonathan Nieder | becbdae | 2011-02-25 23:09:41 -0600 | [diff] [blame] | 112 | { |
| 113 | va_list ap; |
| 114 | |
| 115 | va_start(ap, fmt); |
| 116 | status_vprintf(s, 0, color, fmt, ap, NULL); |
| 117 | va_end(ap); |
| 118 | } |
| 119 | |
Jeff King | c91f0d9 | 2006-09-08 04:05:34 -0400 | [diff] [blame] | 120 | void wt_status_prepare(struct wt_status *s) |
| 121 | { |
| 122 | unsigned char sha1[20]; |
Jeff King | c91f0d9 | 2006-09-08 04:05:34 -0400 | [diff] [blame] | 123 | |
Junio C Hamano | cc46a74 | 2007-02-09 16:22:42 -0800 | [diff] [blame] | 124 | memset(s, 0, sizeof(*s)); |
Junio C Hamano | 23900a9 | 2009-08-09 23:08:40 -0700 | [diff] [blame] | 125 | memcpy(s->color_palette, default_wt_status_colors, |
| 126 | sizeof(default_wt_status_colors)); |
Junio C Hamano | d249b09 | 2009-08-09 21:59:30 -0700 | [diff] [blame] | 127 | s->show_untracked_files = SHOW_NORMAL_UNTRACKED_FILES; |
| 128 | s->use_color = -1; |
| 129 | s->relative_paths = 1; |
Ronnie Sahlberg | 7695d11 | 2014-07-15 12:59:36 -0700 | [diff] [blame] | 130 | s->branch = resolve_refdup("HEAD", 0, sha1, NULL); |
Jeff King | c91f0d9 | 2006-09-08 04:05:34 -0400 | [diff] [blame] | 131 | s->reference = "HEAD"; |
Kristian Høgsberg | f26a001 | 2007-09-17 20:06:42 -0400 | [diff] [blame] | 132 | s->fp = stdout; |
Kristian Høgsberg | 0f729f2 | 2007-09-17 20:06:43 -0400 | [diff] [blame] | 133 | s->index_file = get_index_file(); |
Junio C Hamano | 50b7e70 | 2009-08-04 23:49:33 -0700 | [diff] [blame] | 134 | s->change.strdup_strings = 1; |
Junio C Hamano | 7637868 | 2009-08-10 00:36:33 -0700 | [diff] [blame] | 135 | s->untracked.strdup_strings = 1; |
Junio C Hamano | 6cb3f6b | 2010-04-10 00:11:53 -0700 | [diff] [blame] | 136 | s->ignored.strdup_strings = 1; |
Junio C Hamano | 84b4202 | 2013-06-24 11:41:40 -0700 | [diff] [blame] | 137 | s->show_branch = -1; /* unspecified */ |
Matthieu Moy | 2556b99 | 2013-09-06 19:43:07 +0200 | [diff] [blame] | 138 | s->display_comment_prefix = 0; |
Jeff King | c91f0d9 | 2006-09-08 04:05:34 -0400 | [diff] [blame] | 139 | } |
| 140 | |
Junio C Hamano | 4d4d572 | 2009-08-05 00:04:51 -0700 | [diff] [blame] | 141 | static void wt_status_print_unmerged_header(struct wt_status *s) |
| 142 | { |
Lucien Kong | 96b0ec1 | 2012-06-05 22:21:26 +0200 | [diff] [blame] | 143 | int i; |
| 144 | int del_mod_conflict = 0; |
| 145 | int both_deleted = 0; |
| 146 | int not_deleted = 0; |
Junio C Hamano | d249b09 | 2009-08-09 21:59:30 -0700 | [diff] [blame] | 147 | const char *c = color(WT_STATUS_HEADER, s); |
Junio C Hamano | 3c58845 | 2009-12-11 23:53:41 -0800 | [diff] [blame] | 148 | |
Ævar Arnfjörð Bjarmason | 355ec7a | 2011-02-22 23:42:13 +0000 | [diff] [blame] | 149 | status_printf_ln(s, c, _("Unmerged paths:")); |
Lucien Kong | 96b0ec1 | 2012-06-05 22:21:26 +0200 | [diff] [blame] | 150 | |
| 151 | for (i = 0; i < s->change.nr; i++) { |
| 152 | struct string_list_item *it = &(s->change.items[i]); |
| 153 | struct wt_status_change_data *d = it->util; |
| 154 | |
| 155 | switch (d->stagemask) { |
| 156 | case 0: |
| 157 | break; |
| 158 | case 1: |
| 159 | both_deleted = 1; |
| 160 | break; |
| 161 | case 3: |
| 162 | case 5: |
| 163 | del_mod_conflict = 1; |
| 164 | break; |
| 165 | default: |
| 166 | not_deleted = 1; |
| 167 | break; |
| 168 | } |
| 169 | } |
| 170 | |
Matthieu Moy | 6a964f5 | 2013-09-12 12:50:05 +0200 | [diff] [blame] | 171 | if (!s->hints) |
Jeff King | edf563f | 2009-09-09 07:43:03 -0400 | [diff] [blame] | 172 | return; |
Jay Soffian | 37f7a85 | 2011-02-19 23:12:29 -0500 | [diff] [blame] | 173 | if (s->whence != FROM_COMMIT) |
Junio C Hamano | 3c58845 | 2009-12-11 23:53:41 -0800 | [diff] [blame] | 174 | ; |
| 175 | else if (!s->is_initial) |
Ævar Arnfjörð Bjarmason | 355ec7a | 2011-02-22 23:42:13 +0000 | [diff] [blame] | 176 | 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] | 177 | else |
Ævar Arnfjörð Bjarmason | 355ec7a | 2011-02-22 23:42:13 +0000 | [diff] [blame] | 178 | status_printf_ln(s, c, _(" (use \"git rm --cached <file>...\" to unstage)")); |
Lucien Kong | 96b0ec1 | 2012-06-05 22:21:26 +0200 | [diff] [blame] | 179 | |
| 180 | if (!both_deleted) { |
| 181 | if (!del_mod_conflict) |
| 182 | status_printf_ln(s, c, _(" (use \"git add <file>...\" to mark resolution)")); |
| 183 | else |
| 184 | status_printf_ln(s, c, _(" (use \"git add/rm <file>...\" as appropriate to mark resolution)")); |
| 185 | } else if (!del_mod_conflict && !not_deleted) { |
| 186 | status_printf_ln(s, c, _(" (use \"git rm <file>...\" to mark resolution)")); |
| 187 | } else { |
| 188 | status_printf_ln(s, c, _(" (use \"git add/rm <file>...\" as appropriate to mark resolution)")); |
| 189 | } |
Felipe Contreras | 7d7d680 | 2014-05-04 01:12:55 -0500 | [diff] [blame] | 190 | status_printf_ln(s, c, "%s", ""); |
Junio C Hamano | 4d4d572 | 2009-08-05 00:04:51 -0700 | [diff] [blame] | 191 | } |
| 192 | |
Kristian Høgsberg | f26a001 | 2007-09-17 20:06:42 -0400 | [diff] [blame] | 193 | 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] | 194 | { |
Junio C Hamano | d249b09 | 2009-08-09 21:59:30 -0700 | [diff] [blame] | 195 | const char *c = color(WT_STATUS_HEADER, s); |
Junio C Hamano | 3c58845 | 2009-12-11 23:53:41 -0800 | [diff] [blame] | 196 | |
Ævar Arnfjörð Bjarmason | 919a4ce | 2011-02-22 23:42:16 +0000 | [diff] [blame] | 197 | status_printf_ln(s, c, _("Changes to be committed:")); |
Matthieu Moy | 6a964f5 | 2013-09-12 12:50:05 +0200 | [diff] [blame] | 198 | if (!s->hints) |
Jeff King | edf563f | 2009-09-09 07:43:03 -0400 | [diff] [blame] | 199 | return; |
Jay Soffian | 37f7a85 | 2011-02-19 23:12:29 -0500 | [diff] [blame] | 200 | if (s->whence != FROM_COMMIT) |
Junio C Hamano | 3c58845 | 2009-12-11 23:53:41 -0800 | [diff] [blame] | 201 | ; /* NEEDSWORK: use "git reset --unresolve"??? */ |
| 202 | else if (!s->is_initial) |
Ævar Arnfjörð Bjarmason | 355ec7a | 2011-02-22 23:42:13 +0000 | [diff] [blame] | 203 | 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] | 204 | else |
Ævar Arnfjörð Bjarmason | 355ec7a | 2011-02-22 23:42:13 +0000 | [diff] [blame] | 205 | status_printf_ln(s, c, _(" (use \"git rm --cached <file>...\" to unstage)")); |
Felipe Contreras | 7d7d680 | 2014-05-04 01:12:55 -0500 | [diff] [blame] | 206 | status_printf_ln(s, c, "%s", ""); |
Jürgen Rühle | 3c1eb9c | 2007-01-02 20:26:21 +0100 | [diff] [blame] | 207 | } |
| 208 | |
Anders Melchiorsen | bb914b1 | 2008-09-08 00:05:02 +0200 | [diff] [blame] | 209 | static void wt_status_print_dirty_header(struct wt_status *s, |
Jens Lehmann | 9297f77e6 | 2010-03-08 13:53:19 +0100 | [diff] [blame] | 210 | int has_deleted, |
| 211 | int has_dirty_submodules) |
Jeff King | c91f0d9 | 2006-09-08 04:05:34 -0400 | [diff] [blame] | 212 | { |
Junio C Hamano | d249b09 | 2009-08-09 21:59:30 -0700 | [diff] [blame] | 213 | const char *c = color(WT_STATUS_HEADER, s); |
Junio C Hamano | 3c58845 | 2009-12-11 23:53:41 -0800 | [diff] [blame] | 214 | |
Ævar Arnfjörð Bjarmason | 355ec7a | 2011-02-22 23:42:13 +0000 | [diff] [blame] | 215 | status_printf_ln(s, c, _("Changes not staged for commit:")); |
Matthieu Moy | 6a964f5 | 2013-09-12 12:50:05 +0200 | [diff] [blame] | 216 | if (!s->hints) |
Jeff King | edf563f | 2009-09-09 07:43:03 -0400 | [diff] [blame] | 217 | return; |
Anders Melchiorsen | bb914b1 | 2008-09-08 00:05:02 +0200 | [diff] [blame] | 218 | if (!has_deleted) |
Ævar Arnfjörð Bjarmason | 355ec7a | 2011-02-22 23:42:13 +0000 | [diff] [blame] | 219 | 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] | 220 | else |
Ævar Arnfjörð Bjarmason | 355ec7a | 2011-02-22 23:42:13 +0000 | [diff] [blame] | 221 | status_printf_ln(s, c, _(" (use \"git add/rm <file>...\" to update what will be committed)")); |
| 222 | 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] | 223 | if (has_dirty_submodules) |
Ævar Arnfjörð Bjarmason | 355ec7a | 2011-02-22 23:42:13 +0000 | [diff] [blame] | 224 | status_printf_ln(s, c, _(" (commit or discard the untracked or modified content in submodules)")); |
Felipe Contreras | 7d7d680 | 2014-05-04 01:12:55 -0500 | [diff] [blame] | 225 | status_printf_ln(s, c, "%s", ""); |
Anders Melchiorsen | bb914b1 | 2008-09-08 00:05:02 +0200 | [diff] [blame] | 226 | } |
| 227 | |
Junio C Hamano | 1b908b6 | 2010-04-10 00:19:46 -0700 | [diff] [blame] | 228 | static void wt_status_print_other_header(struct wt_status *s, |
| 229 | const char *what, |
| 230 | const char *how) |
Anders Melchiorsen | bb914b1 | 2008-09-08 00:05:02 +0200 | [diff] [blame] | 231 | { |
Junio C Hamano | d249b09 | 2009-08-09 21:59:30 -0700 | [diff] [blame] | 232 | const char *c = color(WT_STATUS_HEADER, s); |
Nguyễn Thái Ngọc Duy | 50bd8b7 | 2012-09-06 22:16:50 +0700 | [diff] [blame] | 233 | status_printf_ln(s, c, "%s:", what); |
Matthieu Moy | 6a964f5 | 2013-09-12 12:50:05 +0200 | [diff] [blame] | 234 | if (!s->hints) |
Jeff King | edf563f | 2009-09-09 07:43:03 -0400 | [diff] [blame] | 235 | return; |
Ævar Arnfjörð Bjarmason | 355ec7a | 2011-02-22 23:42:13 +0000 | [diff] [blame] | 236 | status_printf_ln(s, c, _(" (use \"git %s <file>...\" to include in what will be committed)"), how); |
Felipe Contreras | 7d7d680 | 2014-05-04 01:12:55 -0500 | [diff] [blame] | 237 | status_printf_ln(s, c, "%s", ""); |
Jeff King | c91f0d9 | 2006-09-08 04:05:34 -0400 | [diff] [blame] | 238 | } |
| 239 | |
Kristian Høgsberg | f26a001 | 2007-09-17 20:06:42 -0400 | [diff] [blame] | 240 | static void wt_status_print_trailer(struct wt_status *s) |
Jeff King | c91f0d9 | 2006-09-08 04:05:34 -0400 | [diff] [blame] | 241 | { |
Felipe Contreras | 7d7d680 | 2014-05-04 01:12:55 -0500 | [diff] [blame] | 242 | status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", ""); |
Jeff King | c91f0d9 | 2006-09-08 04:05:34 -0400 | [diff] [blame] | 243 | } |
| 244 | |
Dmitry Potapov | a734d0b | 2008-03-07 05:30:58 +0300 | [diff] [blame] | 245 | #define quote_path quote_path_relative |
Junio C Hamano | 3a94680 | 2006-11-08 13:20:46 -0800 | [diff] [blame] | 246 | |
Jonathan Nieder | 8f17f5b | 2013-12-19 11:43:19 -0800 | [diff] [blame] | 247 | static const char *wt_status_unmerged_status_string(int stagemask) |
Junio C Hamano | 4d4d572 | 2009-08-05 00:04:51 -0700 | [diff] [blame] | 248 | { |
Jonathan Nieder | 8f17f5b | 2013-12-19 11:43:19 -0800 | [diff] [blame] | 249 | switch (stagemask) { |
| 250 | case 1: |
| 251 | return _("both deleted:"); |
| 252 | case 2: |
| 253 | return _("added by us:"); |
| 254 | case 3: |
| 255 | return _("deleted by them:"); |
| 256 | case 4: |
| 257 | return _("added by them:"); |
| 258 | case 5: |
| 259 | return _("deleted by us:"); |
| 260 | case 6: |
| 261 | return _("both added:"); |
| 262 | case 7: |
| 263 | return _("both modified:"); |
| 264 | default: |
| 265 | die(_("bug: unhandled unmerged status %x"), stagemask); |
Junio C Hamano | 4d4d572 | 2009-08-05 00:04:51 -0700 | [diff] [blame] | 266 | } |
Junio C Hamano | 4d4d572 | 2009-08-05 00:04:51 -0700 | [diff] [blame] | 267 | } |
| 268 | |
Nguyễn Thái Ngọc Duy | 3651e45 | 2013-11-05 09:07:29 +0700 | [diff] [blame] | 269 | static const char *wt_status_diff_status_string(int status) |
| 270 | { |
| 271 | switch (status) { |
| 272 | case DIFF_STATUS_ADDED: |
Junio C Hamano | d52cb57 | 2014-03-12 13:51:22 -0700 | [diff] [blame] | 273 | return _("new file:"); |
Nguyễn Thái Ngọc Duy | 3651e45 | 2013-11-05 09:07:29 +0700 | [diff] [blame] | 274 | case DIFF_STATUS_COPIED: |
Junio C Hamano | d52cb57 | 2014-03-12 13:51:22 -0700 | [diff] [blame] | 275 | return _("copied:"); |
Nguyễn Thái Ngọc Duy | 3651e45 | 2013-11-05 09:07:29 +0700 | [diff] [blame] | 276 | case DIFF_STATUS_DELETED: |
Junio C Hamano | d52cb57 | 2014-03-12 13:51:22 -0700 | [diff] [blame] | 277 | return _("deleted:"); |
Nguyễn Thái Ngọc Duy | 3651e45 | 2013-11-05 09:07:29 +0700 | [diff] [blame] | 278 | case DIFF_STATUS_MODIFIED: |
Junio C Hamano | d52cb57 | 2014-03-12 13:51:22 -0700 | [diff] [blame] | 279 | return _("modified:"); |
Nguyễn Thái Ngọc Duy | 3651e45 | 2013-11-05 09:07:29 +0700 | [diff] [blame] | 280 | case DIFF_STATUS_RENAMED: |
Junio C Hamano | d52cb57 | 2014-03-12 13:51:22 -0700 | [diff] [blame] | 281 | return _("renamed:"); |
Nguyễn Thái Ngọc Duy | 3651e45 | 2013-11-05 09:07:29 +0700 | [diff] [blame] | 282 | case DIFF_STATUS_TYPE_CHANGED: |
Junio C Hamano | d52cb57 | 2014-03-12 13:51:22 -0700 | [diff] [blame] | 283 | return _("typechange:"); |
Nguyễn Thái Ngọc Duy | 3651e45 | 2013-11-05 09:07:29 +0700 | [diff] [blame] | 284 | case DIFF_STATUS_UNKNOWN: |
Junio C Hamano | d52cb57 | 2014-03-12 13:51:22 -0700 | [diff] [blame] | 285 | return _("unknown:"); |
Nguyễn Thái Ngọc Duy | 3651e45 | 2013-11-05 09:07:29 +0700 | [diff] [blame] | 286 | case DIFF_STATUS_UNMERGED: |
Junio C Hamano | d52cb57 | 2014-03-12 13:51:22 -0700 | [diff] [blame] | 287 | return _("unmerged:"); |
Nguyễn Thái Ngọc Duy | 3651e45 | 2013-11-05 09:07:29 +0700 | [diff] [blame] | 288 | default: |
| 289 | return NULL; |
| 290 | } |
| 291 | } |
| 292 | |
Jonathan Nieder | 335e825 | 2013-12-19 11:43:19 -0800 | [diff] [blame] | 293 | static int maxwidth(const char *(*label)(int), int minval, int maxval) |
| 294 | { |
| 295 | int result = 0, i; |
| 296 | |
| 297 | for (i = minval; i <= maxval; i++) { |
| 298 | const char *s = label(i); |
| 299 | int len = s ? utf8_strwidth(s) : 0; |
| 300 | if (len > result) |
| 301 | result = len; |
| 302 | } |
| 303 | return result; |
| 304 | } |
| 305 | |
Jonathan Nieder | 8f17f5b | 2013-12-19 11:43:19 -0800 | [diff] [blame] | 306 | static void wt_status_print_unmerged_data(struct wt_status *s, |
| 307 | struct string_list_item *it) |
| 308 | { |
| 309 | const char *c = color(WT_STATUS_UNMERGED, s); |
| 310 | struct wt_status_change_data *d = it->util; |
| 311 | struct strbuf onebuf = STRBUF_INIT; |
| 312 | static char *padding; |
| 313 | static int label_width; |
| 314 | const char *one, *how; |
| 315 | int len; |
| 316 | |
| 317 | if (!padding) { |
| 318 | label_width = maxwidth(wt_status_unmerged_status_string, 1, 7); |
| 319 | label_width += strlen(" "); |
Jonathan Nieder | 8f17f5b | 2013-12-19 11:43:19 -0800 | [diff] [blame] | 320 | padding = xmallocz(label_width); |
| 321 | memset(padding, ' ', label_width); |
| 322 | } |
| 323 | |
| 324 | one = quote_path(it->string, s->prefix, &onebuf); |
| 325 | status_printf(s, color(WT_STATUS_HEADER, s), "\t"); |
| 326 | |
| 327 | how = wt_status_unmerged_status_string(d->stagemask); |
| 328 | len = label_width - utf8_strwidth(how); |
| 329 | status_printf_more(s, c, "%s%.*s%s\n", how, len, padding, one); |
| 330 | strbuf_release(&onebuf); |
| 331 | } |
| 332 | |
Junio C Hamano | 50b7e70 | 2009-08-04 23:49:33 -0700 | [diff] [blame] | 333 | static void wt_status_print_change_data(struct wt_status *s, |
| 334 | int change_type, |
| 335 | struct string_list_item *it) |
Jeff King | c91f0d9 | 2006-09-08 04:05:34 -0400 | [diff] [blame] | 336 | { |
Junio C Hamano | 50b7e70 | 2009-08-04 23:49:33 -0700 | [diff] [blame] | 337 | struct wt_status_change_data *d = it->util; |
Junio C Hamano | d249b09 | 2009-08-09 21:59:30 -0700 | [diff] [blame] | 338 | const char *c = color(change_type, s); |
Jeff King | b8527d5 | 2013-03-21 07:05:28 -0400 | [diff] [blame] | 339 | int status; |
Junio C Hamano | 50b7e70 | 2009-08-04 23:49:33 -0700 | [diff] [blame] | 340 | char *one_name; |
| 341 | char *two_name; |
Junio C Hamano | 3a94680 | 2006-11-08 13:20:46 -0800 | [diff] [blame] | 342 | const char *one, *two; |
Brandon Casey | f285a2d | 2008-10-09 14:12:12 -0500 | [diff] [blame] | 343 | struct strbuf onebuf = STRBUF_INIT, twobuf = STRBUF_INIT; |
Jens Lehmann | 9297f77e6 | 2010-03-08 13:53:19 +0100 | [diff] [blame] | 344 | struct strbuf extra = STRBUF_INIT; |
Nguyễn Thái Ngọc Duy | 3651e45 | 2013-11-05 09:07:29 +0700 | [diff] [blame] | 345 | static char *padding; |
Junio C Hamano | d52cb57 | 2014-03-12 13:51:22 -0700 | [diff] [blame] | 346 | static int label_width; |
Nguyễn Thái Ngọc Duy | 3651e45 | 2013-11-05 09:07:29 +0700 | [diff] [blame] | 347 | const char *what; |
| 348 | int len; |
| 349 | |
| 350 | if (!padding) { |
Jonathan Nieder | 335e825 | 2013-12-19 11:43:19 -0800 | [diff] [blame] | 351 | /* If DIFF_STATUS_* uses outside the range [A..Z], we're in trouble */ |
| 352 | label_width = maxwidth(wt_status_diff_status_string, 'A', 'Z'); |
Junio C Hamano | d52cb57 | 2014-03-12 13:51:22 -0700 | [diff] [blame] | 353 | label_width += strlen(" "); |
| 354 | padding = xmallocz(label_width); |
| 355 | memset(padding, ' ', label_width); |
Nguyễn Thái Ngọc Duy | 3651e45 | 2013-11-05 09:07:29 +0700 | [diff] [blame] | 356 | } |
Junio C Hamano | 3a94680 | 2006-11-08 13:20:46 -0800 | [diff] [blame] | 357 | |
Junio C Hamano | 50b7e70 | 2009-08-04 23:49:33 -0700 | [diff] [blame] | 358 | one_name = two_name = it->string; |
| 359 | switch (change_type) { |
| 360 | case WT_STATUS_UPDATED: |
| 361 | status = d->index_status; |
| 362 | if (d->head_path) |
| 363 | one_name = d->head_path; |
| 364 | break; |
| 365 | case WT_STATUS_CHANGED: |
Jens Lehmann | 9297f77e6 | 2010-03-08 13:53:19 +0100 | [diff] [blame] | 366 | if (d->new_submodule_commits || d->dirty_submodule) { |
| 367 | strbuf_addstr(&extra, " ("); |
| 368 | if (d->new_submodule_commits) |
Ævar Arnfjörð Bjarmason | 355ec7a | 2011-02-22 23:42:13 +0000 | [diff] [blame] | 369 | strbuf_addf(&extra, _("new commits, ")); |
Jens Lehmann | 9297f77e6 | 2010-03-08 13:53:19 +0100 | [diff] [blame] | 370 | if (d->dirty_submodule & DIRTY_SUBMODULE_MODIFIED) |
Ævar Arnfjörð Bjarmason | 355ec7a | 2011-02-22 23:42:13 +0000 | [diff] [blame] | 371 | strbuf_addf(&extra, _("modified content, ")); |
Jens Lehmann | 9297f77e6 | 2010-03-08 13:53:19 +0100 | [diff] [blame] | 372 | if (d->dirty_submodule & DIRTY_SUBMODULE_UNTRACKED) |
Ævar Arnfjörð Bjarmason | 355ec7a | 2011-02-22 23:42:13 +0000 | [diff] [blame] | 373 | strbuf_addf(&extra, _("untracked content, ")); |
Jens Lehmann | 9297f77e6 | 2010-03-08 13:53:19 +0100 | [diff] [blame] | 374 | strbuf_setlen(&extra, extra.len - 2); |
| 375 | strbuf_addch(&extra, ')'); |
| 376 | } |
Junio C Hamano | 50b7e70 | 2009-08-04 23:49:33 -0700 | [diff] [blame] | 377 | status = d->worktree_status; |
| 378 | break; |
Jeff King | b8527d5 | 2013-03-21 07:05:28 -0400 | [diff] [blame] | 379 | default: |
| 380 | die("BUG: unhandled change_type %d in wt_status_print_change_data", |
| 381 | change_type); |
Junio C Hamano | 50b7e70 | 2009-08-04 23:49:33 -0700 | [diff] [blame] | 382 | } |
| 383 | |
Jiang Xin | 39598f9 | 2013-06-25 23:53:45 +0800 | [diff] [blame] | 384 | one = quote_path(one_name, s->prefix, &onebuf); |
| 385 | two = quote_path(two_name, s->prefix, &twobuf); |
Junio C Hamano | 3a94680 | 2006-11-08 13:20:46 -0800 | [diff] [blame] | 386 | |
Jonathan Nieder | b926c0d | 2011-02-25 23:11:37 -0600 | [diff] [blame] | 387 | status_printf(s, color(WT_STATUS_HEADER, s), "\t"); |
Nguyễn Thái Ngọc Duy | 3651e45 | 2013-11-05 09:07:29 +0700 | [diff] [blame] | 388 | what = wt_status_diff_status_string(status); |
| 389 | if (!what) |
Ævar Arnfjörð Bjarmason | 355ec7a | 2011-02-22 23:42:13 +0000 | [diff] [blame] | 390 | die(_("bug: unhandled diff status %c"), status); |
Junio C Hamano | d52cb57 | 2014-03-12 13:51:22 -0700 | [diff] [blame] | 391 | len = label_width - utf8_strwidth(what); |
Nguyễn Thái Ngọc Duy | 3651e45 | 2013-11-05 09:07:29 +0700 | [diff] [blame] | 392 | assert(len >= 0); |
| 393 | if (status == DIFF_STATUS_COPIED || status == DIFF_STATUS_RENAMED) |
Junio C Hamano | d52cb57 | 2014-03-12 13:51:22 -0700 | [diff] [blame] | 394 | status_printf_more(s, c, "%s%.*s%s -> %s", |
Nguyễn Thái Ngọc Duy | 3651e45 | 2013-11-05 09:07:29 +0700 | [diff] [blame] | 395 | what, len, padding, one, two); |
| 396 | else |
Junio C Hamano | d52cb57 | 2014-03-12 13:51:22 -0700 | [diff] [blame] | 397 | status_printf_more(s, c, "%s%.*s%s", |
Nguyễn Thái Ngọc Duy | 3651e45 | 2013-11-05 09:07:29 +0700 | [diff] [blame] | 398 | what, len, padding, one); |
Jens Lehmann | 9297f77e6 | 2010-03-08 13:53:19 +0100 | [diff] [blame] | 399 | if (extra.len) { |
Jonathan Nieder | b926c0d | 2011-02-25 23:11:37 -0600 | [diff] [blame] | 400 | status_printf_more(s, color(WT_STATUS_HEADER, s), "%s", extra.buf); |
Jens Lehmann | 9297f77e6 | 2010-03-08 13:53:19 +0100 | [diff] [blame] | 401 | strbuf_release(&extra); |
| 402 | } |
Jonathan Nieder | b926c0d | 2011-02-25 23:11:37 -0600 | [diff] [blame] | 403 | status_printf_more(s, GIT_COLOR_NORMAL, "\n"); |
Johannes Schindelin | 367c988 | 2007-11-11 17:35:41 +0000 | [diff] [blame] | 404 | strbuf_release(&onebuf); |
| 405 | strbuf_release(&twobuf); |
Jeff King | c91f0d9 | 2006-09-08 04:05:34 -0400 | [diff] [blame] | 406 | } |
| 407 | |
Junio C Hamano | 50b7e70 | 2009-08-04 23:49:33 -0700 | [diff] [blame] | 408 | static void wt_status_collect_changed_cb(struct diff_queue_struct *q, |
| 409 | struct diff_options *options, |
| 410 | void *data) |
Jeff King | c91f0d9 | 2006-09-08 04:05:34 -0400 | [diff] [blame] | 411 | { |
| 412 | struct wt_status *s = data; |
Jeff King | c91f0d9 | 2006-09-08 04:05:34 -0400 | [diff] [blame] | 413 | int i; |
Junio C Hamano | 50b7e70 | 2009-08-04 23:49:33 -0700 | [diff] [blame] | 414 | |
| 415 | if (!q->nr) |
| 416 | return; |
| 417 | s->workdir_dirty = 1; |
Jeff King | c91f0d9 | 2006-09-08 04:05:34 -0400 | [diff] [blame] | 418 | for (i = 0; i < q->nr; i++) { |
Junio C Hamano | 50b7e70 | 2009-08-04 23:49:33 -0700 | [diff] [blame] | 419 | struct diff_filepair *p; |
| 420 | struct string_list_item *it; |
| 421 | struct wt_status_change_data *d; |
| 422 | |
| 423 | p = q->queue[i]; |
Julian Phillips | 78a395d | 2010-06-26 00:41:35 +0100 | [diff] [blame] | 424 | it = string_list_insert(&s->change, p->one->path); |
Junio C Hamano | 50b7e70 | 2009-08-04 23:49:33 -0700 | [diff] [blame] | 425 | d = it->util; |
| 426 | if (!d) { |
| 427 | d = xcalloc(1, sizeof(*d)); |
| 428 | it->util = d; |
Jeff King | c91f0d9 | 2006-09-08 04:05:34 -0400 | [diff] [blame] | 429 | } |
Junio C Hamano | 50b7e70 | 2009-08-04 23:49:33 -0700 | [diff] [blame] | 430 | if (!d->worktree_status) |
| 431 | d->worktree_status = p->status; |
Jens Lehmann | 9297f77e6 | 2010-03-08 13:53:19 +0100 | [diff] [blame] | 432 | d->dirty_submodule = p->two->dirty_submodule; |
| 433 | if (S_ISGITLINK(p->two->mode)) |
| 434 | d->new_submodule_commits = !!hashcmp(p->one->sha1, p->two->sha1); |
Jeff King | c91f0d9 | 2006-09-08 04:05:34 -0400 | [diff] [blame] | 435 | } |
Jeff King | c91f0d9 | 2006-09-08 04:05:34 -0400 | [diff] [blame] | 436 | } |
| 437 | |
Junio C Hamano | 4d4d572 | 2009-08-05 00:04:51 -0700 | [diff] [blame] | 438 | static int unmerged_mask(const char *path) |
| 439 | { |
| 440 | int pos, mask; |
Nguyễn Thái Ngọc Duy | 9c5e6c8 | 2013-07-09 22:29:00 +0700 | [diff] [blame] | 441 | const struct cache_entry *ce; |
Junio C Hamano | 4d4d572 | 2009-08-05 00:04:51 -0700 | [diff] [blame] | 442 | |
| 443 | pos = cache_name_pos(path, strlen(path)); |
| 444 | if (0 <= pos) |
| 445 | return 0; |
| 446 | |
| 447 | mask = 0; |
| 448 | pos = -pos-1; |
| 449 | while (pos < active_nr) { |
| 450 | ce = active_cache[pos++]; |
| 451 | if (strcmp(ce->name, path) || !ce_stage(ce)) |
| 452 | break; |
| 453 | mask |= (1 << (ce_stage(ce) - 1)); |
| 454 | } |
| 455 | return mask; |
| 456 | } |
| 457 | |
Junio C Hamano | 50b7e70 | 2009-08-04 23:49:33 -0700 | [diff] [blame] | 458 | static void wt_status_collect_updated_cb(struct diff_queue_struct *q, |
| 459 | struct diff_options *options, |
| 460 | void *data) |
Jeff King | c91f0d9 | 2006-09-08 04:05:34 -0400 | [diff] [blame] | 461 | { |
Jürgen Rühle | 6e458bf | 2007-01-02 20:26:22 +0100 | [diff] [blame] | 462 | struct wt_status *s = data; |
Jeff King | c91f0d9 | 2006-09-08 04:05:34 -0400 | [diff] [blame] | 463 | int i; |
Junio C Hamano | 50b7e70 | 2009-08-04 23:49:33 -0700 | [diff] [blame] | 464 | |
| 465 | for (i = 0; i < q->nr; i++) { |
| 466 | struct diff_filepair *p; |
| 467 | struct string_list_item *it; |
| 468 | struct wt_status_change_data *d; |
| 469 | |
| 470 | p = q->queue[i]; |
Julian Phillips | 78a395d | 2010-06-26 00:41:35 +0100 | [diff] [blame] | 471 | it = string_list_insert(&s->change, p->two->path); |
Junio C Hamano | 50b7e70 | 2009-08-04 23:49:33 -0700 | [diff] [blame] | 472 | d = it->util; |
| 473 | if (!d) { |
| 474 | d = xcalloc(1, sizeof(*d)); |
| 475 | it->util = d; |
| 476 | } |
| 477 | if (!d->index_status) |
| 478 | d->index_status = p->status; |
| 479 | switch (p->status) { |
| 480 | case DIFF_STATUS_COPIED: |
| 481 | case DIFF_STATUS_RENAMED: |
| 482 | d->head_path = xstrdup(p->one->path); |
| 483 | break; |
Junio C Hamano | 4d4d572 | 2009-08-05 00:04:51 -0700 | [diff] [blame] | 484 | case DIFF_STATUS_UNMERGED: |
| 485 | d->stagemask = unmerged_mask(p->two->path); |
| 486 | break; |
Junio C Hamano | 50b7e70 | 2009-08-04 23:49:33 -0700 | [diff] [blame] | 487 | } |
Jürgen Rühle | 6e458bf | 2007-01-02 20:26:22 +0100 | [diff] [blame] | 488 | } |
Jeff King | c91f0d9 | 2006-09-08 04:05:34 -0400 | [diff] [blame] | 489 | } |
| 490 | |
Junio C Hamano | 50b7e70 | 2009-08-04 23:49:33 -0700 | [diff] [blame] | 491 | static void wt_status_collect_changes_worktree(struct wt_status *s) |
Jeff King | c91f0d9 | 2006-09-08 04:05:34 -0400 | [diff] [blame] | 492 | { |
| 493 | struct rev_info rev; |
Junio C Hamano | 50b7e70 | 2009-08-04 23:49:33 -0700 | [diff] [blame] | 494 | |
| 495 | init_revisions(&rev, NULL); |
| 496 | setup_revisions(0, NULL, &rev, NULL); |
| 497 | rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK; |
Jens Lehmann | 9297f77e6 | 2010-03-08 13:53:19 +0100 | [diff] [blame] | 498 | DIFF_OPT_SET(&rev.diffopt, DIRTY_SUBMODULES); |
Jens Lehmann | 3bfc450 | 2010-03-13 23:00:27 +0100 | [diff] [blame] | 499 | if (!s->show_untracked_files) |
| 500 | DIFF_OPT_SET(&rev.diffopt, IGNORE_UNTRACKED_IN_SUBMODULES); |
Jens Lehmann | aee9c7d | 2010-08-06 00:39:25 +0200 | [diff] [blame] | 501 | if (s->ignore_submodule_arg) { |
| 502 | DIFF_OPT_SET(&rev.diffopt, OVERRIDE_SUBMODULE_CONFIG); |
Jens Lehmann | 46a958b | 2010-06-25 16:56:47 +0200 | [diff] [blame] | 503 | handle_ignore_submodules_arg(&rev.diffopt, s->ignore_submodule_arg); |
Nguyễn Thái Ngọc Duy | c4c42f2 | 2011-10-24 15:24:51 +1100 | [diff] [blame] | 504 | } |
Junio C Hamano | 50b7e70 | 2009-08-04 23:49:33 -0700 | [diff] [blame] | 505 | rev.diffopt.format_callback = wt_status_collect_changed_cb; |
| 506 | rev.diffopt.format_callback_data = s; |
Nguyễn Thái Ngọc Duy | 15b55ae | 2013-07-14 15:35:39 +0700 | [diff] [blame] | 507 | copy_pathspec(&rev.prune_data, &s->pathspec); |
Junio C Hamano | 50b7e70 | 2009-08-04 23:49:33 -0700 | [diff] [blame] | 508 | run_diff_files(&rev, 0); |
| 509 | } |
| 510 | |
| 511 | static void wt_status_collect_changes_index(struct wt_status *s) |
| 512 | { |
| 513 | struct rev_info rev; |
Junio C Hamano | 32962c9 | 2010-03-08 22:58:09 -0800 | [diff] [blame] | 514 | struct setup_revision_opt opt; |
Junio C Hamano | 50b7e70 | 2009-08-04 23:49:33 -0700 | [diff] [blame] | 515 | |
Jeff King | c91f0d9 | 2006-09-08 04:05:34 -0400 | [diff] [blame] | 516 | init_revisions(&rev, NULL); |
Junio C Hamano | 32962c9 | 2010-03-08 22:58:09 -0800 | [diff] [blame] | 517 | memset(&opt, 0, sizeof(opt)); |
| 518 | opt.def = s->is_initial ? EMPTY_TREE_SHA1_HEX : s->reference; |
| 519 | setup_revisions(0, NULL, &rev, &opt); |
| 520 | |
Jens Lehmann | 1d2f393 | 2014-04-05 18:59:03 +0200 | [diff] [blame] | 521 | DIFF_OPT_SET(&rev.diffopt, OVERRIDE_SUBMODULE_CONFIG); |
Jens Lehmann | aee9c7d | 2010-08-06 00:39:25 +0200 | [diff] [blame] | 522 | if (s->ignore_submodule_arg) { |
Jens Lehmann | 46a958b | 2010-06-25 16:56:47 +0200 | [diff] [blame] | 523 | handle_ignore_submodules_arg(&rev.diffopt, s->ignore_submodule_arg); |
Jens Lehmann | 1d2f393 | 2014-04-05 18:59:03 +0200 | [diff] [blame] | 524 | } else { |
| 525 | /* |
| 526 | * Unless the user did explicitly request a submodule ignore |
| 527 | * mode by passing a command line option we do not ignore any |
| 528 | * changed submodule SHA-1s when comparing index and HEAD, no |
| 529 | * matter what is configured. Otherwise the user won't be |
| 530 | * shown any submodules she manually added (and which are |
| 531 | * staged to be committed), which would be really confusing. |
| 532 | */ |
| 533 | handle_ignore_submodules_arg(&rev.diffopt, "dirty"); |
Jens Lehmann | aee9c7d | 2010-08-06 00:39:25 +0200 | [diff] [blame] | 534 | } |
Jens Lehmann | 46a958b | 2010-06-25 16:56:47 +0200 | [diff] [blame] | 535 | |
Jeff King | c91f0d9 | 2006-09-08 04:05:34 -0400 | [diff] [blame] | 536 | rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK; |
Junio C Hamano | 50b7e70 | 2009-08-04 23:49:33 -0700 | [diff] [blame] | 537 | rev.diffopt.format_callback = wt_status_collect_updated_cb; |
Jeff King | c91f0d9 | 2006-09-08 04:05:34 -0400 | [diff] [blame] | 538 | rev.diffopt.format_callback_data = s; |
| 539 | rev.diffopt.detect_rename = 1; |
Jeff King | 5070591 | 2008-04-30 13:24:43 -0400 | [diff] [blame] | 540 | rev.diffopt.rename_limit = 200; |
Jeff King | f714fb8 | 2007-12-02 22:58:37 -0800 | [diff] [blame] | 541 | rev.diffopt.break_opt = 0; |
Nguyễn Thái Ngọc Duy | 15b55ae | 2013-07-14 15:35:39 +0700 | [diff] [blame] | 542 | copy_pathspec(&rev.prune_data, &s->pathspec); |
Jeff King | c91f0d9 | 2006-09-08 04:05:34 -0400 | [diff] [blame] | 543 | run_diff_index(&rev, 1); |
| 544 | } |
| 545 | |
Junio C Hamano | 50b7e70 | 2009-08-04 23:49:33 -0700 | [diff] [blame] | 546 | static void wt_status_collect_changes_initial(struct wt_status *s) |
| 547 | { |
| 548 | int i; |
| 549 | |
| 550 | for (i = 0; i < active_nr; i++) { |
| 551 | struct string_list_item *it; |
| 552 | struct wt_status_change_data *d; |
Nguyễn Thái Ngọc Duy | 9c5e6c8 | 2013-07-09 22:29:00 +0700 | [diff] [blame] | 553 | const struct cache_entry *ce = active_cache[i]; |
Junio C Hamano | 50b7e70 | 2009-08-04 23:49:33 -0700 | [diff] [blame] | 554 | |
Nguyễn Thái Ngọc Duy | 429bb40 | 2014-01-24 20:40:28 +0700 | [diff] [blame] | 555 | if (!ce_path_match(ce, &s->pathspec, NULL)) |
Junio C Hamano | 76e2f7c | 2009-08-07 23:31:57 -0700 | [diff] [blame] | 556 | continue; |
Julian Phillips | 78a395d | 2010-06-26 00:41:35 +0100 | [diff] [blame] | 557 | it = string_list_insert(&s->change, ce->name); |
Junio C Hamano | 50b7e70 | 2009-08-04 23:49:33 -0700 | [diff] [blame] | 558 | d = it->util; |
| 559 | if (!d) { |
| 560 | d = xcalloc(1, sizeof(*d)); |
| 561 | it->util = d; |
| 562 | } |
Junio C Hamano | 4d4d572 | 2009-08-05 00:04:51 -0700 | [diff] [blame] | 563 | if (ce_stage(ce)) { |
Junio C Hamano | 50b7e70 | 2009-08-04 23:49:33 -0700 | [diff] [blame] | 564 | d->index_status = DIFF_STATUS_UNMERGED; |
Junio C Hamano | 4d4d572 | 2009-08-05 00:04:51 -0700 | [diff] [blame] | 565 | d->stagemask |= (1 << (ce_stage(ce) - 1)); |
| 566 | } |
Junio C Hamano | 50b7e70 | 2009-08-04 23:49:33 -0700 | [diff] [blame] | 567 | else |
| 568 | d->index_status = DIFF_STATUS_ADDED; |
| 569 | } |
| 570 | } |
| 571 | |
Junio C Hamano | 7637868 | 2009-08-10 00:36:33 -0700 | [diff] [blame] | 572 | static void wt_status_collect_untracked(struct wt_status *s) |
| 573 | { |
| 574 | int i; |
| 575 | struct dir_struct dir; |
Karsten Blees | 132d41e | 2014-07-12 02:07:36 +0200 | [diff] [blame] | 576 | uint64_t t_begin = getnanotime(); |
Junio C Hamano | 7637868 | 2009-08-10 00:36:33 -0700 | [diff] [blame] | 577 | |
| 578 | if (!s->show_untracked_files) |
| 579 | return; |
Nguyễn Thái Ngọc Duy | 6a38ef2 | 2013-03-13 19:59:16 +0700 | [diff] [blame] | 580 | |
Junio C Hamano | 7637868 | 2009-08-10 00:36:33 -0700 | [diff] [blame] | 581 | memset(&dir, 0, sizeof(dir)); |
| 582 | if (s->show_untracked_files != SHOW_ALL_UNTRACKED_FILES) |
| 583 | dir.flags |= |
| 584 | DIR_SHOW_OTHER_DIRECTORIES | DIR_HIDE_EMPTY_DIRECTORIES; |
Karsten Blees | 0aaf62b | 2013-04-15 21:15:03 +0200 | [diff] [blame] | 585 | if (s->show_ignored_files) |
| 586 | dir.flags |= DIR_SHOW_IGNORED_TOO; |
Nguyễn Thái Ngọc Duy | 226c051 | 2015-03-08 17:12:41 +0700 | [diff] [blame] | 587 | else |
| 588 | dir.untracked = the_index.untracked; |
Junio C Hamano | 7637868 | 2009-08-10 00:36:33 -0700 | [diff] [blame] | 589 | setup_standard_excludes(&dir); |
| 590 | |
Nguyễn Thái Ngọc Duy | 7327d3d | 2013-07-14 15:35:55 +0700 | [diff] [blame] | 591 | fill_directory(&dir, &s->pathspec); |
Karsten Blees | 0aaf62b | 2013-04-15 21:15:03 +0200 | [diff] [blame] | 592 | |
Brian Gianforcaro | eeefa7c | 2009-09-01 01:35:10 -0400 | [diff] [blame] | 593 | for (i = 0; i < dir.nr; i++) { |
Junio C Hamano | 7637868 | 2009-08-10 00:36:33 -0700 | [diff] [blame] | 594 | struct dir_entry *ent = dir.entries[i]; |
Brandon Casey | b822423 | 2010-09-26 21:49:13 -0500 | [diff] [blame] | 595 | if (cache_name_is_other(ent->name, ent->len) && |
Nguyễn Thái Ngọc Duy | ebb3289 | 2014-01-24 20:40:29 +0700 | [diff] [blame] | 596 | dir_path_match(ent, &s->pathspec, 0, NULL)) |
Brandon Casey | b822423 | 2010-09-26 21:49:13 -0500 | [diff] [blame] | 597 | string_list_insert(&s->untracked, ent->name); |
Junio C Hamano | f5b26b1 | 2010-04-09 23:58:27 -0700 | [diff] [blame] | 598 | free(ent); |
Junio C Hamano | 7637868 | 2009-08-10 00:36:33 -0700 | [diff] [blame] | 599 | } |
Junio C Hamano | f5b26b1 | 2010-04-09 23:58:27 -0700 | [diff] [blame] | 600 | |
Karsten Blees | 0aaf62b | 2013-04-15 21:15:03 +0200 | [diff] [blame] | 601 | for (i = 0; i < dir.ignored_nr; i++) { |
| 602 | struct dir_entry *ent = dir.ignored[i]; |
| 603 | if (cache_name_is_other(ent->name, ent->len) && |
Nguyễn Thái Ngọc Duy | ebb3289 | 2014-01-24 20:40:29 +0700 | [diff] [blame] | 604 | dir_path_match(ent, &s->pathspec, 0, NULL)) |
Karsten Blees | 0aaf62b | 2013-04-15 21:15:03 +0200 | [diff] [blame] | 605 | string_list_insert(&s->ignored, ent->name); |
| 606 | free(ent); |
Junio C Hamano | 6cb3f6b | 2010-04-10 00:11:53 -0700 | [diff] [blame] | 607 | } |
| 608 | |
Junio C Hamano | f5b26b1 | 2010-04-09 23:58:27 -0700 | [diff] [blame] | 609 | free(dir.entries); |
Karsten Blees | 0aaf62b | 2013-04-15 21:15:03 +0200 | [diff] [blame] | 610 | free(dir.ignored); |
| 611 | clear_directory(&dir); |
Nguyễn Thái Ngọc Duy | 6a38ef2 | 2013-03-13 19:59:16 +0700 | [diff] [blame] | 612 | |
Karsten Blees | 132d41e | 2014-07-12 02:07:36 +0200 | [diff] [blame] | 613 | if (advice_status_u_option) |
| 614 | s->untracked_in_ms = (getnanotime() - t_begin) / 1000000; |
Junio C Hamano | 7637868 | 2009-08-10 00:36:33 -0700 | [diff] [blame] | 615 | } |
| 616 | |
| 617 | void wt_status_collect(struct wt_status *s) |
Junio C Hamano | 50b7e70 | 2009-08-04 23:49:33 -0700 | [diff] [blame] | 618 | { |
| 619 | wt_status_collect_changes_worktree(s); |
| 620 | |
| 621 | if (s->is_initial) |
| 622 | wt_status_collect_changes_initial(s); |
| 623 | else |
| 624 | wt_status_collect_changes_index(s); |
Junio C Hamano | 7637868 | 2009-08-10 00:36:33 -0700 | [diff] [blame] | 625 | wt_status_collect_untracked(s); |
Junio C Hamano | 50b7e70 | 2009-08-04 23:49:33 -0700 | [diff] [blame] | 626 | } |
| 627 | |
Junio C Hamano | 4d4d572 | 2009-08-05 00:04:51 -0700 | [diff] [blame] | 628 | static void wt_status_print_unmerged(struct wt_status *s) |
| 629 | { |
| 630 | int shown_header = 0; |
| 631 | int i; |
| 632 | |
| 633 | for (i = 0; i < s->change.nr; i++) { |
| 634 | struct wt_status_change_data *d; |
| 635 | struct string_list_item *it; |
| 636 | it = &(s->change.items[i]); |
| 637 | d = it->util; |
| 638 | if (!d->stagemask) |
| 639 | continue; |
| 640 | if (!shown_header) { |
| 641 | wt_status_print_unmerged_header(s); |
| 642 | shown_header = 1; |
| 643 | } |
| 644 | wt_status_print_unmerged_data(s, it); |
| 645 | } |
| 646 | if (shown_header) |
| 647 | wt_status_print_trailer(s); |
| 648 | |
| 649 | } |
| 650 | |
Junio C Hamano | 50b7e70 | 2009-08-04 23:49:33 -0700 | [diff] [blame] | 651 | static void wt_status_print_updated(struct wt_status *s) |
| 652 | { |
| 653 | int shown_header = 0; |
| 654 | int i; |
| 655 | |
| 656 | for (i = 0; i < s->change.nr; i++) { |
| 657 | struct wt_status_change_data *d; |
| 658 | struct string_list_item *it; |
| 659 | it = &(s->change.items[i]); |
| 660 | d = it->util; |
| 661 | if (!d->index_status || |
| 662 | d->index_status == DIFF_STATUS_UNMERGED) |
| 663 | continue; |
| 664 | if (!shown_header) { |
| 665 | wt_status_print_cached_header(s); |
| 666 | s->commitable = 1; |
| 667 | shown_header = 1; |
| 668 | } |
| 669 | wt_status_print_change_data(s, WT_STATUS_UPDATED, it); |
| 670 | } |
| 671 | if (shown_header) |
| 672 | wt_status_print_trailer(s); |
| 673 | } |
| 674 | |
| 675 | /* |
| 676 | * -1 : has delete |
| 677 | * 0 : no change |
| 678 | * 1 : some change but no delete |
| 679 | */ |
Jens Lehmann | 9297f77e6 | 2010-03-08 13:53:19 +0100 | [diff] [blame] | 680 | static int wt_status_check_worktree_changes(struct wt_status *s, |
| 681 | int *dirty_submodules) |
Junio C Hamano | 50b7e70 | 2009-08-04 23:49:33 -0700 | [diff] [blame] | 682 | { |
| 683 | int i; |
| 684 | int changes = 0; |
| 685 | |
Jens Lehmann | 9297f77e6 | 2010-03-08 13:53:19 +0100 | [diff] [blame] | 686 | *dirty_submodules = 0; |
| 687 | |
Junio C Hamano | 50b7e70 | 2009-08-04 23:49:33 -0700 | [diff] [blame] | 688 | for (i = 0; i < s->change.nr; i++) { |
| 689 | struct wt_status_change_data *d; |
| 690 | d = s->change.items[i].util; |
Junio C Hamano | 4d4d572 | 2009-08-05 00:04:51 -0700 | [diff] [blame] | 691 | if (!d->worktree_status || |
| 692 | d->worktree_status == DIFF_STATUS_UNMERGED) |
Junio C Hamano | 50b7e70 | 2009-08-04 23:49:33 -0700 | [diff] [blame] | 693 | continue; |
Jens Lehmann | 9297f77e6 | 2010-03-08 13:53:19 +0100 | [diff] [blame] | 694 | if (!changes) |
| 695 | changes = 1; |
| 696 | if (d->dirty_submodule) |
| 697 | *dirty_submodules = 1; |
Junio C Hamano | 50b7e70 | 2009-08-04 23:49:33 -0700 | [diff] [blame] | 698 | if (d->worktree_status == DIFF_STATUS_DELETED) |
Jens Lehmann | 9297f77e6 | 2010-03-08 13:53:19 +0100 | [diff] [blame] | 699 | changes = -1; |
Junio C Hamano | 50b7e70 | 2009-08-04 23:49:33 -0700 | [diff] [blame] | 700 | } |
| 701 | return changes; |
| 702 | } |
| 703 | |
Jeff King | c91f0d9 | 2006-09-08 04:05:34 -0400 | [diff] [blame] | 704 | static void wt_status_print_changed(struct wt_status *s) |
| 705 | { |
Jens Lehmann | 9297f77e6 | 2010-03-08 13:53:19 +0100 | [diff] [blame] | 706 | int i, dirty_submodules; |
| 707 | int worktree_changes = wt_status_check_worktree_changes(s, &dirty_submodules); |
Junio C Hamano | 50b7e70 | 2009-08-04 23:49:33 -0700 | [diff] [blame] | 708 | |
| 709 | if (!worktree_changes) |
| 710 | return; |
| 711 | |
Jens Lehmann | 9297f77e6 | 2010-03-08 13:53:19 +0100 | [diff] [blame] | 712 | wt_status_print_dirty_header(s, worktree_changes < 0, dirty_submodules); |
Junio C Hamano | 50b7e70 | 2009-08-04 23:49:33 -0700 | [diff] [blame] | 713 | |
| 714 | for (i = 0; i < s->change.nr; i++) { |
| 715 | struct wt_status_change_data *d; |
| 716 | struct string_list_item *it; |
| 717 | it = &(s->change.items[i]); |
| 718 | d = it->util; |
Junio C Hamano | 4d4d572 | 2009-08-05 00:04:51 -0700 | [diff] [blame] | 719 | if (!d->worktree_status || |
| 720 | d->worktree_status == DIFF_STATUS_UNMERGED) |
Junio C Hamano | 50b7e70 | 2009-08-04 23:49:33 -0700 | [diff] [blame] | 721 | continue; |
| 722 | wt_status_print_change_data(s, WT_STATUS_CHANGED, it); |
| 723 | } |
| 724 | wt_status_print_trailer(s); |
Jeff King | c91f0d9 | 2006-09-08 04:05:34 -0400 | [diff] [blame] | 725 | } |
| 726 | |
Jens Lehmann | f17a5d3 | 2010-01-17 20:42:31 +0100 | [diff] [blame] | 727 | 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] | 728 | { |
René Scharfe | d318027 | 2014-08-19 21:09:35 +0200 | [diff] [blame] | 729 | struct child_process sm_summary = CHILD_PROCESS_INIT; |
Matthieu Moy | 3ba7407 | 2013-09-06 19:43:06 +0200 | [diff] [blame] | 730 | struct strbuf cmd_stdout = STRBUF_INIT; |
| 731 | struct strbuf summary = STRBUF_INIT; |
| 732 | char *summary_content; |
Ping Yin | ac8d5af | 2008-04-12 23:05:32 +0800 | [diff] [blame] | 733 | |
René Scharfe | a915459 | 2014-10-19 13:14:20 +0200 | [diff] [blame] | 734 | argv_array_pushf(&sm_summary.env_array, "GIT_INDEX_FILE=%s", |
| 735 | s->index_file); |
Ping Yin | ac8d5af | 2008-04-12 23:05:32 +0800 | [diff] [blame] | 736 | |
René Scharfe | a2bae2d | 2014-11-09 14:49:54 +0100 | [diff] [blame] | 737 | argv_array_push(&sm_summary.args, "submodule"); |
| 738 | argv_array_push(&sm_summary.args, "summary"); |
| 739 | argv_array_push(&sm_summary.args, uncommitted ? "--files" : "--cached"); |
| 740 | argv_array_push(&sm_summary.args, "--for-status"); |
| 741 | argv_array_push(&sm_summary.args, "--summary-limit"); |
| 742 | argv_array_pushf(&sm_summary.args, "%d", s->submodule_summary); |
Matthieu Moy | bb7e32e | 2013-09-06 19:43:05 +0200 | [diff] [blame] | 743 | if (!uncommitted) |
René Scharfe | a2bae2d | 2014-11-09 14:49:54 +0100 | [diff] [blame] | 744 | argv_array_push(&sm_summary.args, s->amend ? "HEAD^" : "HEAD"); |
Matthieu Moy | bb7e32e | 2013-09-06 19:43:05 +0200 | [diff] [blame] | 745 | |
Ping Yin | ac8d5af | 2008-04-12 23:05:32 +0800 | [diff] [blame] | 746 | sm_summary.git_cmd = 1; |
| 747 | sm_summary.no_stdin = 1; |
Matthieu Moy | 3ba7407 | 2013-09-06 19:43:06 +0200 | [diff] [blame] | 748 | |
Jeff King | 5c950e9 | 2015-03-22 23:53:52 -0400 | [diff] [blame] | 749 | capture_command(&sm_summary, &cmd_stdout, 1024); |
Matthieu Moy | 3ba7407 | 2013-09-06 19:43:06 +0200 | [diff] [blame] | 750 | |
| 751 | /* prepend header, only if there's an actual output */ |
Jeff King | d56d966 | 2015-03-22 06:00:32 -0400 | [diff] [blame] | 752 | if (cmd_stdout.len) { |
Matthieu Moy | 3ba7407 | 2013-09-06 19:43:06 +0200 | [diff] [blame] | 753 | if (uncommitted) |
| 754 | strbuf_addstr(&summary, _("Submodules changed but not updated:")); |
| 755 | else |
| 756 | strbuf_addstr(&summary, _("Submodule changes to be committed:")); |
| 757 | strbuf_addstr(&summary, "\n\n"); |
| 758 | } |
| 759 | strbuf_addbuf(&summary, &cmd_stdout); |
| 760 | strbuf_release(&cmd_stdout); |
| 761 | |
Matthieu Moy | 2556b99 | 2013-09-06 19:43:07 +0200 | [diff] [blame] | 762 | if (s->display_comment_prefix) { |
Jeff King | d56d966 | 2015-03-22 06:00:32 -0400 | [diff] [blame] | 763 | size_t len; |
Matthieu Moy | 2556b99 | 2013-09-06 19:43:07 +0200 | [diff] [blame] | 764 | summary_content = strbuf_detach(&summary, &len); |
| 765 | strbuf_add_commented_lines(&summary, summary_content, len); |
| 766 | free(summary_content); |
| 767 | } |
Matthieu Moy | 3ba7407 | 2013-09-06 19:43:06 +0200 | [diff] [blame] | 768 | |
| 769 | fputs(summary.buf, s->fp); |
| 770 | strbuf_release(&summary); |
Ping Yin | ac8d5af | 2008-04-12 23:05:32 +0800 | [diff] [blame] | 771 | } |
| 772 | |
Junio C Hamano | 1b908b6 | 2010-04-10 00:19:46 -0700 | [diff] [blame] | 773 | static void wt_status_print_other(struct wt_status *s, |
| 774 | struct string_list *l, |
| 775 | const char *what, |
| 776 | const char *how) |
Jeff King | c91f0d9 | 2006-09-08 04:05:34 -0400 | [diff] [blame] | 777 | { |
Jeff King | c91f0d9 | 2006-09-08 04:05:34 -0400 | [diff] [blame] | 778 | int i; |
Brandon Casey | f285a2d | 2008-10-09 14:12:12 -0500 | [diff] [blame] | 779 | struct strbuf buf = STRBUF_INIT; |
Nguyễn Thái Ngọc Duy | 323d053 | 2012-04-13 17:54:39 +0700 | [diff] [blame] | 780 | static struct string_list output = STRING_LIST_INIT_DUP; |
| 781 | struct column_options copts; |
Jeff King | c91f0d9 | 2006-09-08 04:05:34 -0400 | [diff] [blame] | 782 | |
Jeff King | 1282988 | 2011-06-02 01:54:49 -0400 | [diff] [blame] | 783 | if (!l->nr) |
Junio C Hamano | 7637868 | 2009-08-10 00:36:33 -0700 | [diff] [blame] | 784 | return; |
Jeff King | c91f0d9 | 2006-09-08 04:05:34 -0400 | [diff] [blame] | 785 | |
Junio C Hamano | 1b908b6 | 2010-04-10 00:19:46 -0700 | [diff] [blame] | 786 | wt_status_print_other_header(s, what, how); |
| 787 | |
| 788 | for (i = 0; i < l->nr; i++) { |
Junio C Hamano | 7637868 | 2009-08-10 00:36:33 -0700 | [diff] [blame] | 789 | struct string_list_item *it; |
Nguyễn Thái Ngọc Duy | 323d053 | 2012-04-13 17:54:39 +0700 | [diff] [blame] | 790 | const char *path; |
Junio C Hamano | 1b908b6 | 2010-04-10 00:19:46 -0700 | [diff] [blame] | 791 | it = &(l->items[i]); |
Jiang Xin | 39598f9 | 2013-06-25 23:53:45 +0800 | [diff] [blame] | 792 | path = quote_path(it->string, s->prefix, &buf); |
Nguyễn Thái Ngọc Duy | 323d053 | 2012-04-13 17:54:39 +0700 | [diff] [blame] | 793 | if (column_active(s->colopts)) { |
| 794 | string_list_append(&output, path); |
| 795 | continue; |
| 796 | } |
Jonathan Nieder | b926c0d | 2011-02-25 23:11:37 -0600 | [diff] [blame] | 797 | status_printf(s, color(WT_STATUS_HEADER, s), "\t"); |
| 798 | status_printf_more(s, color(WT_STATUS_UNTRACKED, s), |
Nguyễn Thái Ngọc Duy | 323d053 | 2012-04-13 17:54:39 +0700 | [diff] [blame] | 799 | "%s\n", path); |
Jeff King | c91f0d9 | 2006-09-08 04:05:34 -0400 | [diff] [blame] | 800 | } |
Nguyễn Thái Ngọc Duy | 323d053 | 2012-04-13 17:54:39 +0700 | [diff] [blame] | 801 | |
| 802 | strbuf_release(&buf); |
| 803 | if (!column_active(s->colopts)) |
Matthieu Moy | 2f0f7f1 | 2013-09-06 19:43:09 +0200 | [diff] [blame] | 804 | goto conclude; |
Nguyễn Thái Ngọc Duy | 323d053 | 2012-04-13 17:54:39 +0700 | [diff] [blame] | 805 | |
Matthieu Moy | 2556b99 | 2013-09-06 19:43:07 +0200 | [diff] [blame] | 806 | strbuf_addf(&buf, "%s%s\t%s", |
Nguyễn Thái Ngọc Duy | 323d053 | 2012-04-13 17:54:39 +0700 | [diff] [blame] | 807 | color(WT_STATUS_HEADER, s), |
Matthieu Moy | 2556b99 | 2013-09-06 19:43:07 +0200 | [diff] [blame] | 808 | s->display_comment_prefix ? "#" : "", |
Nguyễn Thái Ngọc Duy | 323d053 | 2012-04-13 17:54:39 +0700 | [diff] [blame] | 809 | color(WT_STATUS_UNTRACKED, s)); |
| 810 | memset(&copts, 0, sizeof(copts)); |
| 811 | copts.padding = 1; |
| 812 | copts.indent = buf.buf; |
| 813 | if (want_color(s->use_color)) |
| 814 | copts.nl = GIT_COLOR_RESET "\n"; |
| 815 | print_columns(&output, s->colopts, &copts); |
| 816 | string_list_clear(&output, 0); |
Johannes Schindelin | 367c988 | 2007-11-11 17:35:41 +0000 | [diff] [blame] | 817 | strbuf_release(&buf); |
Matthieu Moy | 2f0f7f1 | 2013-09-06 19:43:09 +0200 | [diff] [blame] | 818 | conclude: |
Felipe Contreras | 7d7d680 | 2014-05-04 01:12:55 -0500 | [diff] [blame] | 819 | status_printf_ln(s, GIT_COLOR_NORMAL, "%s", ""); |
Jeff King | c91f0d9 | 2006-09-08 04:05:34 -0400 | [diff] [blame] | 820 | } |
| 821 | |
Jens Lehmann | 1a72cfd | 2013-12-05 20:44:14 +0100 | [diff] [blame] | 822 | void wt_status_truncate_message_at_cut_line(struct strbuf *buf) |
| 823 | { |
| 824 | const char *p; |
| 825 | struct strbuf pattern = STRBUF_INIT; |
| 826 | |
SZEDER Gábor | fbfa097 | 2015-06-09 02:28:34 +0200 | [diff] [blame] | 827 | strbuf_addf(&pattern, "\n%c %s", comment_line_char, cut_line); |
| 828 | if (starts_with(buf->buf, pattern.buf + 1)) |
| 829 | strbuf_setlen(buf, 0); |
| 830 | else if ((p = strstr(buf->buf, pattern.buf))) |
| 831 | strbuf_setlen(buf, p - buf->buf + 1); |
Jens Lehmann | 1a72cfd | 2013-12-05 20:44:14 +0100 | [diff] [blame] | 832 | strbuf_release(&pattern); |
| 833 | } |
| 834 | |
Nguyễn Thái Ngọc Duy | fcef931 | 2014-02-17 19:15:31 +0700 | [diff] [blame] | 835 | void wt_status_add_cut_line(FILE *fp) |
| 836 | { |
| 837 | const char *explanation = _("Do not touch the line above.\nEverything below will be removed."); |
| 838 | struct strbuf buf = STRBUF_INIT; |
| 839 | |
| 840 | fprintf(fp, "%c %s", comment_line_char, cut_line); |
| 841 | strbuf_add_commented_lines(&buf, explanation, strlen(explanation)); |
| 842 | fputs(buf.buf, fp); |
| 843 | strbuf_release(&buf); |
| 844 | } |
| 845 | |
Jeff King | c91f0d9 | 2006-09-08 04:05:34 -0400 | [diff] [blame] | 846 | static void wt_status_print_verbose(struct wt_status *s) |
| 847 | { |
| 848 | struct rev_info rev; |
Junio C Hamano | 32962c9 | 2010-03-08 22:58:09 -0800 | [diff] [blame] | 849 | struct setup_revision_opt opt; |
Michael J Gruber | 4055500 | 2015-03-06 10:43:35 +0100 | [diff] [blame] | 850 | int dirty_submodules; |
| 851 | const char *c = color(WT_STATUS_HEADER, s); |
Kristian Høgsberg | 99a1269 | 2007-11-21 21:54:49 -0500 | [diff] [blame] | 852 | |
Jeff King | c91f0d9 | 2006-09-08 04:05:34 -0400 | [diff] [blame] | 853 | init_revisions(&rev, NULL); |
Jeff King | 5ec11af | 2008-12-07 21:54:17 -0500 | [diff] [blame] | 854 | DIFF_OPT_SET(&rev.diffopt, ALLOW_TEXTCONV); |
Junio C Hamano | 32962c9 | 2010-03-08 22:58:09 -0800 | [diff] [blame] | 855 | |
| 856 | memset(&opt, 0, sizeof(opt)); |
| 857 | opt.def = s->is_initial ? EMPTY_TREE_SHA1_HEX : s->reference; |
| 858 | setup_revisions(0, NULL, &rev, &opt); |
| 859 | |
Jeff King | c91f0d9 | 2006-09-08 04:05:34 -0400 | [diff] [blame] | 860 | rev.diffopt.output_format |= DIFF_FORMAT_PATCH; |
| 861 | rev.diffopt.detect_rename = 1; |
Kristian Høgsberg | 4ba0cb2 | 2008-03-10 13:58:26 -0400 | [diff] [blame] | 862 | rev.diffopt.file = s->fp; |
| 863 | rev.diffopt.close_file = 0; |
Jeff King | 4f672ad | 2008-10-26 00:49:35 -0400 | [diff] [blame] | 864 | /* |
| 865 | * If we're not going to stdout, then we definitely don't |
| 866 | * want color, since we are going to the commit message |
| 867 | * file (and even the "auto" setting won't work, since it |
Jens Lehmann | 1a72cfd | 2013-12-05 20:44:14 +0100 | [diff] [blame] | 868 | * will have checked isatty on stdout). But we then do want |
| 869 | * to insert the scissor line here to reliably remove the |
| 870 | * diff before committing. |
Jeff King | 4f672ad | 2008-10-26 00:49:35 -0400 | [diff] [blame] | 871 | */ |
Jens Lehmann | 1a72cfd | 2013-12-05 20:44:14 +0100 | [diff] [blame] | 872 | if (s->fp != stdout) { |
Jeff King | f1c9626 | 2011-08-17 22:03:12 -0700 | [diff] [blame] | 873 | rev.diffopt.use_color = 0; |
Nguyễn Thái Ngọc Duy | fcef931 | 2014-02-17 19:15:31 +0700 | [diff] [blame] | 874 | wt_status_add_cut_line(s->fp); |
Jens Lehmann | 1a72cfd | 2013-12-05 20:44:14 +0100 | [diff] [blame] | 875 | } |
Michael J Gruber | 4055500 | 2015-03-06 10:43:35 +0100 | [diff] [blame] | 876 | if (s->verbose > 1 && s->commitable) { |
| 877 | /* print_updated() printed a header, so do we */ |
| 878 | if (s->fp != stdout) |
| 879 | wt_status_print_trailer(s); |
| 880 | status_printf_ln(s, c, _("Changes to be committed:")); |
| 881 | rev.diffopt.a_prefix = "c/"; |
| 882 | rev.diffopt.b_prefix = "i/"; |
| 883 | } /* else use prefix as per user config */ |
Jeff King | c91f0d9 | 2006-09-08 04:05:34 -0400 | [diff] [blame] | 884 | run_diff_index(&rev, 1); |
Michael J Gruber | 4055500 | 2015-03-06 10:43:35 +0100 | [diff] [blame] | 885 | if (s->verbose > 1 && |
| 886 | wt_status_check_worktree_changes(s, &dirty_submodules)) { |
| 887 | status_printf_ln(s, c, |
| 888 | "--------------------------------------------------"); |
| 889 | status_printf_ln(s, c, _("Changes not staged for commit:")); |
| 890 | setup_work_tree(); |
| 891 | rev.diffopt.a_prefix = "i/"; |
| 892 | rev.diffopt.b_prefix = "w/"; |
| 893 | run_diff_files(&rev, 0); |
| 894 | } |
Jeff King | c91f0d9 | 2006-09-08 04:05:34 -0400 | [diff] [blame] | 895 | } |
| 896 | |
Junio C Hamano | b6975ab | 2008-07-02 00:52:16 -0700 | [diff] [blame] | 897 | static void wt_status_print_tracking(struct wt_status *s) |
| 898 | { |
| 899 | struct strbuf sb = STRBUF_INIT; |
René Scharfe | c72b49d | 2015-10-31 18:37:43 +0100 | [diff] [blame] | 900 | const char *cp, *ep, *branch_name; |
Junio C Hamano | b6975ab | 2008-07-02 00:52:16 -0700 | [diff] [blame] | 901 | struct branch *branch; |
Matthieu Moy | 2556b99 | 2013-09-06 19:43:07 +0200 | [diff] [blame] | 902 | char comment_line_string[3]; |
| 903 | int i; |
Junio C Hamano | b6975ab | 2008-07-02 00:52:16 -0700 | [diff] [blame] | 904 | |
| 905 | assert(s->branch && !s->is_initial); |
René Scharfe | c72b49d | 2015-10-31 18:37:43 +0100 | [diff] [blame] | 906 | if (!skip_prefix(s->branch, "refs/heads/", &branch_name)) |
Junio C Hamano | b6975ab | 2008-07-02 00:52:16 -0700 | [diff] [blame] | 907 | return; |
René Scharfe | c72b49d | 2015-10-31 18:37:43 +0100 | [diff] [blame] | 908 | branch = branch_get(branch_name); |
Junio C Hamano | b6975ab | 2008-07-02 00:52:16 -0700 | [diff] [blame] | 909 | if (!format_tracking_info(branch, &sb)) |
| 910 | return; |
| 911 | |
Matthieu Moy | 2556b99 | 2013-09-06 19:43:07 +0200 | [diff] [blame] | 912 | i = 0; |
| 913 | if (s->display_comment_prefix) { |
| 914 | comment_line_string[i++] = comment_line_char; |
| 915 | comment_line_string[i++] = ' '; |
| 916 | } |
| 917 | comment_line_string[i] = '\0'; |
| 918 | |
Junio C Hamano | b6975ab | 2008-07-02 00:52:16 -0700 | [diff] [blame] | 919 | 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] | 920 | color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s), |
Matthieu Moy | 2556b99 | 2013-09-06 19:43:07 +0200 | [diff] [blame] | 921 | "%s%.*s", comment_line_string, |
Junio C Hamano | eff80a9 | 2013-01-16 20:18:48 +0100 | [diff] [blame] | 922 | (int)(ep - cp), cp); |
Matthieu Moy | 2556b99 | 2013-09-06 19:43:07 +0200 | [diff] [blame] | 923 | if (s->display_comment_prefix) |
| 924 | color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s), "%c", |
| 925 | comment_line_char); |
| 926 | else |
Felipe Contreras | 7d7d680 | 2014-05-04 01:12:55 -0500 | [diff] [blame] | 927 | fputs("", s->fp); |
Junio C Hamano | b6975ab | 2008-07-02 00:52:16 -0700 | [diff] [blame] | 928 | } |
| 929 | |
Lucien Kong | 83c750a | 2012-06-05 22:21:24 +0200 | [diff] [blame] | 930 | static int has_unmerged(struct wt_status *s) |
| 931 | { |
| 932 | int i; |
| 933 | |
| 934 | for (i = 0; i < s->change.nr; i++) { |
| 935 | struct wt_status_change_data *d; |
| 936 | d = s->change.items[i].util; |
| 937 | if (d->stagemask) |
| 938 | return 1; |
| 939 | } |
| 940 | return 0; |
| 941 | } |
| 942 | |
| 943 | static void show_merge_in_progress(struct wt_status *s, |
| 944 | struct wt_status_state *state, |
| 945 | const char *color) |
| 946 | { |
| 947 | if (has_unmerged(s)) { |
| 948 | status_printf_ln(s, color, _("You have unmerged paths.")); |
Matthieu Moy | 6a964f5 | 2013-09-12 12:50:05 +0200 | [diff] [blame] | 949 | if (s->hints) |
Lucien Kong | 83c750a | 2012-06-05 22:21:24 +0200 | [diff] [blame] | 950 | status_printf_ln(s, color, |
| 951 | _(" (fix conflicts and run \"git commit\")")); |
| 952 | } else { |
| 953 | status_printf_ln(s, color, |
| 954 | _("All conflicts fixed but you are still merging.")); |
Matthieu Moy | 6a964f5 | 2013-09-12 12:50:05 +0200 | [diff] [blame] | 955 | if (s->hints) |
Lucien Kong | 83c750a | 2012-06-05 22:21:24 +0200 | [diff] [blame] | 956 | status_printf_ln(s, color, |
| 957 | _(" (use \"git commit\" to conclude merge)")); |
| 958 | } |
| 959 | wt_status_print_trailer(s); |
| 960 | } |
| 961 | |
| 962 | static void show_am_in_progress(struct wt_status *s, |
| 963 | struct wt_status_state *state, |
| 964 | const char *color) |
| 965 | { |
| 966 | status_printf_ln(s, color, |
| 967 | _("You are in the middle of an am session.")); |
| 968 | if (state->am_empty_patch) |
| 969 | status_printf_ln(s, color, |
| 970 | _("The current patch is empty.")); |
Matthieu Moy | 6a964f5 | 2013-09-12 12:50:05 +0200 | [diff] [blame] | 971 | if (s->hints) { |
Lucien Kong | 83c750a | 2012-06-05 22:21:24 +0200 | [diff] [blame] | 972 | if (!state->am_empty_patch) |
| 973 | status_printf_ln(s, color, |
Kevin Bracey | 8ceb6fb | 2013-06-26 23:06:41 +0300 | [diff] [blame] | 974 | _(" (fix conflicts and then run \"git am --continue\")")); |
Lucien Kong | 83c750a | 2012-06-05 22:21:24 +0200 | [diff] [blame] | 975 | status_printf_ln(s, color, |
| 976 | _(" (use \"git am --skip\" to skip this patch)")); |
| 977 | status_printf_ln(s, color, |
| 978 | _(" (use \"git am --abort\" to restore the original branch)")); |
| 979 | } |
| 980 | wt_status_print_trailer(s); |
| 981 | } |
| 982 | |
Lucien Kong | 2d1cceb | 2012-06-10 13:17:38 +0200 | [diff] [blame] | 983 | static char *read_line_from_git_path(const char *filename) |
| 984 | { |
| 985 | struct strbuf buf = STRBUF_INIT; |
| 986 | FILE *fp = fopen(git_path("%s", filename), "r"); |
| 987 | if (!fp) { |
| 988 | strbuf_release(&buf); |
| 989 | return NULL; |
| 990 | } |
Junio C Hamano | 8f309ae | 2016-01-13 15:31:17 -0800 | [diff] [blame] | 991 | strbuf_getline_lf(&buf, fp); |
Lucien Kong | 2d1cceb | 2012-06-10 13:17:38 +0200 | [diff] [blame] | 992 | if (!fclose(fp)) { |
| 993 | return strbuf_detach(&buf, NULL); |
| 994 | } else { |
| 995 | strbuf_release(&buf); |
| 996 | return NULL; |
| 997 | } |
| 998 | } |
| 999 | |
| 1000 | static int split_commit_in_progress(struct wt_status *s) |
| 1001 | { |
| 1002 | int split_in_progress = 0; |
| 1003 | char *head = read_line_from_git_path("HEAD"); |
| 1004 | char *orig_head = read_line_from_git_path("ORIG_HEAD"); |
| 1005 | char *rebase_amend = read_line_from_git_path("rebase-merge/amend"); |
| 1006 | char *rebase_orig_head = read_line_from_git_path("rebase-merge/orig-head"); |
| 1007 | |
| 1008 | if (!head || !orig_head || !rebase_amend || !rebase_orig_head || |
| 1009 | !s->branch || strcmp(s->branch, "HEAD")) |
| 1010 | return split_in_progress; |
| 1011 | |
| 1012 | if (!strcmp(rebase_amend, rebase_orig_head)) { |
| 1013 | if (strcmp(head, rebase_amend)) |
| 1014 | split_in_progress = 1; |
| 1015 | } else if (strcmp(orig_head, rebase_orig_head)) { |
| 1016 | split_in_progress = 1; |
| 1017 | } |
| 1018 | |
| 1019 | if (!s->amend && !s->nowarn && !s->workdir_dirty) |
| 1020 | split_in_progress = 0; |
| 1021 | |
| 1022 | free(head); |
| 1023 | free(orig_head); |
| 1024 | free(rebase_amend); |
| 1025 | free(rebase_orig_head); |
| 1026 | return split_in_progress; |
| 1027 | } |
| 1028 | |
Guillaume Pagès | 84e6fb9 | 2015-07-06 22:56:03 +0200 | [diff] [blame] | 1029 | /* |
| 1030 | * Turn |
| 1031 | * "pick d6a2f0303e897ec257dd0e0a39a5ccb709bc2047 some message" |
| 1032 | * into |
| 1033 | * "pick d6a2f03 some message" |
| 1034 | * |
| 1035 | * The function assumes that the line does not contain useless spaces |
| 1036 | * before or after the command. |
| 1037 | */ |
| 1038 | static void abbrev_sha1_in_line(struct strbuf *line) |
| 1039 | { |
| 1040 | struct strbuf **split; |
| 1041 | int i; |
| 1042 | |
| 1043 | if (starts_with(line->buf, "exec ") || |
| 1044 | starts_with(line->buf, "x ")) |
| 1045 | return; |
| 1046 | |
| 1047 | split = strbuf_split_max(line, ' ', 3); |
| 1048 | if (split[0] && split[1]) { |
| 1049 | unsigned char sha1[20]; |
| 1050 | const char *abbrev; |
| 1051 | |
| 1052 | /* |
| 1053 | * strbuf_split_max left a space. Trim it and re-add |
| 1054 | * it after abbreviation. |
| 1055 | */ |
| 1056 | strbuf_trim(split[1]); |
| 1057 | if (!get_sha1(split[1]->buf, sha1)) { |
| 1058 | abbrev = find_unique_abbrev(sha1, DEFAULT_ABBREV); |
| 1059 | strbuf_reset(split[1]); |
| 1060 | strbuf_addf(split[1], "%s ", abbrev); |
| 1061 | strbuf_reset(line); |
| 1062 | for (i = 0; split[i]; i++) |
| 1063 | strbuf_addf(line, "%s", split[i]->buf); |
| 1064 | } |
| 1065 | } |
Stefan Beller | 6eb6078 | 2016-03-31 17:35:44 -0700 | [diff] [blame] | 1066 | strbuf_list_free(split); |
Guillaume Pagès | 84e6fb9 | 2015-07-06 22:56:03 +0200 | [diff] [blame] | 1067 | } |
| 1068 | |
| 1069 | static void read_rebase_todolist(const char *fname, struct string_list *lines) |
| 1070 | { |
| 1071 | struct strbuf line = STRBUF_INIT; |
| 1072 | FILE *f = fopen(git_path("%s", fname), "r"); |
| 1073 | |
| 1074 | if (!f) |
| 1075 | die_errno("Could not open file %s for reading", |
| 1076 | git_path("%s", fname)); |
Junio C Hamano | 8f309ae | 2016-01-13 15:31:17 -0800 | [diff] [blame] | 1077 | while (!strbuf_getline_lf(&line, f)) { |
Guillaume Pagès | 84e6fb9 | 2015-07-06 22:56:03 +0200 | [diff] [blame] | 1078 | if (line.len && line.buf[0] == comment_line_char) |
| 1079 | continue; |
| 1080 | strbuf_trim(&line); |
| 1081 | if (!line.len) |
| 1082 | continue; |
| 1083 | abbrev_sha1_in_line(&line); |
| 1084 | string_list_append(lines, line.buf); |
| 1085 | } |
| 1086 | } |
| 1087 | |
| 1088 | static void show_rebase_information(struct wt_status *s, |
| 1089 | struct wt_status_state *state, |
| 1090 | const char *color) |
| 1091 | { |
| 1092 | if (state->rebase_interactive_in_progress) { |
| 1093 | int i; |
| 1094 | int nr_lines_to_show = 2; |
| 1095 | |
| 1096 | struct string_list have_done = STRING_LIST_INIT_DUP; |
| 1097 | struct string_list yet_to_do = STRING_LIST_INIT_DUP; |
| 1098 | |
| 1099 | read_rebase_todolist("rebase-merge/done", &have_done); |
| 1100 | read_rebase_todolist("rebase-merge/git-rebase-todo", &yet_to_do); |
| 1101 | |
| 1102 | if (have_done.nr == 0) |
| 1103 | status_printf_ln(s, color, _("No commands done.")); |
| 1104 | else { |
| 1105 | status_printf_ln(s, color, |
| 1106 | Q_("Last command done (%d command done):", |
| 1107 | "Last commands done (%d commands done):", |
| 1108 | have_done.nr), |
| 1109 | have_done.nr); |
| 1110 | for (i = (have_done.nr > nr_lines_to_show) |
| 1111 | ? have_done.nr - nr_lines_to_show : 0; |
| 1112 | i < have_done.nr; |
| 1113 | i++) |
| 1114 | status_printf_ln(s, color, " %s", have_done.items[i].string); |
| 1115 | if (have_done.nr > nr_lines_to_show && s->hints) |
| 1116 | status_printf_ln(s, color, |
| 1117 | _(" (see more in file %s)"), git_path("rebase-merge/done")); |
| 1118 | } |
| 1119 | |
| 1120 | if (yet_to_do.nr == 0) |
| 1121 | status_printf_ln(s, color, |
| 1122 | _("No commands remaining.")); |
| 1123 | else { |
| 1124 | status_printf_ln(s, color, |
| 1125 | Q_("Next command to do (%d remaining command):", |
| 1126 | "Next commands to do (%d remaining commands):", |
| 1127 | yet_to_do.nr), |
| 1128 | yet_to_do.nr); |
| 1129 | for (i = 0; i < nr_lines_to_show && i < yet_to_do.nr; i++) |
| 1130 | status_printf_ln(s, color, " %s", yet_to_do.items[i].string); |
| 1131 | if (s->hints) |
| 1132 | status_printf_ln(s, color, |
| 1133 | _(" (use \"git rebase --edit-todo\" to view and edit)")); |
| 1134 | } |
| 1135 | string_list_clear(&yet_to_do, 0); |
| 1136 | string_list_clear(&have_done, 0); |
| 1137 | } |
| 1138 | } |
| 1139 | |
Guillaume Pagès | 05eb563 | 2015-06-30 15:01:12 +0200 | [diff] [blame] | 1140 | static void print_rebase_state(struct wt_status *s, |
| 1141 | struct wt_status_state *state, |
| 1142 | const char *color) |
| 1143 | { |
| 1144 | if (state->branch) |
| 1145 | status_printf_ln(s, color, |
| 1146 | _("You are currently rebasing branch '%s' on '%s'."), |
| 1147 | state->branch, |
| 1148 | state->onto); |
| 1149 | else |
| 1150 | status_printf_ln(s, color, |
| 1151 | _("You are currently rebasing.")); |
| 1152 | } |
| 1153 | |
Lucien Kong | 83c750a | 2012-06-05 22:21:24 +0200 | [diff] [blame] | 1154 | static void show_rebase_in_progress(struct wt_status *s, |
| 1155 | struct wt_status_state *state, |
| 1156 | const char *color) |
| 1157 | { |
| 1158 | struct stat st; |
| 1159 | |
Guillaume Pagès | 84e6fb9 | 2015-07-06 22:56:03 +0200 | [diff] [blame] | 1160 | show_rebase_information(s, state, color); |
Lucien Kong | 83c750a | 2012-06-05 22:21:24 +0200 | [diff] [blame] | 1161 | if (has_unmerged(s)) { |
Guillaume Pagès | 05eb563 | 2015-06-30 15:01:12 +0200 | [diff] [blame] | 1162 | print_rebase_state(s, state, color); |
Matthieu Moy | 6a964f5 | 2013-09-12 12:50:05 +0200 | [diff] [blame] | 1163 | if (s->hints) { |
Lucien Kong | 83c750a | 2012-06-05 22:21:24 +0200 | [diff] [blame] | 1164 | status_printf_ln(s, color, |
| 1165 | _(" (fix conflicts and then run \"git rebase --continue\")")); |
| 1166 | status_printf_ln(s, color, |
| 1167 | _(" (use \"git rebase --skip\" to skip this patch)")); |
| 1168 | status_printf_ln(s, color, |
| 1169 | _(" (use \"git rebase --abort\" to check out the original branch)")); |
| 1170 | } |
Jeff King | f932729 | 2015-08-10 05:38:57 -0400 | [diff] [blame] | 1171 | } else if (state->rebase_in_progress || !stat(git_path_merge_msg(), &st)) { |
Guillaume Pagès | 05eb563 | 2015-06-30 15:01:12 +0200 | [diff] [blame] | 1172 | print_rebase_state(s, state, color); |
Matthieu Moy | 6a964f5 | 2013-09-12 12:50:05 +0200 | [diff] [blame] | 1173 | if (s->hints) |
Lucien Kong | 83c750a | 2012-06-05 22:21:24 +0200 | [diff] [blame] | 1174 | status_printf_ln(s, color, |
| 1175 | _(" (all conflicts fixed: run \"git rebase --continue\")")); |
Lucien Kong | 2d1cceb | 2012-06-10 13:17:38 +0200 | [diff] [blame] | 1176 | } else if (split_commit_in_progress(s)) { |
Nguyễn Thái Ngọc Duy | 0722c80 | 2013-02-03 12:53:27 +0700 | [diff] [blame] | 1177 | if (state->branch) |
| 1178 | status_printf_ln(s, color, |
| 1179 | _("You are currently splitting a commit while rebasing branch '%s' on '%s'."), |
| 1180 | state->branch, |
| 1181 | state->onto); |
| 1182 | else |
| 1183 | status_printf_ln(s, color, |
| 1184 | _("You are currently splitting a commit during a rebase.")); |
Matthieu Moy | 6a964f5 | 2013-09-12 12:50:05 +0200 | [diff] [blame] | 1185 | if (s->hints) |
Lucien Kong | 2d1cceb | 2012-06-10 13:17:38 +0200 | [diff] [blame] | 1186 | status_printf_ln(s, color, |
| 1187 | _(" (Once your working directory is clean, run \"git rebase --continue\")")); |
Lucien Kong | 83c750a | 2012-06-05 22:21:24 +0200 | [diff] [blame] | 1188 | } else { |
Nguyễn Thái Ngọc Duy | 0722c80 | 2013-02-03 12:53:27 +0700 | [diff] [blame] | 1189 | if (state->branch) |
| 1190 | status_printf_ln(s, color, |
| 1191 | _("You are currently editing a commit while rebasing branch '%s' on '%s'."), |
| 1192 | state->branch, |
| 1193 | state->onto); |
| 1194 | else |
| 1195 | status_printf_ln(s, color, |
| 1196 | _("You are currently editing a commit during a rebase.")); |
Matthieu Moy | 6a964f5 | 2013-09-12 12:50:05 +0200 | [diff] [blame] | 1197 | if (s->hints && !s->amend) { |
Lucien Kong | 83c750a | 2012-06-05 22:21:24 +0200 | [diff] [blame] | 1198 | status_printf_ln(s, color, |
| 1199 | _(" (use \"git commit --amend\" to amend the current commit)")); |
| 1200 | status_printf_ln(s, color, |
| 1201 | _(" (use \"git rebase --continue\" once you are satisfied with your changes)")); |
| 1202 | } |
| 1203 | } |
| 1204 | wt_status_print_trailer(s); |
| 1205 | } |
| 1206 | |
| 1207 | static void show_cherry_pick_in_progress(struct wt_status *s, |
| 1208 | struct wt_status_state *state, |
| 1209 | const char *color) |
| 1210 | { |
Ralf Thielow | bffd809 | 2013-10-11 17:58:37 +0200 | [diff] [blame] | 1211 | status_printf_ln(s, color, _("You are currently cherry-picking commit %s."), |
| 1212 | find_unique_abbrev(state->cherry_pick_head_sha1, DEFAULT_ABBREV)); |
Matthieu Moy | 6a964f5 | 2013-09-12 12:50:05 +0200 | [diff] [blame] | 1213 | if (s->hints) { |
Lucien Kong | 83c750a | 2012-06-05 22:21:24 +0200 | [diff] [blame] | 1214 | if (has_unmerged(s)) |
| 1215 | status_printf_ln(s, color, |
Ralf Thielow | b95e66f | 2013-06-17 06:28:26 +0200 | [diff] [blame] | 1216 | _(" (fix conflicts and run \"git cherry-pick --continue\")")); |
Lucien Kong | 83c750a | 2012-06-05 22:21:24 +0200 | [diff] [blame] | 1217 | else |
| 1218 | status_printf_ln(s, color, |
Ralf Thielow | b95e66f | 2013-06-17 06:28:26 +0200 | [diff] [blame] | 1219 | _(" (all conflicts fixed: run \"git cherry-pick --continue\")")); |
| 1220 | status_printf_ln(s, color, |
| 1221 | _(" (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)")); |
Lucien Kong | 83c750a | 2012-06-05 22:21:24 +0200 | [diff] [blame] | 1222 | } |
| 1223 | wt_status_print_trailer(s); |
| 1224 | } |
| 1225 | |
Matthieu Moy | db4ef44 | 2013-04-02 16:20:21 +0200 | [diff] [blame] | 1226 | static void show_revert_in_progress(struct wt_status *s, |
| 1227 | struct wt_status_state *state, |
| 1228 | const char *color) |
| 1229 | { |
Matthieu Moy | 87e139c | 2013-04-02 16:20:22 +0200 | [diff] [blame] | 1230 | status_printf_ln(s, color, _("You are currently reverting commit %s."), |
| 1231 | find_unique_abbrev(state->revert_head_sha1, DEFAULT_ABBREV)); |
Matthieu Moy | 6a964f5 | 2013-09-12 12:50:05 +0200 | [diff] [blame] | 1232 | if (s->hints) { |
Matthieu Moy | db4ef44 | 2013-04-02 16:20:21 +0200 | [diff] [blame] | 1233 | if (has_unmerged(s)) |
| 1234 | status_printf_ln(s, color, |
| 1235 | _(" (fix conflicts and run \"git revert --continue\")")); |
| 1236 | else |
| 1237 | status_printf_ln(s, color, |
| 1238 | _(" (all conflicts fixed: run \"git revert --continue\")")); |
| 1239 | status_printf_ln(s, color, |
| 1240 | _(" (use \"git revert --abort\" to cancel the revert operation)")); |
| 1241 | } |
| 1242 | wt_status_print_trailer(s); |
| 1243 | } |
| 1244 | |
Lucien Kong | 83c750a | 2012-06-05 22:21:24 +0200 | [diff] [blame] | 1245 | static void show_bisect_in_progress(struct wt_status *s, |
| 1246 | struct wt_status_state *state, |
| 1247 | const char *color) |
| 1248 | { |
Nguyễn Thái Ngọc Duy | 0722c80 | 2013-02-03 12:53:27 +0700 | [diff] [blame] | 1249 | if (state->branch) |
| 1250 | status_printf_ln(s, color, |
Nguyễn Thái Ngọc Duy | 6deab24 | 2013-03-23 10:52:44 +0700 | [diff] [blame] | 1251 | _("You are currently bisecting, started from branch '%s'."), |
Nguyễn Thái Ngọc Duy | 0722c80 | 2013-02-03 12:53:27 +0700 | [diff] [blame] | 1252 | state->branch); |
| 1253 | else |
| 1254 | status_printf_ln(s, color, |
| 1255 | _("You are currently bisecting.")); |
Matthieu Moy | 6a964f5 | 2013-09-12 12:50:05 +0200 | [diff] [blame] | 1256 | if (s->hints) |
Lucien Kong | 83c750a | 2012-06-05 22:21:24 +0200 | [diff] [blame] | 1257 | status_printf_ln(s, color, |
| 1258 | _(" (use \"git bisect reset\" to get back to the original branch)")); |
| 1259 | wt_status_print_trailer(s); |
| 1260 | } |
| 1261 | |
Nguyễn Thái Ngọc Duy | 0722c80 | 2013-02-03 12:53:27 +0700 | [diff] [blame] | 1262 | /* |
| 1263 | * Extract branch information from rebase/bisect |
| 1264 | */ |
Nguyễn Thái Ngọc Duy | 8b87cfd | 2013-03-16 09:12:36 +0700 | [diff] [blame] | 1265 | static char *read_and_strip_branch(const char *path) |
Nguyễn Thái Ngọc Duy | 0722c80 | 2013-02-03 12:53:27 +0700 | [diff] [blame] | 1266 | { |
Nguyễn Thái Ngọc Duy | 8b87cfd | 2013-03-16 09:12:36 +0700 | [diff] [blame] | 1267 | struct strbuf sb = STRBUF_INIT; |
Nguyễn Thái Ngọc Duy | 0722c80 | 2013-02-03 12:53:27 +0700 | [diff] [blame] | 1268 | unsigned char sha1[20]; |
René Scharfe | c72b49d | 2015-10-31 18:37:43 +0100 | [diff] [blame] | 1269 | const char *branch_name; |
Nguyễn Thái Ngọc Duy | 0722c80 | 2013-02-03 12:53:27 +0700 | [diff] [blame] | 1270 | |
Nguyễn Thái Ngọc Duy | 8b87cfd | 2013-03-16 09:12:36 +0700 | [diff] [blame] | 1271 | if (strbuf_read_file(&sb, git_path("%s", path), 0) <= 0) |
| 1272 | goto got_nothing; |
Nguyễn Thái Ngọc Duy | 0722c80 | 2013-02-03 12:53:27 +0700 | [diff] [blame] | 1273 | |
Jeff King | 66ec904 | 2015-01-28 12:57:35 -0500 | [diff] [blame] | 1274 | while (sb.len && sb.buf[sb.len - 1] == '\n') |
Nguyễn Thái Ngọc Duy | 8b87cfd | 2013-03-16 09:12:36 +0700 | [diff] [blame] | 1275 | strbuf_setlen(&sb, sb.len - 1); |
| 1276 | if (!sb.len) |
| 1277 | goto got_nothing; |
René Scharfe | c72b49d | 2015-10-31 18:37:43 +0100 | [diff] [blame] | 1278 | if (skip_prefix(sb.buf, "refs/heads/", &branch_name)) |
| 1279 | strbuf_remove(&sb, 0, branch_name - sb.buf); |
Christian Couder | 5955654 | 2013-11-30 21:55:40 +0100 | [diff] [blame] | 1280 | else if (starts_with(sb.buf, "refs/")) |
Nguyễn Thái Ngọc Duy | 8b87cfd | 2013-03-16 09:12:36 +0700 | [diff] [blame] | 1281 | ; |
| 1282 | else if (!get_sha1_hex(sb.buf, sha1)) { |
Nguyễn Thái Ngọc Duy | 0722c80 | 2013-02-03 12:53:27 +0700 | [diff] [blame] | 1283 | const char *abbrev; |
| 1284 | abbrev = find_unique_abbrev(sha1, DEFAULT_ABBREV); |
Nguyễn Thái Ngọc Duy | 8b87cfd | 2013-03-16 09:12:36 +0700 | [diff] [blame] | 1285 | strbuf_reset(&sb); |
| 1286 | strbuf_addstr(&sb, abbrev); |
| 1287 | } else if (!strcmp(sb.buf, "detached HEAD")) /* rebase */ |
| 1288 | goto got_nothing; |
Nguyễn Thái Ngọc Duy | 0722c80 | 2013-02-03 12:53:27 +0700 | [diff] [blame] | 1289 | else /* bisect */ |
Nguyễn Thái Ngọc Duy | 8b87cfd | 2013-03-16 09:12:36 +0700 | [diff] [blame] | 1290 | ; |
| 1291 | return strbuf_detach(&sb, NULL); |
| 1292 | |
| 1293 | got_nothing: |
| 1294 | strbuf_release(&sb); |
| 1295 | return NULL; |
Nguyễn Thái Ngọc Duy | 0722c80 | 2013-02-03 12:53:27 +0700 | [diff] [blame] | 1296 | } |
| 1297 | |
Nguyễn Thái Ngọc Duy | b397ea4 | 2013-03-13 18:42:52 +0700 | [diff] [blame] | 1298 | struct grab_1st_switch_cbdata { |
Nguyễn Thái Ngọc Duy | b397ea4 | 2013-03-13 18:42:52 +0700 | [diff] [blame] | 1299 | struct strbuf buf; |
| 1300 | unsigned char nsha1[20]; |
| 1301 | }; |
| 1302 | |
| 1303 | static int grab_1st_switch(unsigned char *osha1, unsigned char *nsha1, |
| 1304 | const char *email, unsigned long timestamp, int tz, |
| 1305 | const char *message, void *cb_data) |
Lucien Kong | 83c750a | 2012-06-05 22:21:24 +0200 | [diff] [blame] | 1306 | { |
Nguyễn Thái Ngọc Duy | b397ea4 | 2013-03-13 18:42:52 +0700 | [diff] [blame] | 1307 | struct grab_1st_switch_cbdata *cb = cb_data; |
| 1308 | const char *target = NULL, *end; |
| 1309 | |
René Scharfe | c72b49d | 2015-10-31 18:37:43 +0100 | [diff] [blame] | 1310 | if (!skip_prefix(message, "checkout: moving from ", &message)) |
Nguyễn Thái Ngọc Duy | b397ea4 | 2013-03-13 18:42:52 +0700 | [diff] [blame] | 1311 | return 0; |
Nguyễn Thái Ngọc Duy | b397ea4 | 2013-03-13 18:42:52 +0700 | [diff] [blame] | 1312 | target = strstr(message, " to "); |
| 1313 | if (!target) |
| 1314 | return 0; |
| 1315 | target += strlen(" to "); |
| 1316 | strbuf_reset(&cb->buf); |
| 1317 | hashcpy(cb->nsha1, nsha1); |
René Scharfe | 904de44 | 2015-11-25 15:10:18 +0100 | [diff] [blame] | 1318 | end = strchrnul(target, '\n'); |
| 1319 | strbuf_add(&cb->buf, target, end - target); |
| 1320 | if (!strcmp(cb->buf.buf, "HEAD")) { |
Matthieu Moy | 0eb8548 | 2015-09-27 17:13:42 +0200 | [diff] [blame] | 1321 | /* HEAD is relative. Resolve it to the right reflog entry. */ |
René Scharfe | 904de44 | 2015-11-25 15:10:18 +0100 | [diff] [blame] | 1322 | strbuf_reset(&cb->buf); |
Matthieu Moy | 0eb8548 | 2015-09-27 17:13:42 +0200 | [diff] [blame] | 1323 | strbuf_addstr(&cb->buf, |
| 1324 | find_unique_abbrev(nsha1, DEFAULT_ABBREV)); |
Matthieu Moy | 0eb8548 | 2015-09-27 17:13:42 +0200 | [diff] [blame] | 1325 | } |
Nguyễn Thái Ngọc Duy | b397ea4 | 2013-03-13 18:42:52 +0700 | [diff] [blame] | 1326 | return 1; |
| 1327 | } |
| 1328 | |
| 1329 | static void wt_status_get_detached_from(struct wt_status_state *state) |
| 1330 | { |
| 1331 | struct grab_1st_switch_cbdata cb; |
| 1332 | struct commit *commit; |
| 1333 | unsigned char sha1[20]; |
| 1334 | char *ref = NULL; |
| 1335 | |
| 1336 | strbuf_init(&cb.buf, 0); |
| 1337 | if (for_each_reflog_ent_reverse("HEAD", grab_1st_switch, &cb) <= 0) { |
| 1338 | strbuf_release(&cb.buf); |
| 1339 | return; |
| 1340 | } |
| 1341 | |
| 1342 | if (dwim_ref(cb.buf.buf, cb.buf.len, sha1, &ref) == 1 && |
| 1343 | /* sha1 is a commit? match without further lookup */ |
| 1344 | (!hashcmp(cb.nsha1, sha1) || |
| 1345 | /* perhaps sha1 is a tag, try to dereference to a commit */ |
| 1346 | ((commit = lookup_commit_reference_gently(sha1, 1)) != NULL && |
brian m. carlson | ed1c997 | 2015-11-10 02:22:29 +0000 | [diff] [blame] | 1347 | !hashcmp(cb.nsha1, commit->object.oid.hash)))) { |
René Scharfe | c72b49d | 2015-10-31 18:37:43 +0100 | [diff] [blame] | 1348 | const char *from = ref; |
| 1349 | if (!skip_prefix(from, "refs/tags/", &from)) |
| 1350 | skip_prefix(from, "refs/remotes/", &from); |
| 1351 | state->detached_from = xstrdup(from); |
Nguyễn Thái Ngọc Duy | b397ea4 | 2013-03-13 18:42:52 +0700 | [diff] [blame] | 1352 | } else |
| 1353 | state->detached_from = |
| 1354 | xstrdup(find_unique_abbrev(cb.nsha1, DEFAULT_ABBREV)); |
| 1355 | hashcpy(state->detached_sha1, cb.nsha1); |
Michael J Gruber | 970399e | 2015-03-06 16:04:06 +0100 | [diff] [blame] | 1356 | state->detached_at = !get_sha1("HEAD", sha1) && |
| 1357 | !hashcmp(sha1, state->detached_sha1); |
Nguyễn Thái Ngọc Duy | b397ea4 | 2013-03-13 18:42:52 +0700 | [diff] [blame] | 1358 | |
| 1359 | free(ref); |
| 1360 | strbuf_release(&cb.buf); |
| 1361 | } |
| 1362 | |
| 1363 | void wt_status_get_state(struct wt_status_state *state, |
| 1364 | int get_detached_from) |
Nguyễn Thái Ngọc Duy | b9691db | 2013-03-13 18:42:50 +0700 | [diff] [blame] | 1365 | { |
Lucien Kong | 83c750a | 2012-06-05 22:21:24 +0200 | [diff] [blame] | 1366 | struct stat st; |
Matthieu Moy | 87e139c | 2013-04-02 16:20:22 +0200 | [diff] [blame] | 1367 | unsigned char sha1[20]; |
Lucien Kong | 83c750a | 2012-06-05 22:21:24 +0200 | [diff] [blame] | 1368 | |
Jeff King | f932729 | 2015-08-10 05:38:57 -0400 | [diff] [blame] | 1369 | if (!stat(git_path_merge_head(), &st)) { |
Nguyễn Thái Ngọc Duy | b9691db | 2013-03-13 18:42:50 +0700 | [diff] [blame] | 1370 | state->merge_in_progress = 1; |
Lucien Kong | 83c750a | 2012-06-05 22:21:24 +0200 | [diff] [blame] | 1371 | } else if (!stat(git_path("rebase-apply"), &st)) { |
| 1372 | if (!stat(git_path("rebase-apply/applying"), &st)) { |
Nguyễn Thái Ngọc Duy | b9691db | 2013-03-13 18:42:50 +0700 | [diff] [blame] | 1373 | state->am_in_progress = 1; |
Lucien Kong | 83c750a | 2012-06-05 22:21:24 +0200 | [diff] [blame] | 1374 | if (!stat(git_path("rebase-apply/patch"), &st) && !st.st_size) |
Nguyễn Thái Ngọc Duy | b9691db | 2013-03-13 18:42:50 +0700 | [diff] [blame] | 1375 | state->am_empty_patch = 1; |
Lucien Kong | 83c750a | 2012-06-05 22:21:24 +0200 | [diff] [blame] | 1376 | } else { |
Nguyễn Thái Ngọc Duy | b9691db | 2013-03-13 18:42:50 +0700 | [diff] [blame] | 1377 | state->rebase_in_progress = 1; |
| 1378 | state->branch = read_and_strip_branch("rebase-apply/head-name"); |
| 1379 | state->onto = read_and_strip_branch("rebase-apply/onto"); |
Lucien Kong | 83c750a | 2012-06-05 22:21:24 +0200 | [diff] [blame] | 1380 | } |
| 1381 | } else if (!stat(git_path("rebase-merge"), &st)) { |
| 1382 | if (!stat(git_path("rebase-merge/interactive"), &st)) |
Nguyễn Thái Ngọc Duy | b9691db | 2013-03-13 18:42:50 +0700 | [diff] [blame] | 1383 | state->rebase_interactive_in_progress = 1; |
Lucien Kong | 83c750a | 2012-06-05 22:21:24 +0200 | [diff] [blame] | 1384 | else |
Nguyễn Thái Ngọc Duy | b9691db | 2013-03-13 18:42:50 +0700 | [diff] [blame] | 1385 | state->rebase_in_progress = 1; |
| 1386 | state->branch = read_and_strip_branch("rebase-merge/head-name"); |
| 1387 | state->onto = read_and_strip_branch("rebase-merge/onto"); |
Jeff King | f932729 | 2015-08-10 05:38:57 -0400 | [diff] [blame] | 1388 | } else if (!stat(git_path_cherry_pick_head(), &st) && |
Ralf Thielow | bffd809 | 2013-10-11 17:58:37 +0200 | [diff] [blame] | 1389 | !get_sha1("CHERRY_PICK_HEAD", sha1)) { |
Nguyễn Thái Ngọc Duy | b9691db | 2013-03-13 18:42:50 +0700 | [diff] [blame] | 1390 | state->cherry_pick_in_progress = 1; |
Ralf Thielow | bffd809 | 2013-10-11 17:58:37 +0200 | [diff] [blame] | 1391 | hashcpy(state->cherry_pick_head_sha1, sha1); |
Lucien Kong | 83c750a | 2012-06-05 22:21:24 +0200 | [diff] [blame] | 1392 | } |
Nguyễn Thái Ngọc Duy | 0722c80 | 2013-02-03 12:53:27 +0700 | [diff] [blame] | 1393 | if (!stat(git_path("BISECT_LOG"), &st)) { |
Nguyễn Thái Ngọc Duy | b9691db | 2013-03-13 18:42:50 +0700 | [diff] [blame] | 1394 | state->bisect_in_progress = 1; |
| 1395 | state->branch = read_and_strip_branch("BISECT_START"); |
Nguyễn Thái Ngọc Duy | 0722c80 | 2013-02-03 12:53:27 +0700 | [diff] [blame] | 1396 | } |
Jeff King | f932729 | 2015-08-10 05:38:57 -0400 | [diff] [blame] | 1397 | if (!stat(git_path_revert_head(), &st) && |
Matthieu Moy | 87e139c | 2013-04-02 16:20:22 +0200 | [diff] [blame] | 1398 | !get_sha1("REVERT_HEAD", sha1)) { |
Matthieu Moy | db4ef44 | 2013-04-02 16:20:21 +0200 | [diff] [blame] | 1399 | state->revert_in_progress = 1; |
Matthieu Moy | 87e139c | 2013-04-02 16:20:22 +0200 | [diff] [blame] | 1400 | hashcpy(state->revert_head_sha1, sha1); |
Matthieu Moy | db4ef44 | 2013-04-02 16:20:21 +0200 | [diff] [blame] | 1401 | } |
Lucien Kong | 83c750a | 2012-06-05 22:21:24 +0200 | [diff] [blame] | 1402 | |
Nguyễn Thái Ngọc Duy | b397ea4 | 2013-03-13 18:42:52 +0700 | [diff] [blame] | 1403 | if (get_detached_from) |
| 1404 | wt_status_get_detached_from(state); |
Nguyễn Thái Ngọc Duy | b9691db | 2013-03-13 18:42:50 +0700 | [diff] [blame] | 1405 | } |
| 1406 | |
Nguyễn Thái Ngọc Duy | 3b691cc | 2013-03-13 18:42:51 +0700 | [diff] [blame] | 1407 | static void wt_status_print_state(struct wt_status *s, |
| 1408 | struct wt_status_state *state) |
Lucien Kong | 83c750a | 2012-06-05 22:21:24 +0200 | [diff] [blame] | 1409 | { |
| 1410 | const char *state_color = color(WT_STATUS_HEADER, s); |
Nguyễn Thái Ngọc Duy | 3b691cc | 2013-03-13 18:42:51 +0700 | [diff] [blame] | 1411 | if (state->merge_in_progress) |
| 1412 | show_merge_in_progress(s, state, state_color); |
| 1413 | else if (state->am_in_progress) |
| 1414 | show_am_in_progress(s, state, state_color); |
| 1415 | else if (state->rebase_in_progress || state->rebase_interactive_in_progress) |
| 1416 | show_rebase_in_progress(s, state, state_color); |
| 1417 | else if (state->cherry_pick_in_progress) |
| 1418 | show_cherry_pick_in_progress(s, state, state_color); |
Matthieu Moy | db4ef44 | 2013-04-02 16:20:21 +0200 | [diff] [blame] | 1419 | else if (state->revert_in_progress) |
| 1420 | show_revert_in_progress(s, state, state_color); |
Nguyễn Thái Ngọc Duy | 3b691cc | 2013-03-13 18:42:51 +0700 | [diff] [blame] | 1421 | if (state->bisect_in_progress) |
| 1422 | show_bisect_in_progress(s, state, state_color); |
Lucien Kong | 83c750a | 2012-06-05 22:21:24 +0200 | [diff] [blame] | 1423 | } |
| 1424 | |
Jeff King | c91f0d9 | 2006-09-08 04:05:34 -0400 | [diff] [blame] | 1425 | void wt_status_print(struct wt_status *s) |
| 1426 | { |
Aleksi Aalto | 1d28232 | 2010-11-18 01:40:05 +0200 | [diff] [blame] | 1427 | const char *branch_color = color(WT_STATUS_ONBRANCH, s); |
| 1428 | const char *branch_status_color = color(WT_STATUS_HEADER, s); |
Nguyễn Thái Ngọc Duy | 3b691cc | 2013-03-13 18:42:51 +0700 | [diff] [blame] | 1429 | struct wt_status_state state; |
| 1430 | |
| 1431 | memset(&state, 0, sizeof(state)); |
Nguyễn Thái Ngọc Duy | b397ea4 | 2013-03-13 18:42:52 +0700 | [diff] [blame] | 1432 | wt_status_get_state(&state, |
| 1433 | s->branch && !strcmp(s->branch, "HEAD")); |
Jürgen Rühle | 98bf8a4 | 2007-01-02 20:26:23 +0100 | [diff] [blame] | 1434 | |
Junio C Hamano | bda324c | 2007-01-03 01:09:34 -0800 | [diff] [blame] | 1435 | if (s->branch) { |
Ævar Arnfjörð Bjarmason | 355ec7a | 2011-02-22 23:42:13 +0000 | [diff] [blame] | 1436 | const char *on_what = _("On branch "); |
Junio C Hamano | bda324c | 2007-01-03 01:09:34 -0800 | [diff] [blame] | 1437 | const char *branch_name = s->branch; |
René Scharfe | c72b49d | 2015-10-31 18:37:43 +0100 | [diff] [blame] | 1438 | if (!strcmp(branch_name, "HEAD")) { |
Aleksi Aalto | 1d28232 | 2010-11-18 01:40:05 +0200 | [diff] [blame] | 1439 | branch_status_color = color(WT_STATUS_NOBRANCH, s); |
Ramkumar Ramachandra | ec50631 | 2013-06-16 14:15:15 +0530 | [diff] [blame] | 1440 | if (state.rebase_in_progress || state.rebase_interactive_in_progress) { |
Guillaume Pagès | df25e94 | 2015-06-30 15:01:13 +0200 | [diff] [blame] | 1441 | if (state.rebase_interactive_in_progress) |
| 1442 | on_what = _("interactive rebase in progress; onto "); |
| 1443 | else |
| 1444 | on_what = _("rebase in progress; onto "); |
Ramkumar Ramachandra | ec50631 | 2013-06-16 14:15:15 +0530 | [diff] [blame] | 1445 | branch_name = state.onto; |
| 1446 | } else if (state.detached_from) { |
Nguyễn Thái Ngọc Duy | b397ea4 | 2013-03-13 18:42:52 +0700 | [diff] [blame] | 1447 | branch_name = state.detached_from; |
Michael J Gruber | 970399e | 2015-03-06 16:04:06 +0100 | [diff] [blame] | 1448 | if (state.detached_at) |
Nguyễn Thái Ngọc Duy | b397ea4 | 2013-03-13 18:42:52 +0700 | [diff] [blame] | 1449 | on_what = _("HEAD detached at "); |
| 1450 | else |
| 1451 | on_what = _("HEAD detached from "); |
| 1452 | } else { |
| 1453 | branch_name = ""; |
| 1454 | on_what = _("Not currently on any branch."); |
| 1455 | } |
René Scharfe | c72b49d | 2015-10-31 18:37:43 +0100 | [diff] [blame] | 1456 | } else |
| 1457 | skip_prefix(branch_name, "refs/heads/", &branch_name); |
Felipe Contreras | 7d7d680 | 2014-05-04 01:12:55 -0500 | [diff] [blame] | 1458 | status_printf(s, color(WT_STATUS_HEADER, s), "%s", ""); |
Jonathan Nieder | b926c0d | 2011-02-25 23:11:37 -0600 | [diff] [blame] | 1459 | status_printf_more(s, branch_status_color, "%s", on_what); |
| 1460 | status_printf_more(s, branch_color, "%s\n", branch_name); |
Junio C Hamano | b6975ab | 2008-07-02 00:52:16 -0700 | [diff] [blame] | 1461 | if (!s->is_initial) |
| 1462 | wt_status_print_tracking(s); |
Junio C Hamano | bda324c | 2007-01-03 01:09:34 -0800 | [diff] [blame] | 1463 | } |
Jeff King | c91f0d9 | 2006-09-08 04:05:34 -0400 | [diff] [blame] | 1464 | |
Nguyễn Thái Ngọc Duy | 3b691cc | 2013-03-13 18:42:51 +0700 | [diff] [blame] | 1465 | wt_status_print_state(s, &state); |
| 1466 | free(state.branch); |
| 1467 | free(state.onto); |
Nguyễn Thái Ngọc Duy | b397ea4 | 2013-03-13 18:42:52 +0700 | [diff] [blame] | 1468 | free(state.detached_from); |
Nguyễn Thái Ngọc Duy | 3b691cc | 2013-03-13 18:42:51 +0700 | [diff] [blame] | 1469 | |
Jeff King | c91f0d9 | 2006-09-08 04:05:34 -0400 | [diff] [blame] | 1470 | if (s->is_initial) { |
Felipe Contreras | 7d7d680 | 2014-05-04 01:12:55 -0500 | [diff] [blame] | 1471 | status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", ""); |
Ævar Arnfjörð Bjarmason | b3b298a | 2011-02-22 23:42:17 +0000 | [diff] [blame] | 1472 | status_printf_ln(s, color(WT_STATUS_HEADER, s), _("Initial commit")); |
Felipe Contreras | 7d7d680 | 2014-05-04 01:12:55 -0500 | [diff] [blame] | 1473 | status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", ""); |
Jeff King | c91f0d9 | 2006-09-08 04:05:34 -0400 | [diff] [blame] | 1474 | } |
| 1475 | |
Jeff King | c1e255b | 2008-11-12 03:21:39 -0500 | [diff] [blame] | 1476 | wt_status_print_updated(s); |
Johannes Sixt | 228e7b5 | 2009-09-01 22:13:53 +0200 | [diff] [blame] | 1477 | wt_status_print_unmerged(s); |
Jeff King | c91f0d9 | 2006-09-08 04:05:34 -0400 | [diff] [blame] | 1478 | wt_status_print_changed(s); |
Jens Lehmann | 46a958b | 2010-06-25 16:56:47 +0200 | [diff] [blame] | 1479 | if (s->submodule_summary && |
| 1480 | (!s->ignore_submodule_arg || |
| 1481 | strcmp(s->ignore_submodule_arg, "all"))) { |
Jens Lehmann | f17a5d3 | 2010-01-17 20:42:31 +0100 | [diff] [blame] | 1482 | wt_status_print_submodule_summary(s, 0); /* staged */ |
| 1483 | wt_status_print_submodule_summary(s, 1); /* unstaged */ |
| 1484 | } |
Junio C Hamano | 2381e39 | 2010-04-10 00:33:17 -0700 | [diff] [blame] | 1485 | if (s->show_untracked_files) { |
Nguyễn Thái Ngọc Duy | 50bd8b7 | 2012-09-06 22:16:50 +0700 | [diff] [blame] | 1486 | wt_status_print_other(s, &s->untracked, _("Untracked files"), "add"); |
Junio C Hamano | 2381e39 | 2010-04-10 00:33:17 -0700 | [diff] [blame] | 1487 | if (s->show_ignored_files) |
Nguyễn Thái Ngọc Duy | 50bd8b7 | 2012-09-06 22:16:50 +0700 | [diff] [blame] | 1488 | wt_status_print_other(s, &s->ignored, _("Ignored files"), "add -f"); |
Nguyễn Thái Ngọc Duy | 6a38ef2 | 2013-03-13 19:59:16 +0700 | [diff] [blame] | 1489 | if (advice_status_u_option && 2000 < s->untracked_in_ms) { |
Felipe Contreras | 7d7d680 | 2014-05-04 01:12:55 -0500 | [diff] [blame] | 1490 | status_printf_ln(s, GIT_COLOR_NORMAL, "%s", ""); |
Nguyễn Thái Ngọc Duy | 6a38ef2 | 2013-03-13 19:59:16 +0700 | [diff] [blame] | 1491 | status_printf_ln(s, GIT_COLOR_NORMAL, |
Jiang Xin | 6290117 | 2013-04-12 11:53:01 +0800 | [diff] [blame] | 1492 | _("It took %.2f seconds to enumerate untracked files. 'status -uno'\n" |
| 1493 | "may speed it up, but you have to be careful not to forget to add\n" |
| 1494 | "new files yourself (see 'git help status')."), |
| 1495 | s->untracked_in_ms / 1000.0); |
Nguyễn Thái Ngọc Duy | 6a38ef2 | 2013-03-13 19:59:16 +0700 | [diff] [blame] | 1496 | } |
Junio C Hamano | 2381e39 | 2010-04-10 00:33:17 -0700 | [diff] [blame] | 1497 | } else if (s->commitable) |
Ævar Arnfjörð Bjarmason | 355ec7a | 2011-02-22 23:42:13 +0000 | [diff] [blame] | 1498 | status_printf_ln(s, GIT_COLOR_NORMAL, _("Untracked files not listed%s"), |
Matthieu Moy | 6a964f5 | 2013-09-12 12:50:05 +0200 | [diff] [blame] | 1499 | s->hints |
Ævar Arnfjörð Bjarmason | 355ec7a | 2011-02-22 23:42:13 +0000 | [diff] [blame] | 1500 | ? _(" (use -u option to show untracked files)") : ""); |
Jeff King | c91f0d9 | 2006-09-08 04:05:34 -0400 | [diff] [blame] | 1501 | |
Jeff King | 1324fb6 | 2008-11-12 03:23:37 -0500 | [diff] [blame] | 1502 | if (s->verbose) |
Jeff King | c91f0d9 | 2006-09-08 04:05:34 -0400 | [diff] [blame] | 1503 | wt_status_print_verbose(s); |
Jürgen Rühle | 6e458bf | 2007-01-02 20:26:22 +0100 | [diff] [blame] | 1504 | if (!s->commitable) { |
| 1505 | if (s->amend) |
Ævar Arnfjörð Bjarmason | 355ec7a | 2011-02-22 23:42:13 +0000 | [diff] [blame] | 1506 | status_printf_ln(s, GIT_COLOR_NORMAL, _("No changes")); |
Junio C Hamano | 37d07f8 | 2007-12-12 19:09:16 -0800 | [diff] [blame] | 1507 | else if (s->nowarn) |
| 1508 | ; /* nothing */ |
Nguyễn Thái Ngọc Duy | 50bd8b7 | 2012-09-06 22:16:50 +0700 | [diff] [blame] | 1509 | else if (s->workdir_dirty) { |
Matthieu Moy | 6a964f5 | 2013-09-12 12:50:05 +0200 | [diff] [blame] | 1510 | if (s->hints) |
Nguyễn Thái Ngọc Duy | 50bd8b7 | 2012-09-06 22:16:50 +0700 | [diff] [blame] | 1511 | printf(_("no changes added to commit " |
| 1512 | "(use \"git add\" and/or \"git commit -a\")\n")); |
| 1513 | else |
| 1514 | printf(_("no changes added to commit\n")); |
| 1515 | } else if (s->untracked.nr) { |
Matthieu Moy | 6a964f5 | 2013-09-12 12:50:05 +0200 | [diff] [blame] | 1516 | if (s->hints) |
Nguyễn Thái Ngọc Duy | 50bd8b7 | 2012-09-06 22:16:50 +0700 | [diff] [blame] | 1517 | printf(_("nothing added to commit but untracked files " |
| 1518 | "present (use \"git add\" to track)\n")); |
| 1519 | else |
| 1520 | printf(_("nothing added to commit but untracked files present\n")); |
| 1521 | } else if (s->is_initial) { |
Matthieu Moy | 6a964f5 | 2013-09-12 12:50:05 +0200 | [diff] [blame] | 1522 | if (s->hints) |
Nguyễn Thái Ngọc Duy | 50bd8b7 | 2012-09-06 22:16:50 +0700 | [diff] [blame] | 1523 | printf(_("nothing to commit (create/copy files " |
| 1524 | "and use \"git add\" to track)\n")); |
| 1525 | else |
| 1526 | printf(_("nothing to commit\n")); |
| 1527 | } else if (!s->show_untracked_files) { |
Matthieu Moy | 6a964f5 | 2013-09-12 12:50:05 +0200 | [diff] [blame] | 1528 | if (s->hints) |
Nguyễn Thái Ngọc Duy | 50bd8b7 | 2012-09-06 22:16:50 +0700 | [diff] [blame] | 1529 | printf(_("nothing to commit (use -u to show untracked files)\n")); |
| 1530 | else |
| 1531 | printf(_("nothing to commit\n")); |
| 1532 | } else |
| 1533 | printf(_("nothing to commit, working directory clean\n")); |
Jürgen Rühle | 6e458bf | 2007-01-02 20:26:22 +0100 | [diff] [blame] | 1534 | } |
Jeff King | c91f0d9 | 2006-09-08 04:05:34 -0400 | [diff] [blame] | 1535 | } |
Michael J Gruber | 84dbe7b | 2009-12-05 16:04:37 +0100 | [diff] [blame] | 1536 | |
Jeff King | 3207a3a | 2012-05-07 15:44:44 -0400 | [diff] [blame] | 1537 | static void wt_shortstatus_unmerged(struct string_list_item *it, |
Michael J Gruber | 84dbe7b | 2009-12-05 16:04:37 +0100 | [diff] [blame] | 1538 | struct wt_status *s) |
| 1539 | { |
| 1540 | struct wt_status_change_data *d = it->util; |
| 1541 | const char *how = "??"; |
| 1542 | |
| 1543 | switch (d->stagemask) { |
| 1544 | case 1: how = "DD"; break; /* both deleted */ |
| 1545 | case 2: how = "AU"; break; /* added by us */ |
| 1546 | case 3: how = "UD"; break; /* deleted by them */ |
| 1547 | case 4: how = "UA"; break; /* added by them */ |
| 1548 | case 5: how = "DU"; break; /* deleted by us */ |
| 1549 | case 6: how = "AA"; break; /* both added */ |
| 1550 | case 7: how = "UU"; break; /* both modified */ |
| 1551 | } |
Michael J Gruber | 3fe2a89 | 2009-12-05 16:04:38 +0100 | [diff] [blame] | 1552 | color_fprintf(s->fp, color(WT_STATUS_UNMERGED, s), "%s", how); |
Jeff King | 3207a3a | 2012-05-07 15:44:44 -0400 | [diff] [blame] | 1553 | if (s->null_termination) { |
Michael J Gruber | 3fe2a89 | 2009-12-05 16:04:38 +0100 | [diff] [blame] | 1554 | fprintf(stdout, " %s%c", it->string, 0); |
Michael J Gruber | 84dbe7b | 2009-12-05 16:04:37 +0100 | [diff] [blame] | 1555 | } else { |
| 1556 | struct strbuf onebuf = STRBUF_INIT; |
| 1557 | const char *one; |
Jiang Xin | 39598f9 | 2013-06-25 23:53:45 +0800 | [diff] [blame] | 1558 | one = quote_path(it->string, s->prefix, &onebuf); |
Michael J Gruber | 3fe2a89 | 2009-12-05 16:04:38 +0100 | [diff] [blame] | 1559 | printf(" %s\n", one); |
Michael J Gruber | 84dbe7b | 2009-12-05 16:04:37 +0100 | [diff] [blame] | 1560 | strbuf_release(&onebuf); |
| 1561 | } |
| 1562 | } |
| 1563 | |
Jeff King | 3207a3a | 2012-05-07 15:44:44 -0400 | [diff] [blame] | 1564 | static void wt_shortstatus_status(struct string_list_item *it, |
Michael J Gruber | 84dbe7b | 2009-12-05 16:04:37 +0100 | [diff] [blame] | 1565 | struct wt_status *s) |
| 1566 | { |
| 1567 | struct wt_status_change_data *d = it->util; |
| 1568 | |
Michael J Gruber | 3fe2a89 | 2009-12-05 16:04:38 +0100 | [diff] [blame] | 1569 | if (d->index_status) |
| 1570 | color_fprintf(s->fp, color(WT_STATUS_UPDATED, s), "%c", d->index_status); |
| 1571 | else |
| 1572 | putchar(' '); |
| 1573 | if (d->worktree_status) |
| 1574 | color_fprintf(s->fp, color(WT_STATUS_CHANGED, s), "%c", d->worktree_status); |
| 1575 | else |
| 1576 | putchar(' '); |
| 1577 | putchar(' '); |
Jeff King | 3207a3a | 2012-05-07 15:44:44 -0400 | [diff] [blame] | 1578 | if (s->null_termination) { |
Michael J Gruber | 84dbe7b | 2009-12-05 16:04:37 +0100 | [diff] [blame] | 1579 | fprintf(stdout, "%s%c", it->string, 0); |
| 1580 | if (d->head_path) |
| 1581 | fprintf(stdout, "%s%c", d->head_path, 0); |
| 1582 | } else { |
| 1583 | struct strbuf onebuf = STRBUF_INIT; |
| 1584 | const char *one; |
| 1585 | if (d->head_path) { |
Jiang Xin | 39598f9 | 2013-06-25 23:53:45 +0800 | [diff] [blame] | 1586 | one = quote_path(d->head_path, s->prefix, &onebuf); |
Kevin Ballard | dbfdc62 | 2010-11-08 18:44:38 -0800 | [diff] [blame] | 1587 | if (*one != '"' && strchr(one, ' ') != NULL) { |
| 1588 | putchar('"'); |
| 1589 | strbuf_addch(&onebuf, '"'); |
| 1590 | one = onebuf.buf; |
| 1591 | } |
Michael J Gruber | 84dbe7b | 2009-12-05 16:04:37 +0100 | [diff] [blame] | 1592 | printf("%s -> ", one); |
| 1593 | strbuf_release(&onebuf); |
| 1594 | } |
Jiang Xin | 39598f9 | 2013-06-25 23:53:45 +0800 | [diff] [blame] | 1595 | one = quote_path(it->string, s->prefix, &onebuf); |
Kevin Ballard | dbfdc62 | 2010-11-08 18:44:38 -0800 | [diff] [blame] | 1596 | if (*one != '"' && strchr(one, ' ') != NULL) { |
| 1597 | putchar('"'); |
| 1598 | strbuf_addch(&onebuf, '"'); |
| 1599 | one = onebuf.buf; |
| 1600 | } |
Michael J Gruber | 84dbe7b | 2009-12-05 16:04:37 +0100 | [diff] [blame] | 1601 | printf("%s\n", one); |
| 1602 | strbuf_release(&onebuf); |
| 1603 | } |
| 1604 | } |
| 1605 | |
Jeff King | 3207a3a | 2012-05-07 15:44:44 -0400 | [diff] [blame] | 1606 | static void wt_shortstatus_other(struct string_list_item *it, |
Junio C Hamano | 2381e39 | 2010-04-10 00:33:17 -0700 | [diff] [blame] | 1607 | struct wt_status *s, const char *sign) |
Michael J Gruber | 84dbe7b | 2009-12-05 16:04:37 +0100 | [diff] [blame] | 1608 | { |
Jeff King | 3207a3a | 2012-05-07 15:44:44 -0400 | [diff] [blame] | 1609 | if (s->null_termination) { |
Junio C Hamano | 2381e39 | 2010-04-10 00:33:17 -0700 | [diff] [blame] | 1610 | fprintf(stdout, "%s %s%c", sign, it->string, 0); |
Michael J Gruber | 84dbe7b | 2009-12-05 16:04:37 +0100 | [diff] [blame] | 1611 | } else { |
| 1612 | struct strbuf onebuf = STRBUF_INIT; |
| 1613 | const char *one; |
Jiang Xin | 39598f9 | 2013-06-25 23:53:45 +0800 | [diff] [blame] | 1614 | one = quote_path(it->string, s->prefix, &onebuf); |
Junio C Hamano | c1909e7 | 2010-05-01 22:05:14 -0700 | [diff] [blame] | 1615 | color_fprintf(s->fp, color(WT_STATUS_UNTRACKED, s), "%s", sign); |
Michael J Gruber | 3fe2a89 | 2009-12-05 16:04:38 +0100 | [diff] [blame] | 1616 | printf(" %s\n", one); |
Michael J Gruber | 84dbe7b | 2009-12-05 16:04:37 +0100 | [diff] [blame] | 1617 | strbuf_release(&onebuf); |
| 1618 | } |
| 1619 | } |
| 1620 | |
Daniel Knittl-Frank | 05a59a0 | 2010-05-25 15:45:51 +0200 | [diff] [blame] | 1621 | static void wt_shortstatus_print_tracking(struct wt_status *s) |
| 1622 | { |
| 1623 | struct branch *branch; |
| 1624 | const char *header_color = color(WT_STATUS_HEADER, s); |
| 1625 | const char *branch_color_local = color(WT_STATUS_LOCAL_BRANCH, s); |
| 1626 | const char *branch_color_remote = color(WT_STATUS_REMOTE_BRANCH, s); |
| 1627 | |
| 1628 | const char *base; |
| 1629 | const char *branch_name; |
| 1630 | int num_ours, num_theirs; |
Jiang Xin | f2e0873 | 2013-08-26 15:02:48 +0800 | [diff] [blame] | 1631 | int upstream_is_gone = 0; |
Daniel Knittl-Frank | 05a59a0 | 2010-05-25 15:45:51 +0200 | [diff] [blame] | 1632 | |
| 1633 | color_fprintf(s->fp, color(WT_STATUS_HEADER, s), "## "); |
| 1634 | |
| 1635 | if (!s->branch) |
| 1636 | return; |
| 1637 | branch_name = s->branch; |
| 1638 | |
Daniel Knittl-Frank | 05a59a0 | 2010-05-25 15:45:51 +0200 | [diff] [blame] | 1639 | if (s->is_initial) |
Ævar Arnfjörð Bjarmason | 98f5e24 | 2011-02-22 23:42:15 +0000 | [diff] [blame] | 1640 | color_fprintf(s->fp, header_color, _("Initial commit on ")); |
Jiang Xin | f2e0873 | 2013-08-26 15:02:48 +0800 | [diff] [blame] | 1641 | |
René Scharfe | baf0a3e | 2015-10-31 18:36:35 +0100 | [diff] [blame] | 1642 | if (!strcmp(s->branch, "HEAD")) { |
| 1643 | color_fprintf(s->fp, color(WT_STATUS_NOBRANCH, s), "%s", |
| 1644 | _("HEAD (no branch)")); |
| 1645 | goto conclude; |
| 1646 | } |
| 1647 | |
René Scharfe | c72b49d | 2015-10-31 18:37:43 +0100 | [diff] [blame] | 1648 | skip_prefix(branch_name, "refs/heads/", &branch_name); |
René Scharfe | baf0a3e | 2015-10-31 18:36:35 +0100 | [diff] [blame] | 1649 | |
René Scharfe | 8d8325f | 2015-10-31 18:37:12 +0100 | [diff] [blame] | 1650 | branch = branch_get(branch_name); |
René Scharfe | baf0a3e | 2015-10-31 18:36:35 +0100 | [diff] [blame] | 1651 | |
Jiang Xin | f2e0873 | 2013-08-26 15:02:48 +0800 | [diff] [blame] | 1652 | color_fprintf(s->fp, branch_color_local, "%s", branch_name); |
| 1653 | |
Jeff King | 979cb24 | 2015-05-21 20:49:11 -0400 | [diff] [blame] | 1654 | if (stat_tracking_info(branch, &num_ours, &num_theirs, &base) < 0) { |
René Scharfe | bcf8cc2 | 2015-10-31 18:36:01 +0100 | [diff] [blame] | 1655 | if (!base) |
| 1656 | goto conclude; |
Jeff King | 979cb24 | 2015-05-21 20:49:11 -0400 | [diff] [blame] | 1657 | |
Jiang Xin | f2e0873 | 2013-08-26 15:02:48 +0800 | [diff] [blame] | 1658 | upstream_is_gone = 1; |
Daniel Knittl-Frank | 05a59a0 | 2010-05-25 15:45:51 +0200 | [diff] [blame] | 1659 | } |
| 1660 | |
Daniel Knittl-Frank | 05a59a0 | 2010-05-25 15:45:51 +0200 | [diff] [blame] | 1661 | base = shorten_unambiguous_ref(base, 0); |
Daniel Knittl-Frank | 05a59a0 | 2010-05-25 15:45:51 +0200 | [diff] [blame] | 1662 | color_fprintf(s->fp, header_color, "..."); |
| 1663 | color_fprintf(s->fp, branch_color_remote, "%s", base); |
Stefan Beller | 0e32d4b | 2015-03-30 18:22:09 -0700 | [diff] [blame] | 1664 | free((char *)base); |
Daniel Knittl-Frank | 05a59a0 | 2010-05-25 15:45:51 +0200 | [diff] [blame] | 1665 | |
René Scharfe | bcf8cc2 | 2015-10-31 18:36:01 +0100 | [diff] [blame] | 1666 | if (!upstream_is_gone && !num_ours && !num_theirs) |
| 1667 | goto conclude; |
Jiang Xin | f223459 | 2013-08-26 15:02:49 +0800 | [diff] [blame] | 1668 | |
Matthieu Moy | 7a76c28 | 2014-03-20 13:12:41 +0100 | [diff] [blame] | 1669 | #define LABEL(string) (s->no_gettext ? (string) : _(string)) |
| 1670 | |
Daniel Knittl-Frank | 05a59a0 | 2010-05-25 15:45:51 +0200 | [diff] [blame] | 1671 | color_fprintf(s->fp, header_color, " ["); |
Jiang Xin | f2e0873 | 2013-08-26 15:02:48 +0800 | [diff] [blame] | 1672 | if (upstream_is_gone) { |
Matthieu Moy | 7a76c28 | 2014-03-20 13:12:41 +0100 | [diff] [blame] | 1673 | color_fprintf(s->fp, header_color, LABEL(N_("gone"))); |
Jiang Xin | f2e0873 | 2013-08-26 15:02:48 +0800 | [diff] [blame] | 1674 | } else if (!num_ours) { |
Matthieu Moy | 7a76c28 | 2014-03-20 13:12:41 +0100 | [diff] [blame] | 1675 | color_fprintf(s->fp, header_color, LABEL(N_("behind "))); |
Daniel Knittl-Frank | 05a59a0 | 2010-05-25 15:45:51 +0200 | [diff] [blame] | 1676 | color_fprintf(s->fp, branch_color_remote, "%d", num_theirs); |
| 1677 | } else if (!num_theirs) { |
Michael J Gruber | df22724 | 2016-03-14 16:30:33 +0100 | [diff] [blame] | 1678 | color_fprintf(s->fp, header_color, LABEL(N_("ahead "))); |
Daniel Knittl-Frank | 05a59a0 | 2010-05-25 15:45:51 +0200 | [diff] [blame] | 1679 | color_fprintf(s->fp, branch_color_local, "%d", num_ours); |
| 1680 | } else { |
Michael J Gruber | df22724 | 2016-03-14 16:30:33 +0100 | [diff] [blame] | 1681 | color_fprintf(s->fp, header_color, LABEL(N_("ahead "))); |
Daniel Knittl-Frank | 05a59a0 | 2010-05-25 15:45:51 +0200 | [diff] [blame] | 1682 | color_fprintf(s->fp, branch_color_local, "%d", num_ours); |
Matthieu Moy | 7a76c28 | 2014-03-20 13:12:41 +0100 | [diff] [blame] | 1683 | color_fprintf(s->fp, header_color, ", %s", LABEL(N_("behind "))); |
Daniel Knittl-Frank | 05a59a0 | 2010-05-25 15:45:51 +0200 | [diff] [blame] | 1684 | color_fprintf(s->fp, branch_color_remote, "%d", num_theirs); |
| 1685 | } |
| 1686 | |
Jeff King | a598523 | 2012-05-07 17:02:18 -0400 | [diff] [blame] | 1687 | color_fprintf(s->fp, header_color, "]"); |
René Scharfe | bcf8cc2 | 2015-10-31 18:36:01 +0100 | [diff] [blame] | 1688 | conclude: |
Jeff King | a598523 | 2012-05-07 17:02:18 -0400 | [diff] [blame] | 1689 | fputc(s->null_termination ? '\0' : '\n', s->fp); |
Daniel Knittl-Frank | 05a59a0 | 2010-05-25 15:45:51 +0200 | [diff] [blame] | 1690 | } |
| 1691 | |
Jeff King | d4a6bf1 | 2012-05-07 17:09:04 -0400 | [diff] [blame] | 1692 | void wt_shortstatus_print(struct wt_status *s) |
Michael J Gruber | 84dbe7b | 2009-12-05 16:04:37 +0100 | [diff] [blame] | 1693 | { |
| 1694 | int i; |
Daniel Knittl-Frank | 05a59a0 | 2010-05-25 15:45:51 +0200 | [diff] [blame] | 1695 | |
Jeff King | d4a6bf1 | 2012-05-07 17:09:04 -0400 | [diff] [blame] | 1696 | if (s->show_branch) |
Daniel Knittl-Frank | 05a59a0 | 2010-05-25 15:45:51 +0200 | [diff] [blame] | 1697 | wt_shortstatus_print_tracking(s); |
| 1698 | |
Michael J Gruber | 84dbe7b | 2009-12-05 16:04:37 +0100 | [diff] [blame] | 1699 | for (i = 0; i < s->change.nr; i++) { |
| 1700 | struct wt_status_change_data *d; |
| 1701 | struct string_list_item *it; |
| 1702 | |
| 1703 | it = &(s->change.items[i]); |
| 1704 | d = it->util; |
| 1705 | if (d->stagemask) |
Jeff King | 3207a3a | 2012-05-07 15:44:44 -0400 | [diff] [blame] | 1706 | wt_shortstatus_unmerged(it, s); |
Michael J Gruber | 84dbe7b | 2009-12-05 16:04:37 +0100 | [diff] [blame] | 1707 | else |
Jeff King | 3207a3a | 2012-05-07 15:44:44 -0400 | [diff] [blame] | 1708 | wt_shortstatus_status(it, s); |
Michael J Gruber | 84dbe7b | 2009-12-05 16:04:37 +0100 | [diff] [blame] | 1709 | } |
| 1710 | for (i = 0; i < s->untracked.nr; i++) { |
| 1711 | struct string_list_item *it; |
| 1712 | |
| 1713 | it = &(s->untracked.items[i]); |
Jeff King | 3207a3a | 2012-05-07 15:44:44 -0400 | [diff] [blame] | 1714 | wt_shortstatus_other(it, s, "??"); |
Junio C Hamano | 2381e39 | 2010-04-10 00:33:17 -0700 | [diff] [blame] | 1715 | } |
| 1716 | for (i = 0; i < s->ignored.nr; i++) { |
| 1717 | struct string_list_item *it; |
| 1718 | |
| 1719 | it = &(s->ignored.items[i]); |
Jeff King | 3207a3a | 2012-05-07 15:44:44 -0400 | [diff] [blame] | 1720 | wt_shortstatus_other(it, s, "!!"); |
Michael J Gruber | 84dbe7b | 2009-12-05 16:04:37 +0100 | [diff] [blame] | 1721 | } |
| 1722 | } |
Jeff King | 4a7cc2f | 2009-12-07 00:17:15 -0500 | [diff] [blame] | 1723 | |
Jeff King | 3207a3a | 2012-05-07 15:44:44 -0400 | [diff] [blame] | 1724 | void wt_porcelain_print(struct wt_status *s) |
Jeff King | 4a7cc2f | 2009-12-07 00:17:15 -0500 | [diff] [blame] | 1725 | { |
| 1726 | s->use_color = 0; |
Jeff King | 8661768 | 2009-12-07 00:26:25 -0500 | [diff] [blame] | 1727 | s->relative_paths = 0; |
| 1728 | s->prefix = NULL; |
Matthieu Moy | 7a76c28 | 2014-03-20 13:12:41 +0100 | [diff] [blame] | 1729 | s->no_gettext = 1; |
Jeff King | d4a6bf1 | 2012-05-07 17:09:04 -0400 | [diff] [blame] | 1730 | wt_shortstatus_print(s); |
Jeff King | 4a7cc2f | 2009-12-07 00:17:15 -0500 | [diff] [blame] | 1731 | } |