blob: 4f27bd62af992122d83df911c42b585342ac1066 [file] [log] [blame]
Junio C Hamano85023572006-12-19 14:34:12 -08001#include "cache.h"
Jeff Kingc91f0d92006-09-08 04:05:34 -04002#include "wt-status.h"
Jeff Kingc91f0d92006-09-08 04:05:34 -04003#include "object.h"
4#include "dir.h"
5#include "commit.h"
6#include "diff.h"
7#include "revision.h"
8#include "diffcore.h"
Dmitry Potapova734d0b2008-03-07 05:30:58 +03009#include "quote.h"
Ping Yinac8d5af2008-04-12 23:05:32 +080010#include "run-command.h"
Matthieu Moybb7e32e2013-09-06 19:43:05 +020011#include "argv-array.h"
Junio C Hamanob6975ab2008-07-02 00:52:16 -070012#include "remote.h"
Daniel Knittl-Frank05a59a02010-05-25 15:45:51 +020013#include "refs.h"
Jens Lehmann46a958b2010-06-25 16:56:47 +020014#include "submodule.h"
Nguyễn Thái Ngọc Duy323d0532012-04-13 17:54:39 +070015#include "column.h"
Lucien Kong2d1cceb2012-06-10 13:17:38 +020016#include "strbuf.h"
Nguyễn Thái Ngọc Duy3651e452013-11-05 09:07:29 +070017#include "utf8.h"
Nguyễn Thái Ngọc Duy81eff272016-04-22 20:01:31 +070018#include "worktree.h"
Jeff Kingc91f0d92006-09-08 04:05:34 -040019
Nguyễn Thái Ngọc Duy983dc692014-02-17 19:15:30 +070020static const char cut_line[] =
Jens Lehmann1a72cfd2013-12-05 20:44:14 +010021"------------------------ >8 ------------------------\n";
22
Junio C Hamano23900a92009-08-09 23:08:40 -070023static char default_wt_status_colors[][COLOR_MAXLEN] = {
Arjen Laarhovendc6ebd42009-02-13 22:53:40 +010024 GIT_COLOR_NORMAL, /* WT_STATUS_HEADER */
25 GIT_COLOR_GREEN, /* WT_STATUS_UPDATED */
26 GIT_COLOR_RED, /* WT_STATUS_CHANGED */
27 GIT_COLOR_RED, /* WT_STATUS_UNTRACKED */
28 GIT_COLOR_RED, /* WT_STATUS_NOBRANCH */
Junio C Hamano4d4d5722009-08-05 00:04:51 -070029 GIT_COLOR_RED, /* WT_STATUS_UNMERGED */
Daniel Knittl-Frank05a59a02010-05-25 15:45:51 +020030 GIT_COLOR_GREEN, /* WT_STATUS_LOCAL_BRANCH */
31 GIT_COLOR_RED, /* WT_STATUS_REMOTE_BRANCH */
Jeff King148135f2010-12-09 12:27:08 -050032 GIT_COLOR_NIL, /* WT_STATUS_ONBRANCH */
Jeff Kingc91f0d92006-09-08 04:05:34 -040033};
Junio C Hamano4d229652007-01-11 15:34:41 -080034
Junio C Hamanod249b092009-08-09 21:59:30 -070035static const char *color(int slot, struct wt_status *s)
Jeff Kingc91f0d92006-09-08 04:05:34 -040036{
Jeff Kingdaa0c3d2011-08-17 22:04:23 -070037 const char *c = "";
38 if (want_color(s->use_color))
39 c = s->color_palette[slot];
Jeff King148135f2010-12-09 12:27:08 -050040 if (slot == WT_STATUS_ONBRANCH && color_is_nil(c))
41 c = s->color_palette[WT_STATUS_HEADER];
42 return c;
Jeff Kingc91f0d92006-09-08 04:05:34 -040043}
44
Jonathan Niederbecbdae2011-02-25 23:09:41 -060045static void status_vprintf(struct wt_status *s, int at_bol, const char *color,
46 const char *fmt, va_list ap, const char *trail)
47{
48 struct strbuf sb = STRBUF_INIT;
49 struct strbuf linebuf = STRBUF_INIT;
50 const char *line, *eol;
51
52 strbuf_vaddf(&sb, fmt, ap);
53 if (!sb.len) {
Matthieu Moy2556b992013-09-06 19:43:07 +020054 if (s->display_comment_prefix) {
55 strbuf_addch(&sb, comment_line_char);
56 if (!trail)
57 strbuf_addch(&sb, ' ');
58 }
Jonathan Niederbecbdae2011-02-25 23:09:41 -060059 color_print_strbuf(s->fp, color, &sb);
60 if (trail)
61 fprintf(s->fp, "%s", trail);
62 strbuf_release(&sb);
63 return;
64 }
65 for (line = sb.buf; *line; line = eol + 1) {
66 eol = strchr(line, '\n');
67
68 strbuf_reset(&linebuf);
Matthieu Moy2556b992013-09-06 19:43:07 +020069 if (at_bol && s->display_comment_prefix) {
Junio C Hamanoeff80a92013-01-16 20:18:48 +010070 strbuf_addch(&linebuf, comment_line_char);
Jonathan Niederbecbdae2011-02-25 23:09:41 -060071 if (*line != '\n' && *line != '\t')
72 strbuf_addch(&linebuf, ' ');
73 }
74 if (eol)
75 strbuf_add(&linebuf, line, eol - line);
76 else
77 strbuf_addstr(&linebuf, line);
78 color_print_strbuf(s->fp, color, &linebuf);
79 if (eol)
80 fprintf(s->fp, "\n");
81 else
82 break;
83 at_bol = 1;
84 }
85 if (trail)
86 fprintf(s->fp, "%s", trail);
87 strbuf_release(&linebuf);
88 strbuf_release(&sb);
89}
90
91void status_printf_ln(struct wt_status *s, const char *color,
92 const char *fmt, ...)
93{
94 va_list ap;
95
96 va_start(ap, fmt);
97 status_vprintf(s, 1, color, fmt, ap, "\n");
98 va_end(ap);
99}
100
101void status_printf(struct wt_status *s, const char *color,
102 const char *fmt, ...)
103{
104 va_list ap;
105
106 va_start(ap, fmt);
107 status_vprintf(s, 1, color, fmt, ap, NULL);
108 va_end(ap);
109}
110
Junio C Hamano1e248452012-09-15 22:46:26 -0700111static void status_printf_more(struct wt_status *s, const char *color,
112 const char *fmt, ...)
Jonathan Niederbecbdae2011-02-25 23:09:41 -0600113{
114 va_list ap;
115
116 va_start(ap, fmt);
117 status_vprintf(s, 0, color, fmt, ap, NULL);
118 va_end(ap);
119}
120
Jeff Kingc91f0d92006-09-08 04:05:34 -0400121void wt_status_prepare(struct wt_status *s)
122{
123 unsigned char sha1[20];
Jeff Kingc91f0d92006-09-08 04:05:34 -0400124
Junio C Hamanocc46a742007-02-09 16:22:42 -0800125 memset(s, 0, sizeof(*s));
Junio C Hamano23900a92009-08-09 23:08:40 -0700126 memcpy(s->color_palette, default_wt_status_colors,
127 sizeof(default_wt_status_colors));
Junio C Hamanod249b092009-08-09 21:59:30 -0700128 s->show_untracked_files = SHOW_NORMAL_UNTRACKED_FILES;
129 s->use_color = -1;
130 s->relative_paths = 1;
Ronnie Sahlberg7695d112014-07-15 12:59:36 -0700131 s->branch = resolve_refdup("HEAD", 0, sha1, NULL);
Jeff Kingc91f0d92006-09-08 04:05:34 -0400132 s->reference = "HEAD";
Kristian Høgsbergf26a0012007-09-17 20:06:42 -0400133 s->fp = stdout;
Kristian Høgsberg0f729f22007-09-17 20:06:43 -0400134 s->index_file = get_index_file();
Junio C Hamano50b7e702009-08-04 23:49:33 -0700135 s->change.strdup_strings = 1;
Junio C Hamano76378682009-08-10 00:36:33 -0700136 s->untracked.strdup_strings = 1;
Junio C Hamano6cb3f6b2010-04-10 00:11:53 -0700137 s->ignored.strdup_strings = 1;
Junio C Hamano84b42022013-06-24 11:41:40 -0700138 s->show_branch = -1; /* unspecified */
Matthieu Moy2556b992013-09-06 19:43:07 +0200139 s->display_comment_prefix = 0;
Jeff Kingc91f0d92006-09-08 04:05:34 -0400140}
141
Junio C Hamano4d4d5722009-08-05 00:04:51 -0700142static void wt_status_print_unmerged_header(struct wt_status *s)
143{
Lucien Kong96b0ec12012-06-05 22:21:26 +0200144 int i;
145 int del_mod_conflict = 0;
146 int both_deleted = 0;
147 int not_deleted = 0;
Junio C Hamanod249b092009-08-09 21:59:30 -0700148 const char *c = color(WT_STATUS_HEADER, s);
Junio C Hamano3c588452009-12-11 23:53:41 -0800149
Ævar Arnfjörð Bjarmason355ec7a2011-02-22 23:42:13 +0000150 status_printf_ln(s, c, _("Unmerged paths:"));
Lucien Kong96b0ec12012-06-05 22:21:26 +0200151
152 for (i = 0; i < s->change.nr; i++) {
153 struct string_list_item *it = &(s->change.items[i]);
154 struct wt_status_change_data *d = it->util;
155
156 switch (d->stagemask) {
157 case 0:
158 break;
159 case 1:
160 both_deleted = 1;
161 break;
162 case 3:
163 case 5:
164 del_mod_conflict = 1;
165 break;
166 default:
167 not_deleted = 1;
168 break;
169 }
170 }
171
Matthieu Moy6a964f52013-09-12 12:50:05 +0200172 if (!s->hints)
Jeff Kingedf563f2009-09-09 07:43:03 -0400173 return;
Jay Soffian37f7a852011-02-19 23:12:29 -0500174 if (s->whence != FROM_COMMIT)
Junio C Hamano3c588452009-12-11 23:53:41 -0800175 ;
176 else if (!s->is_initial)
Ævar Arnfjörð Bjarmason355ec7a2011-02-22 23:42:13 +0000177 status_printf_ln(s, c, _(" (use \"git reset %s <file>...\" to unstage)"), s->reference);
Junio C Hamano4d4d5722009-08-05 00:04:51 -0700178 else
Ævar Arnfjörð Bjarmason355ec7a2011-02-22 23:42:13 +0000179 status_printf_ln(s, c, _(" (use \"git rm --cached <file>...\" to unstage)"));
Lucien Kong96b0ec12012-06-05 22:21:26 +0200180
181 if (!both_deleted) {
182 if (!del_mod_conflict)
183 status_printf_ln(s, c, _(" (use \"git add <file>...\" to mark resolution)"));
184 else
185 status_printf_ln(s, c, _(" (use \"git add/rm <file>...\" as appropriate to mark resolution)"));
186 } else if (!del_mod_conflict && !not_deleted) {
187 status_printf_ln(s, c, _(" (use \"git rm <file>...\" to mark resolution)"));
188 } else {
189 status_printf_ln(s, c, _(" (use \"git add/rm <file>...\" as appropriate to mark resolution)"));
190 }
Felipe Contreras7d7d6802014-05-04 01:12:55 -0500191 status_printf_ln(s, c, "%s", "");
Junio C Hamano4d4d5722009-08-05 00:04:51 -0700192}
193
Kristian Høgsbergf26a0012007-09-17 20:06:42 -0400194static void wt_status_print_cached_header(struct wt_status *s)
Jürgen Rühle3c1eb9c2007-01-02 20:26:21 +0100195{
Junio C Hamanod249b092009-08-09 21:59:30 -0700196 const char *c = color(WT_STATUS_HEADER, s);
Junio C Hamano3c588452009-12-11 23:53:41 -0800197
Ævar Arnfjörð Bjarmason919a4ce2011-02-22 23:42:16 +0000198 status_printf_ln(s, c, _("Changes to be committed:"));
Matthieu Moy6a964f52013-09-12 12:50:05 +0200199 if (!s->hints)
Jeff Kingedf563f2009-09-09 07:43:03 -0400200 return;
Jay Soffian37f7a852011-02-19 23:12:29 -0500201 if (s->whence != FROM_COMMIT)
Junio C Hamano3c588452009-12-11 23:53:41 -0800202 ; /* NEEDSWORK: use "git reset --unresolve"??? */
203 else if (!s->is_initial)
Ævar Arnfjörð Bjarmason355ec7a2011-02-22 23:42:13 +0000204 status_printf_ln(s, c, _(" (use \"git reset %s <file>...\" to unstage)"), s->reference);
Junio C Hamano3c588452009-12-11 23:53:41 -0800205 else
Ævar Arnfjörð Bjarmason355ec7a2011-02-22 23:42:13 +0000206 status_printf_ln(s, c, _(" (use \"git rm --cached <file>...\" to unstage)"));
Felipe Contreras7d7d6802014-05-04 01:12:55 -0500207 status_printf_ln(s, c, "%s", "");
Jürgen Rühle3c1eb9c2007-01-02 20:26:21 +0100208}
209
Anders Melchiorsenbb914b12008-09-08 00:05:02 +0200210static void wt_status_print_dirty_header(struct wt_status *s,
Jens Lehmann9297f77e62010-03-08 13:53:19 +0100211 int has_deleted,
212 int has_dirty_submodules)
Jeff Kingc91f0d92006-09-08 04:05:34 -0400213{
Junio C Hamanod249b092009-08-09 21:59:30 -0700214 const char *c = color(WT_STATUS_HEADER, s);
Junio C Hamano3c588452009-12-11 23:53:41 -0800215
Ævar Arnfjörð Bjarmason355ec7a2011-02-22 23:42:13 +0000216 status_printf_ln(s, c, _("Changes not staged for commit:"));
Matthieu Moy6a964f52013-09-12 12:50:05 +0200217 if (!s->hints)
Jeff Kingedf563f2009-09-09 07:43:03 -0400218 return;
Anders Melchiorsenbb914b12008-09-08 00:05:02 +0200219 if (!has_deleted)
Ævar Arnfjörð Bjarmason355ec7a2011-02-22 23:42:13 +0000220 status_printf_ln(s, c, _(" (use \"git add <file>...\" to update what will be committed)"));
Anders Melchiorsenbb914b12008-09-08 00:05:02 +0200221 else
Ævar Arnfjörð Bjarmason355ec7a2011-02-22 23:42:13 +0000222 status_printf_ln(s, c, _(" (use \"git add/rm <file>...\" to update what will be committed)"));
223 status_printf_ln(s, c, _(" (use \"git checkout -- <file>...\" to discard changes in working directory)"));
Jens Lehmann9297f77e62010-03-08 13:53:19 +0100224 if (has_dirty_submodules)
Ævar Arnfjörð Bjarmason355ec7a2011-02-22 23:42:13 +0000225 status_printf_ln(s, c, _(" (commit or discard the untracked or modified content in submodules)"));
Felipe Contreras7d7d6802014-05-04 01:12:55 -0500226 status_printf_ln(s, c, "%s", "");
Anders Melchiorsenbb914b12008-09-08 00:05:02 +0200227}
228
Junio C Hamano1b908b62010-04-10 00:19:46 -0700229static void wt_status_print_other_header(struct wt_status *s,
230 const char *what,
231 const char *how)
Anders Melchiorsenbb914b12008-09-08 00:05:02 +0200232{
Junio C Hamanod249b092009-08-09 21:59:30 -0700233 const char *c = color(WT_STATUS_HEADER, s);
Nguyễn Thái Ngọc Duy50bd8b72012-09-06 22:16:50 +0700234 status_printf_ln(s, c, "%s:", what);
Matthieu Moy6a964f52013-09-12 12:50:05 +0200235 if (!s->hints)
Jeff Kingedf563f2009-09-09 07:43:03 -0400236 return;
Ævar Arnfjörð Bjarmason355ec7a2011-02-22 23:42:13 +0000237 status_printf_ln(s, c, _(" (use \"git %s <file>...\" to include in what will be committed)"), how);
Felipe Contreras7d7d6802014-05-04 01:12:55 -0500238 status_printf_ln(s, c, "%s", "");
Jeff Kingc91f0d92006-09-08 04:05:34 -0400239}
240
Kristian Høgsbergf26a0012007-09-17 20:06:42 -0400241static void wt_status_print_trailer(struct wt_status *s)
Jeff Kingc91f0d92006-09-08 04:05:34 -0400242{
Felipe Contreras7d7d6802014-05-04 01:12:55 -0500243 status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", "");
Jeff Kingc91f0d92006-09-08 04:05:34 -0400244}
245
Dmitry Potapova734d0b2008-03-07 05:30:58 +0300246#define quote_path quote_path_relative
Junio C Hamano3a946802006-11-08 13:20:46 -0800247
Jonathan Nieder8f17f5b2013-12-19 11:43:19 -0800248static const char *wt_status_unmerged_status_string(int stagemask)
Junio C Hamano4d4d5722009-08-05 00:04:51 -0700249{
Jonathan Nieder8f17f5b2013-12-19 11:43:19 -0800250 switch (stagemask) {
251 case 1:
252 return _("both deleted:");
253 case 2:
254 return _("added by us:");
255 case 3:
256 return _("deleted by them:");
257 case 4:
258 return _("added by them:");
259 case 5:
260 return _("deleted by us:");
261 case 6:
262 return _("both added:");
263 case 7:
264 return _("both modified:");
265 default:
266 die(_("bug: unhandled unmerged status %x"), stagemask);
Junio C Hamano4d4d5722009-08-05 00:04:51 -0700267 }
Junio C Hamano4d4d5722009-08-05 00:04:51 -0700268}
269
Nguyễn Thái Ngọc Duy3651e452013-11-05 09:07:29 +0700270static const char *wt_status_diff_status_string(int status)
271{
272 switch (status) {
273 case DIFF_STATUS_ADDED:
Junio C Hamanod52cb572014-03-12 13:51:22 -0700274 return _("new file:");
Nguyễn Thái Ngọc Duy3651e452013-11-05 09:07:29 +0700275 case DIFF_STATUS_COPIED:
Junio C Hamanod52cb572014-03-12 13:51:22 -0700276 return _("copied:");
Nguyễn Thái Ngọc Duy3651e452013-11-05 09:07:29 +0700277 case DIFF_STATUS_DELETED:
Junio C Hamanod52cb572014-03-12 13:51:22 -0700278 return _("deleted:");
Nguyễn Thái Ngọc Duy3651e452013-11-05 09:07:29 +0700279 case DIFF_STATUS_MODIFIED:
Junio C Hamanod52cb572014-03-12 13:51:22 -0700280 return _("modified:");
Nguyễn Thái Ngọc Duy3651e452013-11-05 09:07:29 +0700281 case DIFF_STATUS_RENAMED:
Junio C Hamanod52cb572014-03-12 13:51:22 -0700282 return _("renamed:");
Nguyễn Thái Ngọc Duy3651e452013-11-05 09:07:29 +0700283 case DIFF_STATUS_TYPE_CHANGED:
Junio C Hamanod52cb572014-03-12 13:51:22 -0700284 return _("typechange:");
Nguyễn Thái Ngọc Duy3651e452013-11-05 09:07:29 +0700285 case DIFF_STATUS_UNKNOWN:
Junio C Hamanod52cb572014-03-12 13:51:22 -0700286 return _("unknown:");
Nguyễn Thái Ngọc Duy3651e452013-11-05 09:07:29 +0700287 case DIFF_STATUS_UNMERGED:
Junio C Hamanod52cb572014-03-12 13:51:22 -0700288 return _("unmerged:");
Nguyễn Thái Ngọc Duy3651e452013-11-05 09:07:29 +0700289 default:
290 return NULL;
291 }
292}
293
Jonathan Nieder335e8252013-12-19 11:43:19 -0800294static int maxwidth(const char *(*label)(int), int minval, int maxval)
295{
296 int result = 0, i;
297
298 for (i = minval; i <= maxval; i++) {
299 const char *s = label(i);
300 int len = s ? utf8_strwidth(s) : 0;
301 if (len > result)
302 result = len;
303 }
304 return result;
305}
306
Jonathan Nieder8f17f5b2013-12-19 11:43:19 -0800307static void wt_status_print_unmerged_data(struct wt_status *s,
308 struct string_list_item *it)
309{
310 const char *c = color(WT_STATUS_UNMERGED, s);
311 struct wt_status_change_data *d = it->util;
312 struct strbuf onebuf = STRBUF_INIT;
313 static char *padding;
314 static int label_width;
315 const char *one, *how;
316 int len;
317
318 if (!padding) {
319 label_width = maxwidth(wt_status_unmerged_status_string, 1, 7);
320 label_width += strlen(" ");
Jonathan Nieder8f17f5b2013-12-19 11:43:19 -0800321 padding = xmallocz(label_width);
322 memset(padding, ' ', label_width);
323 }
324
325 one = quote_path(it->string, s->prefix, &onebuf);
326 status_printf(s, color(WT_STATUS_HEADER, s), "\t");
327
328 how = wt_status_unmerged_status_string(d->stagemask);
329 len = label_width - utf8_strwidth(how);
330 status_printf_more(s, c, "%s%.*s%s\n", how, len, padding, one);
331 strbuf_release(&onebuf);
332}
333
Junio C Hamano50b7e702009-08-04 23:49:33 -0700334static void wt_status_print_change_data(struct wt_status *s,
335 int change_type,
336 struct string_list_item *it)
Jeff Kingc91f0d92006-09-08 04:05:34 -0400337{
Junio C Hamano50b7e702009-08-04 23:49:33 -0700338 struct wt_status_change_data *d = it->util;
Junio C Hamanod249b092009-08-09 21:59:30 -0700339 const char *c = color(change_type, s);
Jeff Kingb8527d52013-03-21 07:05:28 -0400340 int status;
Junio C Hamano50b7e702009-08-04 23:49:33 -0700341 char *one_name;
342 char *two_name;
Junio C Hamano3a946802006-11-08 13:20:46 -0800343 const char *one, *two;
Brandon Caseyf285a2d2008-10-09 14:12:12 -0500344 struct strbuf onebuf = STRBUF_INIT, twobuf = STRBUF_INIT;
Jens Lehmann9297f77e62010-03-08 13:53:19 +0100345 struct strbuf extra = STRBUF_INIT;
Nguyễn Thái Ngọc Duy3651e452013-11-05 09:07:29 +0700346 static char *padding;
Junio C Hamanod52cb572014-03-12 13:51:22 -0700347 static int label_width;
Nguyễn Thái Ngọc Duy3651e452013-11-05 09:07:29 +0700348 const char *what;
349 int len;
350
351 if (!padding) {
Jonathan Nieder335e8252013-12-19 11:43:19 -0800352 /* If DIFF_STATUS_* uses outside the range [A..Z], we're in trouble */
353 label_width = maxwidth(wt_status_diff_status_string, 'A', 'Z');
Junio C Hamanod52cb572014-03-12 13:51:22 -0700354 label_width += strlen(" ");
355 padding = xmallocz(label_width);
356 memset(padding, ' ', label_width);
Nguyễn Thái Ngọc Duy3651e452013-11-05 09:07:29 +0700357 }
Junio C Hamano3a946802006-11-08 13:20:46 -0800358
Junio C Hamano50b7e702009-08-04 23:49:33 -0700359 one_name = two_name = it->string;
360 switch (change_type) {
361 case WT_STATUS_UPDATED:
362 status = d->index_status;
363 if (d->head_path)
364 one_name = d->head_path;
365 break;
366 case WT_STATUS_CHANGED:
Jens Lehmann9297f77e62010-03-08 13:53:19 +0100367 if (d->new_submodule_commits || d->dirty_submodule) {
368 strbuf_addstr(&extra, " (");
369 if (d->new_submodule_commits)
Ævar Arnfjörð Bjarmason355ec7a2011-02-22 23:42:13 +0000370 strbuf_addf(&extra, _("new commits, "));
Jens Lehmann9297f77e62010-03-08 13:53:19 +0100371 if (d->dirty_submodule & DIRTY_SUBMODULE_MODIFIED)
Ævar Arnfjörð Bjarmason355ec7a2011-02-22 23:42:13 +0000372 strbuf_addf(&extra, _("modified content, "));
Jens Lehmann9297f77e62010-03-08 13:53:19 +0100373 if (d->dirty_submodule & DIRTY_SUBMODULE_UNTRACKED)
Ævar Arnfjörð Bjarmason355ec7a2011-02-22 23:42:13 +0000374 strbuf_addf(&extra, _("untracked content, "));
Jens Lehmann9297f77e62010-03-08 13:53:19 +0100375 strbuf_setlen(&extra, extra.len - 2);
376 strbuf_addch(&extra, ')');
377 }
Junio C Hamano50b7e702009-08-04 23:49:33 -0700378 status = d->worktree_status;
379 break;
Jeff Kingb8527d52013-03-21 07:05:28 -0400380 default:
381 die("BUG: unhandled change_type %d in wt_status_print_change_data",
382 change_type);
Junio C Hamano50b7e702009-08-04 23:49:33 -0700383 }
384
Jiang Xin39598f92013-06-25 23:53:45 +0800385 one = quote_path(one_name, s->prefix, &onebuf);
386 two = quote_path(two_name, s->prefix, &twobuf);
Junio C Hamano3a946802006-11-08 13:20:46 -0800387
Jonathan Niederb926c0d2011-02-25 23:11:37 -0600388 status_printf(s, color(WT_STATUS_HEADER, s), "\t");
Nguyễn Thái Ngọc Duy3651e452013-11-05 09:07:29 +0700389 what = wt_status_diff_status_string(status);
390 if (!what)
Ævar Arnfjörð Bjarmason355ec7a2011-02-22 23:42:13 +0000391 die(_("bug: unhandled diff status %c"), status);
Junio C Hamanod52cb572014-03-12 13:51:22 -0700392 len = label_width - utf8_strwidth(what);
Nguyễn Thái Ngọc Duy3651e452013-11-05 09:07:29 +0700393 assert(len >= 0);
394 if (status == DIFF_STATUS_COPIED || status == DIFF_STATUS_RENAMED)
Junio C Hamanod52cb572014-03-12 13:51:22 -0700395 status_printf_more(s, c, "%s%.*s%s -> %s",
Nguyễn Thái Ngọc Duy3651e452013-11-05 09:07:29 +0700396 what, len, padding, one, two);
397 else
Junio C Hamanod52cb572014-03-12 13:51:22 -0700398 status_printf_more(s, c, "%s%.*s%s",
Nguyễn Thái Ngọc Duy3651e452013-11-05 09:07:29 +0700399 what, len, padding, one);
Jens Lehmann9297f77e62010-03-08 13:53:19 +0100400 if (extra.len) {
Jonathan Niederb926c0d2011-02-25 23:11:37 -0600401 status_printf_more(s, color(WT_STATUS_HEADER, s), "%s", extra.buf);
Jens Lehmann9297f77e62010-03-08 13:53:19 +0100402 strbuf_release(&extra);
403 }
Jonathan Niederb926c0d2011-02-25 23:11:37 -0600404 status_printf_more(s, GIT_COLOR_NORMAL, "\n");
Johannes Schindelin367c9882007-11-11 17:35:41 +0000405 strbuf_release(&onebuf);
406 strbuf_release(&twobuf);
Jeff Kingc91f0d92006-09-08 04:05:34 -0400407}
408
Junio C Hamano50b7e702009-08-04 23:49:33 -0700409static void wt_status_collect_changed_cb(struct diff_queue_struct *q,
410 struct diff_options *options,
411 void *data)
Jeff Kingc91f0d92006-09-08 04:05:34 -0400412{
413 struct wt_status *s = data;
Jeff Kingc91f0d92006-09-08 04:05:34 -0400414 int i;
Junio C Hamano50b7e702009-08-04 23:49:33 -0700415
416 if (!q->nr)
417 return;
418 s->workdir_dirty = 1;
Jeff Kingc91f0d92006-09-08 04:05:34 -0400419 for (i = 0; i < q->nr; i++) {
Junio C Hamano50b7e702009-08-04 23:49:33 -0700420 struct diff_filepair *p;
421 struct string_list_item *it;
422 struct wt_status_change_data *d;
423
424 p = q->queue[i];
Julian Phillips78a395d2010-06-26 00:41:35 +0100425 it = string_list_insert(&s->change, p->one->path);
Junio C Hamano50b7e702009-08-04 23:49:33 -0700426 d = it->util;
427 if (!d) {
428 d = xcalloc(1, sizeof(*d));
429 it->util = d;
Jeff Kingc91f0d92006-09-08 04:05:34 -0400430 }
Junio C Hamano50b7e702009-08-04 23:49:33 -0700431 if (!d->worktree_status)
432 d->worktree_status = p->status;
Jens Lehmann9297f77e62010-03-08 13:53:19 +0100433 d->dirty_submodule = p->two->dirty_submodule;
434 if (S_ISGITLINK(p->two->mode))
435 d->new_submodule_commits = !!hashcmp(p->one->sha1, p->two->sha1);
Jeff Kingc91f0d92006-09-08 04:05:34 -0400436 }
Jeff Kingc91f0d92006-09-08 04:05:34 -0400437}
438
Junio C Hamano4d4d5722009-08-05 00:04:51 -0700439static int unmerged_mask(const char *path)
440{
441 int pos, mask;
Nguyễn Thái Ngọc Duy9c5e6c82013-07-09 22:29:00 +0700442 const struct cache_entry *ce;
Junio C Hamano4d4d5722009-08-05 00:04:51 -0700443
444 pos = cache_name_pos(path, strlen(path));
445 if (0 <= pos)
446 return 0;
447
448 mask = 0;
449 pos = -pos-1;
450 while (pos < active_nr) {
451 ce = active_cache[pos++];
452 if (strcmp(ce->name, path) || !ce_stage(ce))
453 break;
454 mask |= (1 << (ce_stage(ce) - 1));
455 }
456 return mask;
457}
458
Junio C Hamano50b7e702009-08-04 23:49:33 -0700459static void wt_status_collect_updated_cb(struct diff_queue_struct *q,
460 struct diff_options *options,
461 void *data)
Jeff Kingc91f0d92006-09-08 04:05:34 -0400462{
Jürgen Rühle6e458bf2007-01-02 20:26:22 +0100463 struct wt_status *s = data;
Jeff Kingc91f0d92006-09-08 04:05:34 -0400464 int i;
Junio C Hamano50b7e702009-08-04 23:49:33 -0700465
466 for (i = 0; i < q->nr; i++) {
467 struct diff_filepair *p;
468 struct string_list_item *it;
469 struct wt_status_change_data *d;
470
471 p = q->queue[i];
Julian Phillips78a395d2010-06-26 00:41:35 +0100472 it = string_list_insert(&s->change, p->two->path);
Junio C Hamano50b7e702009-08-04 23:49:33 -0700473 d = it->util;
474 if (!d) {
475 d = xcalloc(1, sizeof(*d));
476 it->util = d;
477 }
478 if (!d->index_status)
479 d->index_status = p->status;
480 switch (p->status) {
481 case DIFF_STATUS_COPIED:
482 case DIFF_STATUS_RENAMED:
483 d->head_path = xstrdup(p->one->path);
484 break;
Junio C Hamano4d4d5722009-08-05 00:04:51 -0700485 case DIFF_STATUS_UNMERGED:
486 d->stagemask = unmerged_mask(p->two->path);
487 break;
Junio C Hamano50b7e702009-08-04 23:49:33 -0700488 }
Jürgen Rühle6e458bf2007-01-02 20:26:22 +0100489 }
Jeff Kingc91f0d92006-09-08 04:05:34 -0400490}
491
Junio C Hamano50b7e702009-08-04 23:49:33 -0700492static void wt_status_collect_changes_worktree(struct wt_status *s)
Jeff Kingc91f0d92006-09-08 04:05:34 -0400493{
494 struct rev_info rev;
Junio C Hamano50b7e702009-08-04 23:49:33 -0700495
496 init_revisions(&rev, NULL);
497 setup_revisions(0, NULL, &rev, NULL);
498 rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
Jens Lehmann9297f77e62010-03-08 13:53:19 +0100499 DIFF_OPT_SET(&rev.diffopt, DIRTY_SUBMODULES);
Jens Lehmann3bfc4502010-03-13 23:00:27 +0100500 if (!s->show_untracked_files)
501 DIFF_OPT_SET(&rev.diffopt, IGNORE_UNTRACKED_IN_SUBMODULES);
Jens Lehmannaee9c7d2010-08-06 00:39:25 +0200502 if (s->ignore_submodule_arg) {
503 DIFF_OPT_SET(&rev.diffopt, OVERRIDE_SUBMODULE_CONFIG);
Jens Lehmann46a958b2010-06-25 16:56:47 +0200504 handle_ignore_submodules_arg(&rev.diffopt, s->ignore_submodule_arg);
Nguyễn Thái Ngọc Duyc4c42f22011-10-24 15:24:51 +1100505 }
Junio C Hamano50b7e702009-08-04 23:49:33 -0700506 rev.diffopt.format_callback = wt_status_collect_changed_cb;
507 rev.diffopt.format_callback_data = s;
Nguyễn Thái Ngọc Duy15b55ae2013-07-14 15:35:39 +0700508 copy_pathspec(&rev.prune_data, &s->pathspec);
Junio C Hamano50b7e702009-08-04 23:49:33 -0700509 run_diff_files(&rev, 0);
510}
511
512static void wt_status_collect_changes_index(struct wt_status *s)
513{
514 struct rev_info rev;
Junio C Hamano32962c92010-03-08 22:58:09 -0800515 struct setup_revision_opt opt;
Junio C Hamano50b7e702009-08-04 23:49:33 -0700516
Jeff Kingc91f0d92006-09-08 04:05:34 -0400517 init_revisions(&rev, NULL);
Junio C Hamano32962c92010-03-08 22:58:09 -0800518 memset(&opt, 0, sizeof(opt));
519 opt.def = s->is_initial ? EMPTY_TREE_SHA1_HEX : s->reference;
520 setup_revisions(0, NULL, &rev, &opt);
521
Jens Lehmann1d2f3932014-04-05 18:59:03 +0200522 DIFF_OPT_SET(&rev.diffopt, OVERRIDE_SUBMODULE_CONFIG);
Jens Lehmannaee9c7d2010-08-06 00:39:25 +0200523 if (s->ignore_submodule_arg) {
Jens Lehmann46a958b2010-06-25 16:56:47 +0200524 handle_ignore_submodules_arg(&rev.diffopt, s->ignore_submodule_arg);
Jens Lehmann1d2f3932014-04-05 18:59:03 +0200525 } else {
526 /*
527 * Unless the user did explicitly request a submodule ignore
528 * mode by passing a command line option we do not ignore any
529 * changed submodule SHA-1s when comparing index and HEAD, no
530 * matter what is configured. Otherwise the user won't be
531 * shown any submodules she manually added (and which are
532 * staged to be committed), which would be really confusing.
533 */
534 handle_ignore_submodules_arg(&rev.diffopt, "dirty");
Jens Lehmannaee9c7d2010-08-06 00:39:25 +0200535 }
Jens Lehmann46a958b2010-06-25 16:56:47 +0200536
Jeff Kingc91f0d92006-09-08 04:05:34 -0400537 rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
Junio C Hamano50b7e702009-08-04 23:49:33 -0700538 rev.diffopt.format_callback = wt_status_collect_updated_cb;
Jeff Kingc91f0d92006-09-08 04:05:34 -0400539 rev.diffopt.format_callback_data = s;
540 rev.diffopt.detect_rename = 1;
Jeff King50705912008-04-30 13:24:43 -0400541 rev.diffopt.rename_limit = 200;
Jeff Kingf714fb82007-12-02 22:58:37 -0800542 rev.diffopt.break_opt = 0;
Nguyễn Thái Ngọc Duy15b55ae2013-07-14 15:35:39 +0700543 copy_pathspec(&rev.prune_data, &s->pathspec);
Jeff Kingc91f0d92006-09-08 04:05:34 -0400544 run_diff_index(&rev, 1);
545}
546
Junio C Hamano50b7e702009-08-04 23:49:33 -0700547static void wt_status_collect_changes_initial(struct wt_status *s)
548{
549 int i;
550
551 for (i = 0; i < active_nr; i++) {
552 struct string_list_item *it;
553 struct wt_status_change_data *d;
Nguyễn Thái Ngọc Duy9c5e6c82013-07-09 22:29:00 +0700554 const struct cache_entry *ce = active_cache[i];
Junio C Hamano50b7e702009-08-04 23:49:33 -0700555
Nguyễn Thái Ngọc Duy429bb402014-01-24 20:40:28 +0700556 if (!ce_path_match(ce, &s->pathspec, NULL))
Junio C Hamano76e2f7c2009-08-07 23:31:57 -0700557 continue;
Julian Phillips78a395d2010-06-26 00:41:35 +0100558 it = string_list_insert(&s->change, ce->name);
Junio C Hamano50b7e702009-08-04 23:49:33 -0700559 d = it->util;
560 if (!d) {
561 d = xcalloc(1, sizeof(*d));
562 it->util = d;
563 }
Junio C Hamano4d4d5722009-08-05 00:04:51 -0700564 if (ce_stage(ce)) {
Junio C Hamano50b7e702009-08-04 23:49:33 -0700565 d->index_status = DIFF_STATUS_UNMERGED;
Junio C Hamano4d4d5722009-08-05 00:04:51 -0700566 d->stagemask |= (1 << (ce_stage(ce) - 1));
567 }
Junio C Hamano50b7e702009-08-04 23:49:33 -0700568 else
569 d->index_status = DIFF_STATUS_ADDED;
570 }
571}
572
Junio C Hamano76378682009-08-10 00:36:33 -0700573static void wt_status_collect_untracked(struct wt_status *s)
574{
575 int i;
576 struct dir_struct dir;
Karsten Blees132d41e2014-07-12 02:07:36 +0200577 uint64_t t_begin = getnanotime();
Junio C Hamano76378682009-08-10 00:36:33 -0700578
579 if (!s->show_untracked_files)
580 return;
Nguyễn Thái Ngọc Duy6a38ef22013-03-13 19:59:16 +0700581
Junio C Hamano76378682009-08-10 00:36:33 -0700582 memset(&dir, 0, sizeof(dir));
583 if (s->show_untracked_files != SHOW_ALL_UNTRACKED_FILES)
584 dir.flags |=
585 DIR_SHOW_OTHER_DIRECTORIES | DIR_HIDE_EMPTY_DIRECTORIES;
Karsten Blees0aaf62b2013-04-15 21:15:03 +0200586 if (s->show_ignored_files)
587 dir.flags |= DIR_SHOW_IGNORED_TOO;
Nguyễn Thái Ngọc Duy226c0512015-03-08 17:12:41 +0700588 else
589 dir.untracked = the_index.untracked;
Junio C Hamano76378682009-08-10 00:36:33 -0700590 setup_standard_excludes(&dir);
591
Nguyễn Thái Ngọc Duy7327d3d2013-07-14 15:35:55 +0700592 fill_directory(&dir, &s->pathspec);
Karsten Blees0aaf62b2013-04-15 21:15:03 +0200593
Brian Gianforcaroeeefa7c2009-09-01 01:35:10 -0400594 for (i = 0; i < dir.nr; i++) {
Junio C Hamano76378682009-08-10 00:36:33 -0700595 struct dir_entry *ent = dir.entries[i];
Brandon Caseyb8224232010-09-26 21:49:13 -0500596 if (cache_name_is_other(ent->name, ent->len) &&
Nguyễn Thái Ngọc Duyebb32892014-01-24 20:40:29 +0700597 dir_path_match(ent, &s->pathspec, 0, NULL))
Brandon Caseyb8224232010-09-26 21:49:13 -0500598 string_list_insert(&s->untracked, ent->name);
Junio C Hamanof5b26b12010-04-09 23:58:27 -0700599 free(ent);
Junio C Hamano76378682009-08-10 00:36:33 -0700600 }
Junio C Hamanof5b26b12010-04-09 23:58:27 -0700601
Karsten Blees0aaf62b2013-04-15 21:15:03 +0200602 for (i = 0; i < dir.ignored_nr; i++) {
603 struct dir_entry *ent = dir.ignored[i];
604 if (cache_name_is_other(ent->name, ent->len) &&
Nguyễn Thái Ngọc Duyebb32892014-01-24 20:40:29 +0700605 dir_path_match(ent, &s->pathspec, 0, NULL))
Karsten Blees0aaf62b2013-04-15 21:15:03 +0200606 string_list_insert(&s->ignored, ent->name);
607 free(ent);
Junio C Hamano6cb3f6b2010-04-10 00:11:53 -0700608 }
609
Junio C Hamanof5b26b12010-04-09 23:58:27 -0700610 free(dir.entries);
Karsten Blees0aaf62b2013-04-15 21:15:03 +0200611 free(dir.ignored);
612 clear_directory(&dir);
Nguyễn Thái Ngọc Duy6a38ef22013-03-13 19:59:16 +0700613
Karsten Blees132d41e2014-07-12 02:07:36 +0200614 if (advice_status_u_option)
615 s->untracked_in_ms = (getnanotime() - t_begin) / 1000000;
Junio C Hamano76378682009-08-10 00:36:33 -0700616}
617
618void wt_status_collect(struct wt_status *s)
Junio C Hamano50b7e702009-08-04 23:49:33 -0700619{
620 wt_status_collect_changes_worktree(s);
621
622 if (s->is_initial)
623 wt_status_collect_changes_initial(s);
624 else
625 wt_status_collect_changes_index(s);
Junio C Hamano76378682009-08-10 00:36:33 -0700626 wt_status_collect_untracked(s);
Junio C Hamano50b7e702009-08-04 23:49:33 -0700627}
628
Junio C Hamano4d4d5722009-08-05 00:04:51 -0700629static void wt_status_print_unmerged(struct wt_status *s)
630{
631 int shown_header = 0;
632 int i;
633
634 for (i = 0; i < s->change.nr; i++) {
635 struct wt_status_change_data *d;
636 struct string_list_item *it;
637 it = &(s->change.items[i]);
638 d = it->util;
639 if (!d->stagemask)
640 continue;
641 if (!shown_header) {
642 wt_status_print_unmerged_header(s);
643 shown_header = 1;
644 }
645 wt_status_print_unmerged_data(s, it);
646 }
647 if (shown_header)
648 wt_status_print_trailer(s);
649
650}
651
Junio C Hamano50b7e702009-08-04 23:49:33 -0700652static void wt_status_print_updated(struct wt_status *s)
653{
654 int shown_header = 0;
655 int i;
656
657 for (i = 0; i < s->change.nr; i++) {
658 struct wt_status_change_data *d;
659 struct string_list_item *it;
660 it = &(s->change.items[i]);
661 d = it->util;
662 if (!d->index_status ||
663 d->index_status == DIFF_STATUS_UNMERGED)
664 continue;
665 if (!shown_header) {
666 wt_status_print_cached_header(s);
667 s->commitable = 1;
668 shown_header = 1;
669 }
670 wt_status_print_change_data(s, WT_STATUS_UPDATED, it);
671 }
672 if (shown_header)
673 wt_status_print_trailer(s);
674}
675
676/*
677 * -1 : has delete
678 * 0 : no change
679 * 1 : some change but no delete
680 */
Jens Lehmann9297f77e62010-03-08 13:53:19 +0100681static int wt_status_check_worktree_changes(struct wt_status *s,
682 int *dirty_submodules)
Junio C Hamano50b7e702009-08-04 23:49:33 -0700683{
684 int i;
685 int changes = 0;
686
Jens Lehmann9297f77e62010-03-08 13:53:19 +0100687 *dirty_submodules = 0;
688
Junio C Hamano50b7e702009-08-04 23:49:33 -0700689 for (i = 0; i < s->change.nr; i++) {
690 struct wt_status_change_data *d;
691 d = s->change.items[i].util;
Junio C Hamano4d4d5722009-08-05 00:04:51 -0700692 if (!d->worktree_status ||
693 d->worktree_status == DIFF_STATUS_UNMERGED)
Junio C Hamano50b7e702009-08-04 23:49:33 -0700694 continue;
Jens Lehmann9297f77e62010-03-08 13:53:19 +0100695 if (!changes)
696 changes = 1;
697 if (d->dirty_submodule)
698 *dirty_submodules = 1;
Junio C Hamano50b7e702009-08-04 23:49:33 -0700699 if (d->worktree_status == DIFF_STATUS_DELETED)
Jens Lehmann9297f77e62010-03-08 13:53:19 +0100700 changes = -1;
Junio C Hamano50b7e702009-08-04 23:49:33 -0700701 }
702 return changes;
703}
704
Jeff Kingc91f0d92006-09-08 04:05:34 -0400705static void wt_status_print_changed(struct wt_status *s)
706{
Jens Lehmann9297f77e62010-03-08 13:53:19 +0100707 int i, dirty_submodules;
708 int worktree_changes = wt_status_check_worktree_changes(s, &dirty_submodules);
Junio C Hamano50b7e702009-08-04 23:49:33 -0700709
710 if (!worktree_changes)
711 return;
712
Jens Lehmann9297f77e62010-03-08 13:53:19 +0100713 wt_status_print_dirty_header(s, worktree_changes < 0, dirty_submodules);
Junio C Hamano50b7e702009-08-04 23:49:33 -0700714
715 for (i = 0; i < s->change.nr; i++) {
716 struct wt_status_change_data *d;
717 struct string_list_item *it;
718 it = &(s->change.items[i]);
719 d = it->util;
Junio C Hamano4d4d5722009-08-05 00:04:51 -0700720 if (!d->worktree_status ||
721 d->worktree_status == DIFF_STATUS_UNMERGED)
Junio C Hamano50b7e702009-08-04 23:49:33 -0700722 continue;
723 wt_status_print_change_data(s, WT_STATUS_CHANGED, it);
724 }
725 wt_status_print_trailer(s);
Jeff Kingc91f0d92006-09-08 04:05:34 -0400726}
727
Jens Lehmannf17a5d32010-01-17 20:42:31 +0100728static void wt_status_print_submodule_summary(struct wt_status *s, int uncommitted)
Ping Yinac8d5af2008-04-12 23:05:32 +0800729{
René Scharfed3180272014-08-19 21:09:35 +0200730 struct child_process sm_summary = CHILD_PROCESS_INIT;
Matthieu Moy3ba74072013-09-06 19:43:06 +0200731 struct strbuf cmd_stdout = STRBUF_INIT;
732 struct strbuf summary = STRBUF_INIT;
733 char *summary_content;
Ping Yinac8d5af2008-04-12 23:05:32 +0800734
René Scharfea9154592014-10-19 13:14:20 +0200735 argv_array_pushf(&sm_summary.env_array, "GIT_INDEX_FILE=%s",
736 s->index_file);
Ping Yinac8d5af2008-04-12 23:05:32 +0800737
René Scharfea2bae2d2014-11-09 14:49:54 +0100738 argv_array_push(&sm_summary.args, "submodule");
739 argv_array_push(&sm_summary.args, "summary");
740 argv_array_push(&sm_summary.args, uncommitted ? "--files" : "--cached");
741 argv_array_push(&sm_summary.args, "--for-status");
742 argv_array_push(&sm_summary.args, "--summary-limit");
743 argv_array_pushf(&sm_summary.args, "%d", s->submodule_summary);
Matthieu Moybb7e32e2013-09-06 19:43:05 +0200744 if (!uncommitted)
René Scharfea2bae2d2014-11-09 14:49:54 +0100745 argv_array_push(&sm_summary.args, s->amend ? "HEAD^" : "HEAD");
Matthieu Moybb7e32e2013-09-06 19:43:05 +0200746
Ping Yinac8d5af2008-04-12 23:05:32 +0800747 sm_summary.git_cmd = 1;
748 sm_summary.no_stdin = 1;
Matthieu Moy3ba74072013-09-06 19:43:06 +0200749
Jeff King5c950e92015-03-22 23:53:52 -0400750 capture_command(&sm_summary, &cmd_stdout, 1024);
Matthieu Moy3ba74072013-09-06 19:43:06 +0200751
752 /* prepend header, only if there's an actual output */
Jeff Kingd56d9662015-03-22 06:00:32 -0400753 if (cmd_stdout.len) {
Matthieu Moy3ba74072013-09-06 19:43:06 +0200754 if (uncommitted)
755 strbuf_addstr(&summary, _("Submodules changed but not updated:"));
756 else
757 strbuf_addstr(&summary, _("Submodule changes to be committed:"));
758 strbuf_addstr(&summary, "\n\n");
759 }
760 strbuf_addbuf(&summary, &cmd_stdout);
761 strbuf_release(&cmd_stdout);
762
Matthieu Moy2556b992013-09-06 19:43:07 +0200763 if (s->display_comment_prefix) {
Jeff Kingd56d9662015-03-22 06:00:32 -0400764 size_t len;
Matthieu Moy2556b992013-09-06 19:43:07 +0200765 summary_content = strbuf_detach(&summary, &len);
766 strbuf_add_commented_lines(&summary, summary_content, len);
767 free(summary_content);
768 }
Matthieu Moy3ba74072013-09-06 19:43:06 +0200769
770 fputs(summary.buf, s->fp);
771 strbuf_release(&summary);
Ping Yinac8d5af2008-04-12 23:05:32 +0800772}
773
Junio C Hamano1b908b62010-04-10 00:19:46 -0700774static void wt_status_print_other(struct wt_status *s,
775 struct string_list *l,
776 const char *what,
777 const char *how)
Jeff Kingc91f0d92006-09-08 04:05:34 -0400778{
Jeff Kingc91f0d92006-09-08 04:05:34 -0400779 int i;
Brandon Caseyf285a2d2008-10-09 14:12:12 -0500780 struct strbuf buf = STRBUF_INIT;
Nguyễn Thái Ngọc Duy323d0532012-04-13 17:54:39 +0700781 static struct string_list output = STRING_LIST_INIT_DUP;
782 struct column_options copts;
Jeff Kingc91f0d92006-09-08 04:05:34 -0400783
Jeff King12829882011-06-02 01:54:49 -0400784 if (!l->nr)
Junio C Hamano76378682009-08-10 00:36:33 -0700785 return;
Jeff Kingc91f0d92006-09-08 04:05:34 -0400786
Junio C Hamano1b908b62010-04-10 00:19:46 -0700787 wt_status_print_other_header(s, what, how);
788
789 for (i = 0; i < l->nr; i++) {
Junio C Hamano76378682009-08-10 00:36:33 -0700790 struct string_list_item *it;
Nguyễn Thái Ngọc Duy323d0532012-04-13 17:54:39 +0700791 const char *path;
Junio C Hamano1b908b62010-04-10 00:19:46 -0700792 it = &(l->items[i]);
Jiang Xin39598f92013-06-25 23:53:45 +0800793 path = quote_path(it->string, s->prefix, &buf);
Nguyễn Thái Ngọc Duy323d0532012-04-13 17:54:39 +0700794 if (column_active(s->colopts)) {
795 string_list_append(&output, path);
796 continue;
797 }
Jonathan Niederb926c0d2011-02-25 23:11:37 -0600798 status_printf(s, color(WT_STATUS_HEADER, s), "\t");
799 status_printf_more(s, color(WT_STATUS_UNTRACKED, s),
Nguyễn Thái Ngọc Duy323d0532012-04-13 17:54:39 +0700800 "%s\n", path);
Jeff Kingc91f0d92006-09-08 04:05:34 -0400801 }
Nguyễn Thái Ngọc Duy323d0532012-04-13 17:54:39 +0700802
803 strbuf_release(&buf);
804 if (!column_active(s->colopts))
Matthieu Moy2f0f7f12013-09-06 19:43:09 +0200805 goto conclude;
Nguyễn Thái Ngọc Duy323d0532012-04-13 17:54:39 +0700806
Matthieu Moy2556b992013-09-06 19:43:07 +0200807 strbuf_addf(&buf, "%s%s\t%s",
Nguyễn Thái Ngọc Duy323d0532012-04-13 17:54:39 +0700808 color(WT_STATUS_HEADER, s),
Matthieu Moy2556b992013-09-06 19:43:07 +0200809 s->display_comment_prefix ? "#" : "",
Nguyễn Thái Ngọc Duy323d0532012-04-13 17:54:39 +0700810 color(WT_STATUS_UNTRACKED, s));
811 memset(&copts, 0, sizeof(copts));
812 copts.padding = 1;
813 copts.indent = buf.buf;
814 if (want_color(s->use_color))
815 copts.nl = GIT_COLOR_RESET "\n";
816 print_columns(&output, s->colopts, &copts);
817 string_list_clear(&output, 0);
Johannes Schindelin367c9882007-11-11 17:35:41 +0000818 strbuf_release(&buf);
Matthieu Moy2f0f7f12013-09-06 19:43:09 +0200819conclude:
Felipe Contreras7d7d6802014-05-04 01:12:55 -0500820 status_printf_ln(s, GIT_COLOR_NORMAL, "%s", "");
Jeff Kingc91f0d92006-09-08 04:05:34 -0400821}
822
Jens Lehmann1a72cfd2013-12-05 20:44:14 +0100823void wt_status_truncate_message_at_cut_line(struct strbuf *buf)
824{
825 const char *p;
826 struct strbuf pattern = STRBUF_INIT;
827
SZEDER Gáborfbfa0972015-06-09 02:28:34 +0200828 strbuf_addf(&pattern, "\n%c %s", comment_line_char, cut_line);
829 if (starts_with(buf->buf, pattern.buf + 1))
830 strbuf_setlen(buf, 0);
831 else if ((p = strstr(buf->buf, pattern.buf)))
832 strbuf_setlen(buf, p - buf->buf + 1);
Jens Lehmann1a72cfd2013-12-05 20:44:14 +0100833 strbuf_release(&pattern);
834}
835
Nguyễn Thái Ngọc Duyfcef9312014-02-17 19:15:31 +0700836void wt_status_add_cut_line(FILE *fp)
837{
838 const char *explanation = _("Do not touch the line above.\nEverything below will be removed.");
839 struct strbuf buf = STRBUF_INIT;
840
841 fprintf(fp, "%c %s", comment_line_char, cut_line);
842 strbuf_add_commented_lines(&buf, explanation, strlen(explanation));
843 fputs(buf.buf, fp);
844 strbuf_release(&buf);
845}
846
Jeff Kingc91f0d92006-09-08 04:05:34 -0400847static void wt_status_print_verbose(struct wt_status *s)
848{
849 struct rev_info rev;
Junio C Hamano32962c92010-03-08 22:58:09 -0800850 struct setup_revision_opt opt;
Michael J Gruber40555002015-03-06 10:43:35 +0100851 int dirty_submodules;
852 const char *c = color(WT_STATUS_HEADER, s);
Kristian Høgsberg99a12692007-11-21 21:54:49 -0500853
Jeff Kingc91f0d92006-09-08 04:05:34 -0400854 init_revisions(&rev, NULL);
Jeff King5ec11af2008-12-07 21:54:17 -0500855 DIFF_OPT_SET(&rev.diffopt, ALLOW_TEXTCONV);
Junio C Hamano32962c92010-03-08 22:58:09 -0800856
857 memset(&opt, 0, sizeof(opt));
858 opt.def = s->is_initial ? EMPTY_TREE_SHA1_HEX : s->reference;
859 setup_revisions(0, NULL, &rev, &opt);
860
Jeff Kingc91f0d92006-09-08 04:05:34 -0400861 rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
862 rev.diffopt.detect_rename = 1;
Kristian Høgsberg4ba0cb22008-03-10 13:58:26 -0400863 rev.diffopt.file = s->fp;
864 rev.diffopt.close_file = 0;
Jeff King4f672ad2008-10-26 00:49:35 -0400865 /*
866 * If we're not going to stdout, then we definitely don't
867 * want color, since we are going to the commit message
868 * file (and even the "auto" setting won't work, since it
Jens Lehmann1a72cfd2013-12-05 20:44:14 +0100869 * will have checked isatty on stdout). But we then do want
870 * to insert the scissor line here to reliably remove the
871 * diff before committing.
Jeff King4f672ad2008-10-26 00:49:35 -0400872 */
Jens Lehmann1a72cfd2013-12-05 20:44:14 +0100873 if (s->fp != stdout) {
Jeff Kingf1c96262011-08-17 22:03:12 -0700874 rev.diffopt.use_color = 0;
Nguyễn Thái Ngọc Duyfcef9312014-02-17 19:15:31 +0700875 wt_status_add_cut_line(s->fp);
Jens Lehmann1a72cfd2013-12-05 20:44:14 +0100876 }
Michael J Gruber40555002015-03-06 10:43:35 +0100877 if (s->verbose > 1 && s->commitable) {
878 /* print_updated() printed a header, so do we */
879 if (s->fp != stdout)
880 wt_status_print_trailer(s);
881 status_printf_ln(s, c, _("Changes to be committed:"));
882 rev.diffopt.a_prefix = "c/";
883 rev.diffopt.b_prefix = "i/";
884 } /* else use prefix as per user config */
Jeff Kingc91f0d92006-09-08 04:05:34 -0400885 run_diff_index(&rev, 1);
Michael J Gruber40555002015-03-06 10:43:35 +0100886 if (s->verbose > 1 &&
887 wt_status_check_worktree_changes(s, &dirty_submodules)) {
888 status_printf_ln(s, c,
889 "--------------------------------------------------");
890 status_printf_ln(s, c, _("Changes not staged for commit:"));
891 setup_work_tree();
892 rev.diffopt.a_prefix = "i/";
893 rev.diffopt.b_prefix = "w/";
894 run_diff_files(&rev, 0);
895 }
Jeff Kingc91f0d92006-09-08 04:05:34 -0400896}
897
Junio C Hamanob6975ab2008-07-02 00:52:16 -0700898static void wt_status_print_tracking(struct wt_status *s)
899{
900 struct strbuf sb = STRBUF_INIT;
René Scharfec72b49d2015-10-31 18:37:43 +0100901 const char *cp, *ep, *branch_name;
Junio C Hamanob6975ab2008-07-02 00:52:16 -0700902 struct branch *branch;
Matthieu Moy2556b992013-09-06 19:43:07 +0200903 char comment_line_string[3];
904 int i;
Junio C Hamanob6975ab2008-07-02 00:52:16 -0700905
906 assert(s->branch && !s->is_initial);
René Scharfec72b49d2015-10-31 18:37:43 +0100907 if (!skip_prefix(s->branch, "refs/heads/", &branch_name))
Junio C Hamanob6975ab2008-07-02 00:52:16 -0700908 return;
René Scharfec72b49d2015-10-31 18:37:43 +0100909 branch = branch_get(branch_name);
Junio C Hamanob6975ab2008-07-02 00:52:16 -0700910 if (!format_tracking_info(branch, &sb))
911 return;
912
Matthieu Moy2556b992013-09-06 19:43:07 +0200913 i = 0;
914 if (s->display_comment_prefix) {
915 comment_line_string[i++] = comment_line_char;
916 comment_line_string[i++] = ' ';
917 }
918 comment_line_string[i] = '\0';
919
Junio C Hamanob6975ab2008-07-02 00:52:16 -0700920 for (cp = sb.buf; (ep = strchr(cp, '\n')) != NULL; cp = ep + 1)
Junio C Hamanod249b092009-08-09 21:59:30 -0700921 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s),
Matthieu Moy2556b992013-09-06 19:43:07 +0200922 "%s%.*s", comment_line_string,
Junio C Hamanoeff80a92013-01-16 20:18:48 +0100923 (int)(ep - cp), cp);
Matthieu Moy2556b992013-09-06 19:43:07 +0200924 if (s->display_comment_prefix)
925 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s), "%c",
926 comment_line_char);
927 else
Felipe Contreras7d7d6802014-05-04 01:12:55 -0500928 fputs("", s->fp);
Junio C Hamanob6975ab2008-07-02 00:52:16 -0700929}
930
Lucien Kong83c750a2012-06-05 22:21:24 +0200931static int has_unmerged(struct wt_status *s)
932{
933 int i;
934
935 for (i = 0; i < s->change.nr; i++) {
936 struct wt_status_change_data *d;
937 d = s->change.items[i].util;
938 if (d->stagemask)
939 return 1;
940 }
941 return 0;
942}
943
944static void show_merge_in_progress(struct wt_status *s,
945 struct wt_status_state *state,
946 const char *color)
947{
948 if (has_unmerged(s)) {
949 status_printf_ln(s, color, _("You have unmerged paths."));
Matthieu Moy6a964f52013-09-12 12:50:05 +0200950 if (s->hints)
Lucien Kong83c750a2012-06-05 22:21:24 +0200951 status_printf_ln(s, color,
952 _(" (fix conflicts and run \"git commit\")"));
953 } else {
Stephen P. Smith8dc874b2016-02-15 19:38:25 -0700954 s-> commitable = 1;
Lucien Kong83c750a2012-06-05 22:21:24 +0200955 status_printf_ln(s, color,
956 _("All conflicts fixed but you are still merging."));
Matthieu Moy6a964f52013-09-12 12:50:05 +0200957 if (s->hints)
Lucien Kong83c750a2012-06-05 22:21:24 +0200958 status_printf_ln(s, color,
959 _(" (use \"git commit\" to conclude merge)"));
960 }
961 wt_status_print_trailer(s);
962}
963
964static void show_am_in_progress(struct wt_status *s,
965 struct wt_status_state *state,
966 const char *color)
967{
968 status_printf_ln(s, color,
969 _("You are in the middle of an am session."));
970 if (state->am_empty_patch)
971 status_printf_ln(s, color,
972 _("The current patch is empty."));
Matthieu Moy6a964f52013-09-12 12:50:05 +0200973 if (s->hints) {
Lucien Kong83c750a2012-06-05 22:21:24 +0200974 if (!state->am_empty_patch)
975 status_printf_ln(s, color,
Kevin Bracey8ceb6fb2013-06-26 23:06:41 +0300976 _(" (fix conflicts and then run \"git am --continue\")"));
Lucien Kong83c750a2012-06-05 22:21:24 +0200977 status_printf_ln(s, color,
978 _(" (use \"git am --skip\" to skip this patch)"));
979 status_printf_ln(s, color,
980 _(" (use \"git am --abort\" to restore the original branch)"));
981 }
982 wt_status_print_trailer(s);
983}
984
Lucien Kong2d1cceb2012-06-10 13:17:38 +0200985static char *read_line_from_git_path(const char *filename)
986{
987 struct strbuf buf = STRBUF_INIT;
988 FILE *fp = fopen(git_path("%s", filename), "r");
989 if (!fp) {
990 strbuf_release(&buf);
991 return NULL;
992 }
Junio C Hamano8f309ae2016-01-13 15:31:17 -0800993 strbuf_getline_lf(&buf, fp);
Lucien Kong2d1cceb2012-06-10 13:17:38 +0200994 if (!fclose(fp)) {
995 return strbuf_detach(&buf, NULL);
996 } else {
997 strbuf_release(&buf);
998 return NULL;
999 }
1000}
1001
1002static int split_commit_in_progress(struct wt_status *s)
1003{
1004 int split_in_progress = 0;
1005 char *head = read_line_from_git_path("HEAD");
1006 char *orig_head = read_line_from_git_path("ORIG_HEAD");
1007 char *rebase_amend = read_line_from_git_path("rebase-merge/amend");
1008 char *rebase_orig_head = read_line_from_git_path("rebase-merge/orig-head");
1009
1010 if (!head || !orig_head || !rebase_amend || !rebase_orig_head ||
1011 !s->branch || strcmp(s->branch, "HEAD"))
1012 return split_in_progress;
1013
1014 if (!strcmp(rebase_amend, rebase_orig_head)) {
1015 if (strcmp(head, rebase_amend))
1016 split_in_progress = 1;
1017 } else if (strcmp(orig_head, rebase_orig_head)) {
1018 split_in_progress = 1;
1019 }
1020
1021 if (!s->amend && !s->nowarn && !s->workdir_dirty)
1022 split_in_progress = 0;
1023
1024 free(head);
1025 free(orig_head);
1026 free(rebase_amend);
1027 free(rebase_orig_head);
1028 return split_in_progress;
1029}
1030
Guillaume Pagès84e6fb92015-07-06 22:56:03 +02001031/*
1032 * Turn
1033 * "pick d6a2f0303e897ec257dd0e0a39a5ccb709bc2047 some message"
1034 * into
1035 * "pick d6a2f03 some message"
1036 *
1037 * The function assumes that the line does not contain useless spaces
1038 * before or after the command.
1039 */
1040static void abbrev_sha1_in_line(struct strbuf *line)
1041{
1042 struct strbuf **split;
1043 int i;
1044
1045 if (starts_with(line->buf, "exec ") ||
1046 starts_with(line->buf, "x "))
1047 return;
1048
1049 split = strbuf_split_max(line, ' ', 3);
1050 if (split[0] && split[1]) {
1051 unsigned char sha1[20];
1052 const char *abbrev;
1053
1054 /*
1055 * strbuf_split_max left a space. Trim it and re-add
1056 * it after abbreviation.
1057 */
1058 strbuf_trim(split[1]);
1059 if (!get_sha1(split[1]->buf, sha1)) {
1060 abbrev = find_unique_abbrev(sha1, DEFAULT_ABBREV);
1061 strbuf_reset(split[1]);
1062 strbuf_addf(split[1], "%s ", abbrev);
1063 strbuf_reset(line);
1064 for (i = 0; split[i]; i++)
1065 strbuf_addf(line, "%s", split[i]->buf);
1066 }
1067 }
Stefan Beller6eb60782016-03-31 17:35:44 -07001068 strbuf_list_free(split);
Guillaume Pagès84e6fb92015-07-06 22:56:03 +02001069}
1070
1071static void read_rebase_todolist(const char *fname, struct string_list *lines)
1072{
1073 struct strbuf line = STRBUF_INIT;
1074 FILE *f = fopen(git_path("%s", fname), "r");
1075
1076 if (!f)
1077 die_errno("Could not open file %s for reading",
1078 git_path("%s", fname));
Junio C Hamano8f309ae2016-01-13 15:31:17 -08001079 while (!strbuf_getline_lf(&line, f)) {
Guillaume Pagès84e6fb92015-07-06 22:56:03 +02001080 if (line.len && line.buf[0] == comment_line_char)
1081 continue;
1082 strbuf_trim(&line);
1083 if (!line.len)
1084 continue;
1085 abbrev_sha1_in_line(&line);
1086 string_list_append(lines, line.buf);
1087 }
1088}
1089
1090static void show_rebase_information(struct wt_status *s,
1091 struct wt_status_state *state,
1092 const char *color)
1093{
1094 if (state->rebase_interactive_in_progress) {
1095 int i;
1096 int nr_lines_to_show = 2;
1097
1098 struct string_list have_done = STRING_LIST_INIT_DUP;
1099 struct string_list yet_to_do = STRING_LIST_INIT_DUP;
1100
1101 read_rebase_todolist("rebase-merge/done", &have_done);
1102 read_rebase_todolist("rebase-merge/git-rebase-todo", &yet_to_do);
1103
1104 if (have_done.nr == 0)
1105 status_printf_ln(s, color, _("No commands done."));
1106 else {
1107 status_printf_ln(s, color,
1108 Q_("Last command done (%d command done):",
1109 "Last commands done (%d commands done):",
1110 have_done.nr),
1111 have_done.nr);
1112 for (i = (have_done.nr > nr_lines_to_show)
1113 ? have_done.nr - nr_lines_to_show : 0;
1114 i < have_done.nr;
1115 i++)
1116 status_printf_ln(s, color, " %s", have_done.items[i].string);
1117 if (have_done.nr > nr_lines_to_show && s->hints)
1118 status_printf_ln(s, color,
1119 _(" (see more in file %s)"), git_path("rebase-merge/done"));
1120 }
1121
1122 if (yet_to_do.nr == 0)
1123 status_printf_ln(s, color,
1124 _("No commands remaining."));
1125 else {
1126 status_printf_ln(s, color,
1127 Q_("Next command to do (%d remaining command):",
1128 "Next commands to do (%d remaining commands):",
1129 yet_to_do.nr),
1130 yet_to_do.nr);
1131 for (i = 0; i < nr_lines_to_show && i < yet_to_do.nr; i++)
1132 status_printf_ln(s, color, " %s", yet_to_do.items[i].string);
1133 if (s->hints)
1134 status_printf_ln(s, color,
1135 _(" (use \"git rebase --edit-todo\" to view and edit)"));
1136 }
1137 string_list_clear(&yet_to_do, 0);
1138 string_list_clear(&have_done, 0);
1139 }
1140}
1141
Guillaume Pagès05eb5632015-06-30 15:01:12 +02001142static void print_rebase_state(struct wt_status *s,
1143 struct wt_status_state *state,
1144 const char *color)
1145{
1146 if (state->branch)
1147 status_printf_ln(s, color,
1148 _("You are currently rebasing branch '%s' on '%s'."),
1149 state->branch,
1150 state->onto);
1151 else
1152 status_printf_ln(s, color,
1153 _("You are currently rebasing."));
1154}
1155
Lucien Kong83c750a2012-06-05 22:21:24 +02001156static void show_rebase_in_progress(struct wt_status *s,
1157 struct wt_status_state *state,
1158 const char *color)
1159{
1160 struct stat st;
1161
Guillaume Pagès84e6fb92015-07-06 22:56:03 +02001162 show_rebase_information(s, state, color);
Lucien Kong83c750a2012-06-05 22:21:24 +02001163 if (has_unmerged(s)) {
Guillaume Pagès05eb5632015-06-30 15:01:12 +02001164 print_rebase_state(s, state, color);
Matthieu Moy6a964f52013-09-12 12:50:05 +02001165 if (s->hints) {
Lucien Kong83c750a2012-06-05 22:21:24 +02001166 status_printf_ln(s, color,
1167 _(" (fix conflicts and then run \"git rebase --continue\")"));
1168 status_printf_ln(s, color,
1169 _(" (use \"git rebase --skip\" to skip this patch)"));
1170 status_printf_ln(s, color,
1171 _(" (use \"git rebase --abort\" to check out the original branch)"));
1172 }
Jeff Kingf9327292015-08-10 05:38:57 -04001173 } else if (state->rebase_in_progress || !stat(git_path_merge_msg(), &st)) {
Guillaume Pagès05eb5632015-06-30 15:01:12 +02001174 print_rebase_state(s, state, color);
Matthieu Moy6a964f52013-09-12 12:50:05 +02001175 if (s->hints)
Lucien Kong83c750a2012-06-05 22:21:24 +02001176 status_printf_ln(s, color,
1177 _(" (all conflicts fixed: run \"git rebase --continue\")"));
Lucien Kong2d1cceb2012-06-10 13:17:38 +02001178 } else if (split_commit_in_progress(s)) {
Nguyễn Thái Ngọc Duy0722c802013-02-03 12:53:27 +07001179 if (state->branch)
1180 status_printf_ln(s, color,
1181 _("You are currently splitting a commit while rebasing branch '%s' on '%s'."),
1182 state->branch,
1183 state->onto);
1184 else
1185 status_printf_ln(s, color,
1186 _("You are currently splitting a commit during a rebase."));
Matthieu Moy6a964f52013-09-12 12:50:05 +02001187 if (s->hints)
Lucien Kong2d1cceb2012-06-10 13:17:38 +02001188 status_printf_ln(s, color,
1189 _(" (Once your working directory is clean, run \"git rebase --continue\")"));
Lucien Kong83c750a2012-06-05 22:21:24 +02001190 } else {
Nguyễn Thái Ngọc Duy0722c802013-02-03 12:53:27 +07001191 if (state->branch)
1192 status_printf_ln(s, color,
1193 _("You are currently editing a commit while rebasing branch '%s' on '%s'."),
1194 state->branch,
1195 state->onto);
1196 else
1197 status_printf_ln(s, color,
1198 _("You are currently editing a commit during a rebase."));
Matthieu Moy6a964f52013-09-12 12:50:05 +02001199 if (s->hints && !s->amend) {
Lucien Kong83c750a2012-06-05 22:21:24 +02001200 status_printf_ln(s, color,
1201 _(" (use \"git commit --amend\" to amend the current commit)"));
1202 status_printf_ln(s, color,
1203 _(" (use \"git rebase --continue\" once you are satisfied with your changes)"));
1204 }
1205 }
1206 wt_status_print_trailer(s);
1207}
1208
1209static void show_cherry_pick_in_progress(struct wt_status *s,
1210 struct wt_status_state *state,
1211 const char *color)
1212{
Ralf Thielowbffd8092013-10-11 17:58:37 +02001213 status_printf_ln(s, color, _("You are currently cherry-picking commit %s."),
1214 find_unique_abbrev(state->cherry_pick_head_sha1, DEFAULT_ABBREV));
Matthieu Moy6a964f52013-09-12 12:50:05 +02001215 if (s->hints) {
Lucien Kong83c750a2012-06-05 22:21:24 +02001216 if (has_unmerged(s))
1217 status_printf_ln(s, color,
Ralf Thielowb95e66f2013-06-17 06:28:26 +02001218 _(" (fix conflicts and run \"git cherry-pick --continue\")"));
Lucien Kong83c750a2012-06-05 22:21:24 +02001219 else
1220 status_printf_ln(s, color,
Ralf Thielowb95e66f2013-06-17 06:28:26 +02001221 _(" (all conflicts fixed: run \"git cherry-pick --continue\")"));
1222 status_printf_ln(s, color,
1223 _(" (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"));
Lucien Kong83c750a2012-06-05 22:21:24 +02001224 }
1225 wt_status_print_trailer(s);
1226}
1227
Matthieu Moydb4ef442013-04-02 16:20:21 +02001228static void show_revert_in_progress(struct wt_status *s,
1229 struct wt_status_state *state,
1230 const char *color)
1231{
Matthieu Moy87e139c2013-04-02 16:20:22 +02001232 status_printf_ln(s, color, _("You are currently reverting commit %s."),
1233 find_unique_abbrev(state->revert_head_sha1, DEFAULT_ABBREV));
Matthieu Moy6a964f52013-09-12 12:50:05 +02001234 if (s->hints) {
Matthieu Moydb4ef442013-04-02 16:20:21 +02001235 if (has_unmerged(s))
1236 status_printf_ln(s, color,
1237 _(" (fix conflicts and run \"git revert --continue\")"));
1238 else
1239 status_printf_ln(s, color,
1240 _(" (all conflicts fixed: run \"git revert --continue\")"));
1241 status_printf_ln(s, color,
1242 _(" (use \"git revert --abort\" to cancel the revert operation)"));
1243 }
1244 wt_status_print_trailer(s);
1245}
1246
Lucien Kong83c750a2012-06-05 22:21:24 +02001247static void show_bisect_in_progress(struct wt_status *s,
1248 struct wt_status_state *state,
1249 const char *color)
1250{
Nguyễn Thái Ngọc Duy0722c802013-02-03 12:53:27 +07001251 if (state->branch)
1252 status_printf_ln(s, color,
Nguyễn Thái Ngọc Duy6deab242013-03-23 10:52:44 +07001253 _("You are currently bisecting, started from branch '%s'."),
Nguyễn Thái Ngọc Duy0722c802013-02-03 12:53:27 +07001254 state->branch);
1255 else
1256 status_printf_ln(s, color,
1257 _("You are currently bisecting."));
Matthieu Moy6a964f52013-09-12 12:50:05 +02001258 if (s->hints)
Lucien Kong83c750a2012-06-05 22:21:24 +02001259 status_printf_ln(s, color,
1260 _(" (use \"git bisect reset\" to get back to the original branch)"));
1261 wt_status_print_trailer(s);
1262}
1263
Nguyễn Thái Ngọc Duy0722c802013-02-03 12:53:27 +07001264/*
1265 * Extract branch information from rebase/bisect
1266 */
Nguyễn Thái Ngọc Duy81eff272016-04-22 20:01:31 +07001267static char *get_branch(const struct worktree *wt, const char *path)
Nguyễn Thái Ngọc Duy0722c802013-02-03 12:53:27 +07001268{
Nguyễn Thái Ngọc Duy8b87cfd2013-03-16 09:12:36 +07001269 struct strbuf sb = STRBUF_INIT;
Nguyễn Thái Ngọc Duy0722c802013-02-03 12:53:27 +07001270 unsigned char sha1[20];
René Scharfec72b49d2015-10-31 18:37:43 +01001271 const char *branch_name;
Nguyễn Thái Ngọc Duy0722c802013-02-03 12:53:27 +07001272
Nguyễn Thái Ngọc Duy81eff272016-04-22 20:01:31 +07001273 if (strbuf_read_file(&sb, worktree_git_path(wt, "%s", path), 0) <= 0)
Nguyễn Thái Ngọc Duy8b87cfd2013-03-16 09:12:36 +07001274 goto got_nothing;
Nguyễn Thái Ngọc Duy0722c802013-02-03 12:53:27 +07001275
Jeff King66ec9042015-01-28 12:57:35 -05001276 while (sb.len && sb.buf[sb.len - 1] == '\n')
Nguyễn Thái Ngọc Duy8b87cfd2013-03-16 09:12:36 +07001277 strbuf_setlen(&sb, sb.len - 1);
1278 if (!sb.len)
1279 goto got_nothing;
René Scharfec72b49d2015-10-31 18:37:43 +01001280 if (skip_prefix(sb.buf, "refs/heads/", &branch_name))
1281 strbuf_remove(&sb, 0, branch_name - sb.buf);
Christian Couder59556542013-11-30 21:55:40 +01001282 else if (starts_with(sb.buf, "refs/"))
Nguyễn Thái Ngọc Duy8b87cfd2013-03-16 09:12:36 +07001283 ;
1284 else if (!get_sha1_hex(sb.buf, sha1)) {
Nguyễn Thái Ngọc Duy0722c802013-02-03 12:53:27 +07001285 const char *abbrev;
1286 abbrev = find_unique_abbrev(sha1, DEFAULT_ABBREV);
Nguyễn Thái Ngọc Duy8b87cfd2013-03-16 09:12:36 +07001287 strbuf_reset(&sb);
1288 strbuf_addstr(&sb, abbrev);
1289 } else if (!strcmp(sb.buf, "detached HEAD")) /* rebase */
1290 goto got_nothing;
Nguyễn Thái Ngọc Duy0722c802013-02-03 12:53:27 +07001291 else /* bisect */
Nguyễn Thái Ngọc Duy8b87cfd2013-03-16 09:12:36 +07001292 ;
1293 return strbuf_detach(&sb, NULL);
1294
1295got_nothing:
1296 strbuf_release(&sb);
1297 return NULL;
Nguyễn Thái Ngọc Duy0722c802013-02-03 12:53:27 +07001298}
1299
Nguyễn Thái Ngọc Duyb397ea42013-03-13 18:42:52 +07001300struct grab_1st_switch_cbdata {
Nguyễn Thái Ngọc Duyb397ea42013-03-13 18:42:52 +07001301 struct strbuf buf;
1302 unsigned char nsha1[20];
1303};
1304
1305static int grab_1st_switch(unsigned char *osha1, unsigned char *nsha1,
1306 const char *email, unsigned long timestamp, int tz,
1307 const char *message, void *cb_data)
Lucien Kong83c750a2012-06-05 22:21:24 +02001308{
Nguyễn Thái Ngọc Duyb397ea42013-03-13 18:42:52 +07001309 struct grab_1st_switch_cbdata *cb = cb_data;
1310 const char *target = NULL, *end;
1311
René Scharfec72b49d2015-10-31 18:37:43 +01001312 if (!skip_prefix(message, "checkout: moving from ", &message))
Nguyễn Thái Ngọc Duyb397ea42013-03-13 18:42:52 +07001313 return 0;
Nguyễn Thái Ngọc Duyb397ea42013-03-13 18:42:52 +07001314 target = strstr(message, " to ");
1315 if (!target)
1316 return 0;
1317 target += strlen(" to ");
1318 strbuf_reset(&cb->buf);
1319 hashcpy(cb->nsha1, nsha1);
René Scharfe904de442015-11-25 15:10:18 +01001320 end = strchrnul(target, '\n');
1321 strbuf_add(&cb->buf, target, end - target);
1322 if (!strcmp(cb->buf.buf, "HEAD")) {
Matthieu Moy0eb85482015-09-27 17:13:42 +02001323 /* HEAD is relative. Resolve it to the right reflog entry. */
René Scharfe904de442015-11-25 15:10:18 +01001324 strbuf_reset(&cb->buf);
Matthieu Moy0eb85482015-09-27 17:13:42 +02001325 strbuf_addstr(&cb->buf,
1326 find_unique_abbrev(nsha1, DEFAULT_ABBREV));
Matthieu Moy0eb85482015-09-27 17:13:42 +02001327 }
Nguyễn Thái Ngọc Duyb397ea42013-03-13 18:42:52 +07001328 return 1;
1329}
1330
1331static void wt_status_get_detached_from(struct wt_status_state *state)
1332{
1333 struct grab_1st_switch_cbdata cb;
1334 struct commit *commit;
1335 unsigned char sha1[20];
1336 char *ref = NULL;
1337
1338 strbuf_init(&cb.buf, 0);
1339 if (for_each_reflog_ent_reverse("HEAD", grab_1st_switch, &cb) <= 0) {
1340 strbuf_release(&cb.buf);
1341 return;
1342 }
1343
1344 if (dwim_ref(cb.buf.buf, cb.buf.len, sha1, &ref) == 1 &&
1345 /* sha1 is a commit? match without further lookup */
1346 (!hashcmp(cb.nsha1, sha1) ||
1347 /* perhaps sha1 is a tag, try to dereference to a commit */
1348 ((commit = lookup_commit_reference_gently(sha1, 1)) != NULL &&
brian m. carlsoned1c9972015-11-10 02:22:29 +00001349 !hashcmp(cb.nsha1, commit->object.oid.hash)))) {
René Scharfec72b49d2015-10-31 18:37:43 +01001350 const char *from = ref;
1351 if (!skip_prefix(from, "refs/tags/", &from))
1352 skip_prefix(from, "refs/remotes/", &from);
1353 state->detached_from = xstrdup(from);
Nguyễn Thái Ngọc Duyb397ea42013-03-13 18:42:52 +07001354 } else
1355 state->detached_from =
1356 xstrdup(find_unique_abbrev(cb.nsha1, DEFAULT_ABBREV));
1357 hashcpy(state->detached_sha1, cb.nsha1);
Michael J Gruber970399e2015-03-06 16:04:06 +01001358 state->detached_at = !get_sha1("HEAD", sha1) &&
1359 !hashcmp(sha1, state->detached_sha1);
Nguyễn Thái Ngọc Duyb397ea42013-03-13 18:42:52 +07001360
1361 free(ref);
1362 strbuf_release(&cb.buf);
1363}
1364
Nguyễn Thái Ngọc Duy81eff272016-04-22 20:01:31 +07001365int wt_status_check_rebase(const struct worktree *wt,
1366 struct wt_status_state *state)
Nguyễn Thái Ngọc Duyb9691db2013-03-13 18:42:50 +07001367{
Lucien Kong83c750a2012-06-05 22:21:24 +02001368 struct stat st;
1369
Nguyễn Thái Ngọc Duy81eff272016-04-22 20:01:31 +07001370 if (!stat(worktree_git_path(wt, "rebase-apply"), &st)) {
1371 if (!stat(worktree_git_path(wt, "rebase-apply/applying"), &st)) {
Nguyễn Thái Ngọc Duyb9691db2013-03-13 18:42:50 +07001372 state->am_in_progress = 1;
Nguyễn Thái Ngọc Duy81eff272016-04-22 20:01:31 +07001373 if (!stat(worktree_git_path(wt, "rebase-apply/patch"), &st) && !st.st_size)
Nguyễn Thái Ngọc Duyb9691db2013-03-13 18:42:50 +07001374 state->am_empty_patch = 1;
Lucien Kong83c750a2012-06-05 22:21:24 +02001375 } else {
Nguyễn Thái Ngọc Duyb9691db2013-03-13 18:42:50 +07001376 state->rebase_in_progress = 1;
Nguyễn Thái Ngọc Duy81eff272016-04-22 20:01:31 +07001377 state->branch = get_branch(wt, "rebase-apply/head-name");
1378 state->onto = get_branch(wt, "rebase-apply/onto");
Lucien Kong83c750a2012-06-05 22:21:24 +02001379 }
Nguyễn Thái Ngọc Duy81eff272016-04-22 20:01:31 +07001380 } else if (!stat(worktree_git_path(wt, "rebase-merge"), &st)) {
1381 if (!stat(worktree_git_path(wt, "rebase-merge/interactive"), &st))
Nguyễn Thái Ngọc Duyb9691db2013-03-13 18:42:50 +07001382 state->rebase_interactive_in_progress = 1;
Lucien Kong83c750a2012-06-05 22:21:24 +02001383 else
Nguyễn Thái Ngọc Duyb9691db2013-03-13 18:42:50 +07001384 state->rebase_in_progress = 1;
Nguyễn Thái Ngọc Duy81eff272016-04-22 20:01:31 +07001385 state->branch = get_branch(wt, "rebase-merge/head-name");
1386 state->onto = get_branch(wt, "rebase-merge/onto");
Nguyễn Thái Ngọc Duybcd522a2016-04-22 20:01:30 +07001387 } else
1388 return 0;
1389 return 1;
1390}
1391
Nguyễn Thái Ngọc Duyf5d067a2016-04-22 20:01:34 +07001392int wt_status_check_bisect(const struct worktree *wt,
1393 struct wt_status_state *state)
1394{
1395 struct stat st;
1396
1397 if (!stat(worktree_git_path(wt, "BISECT_LOG"), &st)) {
1398 state->bisect_in_progress = 1;
1399 state->branch = get_branch(wt, "BISECT_START");
1400 return 1;
1401 }
1402 return 0;
1403}
1404
Lucien Kong83c750a2012-06-05 22:21:24 +02001405void wt_status_get_state(struct wt_status_state *state,
1406 int get_detached_from)
1407{
1408 struct stat st;
1409 unsigned char sha1[20];
1410
1411 if (!stat(git_path_merge_head(), &st)) {
1412 state->merge_in_progress = 1;
Nguyễn Thái Ngọc Duy81eff272016-04-22 20:01:31 +07001413 } else if (wt_status_check_rebase(NULL, state)) {
Nguyễn Thái Ngọc Duybcd522a2016-04-22 20:01:30 +07001414 ; /* all set */
Jeff Kingf9327292015-08-10 05:38:57 -04001415 } else if (!stat(git_path_cherry_pick_head(), &st) &&
Ralf Thielowbffd8092013-10-11 17:58:37 +02001416 !get_sha1("CHERRY_PICK_HEAD", sha1)) {
Nguyễn Thái Ngọc Duyb9691db2013-03-13 18:42:50 +07001417 state->cherry_pick_in_progress = 1;
Ralf Thielowbffd8092013-10-11 17:58:37 +02001418 hashcpy(state->cherry_pick_head_sha1, sha1);
Lucien Kong83c750a2012-06-05 22:21:24 +02001419 }
Nguyễn Thái Ngọc Duyf5d067a2016-04-22 20:01:34 +07001420 wt_status_check_bisect(NULL, state);
Jeff Kingf9327292015-08-10 05:38:57 -04001421 if (!stat(git_path_revert_head(), &st) &&
Matthieu Moy87e139c2013-04-02 16:20:22 +02001422 !get_sha1("REVERT_HEAD", sha1)) {
Matthieu Moydb4ef442013-04-02 16:20:21 +02001423 state->revert_in_progress = 1;
Matthieu Moy87e139c2013-04-02 16:20:22 +02001424 hashcpy(state->revert_head_sha1, sha1);
Matthieu Moydb4ef442013-04-02 16:20:21 +02001425 }
Lucien Kong83c750a2012-06-05 22:21:24 +02001426
Nguyễn Thái Ngọc Duyb397ea42013-03-13 18:42:52 +07001427 if (get_detached_from)
1428 wt_status_get_detached_from(state);
Nguyễn Thái Ngọc Duyb9691db2013-03-13 18:42:50 +07001429}
1430
Nguyễn Thái Ngọc Duy3b691cc2013-03-13 18:42:51 +07001431static void wt_status_print_state(struct wt_status *s,
1432 struct wt_status_state *state)
Lucien Kong83c750a2012-06-05 22:21:24 +02001433{
1434 const char *state_color = color(WT_STATUS_HEADER, s);
Nguyễn Thái Ngọc Duy3b691cc2013-03-13 18:42:51 +07001435 if (state->merge_in_progress)
1436 show_merge_in_progress(s, state, state_color);
1437 else if (state->am_in_progress)
1438 show_am_in_progress(s, state, state_color);
1439 else if (state->rebase_in_progress || state->rebase_interactive_in_progress)
1440 show_rebase_in_progress(s, state, state_color);
1441 else if (state->cherry_pick_in_progress)
1442 show_cherry_pick_in_progress(s, state, state_color);
Matthieu Moydb4ef442013-04-02 16:20:21 +02001443 else if (state->revert_in_progress)
1444 show_revert_in_progress(s, state, state_color);
Nguyễn Thái Ngọc Duy3b691cc2013-03-13 18:42:51 +07001445 if (state->bisect_in_progress)
1446 show_bisect_in_progress(s, state, state_color);
Lucien Kong83c750a2012-06-05 22:21:24 +02001447}
1448
Jeff Kingc91f0d92006-09-08 04:05:34 -04001449void wt_status_print(struct wt_status *s)
1450{
Aleksi Aalto1d282322010-11-18 01:40:05 +02001451 const char *branch_color = color(WT_STATUS_ONBRANCH, s);
1452 const char *branch_status_color = color(WT_STATUS_HEADER, s);
Nguyễn Thái Ngọc Duy3b691cc2013-03-13 18:42:51 +07001453 struct wt_status_state state;
1454
1455 memset(&state, 0, sizeof(state));
Nguyễn Thái Ngọc Duyb397ea42013-03-13 18:42:52 +07001456 wt_status_get_state(&state,
1457 s->branch && !strcmp(s->branch, "HEAD"));
Jürgen Rühle98bf8a42007-01-02 20:26:23 +01001458
Junio C Hamanobda324c2007-01-03 01:09:34 -08001459 if (s->branch) {
Ævar Arnfjörð Bjarmason355ec7a2011-02-22 23:42:13 +00001460 const char *on_what = _("On branch ");
Junio C Hamanobda324c2007-01-03 01:09:34 -08001461 const char *branch_name = s->branch;
René Scharfec72b49d2015-10-31 18:37:43 +01001462 if (!strcmp(branch_name, "HEAD")) {
Aleksi Aalto1d282322010-11-18 01:40:05 +02001463 branch_status_color = color(WT_STATUS_NOBRANCH, s);
Ramkumar Ramachandraec506312013-06-16 14:15:15 +05301464 if (state.rebase_in_progress || state.rebase_interactive_in_progress) {
Guillaume Pagèsdf25e942015-06-30 15:01:13 +02001465 if (state.rebase_interactive_in_progress)
1466 on_what = _("interactive rebase in progress; onto ");
1467 else
1468 on_what = _("rebase in progress; onto ");
Ramkumar Ramachandraec506312013-06-16 14:15:15 +05301469 branch_name = state.onto;
1470 } else if (state.detached_from) {
Nguyễn Thái Ngọc Duyb397ea42013-03-13 18:42:52 +07001471 branch_name = state.detached_from;
Michael J Gruber970399e2015-03-06 16:04:06 +01001472 if (state.detached_at)
Nguyễn Thái Ngọc Duyb397ea42013-03-13 18:42:52 +07001473 on_what = _("HEAD detached at ");
1474 else
1475 on_what = _("HEAD detached from ");
1476 } else {
1477 branch_name = "";
1478 on_what = _("Not currently on any branch.");
1479 }
René Scharfec72b49d2015-10-31 18:37:43 +01001480 } else
1481 skip_prefix(branch_name, "refs/heads/", &branch_name);
Felipe Contreras7d7d6802014-05-04 01:12:55 -05001482 status_printf(s, color(WT_STATUS_HEADER, s), "%s", "");
Jonathan Niederb926c0d2011-02-25 23:11:37 -06001483 status_printf_more(s, branch_status_color, "%s", on_what);
1484 status_printf_more(s, branch_color, "%s\n", branch_name);
Junio C Hamanob6975ab2008-07-02 00:52:16 -07001485 if (!s->is_initial)
1486 wt_status_print_tracking(s);
Junio C Hamanobda324c2007-01-03 01:09:34 -08001487 }
Jeff Kingc91f0d92006-09-08 04:05:34 -04001488
Nguyễn Thái Ngọc Duy3b691cc2013-03-13 18:42:51 +07001489 wt_status_print_state(s, &state);
1490 free(state.branch);
1491 free(state.onto);
Nguyễn Thái Ngọc Duyb397ea42013-03-13 18:42:52 +07001492 free(state.detached_from);
Nguyễn Thái Ngọc Duy3b691cc2013-03-13 18:42:51 +07001493
Jeff Kingc91f0d92006-09-08 04:05:34 -04001494 if (s->is_initial) {
Felipe Contreras7d7d6802014-05-04 01:12:55 -05001495 status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", "");
Ævar Arnfjörð Bjarmasonb3b298a2011-02-22 23:42:17 +00001496 status_printf_ln(s, color(WT_STATUS_HEADER, s), _("Initial commit"));
Felipe Contreras7d7d6802014-05-04 01:12:55 -05001497 status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", "");
Jeff Kingc91f0d92006-09-08 04:05:34 -04001498 }
1499
Jeff Kingc1e255b2008-11-12 03:21:39 -05001500 wt_status_print_updated(s);
Johannes Sixt228e7b52009-09-01 22:13:53 +02001501 wt_status_print_unmerged(s);
Jeff Kingc91f0d92006-09-08 04:05:34 -04001502 wt_status_print_changed(s);
Jens Lehmann46a958b2010-06-25 16:56:47 +02001503 if (s->submodule_summary &&
1504 (!s->ignore_submodule_arg ||
1505 strcmp(s->ignore_submodule_arg, "all"))) {
Jens Lehmannf17a5d32010-01-17 20:42:31 +01001506 wt_status_print_submodule_summary(s, 0); /* staged */
1507 wt_status_print_submodule_summary(s, 1); /* unstaged */
1508 }
Junio C Hamano2381e392010-04-10 00:33:17 -07001509 if (s->show_untracked_files) {
Nguyễn Thái Ngọc Duy50bd8b72012-09-06 22:16:50 +07001510 wt_status_print_other(s, &s->untracked, _("Untracked files"), "add");
Junio C Hamano2381e392010-04-10 00:33:17 -07001511 if (s->show_ignored_files)
Nguyễn Thái Ngọc Duy50bd8b72012-09-06 22:16:50 +07001512 wt_status_print_other(s, &s->ignored, _("Ignored files"), "add -f");
Nguyễn Thái Ngọc Duy6a38ef22013-03-13 19:59:16 +07001513 if (advice_status_u_option && 2000 < s->untracked_in_ms) {
Felipe Contreras7d7d6802014-05-04 01:12:55 -05001514 status_printf_ln(s, GIT_COLOR_NORMAL, "%s", "");
Nguyễn Thái Ngọc Duy6a38ef22013-03-13 19:59:16 +07001515 status_printf_ln(s, GIT_COLOR_NORMAL,
Jiang Xin62901172013-04-12 11:53:01 +08001516 _("It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1517 "may speed it up, but you have to be careful not to forget to add\n"
1518 "new files yourself (see 'git help status')."),
1519 s->untracked_in_ms / 1000.0);
Nguyễn Thái Ngọc Duy6a38ef22013-03-13 19:59:16 +07001520 }
Junio C Hamano2381e392010-04-10 00:33:17 -07001521 } else if (s->commitable)
Ævar Arnfjörð Bjarmason355ec7a2011-02-22 23:42:13 +00001522 status_printf_ln(s, GIT_COLOR_NORMAL, _("Untracked files not listed%s"),
Matthieu Moy6a964f52013-09-12 12:50:05 +02001523 s->hints
Ævar Arnfjörð Bjarmason355ec7a2011-02-22 23:42:13 +00001524 ? _(" (use -u option to show untracked files)") : "");
Jeff Kingc91f0d92006-09-08 04:05:34 -04001525
Jeff King1324fb62008-11-12 03:23:37 -05001526 if (s->verbose)
Jeff Kingc91f0d92006-09-08 04:05:34 -04001527 wt_status_print_verbose(s);
Jürgen Rühle6e458bf2007-01-02 20:26:22 +01001528 if (!s->commitable) {
1529 if (s->amend)
Ævar Arnfjörð Bjarmason355ec7a2011-02-22 23:42:13 +00001530 status_printf_ln(s, GIT_COLOR_NORMAL, _("No changes"));
Junio C Hamano37d07f82007-12-12 19:09:16 -08001531 else if (s->nowarn)
1532 ; /* nothing */
Nguyễn Thái Ngọc Duy50bd8b72012-09-06 22:16:50 +07001533 else if (s->workdir_dirty) {
Matthieu Moy6a964f52013-09-12 12:50:05 +02001534 if (s->hints)
Nguyễn Thái Ngọc Duy50bd8b72012-09-06 22:16:50 +07001535 printf(_("no changes added to commit "
1536 "(use \"git add\" and/or \"git commit -a\")\n"));
1537 else
1538 printf(_("no changes added to commit\n"));
1539 } else if (s->untracked.nr) {
Matthieu Moy6a964f52013-09-12 12:50:05 +02001540 if (s->hints)
Nguyễn Thái Ngọc Duy50bd8b72012-09-06 22:16:50 +07001541 printf(_("nothing added to commit but untracked files "
1542 "present (use \"git add\" to track)\n"));
1543 else
1544 printf(_("nothing added to commit but untracked files present\n"));
1545 } else if (s->is_initial) {
Matthieu Moy6a964f52013-09-12 12:50:05 +02001546 if (s->hints)
Nguyễn Thái Ngọc Duy50bd8b72012-09-06 22:16:50 +07001547 printf(_("nothing to commit (create/copy files "
1548 "and use \"git add\" to track)\n"));
1549 else
1550 printf(_("nothing to commit\n"));
1551 } else if (!s->show_untracked_files) {
Matthieu Moy6a964f52013-09-12 12:50:05 +02001552 if (s->hints)
Nguyễn Thái Ngọc Duy50bd8b72012-09-06 22:16:50 +07001553 printf(_("nothing to commit (use -u to show untracked files)\n"));
1554 else
1555 printf(_("nothing to commit\n"));
1556 } else
1557 printf(_("nothing to commit, working directory clean\n"));
Jürgen Rühle6e458bf2007-01-02 20:26:22 +01001558 }
Jeff Kingc91f0d92006-09-08 04:05:34 -04001559}
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01001560
Jeff King3207a3a2012-05-07 15:44:44 -04001561static void wt_shortstatus_unmerged(struct string_list_item *it,
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01001562 struct wt_status *s)
1563{
1564 struct wt_status_change_data *d = it->util;
1565 const char *how = "??";
1566
1567 switch (d->stagemask) {
1568 case 1: how = "DD"; break; /* both deleted */
1569 case 2: how = "AU"; break; /* added by us */
1570 case 3: how = "UD"; break; /* deleted by them */
1571 case 4: how = "UA"; break; /* added by them */
1572 case 5: how = "DU"; break; /* deleted by us */
1573 case 6: how = "AA"; break; /* both added */
1574 case 7: how = "UU"; break; /* both modified */
1575 }
Michael J Gruber3fe2a892009-12-05 16:04:38 +01001576 color_fprintf(s->fp, color(WT_STATUS_UNMERGED, s), "%s", how);
Jeff King3207a3a2012-05-07 15:44:44 -04001577 if (s->null_termination) {
Michael J Gruber3fe2a892009-12-05 16:04:38 +01001578 fprintf(stdout, " %s%c", it->string, 0);
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01001579 } else {
1580 struct strbuf onebuf = STRBUF_INIT;
1581 const char *one;
Jiang Xin39598f92013-06-25 23:53:45 +08001582 one = quote_path(it->string, s->prefix, &onebuf);
Michael J Gruber3fe2a892009-12-05 16:04:38 +01001583 printf(" %s\n", one);
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01001584 strbuf_release(&onebuf);
1585 }
1586}
1587
Jeff King3207a3a2012-05-07 15:44:44 -04001588static void wt_shortstatus_status(struct string_list_item *it,
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01001589 struct wt_status *s)
1590{
1591 struct wt_status_change_data *d = it->util;
1592
Michael J Gruber3fe2a892009-12-05 16:04:38 +01001593 if (d->index_status)
1594 color_fprintf(s->fp, color(WT_STATUS_UPDATED, s), "%c", d->index_status);
1595 else
1596 putchar(' ');
1597 if (d->worktree_status)
1598 color_fprintf(s->fp, color(WT_STATUS_CHANGED, s), "%c", d->worktree_status);
1599 else
1600 putchar(' ');
1601 putchar(' ');
Jeff King3207a3a2012-05-07 15:44:44 -04001602 if (s->null_termination) {
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01001603 fprintf(stdout, "%s%c", it->string, 0);
1604 if (d->head_path)
1605 fprintf(stdout, "%s%c", d->head_path, 0);
1606 } else {
1607 struct strbuf onebuf = STRBUF_INIT;
1608 const char *one;
1609 if (d->head_path) {
Jiang Xin39598f92013-06-25 23:53:45 +08001610 one = quote_path(d->head_path, s->prefix, &onebuf);
Kevin Ballarddbfdc622010-11-08 18:44:38 -08001611 if (*one != '"' && strchr(one, ' ') != NULL) {
1612 putchar('"');
1613 strbuf_addch(&onebuf, '"');
1614 one = onebuf.buf;
1615 }
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01001616 printf("%s -> ", one);
1617 strbuf_release(&onebuf);
1618 }
Jiang Xin39598f92013-06-25 23:53:45 +08001619 one = quote_path(it->string, s->prefix, &onebuf);
Kevin Ballarddbfdc622010-11-08 18:44:38 -08001620 if (*one != '"' && strchr(one, ' ') != NULL) {
1621 putchar('"');
1622 strbuf_addch(&onebuf, '"');
1623 one = onebuf.buf;
1624 }
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01001625 printf("%s\n", one);
1626 strbuf_release(&onebuf);
1627 }
1628}
1629
Jeff King3207a3a2012-05-07 15:44:44 -04001630static void wt_shortstatus_other(struct string_list_item *it,
Junio C Hamano2381e392010-04-10 00:33:17 -07001631 struct wt_status *s, const char *sign)
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01001632{
Jeff King3207a3a2012-05-07 15:44:44 -04001633 if (s->null_termination) {
Junio C Hamano2381e392010-04-10 00:33:17 -07001634 fprintf(stdout, "%s %s%c", sign, it->string, 0);
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01001635 } else {
1636 struct strbuf onebuf = STRBUF_INIT;
1637 const char *one;
Jiang Xin39598f92013-06-25 23:53:45 +08001638 one = quote_path(it->string, s->prefix, &onebuf);
Junio C Hamanoc1909e72010-05-01 22:05:14 -07001639 color_fprintf(s->fp, color(WT_STATUS_UNTRACKED, s), "%s", sign);
Michael J Gruber3fe2a892009-12-05 16:04:38 +01001640 printf(" %s\n", one);
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01001641 strbuf_release(&onebuf);
1642 }
1643}
1644
Daniel Knittl-Frank05a59a02010-05-25 15:45:51 +02001645static void wt_shortstatus_print_tracking(struct wt_status *s)
1646{
1647 struct branch *branch;
1648 const char *header_color = color(WT_STATUS_HEADER, s);
1649 const char *branch_color_local = color(WT_STATUS_LOCAL_BRANCH, s);
1650 const char *branch_color_remote = color(WT_STATUS_REMOTE_BRANCH, s);
1651
1652 const char *base;
1653 const char *branch_name;
1654 int num_ours, num_theirs;
Jiang Xinf2e08732013-08-26 15:02:48 +08001655 int upstream_is_gone = 0;
Daniel Knittl-Frank05a59a02010-05-25 15:45:51 +02001656
1657 color_fprintf(s->fp, color(WT_STATUS_HEADER, s), "## ");
1658
1659 if (!s->branch)
1660 return;
1661 branch_name = s->branch;
1662
Daniel Knittl-Frank05a59a02010-05-25 15:45:51 +02001663 if (s->is_initial)
Ævar Arnfjörð Bjarmason98f5e242011-02-22 23:42:15 +00001664 color_fprintf(s->fp, header_color, _("Initial commit on "));
Jiang Xinf2e08732013-08-26 15:02:48 +08001665
René Scharfebaf0a3e2015-10-31 18:36:35 +01001666 if (!strcmp(s->branch, "HEAD")) {
1667 color_fprintf(s->fp, color(WT_STATUS_NOBRANCH, s), "%s",
1668 _("HEAD (no branch)"));
1669 goto conclude;
1670 }
1671
René Scharfec72b49d2015-10-31 18:37:43 +01001672 skip_prefix(branch_name, "refs/heads/", &branch_name);
René Scharfebaf0a3e2015-10-31 18:36:35 +01001673
René Scharfe8d8325f2015-10-31 18:37:12 +01001674 branch = branch_get(branch_name);
René Scharfebaf0a3e2015-10-31 18:36:35 +01001675
Jiang Xinf2e08732013-08-26 15:02:48 +08001676 color_fprintf(s->fp, branch_color_local, "%s", branch_name);
1677
Jeff King979cb242015-05-21 20:49:11 -04001678 if (stat_tracking_info(branch, &num_ours, &num_theirs, &base) < 0) {
René Scharfebcf8cc22015-10-31 18:36:01 +01001679 if (!base)
1680 goto conclude;
Jeff King979cb242015-05-21 20:49:11 -04001681
Jiang Xinf2e08732013-08-26 15:02:48 +08001682 upstream_is_gone = 1;
Daniel Knittl-Frank05a59a02010-05-25 15:45:51 +02001683 }
1684
Daniel Knittl-Frank05a59a02010-05-25 15:45:51 +02001685 base = shorten_unambiguous_ref(base, 0);
Daniel Knittl-Frank05a59a02010-05-25 15:45:51 +02001686 color_fprintf(s->fp, header_color, "...");
1687 color_fprintf(s->fp, branch_color_remote, "%s", base);
Stefan Beller0e32d4b2015-03-30 18:22:09 -07001688 free((char *)base);
Daniel Knittl-Frank05a59a02010-05-25 15:45:51 +02001689
René Scharfebcf8cc22015-10-31 18:36:01 +01001690 if (!upstream_is_gone && !num_ours && !num_theirs)
1691 goto conclude;
Jiang Xinf2234592013-08-26 15:02:49 +08001692
Matthieu Moy7a76c282014-03-20 13:12:41 +01001693#define LABEL(string) (s->no_gettext ? (string) : _(string))
1694
Daniel Knittl-Frank05a59a02010-05-25 15:45:51 +02001695 color_fprintf(s->fp, header_color, " [");
Jiang Xinf2e08732013-08-26 15:02:48 +08001696 if (upstream_is_gone) {
Matthieu Moy7a76c282014-03-20 13:12:41 +01001697 color_fprintf(s->fp, header_color, LABEL(N_("gone")));
Jiang Xinf2e08732013-08-26 15:02:48 +08001698 } else if (!num_ours) {
Matthieu Moy7a76c282014-03-20 13:12:41 +01001699 color_fprintf(s->fp, header_color, LABEL(N_("behind ")));
Daniel Knittl-Frank05a59a02010-05-25 15:45:51 +02001700 color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
1701 } else if (!num_theirs) {
Michael J Gruberdf227242016-03-14 16:30:33 +01001702 color_fprintf(s->fp, header_color, LABEL(N_("ahead ")));
Daniel Knittl-Frank05a59a02010-05-25 15:45:51 +02001703 color_fprintf(s->fp, branch_color_local, "%d", num_ours);
1704 } else {
Michael J Gruberdf227242016-03-14 16:30:33 +01001705 color_fprintf(s->fp, header_color, LABEL(N_("ahead ")));
Daniel Knittl-Frank05a59a02010-05-25 15:45:51 +02001706 color_fprintf(s->fp, branch_color_local, "%d", num_ours);
Matthieu Moy7a76c282014-03-20 13:12:41 +01001707 color_fprintf(s->fp, header_color, ", %s", LABEL(N_("behind ")));
Daniel Knittl-Frank05a59a02010-05-25 15:45:51 +02001708 color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
1709 }
1710
Jeff Kinga5985232012-05-07 17:02:18 -04001711 color_fprintf(s->fp, header_color, "]");
René Scharfebcf8cc22015-10-31 18:36:01 +01001712 conclude:
Jeff Kinga5985232012-05-07 17:02:18 -04001713 fputc(s->null_termination ? '\0' : '\n', s->fp);
Daniel Knittl-Frank05a59a02010-05-25 15:45:51 +02001714}
1715
Jeff Kingd4a6bf12012-05-07 17:09:04 -04001716void wt_shortstatus_print(struct wt_status *s)
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01001717{
1718 int i;
Daniel Knittl-Frank05a59a02010-05-25 15:45:51 +02001719
Jeff Kingd4a6bf12012-05-07 17:09:04 -04001720 if (s->show_branch)
Daniel Knittl-Frank05a59a02010-05-25 15:45:51 +02001721 wt_shortstatus_print_tracking(s);
1722
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01001723 for (i = 0; i < s->change.nr; i++) {
1724 struct wt_status_change_data *d;
1725 struct string_list_item *it;
1726
1727 it = &(s->change.items[i]);
1728 d = it->util;
1729 if (d->stagemask)
Jeff King3207a3a2012-05-07 15:44:44 -04001730 wt_shortstatus_unmerged(it, s);
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01001731 else
Jeff King3207a3a2012-05-07 15:44:44 -04001732 wt_shortstatus_status(it, s);
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01001733 }
1734 for (i = 0; i < s->untracked.nr; i++) {
1735 struct string_list_item *it;
1736
1737 it = &(s->untracked.items[i]);
Jeff King3207a3a2012-05-07 15:44:44 -04001738 wt_shortstatus_other(it, s, "??");
Junio C Hamano2381e392010-04-10 00:33:17 -07001739 }
1740 for (i = 0; i < s->ignored.nr; i++) {
1741 struct string_list_item *it;
1742
1743 it = &(s->ignored.items[i]);
Jeff King3207a3a2012-05-07 15:44:44 -04001744 wt_shortstatus_other(it, s, "!!");
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01001745 }
1746}
Jeff King4a7cc2f2009-12-07 00:17:15 -05001747
Jeff King3207a3a2012-05-07 15:44:44 -04001748void wt_porcelain_print(struct wt_status *s)
Jeff King4a7cc2f2009-12-07 00:17:15 -05001749{
1750 s->use_color = 0;
Jeff King86617682009-12-07 00:26:25 -05001751 s->relative_paths = 0;
1752 s->prefix = NULL;
Matthieu Moy7a76c282014-03-20 13:12:41 +01001753 s->no_gettext = 1;
Jeff Kingd4a6bf12012-05-07 17:09:04 -04001754 wt_shortstatus_print(s);
Jeff King4a7cc2f2009-12-07 00:17:15 -05001755}