blob: d75399085dead1ad52b36a12b505eef02b2036cc [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"
Jeff Kingdbbcd442020-07-28 16:23:39 -040011#include "strvec.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"
Johannes Schindelinfd849862016-10-07 18:08:38 +020019#include "lockfile.h"
Phillip Wood4a724862019-04-16 11:18:42 +010020#include "sequencer.h"
Jeff Kingc91f0d92006-09-08 04:05:34 -040021
Jeff Hostetler0a535612019-06-18 13:21:27 -070022#define AB_DELAY_WARNING_IN_MS (2 * 1000)
23
Nguyễn Thái Ngọc Duy983dc692014-02-17 19:15:30 +070024static const char cut_line[] =
Jens Lehmann1a72cfd2013-12-05 20:44:14 +010025"------------------------ >8 ------------------------\n";
26
Junio C Hamano23900a92009-08-09 23:08:40 -070027static char default_wt_status_colors[][COLOR_MAXLEN] = {
Arjen Laarhovendc6ebd42009-02-13 22:53:40 +010028 GIT_COLOR_NORMAL, /* WT_STATUS_HEADER */
29 GIT_COLOR_GREEN, /* WT_STATUS_UPDATED */
30 GIT_COLOR_RED, /* WT_STATUS_CHANGED */
31 GIT_COLOR_RED, /* WT_STATUS_UNTRACKED */
32 GIT_COLOR_RED, /* WT_STATUS_NOBRANCH */
Junio C Hamano4d4d5722009-08-05 00:04:51 -070033 GIT_COLOR_RED, /* WT_STATUS_UNMERGED */
Daniel Knittl-Frank05a59a02010-05-25 15:45:51 +020034 GIT_COLOR_GREEN, /* WT_STATUS_LOCAL_BRANCH */
35 GIT_COLOR_RED, /* WT_STATUS_REMOTE_BRANCH */
Jeff King148135f2010-12-09 12:27:08 -050036 GIT_COLOR_NIL, /* WT_STATUS_ONBRANCH */
Jeff Kingc91f0d92006-09-08 04:05:34 -040037};
Junio C Hamano4d229652007-01-11 15:34:41 -080038
Junio C Hamanod249b092009-08-09 21:59:30 -070039static const char *color(int slot, struct wt_status *s)
Jeff Kingc91f0d92006-09-08 04:05:34 -040040{
Jeff Kingdaa0c3d2011-08-17 22:04:23 -070041 const char *c = "";
42 if (want_color(s->use_color))
43 c = s->color_palette[slot];
Jeff King148135f2010-12-09 12:27:08 -050044 if (slot == WT_STATUS_ONBRANCH && color_is_nil(c))
45 c = s->color_palette[WT_STATUS_HEADER];
46 return c;
Jeff Kingc91f0d92006-09-08 04:05:34 -040047}
48
Jonathan Niederbecbdae2011-02-25 23:09:41 -060049static void status_vprintf(struct wt_status *s, int at_bol, const char *color,
50 const char *fmt, va_list ap, const char *trail)
51{
52 struct strbuf sb = STRBUF_INIT;
53 struct strbuf linebuf = STRBUF_INIT;
54 const char *line, *eol;
55
56 strbuf_vaddf(&sb, fmt, ap);
57 if (!sb.len) {
Matthieu Moy2556b992013-09-06 19:43:07 +020058 if (s->display_comment_prefix) {
59 strbuf_addch(&sb, comment_line_char);
60 if (!trail)
61 strbuf_addch(&sb, ' ');
62 }
Jonathan Niederbecbdae2011-02-25 23:09:41 -060063 color_print_strbuf(s->fp, color, &sb);
64 if (trail)
65 fprintf(s->fp, "%s", trail);
66 strbuf_release(&sb);
67 return;
68 }
69 for (line = sb.buf; *line; line = eol + 1) {
70 eol = strchr(line, '\n');
71
72 strbuf_reset(&linebuf);
Matthieu Moy2556b992013-09-06 19:43:07 +020073 if (at_bol && s->display_comment_prefix) {
Junio C Hamanoeff80a92013-01-16 20:18:48 +010074 strbuf_addch(&linebuf, comment_line_char);
Jonathan Niederbecbdae2011-02-25 23:09:41 -060075 if (*line != '\n' && *line != '\t')
76 strbuf_addch(&linebuf, ' ');
77 }
78 if (eol)
79 strbuf_add(&linebuf, line, eol - line);
80 else
81 strbuf_addstr(&linebuf, line);
82 color_print_strbuf(s->fp, color, &linebuf);
83 if (eol)
84 fprintf(s->fp, "\n");
85 else
86 break;
87 at_bol = 1;
88 }
89 if (trail)
90 fprintf(s->fp, "%s", trail);
91 strbuf_release(&linebuf);
92 strbuf_release(&sb);
93}
94
95void status_printf_ln(struct wt_status *s, const char *color,
96 const char *fmt, ...)
97{
98 va_list ap;
99
100 va_start(ap, fmt);
101 status_vprintf(s, 1, color, fmt, ap, "\n");
102 va_end(ap);
103}
104
105void status_printf(struct wt_status *s, const char *color,
106 const char *fmt, ...)
107{
108 va_list ap;
109
110 va_start(ap, fmt);
111 status_vprintf(s, 1, color, fmt, ap, NULL);
112 va_end(ap);
113}
114
Junio C Hamano1e248452012-09-15 22:46:26 -0700115static void status_printf_more(struct wt_status *s, const char *color,
116 const char *fmt, ...)
Jonathan Niederbecbdae2011-02-25 23:09:41 -0600117{
118 va_list ap;
119
120 va_start(ap, fmt);
121 status_vprintf(s, 0, color, fmt, ap, NULL);
122 va_end(ap);
123}
124
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +0100125void wt_status_prepare(struct repository *r, struct wt_status *s)
Jeff Kingc91f0d92006-09-08 04:05:34 -0400126{
Junio C Hamanocc46a742007-02-09 16:22:42 -0800127 memset(s, 0, sizeof(*s));
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +0100128 s->repo = r;
Junio C Hamano23900a92009-08-09 23:08:40 -0700129 memcpy(s->color_palette, default_wt_status_colors,
130 sizeof(default_wt_status_colors));
Junio C Hamanod249b092009-08-09 21:59:30 -0700131 s->show_untracked_files = SHOW_NORMAL_UNTRACKED_FILES;
132 s->use_color = -1;
133 s->relative_paths = 1;
René Scharfeefbd4fd2017-10-01 09:29:03 +0200134 s->branch = resolve_refdup("HEAD", 0, NULL, NULL);
Jeff Kingc91f0d92006-09-08 04:05:34 -0400135 s->reference = "HEAD";
Kristian Høgsbergf26a0012007-09-17 20:06:42 -0400136 s->fp = stdout;
Kristian Høgsberg0f729f22007-09-17 20:06:43 -0400137 s->index_file = get_index_file();
Junio C Hamano50b7e702009-08-04 23:49:33 -0700138 s->change.strdup_strings = 1;
Junio C Hamano76378682009-08-10 00:36:33 -0700139 s->untracked.strdup_strings = 1;
Junio C Hamano6cb3f6b2010-04-10 00:11:53 -0700140 s->ignored.strdup_strings = 1;
Junio C Hamano84b42022013-06-24 11:41:40 -0700141 s->show_branch = -1; /* unspecified */
Liam Beguinc1b5d012017-06-17 18:30:51 -0400142 s->show_stash = 0;
Jeff Hostetlerfd9b5442018-01-09 18:50:16 +0000143 s->ahead_behind_flags = AHEAD_BEHIND_UNSPECIFIED;
Matthieu Moy2556b992013-09-06 19:43:07 +0200144 s->display_comment_prefix = 0;
Ben Pearte8b2dc22018-05-11 15:38:58 +0000145 s->detect_rename = -1;
146 s->rename_score = -1;
147 s->rename_limit = -1;
Jeff Kingc91f0d92006-09-08 04:05:34 -0400148}
149
Jeff Hostetler957a0fe2016-08-05 18:00:26 -0400150static void wt_longstatus_print_unmerged_header(struct wt_status *s)
Junio C Hamano4d4d5722009-08-05 00:04:51 -0700151{
Lucien Kong96b0ec12012-06-05 22:21:26 +0200152 int i;
153 int del_mod_conflict = 0;
154 int both_deleted = 0;
155 int not_deleted = 0;
Junio C Hamanod249b092009-08-09 21:59:30 -0700156 const char *c = color(WT_STATUS_HEADER, s);
Junio C Hamano3c588452009-12-11 23:53:41 -0800157
Ævar Arnfjörð Bjarmason355ec7a2011-02-22 23:42:13 +0000158 status_printf_ln(s, c, _("Unmerged paths:"));
Lucien Kong96b0ec12012-06-05 22:21:26 +0200159
160 for (i = 0; i < s->change.nr; i++) {
161 struct string_list_item *it = &(s->change.items[i]);
162 struct wt_status_change_data *d = it->util;
163
164 switch (d->stagemask) {
165 case 0:
166 break;
167 case 1:
168 both_deleted = 1;
169 break;
170 case 3:
171 case 5:
172 del_mod_conflict = 1;
173 break;
174 default:
175 not_deleted = 1;
176 break;
177 }
178 }
179
Matthieu Moy6a964f52013-09-12 12:50:05 +0200180 if (!s->hints)
Jeff Kingedf563f2009-09-09 07:43:03 -0400181 return;
Jay Soffian37f7a852011-02-19 23:12:29 -0500182 if (s->whence != FROM_COMMIT)
Junio C Hamano3c588452009-12-11 23:53:41 -0800183 ;
Nguyễn Thái Ngọc Duy80f537f2019-04-25 16:45:58 +0700184 else if (!s->is_initial) {
185 if (!strcmp(s->reference, "HEAD"))
186 status_printf_ln(s, c,
187 _(" (use \"git restore --staged <file>...\" to unstage)"));
188 else
189 status_printf_ln(s, c,
190 _(" (use \"git restore --source=%s --staged <file>...\" to unstage)"),
191 s->reference);
192 } else
Ævar Arnfjörð Bjarmason355ec7a2011-02-22 23:42:13 +0000193 status_printf_ln(s, c, _(" (use \"git rm --cached <file>...\" to unstage)"));
Lucien Kong96b0ec12012-06-05 22:21:26 +0200194
195 if (!both_deleted) {
196 if (!del_mod_conflict)
197 status_printf_ln(s, c, _(" (use \"git add <file>...\" to mark resolution)"));
198 else
199 status_printf_ln(s, c, _(" (use \"git add/rm <file>...\" as appropriate to mark resolution)"));
200 } else if (!del_mod_conflict && !not_deleted) {
201 status_printf_ln(s, c, _(" (use \"git rm <file>...\" to mark resolution)"));
202 } else {
203 status_printf_ln(s, c, _(" (use \"git add/rm <file>...\" as appropriate to mark resolution)"));
204 }
Junio C Hamano4d4d5722009-08-05 00:04:51 -0700205}
206
Jeff Hostetler957a0fe2016-08-05 18:00:26 -0400207static void wt_longstatus_print_cached_header(struct wt_status *s)
Jürgen Rühle3c1eb9c2007-01-02 20:26:21 +0100208{
Junio C Hamanod249b092009-08-09 21:59:30 -0700209 const char *c = color(WT_STATUS_HEADER, s);
Junio C Hamano3c588452009-12-11 23:53:41 -0800210
Ævar Arnfjörð Bjarmason919a4ce2011-02-22 23:42:16 +0000211 status_printf_ln(s, c, _("Changes to be committed:"));
Matthieu Moy6a964f52013-09-12 12:50:05 +0200212 if (!s->hints)
Jeff Kingedf563f2009-09-09 07:43:03 -0400213 return;
Jay Soffian37f7a852011-02-19 23:12:29 -0500214 if (s->whence != FROM_COMMIT)
Junio C Hamano3c588452009-12-11 23:53:41 -0800215 ; /* NEEDSWORK: use "git reset --unresolve"??? */
Nguyễn Thái Ngọc Duy80f537f2019-04-25 16:45:58 +0700216 else if (!s->is_initial) {
217 if (!strcmp(s->reference, "HEAD"))
218 status_printf_ln(s, c
219 , _(" (use \"git restore --staged <file>...\" to unstage)"));
220 else
221 status_printf_ln(s, c,
222 _(" (use \"git restore --source=%s --staged <file>...\" to unstage)"),
223 s->reference);
224 } else
Ævar Arnfjörð Bjarmason355ec7a2011-02-22 23:42:13 +0000225 status_printf_ln(s, c, _(" (use \"git rm --cached <file>...\" to unstage)"));
Jürgen Rühle3c1eb9c2007-01-02 20:26:21 +0100226}
227
Jeff Hostetler957a0fe2016-08-05 18:00:26 -0400228static void wt_longstatus_print_dirty_header(struct wt_status *s,
229 int has_deleted,
230 int has_dirty_submodules)
Jeff Kingc91f0d92006-09-08 04:05:34 -0400231{
Junio C Hamanod249b092009-08-09 21:59:30 -0700232 const char *c = color(WT_STATUS_HEADER, s);
Junio C Hamano3c588452009-12-11 23:53:41 -0800233
Ævar Arnfjörð Bjarmason355ec7a2011-02-22 23:42:13 +0000234 status_printf_ln(s, c, _("Changes not staged for commit:"));
Matthieu Moy6a964f52013-09-12 12:50:05 +0200235 if (!s->hints)
Jeff Kingedf563f2009-09-09 07:43:03 -0400236 return;
Anders Melchiorsenbb914b12008-09-08 00:05:02 +0200237 if (!has_deleted)
Ævar Arnfjörð Bjarmason355ec7a2011-02-22 23:42:13 +0000238 status_printf_ln(s, c, _(" (use \"git add <file>...\" to update what will be committed)"));
Anders Melchiorsenbb914b12008-09-08 00:05:02 +0200239 else
Ævar Arnfjörð Bjarmason355ec7a2011-02-22 23:42:13 +0000240 status_printf_ln(s, c, _(" (use \"git add/rm <file>...\" to update what will be committed)"));
Nguyễn Thái Ngọc Duy80f537f2019-04-25 16:45:58 +0700241 status_printf_ln(s, c, _(" (use \"git restore <file>...\" to discard changes in working directory)"));
Jens Lehmann9297f77e62010-03-08 13:53:19 +0100242 if (has_dirty_submodules)
Ævar Arnfjörð Bjarmason355ec7a2011-02-22 23:42:13 +0000243 status_printf_ln(s, c, _(" (commit or discard the untracked or modified content in submodules)"));
Anders Melchiorsenbb914b12008-09-08 00:05:02 +0200244}
245
Jeff Hostetler957a0fe2016-08-05 18:00:26 -0400246static void wt_longstatus_print_other_header(struct wt_status *s,
247 const char *what,
248 const char *how)
Anders Melchiorsenbb914b12008-09-08 00:05:02 +0200249{
Junio C Hamanod249b092009-08-09 21:59:30 -0700250 const char *c = color(WT_STATUS_HEADER, s);
Nguyễn Thái Ngọc Duy50bd8b72012-09-06 22:16:50 +0700251 status_printf_ln(s, c, "%s:", what);
Matthieu Moy6a964f52013-09-12 12:50:05 +0200252 if (!s->hints)
Jeff Kingedf563f2009-09-09 07:43:03 -0400253 return;
Ævar Arnfjörð Bjarmason355ec7a2011-02-22 23:42:13 +0000254 status_printf_ln(s, c, _(" (use \"git %s <file>...\" to include in what will be committed)"), how);
Jeff Kingc91f0d92006-09-08 04:05:34 -0400255}
256
Jeff Hostetler957a0fe2016-08-05 18:00:26 -0400257static void wt_longstatus_print_trailer(struct wt_status *s)
Jeff Kingc91f0d92006-09-08 04:05:34 -0400258{
Felipe Contreras7d7d6802014-05-04 01:12:55 -0500259 status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", "");
Jeff Kingc91f0d92006-09-08 04:05:34 -0400260}
261
Dmitry Potapova734d0b2008-03-07 05:30:58 +0300262#define quote_path quote_path_relative
Junio C Hamano3a946802006-11-08 13:20:46 -0800263
Jonathan Nieder8f17f5b2013-12-19 11:43:19 -0800264static const char *wt_status_unmerged_status_string(int stagemask)
Junio C Hamano4d4d5722009-08-05 00:04:51 -0700265{
Jonathan Nieder8f17f5b2013-12-19 11:43:19 -0800266 switch (stagemask) {
267 case 1:
268 return _("both deleted:");
269 case 2:
270 return _("added by us:");
271 case 3:
272 return _("deleted by them:");
273 case 4:
274 return _("added by them:");
275 case 5:
276 return _("deleted by us:");
277 case 6:
278 return _("both added:");
279 case 7:
280 return _("both modified:");
281 default:
Johannes Schindelin033abf92018-05-02 11:38:39 +0200282 BUG("unhandled unmerged status %x", stagemask);
Junio C Hamano4d4d5722009-08-05 00:04:51 -0700283 }
Junio C Hamano4d4d5722009-08-05 00:04:51 -0700284}
285
Nguyễn Thái Ngọc Duy3651e452013-11-05 09:07:29 +0700286static const char *wt_status_diff_status_string(int status)
287{
288 switch (status) {
289 case DIFF_STATUS_ADDED:
Junio C Hamanod52cb572014-03-12 13:51:22 -0700290 return _("new file:");
Nguyễn Thái Ngọc Duy3651e452013-11-05 09:07:29 +0700291 case DIFF_STATUS_COPIED:
Junio C Hamanod52cb572014-03-12 13:51:22 -0700292 return _("copied:");
Nguyễn Thái Ngọc Duy3651e452013-11-05 09:07:29 +0700293 case DIFF_STATUS_DELETED:
Junio C Hamanod52cb572014-03-12 13:51:22 -0700294 return _("deleted:");
Nguyễn Thái Ngọc Duy3651e452013-11-05 09:07:29 +0700295 case DIFF_STATUS_MODIFIED:
Junio C Hamanod52cb572014-03-12 13:51:22 -0700296 return _("modified:");
Nguyễn Thái Ngọc Duy3651e452013-11-05 09:07:29 +0700297 case DIFF_STATUS_RENAMED:
Junio C Hamanod52cb572014-03-12 13:51:22 -0700298 return _("renamed:");
Nguyễn Thái Ngọc Duy3651e452013-11-05 09:07:29 +0700299 case DIFF_STATUS_TYPE_CHANGED:
Junio C Hamanod52cb572014-03-12 13:51:22 -0700300 return _("typechange:");
Nguyễn Thái Ngọc Duy3651e452013-11-05 09:07:29 +0700301 case DIFF_STATUS_UNKNOWN:
Junio C Hamanod52cb572014-03-12 13:51:22 -0700302 return _("unknown:");
Nguyễn Thái Ngọc Duy3651e452013-11-05 09:07:29 +0700303 case DIFF_STATUS_UNMERGED:
Junio C Hamanod52cb572014-03-12 13:51:22 -0700304 return _("unmerged:");
Nguyễn Thái Ngọc Duy3651e452013-11-05 09:07:29 +0700305 default:
306 return NULL;
307 }
308}
309
Jonathan Nieder335e8252013-12-19 11:43:19 -0800310static int maxwidth(const char *(*label)(int), int minval, int maxval)
311{
312 int result = 0, i;
313
314 for (i = minval; i <= maxval; i++) {
315 const char *s = label(i);
316 int len = s ? utf8_strwidth(s) : 0;
317 if (len > result)
318 result = len;
319 }
320 return result;
321}
322
Jeff Hostetler957a0fe2016-08-05 18:00:26 -0400323static void wt_longstatus_print_unmerged_data(struct wt_status *s,
324 struct string_list_item *it)
Jonathan Nieder8f17f5b2013-12-19 11:43:19 -0800325{
326 const char *c = color(WT_STATUS_UNMERGED, s);
327 struct wt_status_change_data *d = it->util;
328 struct strbuf onebuf = STRBUF_INIT;
329 static char *padding;
330 static int label_width;
331 const char *one, *how;
332 int len;
333
334 if (!padding) {
335 label_width = maxwidth(wt_status_unmerged_status_string, 1, 7);
336 label_width += strlen(" ");
Jonathan Nieder8f17f5b2013-12-19 11:43:19 -0800337 padding = xmallocz(label_width);
338 memset(padding, ' ', label_width);
339 }
340
341 one = quote_path(it->string, s->prefix, &onebuf);
342 status_printf(s, color(WT_STATUS_HEADER, s), "\t");
343
344 how = wt_status_unmerged_status_string(d->stagemask);
345 len = label_width - utf8_strwidth(how);
346 status_printf_more(s, c, "%s%.*s%s\n", how, len, padding, one);
347 strbuf_release(&onebuf);
348}
349
Jeff Hostetler957a0fe2016-08-05 18:00:26 -0400350static void wt_longstatus_print_change_data(struct wt_status *s,
351 int change_type,
352 struct string_list_item *it)
Jeff Kingc91f0d92006-09-08 04:05:34 -0400353{
Junio C Hamano50b7e702009-08-04 23:49:33 -0700354 struct wt_status_change_data *d = it->util;
Junio C Hamanod249b092009-08-09 21:59:30 -0700355 const char *c = color(change_type, s);
Jeff Kingb8527d52013-03-21 07:05:28 -0400356 int status;
Junio C Hamano50b7e702009-08-04 23:49:33 -0700357 char *one_name;
358 char *two_name;
Junio C Hamano3a946802006-11-08 13:20:46 -0800359 const char *one, *two;
Brandon Caseyf285a2d2008-10-09 14:12:12 -0500360 struct strbuf onebuf = STRBUF_INIT, twobuf = STRBUF_INIT;
Jens Lehmann9297f77e62010-03-08 13:53:19 +0100361 struct strbuf extra = STRBUF_INIT;
Nguyễn Thái Ngọc Duy3651e452013-11-05 09:07:29 +0700362 static char *padding;
Junio C Hamanod52cb572014-03-12 13:51:22 -0700363 static int label_width;
Nguyễn Thái Ngọc Duy3651e452013-11-05 09:07:29 +0700364 const char *what;
365 int len;
366
367 if (!padding) {
Jonathan Nieder335e8252013-12-19 11:43:19 -0800368 /* If DIFF_STATUS_* uses outside the range [A..Z], we're in trouble */
369 label_width = maxwidth(wt_status_diff_status_string, 'A', 'Z');
Junio C Hamanod52cb572014-03-12 13:51:22 -0700370 label_width += strlen(" ");
371 padding = xmallocz(label_width);
372 memset(padding, ' ', label_width);
Nguyễn Thái Ngọc Duy3651e452013-11-05 09:07:29 +0700373 }
Junio C Hamano3a946802006-11-08 13:20:46 -0800374
Junio C Hamano50b7e702009-08-04 23:49:33 -0700375 one_name = two_name = it->string;
376 switch (change_type) {
377 case WT_STATUS_UPDATED:
378 status = d->index_status;
Junio C Hamano50b7e702009-08-04 23:49:33 -0700379 break;
380 case WT_STATUS_CHANGED:
Jens Lehmann9297f77e62010-03-08 13:53:19 +0100381 if (d->new_submodule_commits || d->dirty_submodule) {
382 strbuf_addstr(&extra, " (");
383 if (d->new_submodule_commits)
René Scharfea22ae752016-09-15 20:31:00 +0200384 strbuf_addstr(&extra, _("new commits, "));
Jens Lehmann9297f77e62010-03-08 13:53:19 +0100385 if (d->dirty_submodule & DIRTY_SUBMODULE_MODIFIED)
René Scharfea22ae752016-09-15 20:31:00 +0200386 strbuf_addstr(&extra, _("modified content, "));
Jens Lehmann9297f77e62010-03-08 13:53:19 +0100387 if (d->dirty_submodule & DIRTY_SUBMODULE_UNTRACKED)
René Scharfea22ae752016-09-15 20:31:00 +0200388 strbuf_addstr(&extra, _("untracked content, "));
Jens Lehmann9297f77e62010-03-08 13:53:19 +0100389 strbuf_setlen(&extra, extra.len - 2);
390 strbuf_addch(&extra, ')');
391 }
Junio C Hamano50b7e702009-08-04 23:49:33 -0700392 status = d->worktree_status;
393 break;
Jeff Kingb8527d52013-03-21 07:05:28 -0400394 default:
Johannes Schindelin033abf92018-05-02 11:38:39 +0200395 BUG("unhandled change_type %d in wt_longstatus_print_change_data",
Jeff Kingb8527d52013-03-21 07:05:28 -0400396 change_type);
Junio C Hamano50b7e702009-08-04 23:49:33 -0700397 }
398
Nguyễn Thái Ngọc Duy176ea742017-12-27 17:18:39 +0700399 /*
400 * Only pick up the rename it's relevant. If the rename is for
401 * the changed section and we're printing the updated section,
402 * ignore it.
403 */
404 if (d->rename_status == status)
405 one_name = d->rename_source;
406
Jiang Xin39598f92013-06-25 23:53:45 +0800407 one = quote_path(one_name, s->prefix, &onebuf);
408 two = quote_path(two_name, s->prefix, &twobuf);
Junio C Hamano3a946802006-11-08 13:20:46 -0800409
Jonathan Niederb926c0d2011-02-25 23:11:37 -0600410 status_printf(s, color(WT_STATUS_HEADER, s), "\t");
Nguyễn Thái Ngọc Duy3651e452013-11-05 09:07:29 +0700411 what = wt_status_diff_status_string(status);
412 if (!what)
Johannes Schindelin033abf92018-05-02 11:38:39 +0200413 BUG("unhandled diff status %c", status);
Junio C Hamanod52cb572014-03-12 13:51:22 -0700414 len = label_width - utf8_strwidth(what);
Nguyễn Thái Ngọc Duy3651e452013-11-05 09:07:29 +0700415 assert(len >= 0);
Nguyễn Thái Ngọc Duy5134ccd2017-12-27 17:18:38 +0700416 if (one_name != two_name)
Junio C Hamanod52cb572014-03-12 13:51:22 -0700417 status_printf_more(s, c, "%s%.*s%s -> %s",
Nguyễn Thái Ngọc Duy3651e452013-11-05 09:07:29 +0700418 what, len, padding, one, two);
419 else
Junio C Hamanod52cb572014-03-12 13:51:22 -0700420 status_printf_more(s, c, "%s%.*s%s",
Nguyễn Thái Ngọc Duy3651e452013-11-05 09:07:29 +0700421 what, len, padding, one);
Jens Lehmann9297f77e62010-03-08 13:53:19 +0100422 if (extra.len) {
Jonathan Niederb926c0d2011-02-25 23:11:37 -0600423 status_printf_more(s, color(WT_STATUS_HEADER, s), "%s", extra.buf);
Jens Lehmann9297f77e62010-03-08 13:53:19 +0100424 strbuf_release(&extra);
425 }
Jonathan Niederb926c0d2011-02-25 23:11:37 -0600426 status_printf_more(s, GIT_COLOR_NORMAL, "\n");
Johannes Schindelin367c9882007-11-11 17:35:41 +0000427 strbuf_release(&onebuf);
428 strbuf_release(&twobuf);
Jeff Kingc91f0d92006-09-08 04:05:34 -0400429}
430
Nguyễn Thái Ngọc Duy98bc94e2017-12-27 17:18:36 +0700431static char short_submodule_status(struct wt_status_change_data *d)
432{
Stefan Bellerdd6962d2017-03-29 15:26:15 -0700433 if (d->new_submodule_commits)
434 return 'M';
435 if (d->dirty_submodule & DIRTY_SUBMODULE_MODIFIED)
436 return 'm';
437 if (d->dirty_submodule & DIRTY_SUBMODULE_UNTRACKED)
438 return '?';
439 return d->worktree_status;
440}
441
Junio C Hamano50b7e702009-08-04 23:49:33 -0700442static void wt_status_collect_changed_cb(struct diff_queue_struct *q,
443 struct diff_options *options,
444 void *data)
Jeff Kingc91f0d92006-09-08 04:05:34 -0400445{
446 struct wt_status *s = data;
Jeff Kingc91f0d92006-09-08 04:05:34 -0400447 int i;
Junio C Hamano50b7e702009-08-04 23:49:33 -0700448
449 if (!q->nr)
450 return;
451 s->workdir_dirty = 1;
Jeff Kingc91f0d92006-09-08 04:05:34 -0400452 for (i = 0; i < q->nr; i++) {
Junio C Hamano50b7e702009-08-04 23:49:33 -0700453 struct diff_filepair *p;
454 struct string_list_item *it;
455 struct wt_status_change_data *d;
456
457 p = q->queue[i];
Nguyễn Thái Ngọc Duy176ea742017-12-27 17:18:39 +0700458 it = string_list_insert(&s->change, p->two->path);
Junio C Hamano50b7e702009-08-04 23:49:33 -0700459 d = it->util;
460 if (!d) {
461 d = xcalloc(1, sizeof(*d));
462 it->util = d;
Jeff Kingc91f0d92006-09-08 04:05:34 -0400463 }
Junio C Hamano50b7e702009-08-04 23:49:33 -0700464 if (!d->worktree_status)
465 d->worktree_status = p->status;
Stefan Bellerdd6962d2017-03-29 15:26:15 -0700466 if (S_ISGITLINK(p->two->mode)) {
467 d->dirty_submodule = p->two->dirty_submodule;
Jeff King4a7e27e2018-08-28 17:22:40 -0400468 d->new_submodule_commits = !oideq(&p->one->oid,
469 &p->two->oid);
Stefan Bellerdd6962d2017-03-29 15:26:15 -0700470 if (s->status_format == STATUS_FORMAT_SHORT)
471 d->worktree_status = short_submodule_status(d);
472 }
Jeff Hostetler1ecdecc2016-08-11 10:45:57 -0400473
474 switch (p->status) {
475 case DIFF_STATUS_ADDED:
Nguyễn Thái Ngọc Duy425a28e2016-10-24 17:42:19 +0700476 d->mode_worktree = p->two->mode;
Jeff Hostetler1ecdecc2016-08-11 10:45:57 -0400477 break;
478
479 case DIFF_STATUS_DELETED:
480 d->mode_index = p->one->mode;
481 oidcpy(&d->oid_index, &p->one->oid);
482 /* mode_worktree is zero for a delete. */
483 break;
484
Nguyễn Thái Ngọc Duy176ea742017-12-27 17:18:39 +0700485 case DIFF_STATUS_COPIED:
486 case DIFF_STATUS_RENAMED:
487 if (d->rename_status)
Johannes Schindelin033abf92018-05-02 11:38:39 +0200488 BUG("multiple renames on the same target? how?");
Nguyễn Thái Ngọc Duy176ea742017-12-27 17:18:39 +0700489 d->rename_source = xstrdup(p->one->path);
490 d->rename_score = p->score * 100 / MAX_SCORE;
491 d->rename_status = p->status;
492 /* fallthru */
Jeff Hostetler1ecdecc2016-08-11 10:45:57 -0400493 case DIFF_STATUS_MODIFIED:
494 case DIFF_STATUS_TYPE_CHANGED:
495 case DIFF_STATUS_UNMERGED:
496 d->mode_index = p->one->mode;
497 d->mode_worktree = p->two->mode;
498 oidcpy(&d->oid_index, &p->one->oid);
499 break;
500
Nguyễn Thái Ngọc Duyea56f972017-12-27 17:18:37 +0700501 default:
Johannes Schindelin033abf92018-05-02 11:38:39 +0200502 BUG("unhandled diff-files status '%c'", p->status);
Jeff Hostetler1ecdecc2016-08-11 10:45:57 -0400503 break;
504 }
505
Jeff Kingc91f0d92006-09-08 04:05:34 -0400506 }
Jeff Kingc91f0d92006-09-08 04:05:34 -0400507}
508
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +0100509static int unmerged_mask(struct index_state *istate, const char *path)
Junio C Hamano4d4d5722009-08-05 00:04:51 -0700510{
511 int pos, mask;
Nguyễn Thái Ngọc Duy9c5e6c82013-07-09 22:29:00 +0700512 const struct cache_entry *ce;
Junio C Hamano4d4d5722009-08-05 00:04:51 -0700513
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +0100514 pos = index_name_pos(istate, path, strlen(path));
Junio C Hamano4d4d5722009-08-05 00:04:51 -0700515 if (0 <= pos)
516 return 0;
517
518 mask = 0;
519 pos = -pos-1;
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +0100520 while (pos < istate->cache_nr) {
521 ce = istate->cache[pos++];
Junio C Hamano4d4d5722009-08-05 00:04:51 -0700522 if (strcmp(ce->name, path) || !ce_stage(ce))
523 break;
524 mask |= (1 << (ce_stage(ce) - 1));
525 }
526 return mask;
527}
528
Junio C Hamano50b7e702009-08-04 23:49:33 -0700529static void wt_status_collect_updated_cb(struct diff_queue_struct *q,
530 struct diff_options *options,
531 void *data)
Jeff Kingc91f0d92006-09-08 04:05:34 -0400532{
Jürgen Rühle6e458bf2007-01-02 20:26:22 +0100533 struct wt_status *s = data;
Jeff Kingc91f0d92006-09-08 04:05:34 -0400534 int i;
Junio C Hamano50b7e702009-08-04 23:49:33 -0700535
536 for (i = 0; i < q->nr; i++) {
537 struct diff_filepair *p;
538 struct string_list_item *it;
539 struct wt_status_change_data *d;
540
541 p = q->queue[i];
Julian Phillips78a395d2010-06-26 00:41:35 +0100542 it = string_list_insert(&s->change, p->two->path);
Junio C Hamano50b7e702009-08-04 23:49:33 -0700543 d = it->util;
544 if (!d) {
545 d = xcalloc(1, sizeof(*d));
546 it->util = d;
547 }
548 if (!d->index_status)
549 d->index_status = p->status;
550 switch (p->status) {
Jeff Hostetler1ecdecc2016-08-11 10:45:57 -0400551 case DIFF_STATUS_ADDED:
552 /* Leave {mode,oid}_head zero for an add. */
553 d->mode_index = p->two->mode;
554 oidcpy(&d->oid_index, &p->two->oid);
Stephen P. Smithf3bd35f2018-09-05 17:53:29 -0700555 s->committable = 1;
Jeff Hostetler1ecdecc2016-08-11 10:45:57 -0400556 break;
557 case DIFF_STATUS_DELETED:
558 d->mode_head = p->one->mode;
559 oidcpy(&d->oid_head, &p->one->oid);
Stephen P. Smithf3bd35f2018-09-05 17:53:29 -0700560 s->committable = 1;
Jeff Hostetler1ecdecc2016-08-11 10:45:57 -0400561 /* Leave {mode,oid}_index zero for a delete. */
562 break;
563
Junio C Hamano50b7e702009-08-04 23:49:33 -0700564 case DIFF_STATUS_COPIED:
565 case DIFF_STATUS_RENAMED:
Nguyễn Thái Ngọc Duy176ea742017-12-27 17:18:39 +0700566 if (d->rename_status)
Johannes Schindelin033abf92018-05-02 11:38:39 +0200567 BUG("multiple renames on the same target? how?");
Nguyễn Thái Ngọc Duy5134ccd2017-12-27 17:18:38 +0700568 d->rename_source = xstrdup(p->one->path);
569 d->rename_score = p->score * 100 / MAX_SCORE;
570 d->rename_status = p->status;
Jeff Hostetler1ecdecc2016-08-11 10:45:57 -0400571 /* fallthru */
572 case DIFF_STATUS_MODIFIED:
573 case DIFF_STATUS_TYPE_CHANGED:
574 d->mode_head = p->one->mode;
575 d->mode_index = p->two->mode;
576 oidcpy(&d->oid_head, &p->one->oid);
577 oidcpy(&d->oid_index, &p->two->oid);
Stephen P. Smithf3bd35f2018-09-05 17:53:29 -0700578 s->committable = 1;
Junio C Hamano50b7e702009-08-04 23:49:33 -0700579 break;
Junio C Hamano4d4d5722009-08-05 00:04:51 -0700580 case DIFF_STATUS_UNMERGED:
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +0100581 d->stagemask = unmerged_mask(s->repo->index,
582 p->two->path);
Jeff Hostetler1ecdecc2016-08-11 10:45:57 -0400583 /*
584 * Don't bother setting {mode,oid}_{head,index} since the print
585 * code will output the stage values directly and not use the
586 * values in these fields.
587 */
Junio C Hamano4d4d5722009-08-05 00:04:51 -0700588 break;
Nguyễn Thái Ngọc Duyea56f972017-12-27 17:18:37 +0700589
590 default:
Johannes Schindelin033abf92018-05-02 11:38:39 +0200591 BUG("unhandled diff-index status '%c'", p->status);
Nguyễn Thái Ngọc Duyea56f972017-12-27 17:18:37 +0700592 break;
Junio C Hamano50b7e702009-08-04 23:49:33 -0700593 }
Jürgen Rühle6e458bf2007-01-02 20:26:22 +0100594 }
Jeff Kingc91f0d92006-09-08 04:05:34 -0400595}
596
Junio C Hamano50b7e702009-08-04 23:49:33 -0700597static void wt_status_collect_changes_worktree(struct wt_status *s)
Jeff Kingc91f0d92006-09-08 04:05:34 -0400598{
599 struct rev_info rev;
Junio C Hamano50b7e702009-08-04 23:49:33 -0700600
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +0100601 repo_init_revisions(s->repo, &rev, NULL);
Junio C Hamano50b7e702009-08-04 23:49:33 -0700602 setup_revisions(0, NULL, &rev, NULL);
603 rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
Brandon Williams0d1e0e72017-10-31 11:19:11 -0700604 rev.diffopt.flags.dirty_submodules = 1;
Nguyễn Thái Ngọc Duy425a28e2016-10-24 17:42:19 +0700605 rev.diffopt.ita_invisible_in_index = 1;
Jens Lehmann3bfc4502010-03-13 23:00:27 +0100606 if (!s->show_untracked_files)
Brandon Williams0d1e0e72017-10-31 11:19:11 -0700607 rev.diffopt.flags.ignore_untracked_in_submodules = 1;
Jens Lehmannaee9c7d2010-08-06 00:39:25 +0200608 if (s->ignore_submodule_arg) {
Brandon Williams0d1e0e72017-10-31 11:19:11 -0700609 rev.diffopt.flags.override_submodule_config = 1;
Jens Lehmann46a958b2010-06-25 16:56:47 +0200610 handle_ignore_submodules_arg(&rev.diffopt, s->ignore_submodule_arg);
Nguyễn Thái Ngọc Duyc4c42f22011-10-24 15:24:51 +1100611 }
Junio C Hamano50b7e702009-08-04 23:49:33 -0700612 rev.diffopt.format_callback = wt_status_collect_changed_cb;
613 rev.diffopt.format_callback_data = s;
Ben Pearte8b2dc22018-05-11 15:38:58 +0000614 rev.diffopt.detect_rename = s->detect_rename >= 0 ? s->detect_rename : rev.diffopt.detect_rename;
615 rev.diffopt.rename_limit = s->rename_limit >= 0 ? s->rename_limit : rev.diffopt.rename_limit;
616 rev.diffopt.rename_score = s->rename_score >= 0 ? s->rename_score : rev.diffopt.rename_score;
Nguyễn Thái Ngọc Duy15b55ae2013-07-14 15:35:39 +0700617 copy_pathspec(&rev.prune_data, &s->pathspec);
Junio C Hamano50b7e702009-08-04 23:49:33 -0700618 run_diff_files(&rev, 0);
619}
620
621static void wt_status_collect_changes_index(struct wt_status *s)
622{
623 struct rev_info rev;
Junio C Hamano32962c92010-03-08 22:58:09 -0800624 struct setup_revision_opt opt;
Junio C Hamano50b7e702009-08-04 23:49:33 -0700625
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +0100626 repo_init_revisions(s->repo, &rev, NULL);
Junio C Hamano32962c92010-03-08 22:58:09 -0800627 memset(&opt, 0, sizeof(opt));
brian m. carlsonf2e51192018-05-02 00:26:00 +0000628 opt.def = s->is_initial ? empty_tree_oid_hex() : s->reference;
Junio C Hamano32962c92010-03-08 22:58:09 -0800629 setup_revisions(0, NULL, &rev, &opt);
630
Brandon Williams0d1e0e72017-10-31 11:19:11 -0700631 rev.diffopt.flags.override_submodule_config = 1;
Nguyễn Thái Ngọc Duy425a28e2016-10-24 17:42:19 +0700632 rev.diffopt.ita_invisible_in_index = 1;
Jens Lehmannaee9c7d2010-08-06 00:39:25 +0200633 if (s->ignore_submodule_arg) {
Jens Lehmann46a958b2010-06-25 16:56:47 +0200634 handle_ignore_submodules_arg(&rev.diffopt, s->ignore_submodule_arg);
Jens Lehmann1d2f3932014-04-05 18:59:03 +0200635 } else {
636 /*
637 * Unless the user did explicitly request a submodule ignore
638 * mode by passing a command line option we do not ignore any
639 * changed submodule SHA-1s when comparing index and HEAD, no
640 * matter what is configured. Otherwise the user won't be
641 * shown any submodules she manually added (and which are
642 * staged to be committed), which would be really confusing.
643 */
644 handle_ignore_submodules_arg(&rev.diffopt, "dirty");
Jens Lehmannaee9c7d2010-08-06 00:39:25 +0200645 }
Jens Lehmann46a958b2010-06-25 16:56:47 +0200646
Jeff Kingc91f0d92006-09-08 04:05:34 -0400647 rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
Junio C Hamano50b7e702009-08-04 23:49:33 -0700648 rev.diffopt.format_callback = wt_status_collect_updated_cb;
Jeff Kingc91f0d92006-09-08 04:05:34 -0400649 rev.diffopt.format_callback_data = s;
Ben Pearte8b2dc22018-05-11 15:38:58 +0000650 rev.diffopt.detect_rename = s->detect_rename >= 0 ? s->detect_rename : rev.diffopt.detect_rename;
651 rev.diffopt.rename_limit = s->rename_limit >= 0 ? s->rename_limit : rev.diffopt.rename_limit;
652 rev.diffopt.rename_score = s->rename_score >= 0 ? s->rename_score : rev.diffopt.rename_score;
Nguyễn Thái Ngọc Duy15b55ae2013-07-14 15:35:39 +0700653 copy_pathspec(&rev.prune_data, &s->pathspec);
Jeff Kingc91f0d92006-09-08 04:05:34 -0400654 run_diff_index(&rev, 1);
655}
656
Junio C Hamano50b7e702009-08-04 23:49:33 -0700657static void wt_status_collect_changes_initial(struct wt_status *s)
658{
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +0100659 struct index_state *istate = s->repo->index;
Junio C Hamano50b7e702009-08-04 23:49:33 -0700660 int i;
661
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +0100662 for (i = 0; i < istate->cache_nr; i++) {
Junio C Hamano50b7e702009-08-04 23:49:33 -0700663 struct string_list_item *it;
664 struct wt_status_change_data *d;
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +0100665 const struct cache_entry *ce = istate->cache[i];
Junio C Hamano50b7e702009-08-04 23:49:33 -0700666
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +0100667 if (!ce_path_match(istate, ce, &s->pathspec, NULL))
Junio C Hamano76e2f7c2009-08-07 23:31:57 -0700668 continue;
Nguyễn Thái Ngọc Duy425a28e2016-10-24 17:42:19 +0700669 if (ce_intent_to_add(ce))
670 continue;
Julian Phillips78a395d2010-06-26 00:41:35 +0100671 it = string_list_insert(&s->change, ce->name);
Junio C Hamano50b7e702009-08-04 23:49:33 -0700672 d = it->util;
673 if (!d) {
674 d = xcalloc(1, sizeof(*d));
675 it->util = d;
676 }
Junio C Hamano4d4d5722009-08-05 00:04:51 -0700677 if (ce_stage(ce)) {
Junio C Hamano50b7e702009-08-04 23:49:33 -0700678 d->index_status = DIFF_STATUS_UNMERGED;
Junio C Hamano4d4d5722009-08-05 00:04:51 -0700679 d->stagemask |= (1 << (ce_stage(ce) - 1));
Jeff Hostetler1ecdecc2016-08-11 10:45:57 -0400680 /*
681 * Don't bother setting {mode,oid}_{head,index} since the print
682 * code will output the stage values directly and not use the
683 * values in these fields.
684 */
Stephen P. Smithf3bd35f2018-09-05 17:53:29 -0700685 s->committable = 1;
Jeff Hostetler1ecdecc2016-08-11 10:45:57 -0400686 } else {
Junio C Hamano50b7e702009-08-04 23:49:33 -0700687 d->index_status = DIFF_STATUS_ADDED;
Jeff Hostetler1ecdecc2016-08-11 10:45:57 -0400688 /* Leave {mode,oid}_head zero for adds. */
689 d->mode_index = ce->ce_mode;
René Scharfe86947692017-01-28 23:03:06 +0100690 oidcpy(&d->oid_index, &ce->oid);
Stephen P. Smithf3bd35f2018-09-05 17:53:29 -0700691 s->committable = 1;
Jeff Hostetler1ecdecc2016-08-11 10:45:57 -0400692 }
Junio C Hamano50b7e702009-08-04 23:49:33 -0700693 }
694}
695
Junio C Hamano76378682009-08-10 00:36:33 -0700696static void wt_status_collect_untracked(struct wt_status *s)
697{
698 int i;
699 struct dir_struct dir;
Karsten Blees132d41e2014-07-12 02:07:36 +0200700 uint64_t t_begin = getnanotime();
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +0100701 struct index_state *istate = s->repo->index;
Junio C Hamano76378682009-08-10 00:36:33 -0700702
703 if (!s->show_untracked_files)
704 return;
Nguyễn Thái Ngọc Duy6a38ef22013-03-13 19:59:16 +0700705
Junio C Hamano76378682009-08-10 00:36:33 -0700706 memset(&dir, 0, sizeof(dir));
707 if (s->show_untracked_files != SHOW_ALL_UNTRACKED_FILES)
708 dir.flags |=
709 DIR_SHOW_OTHER_DIRECTORIES | DIR_HIDE_EMPTY_DIRECTORIES;
Jameson Millereec0f7f2017-10-30 13:21:37 -0400710 if (s->show_ignored_mode) {
Karsten Blees0aaf62b2013-04-15 21:15:03 +0200711 dir.flags |= DIR_SHOW_IGNORED_TOO;
Jameson Millereec0f7f2017-10-30 13:21:37 -0400712
713 if (s->show_ignored_mode == SHOW_MATCHING_IGNORED)
714 dir.flags |= DIR_SHOW_IGNORED_TOO_MODE_MATCHING;
715 } else {
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +0100716 dir.untracked = istate->untracked;
Jameson Millereec0f7f2017-10-30 13:21:37 -0400717 }
718
Junio C Hamano76378682009-08-10 00:36:33 -0700719 setup_standard_excludes(&dir);
720
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +0100721 fill_directory(&dir, istate, &s->pathspec);
Karsten Blees0aaf62b2013-04-15 21:15:03 +0200722
Brian Gianforcaroeeefa7c2009-09-01 01:35:10 -0400723 for (i = 0; i < dir.nr; i++) {
Junio C Hamano76378682009-08-10 00:36:33 -0700724 struct dir_entry *ent = dir.entries[i];
Elijah Newren95c11ec2020-04-01 04:17:45 +0000725 if (index_name_is_other(istate, ent->name, ent->len))
Brandon Caseyb8224232010-09-26 21:49:13 -0500726 string_list_insert(&s->untracked, ent->name);
Junio C Hamanof5b26b12010-04-09 23:58:27 -0700727 free(ent);
Junio C Hamano76378682009-08-10 00:36:33 -0700728 }
Junio C Hamanof5b26b12010-04-09 23:58:27 -0700729
Karsten Blees0aaf62b2013-04-15 21:15:03 +0200730 for (i = 0; i < dir.ignored_nr; i++) {
731 struct dir_entry *ent = dir.ignored[i];
Elijah Newren95c11ec2020-04-01 04:17:45 +0000732 if (index_name_is_other(istate, ent->name, ent->len))
Karsten Blees0aaf62b2013-04-15 21:15:03 +0200733 string_list_insert(&s->ignored, ent->name);
734 free(ent);
Junio C Hamano6cb3f6b2010-04-10 00:11:53 -0700735 }
736
Junio C Hamanof5b26b12010-04-09 23:58:27 -0700737 free(dir.entries);
Karsten Blees0aaf62b2013-04-15 21:15:03 +0200738 free(dir.ignored);
739 clear_directory(&dir);
Nguyễn Thái Ngọc Duy6a38ef22013-03-13 19:59:16 +0700740
Karsten Blees132d41e2014-07-12 02:07:36 +0200741 if (advice_status_u_option)
742 s->untracked_in_ms = (getnanotime() - t_begin) / 1000000;
Junio C Hamano76378682009-08-10 00:36:33 -0700743}
744
Stephen P. Smithc01d8f92018-09-05 17:53:26 -0700745static int has_unmerged(struct wt_status *s)
746{
747 int i;
748
749 for (i = 0; i < s->change.nr; i++) {
750 struct wt_status_change_data *d;
751 d = s->change.items[i].util;
752 if (d->stagemask)
753 return 1;
754 }
755 return 0;
756}
757
Junio C Hamano76378682009-08-10 00:36:33 -0700758void wt_status_collect(struct wt_status *s)
Junio C Hamano50b7e702009-08-04 23:49:33 -0700759{
Jeff Hostetler942b2742019-02-22 14:25:03 -0800760 trace2_region_enter("status", "worktrees", s->repo);
Junio C Hamano50b7e702009-08-04 23:49:33 -0700761 wt_status_collect_changes_worktree(s);
Jeff Hostetler942b2742019-02-22 14:25:03 -0800762 trace2_region_leave("status", "worktrees", s->repo);
763
764 if (s->is_initial) {
765 trace2_region_enter("status", "initial", s->repo);
Junio C Hamano50b7e702009-08-04 23:49:33 -0700766 wt_status_collect_changes_initial(s);
Jeff Hostetler942b2742019-02-22 14:25:03 -0800767 trace2_region_leave("status", "initial", s->repo);
768 } else {
769 trace2_region_enter("status", "index", s->repo);
Junio C Hamano50b7e702009-08-04 23:49:33 -0700770 wt_status_collect_changes_index(s);
Jeff Hostetler942b2742019-02-22 14:25:03 -0800771 trace2_region_leave("status", "index", s->repo);
772 }
773
774 trace2_region_enter("status", "untracked", s->repo);
Junio C Hamano76378682009-08-10 00:36:33 -0700775 wt_status_collect_untracked(s);
Jeff Hostetler942b2742019-02-22 14:25:03 -0800776 trace2_region_leave("status", "untracked", s->repo);
Stephen P. Smithf3bd35f2018-09-05 17:53:29 -0700777
Nguyễn Thái Ngọc Duy78845452018-11-10 06:48:50 +0100778 wt_status_get_state(s->repo, &s->state, s->branch && !strcmp(s->branch, "HEAD"));
Stephen P. Smith73ba5d72018-09-30 07:12:45 -0700779 if (s->state.merge_in_progress && !has_unmerged(s))
Stephen P. Smithf3bd35f2018-09-05 17:53:29 -0700780 s->committable = 1;
Junio C Hamano50b7e702009-08-04 23:49:33 -0700781}
782
Stephen P. Smith73ba5d72018-09-30 07:12:45 -0700783void wt_status_collect_free_buffers(struct wt_status *s)
784{
785 free(s->state.branch);
786 free(s->state.onto);
787 free(s->state.detached_from);
Junio C Hamano50b7e702009-08-04 23:49:33 -0700788}
789
Jeff Hostetler957a0fe2016-08-05 18:00:26 -0400790static void wt_longstatus_print_unmerged(struct wt_status *s)
Junio C Hamano4d4d5722009-08-05 00:04:51 -0700791{
792 int shown_header = 0;
793 int i;
794
795 for (i = 0; i < s->change.nr; i++) {
796 struct wt_status_change_data *d;
797 struct string_list_item *it;
798 it = &(s->change.items[i]);
799 d = it->util;
800 if (!d->stagemask)
801 continue;
802 if (!shown_header) {
Jeff Hostetler957a0fe2016-08-05 18:00:26 -0400803 wt_longstatus_print_unmerged_header(s);
Junio C Hamano4d4d5722009-08-05 00:04:51 -0700804 shown_header = 1;
805 }
Jeff Hostetler957a0fe2016-08-05 18:00:26 -0400806 wt_longstatus_print_unmerged_data(s, it);
Junio C Hamano4d4d5722009-08-05 00:04:51 -0700807 }
808 if (shown_header)
Jeff Hostetler957a0fe2016-08-05 18:00:26 -0400809 wt_longstatus_print_trailer(s);
Junio C Hamano4d4d5722009-08-05 00:04:51 -0700810
811}
812
Jeff Hostetler957a0fe2016-08-05 18:00:26 -0400813static void wt_longstatus_print_updated(struct wt_status *s)
Junio C Hamano50b7e702009-08-04 23:49:33 -0700814{
815 int shown_header = 0;
816 int i;
817
818 for (i = 0; i < s->change.nr; i++) {
819 struct wt_status_change_data *d;
820 struct string_list_item *it;
821 it = &(s->change.items[i]);
822 d = it->util;
823 if (!d->index_status ||
824 d->index_status == DIFF_STATUS_UNMERGED)
825 continue;
826 if (!shown_header) {
Jeff Hostetler957a0fe2016-08-05 18:00:26 -0400827 wt_longstatus_print_cached_header(s);
Junio C Hamano50b7e702009-08-04 23:49:33 -0700828 shown_header = 1;
829 }
Jeff Hostetler957a0fe2016-08-05 18:00:26 -0400830 wt_longstatus_print_change_data(s, WT_STATUS_UPDATED, it);
Junio C Hamano50b7e702009-08-04 23:49:33 -0700831 }
832 if (shown_header)
Jeff Hostetler957a0fe2016-08-05 18:00:26 -0400833 wt_longstatus_print_trailer(s);
Junio C Hamano50b7e702009-08-04 23:49:33 -0700834}
835
836/*
837 * -1 : has delete
838 * 0 : no change
839 * 1 : some change but no delete
840 */
Jens Lehmann9297f77e62010-03-08 13:53:19 +0100841static int wt_status_check_worktree_changes(struct wt_status *s,
842 int *dirty_submodules)
Junio C Hamano50b7e702009-08-04 23:49:33 -0700843{
844 int i;
845 int changes = 0;
846
Jens Lehmann9297f77e62010-03-08 13:53:19 +0100847 *dirty_submodules = 0;
848
Junio C Hamano50b7e702009-08-04 23:49:33 -0700849 for (i = 0; i < s->change.nr; i++) {
850 struct wt_status_change_data *d;
851 d = s->change.items[i].util;
Junio C Hamano4d4d5722009-08-05 00:04:51 -0700852 if (!d->worktree_status ||
853 d->worktree_status == DIFF_STATUS_UNMERGED)
Junio C Hamano50b7e702009-08-04 23:49:33 -0700854 continue;
Jens Lehmann9297f77e62010-03-08 13:53:19 +0100855 if (!changes)
856 changes = 1;
857 if (d->dirty_submodule)
858 *dirty_submodules = 1;
Junio C Hamano50b7e702009-08-04 23:49:33 -0700859 if (d->worktree_status == DIFF_STATUS_DELETED)
Jens Lehmann9297f77e62010-03-08 13:53:19 +0100860 changes = -1;
Junio C Hamano50b7e702009-08-04 23:49:33 -0700861 }
862 return changes;
863}
864
Jeff Hostetler957a0fe2016-08-05 18:00:26 -0400865static void wt_longstatus_print_changed(struct wt_status *s)
Jeff Kingc91f0d92006-09-08 04:05:34 -0400866{
Jens Lehmann9297f77e62010-03-08 13:53:19 +0100867 int i, dirty_submodules;
868 int worktree_changes = wt_status_check_worktree_changes(s, &dirty_submodules);
Junio C Hamano50b7e702009-08-04 23:49:33 -0700869
870 if (!worktree_changes)
871 return;
872
Jeff Hostetler957a0fe2016-08-05 18:00:26 -0400873 wt_longstatus_print_dirty_header(s, worktree_changes < 0, dirty_submodules);
Junio C Hamano50b7e702009-08-04 23:49:33 -0700874
875 for (i = 0; i < s->change.nr; i++) {
876 struct wt_status_change_data *d;
877 struct string_list_item *it;
878 it = &(s->change.items[i]);
879 d = it->util;
Junio C Hamano4d4d5722009-08-05 00:04:51 -0700880 if (!d->worktree_status ||
881 d->worktree_status == DIFF_STATUS_UNMERGED)
Junio C Hamano50b7e702009-08-04 23:49:33 -0700882 continue;
Jeff Hostetler957a0fe2016-08-05 18:00:26 -0400883 wt_longstatus_print_change_data(s, WT_STATUS_CHANGED, it);
Junio C Hamano50b7e702009-08-04 23:49:33 -0700884 }
Jeff Hostetler957a0fe2016-08-05 18:00:26 -0400885 wt_longstatus_print_trailer(s);
Jeff Kingc91f0d92006-09-08 04:05:34 -0400886}
887
Liam Beguinc1b5d012017-06-17 18:30:51 -0400888static int stash_count_refs(struct object_id *ooid, struct object_id *noid,
889 const char *email, timestamp_t timestamp, int tz,
890 const char *message, void *cb_data)
891{
892 int *c = cb_data;
893 (*c)++;
894 return 0;
895}
896
897static void wt_longstatus_print_stash_summary(struct wt_status *s)
898{
899 int stash_count = 0;
900
901 for_each_reflog_ent("refs/stash", stash_count_refs, &stash_count);
902 if (stash_count > 0)
903 status_printf_ln(s, GIT_COLOR_NORMAL,
904 Q_("Your stash currently has %d entry",
905 "Your stash currently has %d entries", stash_count),
906 stash_count);
907}
908
Jeff Hostetler957a0fe2016-08-05 18:00:26 -0400909static void wt_longstatus_print_submodule_summary(struct wt_status *s, int uncommitted)
Ping Yinac8d5af2008-04-12 23:05:32 +0800910{
René Scharfed3180272014-08-19 21:09:35 +0200911 struct child_process sm_summary = CHILD_PROCESS_INIT;
Matthieu Moy3ba74072013-09-06 19:43:06 +0200912 struct strbuf cmd_stdout = STRBUF_INIT;
913 struct strbuf summary = STRBUF_INIT;
914 char *summary_content;
Ping Yinac8d5af2008-04-12 23:05:32 +0800915
Jeff Kingf6d89422020-07-28 16:26:31 -0400916 strvec_pushf(&sm_summary.env_array, "GIT_INDEX_FILE=%s", s->index_file);
Ping Yinac8d5af2008-04-12 23:05:32 +0800917
Jeff Kingc972bf42020-07-28 16:25:12 -0400918 strvec_push(&sm_summary.args, "submodule");
919 strvec_push(&sm_summary.args, "summary");
920 strvec_push(&sm_summary.args, uncommitted ? "--files" : "--cached");
921 strvec_push(&sm_summary.args, "--for-status");
922 strvec_push(&sm_summary.args, "--summary-limit");
923 strvec_pushf(&sm_summary.args, "%d", s->submodule_summary);
Matthieu Moybb7e32e2013-09-06 19:43:05 +0200924 if (!uncommitted)
Jeff Kingc972bf42020-07-28 16:25:12 -0400925 strvec_push(&sm_summary.args, s->amend ? "HEAD^" : "HEAD");
Matthieu Moybb7e32e2013-09-06 19:43:05 +0200926
Ping Yinac8d5af2008-04-12 23:05:32 +0800927 sm_summary.git_cmd = 1;
928 sm_summary.no_stdin = 1;
Matthieu Moy3ba74072013-09-06 19:43:06 +0200929
Jeff King5c950e92015-03-22 23:53:52 -0400930 capture_command(&sm_summary, &cmd_stdout, 1024);
Matthieu Moy3ba74072013-09-06 19:43:06 +0200931
932 /* prepend header, only if there's an actual output */
Jeff Kingd56d9662015-03-22 06:00:32 -0400933 if (cmd_stdout.len) {
Matthieu Moy3ba74072013-09-06 19:43:06 +0200934 if (uncommitted)
935 strbuf_addstr(&summary, _("Submodules changed but not updated:"));
936 else
937 strbuf_addstr(&summary, _("Submodule changes to be committed:"));
938 strbuf_addstr(&summary, "\n\n");
939 }
940 strbuf_addbuf(&summary, &cmd_stdout);
941 strbuf_release(&cmd_stdout);
942
Matthieu Moy2556b992013-09-06 19:43:07 +0200943 if (s->display_comment_prefix) {
Jeff Kingd56d9662015-03-22 06:00:32 -0400944 size_t len;
Matthieu Moy2556b992013-09-06 19:43:07 +0200945 summary_content = strbuf_detach(&summary, &len);
946 strbuf_add_commented_lines(&summary, summary_content, len);
947 free(summary_content);
948 }
Matthieu Moy3ba74072013-09-06 19:43:06 +0200949
950 fputs(summary.buf, s->fp);
951 strbuf_release(&summary);
Ping Yinac8d5af2008-04-12 23:05:32 +0800952}
953
Jeff Hostetler957a0fe2016-08-05 18:00:26 -0400954static void wt_longstatus_print_other(struct wt_status *s,
955 struct string_list *l,
956 const char *what,
957 const char *how)
Jeff Kingc91f0d92006-09-08 04:05:34 -0400958{
Jeff Kingc91f0d92006-09-08 04:05:34 -0400959 int i;
Brandon Caseyf285a2d2008-10-09 14:12:12 -0500960 struct strbuf buf = STRBUF_INIT;
Nguyễn Thái Ngọc Duy323d0532012-04-13 17:54:39 +0700961 static struct string_list output = STRING_LIST_INIT_DUP;
962 struct column_options copts;
Jeff Kingc91f0d92006-09-08 04:05:34 -0400963
Jeff King12829882011-06-02 01:54:49 -0400964 if (!l->nr)
Junio C Hamano76378682009-08-10 00:36:33 -0700965 return;
Jeff Kingc91f0d92006-09-08 04:05:34 -0400966
Jeff Hostetler957a0fe2016-08-05 18:00:26 -0400967 wt_longstatus_print_other_header(s, what, how);
Junio C Hamano1b908b62010-04-10 00:19:46 -0700968
969 for (i = 0; i < l->nr; i++) {
Junio C Hamano76378682009-08-10 00:36:33 -0700970 struct string_list_item *it;
Nguyễn Thái Ngọc Duy323d0532012-04-13 17:54:39 +0700971 const char *path;
Junio C Hamano1b908b62010-04-10 00:19:46 -0700972 it = &(l->items[i]);
Jiang Xin39598f92013-06-25 23:53:45 +0800973 path = quote_path(it->string, s->prefix, &buf);
Nguyễn Thái Ngọc Duy323d0532012-04-13 17:54:39 +0700974 if (column_active(s->colopts)) {
975 string_list_append(&output, path);
976 continue;
977 }
Jonathan Niederb926c0d2011-02-25 23:11:37 -0600978 status_printf(s, color(WT_STATUS_HEADER, s), "\t");
979 status_printf_more(s, color(WT_STATUS_UNTRACKED, s),
Nguyễn Thái Ngọc Duy323d0532012-04-13 17:54:39 +0700980 "%s\n", path);
Jeff Kingc91f0d92006-09-08 04:05:34 -0400981 }
Nguyễn Thái Ngọc Duy323d0532012-04-13 17:54:39 +0700982
983 strbuf_release(&buf);
984 if (!column_active(s->colopts))
Matthieu Moy2f0f7f12013-09-06 19:43:09 +0200985 goto conclude;
Nguyễn Thái Ngọc Duy323d0532012-04-13 17:54:39 +0700986
Matthieu Moy2556b992013-09-06 19:43:07 +0200987 strbuf_addf(&buf, "%s%s\t%s",
Nguyễn Thái Ngọc Duy323d0532012-04-13 17:54:39 +0700988 color(WT_STATUS_HEADER, s),
Matthieu Moy2556b992013-09-06 19:43:07 +0200989 s->display_comment_prefix ? "#" : "",
Nguyễn Thái Ngọc Duy323d0532012-04-13 17:54:39 +0700990 color(WT_STATUS_UNTRACKED, s));
991 memset(&copts, 0, sizeof(copts));
992 copts.padding = 1;
993 copts.indent = buf.buf;
994 if (want_color(s->use_color))
995 copts.nl = GIT_COLOR_RESET "\n";
996 print_columns(&output, s->colopts, &copts);
997 string_list_clear(&output, 0);
Johannes Schindelin367c9882007-11-11 17:35:41 +0000998 strbuf_release(&buf);
Matthieu Moy2f0f7f12013-09-06 19:43:09 +0200999conclude:
Felipe Contreras7d7d6802014-05-04 01:12:55 -05001000 status_printf_ln(s, GIT_COLOR_NORMAL, "%s", "");
Jeff Kingc91f0d92006-09-08 04:05:34 -04001001}
1002
Brian Malehornd76650b2017-05-15 23:06:49 -07001003size_t wt_status_locate_end(const char *s, size_t len)
Jens Lehmann1a72cfd2013-12-05 20:44:14 +01001004{
1005 const char *p;
1006 struct strbuf pattern = STRBUF_INIT;
1007
SZEDER Gáborfbfa0972015-06-09 02:28:34 +02001008 strbuf_addf(&pattern, "\n%c %s", comment_line_char, cut_line);
Brian Malehornd76650b2017-05-15 23:06:49 -07001009 if (starts_with(s, pattern.buf + 1))
1010 len = 0;
1011 else if ((p = strstr(s, pattern.buf)))
1012 len = p - s + 1;
Jens Lehmann1a72cfd2013-12-05 20:44:14 +01001013 strbuf_release(&pattern);
Brian Malehornd76650b2017-05-15 23:06:49 -07001014 return len;
Jens Lehmann1a72cfd2013-12-05 20:44:14 +01001015}
1016
Denton Liud540b702019-04-17 11:23:27 +01001017void wt_status_append_cut_line(struct strbuf *buf)
Nguyễn Thái Ngọc Duyfcef9312014-02-17 19:15:31 +07001018{
Kaartic Sivaraam8c4b1a32017-09-13 13:05:38 +00001019 const char *explanation = _("Do not modify or remove the line above.\nEverything below it will be ignored.");
Denton Liud540b702019-04-17 11:23:27 +01001020
1021 strbuf_commented_addf(buf, "%s", cut_line);
1022 strbuf_add_commented_lines(buf, explanation, strlen(explanation));
1023}
1024
1025void wt_status_add_cut_line(FILE *fp)
1026{
Nguyễn Thái Ngọc Duyfcef9312014-02-17 19:15:31 +07001027 struct strbuf buf = STRBUF_INIT;
1028
Denton Liud540b702019-04-17 11:23:27 +01001029 wt_status_append_cut_line(&buf);
Nguyễn Thái Ngọc Duyfcef9312014-02-17 19:15:31 +07001030 fputs(buf.buf, fp);
1031 strbuf_release(&buf);
1032}
1033
Jeff Hostetler957a0fe2016-08-05 18:00:26 -04001034static void wt_longstatus_print_verbose(struct wt_status *s)
Jeff Kingc91f0d92006-09-08 04:05:34 -04001035{
1036 struct rev_info rev;
Junio C Hamano32962c92010-03-08 22:58:09 -08001037 struct setup_revision_opt opt;
Michael J Gruber40555002015-03-06 10:43:35 +01001038 int dirty_submodules;
1039 const char *c = color(WT_STATUS_HEADER, s);
Kristian Høgsberg99a12692007-11-21 21:54:49 -05001040
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +01001041 repo_init_revisions(s->repo, &rev, NULL);
Brandon Williams0d1e0e72017-10-31 11:19:11 -07001042 rev.diffopt.flags.allow_textconv = 1;
Nguyễn Thái Ngọc Duy425a28e2016-10-24 17:42:19 +07001043 rev.diffopt.ita_invisible_in_index = 1;
Junio C Hamano32962c92010-03-08 22:58:09 -08001044
1045 memset(&opt, 0, sizeof(opt));
brian m. carlsonf2e51192018-05-02 00:26:00 +00001046 opt.def = s->is_initial ? empty_tree_oid_hex() : s->reference;
Junio C Hamano32962c92010-03-08 22:58:09 -08001047 setup_revisions(0, NULL, &rev, &opt);
1048
Jeff Kingc91f0d92006-09-08 04:05:34 -04001049 rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
Ben Pearte8b2dc22018-05-11 15:38:58 +00001050 rev.diffopt.detect_rename = s->detect_rename >= 0 ? s->detect_rename : rev.diffopt.detect_rename;
1051 rev.diffopt.rename_limit = s->rename_limit >= 0 ? s->rename_limit : rev.diffopt.rename_limit;
1052 rev.diffopt.rename_score = s->rename_score >= 0 ? s->rename_score : rev.diffopt.rename_score;
Kristian Høgsberg4ba0cb22008-03-10 13:58:26 -04001053 rev.diffopt.file = s->fp;
1054 rev.diffopt.close_file = 0;
Jeff King4f672ad2008-10-26 00:49:35 -04001055 /*
1056 * If we're not going to stdout, then we definitely don't
1057 * want color, since we are going to the commit message
1058 * file (and even the "auto" setting won't work, since it
Jens Lehmann1a72cfd2013-12-05 20:44:14 +01001059 * will have checked isatty on stdout). But we then do want
1060 * to insert the scissor line here to reliably remove the
1061 * diff before committing.
Jeff King4f672ad2008-10-26 00:49:35 -04001062 */
Jens Lehmann1a72cfd2013-12-05 20:44:14 +01001063 if (s->fp != stdout) {
Jeff Kingf1c96262011-08-17 22:03:12 -07001064 rev.diffopt.use_color = 0;
Nguyễn Thái Ngọc Duyfcef9312014-02-17 19:15:31 +07001065 wt_status_add_cut_line(s->fp);
Jens Lehmann1a72cfd2013-12-05 20:44:14 +01001066 }
Stephen P. Smith6fa90192018-09-05 17:53:27 -07001067 if (s->verbose > 1 && s->committable) {
Michael J Gruber40555002015-03-06 10:43:35 +01001068 /* print_updated() printed a header, so do we */
1069 if (s->fp != stdout)
Jeff Hostetler957a0fe2016-08-05 18:00:26 -04001070 wt_longstatus_print_trailer(s);
Michael J Gruber40555002015-03-06 10:43:35 +01001071 status_printf_ln(s, c, _("Changes to be committed:"));
1072 rev.diffopt.a_prefix = "c/";
1073 rev.diffopt.b_prefix = "i/";
1074 } /* else use prefix as per user config */
Jeff Kingc91f0d92006-09-08 04:05:34 -04001075 run_diff_index(&rev, 1);
Michael J Gruber40555002015-03-06 10:43:35 +01001076 if (s->verbose > 1 &&
1077 wt_status_check_worktree_changes(s, &dirty_submodules)) {
1078 status_printf_ln(s, c,
1079 "--------------------------------------------------");
1080 status_printf_ln(s, c, _("Changes not staged for commit:"));
1081 setup_work_tree();
1082 rev.diffopt.a_prefix = "i/";
1083 rev.diffopt.b_prefix = "w/";
1084 run_diff_files(&rev, 0);
1085 }
Jeff Kingc91f0d92006-09-08 04:05:34 -04001086}
1087
Jeff Hostetler957a0fe2016-08-05 18:00:26 -04001088static void wt_longstatus_print_tracking(struct wt_status *s)
Junio C Hamanob6975ab2008-07-02 00:52:16 -07001089{
1090 struct strbuf sb = STRBUF_INIT;
René Scharfec72b49d2015-10-31 18:37:43 +01001091 const char *cp, *ep, *branch_name;
Junio C Hamanob6975ab2008-07-02 00:52:16 -07001092 struct branch *branch;
Matthieu Moy2556b992013-09-06 19:43:07 +02001093 char comment_line_string[3];
1094 int i;
Jeff Hostetler0a535612019-06-18 13:21:27 -07001095 uint64_t t_begin = 0;
Junio C Hamanob6975ab2008-07-02 00:52:16 -07001096
1097 assert(s->branch && !s->is_initial);
René Scharfec72b49d2015-10-31 18:37:43 +01001098 if (!skip_prefix(s->branch, "refs/heads/", &branch_name))
Junio C Hamanob6975ab2008-07-02 00:52:16 -07001099 return;
René Scharfec72b49d2015-10-31 18:37:43 +01001100 branch = branch_get(branch_name);
Jeff Hostetler0a535612019-06-18 13:21:27 -07001101
1102 t_begin = getnanotime();
1103
Jeff Hostetlerf39a7572018-01-09 18:50:18 +00001104 if (!format_tracking_info(branch, &sb, s->ahead_behind_flags))
Junio C Hamanob6975ab2008-07-02 00:52:16 -07001105 return;
1106
Jeff Hostetler0a535612019-06-18 13:21:27 -07001107 if (advice_status_ahead_behind_warning &&
1108 s->ahead_behind_flags == AHEAD_BEHIND_FULL) {
1109 uint64_t t_delta_in_ms = (getnanotime() - t_begin) / 1000000;
1110 if (t_delta_in_ms > AB_DELAY_WARNING_IN_MS) {
1111 strbuf_addf(&sb, _("\n"
1112 "It took %.2f seconds to compute the branch ahead/behind values.\n"
1113 "You can use '--no-ahead-behind' to avoid this.\n"),
1114 t_delta_in_ms / 1000.0);
1115 }
1116 }
1117
Matthieu Moy2556b992013-09-06 19:43:07 +02001118 i = 0;
1119 if (s->display_comment_prefix) {
1120 comment_line_string[i++] = comment_line_char;
1121 comment_line_string[i++] = ' ';
1122 }
1123 comment_line_string[i] = '\0';
1124
Junio C Hamanob6975ab2008-07-02 00:52:16 -07001125 for (cp = sb.buf; (ep = strchr(cp, '\n')) != NULL; cp = ep + 1)
Junio C Hamanod249b092009-08-09 21:59:30 -07001126 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s),
Matthieu Moy2556b992013-09-06 19:43:07 +02001127 "%s%.*s", comment_line_string,
Junio C Hamanoeff80a92013-01-16 20:18:48 +01001128 (int)(ep - cp), cp);
Matthieu Moy2556b992013-09-06 19:43:07 +02001129 if (s->display_comment_prefix)
1130 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s), "%c",
1131 comment_line_char);
1132 else
Jeff King75177c82017-04-27 05:01:05 -04001133 fputs("\n", s->fp);
Rene Scharfeb6ec3072017-08-30 20:20:18 +02001134 strbuf_release(&sb);
Junio C Hamanob6975ab2008-07-02 00:52:16 -07001135}
1136
Lucien Kong83c750a2012-06-05 22:21:24 +02001137static void show_merge_in_progress(struct wt_status *s,
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001138 const char *color)
Lucien Kong83c750a2012-06-05 22:21:24 +02001139{
1140 if (has_unmerged(s)) {
1141 status_printf_ln(s, color, _("You have unmerged paths."));
Matthieu Moyb0a61ab2016-07-21 14:58:37 +02001142 if (s->hints) {
Lucien Kong83c750a2012-06-05 22:21:24 +02001143 status_printf_ln(s, color,
Matthieu Moyb0a61ab2016-07-21 14:58:37 +02001144 _(" (fix conflicts and run \"git commit\")"));
1145 status_printf_ln(s, color,
1146 _(" (use \"git merge --abort\" to abort the merge)"));
1147 }
Lucien Kong83c750a2012-06-05 22:21:24 +02001148 } else {
1149 status_printf_ln(s, color,
1150 _("All conflicts fixed but you are still merging."));
Matthieu Moy6a964f52013-09-12 12:50:05 +02001151 if (s->hints)
Lucien Kong83c750a2012-06-05 22:21:24 +02001152 status_printf_ln(s, color,
1153 _(" (use \"git commit\" to conclude merge)"));
1154 }
Jeff Hostetler957a0fe2016-08-05 18:00:26 -04001155 wt_longstatus_print_trailer(s);
Lucien Kong83c750a2012-06-05 22:21:24 +02001156}
1157
1158static void show_am_in_progress(struct wt_status *s,
Lucien Kong83c750a2012-06-05 22:21:24 +02001159 const char *color)
1160{
1161 status_printf_ln(s, color,
1162 _("You are in the middle of an am session."));
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001163 if (s->state.am_empty_patch)
Lucien Kong83c750a2012-06-05 22:21:24 +02001164 status_printf_ln(s, color,
1165 _("The current patch is empty."));
Matthieu Moy6a964f52013-09-12 12:50:05 +02001166 if (s->hints) {
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001167 if (!s->state.am_empty_patch)
Lucien Kong83c750a2012-06-05 22:21:24 +02001168 status_printf_ln(s, color,
Kevin Bracey8ceb6fb2013-06-26 23:06:41 +03001169 _(" (fix conflicts and then run \"git am --continue\")"));
Lucien Kong83c750a2012-06-05 22:21:24 +02001170 status_printf_ln(s, color,
1171 _(" (use \"git am --skip\" to skip this patch)"));
1172 status_printf_ln(s, color,
1173 _(" (use \"git am --abort\" to restore the original branch)"));
1174 }
Jeff Hostetler957a0fe2016-08-05 18:00:26 -04001175 wt_longstatus_print_trailer(s);
Lucien Kong83c750a2012-06-05 22:21:24 +02001176}
1177
Lucien Kong2d1cceb2012-06-10 13:17:38 +02001178static char *read_line_from_git_path(const char *filename)
1179{
1180 struct strbuf buf = STRBUF_INIT;
Nguyễn Thái Ngọc Duye9d983f2017-05-03 17:16:50 +07001181 FILE *fp = fopen_or_warn(git_path("%s", filename), "r");
1182
Lucien Kong2d1cceb2012-06-10 13:17:38 +02001183 if (!fp) {
1184 strbuf_release(&buf);
1185 return NULL;
1186 }
Junio C Hamano8f309ae2016-01-13 15:31:17 -08001187 strbuf_getline_lf(&buf, fp);
Lucien Kong2d1cceb2012-06-10 13:17:38 +02001188 if (!fclose(fp)) {
1189 return strbuf_detach(&buf, NULL);
1190 } else {
1191 strbuf_release(&buf);
1192 return NULL;
1193 }
1194}
1195
1196static int split_commit_in_progress(struct wt_status *s)
1197{
1198 int split_in_progress = 0;
Johannes Schindelin41fc6b32017-05-04 15:56:44 +02001199 char *head, *orig_head, *rebase_amend, *rebase_orig_head;
Lucien Kong2d1cceb2012-06-10 13:17:38 +02001200
Johannes Schindelin41fc6b32017-05-04 15:56:44 +02001201 if ((!s->amend && !s->nowarn && !s->workdir_dirty) ||
Lucien Kong2d1cceb2012-06-10 13:17:38 +02001202 !s->branch || strcmp(s->branch, "HEAD"))
Johannes Schindelin41fc6b32017-05-04 15:56:44 +02001203 return 0;
Lucien Kong2d1cceb2012-06-10 13:17:38 +02001204
Johannes Schindelin41fc6b32017-05-04 15:56:44 +02001205 head = read_line_from_git_path("HEAD");
1206 orig_head = read_line_from_git_path("ORIG_HEAD");
1207 rebase_amend = read_line_from_git_path("rebase-merge/amend");
1208 rebase_orig_head = read_line_from_git_path("rebase-merge/orig-head");
1209
1210 if (!head || !orig_head || !rebase_amend || !rebase_orig_head)
1211 ; /* fall through, no split in progress */
1212 else if (!strcmp(rebase_amend, rebase_orig_head))
1213 split_in_progress = !!strcmp(head, rebase_amend);
1214 else if (strcmp(orig_head, rebase_orig_head))
Lucien Kong2d1cceb2012-06-10 13:17:38 +02001215 split_in_progress = 1;
Lucien Kong2d1cceb2012-06-10 13:17:38 +02001216
1217 free(head);
1218 free(orig_head);
1219 free(rebase_amend);
1220 free(rebase_orig_head);
Johannes Schindelin41fc6b32017-05-04 15:56:44 +02001221
Lucien Kong2d1cceb2012-06-10 13:17:38 +02001222 return split_in_progress;
1223}
1224
Guillaume Pagès84e6fb92015-07-06 22:56:03 +02001225/*
1226 * Turn
1227 * "pick d6a2f0303e897ec257dd0e0a39a5ccb709bc2047 some message"
1228 * into
1229 * "pick d6a2f03 some message"
1230 *
1231 * The function assumes that the line does not contain useless spaces
1232 * before or after the command.
1233 */
1234static void abbrev_sha1_in_line(struct strbuf *line)
1235{
1236 struct strbuf **split;
1237 int i;
1238
1239 if (starts_with(line->buf, "exec ") ||
Johannes Schindelin225a7772019-05-10 13:23:14 -07001240 starts_with(line->buf, "x ") ||
1241 starts_with(line->buf, "label ") ||
1242 starts_with(line->buf, "l "))
Guillaume Pagès84e6fb92015-07-06 22:56:03 +02001243 return;
1244
1245 split = strbuf_split_max(line, ' ', 3);
1246 if (split[0] && split[1]) {
brian m. carlsone86ab2c2017-02-21 23:47:37 +00001247 struct object_id oid;
Guillaume Pagès84e6fb92015-07-06 22:56:03 +02001248
1249 /*
1250 * strbuf_split_max left a space. Trim it and re-add
1251 * it after abbreviation.
1252 */
1253 strbuf_trim(split[1]);
brian m. carlsone86ab2c2017-02-21 23:47:37 +00001254 if (!get_oid(split[1]->buf, &oid)) {
Guillaume Pagès84e6fb92015-07-06 22:56:03 +02001255 strbuf_reset(split[1]);
brian m. carlson30e677e2018-03-12 02:27:28 +00001256 strbuf_add_unique_abbrev(split[1], &oid,
René Scharfea94bb682016-10-08 17:38:47 +02001257 DEFAULT_ABBREV);
1258 strbuf_addch(split[1], ' ');
Guillaume Pagès84e6fb92015-07-06 22:56:03 +02001259 strbuf_reset(line);
1260 for (i = 0; split[i]; i++)
René Scharfe81099842016-07-19 20:36:29 +02001261 strbuf_addbuf(line, split[i]);
Guillaume Pagès84e6fb92015-07-06 22:56:03 +02001262 }
1263 }
Stefan Beller6eb60782016-03-31 17:35:44 -07001264 strbuf_list_free(split);
Guillaume Pagès84e6fb92015-07-06 22:56:03 +02001265}
1266
Johannes Schindelindf9ded42017-01-26 17:08:41 +01001267static int read_rebase_todolist(const char *fname, struct string_list *lines)
Guillaume Pagès84e6fb92015-07-06 22:56:03 +02001268{
1269 struct strbuf line = STRBUF_INIT;
1270 FILE *f = fopen(git_path("%s", fname), "r");
1271
Johannes Schindelindf9ded42017-01-26 17:08:41 +01001272 if (!f) {
1273 if (errno == ENOENT)
1274 return -1;
Guillaume Pagès84e6fb92015-07-06 22:56:03 +02001275 die_errno("Could not open file %s for reading",
1276 git_path("%s", fname));
Johannes Schindelindf9ded42017-01-26 17:08:41 +01001277 }
Junio C Hamano8f309ae2016-01-13 15:31:17 -08001278 while (!strbuf_getline_lf(&line, f)) {
Guillaume Pagès84e6fb92015-07-06 22:56:03 +02001279 if (line.len && line.buf[0] == comment_line_char)
1280 continue;
1281 strbuf_trim(&line);
1282 if (!line.len)
1283 continue;
1284 abbrev_sha1_in_line(&line);
1285 string_list_append(lines, line.buf);
1286 }
Johannes Schindeline7b65e22017-05-04 15:55:52 +02001287 fclose(f);
Rene Scharfe6f495412017-08-30 20:20:17 +02001288 strbuf_release(&line);
Johannes Schindelindf9ded42017-01-26 17:08:41 +01001289 return 0;
Guillaume Pagès84e6fb92015-07-06 22:56:03 +02001290}
1291
1292static void show_rebase_information(struct wt_status *s,
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001293 const char *color)
Guillaume Pagès84e6fb92015-07-06 22:56:03 +02001294{
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001295 if (s->state.rebase_interactive_in_progress) {
Guillaume Pagès84e6fb92015-07-06 22:56:03 +02001296 int i;
1297 int nr_lines_to_show = 2;
1298
1299 struct string_list have_done = STRING_LIST_INIT_DUP;
1300 struct string_list yet_to_do = STRING_LIST_INIT_DUP;
1301
1302 read_rebase_todolist("rebase-merge/done", &have_done);
Johannes Schindelindf9ded42017-01-26 17:08:41 +01001303 if (read_rebase_todolist("rebase-merge/git-rebase-todo",
1304 &yet_to_do))
1305 status_printf_ln(s, color,
1306 _("git-rebase-todo is missing."));
Guillaume Pagès84e6fb92015-07-06 22:56:03 +02001307 if (have_done.nr == 0)
1308 status_printf_ln(s, color, _("No commands done."));
1309 else {
1310 status_printf_ln(s, color,
1311 Q_("Last command done (%d command done):",
1312 "Last commands done (%d commands done):",
1313 have_done.nr),
1314 have_done.nr);
1315 for (i = (have_done.nr > nr_lines_to_show)
1316 ? have_done.nr - nr_lines_to_show : 0;
1317 i < have_done.nr;
1318 i++)
1319 status_printf_ln(s, color, " %s", have_done.items[i].string);
1320 if (have_done.nr > nr_lines_to_show && s->hints)
1321 status_printf_ln(s, color,
1322 _(" (see more in file %s)"), git_path("rebase-merge/done"));
1323 }
1324
1325 if (yet_to_do.nr == 0)
1326 status_printf_ln(s, color,
1327 _("No commands remaining."));
1328 else {
1329 status_printf_ln(s, color,
1330 Q_("Next command to do (%d remaining command):",
1331 "Next commands to do (%d remaining commands):",
1332 yet_to_do.nr),
1333 yet_to_do.nr);
1334 for (i = 0; i < nr_lines_to_show && i < yet_to_do.nr; i++)
1335 status_printf_ln(s, color, " %s", yet_to_do.items[i].string);
1336 if (s->hints)
1337 status_printf_ln(s, color,
1338 _(" (use \"git rebase --edit-todo\" to view and edit)"));
1339 }
1340 string_list_clear(&yet_to_do, 0);
1341 string_list_clear(&have_done, 0);
1342 }
1343}
1344
Guillaume Pagès05eb5632015-06-30 15:01:12 +02001345static void print_rebase_state(struct wt_status *s,
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001346 const char *color)
Guillaume Pagès05eb5632015-06-30 15:01:12 +02001347{
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001348 if (s->state.branch)
Guillaume Pagès05eb5632015-06-30 15:01:12 +02001349 status_printf_ln(s, color,
1350 _("You are currently rebasing branch '%s' on '%s'."),
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001351 s->state.branch,
1352 s->state.onto);
Guillaume Pagès05eb5632015-06-30 15:01:12 +02001353 else
1354 status_printf_ln(s, color,
1355 _("You are currently rebasing."));
1356}
1357
Lucien Kong83c750a2012-06-05 22:21:24 +02001358static void show_rebase_in_progress(struct wt_status *s,
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001359 const char *color)
Lucien Kong83c750a2012-06-05 22:21:24 +02001360{
1361 struct stat st;
1362
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001363 show_rebase_information(s, color);
Lucien Kong83c750a2012-06-05 22:21:24 +02001364 if (has_unmerged(s)) {
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001365 print_rebase_state(s, color);
Matthieu Moy6a964f52013-09-12 12:50:05 +02001366 if (s->hints) {
Lucien Kong83c750a2012-06-05 22:21:24 +02001367 status_printf_ln(s, color,
1368 _(" (fix conflicts and then run \"git rebase --continue\")"));
1369 status_printf_ln(s, color,
1370 _(" (use \"git rebase --skip\" to skip this patch)"));
1371 status_printf_ln(s, color,
1372 _(" (use \"git rebase --abort\" to check out the original branch)"));
1373 }
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001374 } else if (s->state.rebase_in_progress ||
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +01001375 !stat(git_path_merge_msg(s->repo), &st)) {
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001376 print_rebase_state(s, color);
Matthieu Moy6a964f52013-09-12 12:50:05 +02001377 if (s->hints)
Lucien Kong83c750a2012-06-05 22:21:24 +02001378 status_printf_ln(s, color,
1379 _(" (all conflicts fixed: run \"git rebase --continue\")"));
Lucien Kong2d1cceb2012-06-10 13:17:38 +02001380 } else if (split_commit_in_progress(s)) {
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001381 if (s->state.branch)
Nguyễn Thái Ngọc Duy0722c802013-02-03 12:53:27 +07001382 status_printf_ln(s, color,
1383 _("You are currently splitting a commit while rebasing branch '%s' on '%s'."),
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001384 s->state.branch,
1385 s->state.onto);
Nguyễn Thái Ngọc Duy0722c802013-02-03 12:53:27 +07001386 else
1387 status_printf_ln(s, color,
1388 _("You are currently splitting a commit during a rebase."));
Matthieu Moy6a964f52013-09-12 12:50:05 +02001389 if (s->hints)
Lucien Kong2d1cceb2012-06-10 13:17:38 +02001390 status_printf_ln(s, color,
1391 _(" (Once your working directory is clean, run \"git rebase --continue\")"));
Lucien Kong83c750a2012-06-05 22:21:24 +02001392 } else {
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001393 if (s->state.branch)
Nguyễn Thái Ngọc Duy0722c802013-02-03 12:53:27 +07001394 status_printf_ln(s, color,
1395 _("You are currently editing a commit while rebasing branch '%s' on '%s'."),
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001396 s->state.branch,
1397 s->state.onto);
Nguyễn Thái Ngọc Duy0722c802013-02-03 12:53:27 +07001398 else
1399 status_printf_ln(s, color,
1400 _("You are currently editing a commit during a rebase."));
Matthieu Moy6a964f52013-09-12 12:50:05 +02001401 if (s->hints && !s->amend) {
Lucien Kong83c750a2012-06-05 22:21:24 +02001402 status_printf_ln(s, color,
1403 _(" (use \"git commit --amend\" to amend the current commit)"));
1404 status_printf_ln(s, color,
1405 _(" (use \"git rebase --continue\" once you are satisfied with your changes)"));
1406 }
1407 }
Jeff Hostetler957a0fe2016-08-05 18:00:26 -04001408 wt_longstatus_print_trailer(s);
Lucien Kong83c750a2012-06-05 22:21:24 +02001409}
1410
1411static void show_cherry_pick_in_progress(struct wt_status *s,
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001412 const char *color)
Lucien Kong83c750a2012-06-05 22:21:24 +02001413{
Phillip Wood4a724862019-04-16 11:18:42 +01001414 if (is_null_oid(&s->state.cherry_pick_head_oid))
1415 status_printf_ln(s, color,
1416 _("Cherry-pick currently in progress."));
1417 else
1418 status_printf_ln(s, color,
1419 _("You are currently cherry-picking commit %s."),
1420 find_unique_abbrev(&s->state.cherry_pick_head_oid,
1421 DEFAULT_ABBREV));
1422
Matthieu Moy6a964f52013-09-12 12:50:05 +02001423 if (s->hints) {
Lucien Kong83c750a2012-06-05 22:21:24 +02001424 if (has_unmerged(s))
1425 status_printf_ln(s, color,
Ralf Thielowb95e66f2013-06-17 06:28:26 +02001426 _(" (fix conflicts and run \"git cherry-pick --continue\")"));
Phillip Wood4a724862019-04-16 11:18:42 +01001427 else if (is_null_oid(&s->state.cherry_pick_head_oid))
1428 status_printf_ln(s, color,
1429 _(" (run \"git cherry-pick --continue\" to continue)"));
Lucien Kong83c750a2012-06-05 22:21:24 +02001430 else
1431 status_printf_ln(s, color,
Ralf Thielowb95e66f2013-06-17 06:28:26 +02001432 _(" (all conflicts fixed: run \"git cherry-pick --continue\")"));
1433 status_printf_ln(s, color,
Denton Liu86ae43d2019-08-27 00:45:41 -04001434 _(" (use \"git cherry-pick --skip\" to skip this patch)"));
1435 status_printf_ln(s, color,
Ralf Thielowb95e66f2013-06-17 06:28:26 +02001436 _(" (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"));
Lucien Kong83c750a2012-06-05 22:21:24 +02001437 }
Jeff Hostetler957a0fe2016-08-05 18:00:26 -04001438 wt_longstatus_print_trailer(s);
Lucien Kong83c750a2012-06-05 22:21:24 +02001439}
1440
Matthieu Moydb4ef442013-04-02 16:20:21 +02001441static void show_revert_in_progress(struct wt_status *s,
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001442 const char *color)
Matthieu Moydb4ef442013-04-02 16:20:21 +02001443{
Phillip Wood4a724862019-04-16 11:18:42 +01001444 if (is_null_oid(&s->state.revert_head_oid))
1445 status_printf_ln(s, color,
1446 _("Revert currently in progress."));
1447 else
1448 status_printf_ln(s, color,
1449 _("You are currently reverting commit %s."),
1450 find_unique_abbrev(&s->state.revert_head_oid,
1451 DEFAULT_ABBREV));
Matthieu Moy6a964f52013-09-12 12:50:05 +02001452 if (s->hints) {
Matthieu Moydb4ef442013-04-02 16:20:21 +02001453 if (has_unmerged(s))
1454 status_printf_ln(s, color,
1455 _(" (fix conflicts and run \"git revert --continue\")"));
Phillip Wood4a724862019-04-16 11:18:42 +01001456 else if (is_null_oid(&s->state.revert_head_oid))
1457 status_printf_ln(s, color,
1458 _(" (run \"git revert --continue\" to continue)"));
Matthieu Moydb4ef442013-04-02 16:20:21 +02001459 else
1460 status_printf_ln(s, color,
1461 _(" (all conflicts fixed: run \"git revert --continue\")"));
1462 status_printf_ln(s, color,
Denton Liu86ae43d2019-08-27 00:45:41 -04001463 _(" (use \"git revert --skip\" to skip this patch)"));
1464 status_printf_ln(s, color,
Matthieu Moydb4ef442013-04-02 16:20:21 +02001465 _(" (use \"git revert --abort\" to cancel the revert operation)"));
1466 }
Jeff Hostetler957a0fe2016-08-05 18:00:26 -04001467 wt_longstatus_print_trailer(s);
Matthieu Moydb4ef442013-04-02 16:20:21 +02001468}
1469
Lucien Kong83c750a2012-06-05 22:21:24 +02001470static void show_bisect_in_progress(struct wt_status *s,
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001471 const char *color)
Lucien Kong83c750a2012-06-05 22:21:24 +02001472{
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001473 if (s->state.branch)
Nguyễn Thái Ngọc Duy0722c802013-02-03 12:53:27 +07001474 status_printf_ln(s, color,
Nguyễn Thái Ngọc Duy6deab242013-03-23 10:52:44 +07001475 _("You are currently bisecting, started from branch '%s'."),
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001476 s->state.branch);
Nguyễn Thái Ngọc Duy0722c802013-02-03 12:53:27 +07001477 else
1478 status_printf_ln(s, color,
1479 _("You are currently bisecting."));
Matthieu Moy6a964f52013-09-12 12:50:05 +02001480 if (s->hints)
Lucien Kong83c750a2012-06-05 22:21:24 +02001481 status_printf_ln(s, color,
1482 _(" (use \"git bisect reset\" to get back to the original branch)"));
Jeff Hostetler957a0fe2016-08-05 18:00:26 -04001483 wt_longstatus_print_trailer(s);
Lucien Kong83c750a2012-06-05 22:21:24 +02001484}
1485
Elijah Newren051df3c2020-06-18 20:49:57 +00001486static void show_sparse_checkout_in_use(struct wt_status *s,
1487 const char *color)
1488{
1489 if (s->state.sparse_checkout_percentage == SPARSE_CHECKOUT_DISABLED)
1490 return;
1491
1492 status_printf_ln(s, color,
1493 _("You are in a sparse checkout with %d%% of tracked files present."),
1494 s->state.sparse_checkout_percentage);
1495 wt_longstatus_print_trailer(s);
1496}
1497
Nguyễn Thái Ngọc Duy0722c802013-02-03 12:53:27 +07001498/*
1499 * Extract branch information from rebase/bisect
1500 */
Nguyễn Thái Ngọc Duy81eff272016-04-22 20:01:31 +07001501static char *get_branch(const struct worktree *wt, const char *path)
Nguyễn Thái Ngọc Duy0722c802013-02-03 12:53:27 +07001502{
Nguyễn Thái Ngọc Duy8b87cfd2013-03-16 09:12:36 +07001503 struct strbuf sb = STRBUF_INIT;
brian m. carlsone86ab2c2017-02-21 23:47:37 +00001504 struct object_id oid;
René Scharfec72b49d2015-10-31 18:37:43 +01001505 const char *branch_name;
Nguyễn Thái Ngọc Duy0722c802013-02-03 12:53:27 +07001506
Nguyễn Thái Ngọc Duy81eff272016-04-22 20:01:31 +07001507 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 +07001508 goto got_nothing;
Nguyễn Thái Ngọc Duy0722c802013-02-03 12:53:27 +07001509
Jeff King66ec9042015-01-28 12:57:35 -05001510 while (sb.len && sb.buf[sb.len - 1] == '\n')
Nguyễn Thái Ngọc Duy8b87cfd2013-03-16 09:12:36 +07001511 strbuf_setlen(&sb, sb.len - 1);
1512 if (!sb.len)
1513 goto got_nothing;
René Scharfec72b49d2015-10-31 18:37:43 +01001514 if (skip_prefix(sb.buf, "refs/heads/", &branch_name))
1515 strbuf_remove(&sb, 0, branch_name - sb.buf);
Christian Couder59556542013-11-30 21:55:40 +01001516 else if (starts_with(sb.buf, "refs/"))
Nguyễn Thái Ngọc Duy8b87cfd2013-03-16 09:12:36 +07001517 ;
brian m. carlsone86ab2c2017-02-21 23:47:37 +00001518 else if (!get_oid_hex(sb.buf, &oid)) {
Nguyễn Thái Ngọc Duy8b87cfd2013-03-16 09:12:36 +07001519 strbuf_reset(&sb);
brian m. carlson30e677e2018-03-12 02:27:28 +00001520 strbuf_add_unique_abbrev(&sb, &oid, DEFAULT_ABBREV);
Nguyễn Thái Ngọc Duy8b87cfd2013-03-16 09:12:36 +07001521 } else if (!strcmp(sb.buf, "detached HEAD")) /* rebase */
1522 goto got_nothing;
Nguyễn Thái Ngọc Duy0722c802013-02-03 12:53:27 +07001523 else /* bisect */
Nguyễn Thái Ngọc Duy8b87cfd2013-03-16 09:12:36 +07001524 ;
1525 return strbuf_detach(&sb, NULL);
1526
1527got_nothing:
1528 strbuf_release(&sb);
1529 return NULL;
Nguyễn Thái Ngọc Duy0722c802013-02-03 12:53:27 +07001530}
1531
Nguyễn Thái Ngọc Duyb397ea42013-03-13 18:42:52 +07001532struct grab_1st_switch_cbdata {
Nguyễn Thái Ngọc Duyb397ea42013-03-13 18:42:52 +07001533 struct strbuf buf;
brian m. carlsone86ab2c2017-02-21 23:47:37 +00001534 struct object_id noid;
Nguyễn Thái Ngọc Duyb397ea42013-03-13 18:42:52 +07001535};
1536
brian m. carlson9461d272017-02-21 23:47:32 +00001537static int grab_1st_switch(struct object_id *ooid, struct object_id *noid,
Johannes Schindelindddbad72017-04-26 21:29:31 +02001538 const char *email, timestamp_t timestamp, int tz,
Nguyễn Thái Ngọc Duyb397ea42013-03-13 18:42:52 +07001539 const char *message, void *cb_data)
Lucien Kong83c750a2012-06-05 22:21:24 +02001540{
Nguyễn Thái Ngọc Duyb397ea42013-03-13 18:42:52 +07001541 struct grab_1st_switch_cbdata *cb = cb_data;
1542 const char *target = NULL, *end;
1543
René Scharfec72b49d2015-10-31 18:37:43 +01001544 if (!skip_prefix(message, "checkout: moving from ", &message))
Nguyễn Thái Ngọc Duyb397ea42013-03-13 18:42:52 +07001545 return 0;
Nguyễn Thái Ngọc Duyb397ea42013-03-13 18:42:52 +07001546 target = strstr(message, " to ");
1547 if (!target)
1548 return 0;
1549 target += strlen(" to ");
1550 strbuf_reset(&cb->buf);
brian m. carlsone86ab2c2017-02-21 23:47:37 +00001551 oidcpy(&cb->noid, noid);
René Scharfe904de442015-11-25 15:10:18 +01001552 end = strchrnul(target, '\n');
1553 strbuf_add(&cb->buf, target, end - target);
1554 if (!strcmp(cb->buf.buf, "HEAD")) {
Matthieu Moy0eb85482015-09-27 17:13:42 +02001555 /* HEAD is relative. Resolve it to the right reflog entry. */
René Scharfe904de442015-11-25 15:10:18 +01001556 strbuf_reset(&cb->buf);
brian m. carlson30e677e2018-03-12 02:27:28 +00001557 strbuf_add_unique_abbrev(&cb->buf, noid, DEFAULT_ABBREV);
Matthieu Moy0eb85482015-09-27 17:13:42 +02001558 }
Nguyễn Thái Ngọc Duyb397ea42013-03-13 18:42:52 +07001559 return 1;
1560}
1561
Nguyễn Thái Ngọc Duy78845452018-11-10 06:48:50 +01001562static void wt_status_get_detached_from(struct repository *r,
1563 struct wt_status_state *state)
Nguyễn Thái Ngọc Duyb397ea42013-03-13 18:42:52 +07001564{
1565 struct grab_1st_switch_cbdata cb;
1566 struct commit *commit;
brian m. carlsone86ab2c2017-02-21 23:47:37 +00001567 struct object_id oid;
Nguyễn Thái Ngọc Duyb397ea42013-03-13 18:42:52 +07001568 char *ref = NULL;
1569
1570 strbuf_init(&cb.buf, 0);
1571 if (for_each_reflog_ent_reverse("HEAD", grab_1st_switch, &cb) <= 0) {
1572 strbuf_release(&cb.buf);
1573 return;
1574 }
1575
brian m. carlsoncca5fa62017-10-15 22:06:57 +00001576 if (dwim_ref(cb.buf.buf, cb.buf.len, &oid, &ref) == 1 &&
Nguyễn Thái Ngọc Duyb397ea42013-03-13 18:42:52 +07001577 /* sha1 is a commit? match without further lookup */
Jeff King4a7e27e2018-08-28 17:22:40 -04001578 (oideq(&cb.noid, &oid) ||
Nguyễn Thái Ngọc Duyb397ea42013-03-13 18:42:52 +07001579 /* perhaps sha1 is a tag, try to dereference to a commit */
Nguyễn Thái Ngọc Duy78845452018-11-10 06:48:50 +01001580 ((commit = lookup_commit_reference_gently(r, &oid, 1)) != NULL &&
Jeff King4a7e27e2018-08-28 17:22:40 -04001581 oideq(&cb.noid, &commit->object.oid)))) {
René Scharfec72b49d2015-10-31 18:37:43 +01001582 const char *from = ref;
1583 if (!skip_prefix(from, "refs/tags/", &from))
1584 skip_prefix(from, "refs/remotes/", &from);
1585 state->detached_from = xstrdup(from);
Nguyễn Thái Ngọc Duyb397ea42013-03-13 18:42:52 +07001586 } else
1587 state->detached_from =
brian m. carlsonaab95832018-03-12 02:27:30 +00001588 xstrdup(find_unique_abbrev(&cb.noid, DEFAULT_ABBREV));
brian m. carlson40f55552018-03-12 02:27:29 +00001589 oidcpy(&state->detached_oid, &cb.noid);
brian m. carlsone86ab2c2017-02-21 23:47:37 +00001590 state->detached_at = !get_oid("HEAD", &oid) &&
Jeff King4a7e27e2018-08-28 17:22:40 -04001591 oideq(&oid, &state->detached_oid);
Nguyễn Thái Ngọc Duyb397ea42013-03-13 18:42:52 +07001592
1593 free(ref);
1594 strbuf_release(&cb.buf);
1595}
1596
Nguyễn Thái Ngọc Duy81eff272016-04-22 20:01:31 +07001597int wt_status_check_rebase(const struct worktree *wt,
1598 struct wt_status_state *state)
Nguyễn Thái Ngọc Duyb9691db2013-03-13 18:42:50 +07001599{
Lucien Kong83c750a2012-06-05 22:21:24 +02001600 struct stat st;
1601
Nguyễn Thái Ngọc Duy81eff272016-04-22 20:01:31 +07001602 if (!stat(worktree_git_path(wt, "rebase-apply"), &st)) {
1603 if (!stat(worktree_git_path(wt, "rebase-apply/applying"), &st)) {
Nguyễn Thái Ngọc Duyb9691db2013-03-13 18:42:50 +07001604 state->am_in_progress = 1;
Nguyễn Thái Ngọc Duy81eff272016-04-22 20:01:31 +07001605 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 +07001606 state->am_empty_patch = 1;
Lucien Kong83c750a2012-06-05 22:21:24 +02001607 } else {
Nguyễn Thái Ngọc Duyb9691db2013-03-13 18:42:50 +07001608 state->rebase_in_progress = 1;
Nguyễn Thái Ngọc Duy81eff272016-04-22 20:01:31 +07001609 state->branch = get_branch(wt, "rebase-apply/head-name");
1610 state->onto = get_branch(wt, "rebase-apply/onto");
Lucien Kong83c750a2012-06-05 22:21:24 +02001611 }
Nguyễn Thái Ngọc Duy81eff272016-04-22 20:01:31 +07001612 } else if (!stat(worktree_git_path(wt, "rebase-merge"), &st)) {
1613 if (!stat(worktree_git_path(wt, "rebase-merge/interactive"), &st))
Nguyễn Thái Ngọc Duyb9691db2013-03-13 18:42:50 +07001614 state->rebase_interactive_in_progress = 1;
Lucien Kong83c750a2012-06-05 22:21:24 +02001615 else
Nguyễn Thái Ngọc Duyb9691db2013-03-13 18:42:50 +07001616 state->rebase_in_progress = 1;
Nguyễn Thái Ngọc Duy81eff272016-04-22 20:01:31 +07001617 state->branch = get_branch(wt, "rebase-merge/head-name");
1618 state->onto = get_branch(wt, "rebase-merge/onto");
Nguyễn Thái Ngọc Duybcd522a2016-04-22 20:01:30 +07001619 } else
1620 return 0;
1621 return 1;
1622}
1623
Nguyễn Thái Ngọc Duyf5d067a2016-04-22 20:01:34 +07001624int wt_status_check_bisect(const struct worktree *wt,
1625 struct wt_status_state *state)
1626{
1627 struct stat st;
1628
1629 if (!stat(worktree_git_path(wt, "BISECT_LOG"), &st)) {
1630 state->bisect_in_progress = 1;
1631 state->branch = get_branch(wt, "BISECT_START");
1632 return 1;
1633 }
1634 return 0;
1635}
1636
Elijah Newren051df3c2020-06-18 20:49:57 +00001637static void wt_status_check_sparse_checkout(struct repository *r,
1638 struct wt_status_state *state)
1639{
1640 int skip_worktree = 0;
1641 int i;
1642
1643 if (!core_apply_sparse_checkout || r->index->cache_nr == 0) {
1644 /*
1645 * Don't compute percentage of checked out files if we
1646 * aren't in a sparse checkout or would get division by 0.
1647 */
1648 state->sparse_checkout_percentage = SPARSE_CHECKOUT_DISABLED;
1649 return;
1650 }
1651
1652 for (i = 0; i < r->index->cache_nr; i++) {
1653 struct cache_entry *ce = r->index->cache[i];
1654 if (ce_skip_worktree(ce))
1655 skip_worktree++;
1656 }
1657
1658 state->sparse_checkout_percentage =
1659 100 - (100 * skip_worktree)/r->index->cache_nr;
1660}
1661
Nguyễn Thái Ngọc Duy78845452018-11-10 06:48:50 +01001662void wt_status_get_state(struct repository *r,
1663 struct wt_status_state *state,
Lucien Kong83c750a2012-06-05 22:21:24 +02001664 int get_detached_from)
1665{
1666 struct stat st;
brian m. carlsone86ab2c2017-02-21 23:47:37 +00001667 struct object_id oid;
Phillip Wood4a724862019-04-16 11:18:42 +01001668 enum replay_action action;
Lucien Kong83c750a2012-06-05 22:21:24 +02001669
Nguyễn Thái Ngọc Duy78845452018-11-10 06:48:50 +01001670 if (!stat(git_path_merge_head(r), &st)) {
Johannes Schindelin982288e2018-11-12 15:26:02 -08001671 wt_status_check_rebase(NULL, state);
Lucien Kong83c750a2012-06-05 22:21:24 +02001672 state->merge_in_progress = 1;
Nguyễn Thái Ngọc Duy81eff272016-04-22 20:01:31 +07001673 } else if (wt_status_check_rebase(NULL, state)) {
Nguyễn Thái Ngọc Duybcd522a2016-04-22 20:01:30 +07001674 ; /* all set */
Nguyễn Thái Ngọc Duy78845452018-11-10 06:48:50 +01001675 } else if (!stat(git_path_cherry_pick_head(r), &st) &&
brian m. carlsone86ab2c2017-02-21 23:47:37 +00001676 !get_oid("CHERRY_PICK_HEAD", &oid)) {
Nguyễn Thái Ngọc Duyb9691db2013-03-13 18:42:50 +07001677 state->cherry_pick_in_progress = 1;
brian m. carlson40f55552018-03-12 02:27:29 +00001678 oidcpy(&state->cherry_pick_head_oid, &oid);
Lucien Kong83c750a2012-06-05 22:21:24 +02001679 }
Nguyễn Thái Ngọc Duyf5d067a2016-04-22 20:01:34 +07001680 wt_status_check_bisect(NULL, state);
Nguyễn Thái Ngọc Duy78845452018-11-10 06:48:50 +01001681 if (!stat(git_path_revert_head(r), &st) &&
brian m. carlsone86ab2c2017-02-21 23:47:37 +00001682 !get_oid("REVERT_HEAD", &oid)) {
Matthieu Moydb4ef442013-04-02 16:20:21 +02001683 state->revert_in_progress = 1;
brian m. carlson40f55552018-03-12 02:27:29 +00001684 oidcpy(&state->revert_head_oid, &oid);
Matthieu Moydb4ef442013-04-02 16:20:21 +02001685 }
Phillip Wood4a724862019-04-16 11:18:42 +01001686 if (!sequencer_get_last_command(r, &action)) {
1687 if (action == REPLAY_PICK) {
1688 state->cherry_pick_in_progress = 1;
1689 oidcpy(&state->cherry_pick_head_oid, &null_oid);
1690 } else {
1691 state->revert_in_progress = 1;
1692 oidcpy(&state->revert_head_oid, &null_oid);
1693 }
1694 }
Nguyễn Thái Ngọc Duyb397ea42013-03-13 18:42:52 +07001695 if (get_detached_from)
Nguyễn Thái Ngọc Duy78845452018-11-10 06:48:50 +01001696 wt_status_get_detached_from(r, state);
Elijah Newren051df3c2020-06-18 20:49:57 +00001697 wt_status_check_sparse_checkout(r, state);
Nguyễn Thái Ngọc Duyb9691db2013-03-13 18:42:50 +07001698}
1699
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001700static void wt_longstatus_print_state(struct wt_status *s)
Lucien Kong83c750a2012-06-05 22:21:24 +02001701{
1702 const char *state_color = color(WT_STATUS_HEADER, s);
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001703 struct wt_status_state *state = &s->state;
1704
Johannes Schindelin982288e2018-11-12 15:26:02 -08001705 if (state->merge_in_progress) {
1706 if (state->rebase_interactive_in_progress) {
1707 show_rebase_information(s, state_color);
1708 fputs("\n", s->fp);
1709 }
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001710 show_merge_in_progress(s, state_color);
Johannes Schindelin982288e2018-11-12 15:26:02 -08001711 } else if (state->am_in_progress)
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001712 show_am_in_progress(s, state_color);
Nguyễn Thái Ngọc Duy3b691cc2013-03-13 18:42:51 +07001713 else if (state->rebase_in_progress || state->rebase_interactive_in_progress)
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001714 show_rebase_in_progress(s, state_color);
Nguyễn Thái Ngọc Duy3b691cc2013-03-13 18:42:51 +07001715 else if (state->cherry_pick_in_progress)
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001716 show_cherry_pick_in_progress(s, state_color);
Matthieu Moydb4ef442013-04-02 16:20:21 +02001717 else if (state->revert_in_progress)
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001718 show_revert_in_progress(s, state_color);
Nguyễn Thái Ngọc Duy3b691cc2013-03-13 18:42:51 +07001719 if (state->bisect_in_progress)
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001720 show_bisect_in_progress(s, state_color);
Elijah Newren051df3c2020-06-18 20:49:57 +00001721
1722 if (state->sparse_checkout_percentage != SPARSE_CHECKOUT_DISABLED)
1723 show_sparse_checkout_in_use(s, state_color);
Lucien Kong83c750a2012-06-05 22:21:24 +02001724}
1725
Jeff Hostetlerbe7e7952016-08-05 18:00:27 -04001726static void wt_longstatus_print(struct wt_status *s)
Jeff Kingc91f0d92006-09-08 04:05:34 -04001727{
Aleksi Aalto1d282322010-11-18 01:40:05 +02001728 const char *branch_color = color(WT_STATUS_ONBRANCH, s);
1729 const char *branch_status_color = color(WT_STATUS_HEADER, s);
Jürgen Rühle98bf8a42007-01-02 20:26:23 +01001730
Junio C Hamanobda324c2007-01-03 01:09:34 -08001731 if (s->branch) {
Ævar Arnfjörð Bjarmason355ec7a2011-02-22 23:42:13 +00001732 const char *on_what = _("On branch ");
Junio C Hamanobda324c2007-01-03 01:09:34 -08001733 const char *branch_name = s->branch;
René Scharfec72b49d2015-10-31 18:37:43 +01001734 if (!strcmp(branch_name, "HEAD")) {
Aleksi Aalto1d282322010-11-18 01:40:05 +02001735 branch_status_color = color(WT_STATUS_NOBRANCH, s);
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001736 if (s->state.rebase_in_progress ||
1737 s->state.rebase_interactive_in_progress) {
1738 if (s->state.rebase_interactive_in_progress)
Guillaume Pagèsdf25e942015-06-30 15:01:13 +02001739 on_what = _("interactive rebase in progress; onto ");
1740 else
1741 on_what = _("rebase in progress; onto ");
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001742 branch_name = s->state.onto;
1743 } else if (s->state.detached_from) {
1744 branch_name = s->state.detached_from;
1745 if (s->state.detached_at)
Matthew DeVore28438e82019-06-18 15:29:15 -07001746 on_what = HEAD_DETACHED_AT;
Nguyễn Thái Ngọc Duyb397ea42013-03-13 18:42:52 +07001747 else
Matthew DeVore28438e82019-06-18 15:29:15 -07001748 on_what = HEAD_DETACHED_FROM;
Nguyễn Thái Ngọc Duyb397ea42013-03-13 18:42:52 +07001749 } else {
1750 branch_name = "";
1751 on_what = _("Not currently on any branch.");
1752 }
René Scharfec72b49d2015-10-31 18:37:43 +01001753 } else
1754 skip_prefix(branch_name, "refs/heads/", &branch_name);
Felipe Contreras7d7d6802014-05-04 01:12:55 -05001755 status_printf(s, color(WT_STATUS_HEADER, s), "%s", "");
Jonathan Niederb926c0d2011-02-25 23:11:37 -06001756 status_printf_more(s, branch_status_color, "%s", on_what);
1757 status_printf_more(s, branch_color, "%s\n", branch_name);
Junio C Hamanob6975ab2008-07-02 00:52:16 -07001758 if (!s->is_initial)
Jeff Hostetler957a0fe2016-08-05 18:00:26 -04001759 wt_longstatus_print_tracking(s);
Junio C Hamanobda324c2007-01-03 01:09:34 -08001760 }
Jeff Kingc91f0d92006-09-08 04:05:34 -04001761
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001762 wt_longstatus_print_state(s);
Nguyễn Thái Ngọc Duy3b691cc2013-03-13 18:42:51 +07001763
Jeff Kingc91f0d92006-09-08 04:05:34 -04001764 if (s->is_initial) {
Felipe Contreras7d7d6802014-05-04 01:12:55 -05001765 status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", "");
Kaartic Sivaraam4ddb1352017-06-21 23:46:14 +05301766 status_printf_ln(s, color(WT_STATUS_HEADER, s),
1767 s->commit_template
1768 ? _("Initial commit")
1769 : _("No commits yet"));
Felipe Contreras7d7d6802014-05-04 01:12:55 -05001770 status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", "");
Jeff Kingc91f0d92006-09-08 04:05:34 -04001771 }
1772
Jeff Hostetler957a0fe2016-08-05 18:00:26 -04001773 wt_longstatus_print_updated(s);
1774 wt_longstatus_print_unmerged(s);
1775 wt_longstatus_print_changed(s);
Jens Lehmann46a958b2010-06-25 16:56:47 +02001776 if (s->submodule_summary &&
1777 (!s->ignore_submodule_arg ||
1778 strcmp(s->ignore_submodule_arg, "all"))) {
Jeff Hostetler957a0fe2016-08-05 18:00:26 -04001779 wt_longstatus_print_submodule_summary(s, 0); /* staged */
1780 wt_longstatus_print_submodule_summary(s, 1); /* unstaged */
Jens Lehmannf17a5d32010-01-17 20:42:31 +01001781 }
Junio C Hamano2381e392010-04-10 00:33:17 -07001782 if (s->show_untracked_files) {
Jeff Hostetler957a0fe2016-08-05 18:00:26 -04001783 wt_longstatus_print_other(s, &s->untracked, _("Untracked files"), "add");
Jameson Millereec0f7f2017-10-30 13:21:37 -04001784 if (s->show_ignored_mode)
Jeff Hostetler957a0fe2016-08-05 18:00:26 -04001785 wt_longstatus_print_other(s, &s->ignored, _("Ignored files"), "add -f");
Nguyễn Thái Ngọc Duy6a38ef22013-03-13 19:59:16 +07001786 if (advice_status_u_option && 2000 < s->untracked_in_ms) {
Felipe Contreras7d7d6802014-05-04 01:12:55 -05001787 status_printf_ln(s, GIT_COLOR_NORMAL, "%s", "");
Nguyễn Thái Ngọc Duy6a38ef22013-03-13 19:59:16 +07001788 status_printf_ln(s, GIT_COLOR_NORMAL,
Jiang Xin62901172013-04-12 11:53:01 +08001789 _("It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1790 "may speed it up, but you have to be careful not to forget to add\n"
1791 "new files yourself (see 'git help status')."),
1792 s->untracked_in_ms / 1000.0);
Nguyễn Thái Ngọc Duy6a38ef22013-03-13 19:59:16 +07001793 }
Stephen P. Smith6fa90192018-09-05 17:53:27 -07001794 } else if (s->committable)
Ævar Arnfjörð Bjarmason355ec7a2011-02-22 23:42:13 +00001795 status_printf_ln(s, GIT_COLOR_NORMAL, _("Untracked files not listed%s"),
Matthieu Moy6a964f52013-09-12 12:50:05 +02001796 s->hints
Ævar Arnfjörð Bjarmason355ec7a2011-02-22 23:42:13 +00001797 ? _(" (use -u option to show untracked files)") : "");
Jeff Kingc91f0d92006-09-08 04:05:34 -04001798
Jeff King1324fb62008-11-12 03:23:37 -05001799 if (s->verbose)
Jeff Hostetler957a0fe2016-08-05 18:00:26 -04001800 wt_longstatus_print_verbose(s);
Stephen P. Smith6fa90192018-09-05 17:53:27 -07001801 if (!s->committable) {
Jürgen Rühle6e458bf2007-01-02 20:26:22 +01001802 if (s->amend)
Ævar Arnfjörð Bjarmason355ec7a2011-02-22 23:42:13 +00001803 status_printf_ln(s, GIT_COLOR_NORMAL, _("No changes"));
Junio C Hamano37d07f82007-12-12 19:09:16 -08001804 else if (s->nowarn)
1805 ; /* nothing */
Nguyễn Thái Ngọc Duy50bd8b72012-09-06 22:16:50 +07001806 else if (s->workdir_dirty) {
Matthieu Moy6a964f52013-09-12 12:50:05 +02001807 if (s->hints)
Nguyễn Thái Ngọc Duy50bd8b72012-09-06 22:16:50 +07001808 printf(_("no changes added to commit "
1809 "(use \"git add\" and/or \"git commit -a\")\n"));
1810 else
1811 printf(_("no changes added to commit\n"));
1812 } else if (s->untracked.nr) {
Matthieu Moy6a964f52013-09-12 12:50:05 +02001813 if (s->hints)
Nguyễn Thái Ngọc Duy50bd8b72012-09-06 22:16:50 +07001814 printf(_("nothing added to commit but untracked files "
1815 "present (use \"git add\" to track)\n"));
1816 else
1817 printf(_("nothing added to commit but untracked files present\n"));
1818 } else if (s->is_initial) {
Matthieu Moy6a964f52013-09-12 12:50:05 +02001819 if (s->hints)
Nguyễn Thái Ngọc Duy50bd8b72012-09-06 22:16:50 +07001820 printf(_("nothing to commit (create/copy files "
1821 "and use \"git add\" to track)\n"));
1822 else
1823 printf(_("nothing to commit\n"));
1824 } else if (!s->show_untracked_files) {
Matthieu Moy6a964f52013-09-12 12:50:05 +02001825 if (s->hints)
Nguyễn Thái Ngọc Duy50bd8b72012-09-06 22:16:50 +07001826 printf(_("nothing to commit (use -u to show untracked files)\n"));
1827 else
1828 printf(_("nothing to commit\n"));
1829 } else
Lars Vogel2a0e6cd2016-06-09 20:19:30 +02001830 printf(_("nothing to commit, working tree clean\n"));
Jürgen Rühle6e458bf2007-01-02 20:26:22 +01001831 }
Liam Beguinc1b5d012017-06-17 18:30:51 -04001832 if(s->show_stash)
1833 wt_longstatus_print_stash_summary(s);
Jeff Kingc91f0d92006-09-08 04:05:34 -04001834}
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01001835
Jeff King3207a3a2012-05-07 15:44:44 -04001836static void wt_shortstatus_unmerged(struct string_list_item *it,
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01001837 struct wt_status *s)
1838{
1839 struct wt_status_change_data *d = it->util;
1840 const char *how = "??";
1841
1842 switch (d->stagemask) {
1843 case 1: how = "DD"; break; /* both deleted */
1844 case 2: how = "AU"; break; /* added by us */
1845 case 3: how = "UD"; break; /* deleted by them */
1846 case 4: how = "UA"; break; /* added by them */
1847 case 5: how = "DU"; break; /* deleted by us */
1848 case 6: how = "AA"; break; /* both added */
1849 case 7: how = "UU"; break; /* both modified */
1850 }
Michael J Gruber3fe2a892009-12-05 16:04:38 +01001851 color_fprintf(s->fp, color(WT_STATUS_UNMERGED, s), "%s", how);
Jeff King3207a3a2012-05-07 15:44:44 -04001852 if (s->null_termination) {
Michael J Gruber3fe2a892009-12-05 16:04:38 +01001853 fprintf(stdout, " %s%c", it->string, 0);
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01001854 } else {
1855 struct strbuf onebuf = STRBUF_INIT;
1856 const char *one;
Jiang Xin39598f92013-06-25 23:53:45 +08001857 one = quote_path(it->string, s->prefix, &onebuf);
Michael J Gruber3fe2a892009-12-05 16:04:38 +01001858 printf(" %s\n", one);
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01001859 strbuf_release(&onebuf);
1860 }
1861}
1862
Jeff King3207a3a2012-05-07 15:44:44 -04001863static void wt_shortstatus_status(struct string_list_item *it,
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01001864 struct wt_status *s)
1865{
1866 struct wt_status_change_data *d = it->util;
1867
Michael J Gruber3fe2a892009-12-05 16:04:38 +01001868 if (d->index_status)
1869 color_fprintf(s->fp, color(WT_STATUS_UPDATED, s), "%c", d->index_status);
1870 else
1871 putchar(' ');
1872 if (d->worktree_status)
1873 color_fprintf(s->fp, color(WT_STATUS_CHANGED, s), "%c", d->worktree_status);
1874 else
1875 putchar(' ');
1876 putchar(' ');
Jeff King3207a3a2012-05-07 15:44:44 -04001877 if (s->null_termination) {
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01001878 fprintf(stdout, "%s%c", it->string, 0);
Nguyễn Thái Ngọc Duy5134ccd2017-12-27 17:18:38 +07001879 if (d->rename_source)
1880 fprintf(stdout, "%s%c", d->rename_source, 0);
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01001881 } else {
1882 struct strbuf onebuf = STRBUF_INIT;
1883 const char *one;
Nguyễn Thái Ngọc Duy5134ccd2017-12-27 17:18:38 +07001884
1885 if (d->rename_source) {
1886 one = quote_path(d->rename_source, s->prefix, &onebuf);
Kevin Ballarddbfdc622010-11-08 18:44:38 -08001887 if (*one != '"' && strchr(one, ' ') != NULL) {
1888 putchar('"');
1889 strbuf_addch(&onebuf, '"');
1890 one = onebuf.buf;
1891 }
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01001892 printf("%s -> ", one);
1893 strbuf_release(&onebuf);
1894 }
Jiang Xin39598f92013-06-25 23:53:45 +08001895 one = quote_path(it->string, s->prefix, &onebuf);
Kevin Ballarddbfdc622010-11-08 18:44:38 -08001896 if (*one != '"' && strchr(one, ' ') != NULL) {
1897 putchar('"');
1898 strbuf_addch(&onebuf, '"');
1899 one = onebuf.buf;
1900 }
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01001901 printf("%s\n", one);
1902 strbuf_release(&onebuf);
1903 }
1904}
1905
Jeff King3207a3a2012-05-07 15:44:44 -04001906static void wt_shortstatus_other(struct string_list_item *it,
Junio C Hamano2381e392010-04-10 00:33:17 -07001907 struct wt_status *s, const char *sign)
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01001908{
Jeff King3207a3a2012-05-07 15:44:44 -04001909 if (s->null_termination) {
Junio C Hamano2381e392010-04-10 00:33:17 -07001910 fprintf(stdout, "%s %s%c", sign, it->string, 0);
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01001911 } else {
1912 struct strbuf onebuf = STRBUF_INIT;
1913 const char *one;
Jiang Xin39598f92013-06-25 23:53:45 +08001914 one = quote_path(it->string, s->prefix, &onebuf);
Junio C Hamanoc1909e72010-05-01 22:05:14 -07001915 color_fprintf(s->fp, color(WT_STATUS_UNTRACKED, s), "%s", sign);
Michael J Gruber3fe2a892009-12-05 16:04:38 +01001916 printf(" %s\n", one);
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01001917 strbuf_release(&onebuf);
1918 }
1919}
1920
Daniel Knittl-Frank05a59a02010-05-25 15:45:51 +02001921static void wt_shortstatus_print_tracking(struct wt_status *s)
1922{
1923 struct branch *branch;
1924 const char *header_color = color(WT_STATUS_HEADER, s);
1925 const char *branch_color_local = color(WT_STATUS_LOCAL_BRANCH, s);
1926 const char *branch_color_remote = color(WT_STATUS_REMOTE_BRANCH, s);
1927
1928 const char *base;
René Scharfe5e8d2722017-07-08 12:51:01 +02001929 char *short_base;
Daniel Knittl-Frank05a59a02010-05-25 15:45:51 +02001930 const char *branch_name;
Jeff Hostetler3ca18972018-01-09 18:50:17 +00001931 int num_ours, num_theirs, sti;
Jiang Xinf2e08732013-08-26 15:02:48 +08001932 int upstream_is_gone = 0;
Daniel Knittl-Frank05a59a02010-05-25 15:45:51 +02001933
1934 color_fprintf(s->fp, color(WT_STATUS_HEADER, s), "## ");
1935
1936 if (!s->branch)
1937 return;
1938 branch_name = s->branch;
1939
Michael J Gruberb9e2bc52017-03-14 17:02:02 +01001940#define LABEL(string) (s->no_gettext ? (string) : _(string))
1941
Daniel Knittl-Frank05a59a02010-05-25 15:45:51 +02001942 if (s->is_initial)
Kaartic Sivaraam4ddb1352017-06-21 23:46:14 +05301943 color_fprintf(s->fp, header_color, LABEL(N_("No commits yet on ")));
Jiang Xinf2e08732013-08-26 15:02:48 +08001944
René Scharfebaf0a3e2015-10-31 18:36:35 +01001945 if (!strcmp(s->branch, "HEAD")) {
1946 color_fprintf(s->fp, color(WT_STATUS_NOBRANCH, s), "%s",
Michael J Gruberb9e2bc52017-03-14 17:02:02 +01001947 LABEL(N_("HEAD (no branch)")));
René Scharfebaf0a3e2015-10-31 18:36:35 +01001948 goto conclude;
1949 }
1950
René Scharfec72b49d2015-10-31 18:37:43 +01001951 skip_prefix(branch_name, "refs/heads/", &branch_name);
René Scharfebaf0a3e2015-10-31 18:36:35 +01001952
René Scharfe8d8325f2015-10-31 18:37:12 +01001953 branch = branch_get(branch_name);
René Scharfebaf0a3e2015-10-31 18:36:35 +01001954
Jiang Xinf2e08732013-08-26 15:02:48 +08001955 color_fprintf(s->fp, branch_color_local, "%s", branch_name);
1956
Jeff Hostetler3ca18972018-01-09 18:50:17 +00001957 sti = stat_tracking_info(branch, &num_ours, &num_theirs, &base,
Damien Robertc646d092019-04-16 14:16:46 +02001958 0, s->ahead_behind_flags);
Jeff Hostetler3ca18972018-01-09 18:50:17 +00001959 if (sti < 0) {
René Scharfebcf8cc22015-10-31 18:36:01 +01001960 if (!base)
1961 goto conclude;
Jeff King979cb242015-05-21 20:49:11 -04001962
Jiang Xinf2e08732013-08-26 15:02:48 +08001963 upstream_is_gone = 1;
Daniel Knittl-Frank05a59a02010-05-25 15:45:51 +02001964 }
1965
René Scharfe5e8d2722017-07-08 12:51:01 +02001966 short_base = shorten_unambiguous_ref(base, 0);
Daniel Knittl-Frank05a59a02010-05-25 15:45:51 +02001967 color_fprintf(s->fp, header_color, "...");
René Scharfe5e8d2722017-07-08 12:51:01 +02001968 color_fprintf(s->fp, branch_color_remote, "%s", short_base);
1969 free(short_base);
Daniel Knittl-Frank05a59a02010-05-25 15:45:51 +02001970
Jeff Hostetler3ca18972018-01-09 18:50:17 +00001971 if (!upstream_is_gone && !sti)
René Scharfebcf8cc22015-10-31 18:36:01 +01001972 goto conclude;
Jiang Xinf2234592013-08-26 15:02:49 +08001973
Daniel Knittl-Frank05a59a02010-05-25 15:45:51 +02001974 color_fprintf(s->fp, header_color, " [");
Jiang Xinf2e08732013-08-26 15:02:48 +08001975 if (upstream_is_gone) {
Matthieu Moy7a76c282014-03-20 13:12:41 +01001976 color_fprintf(s->fp, header_color, LABEL(N_("gone")));
Jeff Hostetler3ca18972018-01-09 18:50:17 +00001977 } else if (s->ahead_behind_flags == AHEAD_BEHIND_QUICK) {
1978 color_fprintf(s->fp, header_color, LABEL(N_("different")));
Jiang Xinf2e08732013-08-26 15:02:48 +08001979 } else if (!num_ours) {
Matthieu Moy7a76c282014-03-20 13:12:41 +01001980 color_fprintf(s->fp, header_color, LABEL(N_("behind ")));
Daniel Knittl-Frank05a59a02010-05-25 15:45:51 +02001981 color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
1982 } else if (!num_theirs) {
Michael J Gruberdf227242016-03-14 16:30:33 +01001983 color_fprintf(s->fp, header_color, LABEL(N_("ahead ")));
Daniel Knittl-Frank05a59a02010-05-25 15:45:51 +02001984 color_fprintf(s->fp, branch_color_local, "%d", num_ours);
1985 } else {
Michael J Gruberdf227242016-03-14 16:30:33 +01001986 color_fprintf(s->fp, header_color, LABEL(N_("ahead ")));
Daniel Knittl-Frank05a59a02010-05-25 15:45:51 +02001987 color_fprintf(s->fp, branch_color_local, "%d", num_ours);
Matthieu Moy7a76c282014-03-20 13:12:41 +01001988 color_fprintf(s->fp, header_color, ", %s", LABEL(N_("behind ")));
Daniel Knittl-Frank05a59a02010-05-25 15:45:51 +02001989 color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
1990 }
1991
Jeff Kinga5985232012-05-07 17:02:18 -04001992 color_fprintf(s->fp, header_color, "]");
René Scharfebcf8cc22015-10-31 18:36:01 +01001993 conclude:
Jeff Kinga5985232012-05-07 17:02:18 -04001994 fputc(s->null_termination ? '\0' : '\n', s->fp);
Daniel Knittl-Frank05a59a02010-05-25 15:45:51 +02001995}
1996
Jeff Hostetlerbe7e7952016-08-05 18:00:27 -04001997static void wt_shortstatus_print(struct wt_status *s)
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01001998{
Stefan Bellerd4aae452017-03-16 14:36:19 -07001999 struct string_list_item *it;
Daniel Knittl-Frank05a59a02010-05-25 15:45:51 +02002000
Jeff Kingd4a6bf12012-05-07 17:09:04 -04002001 if (s->show_branch)
Daniel Knittl-Frank05a59a02010-05-25 15:45:51 +02002002 wt_shortstatus_print_tracking(s);
2003
Stefan Bellerd4aae452017-03-16 14:36:19 -07002004 for_each_string_list_item(it, &s->change) {
2005 struct wt_status_change_data *d = it->util;
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01002006
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01002007 if (d->stagemask)
Jeff King3207a3a2012-05-07 15:44:44 -04002008 wt_shortstatus_unmerged(it, s);
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01002009 else
Jeff King3207a3a2012-05-07 15:44:44 -04002010 wt_shortstatus_status(it, s);
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01002011 }
Stefan Bellerd4aae452017-03-16 14:36:19 -07002012 for_each_string_list_item(it, &s->untracked)
Jeff King3207a3a2012-05-07 15:44:44 -04002013 wt_shortstatus_other(it, s, "??");
Junio C Hamano2381e392010-04-10 00:33:17 -07002014
Stefan Bellerd4aae452017-03-16 14:36:19 -07002015 for_each_string_list_item(it, &s->ignored)
Jeff King3207a3a2012-05-07 15:44:44 -04002016 wt_shortstatus_other(it, s, "!!");
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01002017}
Jeff King4a7cc2f2009-12-07 00:17:15 -05002018
Jeff Hostetlerbe7e7952016-08-05 18:00:27 -04002019static void wt_porcelain_print(struct wt_status *s)
Jeff King4a7cc2f2009-12-07 00:17:15 -05002020{
2021 s->use_color = 0;
Jeff King86617682009-12-07 00:26:25 -05002022 s->relative_paths = 0;
2023 s->prefix = NULL;
Matthieu Moy7a76c282014-03-20 13:12:41 +01002024 s->no_gettext = 1;
Jeff Kingd4a6bf12012-05-07 17:09:04 -04002025 wt_shortstatus_print(s);
Jeff King4a7cc2f2009-12-07 00:17:15 -05002026}
Jeff Hostetlerbe7e7952016-08-05 18:00:27 -04002027
Jeff Hostetler24959ba2016-08-11 10:45:58 -04002028/*
Jeff Hostetlerd9fc7462016-08-11 10:45:59 -04002029 * Print branch information for porcelain v2 output. These lines
2030 * are printed when the '--branch' parameter is given.
2031 *
2032 * # branch.oid <commit><eol>
2033 * # branch.head <head><eol>
2034 * [# branch.upstream <upstream><eol>
2035 * [# branch.ab +<ahead> -<behind><eol>]]
2036 *
Elijah Newren6d12b532020-07-28 20:45:38 +00002037 * <commit> ::= the current commit hash or the literal
Jeff Hostetlerd9fc7462016-08-11 10:45:59 -04002038 * "(initial)" to indicate an initialized repo
2039 * with no commits.
2040 *
2041 * <head> ::= <branch_name> the current branch name or
2042 * "(detached)" literal when detached head or
2043 * "(unknown)" when something is wrong.
2044 *
2045 * <upstream> ::= the upstream branch name, when set.
2046 *
Jeff Hostetlerfd9b5442018-01-09 18:50:16 +00002047 * <ahead> ::= integer ahead value or '?'.
Jeff Hostetlerd9fc7462016-08-11 10:45:59 -04002048 *
Jeff Hostetlerfd9b5442018-01-09 18:50:16 +00002049 * <behind> ::= integer behind value or '?'.
Jeff Hostetlerd9fc7462016-08-11 10:45:59 -04002050 *
2051 * The end-of-line is defined by the -z flag.
2052 *
2053 * <eol> ::= NUL when -z,
2054 * LF when NOT -z.
2055 *
Jeff Hostetlerfd9b5442018-01-09 18:50:16 +00002056 * When an upstream is set and present, the 'branch.ab' line will
2057 * be printed with the ahead/behind counts for the branch and the
2058 * upstream. When AHEAD_BEHIND_QUICK is requested and the branches
2059 * are different, '?' will be substituted for the actual count.
Jeff Hostetlerd9fc7462016-08-11 10:45:59 -04002060 */
2061static void wt_porcelain_v2_print_tracking(struct wt_status *s)
2062{
2063 struct branch *branch;
2064 const char *base;
2065 const char *branch_name;
Jeff Hostetlerd9fc7462016-08-11 10:45:59 -04002066 int ab_info, nr_ahead, nr_behind;
2067 char eol = s->null_termination ? '\0' : '\n';
2068
Jeff Hostetlerd9fc7462016-08-11 10:45:59 -04002069 fprintf(s->fp, "# branch.oid %s%c",
brian m. carlsone0cb7cd2019-08-18 20:04:21 +00002070 (s->is_initial ? "(initial)" : oid_to_hex(&s->oid_commit)),
Jeff Hostetlerd9fc7462016-08-11 10:45:59 -04002071 eol);
2072
2073 if (!s->branch)
2074 fprintf(s->fp, "# branch.head %s%c", "(unknown)", eol);
2075 else {
2076 if (!strcmp(s->branch, "HEAD")) {
2077 fprintf(s->fp, "# branch.head %s%c", "(detached)", eol);
2078
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07002079 if (s->state.rebase_in_progress ||
2080 s->state.rebase_interactive_in_progress)
2081 branch_name = s->state.onto;
2082 else if (s->state.detached_from)
2083 branch_name = s->state.detached_from;
Jeff Hostetlerd9fc7462016-08-11 10:45:59 -04002084 else
2085 branch_name = "";
2086 } else {
2087 branch_name = NULL;
2088 skip_prefix(s->branch, "refs/heads/", &branch_name);
2089
2090 fprintf(s->fp, "# branch.head %s%c", branch_name, eol);
2091 }
2092
2093 /* Lookup stats on the upstream tracking branch, if set. */
2094 branch = branch_get(branch_name);
2095 base = NULL;
Jeff Hostetlerfd9b5442018-01-09 18:50:16 +00002096 ab_info = stat_tracking_info(branch, &nr_ahead, &nr_behind,
Damien Robertc646d092019-04-16 14:16:46 +02002097 &base, 0, s->ahead_behind_flags);
Jeff Hostetlerd9fc7462016-08-11 10:45:59 -04002098 if (base) {
2099 base = shorten_unambiguous_ref(base, 0);
2100 fprintf(s->fp, "# branch.upstream %s%c", base, eol);
2101 free((char *)base);
2102
Jeff Hostetlerfd9b5442018-01-09 18:50:16 +00002103 if (ab_info > 0) {
2104 /* different */
2105 if (nr_ahead || nr_behind)
2106 fprintf(s->fp, "# branch.ab +%d -%d%c",
2107 nr_ahead, nr_behind, eol);
2108 else
2109 fprintf(s->fp, "# branch.ab +? -?%c",
2110 eol);
2111 } else if (!ab_info) {
2112 /* same */
2113 fprintf(s->fp, "# branch.ab +0 -0%c", eol);
2114 }
Jeff Hostetlerd9fc7462016-08-11 10:45:59 -04002115 }
2116 }
Jeff Hostetlerd9fc7462016-08-11 10:45:59 -04002117}
2118
2119/*
Jeff Hostetler24959ba2016-08-11 10:45:58 -04002120 * Convert various submodule status values into a
2121 * fixed-length string of characters in the buffer provided.
2122 */
2123static void wt_porcelain_v2_submodule_state(
2124 struct wt_status_change_data *d,
2125 char sub[5])
2126{
2127 if (S_ISGITLINK(d->mode_head) ||
2128 S_ISGITLINK(d->mode_index) ||
2129 S_ISGITLINK(d->mode_worktree)) {
2130 sub[0] = 'S';
2131 sub[1] = d->new_submodule_commits ? 'C' : '.';
2132 sub[2] = (d->dirty_submodule & DIRTY_SUBMODULE_MODIFIED) ? 'M' : '.';
2133 sub[3] = (d->dirty_submodule & DIRTY_SUBMODULE_UNTRACKED) ? 'U' : '.';
2134 } else {
2135 sub[0] = 'N';
2136 sub[1] = '.';
2137 sub[2] = '.';
2138 sub[3] = '.';
2139 }
2140 sub[4] = 0;
2141}
2142
2143/*
2144 * Fix-up changed entries before we print them.
2145 */
Jeff King13a17812019-05-09 17:30:19 -04002146static void wt_porcelain_v2_fix_up_changed(struct string_list_item *it)
Jeff Hostetler24959ba2016-08-11 10:45:58 -04002147{
2148 struct wt_status_change_data *d = it->util;
2149
2150 if (!d->index_status) {
2151 /*
2152 * This entry is unchanged in the index (relative to the head).
2153 * Therefore, the collect_updated_cb was never called for this
2154 * entry (during the head-vs-index scan) and so the head column
2155 * fields were never set.
2156 *
2157 * We must have data for the index column (from the
2158 * index-vs-worktree scan (otherwise, this entry should not be
2159 * in the list of changes)).
2160 *
2161 * Copy index column fields to the head column, so that our
2162 * output looks complete.
2163 */
2164 assert(d->mode_head == 0);
2165 d->mode_head = d->mode_index;
2166 oidcpy(&d->oid_head, &d->oid_index);
2167 }
2168
2169 if (!d->worktree_status) {
2170 /*
2171 * This entry is unchanged in the worktree (relative to the index).
2172 * Therefore, the collect_changed_cb was never called for this entry
2173 * (during the index-vs-worktree scan) and so the worktree column
2174 * fields were never set.
2175 *
2176 * We must have data for the index column (from the head-vs-index
2177 * scan).
2178 *
2179 * Copy the index column fields to the worktree column so that
2180 * our output looks complete.
2181 *
2182 * Note that we only have a mode field in the worktree column
2183 * because the scan code tries really hard to not have to compute it.
2184 */
2185 assert(d->mode_worktree == 0);
2186 d->mode_worktree = d->mode_index;
2187 }
2188}
2189
2190/*
2191 * Print porcelain v2 info for tracked entries with changes.
2192 */
2193static void wt_porcelain_v2_print_changed_entry(
2194 struct string_list_item *it,
2195 struct wt_status *s)
2196{
2197 struct wt_status_change_data *d = it->util;
Nguyễn Thái Ngọc Duy5134ccd2017-12-27 17:18:38 +07002198 struct strbuf buf = STRBUF_INIT;
2199 struct strbuf buf_from = STRBUF_INIT;
2200 const char *path = NULL;
2201 const char *path_from = NULL;
Jeff Hostetler24959ba2016-08-11 10:45:58 -04002202 char key[3];
2203 char submodule_token[5];
2204 char sep_char, eol_char;
2205
Jeff King13a17812019-05-09 17:30:19 -04002206 wt_porcelain_v2_fix_up_changed(it);
Jeff Hostetler24959ba2016-08-11 10:45:58 -04002207 wt_porcelain_v2_submodule_state(d, submodule_token);
2208
2209 key[0] = d->index_status ? d->index_status : '.';
2210 key[1] = d->worktree_status ? d->worktree_status : '.';
2211 key[2] = 0;
2212
2213 if (s->null_termination) {
2214 /*
2215 * In -z mode, we DO NOT C-quote pathnames. Current path is ALWAYS first.
2216 * A single NUL character separates them.
2217 */
2218 sep_char = '\0';
2219 eol_char = '\0';
Nguyễn Thái Ngọc Duy5134ccd2017-12-27 17:18:38 +07002220 path = it->string;
2221 path_from = d->rename_source;
Jeff Hostetler24959ba2016-08-11 10:45:58 -04002222 } else {
2223 /*
2224 * Path(s) are C-quoted if necessary. Current path is ALWAYS first.
2225 * The source path is only present when necessary.
2226 * A single TAB separates them (because paths can contain spaces
2227 * which are not escaped and C-quoting does escape TAB characters).
2228 */
2229 sep_char = '\t';
2230 eol_char = '\n';
Nguyễn Thái Ngọc Duy5134ccd2017-12-27 17:18:38 +07002231 path = quote_path(it->string, s->prefix, &buf);
2232 if (d->rename_source)
2233 path_from = quote_path(d->rename_source, s->prefix, &buf_from);
Jeff Hostetler24959ba2016-08-11 10:45:58 -04002234 }
2235
Nguyễn Thái Ngọc Duy5134ccd2017-12-27 17:18:38 +07002236 if (path_from)
Jeff Hostetler24959ba2016-08-11 10:45:58 -04002237 fprintf(s->fp, "2 %s %s %06o %06o %06o %s %s %c%d %s%c%s%c",
2238 key, submodule_token,
2239 d->mode_head, d->mode_index, d->mode_worktree,
2240 oid_to_hex(&d->oid_head), oid_to_hex(&d->oid_index),
Nguyễn Thái Ngọc Duy5134ccd2017-12-27 17:18:38 +07002241 d->rename_status, d->rename_score,
2242 path, sep_char, path_from, eol_char);
Jeff Hostetler24959ba2016-08-11 10:45:58 -04002243 else
2244 fprintf(s->fp, "1 %s %s %06o %06o %06o %s %s %s%c",
2245 key, submodule_token,
2246 d->mode_head, d->mode_index, d->mode_worktree,
2247 oid_to_hex(&d->oid_head), oid_to_hex(&d->oid_index),
Nguyễn Thái Ngọc Duy5134ccd2017-12-27 17:18:38 +07002248 path, eol_char);
Jeff Hostetler24959ba2016-08-11 10:45:58 -04002249
Nguyễn Thái Ngọc Duy5134ccd2017-12-27 17:18:38 +07002250 strbuf_release(&buf);
2251 strbuf_release(&buf_from);
Jeff Hostetler24959ba2016-08-11 10:45:58 -04002252}
2253
2254/*
2255 * Print porcelain v2 status info for unmerged entries.
2256 */
2257static void wt_porcelain_v2_print_unmerged_entry(
2258 struct string_list_item *it,
2259 struct wt_status *s)
2260{
2261 struct wt_status_change_data *d = it->util;
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +01002262 struct index_state *istate = s->repo->index;
Jeff Hostetler24959ba2016-08-11 10:45:58 -04002263 const struct cache_entry *ce;
2264 struct strbuf buf_index = STRBUF_INIT;
2265 const char *path_index = NULL;
2266 int pos, stage, sum;
2267 struct {
2268 int mode;
2269 struct object_id oid;
2270 } stages[3];
2271 char *key;
2272 char submodule_token[5];
2273 char unmerged_prefix = 'u';
2274 char eol_char = s->null_termination ? '\0' : '\n';
2275
2276 wt_porcelain_v2_submodule_state(d, submodule_token);
2277
2278 switch (d->stagemask) {
2279 case 1: key = "DD"; break; /* both deleted */
2280 case 2: key = "AU"; break; /* added by us */
2281 case 3: key = "UD"; break; /* deleted by them */
2282 case 4: key = "UA"; break; /* added by them */
2283 case 5: key = "DU"; break; /* deleted by us */
2284 case 6: key = "AA"; break; /* both added */
2285 case 7: key = "UU"; break; /* both modified */
2286 default:
Johannes Schindelin033abf92018-05-02 11:38:39 +02002287 BUG("unhandled unmerged status %x", d->stagemask);
Jeff Hostetler24959ba2016-08-11 10:45:58 -04002288 }
2289
2290 /*
2291 * Disregard d.aux.porcelain_v2 data that we accumulated
2292 * for the head and index columns during the scans and
2293 * replace with the actual stage data.
2294 *
2295 * Note that this is a last-one-wins for each the individual
2296 * stage [123] columns in the event of multiple cache entries
2297 * for same stage.
2298 */
2299 memset(stages, 0, sizeof(stages));
2300 sum = 0;
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +01002301 pos = index_name_pos(istate, it->string, strlen(it->string));
Jeff Hostetler24959ba2016-08-11 10:45:58 -04002302 assert(pos < 0);
2303 pos = -pos-1;
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +01002304 while (pos < istate->cache_nr) {
2305 ce = istate->cache[pos++];
Jeff Hostetler24959ba2016-08-11 10:45:58 -04002306 stage = ce_stage(ce);
2307 if (strcmp(ce->name, it->string) || !stage)
2308 break;
2309 stages[stage - 1].mode = ce->ce_mode;
René Scharfe86947692017-01-28 23:03:06 +01002310 oidcpy(&stages[stage - 1].oid, &ce->oid);
Jeff Hostetler24959ba2016-08-11 10:45:58 -04002311 sum |= (1 << (stage - 1));
2312 }
2313 if (sum != d->stagemask)
Johannes Schindelin033abf92018-05-02 11:38:39 +02002314 BUG("observed stagemask 0x%x != expected stagemask 0x%x", sum, d->stagemask);
Jeff Hostetler24959ba2016-08-11 10:45:58 -04002315
2316 if (s->null_termination)
2317 path_index = it->string;
2318 else
2319 path_index = quote_path(it->string, s->prefix, &buf_index);
2320
2321 fprintf(s->fp, "%c %s %s %06o %06o %06o %06o %s %s %s %s%c",
2322 unmerged_prefix, key, submodule_token,
2323 stages[0].mode, /* stage 1 */
2324 stages[1].mode, /* stage 2 */
2325 stages[2].mode, /* stage 3 */
2326 d->mode_worktree,
2327 oid_to_hex(&stages[0].oid), /* stage 1 */
2328 oid_to_hex(&stages[1].oid), /* stage 2 */
2329 oid_to_hex(&stages[2].oid), /* stage 3 */
2330 path_index,
2331 eol_char);
2332
2333 strbuf_release(&buf_index);
2334}
2335
2336/*
2337 * Print porcelain V2 status info for untracked and ignored entries.
2338 */
2339static void wt_porcelain_v2_print_other(
2340 struct string_list_item *it,
2341 struct wt_status *s,
2342 char prefix)
2343{
2344 struct strbuf buf = STRBUF_INIT;
2345 const char *path;
2346 char eol_char;
2347
2348 if (s->null_termination) {
2349 path = it->string;
2350 eol_char = '\0';
2351 } else {
2352 path = quote_path(it->string, s->prefix, &buf);
2353 eol_char = '\n';
2354 }
2355
2356 fprintf(s->fp, "%c %s%c", prefix, path, eol_char);
2357
2358 strbuf_release(&buf);
2359}
2360
2361/*
2362 * Print porcelain V2 status.
2363 *
Jeff Hostetlerd9fc7462016-08-11 10:45:59 -04002364 * [<v2_branch>]
Jeff Hostetler24959ba2016-08-11 10:45:58 -04002365 * [<v2_changed_items>]*
2366 * [<v2_unmerged_items>]*
2367 * [<v2_untracked_items>]*
2368 * [<v2_ignored_items>]*
2369 *
2370 */
2371static void wt_porcelain_v2_print(struct wt_status *s)
2372{
2373 struct wt_status_change_data *d;
2374 struct string_list_item *it;
2375 int i;
2376
Jeff Hostetlerd9fc7462016-08-11 10:45:59 -04002377 if (s->show_branch)
2378 wt_porcelain_v2_print_tracking(s);
2379
Jeff Hostetler24959ba2016-08-11 10:45:58 -04002380 for (i = 0; i < s->change.nr; i++) {
2381 it = &(s->change.items[i]);
2382 d = it->util;
2383 if (!d->stagemask)
2384 wt_porcelain_v2_print_changed_entry(it, s);
2385 }
2386
2387 for (i = 0; i < s->change.nr; i++) {
2388 it = &(s->change.items[i]);
2389 d = it->util;
2390 if (d->stagemask)
2391 wt_porcelain_v2_print_unmerged_entry(it, s);
2392 }
2393
2394 for (i = 0; i < s->untracked.nr; i++) {
2395 it = &(s->untracked.items[i]);
2396 wt_porcelain_v2_print_other(it, s, '?');
2397 }
2398
2399 for (i = 0; i < s->ignored.nr; i++) {
2400 it = &(s->ignored.items[i]);
2401 wt_porcelain_v2_print_other(it, s, '!');
2402 }
2403}
2404
Jeff Hostetlerbe7e7952016-08-05 18:00:27 -04002405void wt_status_print(struct wt_status *s)
2406{
Jeff Hostetler942b2742019-02-22 14:25:03 -08002407 trace2_data_intmax("status", s->repo, "count/changed", s->change.nr);
2408 trace2_data_intmax("status", s->repo, "count/untracked",
2409 s->untracked.nr);
2410 trace2_data_intmax("status", s->repo, "count/ignored", s->ignored.nr);
2411
2412 trace2_region_enter("status", "print", s->repo);
2413
Jeff Hostetlerbe7e7952016-08-05 18:00:27 -04002414 switch (s->status_format) {
2415 case STATUS_FORMAT_SHORT:
2416 wt_shortstatus_print(s);
2417 break;
2418 case STATUS_FORMAT_PORCELAIN:
2419 wt_porcelain_print(s);
2420 break;
Jeff Hostetler1ecdecc2016-08-11 10:45:57 -04002421 case STATUS_FORMAT_PORCELAIN_V2:
Jeff Hostetler24959ba2016-08-11 10:45:58 -04002422 wt_porcelain_v2_print(s);
Jeff Hostetler1ecdecc2016-08-11 10:45:57 -04002423 break;
Jeff Hostetlerbe7e7952016-08-05 18:00:27 -04002424 case STATUS_FORMAT_UNSPECIFIED:
Johannes Schindelin033abf92018-05-02 11:38:39 +02002425 BUG("finalize_deferred_config() should have been called");
Jeff Hostetlerbe7e7952016-08-05 18:00:27 -04002426 break;
2427 case STATUS_FORMAT_NONE:
2428 case STATUS_FORMAT_LONG:
2429 wt_longstatus_print(s);
2430 break;
2431 }
Jeff Hostetler942b2742019-02-22 14:25:03 -08002432
2433 trace2_region_leave("status", "print", s->repo);
Jeff Hostetlerbe7e7952016-08-05 18:00:27 -04002434}
Johannes Schindelinfd849862016-10-07 18:08:38 +02002435
2436/**
2437 * Returns 1 if there are unstaged changes, 0 otherwise.
2438 */
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +01002439int has_unstaged_changes(struct repository *r, int ignore_submodules)
Johannes Schindelinfd849862016-10-07 18:08:38 +02002440{
2441 struct rev_info rev_info;
2442 int result;
2443
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +01002444 repo_init_revisions(r, &rev_info, NULL);
Brandon Williamsc6d8ccf2017-11-06 14:08:19 -08002445 if (ignore_submodules) {
Brandon Williams0d1e0e72017-10-31 11:19:11 -07002446 rev_info.diffopt.flags.ignore_submodules = 1;
Junio C Hamanob50d82b2017-11-15 12:14:30 +09002447 rev_info.diffopt.flags.override_submodule_config = 1;
Brandon Williamsc6d8ccf2017-11-06 14:08:19 -08002448 }
Brandon Williams0d1e0e72017-10-31 11:19:11 -07002449 rev_info.diffopt.flags.quick = 1;
Johannes Schindelinfd849862016-10-07 18:08:38 +02002450 diff_setup_done(&rev_info.diffopt);
2451 result = run_diff_files(&rev_info, 0);
2452 return diff_result_code(&rev_info.diffopt, result);
2453}
2454
2455/**
2456 * Returns 1 if there are uncommitted changes, 0 otherwise.
2457 */
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +01002458int has_uncommitted_changes(struct repository *r,
2459 int ignore_submodules)
Johannes Schindelinfd849862016-10-07 18:08:38 +02002460{
2461 struct rev_info rev_info;
2462 int result;
2463
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +01002464 if (is_index_unborn(r->index))
Johannes Schindelinfd849862016-10-07 18:08:38 +02002465 return 0;
2466
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +01002467 repo_init_revisions(r, &rev_info, NULL);
Johannes Schindelind8cc92a2016-10-07 18:09:00 +02002468 if (ignore_submodules)
Brandon Williams0d1e0e72017-10-31 11:19:11 -07002469 rev_info.diffopt.flags.ignore_submodules = 1;
2470 rev_info.diffopt.flags.quick = 1;
Jeff King3506dc92018-07-11 10:14:06 -04002471
Johannes Schindelinfd849862016-10-07 18:08:38 +02002472 add_head_to_pending(&rev_info);
Jeff King3506dc92018-07-11 10:14:06 -04002473 if (!rev_info.pending.nr) {
2474 /*
2475 * We have no head (or it's corrupt); use the empty tree,
2476 * which will complain if the index is non-empty.
2477 */
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +01002478 struct tree *tree = lookup_tree(r, the_hash_algo->empty_tree);
Jeff King3506dc92018-07-11 10:14:06 -04002479 add_pending_object(&rev_info, &tree->object, "");
2480 }
2481
Johannes Schindelinfd849862016-10-07 18:08:38 +02002482 diff_setup_done(&rev_info.diffopt);
2483 result = run_diff_index(&rev_info, 1);
2484 return diff_result_code(&rev_info.diffopt, result);
2485}
2486
2487/**
2488 * If the work tree has unstaged or uncommitted changes, dies with the
2489 * appropriate message.
2490 */
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +01002491int require_clean_work_tree(struct repository *r,
2492 const char *action,
2493 const char *hint,
2494 int ignore_submodules,
2495 int gently)
Johannes Schindelinfd849862016-10-07 18:08:38 +02002496{
Martin Ågren837e34e2017-10-05 22:32:04 +02002497 struct lock_file lock_file = LOCK_INIT;
Junio C Hamano89d38fb2016-12-07 11:11:26 -08002498 int err = 0, fd;
Johannes Schindelinfd849862016-10-07 18:08:38 +02002499
Nguyễn Thái Ngọc Duy3a95f312019-01-12 09:13:24 +07002500 fd = repo_hold_locked_index(r, &lock_file, 0);
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +01002501 refresh_index(r->index, REFRESH_QUIET, NULL, NULL, NULL);
Junio C Hamano89d38fb2016-12-07 11:11:26 -08002502 if (0 <= fd)
Nguyễn Thái Ngọc Duy1b0d9682019-01-12 09:13:27 +07002503 repo_update_index_if_able(r, &lock_file);
Martin Ågren837e34e2017-10-05 22:32:04 +02002504 rollback_lock_file(&lock_file);
Johannes Schindelinfd849862016-10-07 18:08:38 +02002505
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +01002506 if (has_unstaged_changes(r, ignore_submodules)) {
Johannes Schindelinfd849862016-10-07 18:08:38 +02002507 /* TRANSLATORS: the action is e.g. "pull with rebase" */
Johannes Schindelin4777e172016-10-07 18:09:04 +02002508 error(_("cannot %s: You have unstaged changes."), _(action));
Johannes Schindelinfd849862016-10-07 18:08:38 +02002509 err = 1;
2510 }
2511
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +01002512 if (has_uncommitted_changes(r, ignore_submodules)) {
Johannes Schindelinfd849862016-10-07 18:08:38 +02002513 if (err)
Johannes Schindelin4777e172016-10-07 18:09:04 +02002514 error(_("additionally, your index contains uncommitted changes."));
Johannes Schindelinfd849862016-10-07 18:08:38 +02002515 else
Johannes Schindelin4777e172016-10-07 18:09:04 +02002516 error(_("cannot %s: Your index contains uncommitted changes."),
Johannes Schindelinfd849862016-10-07 18:08:38 +02002517 _(action));
2518 err = 1;
2519 }
2520
2521 if (err) {
2522 if (hint)
2523 error("%s", hint);
2524 if (!gently)
2525 exit(128);
2526 }
2527
2528 return err;
2529}