blob: 867e3e417e9d4d26036a15a2034018529ce6dec7 [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
Jonathan Nieder8f17f5b2013-12-19 11:43:19 -0800262static const char *wt_status_unmerged_status_string(int stagemask)
Junio C Hamano4d4d5722009-08-05 00:04:51 -0700263{
Jonathan Nieder8f17f5b2013-12-19 11:43:19 -0800264 switch (stagemask) {
265 case 1:
266 return _("both deleted:");
267 case 2:
268 return _("added by us:");
269 case 3:
270 return _("deleted by them:");
271 case 4:
272 return _("added by them:");
273 case 5:
274 return _("deleted by us:");
275 case 6:
276 return _("both added:");
277 case 7:
278 return _("both modified:");
279 default:
Johannes Schindelin033abf92018-05-02 11:38:39 +0200280 BUG("unhandled unmerged status %x", stagemask);
Junio C Hamano4d4d5722009-08-05 00:04:51 -0700281 }
Junio C Hamano4d4d5722009-08-05 00:04:51 -0700282}
283
Nguyễn Thái Ngọc Duy3651e452013-11-05 09:07:29 +0700284static const char *wt_status_diff_status_string(int status)
285{
286 switch (status) {
287 case DIFF_STATUS_ADDED:
Junio C Hamanod52cb572014-03-12 13:51:22 -0700288 return _("new file:");
Nguyễn Thái Ngọc Duy3651e452013-11-05 09:07:29 +0700289 case DIFF_STATUS_COPIED:
Junio C Hamanod52cb572014-03-12 13:51:22 -0700290 return _("copied:");
Nguyễn Thái Ngọc Duy3651e452013-11-05 09:07:29 +0700291 case DIFF_STATUS_DELETED:
Junio C Hamanod52cb572014-03-12 13:51:22 -0700292 return _("deleted:");
Nguyễn Thái Ngọc Duy3651e452013-11-05 09:07:29 +0700293 case DIFF_STATUS_MODIFIED:
Junio C Hamanod52cb572014-03-12 13:51:22 -0700294 return _("modified:");
Nguyễn Thái Ngọc Duy3651e452013-11-05 09:07:29 +0700295 case DIFF_STATUS_RENAMED:
Junio C Hamanod52cb572014-03-12 13:51:22 -0700296 return _("renamed:");
Nguyễn Thái Ngọc Duy3651e452013-11-05 09:07:29 +0700297 case DIFF_STATUS_TYPE_CHANGED:
Junio C Hamanod52cb572014-03-12 13:51:22 -0700298 return _("typechange:");
Nguyễn Thái Ngọc Duy3651e452013-11-05 09:07:29 +0700299 case DIFF_STATUS_UNKNOWN:
Junio C Hamanod52cb572014-03-12 13:51:22 -0700300 return _("unknown:");
Nguyễn Thái Ngọc Duy3651e452013-11-05 09:07:29 +0700301 case DIFF_STATUS_UNMERGED:
Junio C Hamanod52cb572014-03-12 13:51:22 -0700302 return _("unmerged:");
Nguyễn Thái Ngọc Duy3651e452013-11-05 09:07:29 +0700303 default:
304 return NULL;
305 }
306}
307
Jonathan Nieder335e8252013-12-19 11:43:19 -0800308static int maxwidth(const char *(*label)(int), int minval, int maxval)
309{
310 int result = 0, i;
311
312 for (i = minval; i <= maxval; i++) {
313 const char *s = label(i);
314 int len = s ? utf8_strwidth(s) : 0;
315 if (len > result)
316 result = len;
317 }
318 return result;
319}
320
Jeff Hostetler957a0fe2016-08-05 18:00:26 -0400321static void wt_longstatus_print_unmerged_data(struct wt_status *s,
322 struct string_list_item *it)
Jonathan Nieder8f17f5b2013-12-19 11:43:19 -0800323{
324 const char *c = color(WT_STATUS_UNMERGED, s);
325 struct wt_status_change_data *d = it->util;
326 struct strbuf onebuf = STRBUF_INIT;
327 static char *padding;
328 static int label_width;
329 const char *one, *how;
330 int len;
331
332 if (!padding) {
333 label_width = maxwidth(wt_status_unmerged_status_string, 1, 7);
334 label_width += strlen(" ");
Jonathan Nieder8f17f5b2013-12-19 11:43:19 -0800335 padding = xmallocz(label_width);
336 memset(padding, ' ', label_width);
337 }
338
Junio C Hamano88910c92020-09-10 10:01:54 -0700339 one = quote_path(it->string, s->prefix, &onebuf, 0);
Jonathan Nieder8f17f5b2013-12-19 11:43:19 -0800340 status_printf(s, color(WT_STATUS_HEADER, s), "\t");
341
342 how = wt_status_unmerged_status_string(d->stagemask);
343 len = label_width - utf8_strwidth(how);
344 status_printf_more(s, c, "%s%.*s%s\n", how, len, padding, one);
345 strbuf_release(&onebuf);
346}
347
Jeff Hostetler957a0fe2016-08-05 18:00:26 -0400348static void wt_longstatus_print_change_data(struct wt_status *s,
349 int change_type,
350 struct string_list_item *it)
Jeff Kingc91f0d92006-09-08 04:05:34 -0400351{
Junio C Hamano50b7e702009-08-04 23:49:33 -0700352 struct wt_status_change_data *d = it->util;
Junio C Hamanod249b092009-08-09 21:59:30 -0700353 const char *c = color(change_type, s);
Jeff Kingb8527d52013-03-21 07:05:28 -0400354 int status;
Junio C Hamano50b7e702009-08-04 23:49:33 -0700355 char *one_name;
356 char *two_name;
Junio C Hamano3a946802006-11-08 13:20:46 -0800357 const char *one, *two;
Brandon Caseyf285a2d2008-10-09 14:12:12 -0500358 struct strbuf onebuf = STRBUF_INIT, twobuf = STRBUF_INIT;
Jens Lehmann9297f77e62010-03-08 13:53:19 +0100359 struct strbuf extra = STRBUF_INIT;
Nguyễn Thái Ngọc Duy3651e452013-11-05 09:07:29 +0700360 static char *padding;
Junio C Hamanod52cb572014-03-12 13:51:22 -0700361 static int label_width;
Nguyễn Thái Ngọc Duy3651e452013-11-05 09:07:29 +0700362 const char *what;
363 int len;
364
365 if (!padding) {
Jonathan Nieder335e8252013-12-19 11:43:19 -0800366 /* If DIFF_STATUS_* uses outside the range [A..Z], we're in trouble */
367 label_width = maxwidth(wt_status_diff_status_string, 'A', 'Z');
Junio C Hamanod52cb572014-03-12 13:51:22 -0700368 label_width += strlen(" ");
369 padding = xmallocz(label_width);
370 memset(padding, ' ', label_width);
Nguyễn Thái Ngọc Duy3651e452013-11-05 09:07:29 +0700371 }
Junio C Hamano3a946802006-11-08 13:20:46 -0800372
Junio C Hamano50b7e702009-08-04 23:49:33 -0700373 one_name = two_name = it->string;
374 switch (change_type) {
375 case WT_STATUS_UPDATED:
376 status = d->index_status;
Junio C Hamano50b7e702009-08-04 23:49:33 -0700377 break;
378 case WT_STATUS_CHANGED:
Jens Lehmann9297f77e62010-03-08 13:53:19 +0100379 if (d->new_submodule_commits || d->dirty_submodule) {
380 strbuf_addstr(&extra, " (");
381 if (d->new_submodule_commits)
René Scharfea22ae752016-09-15 20:31:00 +0200382 strbuf_addstr(&extra, _("new commits, "));
Jens Lehmann9297f77e62010-03-08 13:53:19 +0100383 if (d->dirty_submodule & DIRTY_SUBMODULE_MODIFIED)
René Scharfea22ae752016-09-15 20:31:00 +0200384 strbuf_addstr(&extra, _("modified content, "));
Jens Lehmann9297f77e62010-03-08 13:53:19 +0100385 if (d->dirty_submodule & DIRTY_SUBMODULE_UNTRACKED)
René Scharfea22ae752016-09-15 20:31:00 +0200386 strbuf_addstr(&extra, _("untracked content, "));
Jens Lehmann9297f77e62010-03-08 13:53:19 +0100387 strbuf_setlen(&extra, extra.len - 2);
388 strbuf_addch(&extra, ')');
389 }
Junio C Hamano50b7e702009-08-04 23:49:33 -0700390 status = d->worktree_status;
391 break;
Jeff Kingb8527d52013-03-21 07:05:28 -0400392 default:
Johannes Schindelin033abf92018-05-02 11:38:39 +0200393 BUG("unhandled change_type %d in wt_longstatus_print_change_data",
Jeff Kingb8527d52013-03-21 07:05:28 -0400394 change_type);
Junio C Hamano50b7e702009-08-04 23:49:33 -0700395 }
396
Nguyễn Thái Ngọc Duy176ea742017-12-27 17:18:39 +0700397 /*
398 * Only pick up the rename it's relevant. If the rename is for
399 * the changed section and we're printing the updated section,
400 * ignore it.
401 */
402 if (d->rename_status == status)
403 one_name = d->rename_source;
404
Junio C Hamano88910c92020-09-10 10:01:54 -0700405 one = quote_path(one_name, s->prefix, &onebuf, 0);
406 two = quote_path(two_name, s->prefix, &twobuf, 0);
Junio C Hamano3a946802006-11-08 13:20:46 -0800407
Jonathan Niederb926c0d2011-02-25 23:11:37 -0600408 status_printf(s, color(WT_STATUS_HEADER, s), "\t");
Nguyễn Thái Ngọc Duy3651e452013-11-05 09:07:29 +0700409 what = wt_status_diff_status_string(status);
410 if (!what)
Johannes Schindelin033abf92018-05-02 11:38:39 +0200411 BUG("unhandled diff status %c", status);
Junio C Hamanod52cb572014-03-12 13:51:22 -0700412 len = label_width - utf8_strwidth(what);
Nguyễn Thái Ngọc Duy3651e452013-11-05 09:07:29 +0700413 assert(len >= 0);
Nguyễn Thái Ngọc Duy5134ccd2017-12-27 17:18:38 +0700414 if (one_name != two_name)
Junio C Hamanod52cb572014-03-12 13:51:22 -0700415 status_printf_more(s, c, "%s%.*s%s -> %s",
Nguyễn Thái Ngọc Duy3651e452013-11-05 09:07:29 +0700416 what, len, padding, one, two);
417 else
Junio C Hamanod52cb572014-03-12 13:51:22 -0700418 status_printf_more(s, c, "%s%.*s%s",
Nguyễn Thái Ngọc Duy3651e452013-11-05 09:07:29 +0700419 what, len, padding, one);
Jens Lehmann9297f77e62010-03-08 13:53:19 +0100420 if (extra.len) {
Jonathan Niederb926c0d2011-02-25 23:11:37 -0600421 status_printf_more(s, color(WT_STATUS_HEADER, s), "%s", extra.buf);
Jens Lehmann9297f77e62010-03-08 13:53:19 +0100422 strbuf_release(&extra);
423 }
Jonathan Niederb926c0d2011-02-25 23:11:37 -0600424 status_printf_more(s, GIT_COLOR_NORMAL, "\n");
Johannes Schindelin367c9882007-11-11 17:35:41 +0000425 strbuf_release(&onebuf);
426 strbuf_release(&twobuf);
Jeff Kingc91f0d92006-09-08 04:05:34 -0400427}
428
Nguyễn Thái Ngọc Duy98bc94e2017-12-27 17:18:36 +0700429static char short_submodule_status(struct wt_status_change_data *d)
430{
Stefan Bellerdd6962d2017-03-29 15:26:15 -0700431 if (d->new_submodule_commits)
432 return 'M';
433 if (d->dirty_submodule & DIRTY_SUBMODULE_MODIFIED)
434 return 'm';
435 if (d->dirty_submodule & DIRTY_SUBMODULE_UNTRACKED)
436 return '?';
437 return d->worktree_status;
438}
439
Junio C Hamano50b7e702009-08-04 23:49:33 -0700440static void wt_status_collect_changed_cb(struct diff_queue_struct *q,
441 struct diff_options *options,
442 void *data)
Jeff Kingc91f0d92006-09-08 04:05:34 -0400443{
444 struct wt_status *s = data;
Jeff Kingc91f0d92006-09-08 04:05:34 -0400445 int i;
Junio C Hamano50b7e702009-08-04 23:49:33 -0700446
447 if (!q->nr)
448 return;
449 s->workdir_dirty = 1;
Jeff Kingc91f0d92006-09-08 04:05:34 -0400450 for (i = 0; i < q->nr; i++) {
Junio C Hamano50b7e702009-08-04 23:49:33 -0700451 struct diff_filepair *p;
452 struct string_list_item *it;
453 struct wt_status_change_data *d;
454
455 p = q->queue[i];
Nguyễn Thái Ngọc Duy176ea742017-12-27 17:18:39 +0700456 it = string_list_insert(&s->change, p->two->path);
Junio C Hamano50b7e702009-08-04 23:49:33 -0700457 d = it->util;
458 if (!d) {
René Scharfeca56dad2021-03-13 17:17:22 +0100459 CALLOC_ARRAY(d, 1);
Junio C Hamano50b7e702009-08-04 23:49:33 -0700460 it->util = d;
Jeff Kingc91f0d92006-09-08 04:05:34 -0400461 }
Junio C Hamano50b7e702009-08-04 23:49:33 -0700462 if (!d->worktree_status)
463 d->worktree_status = p->status;
Stefan Bellerdd6962d2017-03-29 15:26:15 -0700464 if (S_ISGITLINK(p->two->mode)) {
465 d->dirty_submodule = p->two->dirty_submodule;
Jeff King4a7e27e2018-08-28 17:22:40 -0400466 d->new_submodule_commits = !oideq(&p->one->oid,
467 &p->two->oid);
Stefan Bellerdd6962d2017-03-29 15:26:15 -0700468 if (s->status_format == STATUS_FORMAT_SHORT)
469 d->worktree_status = short_submodule_status(d);
470 }
Jeff Hostetler1ecdecc2016-08-11 10:45:57 -0400471
472 switch (p->status) {
473 case DIFF_STATUS_ADDED:
Nguyễn Thái Ngọc Duy425a28e2016-10-24 17:42:19 +0700474 d->mode_worktree = p->two->mode;
Jeff Hostetler1ecdecc2016-08-11 10:45:57 -0400475 break;
476
477 case DIFF_STATUS_DELETED:
478 d->mode_index = p->one->mode;
479 oidcpy(&d->oid_index, &p->one->oid);
480 /* mode_worktree is zero for a delete. */
481 break;
482
Nguyễn Thái Ngọc Duy176ea742017-12-27 17:18:39 +0700483 case DIFF_STATUS_COPIED:
484 case DIFF_STATUS_RENAMED:
485 if (d->rename_status)
Johannes Schindelin033abf92018-05-02 11:38:39 +0200486 BUG("multiple renames on the same target? how?");
Nguyễn Thái Ngọc Duy176ea742017-12-27 17:18:39 +0700487 d->rename_source = xstrdup(p->one->path);
488 d->rename_score = p->score * 100 / MAX_SCORE;
489 d->rename_status = p->status;
490 /* fallthru */
Jeff Hostetler1ecdecc2016-08-11 10:45:57 -0400491 case DIFF_STATUS_MODIFIED:
492 case DIFF_STATUS_TYPE_CHANGED:
493 case DIFF_STATUS_UNMERGED:
494 d->mode_index = p->one->mode;
495 d->mode_worktree = p->two->mode;
496 oidcpy(&d->oid_index, &p->one->oid);
497 break;
498
Nguyễn Thái Ngọc Duyea56f972017-12-27 17:18:37 +0700499 default:
Johannes Schindelin033abf92018-05-02 11:38:39 +0200500 BUG("unhandled diff-files status '%c'", p->status);
Jeff Hostetler1ecdecc2016-08-11 10:45:57 -0400501 break;
502 }
503
Jeff Kingc91f0d92006-09-08 04:05:34 -0400504 }
Jeff Kingc91f0d92006-09-08 04:05:34 -0400505}
506
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +0100507static int unmerged_mask(struct index_state *istate, const char *path)
Junio C Hamano4d4d5722009-08-05 00:04:51 -0700508{
509 int pos, mask;
Nguyễn Thái Ngọc Duy9c5e6c82013-07-09 22:29:00 +0700510 const struct cache_entry *ce;
Junio C Hamano4d4d5722009-08-05 00:04:51 -0700511
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +0100512 pos = index_name_pos(istate, path, strlen(path));
Junio C Hamano4d4d5722009-08-05 00:04:51 -0700513 if (0 <= pos)
514 return 0;
515
516 mask = 0;
517 pos = -pos-1;
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +0100518 while (pos < istate->cache_nr) {
519 ce = istate->cache[pos++];
Junio C Hamano4d4d5722009-08-05 00:04:51 -0700520 if (strcmp(ce->name, path) || !ce_stage(ce))
521 break;
522 mask |= (1 << (ce_stage(ce) - 1));
523 }
524 return mask;
525}
526
Junio C Hamano50b7e702009-08-04 23:49:33 -0700527static void wt_status_collect_updated_cb(struct diff_queue_struct *q,
528 struct diff_options *options,
529 void *data)
Jeff Kingc91f0d92006-09-08 04:05:34 -0400530{
Jürgen Rühle6e458bf2007-01-02 20:26:22 +0100531 struct wt_status *s = data;
Jeff Kingc91f0d92006-09-08 04:05:34 -0400532 int i;
Junio C Hamano50b7e702009-08-04 23:49:33 -0700533
534 for (i = 0; i < q->nr; i++) {
535 struct diff_filepair *p;
536 struct string_list_item *it;
537 struct wt_status_change_data *d;
538
539 p = q->queue[i];
Julian Phillips78a395d2010-06-26 00:41:35 +0100540 it = string_list_insert(&s->change, p->two->path);
Junio C Hamano50b7e702009-08-04 23:49:33 -0700541 d = it->util;
542 if (!d) {
René Scharfeca56dad2021-03-13 17:17:22 +0100543 CALLOC_ARRAY(d, 1);
Junio C Hamano50b7e702009-08-04 23:49:33 -0700544 it->util = d;
545 }
546 if (!d->index_status)
547 d->index_status = p->status;
548 switch (p->status) {
Jeff Hostetler1ecdecc2016-08-11 10:45:57 -0400549 case DIFF_STATUS_ADDED:
550 /* Leave {mode,oid}_head zero for an add. */
551 d->mode_index = p->two->mode;
552 oidcpy(&d->oid_index, &p->two->oid);
Stephen P. Smithf3bd35f2018-09-05 17:53:29 -0700553 s->committable = 1;
Jeff Hostetler1ecdecc2016-08-11 10:45:57 -0400554 break;
555 case DIFF_STATUS_DELETED:
556 d->mode_head = p->one->mode;
557 oidcpy(&d->oid_head, &p->one->oid);
Stephen P. Smithf3bd35f2018-09-05 17:53:29 -0700558 s->committable = 1;
Jeff Hostetler1ecdecc2016-08-11 10:45:57 -0400559 /* Leave {mode,oid}_index zero for a delete. */
560 break;
561
Junio C Hamano50b7e702009-08-04 23:49:33 -0700562 case DIFF_STATUS_COPIED:
563 case DIFF_STATUS_RENAMED:
Nguyễn Thái Ngọc Duy176ea742017-12-27 17:18:39 +0700564 if (d->rename_status)
Johannes Schindelin033abf92018-05-02 11:38:39 +0200565 BUG("multiple renames on the same target? how?");
Nguyễn Thái Ngọc Duy5134ccd2017-12-27 17:18:38 +0700566 d->rename_source = xstrdup(p->one->path);
567 d->rename_score = p->score * 100 / MAX_SCORE;
568 d->rename_status = p->status;
Jeff Hostetler1ecdecc2016-08-11 10:45:57 -0400569 /* fallthru */
570 case DIFF_STATUS_MODIFIED:
571 case DIFF_STATUS_TYPE_CHANGED:
572 d->mode_head = p->one->mode;
573 d->mode_index = p->two->mode;
574 oidcpy(&d->oid_head, &p->one->oid);
575 oidcpy(&d->oid_index, &p->two->oid);
Stephen P. Smithf3bd35f2018-09-05 17:53:29 -0700576 s->committable = 1;
Junio C Hamano50b7e702009-08-04 23:49:33 -0700577 break;
Junio C Hamano4d4d5722009-08-05 00:04:51 -0700578 case DIFF_STATUS_UNMERGED:
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +0100579 d->stagemask = unmerged_mask(s->repo->index,
580 p->two->path);
Jeff Hostetler1ecdecc2016-08-11 10:45:57 -0400581 /*
582 * Don't bother setting {mode,oid}_{head,index} since the print
583 * code will output the stage values directly and not use the
584 * values in these fields.
585 */
Junio C Hamano4d4d5722009-08-05 00:04:51 -0700586 break;
Nguyễn Thái Ngọc Duyea56f972017-12-27 17:18:37 +0700587
588 default:
Johannes Schindelin033abf92018-05-02 11:38:39 +0200589 BUG("unhandled diff-index status '%c'", p->status);
Nguyễn Thái Ngọc Duyea56f972017-12-27 17:18:37 +0700590 break;
Junio C Hamano50b7e702009-08-04 23:49:33 -0700591 }
Jürgen Rühle6e458bf2007-01-02 20:26:22 +0100592 }
Jeff Kingc91f0d92006-09-08 04:05:34 -0400593}
594
Junio C Hamano50b7e702009-08-04 23:49:33 -0700595static void wt_status_collect_changes_worktree(struct wt_status *s)
Jeff Kingc91f0d92006-09-08 04:05:34 -0400596{
597 struct rev_info rev;
Junio C Hamano50b7e702009-08-04 23:49:33 -0700598
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +0100599 repo_init_revisions(s->repo, &rev, NULL);
Junio C Hamano50b7e702009-08-04 23:49:33 -0700600 setup_revisions(0, NULL, &rev, NULL);
601 rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
Brandon Williams0d1e0e72017-10-31 11:19:11 -0700602 rev.diffopt.flags.dirty_submodules = 1;
Nguyễn Thái Ngọc Duy425a28e2016-10-24 17:42:19 +0700603 rev.diffopt.ita_invisible_in_index = 1;
Jens Lehmann3bfc4502010-03-13 23:00:27 +0100604 if (!s->show_untracked_files)
Brandon Williams0d1e0e72017-10-31 11:19:11 -0700605 rev.diffopt.flags.ignore_untracked_in_submodules = 1;
Jens Lehmannaee9c7d2010-08-06 00:39:25 +0200606 if (s->ignore_submodule_arg) {
Brandon Williams0d1e0e72017-10-31 11:19:11 -0700607 rev.diffopt.flags.override_submodule_config = 1;
Jens Lehmann46a958b2010-06-25 16:56:47 +0200608 handle_ignore_submodules_arg(&rev.diffopt, s->ignore_submodule_arg);
Sangeeta Jain8ef93122020-11-10 14:09:00 +0530609 } else if (!rev.diffopt.flags.ignore_submodule_set &&
610 s->show_untracked_files != SHOW_NO_UNTRACKED_FILES)
611 handle_ignore_submodules_arg(&rev.diffopt, "none");
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);
Ævar Arnfjörð Bjarmasonf0cb6b82022-04-13 22:01:44 +0200619 release_revisions(&rev);
Junio C Hamano50b7e702009-08-04 23:49:33 -0700620}
621
622static void wt_status_collect_changes_index(struct wt_status *s)
623{
624 struct rev_info rev;
Junio C Hamano32962c92010-03-08 22:58:09 -0800625 struct setup_revision_opt opt;
Junio C Hamano50b7e702009-08-04 23:49:33 -0700626
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +0100627 repo_init_revisions(s->repo, &rev, NULL);
Junio C Hamano32962c92010-03-08 22:58:09 -0800628 memset(&opt, 0, sizeof(opt));
brian m. carlsonf2e51192018-05-02 00:26:00 +0000629 opt.def = s->is_initial ? empty_tree_oid_hex() : s->reference;
Junio C Hamano32962c92010-03-08 22:58:09 -0800630 setup_revisions(0, NULL, &rev, &opt);
631
Brandon Williams0d1e0e72017-10-31 11:19:11 -0700632 rev.diffopt.flags.override_submodule_config = 1;
Nguyễn Thái Ngọc Duy425a28e2016-10-24 17:42:19 +0700633 rev.diffopt.ita_invisible_in_index = 1;
Jens Lehmannaee9c7d2010-08-06 00:39:25 +0200634 if (s->ignore_submodule_arg) {
Jens Lehmann46a958b2010-06-25 16:56:47 +0200635 handle_ignore_submodules_arg(&rev.diffopt, s->ignore_submodule_arg);
Jens Lehmann1d2f3932014-04-05 18:59:03 +0200636 } else {
637 /*
638 * Unless the user did explicitly request a submodule ignore
639 * mode by passing a command line option we do not ignore any
640 * changed submodule SHA-1s when comparing index and HEAD, no
641 * matter what is configured. Otherwise the user won't be
Felipe Contreras0e20b222021-06-15 14:11:10 +0000642 * shown any submodules manually added (and which are
Jens Lehmann1d2f3932014-04-05 18:59:03 +0200643 * staged to be committed), which would be really confusing.
644 */
645 handle_ignore_submodules_arg(&rev.diffopt, "dirty");
Jens Lehmannaee9c7d2010-08-06 00:39:25 +0200646 }
Jens Lehmann46a958b2010-06-25 16:56:47 +0200647
Jeff Kingc91f0d92006-09-08 04:05:34 -0400648 rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
Junio C Hamano50b7e702009-08-04 23:49:33 -0700649 rev.diffopt.format_callback = wt_status_collect_updated_cb;
Jeff Kingc91f0d92006-09-08 04:05:34 -0400650 rev.diffopt.format_callback_data = s;
Ben Pearte8b2dc22018-05-11 15:38:58 +0000651 rev.diffopt.detect_rename = s->detect_rename >= 0 ? s->detect_rename : rev.diffopt.detect_rename;
652 rev.diffopt.rename_limit = s->rename_limit >= 0 ? s->rename_limit : rev.diffopt.rename_limit;
653 rev.diffopt.rename_score = s->rename_score >= 0 ? s->rename_score : rev.diffopt.rename_score;
Victoria Dye2c521b02022-03-01 20:24:25 +0000654
655 /*
656 * The `recursive` option must be enabled to allow the diff to recurse
657 * into subdirectories of sparse directory index entries. If it is not
658 * enabled, a subdirectory containing file(s) with changes is reported
659 * as "modified", rather than the modified files themselves.
660 */
661 rev.diffopt.flags.recursive = 1;
662
Nguyễn Thái Ngọc Duy15b55ae2013-07-14 15:35:39 +0700663 copy_pathspec(&rev.prune_data, &s->pathspec);
Jeff Kingc91f0d92006-09-08 04:05:34 -0400664 run_diff_index(&rev, 1);
Ævar Arnfjörð Bjarmason1878b5e2022-04-13 22:01:35 +0200665 release_revisions(&rev);
Jeff Kingc91f0d92006-09-08 04:05:34 -0400666}
667
Derrick Stoleefe0d5762021-07-14 13:12:38 +0000668static int add_file_to_list(const struct object_id *oid,
669 struct strbuf *base, const char *path,
670 unsigned int mode, void *context)
671{
672 struct string_list_item *it;
673 struct wt_status_change_data *d;
674 struct wt_status *s = context;
675 struct strbuf full_name = STRBUF_INIT;
676
677 if (S_ISDIR(mode))
678 return READ_TREE_RECURSIVE;
679
680 strbuf_add(&full_name, base->buf, base->len);
681 strbuf_addstr(&full_name, path);
682 it = string_list_insert(&s->change, full_name.buf);
683 d = it->util;
684 if (!d) {
685 CALLOC_ARRAY(d, 1);
686 it->util = d;
687 }
688
689 d->index_status = DIFF_STATUS_ADDED;
690 /* Leave {mode,oid}_head zero for adds. */
691 d->mode_index = mode;
692 oidcpy(&d->oid_index, oid);
693 s->committable = 1;
694 strbuf_release(&full_name);
695 return 0;
696}
697
Junio C Hamano50b7e702009-08-04 23:49:33 -0700698static void wt_status_collect_changes_initial(struct wt_status *s)
699{
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +0100700 struct index_state *istate = s->repo->index;
Junio C Hamano50b7e702009-08-04 23:49:33 -0700701 int i;
702
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +0100703 for (i = 0; i < istate->cache_nr; i++) {
Junio C Hamano50b7e702009-08-04 23:49:33 -0700704 struct string_list_item *it;
705 struct wt_status_change_data *d;
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +0100706 const struct cache_entry *ce = istate->cache[i];
Junio C Hamano50b7e702009-08-04 23:49:33 -0700707
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +0100708 if (!ce_path_match(istate, ce, &s->pathspec, NULL))
Junio C Hamano76e2f7c2009-08-07 23:31:57 -0700709 continue;
Nguyễn Thái Ngọc Duy425a28e2016-10-24 17:42:19 +0700710 if (ce_intent_to_add(ce))
711 continue;
Derrick Stoleefe0d5762021-07-14 13:12:38 +0000712 if (S_ISSPARSEDIR(ce->ce_mode)) {
713 /*
714 * This is a sparse directory entry, so we want to collect all
715 * of the added files within the tree. This requires recursively
716 * expanding the trees to find the elements that are new in this
717 * tree and marking them with DIFF_STATUS_ADDED.
718 */
719 struct strbuf base = STRBUF_INIT;
720 struct pathspec ps = { 0 };
721 struct tree *tree = lookup_tree(istate->repo, &ce->oid);
722
723 ps.recursive = 1;
724 ps.has_wildcard = 1;
725 ps.max_depth = -1;
726
727 strbuf_add(&base, ce->name, ce->ce_namelen);
728 read_tree_at(istate->repo, tree, &base, &ps,
729 add_file_to_list, s);
730 continue;
731 }
732
Julian Phillips78a395d2010-06-26 00:41:35 +0100733 it = string_list_insert(&s->change, ce->name);
Junio C Hamano50b7e702009-08-04 23:49:33 -0700734 d = it->util;
735 if (!d) {
René Scharfeca56dad2021-03-13 17:17:22 +0100736 CALLOC_ARRAY(d, 1);
Junio C Hamano50b7e702009-08-04 23:49:33 -0700737 it->util = d;
738 }
Junio C Hamano4d4d5722009-08-05 00:04:51 -0700739 if (ce_stage(ce)) {
Junio C Hamano50b7e702009-08-04 23:49:33 -0700740 d->index_status = DIFF_STATUS_UNMERGED;
Junio C Hamano4d4d5722009-08-05 00:04:51 -0700741 d->stagemask |= (1 << (ce_stage(ce) - 1));
Jeff Hostetler1ecdecc2016-08-11 10:45:57 -0400742 /*
743 * Don't bother setting {mode,oid}_{head,index} since the print
744 * code will output the stage values directly and not use the
745 * values in these fields.
746 */
Stephen P. Smithf3bd35f2018-09-05 17:53:29 -0700747 s->committable = 1;
Jeff Hostetler1ecdecc2016-08-11 10:45:57 -0400748 } else {
Junio C Hamano50b7e702009-08-04 23:49:33 -0700749 d->index_status = DIFF_STATUS_ADDED;
Jeff Hostetler1ecdecc2016-08-11 10:45:57 -0400750 /* Leave {mode,oid}_head zero for adds. */
751 d->mode_index = ce->ce_mode;
René Scharfe86947692017-01-28 23:03:06 +0100752 oidcpy(&d->oid_index, &ce->oid);
Stephen P. Smithf3bd35f2018-09-05 17:53:29 -0700753 s->committable = 1;
Jeff Hostetler1ecdecc2016-08-11 10:45:57 -0400754 }
Junio C Hamano50b7e702009-08-04 23:49:33 -0700755 }
756}
757
Junio C Hamano76378682009-08-10 00:36:33 -0700758static void wt_status_collect_untracked(struct wt_status *s)
759{
760 int i;
Ævar Arnfjörð Bjarmasonce93a4c2021-07-01 12:51:27 +0200761 struct dir_struct dir = DIR_INIT;
Karsten Blees132d41e2014-07-12 02:07:36 +0200762 uint64_t t_begin = getnanotime();
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +0100763 struct index_state *istate = s->repo->index;
Junio C Hamano76378682009-08-10 00:36:33 -0700764
765 if (!s->show_untracked_files)
766 return;
Nguyễn Thái Ngọc Duy6a38ef22013-03-13 19:59:16 +0700767
Junio C Hamano76378682009-08-10 00:36:33 -0700768 if (s->show_untracked_files != SHOW_ALL_UNTRACKED_FILES)
769 dir.flags |=
770 DIR_SHOW_OTHER_DIRECTORIES | DIR_HIDE_EMPTY_DIRECTORIES;
Jameson Millereec0f7f2017-10-30 13:21:37 -0400771 if (s->show_ignored_mode) {
Karsten Blees0aaf62b2013-04-15 21:15:03 +0200772 dir.flags |= DIR_SHOW_IGNORED_TOO;
Jameson Millereec0f7f2017-10-30 13:21:37 -0400773
774 if (s->show_ignored_mode == SHOW_MATCHING_IGNORED)
775 dir.flags |= DIR_SHOW_IGNORED_TOO_MODE_MATCHING;
776 } else {
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +0100777 dir.untracked = istate->untracked;
Jameson Millereec0f7f2017-10-30 13:21:37 -0400778 }
779
Junio C Hamano76378682009-08-10 00:36:33 -0700780 setup_standard_excludes(&dir);
781
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +0100782 fill_directory(&dir, istate, &s->pathspec);
Karsten Blees0aaf62b2013-04-15 21:15:03 +0200783
Brian Gianforcaroeeefa7c2009-09-01 01:35:10 -0400784 for (i = 0; i < dir.nr; i++) {
Junio C Hamano76378682009-08-10 00:36:33 -0700785 struct dir_entry *ent = dir.entries[i];
Elijah Newren95c11ec2020-04-01 04:17:45 +0000786 if (index_name_is_other(istate, ent->name, ent->len))
Brandon Caseyb8224232010-09-26 21:49:13 -0500787 string_list_insert(&s->untracked, ent->name);
Junio C Hamano76378682009-08-10 00:36:33 -0700788 }
Junio C Hamanof5b26b12010-04-09 23:58:27 -0700789
Karsten Blees0aaf62b2013-04-15 21:15:03 +0200790 for (i = 0; i < dir.ignored_nr; i++) {
791 struct dir_entry *ent = dir.ignored[i];
Elijah Newren95c11ec2020-04-01 04:17:45 +0000792 if (index_name_is_other(istate, ent->name, ent->len))
Karsten Blees0aaf62b2013-04-15 21:15:03 +0200793 string_list_insert(&s->ignored, ent->name);
Junio C Hamano6cb3f6b2010-04-10 00:11:53 -0700794 }
795
Elijah Newreneceba532020-08-18 22:58:26 +0000796 dir_clear(&dir);
Nguyễn Thái Ngọc Duy6a38ef22013-03-13 19:59:16 +0700797
Ben Boeckeled9bff02021-08-23 12:44:00 +0200798 if (advice_enabled(ADVICE_STATUS_U_OPTION))
Karsten Blees132d41e2014-07-12 02:07:36 +0200799 s->untracked_in_ms = (getnanotime() - t_begin) / 1000000;
Junio C Hamano76378682009-08-10 00:36:33 -0700800}
801
Stephen P. Smithc01d8f92018-09-05 17:53:26 -0700802static int has_unmerged(struct wt_status *s)
803{
804 int i;
805
806 for (i = 0; i < s->change.nr; i++) {
807 struct wt_status_change_data *d;
808 d = s->change.items[i].util;
809 if (d->stagemask)
810 return 1;
811 }
812 return 0;
813}
814
Junio C Hamano76378682009-08-10 00:36:33 -0700815void wt_status_collect(struct wt_status *s)
Junio C Hamano50b7e702009-08-04 23:49:33 -0700816{
Jeff Hostetler942b2742019-02-22 14:25:03 -0800817 trace2_region_enter("status", "worktrees", s->repo);
Junio C Hamano50b7e702009-08-04 23:49:33 -0700818 wt_status_collect_changes_worktree(s);
Jeff Hostetler942b2742019-02-22 14:25:03 -0800819 trace2_region_leave("status", "worktrees", s->repo);
820
821 if (s->is_initial) {
822 trace2_region_enter("status", "initial", s->repo);
Junio C Hamano50b7e702009-08-04 23:49:33 -0700823 wt_status_collect_changes_initial(s);
Jeff Hostetler942b2742019-02-22 14:25:03 -0800824 trace2_region_leave("status", "initial", s->repo);
825 } else {
826 trace2_region_enter("status", "index", s->repo);
Junio C Hamano50b7e702009-08-04 23:49:33 -0700827 wt_status_collect_changes_index(s);
Jeff Hostetler942b2742019-02-22 14:25:03 -0800828 trace2_region_leave("status", "index", s->repo);
829 }
830
831 trace2_region_enter("status", "untracked", s->repo);
Junio C Hamano76378682009-08-10 00:36:33 -0700832 wt_status_collect_untracked(s);
Jeff Hostetler942b2742019-02-22 14:25:03 -0800833 trace2_region_leave("status", "untracked", s->repo);
Stephen P. Smithf3bd35f2018-09-05 17:53:29 -0700834
Nguyễn Thái Ngọc Duy78845452018-11-10 06:48:50 +0100835 wt_status_get_state(s->repo, &s->state, s->branch && !strcmp(s->branch, "HEAD"));
Stephen P. Smith73ba5d72018-09-30 07:12:45 -0700836 if (s->state.merge_in_progress && !has_unmerged(s))
Stephen P. Smithf3bd35f2018-09-05 17:53:29 -0700837 s->committable = 1;
Junio C Hamano50b7e702009-08-04 23:49:33 -0700838}
839
Stephen P. Smith73ba5d72018-09-30 07:12:45 -0700840void wt_status_collect_free_buffers(struct wt_status *s)
841{
Martin Ågren962dd7e2020-09-27 15:15:43 +0200842 wt_status_state_free_buffers(&s->state);
843}
844
845void wt_status_state_free_buffers(struct wt_status_state *state)
846{
847 FREE_AND_NULL(state->branch);
848 FREE_AND_NULL(state->onto);
849 FREE_AND_NULL(state->detached_from);
Junio C Hamano50b7e702009-08-04 23:49:33 -0700850}
851
Jeff Hostetler957a0fe2016-08-05 18:00:26 -0400852static void wt_longstatus_print_unmerged(struct wt_status *s)
Junio C Hamano4d4d5722009-08-05 00:04:51 -0700853{
854 int shown_header = 0;
855 int i;
856
857 for (i = 0; i < s->change.nr; i++) {
858 struct wt_status_change_data *d;
859 struct string_list_item *it;
860 it = &(s->change.items[i]);
861 d = it->util;
862 if (!d->stagemask)
863 continue;
864 if (!shown_header) {
Jeff Hostetler957a0fe2016-08-05 18:00:26 -0400865 wt_longstatus_print_unmerged_header(s);
Junio C Hamano4d4d5722009-08-05 00:04:51 -0700866 shown_header = 1;
867 }
Jeff Hostetler957a0fe2016-08-05 18:00:26 -0400868 wt_longstatus_print_unmerged_data(s, it);
Junio C Hamano4d4d5722009-08-05 00:04:51 -0700869 }
870 if (shown_header)
Jeff Hostetler957a0fe2016-08-05 18:00:26 -0400871 wt_longstatus_print_trailer(s);
Junio C Hamano4d4d5722009-08-05 00:04:51 -0700872
873}
874
Jeff Hostetler957a0fe2016-08-05 18:00:26 -0400875static void wt_longstatus_print_updated(struct wt_status *s)
Junio C Hamano50b7e702009-08-04 23:49:33 -0700876{
877 int shown_header = 0;
878 int i;
879
880 for (i = 0; i < s->change.nr; i++) {
881 struct wt_status_change_data *d;
882 struct string_list_item *it;
883 it = &(s->change.items[i]);
884 d = it->util;
885 if (!d->index_status ||
886 d->index_status == DIFF_STATUS_UNMERGED)
887 continue;
888 if (!shown_header) {
Jeff Hostetler957a0fe2016-08-05 18:00:26 -0400889 wt_longstatus_print_cached_header(s);
Junio C Hamano50b7e702009-08-04 23:49:33 -0700890 shown_header = 1;
891 }
Jeff Hostetler957a0fe2016-08-05 18:00:26 -0400892 wt_longstatus_print_change_data(s, WT_STATUS_UPDATED, it);
Junio C Hamano50b7e702009-08-04 23:49:33 -0700893 }
894 if (shown_header)
Jeff Hostetler957a0fe2016-08-05 18:00:26 -0400895 wt_longstatus_print_trailer(s);
Junio C Hamano50b7e702009-08-04 23:49:33 -0700896}
897
898/*
899 * -1 : has delete
900 * 0 : no change
901 * 1 : some change but no delete
902 */
Jens Lehmann9297f77e62010-03-08 13:53:19 +0100903static int wt_status_check_worktree_changes(struct wt_status *s,
904 int *dirty_submodules)
Junio C Hamano50b7e702009-08-04 23:49:33 -0700905{
906 int i;
907 int changes = 0;
908
Jens Lehmann9297f77e62010-03-08 13:53:19 +0100909 *dirty_submodules = 0;
910
Junio C Hamano50b7e702009-08-04 23:49:33 -0700911 for (i = 0; i < s->change.nr; i++) {
912 struct wt_status_change_data *d;
913 d = s->change.items[i].util;
Junio C Hamano4d4d5722009-08-05 00:04:51 -0700914 if (!d->worktree_status ||
915 d->worktree_status == DIFF_STATUS_UNMERGED)
Junio C Hamano50b7e702009-08-04 23:49:33 -0700916 continue;
Jens Lehmann9297f77e62010-03-08 13:53:19 +0100917 if (!changes)
918 changes = 1;
919 if (d->dirty_submodule)
920 *dirty_submodules = 1;
Junio C Hamano50b7e702009-08-04 23:49:33 -0700921 if (d->worktree_status == DIFF_STATUS_DELETED)
Jens Lehmann9297f77e62010-03-08 13:53:19 +0100922 changes = -1;
Junio C Hamano50b7e702009-08-04 23:49:33 -0700923 }
924 return changes;
925}
926
Jeff Hostetler957a0fe2016-08-05 18:00:26 -0400927static void wt_longstatus_print_changed(struct wt_status *s)
Jeff Kingc91f0d92006-09-08 04:05:34 -0400928{
Jens Lehmann9297f77e62010-03-08 13:53:19 +0100929 int i, dirty_submodules;
930 int worktree_changes = wt_status_check_worktree_changes(s, &dirty_submodules);
Junio C Hamano50b7e702009-08-04 23:49:33 -0700931
932 if (!worktree_changes)
933 return;
934
Jeff Hostetler957a0fe2016-08-05 18:00:26 -0400935 wt_longstatus_print_dirty_header(s, worktree_changes < 0, dirty_submodules);
Junio C Hamano50b7e702009-08-04 23:49:33 -0700936
937 for (i = 0; i < s->change.nr; i++) {
938 struct wt_status_change_data *d;
939 struct string_list_item *it;
940 it = &(s->change.items[i]);
941 d = it->util;
Junio C Hamano4d4d5722009-08-05 00:04:51 -0700942 if (!d->worktree_status ||
943 d->worktree_status == DIFF_STATUS_UNMERGED)
Junio C Hamano50b7e702009-08-04 23:49:33 -0700944 continue;
Jeff Hostetler957a0fe2016-08-05 18:00:26 -0400945 wt_longstatus_print_change_data(s, WT_STATUS_CHANGED, it);
Junio C Hamano50b7e702009-08-04 23:49:33 -0700946 }
Jeff Hostetler957a0fe2016-08-05 18:00:26 -0400947 wt_longstatus_print_trailer(s);
Jeff Kingc91f0d92006-09-08 04:05:34 -0400948}
949
Liam Beguinc1b5d012017-06-17 18:30:51 -0400950static int stash_count_refs(struct object_id *ooid, struct object_id *noid,
951 const char *email, timestamp_t timestamp, int tz,
952 const char *message, void *cb_data)
953{
954 int *c = cb_data;
955 (*c)++;
956 return 0;
957}
958
Øystein Walle612942a2021-10-22 00:25:31 +0200959static int count_stash_entries(void)
960{
961 int n = 0;
962 for_each_reflog_ent("refs/stash", stash_count_refs, &n);
963 return n;
964}
965
Liam Beguinc1b5d012017-06-17 18:30:51 -0400966static void wt_longstatus_print_stash_summary(struct wt_status *s)
967{
Øystein Walle612942a2021-10-22 00:25:31 +0200968 int stash_count = count_stash_entries();
Liam Beguinc1b5d012017-06-17 18:30:51 -0400969
Liam Beguinc1b5d012017-06-17 18:30:51 -0400970 if (stash_count > 0)
971 status_printf_ln(s, GIT_COLOR_NORMAL,
972 Q_("Your stash currently has %d entry",
973 "Your stash currently has %d entries", stash_count),
974 stash_count);
975}
976
Jeff Hostetler957a0fe2016-08-05 18:00:26 -0400977static void wt_longstatus_print_submodule_summary(struct wt_status *s, int uncommitted)
Ping Yinac8d5af2008-04-12 23:05:32 +0800978{
René Scharfed3180272014-08-19 21:09:35 +0200979 struct child_process sm_summary = CHILD_PROCESS_INIT;
Matthieu Moy3ba74072013-09-06 19:43:06 +0200980 struct strbuf cmd_stdout = STRBUF_INIT;
981 struct strbuf summary = STRBUF_INIT;
982 char *summary_content;
Ping Yinac8d5af2008-04-12 23:05:32 +0800983
Ævar Arnfjörð Bjarmason29fda242022-06-02 11:09:50 +0200984 strvec_pushf(&sm_summary.env, "GIT_INDEX_FILE=%s", s->index_file);
Ping Yinac8d5af2008-04-12 23:05:32 +0800985
Jeff Kingc972bf42020-07-28 16:25:12 -0400986 strvec_push(&sm_summary.args, "submodule");
987 strvec_push(&sm_summary.args, "summary");
988 strvec_push(&sm_summary.args, uncommitted ? "--files" : "--cached");
989 strvec_push(&sm_summary.args, "--for-status");
990 strvec_push(&sm_summary.args, "--summary-limit");
991 strvec_pushf(&sm_summary.args, "%d", s->submodule_summary);
Matthieu Moybb7e32e2013-09-06 19:43:05 +0200992 if (!uncommitted)
Jeff Kingc972bf42020-07-28 16:25:12 -0400993 strvec_push(&sm_summary.args, s->amend ? "HEAD^" : "HEAD");
Matthieu Moybb7e32e2013-09-06 19:43:05 +0200994
Ping Yinac8d5af2008-04-12 23:05:32 +0800995 sm_summary.git_cmd = 1;
996 sm_summary.no_stdin = 1;
Matthieu Moy3ba74072013-09-06 19:43:06 +0200997
Jeff King5c950e92015-03-22 23:53:52 -0400998 capture_command(&sm_summary, &cmd_stdout, 1024);
Matthieu Moy3ba74072013-09-06 19:43:06 +0200999
1000 /* prepend header, only if there's an actual output */
Jeff Kingd56d9662015-03-22 06:00:32 -04001001 if (cmd_stdout.len) {
Matthieu Moy3ba74072013-09-06 19:43:06 +02001002 if (uncommitted)
1003 strbuf_addstr(&summary, _("Submodules changed but not updated:"));
1004 else
1005 strbuf_addstr(&summary, _("Submodule changes to be committed:"));
1006 strbuf_addstr(&summary, "\n\n");
1007 }
1008 strbuf_addbuf(&summary, &cmd_stdout);
1009 strbuf_release(&cmd_stdout);
1010
Matthieu Moy2556b992013-09-06 19:43:07 +02001011 if (s->display_comment_prefix) {
Jeff Kingd56d9662015-03-22 06:00:32 -04001012 size_t len;
Matthieu Moy2556b992013-09-06 19:43:07 +02001013 summary_content = strbuf_detach(&summary, &len);
1014 strbuf_add_commented_lines(&summary, summary_content, len);
1015 free(summary_content);
1016 }
Matthieu Moy3ba74072013-09-06 19:43:06 +02001017
1018 fputs(summary.buf, s->fp);
1019 strbuf_release(&summary);
Ping Yinac8d5af2008-04-12 23:05:32 +08001020}
1021
Jeff Hostetler957a0fe2016-08-05 18:00:26 -04001022static void wt_longstatus_print_other(struct wt_status *s,
1023 struct string_list *l,
1024 const char *what,
1025 const char *how)
Jeff Kingc91f0d92006-09-08 04:05:34 -04001026{
Jeff Kingc91f0d92006-09-08 04:05:34 -04001027 int i;
Brandon Caseyf285a2d2008-10-09 14:12:12 -05001028 struct strbuf buf = STRBUF_INIT;
Nguyễn Thái Ngọc Duy323d0532012-04-13 17:54:39 +07001029 static struct string_list output = STRING_LIST_INIT_DUP;
1030 struct column_options copts;
Jeff Kingc91f0d92006-09-08 04:05:34 -04001031
Jeff King12829882011-06-02 01:54:49 -04001032 if (!l->nr)
Junio C Hamano76378682009-08-10 00:36:33 -07001033 return;
Jeff Kingc91f0d92006-09-08 04:05:34 -04001034
Jeff Hostetler957a0fe2016-08-05 18:00:26 -04001035 wt_longstatus_print_other_header(s, what, how);
Junio C Hamano1b908b62010-04-10 00:19:46 -07001036
1037 for (i = 0; i < l->nr; i++) {
Junio C Hamano76378682009-08-10 00:36:33 -07001038 struct string_list_item *it;
Nguyễn Thái Ngọc Duy323d0532012-04-13 17:54:39 +07001039 const char *path;
Junio C Hamano1b908b62010-04-10 00:19:46 -07001040 it = &(l->items[i]);
Junio C Hamano88910c92020-09-10 10:01:54 -07001041 path = quote_path(it->string, s->prefix, &buf, 0);
Nguyễn Thái Ngọc Duy323d0532012-04-13 17:54:39 +07001042 if (column_active(s->colopts)) {
1043 string_list_append(&output, path);
1044 continue;
1045 }
Jonathan Niederb926c0d2011-02-25 23:11:37 -06001046 status_printf(s, color(WT_STATUS_HEADER, s), "\t");
1047 status_printf_more(s, color(WT_STATUS_UNTRACKED, s),
Nguyễn Thái Ngọc Duy323d0532012-04-13 17:54:39 +07001048 "%s\n", path);
Jeff Kingc91f0d92006-09-08 04:05:34 -04001049 }
Nguyễn Thái Ngọc Duy323d0532012-04-13 17:54:39 +07001050
1051 strbuf_release(&buf);
1052 if (!column_active(s->colopts))
Matthieu Moy2f0f7f12013-09-06 19:43:09 +02001053 goto conclude;
Nguyễn Thái Ngọc Duy323d0532012-04-13 17:54:39 +07001054
Matthieu Moy2556b992013-09-06 19:43:07 +02001055 strbuf_addf(&buf, "%s%s\t%s",
Nguyễn Thái Ngọc Duy323d0532012-04-13 17:54:39 +07001056 color(WT_STATUS_HEADER, s),
Matthieu Moy2556b992013-09-06 19:43:07 +02001057 s->display_comment_prefix ? "#" : "",
Nguyễn Thái Ngọc Duy323d0532012-04-13 17:54:39 +07001058 color(WT_STATUS_UNTRACKED, s));
1059 memset(&copts, 0, sizeof(copts));
1060 copts.padding = 1;
1061 copts.indent = buf.buf;
1062 if (want_color(s->use_color))
1063 copts.nl = GIT_COLOR_RESET "\n";
1064 print_columns(&output, s->colopts, &copts);
1065 string_list_clear(&output, 0);
Johannes Schindelin367c9882007-11-11 17:35:41 +00001066 strbuf_release(&buf);
Matthieu Moy2f0f7f12013-09-06 19:43:09 +02001067conclude:
Felipe Contreras7d7d6802014-05-04 01:12:55 -05001068 status_printf_ln(s, GIT_COLOR_NORMAL, "%s", "");
Jeff Kingc91f0d92006-09-08 04:05:34 -04001069}
1070
Brian Malehornd76650b2017-05-15 23:06:49 -07001071size_t wt_status_locate_end(const char *s, size_t len)
Jens Lehmann1a72cfd2013-12-05 20:44:14 +01001072{
1073 const char *p;
1074 struct strbuf pattern = STRBUF_INIT;
1075
SZEDER Gáborfbfa0972015-06-09 02:28:34 +02001076 strbuf_addf(&pattern, "\n%c %s", comment_line_char, cut_line);
Brian Malehornd76650b2017-05-15 23:06:49 -07001077 if (starts_with(s, pattern.buf + 1))
1078 len = 0;
1079 else if ((p = strstr(s, pattern.buf)))
1080 len = p - s + 1;
Jens Lehmann1a72cfd2013-12-05 20:44:14 +01001081 strbuf_release(&pattern);
Brian Malehornd76650b2017-05-15 23:06:49 -07001082 return len;
Jens Lehmann1a72cfd2013-12-05 20:44:14 +01001083}
1084
Denton Liud540b702019-04-17 11:23:27 +01001085void wt_status_append_cut_line(struct strbuf *buf)
Nguyễn Thái Ngọc Duyfcef9312014-02-17 19:15:31 +07001086{
Kaartic Sivaraam8c4b1a32017-09-13 13:05:38 +00001087 const char *explanation = _("Do not modify or remove the line above.\nEverything below it will be ignored.");
Denton Liud540b702019-04-17 11:23:27 +01001088
1089 strbuf_commented_addf(buf, "%s", cut_line);
1090 strbuf_add_commented_lines(buf, explanation, strlen(explanation));
1091}
1092
1093void wt_status_add_cut_line(FILE *fp)
1094{
Nguyễn Thái Ngọc Duyfcef9312014-02-17 19:15:31 +07001095 struct strbuf buf = STRBUF_INIT;
1096
Denton Liud540b702019-04-17 11:23:27 +01001097 wt_status_append_cut_line(&buf);
Nguyễn Thái Ngọc Duyfcef9312014-02-17 19:15:31 +07001098 fputs(buf.buf, fp);
1099 strbuf_release(&buf);
1100}
1101
Jeff Hostetler957a0fe2016-08-05 18:00:26 -04001102static void wt_longstatus_print_verbose(struct wt_status *s)
Jeff Kingc91f0d92006-09-08 04:05:34 -04001103{
1104 struct rev_info rev;
Junio C Hamano32962c92010-03-08 22:58:09 -08001105 struct setup_revision_opt opt;
Michael J Gruber40555002015-03-06 10:43:35 +01001106 int dirty_submodules;
1107 const char *c = color(WT_STATUS_HEADER, s);
Kristian Høgsberg99a12692007-11-21 21:54:49 -05001108
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +01001109 repo_init_revisions(s->repo, &rev, NULL);
Brandon Williams0d1e0e72017-10-31 11:19:11 -07001110 rev.diffopt.flags.allow_textconv = 1;
Nguyễn Thái Ngọc Duy425a28e2016-10-24 17:42:19 +07001111 rev.diffopt.ita_invisible_in_index = 1;
Junio C Hamano32962c92010-03-08 22:58:09 -08001112
1113 memset(&opt, 0, sizeof(opt));
brian m. carlsonf2e51192018-05-02 00:26:00 +00001114 opt.def = s->is_initial ? empty_tree_oid_hex() : s->reference;
Junio C Hamano32962c92010-03-08 22:58:09 -08001115 setup_revisions(0, NULL, &rev, &opt);
1116
Jeff Kingc91f0d92006-09-08 04:05:34 -04001117 rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
Ben Pearte8b2dc22018-05-11 15:38:58 +00001118 rev.diffopt.detect_rename = s->detect_rename >= 0 ? s->detect_rename : rev.diffopt.detect_rename;
1119 rev.diffopt.rename_limit = s->rename_limit >= 0 ? s->rename_limit : rev.diffopt.rename_limit;
1120 rev.diffopt.rename_score = s->rename_score >= 0 ? s->rename_score : rev.diffopt.rename_score;
Kristian Høgsberg4ba0cb22008-03-10 13:58:26 -04001121 rev.diffopt.file = s->fp;
1122 rev.diffopt.close_file = 0;
Jeff King4f672ad2008-10-26 00:49:35 -04001123 /*
1124 * If we're not going to stdout, then we definitely don't
1125 * want color, since we are going to the commit message
1126 * file (and even the "auto" setting won't work, since it
Jens Lehmann1a72cfd2013-12-05 20:44:14 +01001127 * will have checked isatty on stdout). But we then do want
1128 * to insert the scissor line here to reliably remove the
1129 * diff before committing.
Jeff King4f672ad2008-10-26 00:49:35 -04001130 */
Jens Lehmann1a72cfd2013-12-05 20:44:14 +01001131 if (s->fp != stdout) {
Jeff Kingf1c96262011-08-17 22:03:12 -07001132 rev.diffopt.use_color = 0;
Nguyễn Thái Ngọc Duyfcef9312014-02-17 19:15:31 +07001133 wt_status_add_cut_line(s->fp);
Jens Lehmann1a72cfd2013-12-05 20:44:14 +01001134 }
Stephen P. Smith6fa90192018-09-05 17:53:27 -07001135 if (s->verbose > 1 && s->committable) {
Michael J Gruber40555002015-03-06 10:43:35 +01001136 /* print_updated() printed a header, so do we */
1137 if (s->fp != stdout)
Jeff Hostetler957a0fe2016-08-05 18:00:26 -04001138 wt_longstatus_print_trailer(s);
Michael J Gruber40555002015-03-06 10:43:35 +01001139 status_printf_ln(s, c, _("Changes to be committed:"));
1140 rev.diffopt.a_prefix = "c/";
1141 rev.diffopt.b_prefix = "i/";
1142 } /* else use prefix as per user config */
Jeff Kingc91f0d92006-09-08 04:05:34 -04001143 run_diff_index(&rev, 1);
Michael J Gruber40555002015-03-06 10:43:35 +01001144 if (s->verbose > 1 &&
1145 wt_status_check_worktree_changes(s, &dirty_submodules)) {
1146 status_printf_ln(s, c,
1147 "--------------------------------------------------");
1148 status_printf_ln(s, c, _("Changes not staged for commit:"));
1149 setup_work_tree();
1150 rev.diffopt.a_prefix = "i/";
1151 rev.diffopt.b_prefix = "w/";
1152 run_diff_files(&rev, 0);
1153 }
Ævar Arnfjörð Bjarmason2108fe42022-04-13 22:01:36 +02001154 release_revisions(&rev);
Jeff Kingc91f0d92006-09-08 04:05:34 -04001155}
1156
Jeff Hostetler957a0fe2016-08-05 18:00:26 -04001157static void wt_longstatus_print_tracking(struct wt_status *s)
Junio C Hamanob6975ab2008-07-02 00:52:16 -07001158{
1159 struct strbuf sb = STRBUF_INIT;
René Scharfec72b49d2015-10-31 18:37:43 +01001160 const char *cp, *ep, *branch_name;
Junio C Hamanob6975ab2008-07-02 00:52:16 -07001161 struct branch *branch;
Matthieu Moy2556b992013-09-06 19:43:07 +02001162 char comment_line_string[3];
1163 int i;
Jeff Hostetler0a535612019-06-18 13:21:27 -07001164 uint64_t t_begin = 0;
Junio C Hamanob6975ab2008-07-02 00:52:16 -07001165
1166 assert(s->branch && !s->is_initial);
René Scharfec72b49d2015-10-31 18:37:43 +01001167 if (!skip_prefix(s->branch, "refs/heads/", &branch_name))
Junio C Hamanob6975ab2008-07-02 00:52:16 -07001168 return;
René Scharfec72b49d2015-10-31 18:37:43 +01001169 branch = branch_get(branch_name);
Jeff Hostetler0a535612019-06-18 13:21:27 -07001170
1171 t_begin = getnanotime();
1172
Jeff Hostetlerf39a7572018-01-09 18:50:18 +00001173 if (!format_tracking_info(branch, &sb, s->ahead_behind_flags))
Junio C Hamanob6975ab2008-07-02 00:52:16 -07001174 return;
1175
Ben Boeckeled9bff02021-08-23 12:44:00 +02001176 if (advice_enabled(ADVICE_STATUS_AHEAD_BEHIND_WARNING) &&
Jeff Hostetler0a535612019-06-18 13:21:27 -07001177 s->ahead_behind_flags == AHEAD_BEHIND_FULL) {
1178 uint64_t t_delta_in_ms = (getnanotime() - t_begin) / 1000000;
1179 if (t_delta_in_ms > AB_DELAY_WARNING_IN_MS) {
1180 strbuf_addf(&sb, _("\n"
1181 "It took %.2f seconds to compute the branch ahead/behind values.\n"
1182 "You can use '--no-ahead-behind' to avoid this.\n"),
1183 t_delta_in_ms / 1000.0);
1184 }
1185 }
1186
Matthieu Moy2556b992013-09-06 19:43:07 +02001187 i = 0;
1188 if (s->display_comment_prefix) {
1189 comment_line_string[i++] = comment_line_char;
1190 comment_line_string[i++] = ' ';
1191 }
1192 comment_line_string[i] = '\0';
1193
Junio C Hamanob6975ab2008-07-02 00:52:16 -07001194 for (cp = sb.buf; (ep = strchr(cp, '\n')) != NULL; cp = ep + 1)
Junio C Hamanod249b092009-08-09 21:59:30 -07001195 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s),
Matthieu Moy2556b992013-09-06 19:43:07 +02001196 "%s%.*s", comment_line_string,
Junio C Hamanoeff80a92013-01-16 20:18:48 +01001197 (int)(ep - cp), cp);
Matthieu Moy2556b992013-09-06 19:43:07 +02001198 if (s->display_comment_prefix)
1199 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s), "%c",
1200 comment_line_char);
1201 else
Jeff King75177c82017-04-27 05:01:05 -04001202 fputs("\n", s->fp);
Rene Scharfeb6ec3072017-08-30 20:20:18 +02001203 strbuf_release(&sb);
Junio C Hamanob6975ab2008-07-02 00:52:16 -07001204}
1205
Lucien Kong83c750a2012-06-05 22:21:24 +02001206static void show_merge_in_progress(struct wt_status *s,
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001207 const char *color)
Lucien Kong83c750a2012-06-05 22:21:24 +02001208{
1209 if (has_unmerged(s)) {
1210 status_printf_ln(s, color, _("You have unmerged paths."));
Matthieu Moyb0a61ab2016-07-21 14:58:37 +02001211 if (s->hints) {
Lucien Kong83c750a2012-06-05 22:21:24 +02001212 status_printf_ln(s, color,
Matthieu Moyb0a61ab2016-07-21 14:58:37 +02001213 _(" (fix conflicts and run \"git commit\")"));
1214 status_printf_ln(s, color,
1215 _(" (use \"git merge --abort\" to abort the merge)"));
1216 }
Lucien Kong83c750a2012-06-05 22:21:24 +02001217 } else {
1218 status_printf_ln(s, color,
1219 _("All conflicts fixed but you are still merging."));
Matthieu Moy6a964f52013-09-12 12:50:05 +02001220 if (s->hints)
Lucien Kong83c750a2012-06-05 22:21:24 +02001221 status_printf_ln(s, color,
1222 _(" (use \"git commit\" to conclude merge)"));
1223 }
Jeff Hostetler957a0fe2016-08-05 18:00:26 -04001224 wt_longstatus_print_trailer(s);
Lucien Kong83c750a2012-06-05 22:21:24 +02001225}
1226
1227static void show_am_in_progress(struct wt_status *s,
Lucien Kong83c750a2012-06-05 22:21:24 +02001228 const char *color)
1229{
徐沛文 (Aleen)9e7e41b2021-12-09 07:25:55 +00001230 int am_empty_patch;
1231
Lucien Kong83c750a2012-06-05 22:21:24 +02001232 status_printf_ln(s, color,
1233 _("You are in the middle of an am session."));
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001234 if (s->state.am_empty_patch)
Lucien Kong83c750a2012-06-05 22:21:24 +02001235 status_printf_ln(s, color,
1236 _("The current patch is empty."));
Matthieu Moy6a964f52013-09-12 12:50:05 +02001237 if (s->hints) {
徐沛文 (Aleen)9e7e41b2021-12-09 07:25:55 +00001238 am_empty_patch = s->state.am_empty_patch;
1239 if (!am_empty_patch)
Lucien Kong83c750a2012-06-05 22:21:24 +02001240 status_printf_ln(s, color,
Kevin Bracey8ceb6fb2013-06-26 23:06:41 +03001241 _(" (fix conflicts and then run \"git am --continue\")"));
Lucien Kong83c750a2012-06-05 22:21:24 +02001242 status_printf_ln(s, color,
1243 _(" (use \"git am --skip\" to skip this patch)"));
徐沛文 (Aleen)9e7e41b2021-12-09 07:25:55 +00001244 if (am_empty_patch)
1245 status_printf_ln(s, color,
1246 _(" (use \"git am --allow-empty\" to record this patch as an empty commit)"));
Lucien Kong83c750a2012-06-05 22:21:24 +02001247 status_printf_ln(s, color,
1248 _(" (use \"git am --abort\" to restore the original branch)"));
1249 }
Jeff Hostetler957a0fe2016-08-05 18:00:26 -04001250 wt_longstatus_print_trailer(s);
Lucien Kong83c750a2012-06-05 22:21:24 +02001251}
1252
Lucien Kong2d1cceb2012-06-10 13:17:38 +02001253static char *read_line_from_git_path(const char *filename)
1254{
1255 struct strbuf buf = STRBUF_INIT;
Nguyễn Thái Ngọc Duye9d983f2017-05-03 17:16:50 +07001256 FILE *fp = fopen_or_warn(git_path("%s", filename), "r");
1257
Lucien Kong2d1cceb2012-06-10 13:17:38 +02001258 if (!fp) {
1259 strbuf_release(&buf);
1260 return NULL;
1261 }
Junio C Hamano8f309ae2016-01-13 15:31:17 -08001262 strbuf_getline_lf(&buf, fp);
Lucien Kong2d1cceb2012-06-10 13:17:38 +02001263 if (!fclose(fp)) {
1264 return strbuf_detach(&buf, NULL);
1265 } else {
1266 strbuf_release(&buf);
1267 return NULL;
1268 }
1269}
1270
1271static int split_commit_in_progress(struct wt_status *s)
1272{
1273 int split_in_progress = 0;
Johannes Schindelin41fc6b32017-05-04 15:56:44 +02001274 char *head, *orig_head, *rebase_amend, *rebase_orig_head;
Lucien Kong2d1cceb2012-06-10 13:17:38 +02001275
Johannes Schindelin41fc6b32017-05-04 15:56:44 +02001276 if ((!s->amend && !s->nowarn && !s->workdir_dirty) ||
Lucien Kong2d1cceb2012-06-10 13:17:38 +02001277 !s->branch || strcmp(s->branch, "HEAD"))
Johannes Schindelin41fc6b32017-05-04 15:56:44 +02001278 return 0;
Lucien Kong2d1cceb2012-06-10 13:17:38 +02001279
Johannes Schindelin41fc6b32017-05-04 15:56:44 +02001280 head = read_line_from_git_path("HEAD");
1281 orig_head = read_line_from_git_path("ORIG_HEAD");
1282 rebase_amend = read_line_from_git_path("rebase-merge/amend");
1283 rebase_orig_head = read_line_from_git_path("rebase-merge/orig-head");
1284
1285 if (!head || !orig_head || !rebase_amend || !rebase_orig_head)
1286 ; /* fall through, no split in progress */
1287 else if (!strcmp(rebase_amend, rebase_orig_head))
1288 split_in_progress = !!strcmp(head, rebase_amend);
1289 else if (strcmp(orig_head, rebase_orig_head))
Lucien Kong2d1cceb2012-06-10 13:17:38 +02001290 split_in_progress = 1;
Lucien Kong2d1cceb2012-06-10 13:17:38 +02001291
1292 free(head);
1293 free(orig_head);
1294 free(rebase_amend);
1295 free(rebase_orig_head);
Johannes Schindelin41fc6b32017-05-04 15:56:44 +02001296
Lucien Kong2d1cceb2012-06-10 13:17:38 +02001297 return split_in_progress;
1298}
1299
Guillaume Pagès84e6fb92015-07-06 22:56:03 +02001300/*
1301 * Turn
1302 * "pick d6a2f0303e897ec257dd0e0a39a5ccb709bc2047 some message"
1303 * into
1304 * "pick d6a2f03 some message"
1305 *
1306 * The function assumes that the line does not contain useless spaces
1307 * before or after the command.
1308 */
Martin Ågrenb1f1ade2020-09-27 15:15:41 +02001309static void abbrev_oid_in_line(struct strbuf *line)
Guillaume Pagès84e6fb92015-07-06 22:56:03 +02001310{
1311 struct strbuf **split;
1312 int i;
1313
1314 if (starts_with(line->buf, "exec ") ||
Johannes Schindelin225a7772019-05-10 13:23:14 -07001315 starts_with(line->buf, "x ") ||
1316 starts_with(line->buf, "label ") ||
1317 starts_with(line->buf, "l "))
Guillaume Pagès84e6fb92015-07-06 22:56:03 +02001318 return;
1319
1320 split = strbuf_split_max(line, ' ', 3);
1321 if (split[0] && split[1]) {
brian m. carlsone86ab2c2017-02-21 23:47:37 +00001322 struct object_id oid;
Guillaume Pagès84e6fb92015-07-06 22:56:03 +02001323
1324 /*
1325 * strbuf_split_max left a space. Trim it and re-add
1326 * it after abbreviation.
1327 */
1328 strbuf_trim(split[1]);
brian m. carlsone86ab2c2017-02-21 23:47:37 +00001329 if (!get_oid(split[1]->buf, &oid)) {
Guillaume Pagès84e6fb92015-07-06 22:56:03 +02001330 strbuf_reset(split[1]);
brian m. carlson30e677e2018-03-12 02:27:28 +00001331 strbuf_add_unique_abbrev(split[1], &oid,
René Scharfea94bb682016-10-08 17:38:47 +02001332 DEFAULT_ABBREV);
1333 strbuf_addch(split[1], ' ');
Guillaume Pagès84e6fb92015-07-06 22:56:03 +02001334 strbuf_reset(line);
1335 for (i = 0; split[i]; i++)
René Scharfe81099842016-07-19 20:36:29 +02001336 strbuf_addbuf(line, split[i]);
Guillaume Pagès84e6fb92015-07-06 22:56:03 +02001337 }
1338 }
Stefan Beller6eb60782016-03-31 17:35:44 -07001339 strbuf_list_free(split);
Guillaume Pagès84e6fb92015-07-06 22:56:03 +02001340}
1341
Johannes Schindelindf9ded42017-01-26 17:08:41 +01001342static int read_rebase_todolist(const char *fname, struct string_list *lines)
Guillaume Pagès84e6fb92015-07-06 22:56:03 +02001343{
1344 struct strbuf line = STRBUF_INIT;
1345 FILE *f = fopen(git_path("%s", fname), "r");
1346
Johannes Schindelindf9ded42017-01-26 17:08:41 +01001347 if (!f) {
1348 if (errno == ENOENT)
1349 return -1;
Guillaume Pagès84e6fb92015-07-06 22:56:03 +02001350 die_errno("Could not open file %s for reading",
1351 git_path("%s", fname));
Johannes Schindelindf9ded42017-01-26 17:08:41 +01001352 }
Junio C Hamano8f309ae2016-01-13 15:31:17 -08001353 while (!strbuf_getline_lf(&line, f)) {
Guillaume Pagès84e6fb92015-07-06 22:56:03 +02001354 if (line.len && line.buf[0] == comment_line_char)
1355 continue;
1356 strbuf_trim(&line);
1357 if (!line.len)
1358 continue;
Martin Ågrenb1f1ade2020-09-27 15:15:41 +02001359 abbrev_oid_in_line(&line);
Guillaume Pagès84e6fb92015-07-06 22:56:03 +02001360 string_list_append(lines, line.buf);
1361 }
Johannes Schindeline7b65e22017-05-04 15:55:52 +02001362 fclose(f);
Rene Scharfe6f495412017-08-30 20:20:17 +02001363 strbuf_release(&line);
Johannes Schindelindf9ded42017-01-26 17:08:41 +01001364 return 0;
Guillaume Pagès84e6fb92015-07-06 22:56:03 +02001365}
1366
1367static void show_rebase_information(struct wt_status *s,
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001368 const char *color)
Guillaume Pagès84e6fb92015-07-06 22:56:03 +02001369{
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001370 if (s->state.rebase_interactive_in_progress) {
Guillaume Pagès84e6fb92015-07-06 22:56:03 +02001371 int i;
1372 int nr_lines_to_show = 2;
1373
1374 struct string_list have_done = STRING_LIST_INIT_DUP;
1375 struct string_list yet_to_do = STRING_LIST_INIT_DUP;
1376
1377 read_rebase_todolist("rebase-merge/done", &have_done);
Johannes Schindelindf9ded42017-01-26 17:08:41 +01001378 if (read_rebase_todolist("rebase-merge/git-rebase-todo",
1379 &yet_to_do))
1380 status_printf_ln(s, color,
1381 _("git-rebase-todo is missing."));
Guillaume Pagès84e6fb92015-07-06 22:56:03 +02001382 if (have_done.nr == 0)
1383 status_printf_ln(s, color, _("No commands done."));
1384 else {
1385 status_printf_ln(s, color,
Ævar Arnfjörð Bjarmason99d60542022-03-07 16:27:08 +01001386 Q_("Last command done (%"PRIuMAX" command done):",
1387 "Last commands done (%"PRIuMAX" commands done):",
Guillaume Pagès84e6fb92015-07-06 22:56:03 +02001388 have_done.nr),
Ævar Arnfjörð Bjarmason99d60542022-03-07 16:27:08 +01001389 (uintmax_t)have_done.nr);
Guillaume Pagès84e6fb92015-07-06 22:56:03 +02001390 for (i = (have_done.nr > nr_lines_to_show)
1391 ? have_done.nr - nr_lines_to_show : 0;
1392 i < have_done.nr;
1393 i++)
1394 status_printf_ln(s, color, " %s", have_done.items[i].string);
1395 if (have_done.nr > nr_lines_to_show && s->hints)
1396 status_printf_ln(s, color,
1397 _(" (see more in file %s)"), git_path("rebase-merge/done"));
1398 }
1399
1400 if (yet_to_do.nr == 0)
1401 status_printf_ln(s, color,
1402 _("No commands remaining."));
1403 else {
1404 status_printf_ln(s, color,
Ævar Arnfjörð Bjarmason99d60542022-03-07 16:27:08 +01001405 Q_("Next command to do (%"PRIuMAX" remaining command):",
1406 "Next commands to do (%"PRIuMAX" remaining commands):",
Guillaume Pagès84e6fb92015-07-06 22:56:03 +02001407 yet_to_do.nr),
Ævar Arnfjörð Bjarmason99d60542022-03-07 16:27:08 +01001408 (uintmax_t)yet_to_do.nr);
Guillaume Pagès84e6fb92015-07-06 22:56:03 +02001409 for (i = 0; i < nr_lines_to_show && i < yet_to_do.nr; i++)
1410 status_printf_ln(s, color, " %s", yet_to_do.items[i].string);
1411 if (s->hints)
1412 status_printf_ln(s, color,
1413 _(" (use \"git rebase --edit-todo\" to view and edit)"));
1414 }
1415 string_list_clear(&yet_to_do, 0);
1416 string_list_clear(&have_done, 0);
1417 }
1418}
1419
Guillaume Pagès05eb5632015-06-30 15:01:12 +02001420static void print_rebase_state(struct wt_status *s,
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001421 const char *color)
Guillaume Pagès05eb5632015-06-30 15:01:12 +02001422{
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001423 if (s->state.branch)
Guillaume Pagès05eb5632015-06-30 15:01:12 +02001424 status_printf_ln(s, color,
1425 _("You are currently rebasing branch '%s' on '%s'."),
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001426 s->state.branch,
1427 s->state.onto);
Guillaume Pagès05eb5632015-06-30 15:01:12 +02001428 else
1429 status_printf_ln(s, color,
1430 _("You are currently rebasing."));
1431}
1432
Lucien Kong83c750a2012-06-05 22:21:24 +02001433static void show_rebase_in_progress(struct wt_status *s,
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001434 const char *color)
Lucien Kong83c750a2012-06-05 22:21:24 +02001435{
1436 struct stat st;
1437
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001438 show_rebase_information(s, color);
Lucien Kong83c750a2012-06-05 22:21:24 +02001439 if (has_unmerged(s)) {
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001440 print_rebase_state(s, color);
Matthieu Moy6a964f52013-09-12 12:50:05 +02001441 if (s->hints) {
Lucien Kong83c750a2012-06-05 22:21:24 +02001442 status_printf_ln(s, color,
1443 _(" (fix conflicts and then run \"git rebase --continue\")"));
1444 status_printf_ln(s, color,
1445 _(" (use \"git rebase --skip\" to skip this patch)"));
1446 status_printf_ln(s, color,
1447 _(" (use \"git rebase --abort\" to check out the original branch)"));
1448 }
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001449 } else if (s->state.rebase_in_progress ||
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +01001450 !stat(git_path_merge_msg(s->repo), &st)) {
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001451 print_rebase_state(s, color);
Matthieu Moy6a964f52013-09-12 12:50:05 +02001452 if (s->hints)
Lucien Kong83c750a2012-06-05 22:21:24 +02001453 status_printf_ln(s, color,
1454 _(" (all conflicts fixed: run \"git rebase --continue\")"));
Lucien Kong2d1cceb2012-06-10 13:17:38 +02001455 } else if (split_commit_in_progress(s)) {
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001456 if (s->state.branch)
Nguyễn Thái Ngọc Duy0722c802013-02-03 12:53:27 +07001457 status_printf_ln(s, color,
1458 _("You are currently splitting a commit while rebasing branch '%s' on '%s'."),
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001459 s->state.branch,
1460 s->state.onto);
Nguyễn Thái Ngọc Duy0722c802013-02-03 12:53:27 +07001461 else
1462 status_printf_ln(s, color,
1463 _("You are currently splitting a commit during a rebase."));
Matthieu Moy6a964f52013-09-12 12:50:05 +02001464 if (s->hints)
Lucien Kong2d1cceb2012-06-10 13:17:38 +02001465 status_printf_ln(s, color,
1466 _(" (Once your working directory is clean, run \"git rebase --continue\")"));
Lucien Kong83c750a2012-06-05 22:21:24 +02001467 } else {
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001468 if (s->state.branch)
Nguyễn Thái Ngọc Duy0722c802013-02-03 12:53:27 +07001469 status_printf_ln(s, color,
1470 _("You are currently editing a commit while rebasing branch '%s' on '%s'."),
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001471 s->state.branch,
1472 s->state.onto);
Nguyễn Thái Ngọc Duy0722c802013-02-03 12:53:27 +07001473 else
1474 status_printf_ln(s, color,
1475 _("You are currently editing a commit during a rebase."));
Matthieu Moy6a964f52013-09-12 12:50:05 +02001476 if (s->hints && !s->amend) {
Lucien Kong83c750a2012-06-05 22:21:24 +02001477 status_printf_ln(s, color,
1478 _(" (use \"git commit --amend\" to amend the current commit)"));
1479 status_printf_ln(s, color,
1480 _(" (use \"git rebase --continue\" once you are satisfied with your changes)"));
1481 }
1482 }
Jeff Hostetler957a0fe2016-08-05 18:00:26 -04001483 wt_longstatus_print_trailer(s);
Lucien Kong83c750a2012-06-05 22:21:24 +02001484}
1485
1486static void show_cherry_pick_in_progress(struct wt_status *s,
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001487 const char *color)
Lucien Kong83c750a2012-06-05 22:21:24 +02001488{
Phillip Wood4a724862019-04-16 11:18:42 +01001489 if (is_null_oid(&s->state.cherry_pick_head_oid))
1490 status_printf_ln(s, color,
1491 _("Cherry-pick currently in progress."));
1492 else
1493 status_printf_ln(s, color,
1494 _("You are currently cherry-picking commit %s."),
1495 find_unique_abbrev(&s->state.cherry_pick_head_oid,
1496 DEFAULT_ABBREV));
1497
Matthieu Moy6a964f52013-09-12 12:50:05 +02001498 if (s->hints) {
Lucien Kong83c750a2012-06-05 22:21:24 +02001499 if (has_unmerged(s))
1500 status_printf_ln(s, color,
Ralf Thielowb95e66f2013-06-17 06:28:26 +02001501 _(" (fix conflicts and run \"git cherry-pick --continue\")"));
Phillip Wood4a724862019-04-16 11:18:42 +01001502 else if (is_null_oid(&s->state.cherry_pick_head_oid))
1503 status_printf_ln(s, color,
1504 _(" (run \"git cherry-pick --continue\" to continue)"));
Lucien Kong83c750a2012-06-05 22:21:24 +02001505 else
1506 status_printf_ln(s, color,
Ralf Thielowb95e66f2013-06-17 06:28:26 +02001507 _(" (all conflicts fixed: run \"git cherry-pick --continue\")"));
1508 status_printf_ln(s, color,
Denton Liu86ae43d2019-08-27 00:45:41 -04001509 _(" (use \"git cherry-pick --skip\" to skip this patch)"));
1510 status_printf_ln(s, color,
Ralf Thielowb95e66f2013-06-17 06:28:26 +02001511 _(" (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"));
Lucien Kong83c750a2012-06-05 22:21:24 +02001512 }
Jeff Hostetler957a0fe2016-08-05 18:00:26 -04001513 wt_longstatus_print_trailer(s);
Lucien Kong83c750a2012-06-05 22:21:24 +02001514}
1515
Matthieu Moydb4ef442013-04-02 16:20:21 +02001516static void show_revert_in_progress(struct wt_status *s,
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001517 const char *color)
Matthieu Moydb4ef442013-04-02 16:20:21 +02001518{
Phillip Wood4a724862019-04-16 11:18:42 +01001519 if (is_null_oid(&s->state.revert_head_oid))
1520 status_printf_ln(s, color,
1521 _("Revert currently in progress."));
1522 else
1523 status_printf_ln(s, color,
1524 _("You are currently reverting commit %s."),
1525 find_unique_abbrev(&s->state.revert_head_oid,
1526 DEFAULT_ABBREV));
Matthieu Moy6a964f52013-09-12 12:50:05 +02001527 if (s->hints) {
Matthieu Moydb4ef442013-04-02 16:20:21 +02001528 if (has_unmerged(s))
1529 status_printf_ln(s, color,
1530 _(" (fix conflicts and run \"git revert --continue\")"));
Phillip Wood4a724862019-04-16 11:18:42 +01001531 else if (is_null_oid(&s->state.revert_head_oid))
1532 status_printf_ln(s, color,
1533 _(" (run \"git revert --continue\" to continue)"));
Matthieu Moydb4ef442013-04-02 16:20:21 +02001534 else
1535 status_printf_ln(s, color,
1536 _(" (all conflicts fixed: run \"git revert --continue\")"));
1537 status_printf_ln(s, color,
Denton Liu86ae43d2019-08-27 00:45:41 -04001538 _(" (use \"git revert --skip\" to skip this patch)"));
1539 status_printf_ln(s, color,
Matthieu Moydb4ef442013-04-02 16:20:21 +02001540 _(" (use \"git revert --abort\" to cancel the revert operation)"));
1541 }
Jeff Hostetler957a0fe2016-08-05 18:00:26 -04001542 wt_longstatus_print_trailer(s);
Matthieu Moydb4ef442013-04-02 16:20:21 +02001543}
1544
Lucien Kong83c750a2012-06-05 22:21:24 +02001545static void show_bisect_in_progress(struct wt_status *s,
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001546 const char *color)
Lucien Kong83c750a2012-06-05 22:21:24 +02001547{
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001548 if (s->state.branch)
Nguyễn Thái Ngọc Duy0722c802013-02-03 12:53:27 +07001549 status_printf_ln(s, color,
Nguyễn Thái Ngọc Duy6deab242013-03-23 10:52:44 +07001550 _("You are currently bisecting, started from branch '%s'."),
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001551 s->state.branch);
Nguyễn Thái Ngọc Duy0722c802013-02-03 12:53:27 +07001552 else
1553 status_printf_ln(s, color,
1554 _("You are currently bisecting."));
Matthieu Moy6a964f52013-09-12 12:50:05 +02001555 if (s->hints)
Lucien Kong83c750a2012-06-05 22:21:24 +02001556 status_printf_ln(s, color,
1557 _(" (use \"git bisect reset\" to get back to the original branch)"));
Jeff Hostetler957a0fe2016-08-05 18:00:26 -04001558 wt_longstatus_print_trailer(s);
Lucien Kong83c750a2012-06-05 22:21:24 +02001559}
1560
Elijah Newren051df3c2020-06-18 20:49:57 +00001561static void show_sparse_checkout_in_use(struct wt_status *s,
1562 const char *color)
1563{
1564 if (s->state.sparse_checkout_percentage == SPARSE_CHECKOUT_DISABLED)
1565 return;
1566
Derrick Stoleebf48e5a2021-07-14 13:12:36 +00001567 if (s->state.sparse_checkout_percentage == SPARSE_CHECKOUT_SPARSE_INDEX)
1568 status_printf_ln(s, color, _("You are in a sparse checkout."));
1569 else
1570 status_printf_ln(s, color,
1571 _("You are in a sparse checkout with %d%% of tracked files present."),
1572 s->state.sparse_checkout_percentage);
Elijah Newren051df3c2020-06-18 20:49:57 +00001573 wt_longstatus_print_trailer(s);
1574}
1575
Nguyễn Thái Ngọc Duy0722c802013-02-03 12:53:27 +07001576/*
1577 * Extract branch information from rebase/bisect
1578 */
Nguyễn Thái Ngọc Duy81eff272016-04-22 20:01:31 +07001579static char *get_branch(const struct worktree *wt, const char *path)
Nguyễn Thái Ngọc Duy0722c802013-02-03 12:53:27 +07001580{
Nguyễn Thái Ngọc Duy8b87cfd2013-03-16 09:12:36 +07001581 struct strbuf sb = STRBUF_INIT;
brian m. carlsone86ab2c2017-02-21 23:47:37 +00001582 struct object_id oid;
René Scharfec72b49d2015-10-31 18:37:43 +01001583 const char *branch_name;
Nguyễn Thái Ngọc Duy0722c802013-02-03 12:53:27 +07001584
Nguyễn Thái Ngọc Duy81eff272016-04-22 20:01:31 +07001585 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 +07001586 goto got_nothing;
Nguyễn Thái Ngọc Duy0722c802013-02-03 12:53:27 +07001587
Jeff King66ec9042015-01-28 12:57:35 -05001588 while (sb.len && sb.buf[sb.len - 1] == '\n')
Nguyễn Thái Ngọc Duy8b87cfd2013-03-16 09:12:36 +07001589 strbuf_setlen(&sb, sb.len - 1);
1590 if (!sb.len)
1591 goto got_nothing;
René Scharfec72b49d2015-10-31 18:37:43 +01001592 if (skip_prefix(sb.buf, "refs/heads/", &branch_name))
1593 strbuf_remove(&sb, 0, branch_name - sb.buf);
Christian Couder59556542013-11-30 21:55:40 +01001594 else if (starts_with(sb.buf, "refs/"))
Nguyễn Thái Ngọc Duy8b87cfd2013-03-16 09:12:36 +07001595 ;
brian m. carlsone86ab2c2017-02-21 23:47:37 +00001596 else if (!get_oid_hex(sb.buf, &oid)) {
Nguyễn Thái Ngọc Duy8b87cfd2013-03-16 09:12:36 +07001597 strbuf_reset(&sb);
brian m. carlson30e677e2018-03-12 02:27:28 +00001598 strbuf_add_unique_abbrev(&sb, &oid, DEFAULT_ABBREV);
Nguyễn Thái Ngọc Duy8b87cfd2013-03-16 09:12:36 +07001599 } else if (!strcmp(sb.buf, "detached HEAD")) /* rebase */
1600 goto got_nothing;
Nguyễn Thái Ngọc Duy0722c802013-02-03 12:53:27 +07001601 else /* bisect */
Nguyễn Thái Ngọc Duy8b87cfd2013-03-16 09:12:36 +07001602 ;
1603 return strbuf_detach(&sb, NULL);
1604
1605got_nothing:
1606 strbuf_release(&sb);
1607 return NULL;
Nguyễn Thái Ngọc Duy0722c802013-02-03 12:53:27 +07001608}
1609
Nguyễn Thái Ngọc Duyb397ea42013-03-13 18:42:52 +07001610struct grab_1st_switch_cbdata {
Nguyễn Thái Ngọc Duyb397ea42013-03-13 18:42:52 +07001611 struct strbuf buf;
brian m. carlsone86ab2c2017-02-21 23:47:37 +00001612 struct object_id noid;
Nguyễn Thái Ngọc Duyb397ea42013-03-13 18:42:52 +07001613};
1614
brian m. carlson9461d272017-02-21 23:47:32 +00001615static int grab_1st_switch(struct object_id *ooid, struct object_id *noid,
Johannes Schindelindddbad72017-04-26 21:29:31 +02001616 const char *email, timestamp_t timestamp, int tz,
Nguyễn Thái Ngọc Duyb397ea42013-03-13 18:42:52 +07001617 const char *message, void *cb_data)
Lucien Kong83c750a2012-06-05 22:21:24 +02001618{
Nguyễn Thái Ngọc Duyb397ea42013-03-13 18:42:52 +07001619 struct grab_1st_switch_cbdata *cb = cb_data;
1620 const char *target = NULL, *end;
1621
René Scharfec72b49d2015-10-31 18:37:43 +01001622 if (!skip_prefix(message, "checkout: moving from ", &message))
Nguyễn Thái Ngọc Duyb397ea42013-03-13 18:42:52 +07001623 return 0;
Nguyễn Thái Ngọc Duyb397ea42013-03-13 18:42:52 +07001624 target = strstr(message, " to ");
1625 if (!target)
1626 return 0;
1627 target += strlen(" to ");
1628 strbuf_reset(&cb->buf);
brian m. carlsone86ab2c2017-02-21 23:47:37 +00001629 oidcpy(&cb->noid, noid);
René Scharfe904de442015-11-25 15:10:18 +01001630 end = strchrnul(target, '\n');
1631 strbuf_add(&cb->buf, target, end - target);
1632 if (!strcmp(cb->buf.buf, "HEAD")) {
Matthieu Moy0eb85482015-09-27 17:13:42 +02001633 /* HEAD is relative. Resolve it to the right reflog entry. */
René Scharfe904de442015-11-25 15:10:18 +01001634 strbuf_reset(&cb->buf);
brian m. carlson30e677e2018-03-12 02:27:28 +00001635 strbuf_add_unique_abbrev(&cb->buf, noid, DEFAULT_ABBREV);
Matthieu Moy0eb85482015-09-27 17:13:42 +02001636 }
Nguyễn Thái Ngọc Duyb397ea42013-03-13 18:42:52 +07001637 return 1;
1638}
1639
Nguyễn Thái Ngọc Duy78845452018-11-10 06:48:50 +01001640static void wt_status_get_detached_from(struct repository *r,
1641 struct wt_status_state *state)
Nguyễn Thái Ngọc Duyb397ea42013-03-13 18:42:52 +07001642{
1643 struct grab_1st_switch_cbdata cb;
1644 struct commit *commit;
brian m. carlsone86ab2c2017-02-21 23:47:37 +00001645 struct object_id oid;
Nguyễn Thái Ngọc Duyb397ea42013-03-13 18:42:52 +07001646 char *ref = NULL;
1647
1648 strbuf_init(&cb.buf, 0);
1649 if (for_each_reflog_ent_reverse("HEAD", grab_1st_switch, &cb) <= 0) {
1650 strbuf_release(&cb.buf);
1651 return;
1652 }
1653
Jonathan Tanf24c30e2020-09-01 15:28:09 -07001654 if (dwim_ref(cb.buf.buf, cb.buf.len, &oid, &ref, 1) == 1 &&
Martin Ågrenb1f1ade2020-09-27 15:15:41 +02001655 /* oid is a commit? match without further lookup */
Jeff King4a7e27e2018-08-28 17:22:40 -04001656 (oideq(&cb.noid, &oid) ||
Martin Ågrenb1f1ade2020-09-27 15:15:41 +02001657 /* perhaps oid is a tag, try to dereference to a commit */
Nguyễn Thái Ngọc Duy78845452018-11-10 06:48:50 +01001658 ((commit = lookup_commit_reference_gently(r, &oid, 1)) != NULL &&
Jeff King4a7e27e2018-08-28 17:22:40 -04001659 oideq(&cb.noid, &commit->object.oid)))) {
René Scharfec72b49d2015-10-31 18:37:43 +01001660 const char *from = ref;
1661 if (!skip_prefix(from, "refs/tags/", &from))
1662 skip_prefix(from, "refs/remotes/", &from);
1663 state->detached_from = xstrdup(from);
Nguyễn Thái Ngọc Duyb397ea42013-03-13 18:42:52 +07001664 } else
1665 state->detached_from =
brian m. carlsonaab95832018-03-12 02:27:30 +00001666 xstrdup(find_unique_abbrev(&cb.noid, DEFAULT_ABBREV));
brian m. carlson40f55552018-03-12 02:27:29 +00001667 oidcpy(&state->detached_oid, &cb.noid);
brian m. carlsone86ab2c2017-02-21 23:47:37 +00001668 state->detached_at = !get_oid("HEAD", &oid) &&
Jeff King4a7e27e2018-08-28 17:22:40 -04001669 oideq(&oid, &state->detached_oid);
Nguyễn Thái Ngọc Duyb397ea42013-03-13 18:42:52 +07001670
1671 free(ref);
1672 strbuf_release(&cb.buf);
1673}
1674
Nguyễn Thái Ngọc Duy81eff272016-04-22 20:01:31 +07001675int wt_status_check_rebase(const struct worktree *wt,
1676 struct wt_status_state *state)
Nguyễn Thái Ngọc Duyb9691db2013-03-13 18:42:50 +07001677{
Lucien Kong83c750a2012-06-05 22:21:24 +02001678 struct stat st;
1679
Nguyễn Thái Ngọc Duy81eff272016-04-22 20:01:31 +07001680 if (!stat(worktree_git_path(wt, "rebase-apply"), &st)) {
1681 if (!stat(worktree_git_path(wt, "rebase-apply/applying"), &st)) {
Nguyễn Thái Ngọc Duyb9691db2013-03-13 18:42:50 +07001682 state->am_in_progress = 1;
Nguyễn Thái Ngọc Duy81eff272016-04-22 20:01:31 +07001683 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 +07001684 state->am_empty_patch = 1;
Lucien Kong83c750a2012-06-05 22:21:24 +02001685 } else {
Nguyễn Thái Ngọc Duyb9691db2013-03-13 18:42:50 +07001686 state->rebase_in_progress = 1;
Nguyễn Thái Ngọc Duy81eff272016-04-22 20:01:31 +07001687 state->branch = get_branch(wt, "rebase-apply/head-name");
1688 state->onto = get_branch(wt, "rebase-apply/onto");
Lucien Kong83c750a2012-06-05 22:21:24 +02001689 }
Nguyễn Thái Ngọc Duy81eff272016-04-22 20:01:31 +07001690 } else if (!stat(worktree_git_path(wt, "rebase-merge"), &st)) {
1691 if (!stat(worktree_git_path(wt, "rebase-merge/interactive"), &st))
Nguyễn Thái Ngọc Duyb9691db2013-03-13 18:42:50 +07001692 state->rebase_interactive_in_progress = 1;
Lucien Kong83c750a2012-06-05 22:21:24 +02001693 else
Nguyễn Thái Ngọc Duyb9691db2013-03-13 18:42:50 +07001694 state->rebase_in_progress = 1;
Nguyễn Thái Ngọc Duy81eff272016-04-22 20:01:31 +07001695 state->branch = get_branch(wt, "rebase-merge/head-name");
1696 state->onto = get_branch(wt, "rebase-merge/onto");
Nguyễn Thái Ngọc Duybcd522a2016-04-22 20:01:30 +07001697 } else
1698 return 0;
1699 return 1;
1700}
1701
Nguyễn Thái Ngọc Duyf5d067a2016-04-22 20:01:34 +07001702int wt_status_check_bisect(const struct worktree *wt,
1703 struct wt_status_state *state)
1704{
1705 struct stat st;
1706
1707 if (!stat(worktree_git_path(wt, "BISECT_LOG"), &st)) {
1708 state->bisect_in_progress = 1;
1709 state->branch = get_branch(wt, "BISECT_START");
1710 return 1;
1711 }
1712 return 0;
1713}
1714
Elijah Newren051df3c2020-06-18 20:49:57 +00001715static void wt_status_check_sparse_checkout(struct repository *r,
1716 struct wt_status_state *state)
1717{
1718 int skip_worktree = 0;
1719 int i;
1720
1721 if (!core_apply_sparse_checkout || r->index->cache_nr == 0) {
1722 /*
1723 * Don't compute percentage of checked out files if we
1724 * aren't in a sparse checkout or would get division by 0.
1725 */
1726 state->sparse_checkout_percentage = SPARSE_CHECKOUT_DISABLED;
1727 return;
1728 }
1729
Derrick Stoleebf48e5a2021-07-14 13:12:36 +00001730 if (r->index->sparse_index) {
1731 state->sparse_checkout_percentage = SPARSE_CHECKOUT_SPARSE_INDEX;
1732 return;
1733 }
1734
Elijah Newren051df3c2020-06-18 20:49:57 +00001735 for (i = 0; i < r->index->cache_nr; i++) {
1736 struct cache_entry *ce = r->index->cache[i];
1737 if (ce_skip_worktree(ce))
1738 skip_worktree++;
1739 }
1740
1741 state->sparse_checkout_percentage =
1742 100 - (100 * skip_worktree)/r->index->cache_nr;
1743}
1744
Nguyễn Thái Ngọc Duy78845452018-11-10 06:48:50 +01001745void wt_status_get_state(struct repository *r,
1746 struct wt_status_state *state,
Lucien Kong83c750a2012-06-05 22:21:24 +02001747 int get_detached_from)
1748{
1749 struct stat st;
brian m. carlsone86ab2c2017-02-21 23:47:37 +00001750 struct object_id oid;
Phillip Wood4a724862019-04-16 11:18:42 +01001751 enum replay_action action;
Lucien Kong83c750a2012-06-05 22:21:24 +02001752
Nguyễn Thái Ngọc Duy78845452018-11-10 06:48:50 +01001753 if (!stat(git_path_merge_head(r), &st)) {
Johannes Schindelin982288e2018-11-12 15:26:02 -08001754 wt_status_check_rebase(NULL, state);
Lucien Kong83c750a2012-06-05 22:21:24 +02001755 state->merge_in_progress = 1;
Nguyễn Thái Ngọc Duy81eff272016-04-22 20:01:31 +07001756 } else if (wt_status_check_rebase(NULL, state)) {
Nguyễn Thái Ngọc Duybcd522a2016-04-22 20:01:30 +07001757 ; /* all set */
Han-Wen Nienhuysc8e41592020-08-21 16:59:35 +00001758 } else if (refs_ref_exists(get_main_ref_store(r), "CHERRY_PICK_HEAD") &&
1759 !get_oid("CHERRY_PICK_HEAD", &oid)) {
Nguyễn Thái Ngọc Duyb9691db2013-03-13 18:42:50 +07001760 state->cherry_pick_in_progress = 1;
brian m. carlson40f55552018-03-12 02:27:29 +00001761 oidcpy(&state->cherry_pick_head_oid, &oid);
Lucien Kong83c750a2012-06-05 22:21:24 +02001762 }
Nguyễn Thái Ngọc Duyf5d067a2016-04-22 20:01:34 +07001763 wt_status_check_bisect(NULL, state);
Han-Wen Nienhuysb8825ef2020-08-21 16:59:37 +00001764 if (refs_ref_exists(get_main_ref_store(r), "REVERT_HEAD") &&
brian m. carlsone86ab2c2017-02-21 23:47:37 +00001765 !get_oid("REVERT_HEAD", &oid)) {
Matthieu Moydb4ef442013-04-02 16:20:21 +02001766 state->revert_in_progress = 1;
brian m. carlson40f55552018-03-12 02:27:29 +00001767 oidcpy(&state->revert_head_oid, &oid);
Matthieu Moydb4ef442013-04-02 16:20:21 +02001768 }
Phillip Wood4a724862019-04-16 11:18:42 +01001769 if (!sequencer_get_last_command(r, &action)) {
1770 if (action == REPLAY_PICK) {
1771 state->cherry_pick_in_progress = 1;
brian m. carlson14228442021-04-26 01:02:56 +00001772 oidcpy(&state->cherry_pick_head_oid, null_oid());
Phillip Wood4a724862019-04-16 11:18:42 +01001773 } else {
1774 state->revert_in_progress = 1;
brian m. carlson14228442021-04-26 01:02:56 +00001775 oidcpy(&state->revert_head_oid, null_oid());
Phillip Wood4a724862019-04-16 11:18:42 +01001776 }
1777 }
Nguyễn Thái Ngọc Duyb397ea42013-03-13 18:42:52 +07001778 if (get_detached_from)
Nguyễn Thái Ngọc Duy78845452018-11-10 06:48:50 +01001779 wt_status_get_detached_from(r, state);
Elijah Newren051df3c2020-06-18 20:49:57 +00001780 wt_status_check_sparse_checkout(r, state);
Nguyễn Thái Ngọc Duyb9691db2013-03-13 18:42:50 +07001781}
1782
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001783static void wt_longstatus_print_state(struct wt_status *s)
Lucien Kong83c750a2012-06-05 22:21:24 +02001784{
1785 const char *state_color = color(WT_STATUS_HEADER, s);
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001786 struct wt_status_state *state = &s->state;
1787
Johannes Schindelin982288e2018-11-12 15:26:02 -08001788 if (state->merge_in_progress) {
1789 if (state->rebase_interactive_in_progress) {
1790 show_rebase_information(s, state_color);
1791 fputs("\n", s->fp);
1792 }
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001793 show_merge_in_progress(s, state_color);
Johannes Schindelin982288e2018-11-12 15:26:02 -08001794 } else if (state->am_in_progress)
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001795 show_am_in_progress(s, state_color);
Nguyễn Thái Ngọc Duy3b691cc2013-03-13 18:42:51 +07001796 else if (state->rebase_in_progress || state->rebase_interactive_in_progress)
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001797 show_rebase_in_progress(s, state_color);
Nguyễn Thái Ngọc Duy3b691cc2013-03-13 18:42:51 +07001798 else if (state->cherry_pick_in_progress)
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001799 show_cherry_pick_in_progress(s, state_color);
Matthieu Moydb4ef442013-04-02 16:20:21 +02001800 else if (state->revert_in_progress)
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001801 show_revert_in_progress(s, state_color);
Nguyễn Thái Ngọc Duy3b691cc2013-03-13 18:42:51 +07001802 if (state->bisect_in_progress)
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001803 show_bisect_in_progress(s, state_color);
Elijah Newren051df3c2020-06-18 20:49:57 +00001804
1805 if (state->sparse_checkout_percentage != SPARSE_CHECKOUT_DISABLED)
1806 show_sparse_checkout_in_use(s, state_color);
Lucien Kong83c750a2012-06-05 22:21:24 +02001807}
1808
Jeff Hostetlerbe7e7952016-08-05 18:00:27 -04001809static void wt_longstatus_print(struct wt_status *s)
Jeff Kingc91f0d92006-09-08 04:05:34 -04001810{
Aleksi Aalto1d282322010-11-18 01:40:05 +02001811 const char *branch_color = color(WT_STATUS_ONBRANCH, s);
1812 const char *branch_status_color = color(WT_STATUS_HEADER, s);
Jürgen Rühle98bf8a42007-01-02 20:26:23 +01001813
Junio C Hamanobda324c2007-01-03 01:09:34 -08001814 if (s->branch) {
Ævar Arnfjörð Bjarmason355ec7a2011-02-22 23:42:13 +00001815 const char *on_what = _("On branch ");
Junio C Hamanobda324c2007-01-03 01:09:34 -08001816 const char *branch_name = s->branch;
René Scharfec72b49d2015-10-31 18:37:43 +01001817 if (!strcmp(branch_name, "HEAD")) {
Aleksi Aalto1d282322010-11-18 01:40:05 +02001818 branch_status_color = color(WT_STATUS_NOBRANCH, s);
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001819 if (s->state.rebase_in_progress ||
1820 s->state.rebase_interactive_in_progress) {
1821 if (s->state.rebase_interactive_in_progress)
Guillaume Pagèsdf25e942015-06-30 15:01:13 +02001822 on_what = _("interactive rebase in progress; onto ");
1823 else
1824 on_what = _("rebase in progress; onto ");
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001825 branch_name = s->state.onto;
1826 } else if (s->state.detached_from) {
1827 branch_name = s->state.detached_from;
1828 if (s->state.detached_at)
Ævar Arnfjörð Bjarmason2708ce62021-01-07 10:51:52 +01001829 on_what = _("HEAD detached at ");
Nguyễn Thái Ngọc Duyb397ea42013-03-13 18:42:52 +07001830 else
Ævar Arnfjörð Bjarmason2708ce62021-01-07 10:51:52 +01001831 on_what = _("HEAD detached from ");
Nguyễn Thái Ngọc Duyb397ea42013-03-13 18:42:52 +07001832 } else {
1833 branch_name = "";
1834 on_what = _("Not currently on any branch.");
1835 }
René Scharfec72b49d2015-10-31 18:37:43 +01001836 } else
1837 skip_prefix(branch_name, "refs/heads/", &branch_name);
Felipe Contreras7d7d6802014-05-04 01:12:55 -05001838 status_printf(s, color(WT_STATUS_HEADER, s), "%s", "");
Jonathan Niederb926c0d2011-02-25 23:11:37 -06001839 status_printf_more(s, branch_status_color, "%s", on_what);
1840 status_printf_more(s, branch_color, "%s\n", branch_name);
Junio C Hamanob6975ab2008-07-02 00:52:16 -07001841 if (!s->is_initial)
Jeff Hostetler957a0fe2016-08-05 18:00:26 -04001842 wt_longstatus_print_tracking(s);
Junio C Hamanobda324c2007-01-03 01:09:34 -08001843 }
Jeff Kingc91f0d92006-09-08 04:05:34 -04001844
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001845 wt_longstatus_print_state(s);
Nguyễn Thái Ngọc Duy3b691cc2013-03-13 18:42:51 +07001846
Jeff Kingc91f0d92006-09-08 04:05:34 -04001847 if (s->is_initial) {
Felipe Contreras7d7d6802014-05-04 01:12:55 -05001848 status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", "");
Kaartic Sivaraam4ddb1352017-06-21 23:46:14 +05301849 status_printf_ln(s, color(WT_STATUS_HEADER, s),
1850 s->commit_template
1851 ? _("Initial commit")
1852 : _("No commits yet"));
Felipe Contreras7d7d6802014-05-04 01:12:55 -05001853 status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", "");
Jeff Kingc91f0d92006-09-08 04:05:34 -04001854 }
1855
Jeff Hostetler957a0fe2016-08-05 18:00:26 -04001856 wt_longstatus_print_updated(s);
1857 wt_longstatus_print_unmerged(s);
1858 wt_longstatus_print_changed(s);
Jens Lehmann46a958b2010-06-25 16:56:47 +02001859 if (s->submodule_summary &&
1860 (!s->ignore_submodule_arg ||
1861 strcmp(s->ignore_submodule_arg, "all"))) {
Jeff Hostetler957a0fe2016-08-05 18:00:26 -04001862 wt_longstatus_print_submodule_summary(s, 0); /* staged */
1863 wt_longstatus_print_submodule_summary(s, 1); /* unstaged */
Jens Lehmannf17a5d32010-01-17 20:42:31 +01001864 }
Junio C Hamano2381e392010-04-10 00:33:17 -07001865 if (s->show_untracked_files) {
Jeff Hostetler957a0fe2016-08-05 18:00:26 -04001866 wt_longstatus_print_other(s, &s->untracked, _("Untracked files"), "add");
Jameson Millereec0f7f2017-10-30 13:21:37 -04001867 if (s->show_ignored_mode)
Jeff Hostetler957a0fe2016-08-05 18:00:26 -04001868 wt_longstatus_print_other(s, &s->ignored, _("Ignored files"), "add -f");
Ben Boeckeled9bff02021-08-23 12:44:00 +02001869 if (advice_enabled(ADVICE_STATUS_U_OPTION) && 2000 < s->untracked_in_ms) {
Felipe Contreras7d7d6802014-05-04 01:12:55 -05001870 status_printf_ln(s, GIT_COLOR_NORMAL, "%s", "");
Nguyễn Thái Ngọc Duy6a38ef22013-03-13 19:59:16 +07001871 status_printf_ln(s, GIT_COLOR_NORMAL,
Jiang Xin62901172013-04-12 11:53:01 +08001872 _("It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1873 "may speed it up, but you have to be careful not to forget to add\n"
1874 "new files yourself (see 'git help status')."),
1875 s->untracked_in_ms / 1000.0);
Nguyễn Thái Ngọc Duy6a38ef22013-03-13 19:59:16 +07001876 }
Stephen P. Smith6fa90192018-09-05 17:53:27 -07001877 } else if (s->committable)
Ævar Arnfjörð Bjarmason355ec7a2011-02-22 23:42:13 +00001878 status_printf_ln(s, GIT_COLOR_NORMAL, _("Untracked files not listed%s"),
Matthieu Moy6a964f52013-09-12 12:50:05 +02001879 s->hints
Ævar Arnfjörð Bjarmason355ec7a2011-02-22 23:42:13 +00001880 ? _(" (use -u option to show untracked files)") : "");
Jeff Kingc91f0d92006-09-08 04:05:34 -04001881
Jeff King1324fb62008-11-12 03:23:37 -05001882 if (s->verbose)
Jeff Hostetler957a0fe2016-08-05 18:00:26 -04001883 wt_longstatus_print_verbose(s);
Stephen P. Smith6fa90192018-09-05 17:53:27 -07001884 if (!s->committable) {
Jürgen Rühle6e458bf2007-01-02 20:26:22 +01001885 if (s->amend)
Ævar Arnfjörð Bjarmason355ec7a2011-02-22 23:42:13 +00001886 status_printf_ln(s, GIT_COLOR_NORMAL, _("No changes"));
Junio C Hamano37d07f82007-12-12 19:09:16 -08001887 else if (s->nowarn)
1888 ; /* nothing */
Nguyễn Thái Ngọc Duy50bd8b72012-09-06 22:16:50 +07001889 else if (s->workdir_dirty) {
Matthieu Moy6a964f52013-09-12 12:50:05 +02001890 if (s->hints)
Martin Ågren8f7e3de2020-09-27 15:15:42 +02001891 fprintf(s->fp, _("no changes added to commit "
1892 "(use \"git add\" and/or "
1893 "\"git commit -a\")\n"));
Nguyễn Thái Ngọc Duy50bd8b72012-09-06 22:16:50 +07001894 else
Martin Ågren8f7e3de2020-09-27 15:15:42 +02001895 fprintf(s->fp, _("no changes added to "
1896 "commit\n"));
Nguyễn Thái Ngọc Duy50bd8b72012-09-06 22:16:50 +07001897 } else if (s->untracked.nr) {
Matthieu Moy6a964f52013-09-12 12:50:05 +02001898 if (s->hints)
Martin Ågren8f7e3de2020-09-27 15:15:42 +02001899 fprintf(s->fp, _("nothing added to commit but "
1900 "untracked files present (use "
1901 "\"git add\" to track)\n"));
Nguyễn Thái Ngọc Duy50bd8b72012-09-06 22:16:50 +07001902 else
Martin Ågren8f7e3de2020-09-27 15:15:42 +02001903 fprintf(s->fp, _("nothing added to commit but "
1904 "untracked files present\n"));
Nguyễn Thái Ngọc Duy50bd8b72012-09-06 22:16:50 +07001905 } else if (s->is_initial) {
Matthieu Moy6a964f52013-09-12 12:50:05 +02001906 if (s->hints)
Martin Ågren8f7e3de2020-09-27 15:15:42 +02001907 fprintf(s->fp, _("nothing to commit (create/"
1908 "copy files and use \"git "
1909 "add\" to track)\n"));
Nguyễn Thái Ngọc Duy50bd8b72012-09-06 22:16:50 +07001910 else
Martin Ågren8f7e3de2020-09-27 15:15:42 +02001911 fprintf(s->fp, _("nothing to commit\n"));
Nguyễn Thái Ngọc Duy50bd8b72012-09-06 22:16:50 +07001912 } else if (!s->show_untracked_files) {
Matthieu Moy6a964f52013-09-12 12:50:05 +02001913 if (s->hints)
Martin Ågren8f7e3de2020-09-27 15:15:42 +02001914 fprintf(s->fp, _("nothing to commit (use -u to "
1915 "show untracked files)\n"));
Nguyễn Thái Ngọc Duy50bd8b72012-09-06 22:16:50 +07001916 else
Martin Ågren8f7e3de2020-09-27 15:15:42 +02001917 fprintf(s->fp, _("nothing to commit\n"));
Nguyễn Thái Ngọc Duy50bd8b72012-09-06 22:16:50 +07001918 } else
Martin Ågren8f7e3de2020-09-27 15:15:42 +02001919 fprintf(s->fp, _("nothing to commit, working tree "
1920 "clean\n"));
Jürgen Rühle6e458bf2007-01-02 20:26:22 +01001921 }
Liam Beguinc1b5d012017-06-17 18:30:51 -04001922 if(s->show_stash)
1923 wt_longstatus_print_stash_summary(s);
Jeff Kingc91f0d92006-09-08 04:05:34 -04001924}
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01001925
Jeff King3207a3a2012-05-07 15:44:44 -04001926static void wt_shortstatus_unmerged(struct string_list_item *it,
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01001927 struct wt_status *s)
1928{
1929 struct wt_status_change_data *d = it->util;
1930 const char *how = "??";
1931
1932 switch (d->stagemask) {
1933 case 1: how = "DD"; break; /* both deleted */
1934 case 2: how = "AU"; break; /* added by us */
1935 case 3: how = "UD"; break; /* deleted by them */
1936 case 4: how = "UA"; break; /* added by them */
1937 case 5: how = "DU"; break; /* deleted by us */
1938 case 6: how = "AA"; break; /* both added */
1939 case 7: how = "UU"; break; /* both modified */
1940 }
Michael J Gruber3fe2a892009-12-05 16:04:38 +01001941 color_fprintf(s->fp, color(WT_STATUS_UNMERGED, s), "%s", how);
Jeff King3207a3a2012-05-07 15:44:44 -04001942 if (s->null_termination) {
Martin Ågren8f7e3de2020-09-27 15:15:42 +02001943 fprintf(s->fp, " %s%c", it->string, 0);
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01001944 } else {
1945 struct strbuf onebuf = STRBUF_INIT;
1946 const char *one;
Junio C Hamanoa361dd32020-09-10 10:01:57 -07001947 one = quote_path(it->string, s->prefix, &onebuf, QUOTE_PATH_QUOTE_SP);
Martin Ågren8f7e3de2020-09-27 15:15:42 +02001948 fprintf(s->fp, " %s\n", one);
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01001949 strbuf_release(&onebuf);
1950 }
1951}
1952
Jeff King3207a3a2012-05-07 15:44:44 -04001953static void wt_shortstatus_status(struct string_list_item *it,
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01001954 struct wt_status *s)
1955{
1956 struct wt_status_change_data *d = it->util;
1957
Michael J Gruber3fe2a892009-12-05 16:04:38 +01001958 if (d->index_status)
1959 color_fprintf(s->fp, color(WT_STATUS_UPDATED, s), "%c", d->index_status);
1960 else
Martin Ågren8f7e3de2020-09-27 15:15:42 +02001961 fputc(' ', s->fp);
Michael J Gruber3fe2a892009-12-05 16:04:38 +01001962 if (d->worktree_status)
1963 color_fprintf(s->fp, color(WT_STATUS_CHANGED, s), "%c", d->worktree_status);
1964 else
Martin Ågren8f7e3de2020-09-27 15:15:42 +02001965 fputc(' ', s->fp);
1966 fputc(' ', s->fp);
Jeff King3207a3a2012-05-07 15:44:44 -04001967 if (s->null_termination) {
Martin Ågren8f7e3de2020-09-27 15:15:42 +02001968 fprintf(s->fp, "%s%c", it->string, 0);
Nguyễn Thái Ngọc Duy5134ccd2017-12-27 17:18:38 +07001969 if (d->rename_source)
Martin Ågren8f7e3de2020-09-27 15:15:42 +02001970 fprintf(s->fp, "%s%c", d->rename_source, 0);
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01001971 } else {
1972 struct strbuf onebuf = STRBUF_INIT;
1973 const char *one;
Nguyễn Thái Ngọc Duy5134ccd2017-12-27 17:18:38 +07001974
1975 if (d->rename_source) {
Junio C Hamanof3fc4a12020-09-10 10:01:55 -07001976 one = quote_path(d->rename_source, s->prefix, &onebuf,
1977 QUOTE_PATH_QUOTE_SP);
Martin Ågren8f7e3de2020-09-27 15:15:42 +02001978 fprintf(s->fp, "%s -> ", one);
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01001979 strbuf_release(&onebuf);
1980 }
Junio C Hamanof3fc4a12020-09-10 10:01:55 -07001981 one = quote_path(it->string, s->prefix, &onebuf, QUOTE_PATH_QUOTE_SP);
Martin Ågren8f7e3de2020-09-27 15:15:42 +02001982 fprintf(s->fp, "%s\n", one);
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01001983 strbuf_release(&onebuf);
1984 }
1985}
1986
Jeff King3207a3a2012-05-07 15:44:44 -04001987static void wt_shortstatus_other(struct string_list_item *it,
Junio C Hamano2381e392010-04-10 00:33:17 -07001988 struct wt_status *s, const char *sign)
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01001989{
Jeff King3207a3a2012-05-07 15:44:44 -04001990 if (s->null_termination) {
Martin Ågren8f7e3de2020-09-27 15:15:42 +02001991 fprintf(s->fp, "%s %s%c", sign, it->string, 0);
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01001992 } else {
1993 struct strbuf onebuf = STRBUF_INIT;
1994 const char *one;
Junio C Hamanoa361dd32020-09-10 10:01:57 -07001995 one = quote_path(it->string, s->prefix, &onebuf, QUOTE_PATH_QUOTE_SP);
Junio C Hamanoc1909e72010-05-01 22:05:14 -07001996 color_fprintf(s->fp, color(WT_STATUS_UNTRACKED, s), "%s", sign);
Martin Ågren8f7e3de2020-09-27 15:15:42 +02001997 fprintf(s->fp, " %s\n", one);
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01001998 strbuf_release(&onebuf);
1999 }
2000}
2001
Daniel Knittl-Frank05a59a02010-05-25 15:45:51 +02002002static void wt_shortstatus_print_tracking(struct wt_status *s)
2003{
2004 struct branch *branch;
2005 const char *header_color = color(WT_STATUS_HEADER, s);
2006 const char *branch_color_local = color(WT_STATUS_LOCAL_BRANCH, s);
2007 const char *branch_color_remote = color(WT_STATUS_REMOTE_BRANCH, s);
2008
2009 const char *base;
René Scharfe5e8d2722017-07-08 12:51:01 +02002010 char *short_base;
Daniel Knittl-Frank05a59a02010-05-25 15:45:51 +02002011 const char *branch_name;
Jeff Hostetler3ca18972018-01-09 18:50:17 +00002012 int num_ours, num_theirs, sti;
Jiang Xinf2e08732013-08-26 15:02:48 +08002013 int upstream_is_gone = 0;
Daniel Knittl-Frank05a59a02010-05-25 15:45:51 +02002014
2015 color_fprintf(s->fp, color(WT_STATUS_HEADER, s), "## ");
2016
2017 if (!s->branch)
2018 return;
2019 branch_name = s->branch;
2020
Michael J Gruberb9e2bc52017-03-14 17:02:02 +01002021#define LABEL(string) (s->no_gettext ? (string) : _(string))
2022
Daniel Knittl-Frank05a59a02010-05-25 15:45:51 +02002023 if (s->is_initial)
Kaartic Sivaraam4ddb1352017-06-21 23:46:14 +05302024 color_fprintf(s->fp, header_color, LABEL(N_("No commits yet on ")));
Jiang Xinf2e08732013-08-26 15:02:48 +08002025
René Scharfebaf0a3e2015-10-31 18:36:35 +01002026 if (!strcmp(s->branch, "HEAD")) {
2027 color_fprintf(s->fp, color(WT_STATUS_NOBRANCH, s), "%s",
Michael J Gruberb9e2bc52017-03-14 17:02:02 +01002028 LABEL(N_("HEAD (no branch)")));
René Scharfebaf0a3e2015-10-31 18:36:35 +01002029 goto conclude;
2030 }
2031
René Scharfec72b49d2015-10-31 18:37:43 +01002032 skip_prefix(branch_name, "refs/heads/", &branch_name);
René Scharfebaf0a3e2015-10-31 18:36:35 +01002033
René Scharfe8d8325f2015-10-31 18:37:12 +01002034 branch = branch_get(branch_name);
René Scharfebaf0a3e2015-10-31 18:36:35 +01002035
Jiang Xinf2e08732013-08-26 15:02:48 +08002036 color_fprintf(s->fp, branch_color_local, "%s", branch_name);
2037
Jeff Hostetler3ca18972018-01-09 18:50:17 +00002038 sti = stat_tracking_info(branch, &num_ours, &num_theirs, &base,
Damien Robertc646d092019-04-16 14:16:46 +02002039 0, s->ahead_behind_flags);
Jeff Hostetler3ca18972018-01-09 18:50:17 +00002040 if (sti < 0) {
René Scharfebcf8cc22015-10-31 18:36:01 +01002041 if (!base)
2042 goto conclude;
Jeff King979cb242015-05-21 20:49:11 -04002043
Jiang Xinf2e08732013-08-26 15:02:48 +08002044 upstream_is_gone = 1;
Daniel Knittl-Frank05a59a02010-05-25 15:45:51 +02002045 }
2046
René Scharfe5e8d2722017-07-08 12:51:01 +02002047 short_base = shorten_unambiguous_ref(base, 0);
Daniel Knittl-Frank05a59a02010-05-25 15:45:51 +02002048 color_fprintf(s->fp, header_color, "...");
René Scharfe5e8d2722017-07-08 12:51:01 +02002049 color_fprintf(s->fp, branch_color_remote, "%s", short_base);
2050 free(short_base);
Daniel Knittl-Frank05a59a02010-05-25 15:45:51 +02002051
Jeff Hostetler3ca18972018-01-09 18:50:17 +00002052 if (!upstream_is_gone && !sti)
René Scharfebcf8cc22015-10-31 18:36:01 +01002053 goto conclude;
Jiang Xinf2234592013-08-26 15:02:49 +08002054
Daniel Knittl-Frank05a59a02010-05-25 15:45:51 +02002055 color_fprintf(s->fp, header_color, " [");
Jiang Xinf2e08732013-08-26 15:02:48 +08002056 if (upstream_is_gone) {
Matthieu Moy7a76c282014-03-20 13:12:41 +01002057 color_fprintf(s->fp, header_color, LABEL(N_("gone")));
Jeff Hostetler3ca18972018-01-09 18:50:17 +00002058 } else if (s->ahead_behind_flags == AHEAD_BEHIND_QUICK) {
2059 color_fprintf(s->fp, header_color, LABEL(N_("different")));
Jiang Xinf2e08732013-08-26 15:02:48 +08002060 } else if (!num_ours) {
Matthieu Moy7a76c282014-03-20 13:12:41 +01002061 color_fprintf(s->fp, header_color, LABEL(N_("behind ")));
Daniel Knittl-Frank05a59a02010-05-25 15:45:51 +02002062 color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
2063 } else if (!num_theirs) {
Michael J Gruberdf227242016-03-14 16:30:33 +01002064 color_fprintf(s->fp, header_color, LABEL(N_("ahead ")));
Daniel Knittl-Frank05a59a02010-05-25 15:45:51 +02002065 color_fprintf(s->fp, branch_color_local, "%d", num_ours);
2066 } else {
Michael J Gruberdf227242016-03-14 16:30:33 +01002067 color_fprintf(s->fp, header_color, LABEL(N_("ahead ")));
Daniel Knittl-Frank05a59a02010-05-25 15:45:51 +02002068 color_fprintf(s->fp, branch_color_local, "%d", num_ours);
Matthieu Moy7a76c282014-03-20 13:12:41 +01002069 color_fprintf(s->fp, header_color, ", %s", LABEL(N_("behind ")));
Daniel Knittl-Frank05a59a02010-05-25 15:45:51 +02002070 color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
2071 }
2072
Jeff Kinga5985232012-05-07 17:02:18 -04002073 color_fprintf(s->fp, header_color, "]");
René Scharfebcf8cc22015-10-31 18:36:01 +01002074 conclude:
Jeff Kinga5985232012-05-07 17:02:18 -04002075 fputc(s->null_termination ? '\0' : '\n', s->fp);
Daniel Knittl-Frank05a59a02010-05-25 15:45:51 +02002076}
2077
Jeff Hostetlerbe7e7952016-08-05 18:00:27 -04002078static void wt_shortstatus_print(struct wt_status *s)
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01002079{
Stefan Bellerd4aae452017-03-16 14:36:19 -07002080 struct string_list_item *it;
Daniel Knittl-Frank05a59a02010-05-25 15:45:51 +02002081
Jeff Kingd4a6bf12012-05-07 17:09:04 -04002082 if (s->show_branch)
Daniel Knittl-Frank05a59a02010-05-25 15:45:51 +02002083 wt_shortstatus_print_tracking(s);
2084
Stefan Bellerd4aae452017-03-16 14:36:19 -07002085 for_each_string_list_item(it, &s->change) {
2086 struct wt_status_change_data *d = it->util;
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01002087
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01002088 if (d->stagemask)
Jeff King3207a3a2012-05-07 15:44:44 -04002089 wt_shortstatus_unmerged(it, s);
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01002090 else
Jeff King3207a3a2012-05-07 15:44:44 -04002091 wt_shortstatus_status(it, s);
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01002092 }
Stefan Bellerd4aae452017-03-16 14:36:19 -07002093 for_each_string_list_item(it, &s->untracked)
Jeff King3207a3a2012-05-07 15:44:44 -04002094 wt_shortstatus_other(it, s, "??");
Junio C Hamano2381e392010-04-10 00:33:17 -07002095
Stefan Bellerd4aae452017-03-16 14:36:19 -07002096 for_each_string_list_item(it, &s->ignored)
Jeff King3207a3a2012-05-07 15:44:44 -04002097 wt_shortstatus_other(it, s, "!!");
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01002098}
Jeff King4a7cc2f2009-12-07 00:17:15 -05002099
Jeff Hostetlerbe7e7952016-08-05 18:00:27 -04002100static void wt_porcelain_print(struct wt_status *s)
Jeff King4a7cc2f2009-12-07 00:17:15 -05002101{
2102 s->use_color = 0;
Jeff King86617682009-12-07 00:26:25 -05002103 s->relative_paths = 0;
2104 s->prefix = NULL;
Matthieu Moy7a76c282014-03-20 13:12:41 +01002105 s->no_gettext = 1;
Jeff Kingd4a6bf12012-05-07 17:09:04 -04002106 wt_shortstatus_print(s);
Jeff King4a7cc2f2009-12-07 00:17:15 -05002107}
Jeff Hostetlerbe7e7952016-08-05 18:00:27 -04002108
Jeff Hostetler24959ba2016-08-11 10:45:58 -04002109/*
Jeff Hostetlerd9fc7462016-08-11 10:45:59 -04002110 * Print branch information for porcelain v2 output. These lines
2111 * are printed when the '--branch' parameter is given.
2112 *
2113 * # branch.oid <commit><eol>
2114 * # branch.head <head><eol>
2115 * [# branch.upstream <upstream><eol>
2116 * [# branch.ab +<ahead> -<behind><eol>]]
2117 *
Elijah Newren6d12b532020-07-28 20:45:38 +00002118 * <commit> ::= the current commit hash or the literal
Jeff Hostetlerd9fc7462016-08-11 10:45:59 -04002119 * "(initial)" to indicate an initialized repo
2120 * with no commits.
2121 *
2122 * <head> ::= <branch_name> the current branch name or
2123 * "(detached)" literal when detached head or
2124 * "(unknown)" when something is wrong.
2125 *
2126 * <upstream> ::= the upstream branch name, when set.
2127 *
Jeff Hostetlerfd9b5442018-01-09 18:50:16 +00002128 * <ahead> ::= integer ahead value or '?'.
Jeff Hostetlerd9fc7462016-08-11 10:45:59 -04002129 *
Jeff Hostetlerfd9b5442018-01-09 18:50:16 +00002130 * <behind> ::= integer behind value or '?'.
Jeff Hostetlerd9fc7462016-08-11 10:45:59 -04002131 *
2132 * The end-of-line is defined by the -z flag.
2133 *
2134 * <eol> ::= NUL when -z,
2135 * LF when NOT -z.
2136 *
Jeff Hostetlerfd9b5442018-01-09 18:50:16 +00002137 * When an upstream is set and present, the 'branch.ab' line will
2138 * be printed with the ahead/behind counts for the branch and the
2139 * upstream. When AHEAD_BEHIND_QUICK is requested and the branches
2140 * are different, '?' will be substituted for the actual count.
Jeff Hostetlerd9fc7462016-08-11 10:45:59 -04002141 */
2142static void wt_porcelain_v2_print_tracking(struct wt_status *s)
2143{
2144 struct branch *branch;
2145 const char *base;
2146 const char *branch_name;
Jeff Hostetlerd9fc7462016-08-11 10:45:59 -04002147 int ab_info, nr_ahead, nr_behind;
2148 char eol = s->null_termination ? '\0' : '\n';
2149
Jeff Hostetlerd9fc7462016-08-11 10:45:59 -04002150 fprintf(s->fp, "# branch.oid %s%c",
brian m. carlsone0cb7cd2019-08-18 20:04:21 +00002151 (s->is_initial ? "(initial)" : oid_to_hex(&s->oid_commit)),
Jeff Hostetlerd9fc7462016-08-11 10:45:59 -04002152 eol);
2153
2154 if (!s->branch)
2155 fprintf(s->fp, "# branch.head %s%c", "(unknown)", eol);
2156 else {
2157 if (!strcmp(s->branch, "HEAD")) {
2158 fprintf(s->fp, "# branch.head %s%c", "(detached)", eol);
2159
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07002160 if (s->state.rebase_in_progress ||
2161 s->state.rebase_interactive_in_progress)
2162 branch_name = s->state.onto;
2163 else if (s->state.detached_from)
2164 branch_name = s->state.detached_from;
Jeff Hostetlerd9fc7462016-08-11 10:45:59 -04002165 else
2166 branch_name = "";
2167 } else {
2168 branch_name = NULL;
2169 skip_prefix(s->branch, "refs/heads/", &branch_name);
2170
2171 fprintf(s->fp, "# branch.head %s%c", branch_name, eol);
2172 }
2173
2174 /* Lookup stats on the upstream tracking branch, if set. */
2175 branch = branch_get(branch_name);
2176 base = NULL;
Jeff Hostetlerfd9b5442018-01-09 18:50:16 +00002177 ab_info = stat_tracking_info(branch, &nr_ahead, &nr_behind,
Damien Robertc646d092019-04-16 14:16:46 +02002178 &base, 0, s->ahead_behind_flags);
Jeff Hostetlerd9fc7462016-08-11 10:45:59 -04002179 if (base) {
2180 base = shorten_unambiguous_ref(base, 0);
2181 fprintf(s->fp, "# branch.upstream %s%c", base, eol);
2182 free((char *)base);
2183
Jeff Hostetlerfd9b5442018-01-09 18:50:16 +00002184 if (ab_info > 0) {
2185 /* different */
2186 if (nr_ahead || nr_behind)
2187 fprintf(s->fp, "# branch.ab +%d -%d%c",
2188 nr_ahead, nr_behind, eol);
2189 else
2190 fprintf(s->fp, "# branch.ab +? -?%c",
2191 eol);
2192 } else if (!ab_info) {
2193 /* same */
2194 fprintf(s->fp, "# branch.ab +0 -0%c", eol);
2195 }
Jeff Hostetlerd9fc7462016-08-11 10:45:59 -04002196 }
2197 }
Jeff Hostetlerd9fc7462016-08-11 10:45:59 -04002198}
2199
2200/*
Øystein Walle2e59e782021-10-22 00:25:32 +02002201 * Print the stash count in a porcelain-friendly format
2202 */
2203static void wt_porcelain_v2_print_stash(struct wt_status *s)
2204{
2205 int stash_count = count_stash_entries();
2206 char eol = s->null_termination ? '\0' : '\n';
2207
2208 if (stash_count > 0)
2209 fprintf(s->fp, "# stash %d%c", stash_count, eol);
2210}
2211
2212/*
Jeff Hostetler24959ba2016-08-11 10:45:58 -04002213 * Convert various submodule status values into a
2214 * fixed-length string of characters in the buffer provided.
2215 */
2216static void wt_porcelain_v2_submodule_state(
2217 struct wt_status_change_data *d,
2218 char sub[5])
2219{
2220 if (S_ISGITLINK(d->mode_head) ||
2221 S_ISGITLINK(d->mode_index) ||
2222 S_ISGITLINK(d->mode_worktree)) {
2223 sub[0] = 'S';
2224 sub[1] = d->new_submodule_commits ? 'C' : '.';
2225 sub[2] = (d->dirty_submodule & DIRTY_SUBMODULE_MODIFIED) ? 'M' : '.';
2226 sub[3] = (d->dirty_submodule & DIRTY_SUBMODULE_UNTRACKED) ? 'U' : '.';
2227 } else {
2228 sub[0] = 'N';
2229 sub[1] = '.';
2230 sub[2] = '.';
2231 sub[3] = '.';
2232 }
2233 sub[4] = 0;
2234}
2235
2236/*
2237 * Fix-up changed entries before we print them.
2238 */
Jeff King13a17812019-05-09 17:30:19 -04002239static void wt_porcelain_v2_fix_up_changed(struct string_list_item *it)
Jeff Hostetler24959ba2016-08-11 10:45:58 -04002240{
2241 struct wt_status_change_data *d = it->util;
2242
2243 if (!d->index_status) {
2244 /*
2245 * This entry is unchanged in the index (relative to the head).
2246 * Therefore, the collect_updated_cb was never called for this
2247 * entry (during the head-vs-index scan) and so the head column
2248 * fields were never set.
2249 *
2250 * We must have data for the index column (from the
2251 * index-vs-worktree scan (otherwise, this entry should not be
2252 * in the list of changes)).
2253 *
2254 * Copy index column fields to the head column, so that our
2255 * output looks complete.
2256 */
2257 assert(d->mode_head == 0);
2258 d->mode_head = d->mode_index;
2259 oidcpy(&d->oid_head, &d->oid_index);
2260 }
2261
2262 if (!d->worktree_status) {
2263 /*
2264 * This entry is unchanged in the worktree (relative to the index).
2265 * Therefore, the collect_changed_cb was never called for this entry
2266 * (during the index-vs-worktree scan) and so the worktree column
2267 * fields were never set.
2268 *
2269 * We must have data for the index column (from the head-vs-index
2270 * scan).
2271 *
2272 * Copy the index column fields to the worktree column so that
2273 * our output looks complete.
2274 *
2275 * Note that we only have a mode field in the worktree column
2276 * because the scan code tries really hard to not have to compute it.
2277 */
2278 assert(d->mode_worktree == 0);
2279 d->mode_worktree = d->mode_index;
2280 }
2281}
2282
2283/*
2284 * Print porcelain v2 info for tracked entries with changes.
2285 */
2286static void wt_porcelain_v2_print_changed_entry(
2287 struct string_list_item *it,
2288 struct wt_status *s)
2289{
2290 struct wt_status_change_data *d = it->util;
Nguyễn Thái Ngọc Duy5134ccd2017-12-27 17:18:38 +07002291 struct strbuf buf = STRBUF_INIT;
2292 struct strbuf buf_from = STRBUF_INIT;
2293 const char *path = NULL;
2294 const char *path_from = NULL;
Jeff Hostetler24959ba2016-08-11 10:45:58 -04002295 char key[3];
2296 char submodule_token[5];
2297 char sep_char, eol_char;
2298
Jeff King13a17812019-05-09 17:30:19 -04002299 wt_porcelain_v2_fix_up_changed(it);
Jeff Hostetler24959ba2016-08-11 10:45:58 -04002300 wt_porcelain_v2_submodule_state(d, submodule_token);
2301
2302 key[0] = d->index_status ? d->index_status : '.';
2303 key[1] = d->worktree_status ? d->worktree_status : '.';
2304 key[2] = 0;
2305
2306 if (s->null_termination) {
2307 /*
2308 * In -z mode, we DO NOT C-quote pathnames. Current path is ALWAYS first.
2309 * A single NUL character separates them.
2310 */
2311 sep_char = '\0';
2312 eol_char = '\0';
Nguyễn Thái Ngọc Duy5134ccd2017-12-27 17:18:38 +07002313 path = it->string;
2314 path_from = d->rename_source;
Jeff Hostetler24959ba2016-08-11 10:45:58 -04002315 } else {
2316 /*
2317 * Path(s) are C-quoted if necessary. Current path is ALWAYS first.
2318 * The source path is only present when necessary.
2319 * A single TAB separates them (because paths can contain spaces
2320 * which are not escaped and C-quoting does escape TAB characters).
2321 */
2322 sep_char = '\t';
2323 eol_char = '\n';
Junio C Hamano88910c92020-09-10 10:01:54 -07002324 path = quote_path(it->string, s->prefix, &buf, 0);
Nguyễn Thái Ngọc Duy5134ccd2017-12-27 17:18:38 +07002325 if (d->rename_source)
Junio C Hamano88910c92020-09-10 10:01:54 -07002326 path_from = quote_path(d->rename_source, s->prefix, &buf_from, 0);
Jeff Hostetler24959ba2016-08-11 10:45:58 -04002327 }
2328
Nguyễn Thái Ngọc Duy5134ccd2017-12-27 17:18:38 +07002329 if (path_from)
Jeff Hostetler24959ba2016-08-11 10:45:58 -04002330 fprintf(s->fp, "2 %s %s %06o %06o %06o %s %s %c%d %s%c%s%c",
2331 key, submodule_token,
2332 d->mode_head, d->mode_index, d->mode_worktree,
2333 oid_to_hex(&d->oid_head), oid_to_hex(&d->oid_index),
Nguyễn Thái Ngọc Duy5134ccd2017-12-27 17:18:38 +07002334 d->rename_status, d->rename_score,
2335 path, sep_char, path_from, eol_char);
Jeff Hostetler24959ba2016-08-11 10:45:58 -04002336 else
2337 fprintf(s->fp, "1 %s %s %06o %06o %06o %s %s %s%c",
2338 key, submodule_token,
2339 d->mode_head, d->mode_index, d->mode_worktree,
2340 oid_to_hex(&d->oid_head), oid_to_hex(&d->oid_index),
Nguyễn Thái Ngọc Duy5134ccd2017-12-27 17:18:38 +07002341 path, eol_char);
Jeff Hostetler24959ba2016-08-11 10:45:58 -04002342
Nguyễn Thái Ngọc Duy5134ccd2017-12-27 17:18:38 +07002343 strbuf_release(&buf);
2344 strbuf_release(&buf_from);
Jeff Hostetler24959ba2016-08-11 10:45:58 -04002345}
2346
2347/*
2348 * Print porcelain v2 status info for unmerged entries.
2349 */
2350static void wt_porcelain_v2_print_unmerged_entry(
2351 struct string_list_item *it,
2352 struct wt_status *s)
2353{
2354 struct wt_status_change_data *d = it->util;
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +01002355 struct index_state *istate = s->repo->index;
Jeff Hostetler24959ba2016-08-11 10:45:58 -04002356 const struct cache_entry *ce;
2357 struct strbuf buf_index = STRBUF_INIT;
2358 const char *path_index = NULL;
2359 int pos, stage, sum;
2360 struct {
2361 int mode;
2362 struct object_id oid;
2363 } stages[3];
2364 char *key;
2365 char submodule_token[5];
2366 char unmerged_prefix = 'u';
2367 char eol_char = s->null_termination ? '\0' : '\n';
2368
2369 wt_porcelain_v2_submodule_state(d, submodule_token);
2370
2371 switch (d->stagemask) {
2372 case 1: key = "DD"; break; /* both deleted */
2373 case 2: key = "AU"; break; /* added by us */
2374 case 3: key = "UD"; break; /* deleted by them */
2375 case 4: key = "UA"; break; /* added by them */
2376 case 5: key = "DU"; break; /* deleted by us */
2377 case 6: key = "AA"; break; /* both added */
2378 case 7: key = "UU"; break; /* both modified */
2379 default:
Johannes Schindelin033abf92018-05-02 11:38:39 +02002380 BUG("unhandled unmerged status %x", d->stagemask);
Jeff Hostetler24959ba2016-08-11 10:45:58 -04002381 }
2382
2383 /*
2384 * Disregard d.aux.porcelain_v2 data that we accumulated
2385 * for the head and index columns during the scans and
2386 * replace with the actual stage data.
2387 *
2388 * Note that this is a last-one-wins for each the individual
2389 * stage [123] columns in the event of multiple cache entries
2390 * for same stage.
2391 */
2392 memset(stages, 0, sizeof(stages));
2393 sum = 0;
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +01002394 pos = index_name_pos(istate, it->string, strlen(it->string));
Jeff Hostetler24959ba2016-08-11 10:45:58 -04002395 assert(pos < 0);
2396 pos = -pos-1;
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +01002397 while (pos < istate->cache_nr) {
2398 ce = istate->cache[pos++];
Jeff Hostetler24959ba2016-08-11 10:45:58 -04002399 stage = ce_stage(ce);
2400 if (strcmp(ce->name, it->string) || !stage)
2401 break;
2402 stages[stage - 1].mode = ce->ce_mode;
René Scharfe86947692017-01-28 23:03:06 +01002403 oidcpy(&stages[stage - 1].oid, &ce->oid);
Jeff Hostetler24959ba2016-08-11 10:45:58 -04002404 sum |= (1 << (stage - 1));
2405 }
2406 if (sum != d->stagemask)
Johannes Schindelin033abf92018-05-02 11:38:39 +02002407 BUG("observed stagemask 0x%x != expected stagemask 0x%x", sum, d->stagemask);
Jeff Hostetler24959ba2016-08-11 10:45:58 -04002408
2409 if (s->null_termination)
2410 path_index = it->string;
2411 else
Junio C Hamano88910c92020-09-10 10:01:54 -07002412 path_index = quote_path(it->string, s->prefix, &buf_index, 0);
Jeff Hostetler24959ba2016-08-11 10:45:58 -04002413
2414 fprintf(s->fp, "%c %s %s %06o %06o %06o %06o %s %s %s %s%c",
2415 unmerged_prefix, key, submodule_token,
2416 stages[0].mode, /* stage 1 */
2417 stages[1].mode, /* stage 2 */
2418 stages[2].mode, /* stage 3 */
2419 d->mode_worktree,
2420 oid_to_hex(&stages[0].oid), /* stage 1 */
2421 oid_to_hex(&stages[1].oid), /* stage 2 */
2422 oid_to_hex(&stages[2].oid), /* stage 3 */
2423 path_index,
2424 eol_char);
2425
2426 strbuf_release(&buf_index);
2427}
2428
2429/*
2430 * Print porcelain V2 status info for untracked and ignored entries.
2431 */
2432static void wt_porcelain_v2_print_other(
2433 struct string_list_item *it,
2434 struct wt_status *s,
2435 char prefix)
2436{
2437 struct strbuf buf = STRBUF_INIT;
2438 const char *path;
2439 char eol_char;
2440
2441 if (s->null_termination) {
2442 path = it->string;
2443 eol_char = '\0';
2444 } else {
Junio C Hamano88910c92020-09-10 10:01:54 -07002445 path = quote_path(it->string, s->prefix, &buf, 0);
Jeff Hostetler24959ba2016-08-11 10:45:58 -04002446 eol_char = '\n';
2447 }
2448
2449 fprintf(s->fp, "%c %s%c", prefix, path, eol_char);
2450
2451 strbuf_release(&buf);
2452}
2453
2454/*
2455 * Print porcelain V2 status.
2456 *
Jeff Hostetlerd9fc7462016-08-11 10:45:59 -04002457 * [<v2_branch>]
Jeff Hostetler24959ba2016-08-11 10:45:58 -04002458 * [<v2_changed_items>]*
2459 * [<v2_unmerged_items>]*
2460 * [<v2_untracked_items>]*
2461 * [<v2_ignored_items>]*
2462 *
2463 */
2464static void wt_porcelain_v2_print(struct wt_status *s)
2465{
2466 struct wt_status_change_data *d;
2467 struct string_list_item *it;
2468 int i;
2469
Jeff Hostetlerd9fc7462016-08-11 10:45:59 -04002470 if (s->show_branch)
2471 wt_porcelain_v2_print_tracking(s);
2472
Øystein Walle2e59e782021-10-22 00:25:32 +02002473 if (s->show_stash)
2474 wt_porcelain_v2_print_stash(s);
2475
Jeff Hostetler24959ba2016-08-11 10:45:58 -04002476 for (i = 0; i < s->change.nr; i++) {
2477 it = &(s->change.items[i]);
2478 d = it->util;
2479 if (!d->stagemask)
2480 wt_porcelain_v2_print_changed_entry(it, s);
2481 }
2482
2483 for (i = 0; i < s->change.nr; i++) {
2484 it = &(s->change.items[i]);
2485 d = it->util;
2486 if (d->stagemask)
2487 wt_porcelain_v2_print_unmerged_entry(it, s);
2488 }
2489
2490 for (i = 0; i < s->untracked.nr; i++) {
2491 it = &(s->untracked.items[i]);
2492 wt_porcelain_v2_print_other(it, s, '?');
2493 }
2494
2495 for (i = 0; i < s->ignored.nr; i++) {
2496 it = &(s->ignored.items[i]);
2497 wt_porcelain_v2_print_other(it, s, '!');
2498 }
2499}
2500
Jeff Hostetlerbe7e7952016-08-05 18:00:27 -04002501void wt_status_print(struct wt_status *s)
2502{
Jeff Hostetler942b2742019-02-22 14:25:03 -08002503 trace2_data_intmax("status", s->repo, "count/changed", s->change.nr);
2504 trace2_data_intmax("status", s->repo, "count/untracked",
2505 s->untracked.nr);
2506 trace2_data_intmax("status", s->repo, "count/ignored", s->ignored.nr);
2507
2508 trace2_region_enter("status", "print", s->repo);
2509
Jeff Hostetlerbe7e7952016-08-05 18:00:27 -04002510 switch (s->status_format) {
2511 case STATUS_FORMAT_SHORT:
2512 wt_shortstatus_print(s);
2513 break;
2514 case STATUS_FORMAT_PORCELAIN:
2515 wt_porcelain_print(s);
2516 break;
Jeff Hostetler1ecdecc2016-08-11 10:45:57 -04002517 case STATUS_FORMAT_PORCELAIN_V2:
Jeff Hostetler24959ba2016-08-11 10:45:58 -04002518 wt_porcelain_v2_print(s);
Jeff Hostetler1ecdecc2016-08-11 10:45:57 -04002519 break;
Jeff Hostetlerbe7e7952016-08-05 18:00:27 -04002520 case STATUS_FORMAT_UNSPECIFIED:
Johannes Schindelin033abf92018-05-02 11:38:39 +02002521 BUG("finalize_deferred_config() should have been called");
Jeff Hostetlerbe7e7952016-08-05 18:00:27 -04002522 break;
2523 case STATUS_FORMAT_NONE:
2524 case STATUS_FORMAT_LONG:
2525 wt_longstatus_print(s);
2526 break;
2527 }
Jeff Hostetler942b2742019-02-22 14:25:03 -08002528
2529 trace2_region_leave("status", "print", s->repo);
Jeff Hostetlerbe7e7952016-08-05 18:00:27 -04002530}
Johannes Schindelinfd849862016-10-07 18:08:38 +02002531
2532/**
2533 * Returns 1 if there are unstaged changes, 0 otherwise.
2534 */
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +01002535int has_unstaged_changes(struct repository *r, int ignore_submodules)
Johannes Schindelinfd849862016-10-07 18:08:38 +02002536{
2537 struct rev_info rev_info;
2538 int result;
2539
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +01002540 repo_init_revisions(r, &rev_info, NULL);
Brandon Williamsc6d8ccf2017-11-06 14:08:19 -08002541 if (ignore_submodules) {
Brandon Williams0d1e0e72017-10-31 11:19:11 -07002542 rev_info.diffopt.flags.ignore_submodules = 1;
Junio C Hamanob50d82b2017-11-15 12:14:30 +09002543 rev_info.diffopt.flags.override_submodule_config = 1;
Brandon Williamsc6d8ccf2017-11-06 14:08:19 -08002544 }
Brandon Williams0d1e0e72017-10-31 11:19:11 -07002545 rev_info.diffopt.flags.quick = 1;
Johannes Schindelinfd849862016-10-07 18:08:38 +02002546 diff_setup_done(&rev_info.diffopt);
2547 result = run_diff_files(&rev_info, 0);
Ævar Arnfjörð Bjarmason54c8a7c2022-04-14 07:56:40 +02002548 result = diff_result_code(&rev_info.diffopt, result);
Ævar Arnfjörð Bjarmason1878b5e2022-04-13 22:01:35 +02002549 release_revisions(&rev_info);
Ævar Arnfjörð Bjarmason54c8a7c2022-04-14 07:56:40 +02002550 return result;
Johannes Schindelinfd849862016-10-07 18:08:38 +02002551}
2552
2553/**
2554 * Returns 1 if there are uncommitted changes, 0 otherwise.
2555 */
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +01002556int has_uncommitted_changes(struct repository *r,
2557 int ignore_submodules)
Johannes Schindelinfd849862016-10-07 18:08:38 +02002558{
2559 struct rev_info rev_info;
2560 int result;
2561
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +01002562 if (is_index_unborn(r->index))
Johannes Schindelinfd849862016-10-07 18:08:38 +02002563 return 0;
2564
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +01002565 repo_init_revisions(r, &rev_info, NULL);
Johannes Schindelind8cc92a2016-10-07 18:09:00 +02002566 if (ignore_submodules)
Brandon Williams0d1e0e72017-10-31 11:19:11 -07002567 rev_info.diffopt.flags.ignore_submodules = 1;
2568 rev_info.diffopt.flags.quick = 1;
Jeff King3506dc92018-07-11 10:14:06 -04002569
Johannes Schindelinfd849862016-10-07 18:08:38 +02002570 add_head_to_pending(&rev_info);
Jeff King3506dc92018-07-11 10:14:06 -04002571 if (!rev_info.pending.nr) {
2572 /*
2573 * We have no head (or it's corrupt); use the empty tree,
2574 * which will complain if the index is non-empty.
2575 */
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +01002576 struct tree *tree = lookup_tree(r, the_hash_algo->empty_tree);
Jeff King3506dc92018-07-11 10:14:06 -04002577 add_pending_object(&rev_info, &tree->object, "");
2578 }
2579
Johannes Schindelinfd849862016-10-07 18:08:38 +02002580 diff_setup_done(&rev_info.diffopt);
2581 result = run_diff_index(&rev_info, 1);
Ævar Arnfjörð Bjarmason54c8a7c2022-04-14 07:56:40 +02002582 result = diff_result_code(&rev_info.diffopt, result);
Ævar Arnfjörð Bjarmason1878b5e2022-04-13 22:01:35 +02002583 release_revisions(&rev_info);
Ævar Arnfjörð Bjarmason54c8a7c2022-04-14 07:56:40 +02002584 return result;
Johannes Schindelinfd849862016-10-07 18:08:38 +02002585}
2586
2587/**
2588 * If the work tree has unstaged or uncommitted changes, dies with the
2589 * appropriate message.
2590 */
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +01002591int require_clean_work_tree(struct repository *r,
2592 const char *action,
2593 const char *hint,
2594 int ignore_submodules,
2595 int gently)
Johannes Schindelinfd849862016-10-07 18:08:38 +02002596{
Martin Ågren837e34e2017-10-05 22:32:04 +02002597 struct lock_file lock_file = LOCK_INIT;
Junio C Hamano89d38fb2016-12-07 11:11:26 -08002598 int err = 0, fd;
Johannes Schindelinfd849862016-10-07 18:08:38 +02002599
Nguyễn Thái Ngọc Duy3a95f312019-01-12 09:13:24 +07002600 fd = repo_hold_locked_index(r, &lock_file, 0);
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +01002601 refresh_index(r->index, REFRESH_QUIET, NULL, NULL, NULL);
Junio C Hamano89d38fb2016-12-07 11:11:26 -08002602 if (0 <= fd)
Nguyễn Thái Ngọc Duy1b0d9682019-01-12 09:13:27 +07002603 repo_update_index_if_able(r, &lock_file);
Martin Ågren837e34e2017-10-05 22:32:04 +02002604 rollback_lock_file(&lock_file);
Johannes Schindelinfd849862016-10-07 18:08:38 +02002605
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +01002606 if (has_unstaged_changes(r, ignore_submodules)) {
Johannes Schindelinfd849862016-10-07 18:08:38 +02002607 /* TRANSLATORS: the action is e.g. "pull with rebase" */
Johannes Schindelin4777e172016-10-07 18:09:04 +02002608 error(_("cannot %s: You have unstaged changes."), _(action));
Johannes Schindelinfd849862016-10-07 18:08:38 +02002609 err = 1;
2610 }
2611
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +01002612 if (has_uncommitted_changes(r, ignore_submodules)) {
Johannes Schindelinfd849862016-10-07 18:08:38 +02002613 if (err)
Johannes Schindelin4777e172016-10-07 18:09:04 +02002614 error(_("additionally, your index contains uncommitted changes."));
Johannes Schindelinfd849862016-10-07 18:08:38 +02002615 else
Johannes Schindelin4777e172016-10-07 18:09:04 +02002616 error(_("cannot %s: Your index contains uncommitted changes."),
Johannes Schindelinfd849862016-10-07 18:08:38 +02002617 _(action));
2618 err = 1;
2619 }
2620
2621 if (err) {
2622 if (hint)
2623 error("%s", hint);
2624 if (!gently)
2625 exit(128);
2626 }
2627
2628 return err;
2629}