blob: e4f29b2b4c9f7493076ee904f4c5e2b476841d6c [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);
Andrzej Hunt5493ce72021-04-25 14:16:09 +0000619 clear_pathspec(&rev.prune_data);
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;
Nguyễn Thái Ngọc Duy15b55ae2013-07-14 15:35:39 +0700654 copy_pathspec(&rev.prune_data, &s->pathspec);
Jeff Kingc91f0d92006-09-08 04:05:34 -0400655 run_diff_index(&rev, 1);
Andrzej Hunt5493ce72021-04-25 14:16:09 +0000656 object_array_clear(&rev.pending);
657 clear_pathspec(&rev.prune_data);
Jeff Kingc91f0d92006-09-08 04:05:34 -0400658}
659
Derrick Stoleefe0d5762021-07-14 13:12:38 +0000660static int add_file_to_list(const struct object_id *oid,
661 struct strbuf *base, const char *path,
662 unsigned int mode, void *context)
663{
664 struct string_list_item *it;
665 struct wt_status_change_data *d;
666 struct wt_status *s = context;
667 struct strbuf full_name = STRBUF_INIT;
668
669 if (S_ISDIR(mode))
670 return READ_TREE_RECURSIVE;
671
672 strbuf_add(&full_name, base->buf, base->len);
673 strbuf_addstr(&full_name, path);
674 it = string_list_insert(&s->change, full_name.buf);
675 d = it->util;
676 if (!d) {
677 CALLOC_ARRAY(d, 1);
678 it->util = d;
679 }
680
681 d->index_status = DIFF_STATUS_ADDED;
682 /* Leave {mode,oid}_head zero for adds. */
683 d->mode_index = mode;
684 oidcpy(&d->oid_index, oid);
685 s->committable = 1;
686 strbuf_release(&full_name);
687 return 0;
688}
689
Junio C Hamano50b7e702009-08-04 23:49:33 -0700690static void wt_status_collect_changes_initial(struct wt_status *s)
691{
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +0100692 struct index_state *istate = s->repo->index;
Junio C Hamano50b7e702009-08-04 23:49:33 -0700693 int i;
694
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +0100695 for (i = 0; i < istate->cache_nr; i++) {
Junio C Hamano50b7e702009-08-04 23:49:33 -0700696 struct string_list_item *it;
697 struct wt_status_change_data *d;
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +0100698 const struct cache_entry *ce = istate->cache[i];
Junio C Hamano50b7e702009-08-04 23:49:33 -0700699
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +0100700 if (!ce_path_match(istate, ce, &s->pathspec, NULL))
Junio C Hamano76e2f7c2009-08-07 23:31:57 -0700701 continue;
Nguyễn Thái Ngọc Duy425a28e2016-10-24 17:42:19 +0700702 if (ce_intent_to_add(ce))
703 continue;
Derrick Stoleefe0d5762021-07-14 13:12:38 +0000704 if (S_ISSPARSEDIR(ce->ce_mode)) {
705 /*
706 * This is a sparse directory entry, so we want to collect all
707 * of the added files within the tree. This requires recursively
708 * expanding the trees to find the elements that are new in this
709 * tree and marking them with DIFF_STATUS_ADDED.
710 */
711 struct strbuf base = STRBUF_INIT;
712 struct pathspec ps = { 0 };
713 struct tree *tree = lookup_tree(istate->repo, &ce->oid);
714
715 ps.recursive = 1;
716 ps.has_wildcard = 1;
717 ps.max_depth = -1;
718
719 strbuf_add(&base, ce->name, ce->ce_namelen);
720 read_tree_at(istate->repo, tree, &base, &ps,
721 add_file_to_list, s);
722 continue;
723 }
724
Julian Phillips78a395d2010-06-26 00:41:35 +0100725 it = string_list_insert(&s->change, ce->name);
Junio C Hamano50b7e702009-08-04 23:49:33 -0700726 d = it->util;
727 if (!d) {
René Scharfeca56dad2021-03-13 17:17:22 +0100728 CALLOC_ARRAY(d, 1);
Junio C Hamano50b7e702009-08-04 23:49:33 -0700729 it->util = d;
730 }
Junio C Hamano4d4d5722009-08-05 00:04:51 -0700731 if (ce_stage(ce)) {
Junio C Hamano50b7e702009-08-04 23:49:33 -0700732 d->index_status = DIFF_STATUS_UNMERGED;
Junio C Hamano4d4d5722009-08-05 00:04:51 -0700733 d->stagemask |= (1 << (ce_stage(ce) - 1));
Jeff Hostetler1ecdecc2016-08-11 10:45:57 -0400734 /*
735 * Don't bother setting {mode,oid}_{head,index} since the print
736 * code will output the stage values directly and not use the
737 * values in these fields.
738 */
Stephen P. Smithf3bd35f2018-09-05 17:53:29 -0700739 s->committable = 1;
Jeff Hostetler1ecdecc2016-08-11 10:45:57 -0400740 } else {
Junio C Hamano50b7e702009-08-04 23:49:33 -0700741 d->index_status = DIFF_STATUS_ADDED;
Jeff Hostetler1ecdecc2016-08-11 10:45:57 -0400742 /* Leave {mode,oid}_head zero for adds. */
743 d->mode_index = ce->ce_mode;
René Scharfe86947692017-01-28 23:03:06 +0100744 oidcpy(&d->oid_index, &ce->oid);
Stephen P. Smithf3bd35f2018-09-05 17:53:29 -0700745 s->committable = 1;
Jeff Hostetler1ecdecc2016-08-11 10:45:57 -0400746 }
Junio C Hamano50b7e702009-08-04 23:49:33 -0700747 }
748}
749
Junio C Hamano76378682009-08-10 00:36:33 -0700750static void wt_status_collect_untracked(struct wt_status *s)
751{
752 int i;
Ævar Arnfjörð Bjarmasonce93a4c2021-07-01 12:51:27 +0200753 struct dir_struct dir = DIR_INIT;
Karsten Blees132d41e2014-07-12 02:07:36 +0200754 uint64_t t_begin = getnanotime();
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +0100755 struct index_state *istate = s->repo->index;
Junio C Hamano76378682009-08-10 00:36:33 -0700756
757 if (!s->show_untracked_files)
758 return;
Nguyễn Thái Ngọc Duy6a38ef22013-03-13 19:59:16 +0700759
Junio C Hamano76378682009-08-10 00:36:33 -0700760 if (s->show_untracked_files != SHOW_ALL_UNTRACKED_FILES)
761 dir.flags |=
762 DIR_SHOW_OTHER_DIRECTORIES | DIR_HIDE_EMPTY_DIRECTORIES;
Jameson Millereec0f7f2017-10-30 13:21:37 -0400763 if (s->show_ignored_mode) {
Karsten Blees0aaf62b2013-04-15 21:15:03 +0200764 dir.flags |= DIR_SHOW_IGNORED_TOO;
Jameson Millereec0f7f2017-10-30 13:21:37 -0400765
766 if (s->show_ignored_mode == SHOW_MATCHING_IGNORED)
767 dir.flags |= DIR_SHOW_IGNORED_TOO_MODE_MATCHING;
768 } else {
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +0100769 dir.untracked = istate->untracked;
Jameson Millereec0f7f2017-10-30 13:21:37 -0400770 }
771
Junio C Hamano76378682009-08-10 00:36:33 -0700772 setup_standard_excludes(&dir);
773
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +0100774 fill_directory(&dir, istate, &s->pathspec);
Karsten Blees0aaf62b2013-04-15 21:15:03 +0200775
Brian Gianforcaroeeefa7c2009-09-01 01:35:10 -0400776 for (i = 0; i < dir.nr; i++) {
Junio C Hamano76378682009-08-10 00:36:33 -0700777 struct dir_entry *ent = dir.entries[i];
Elijah Newren95c11ec2020-04-01 04:17:45 +0000778 if (index_name_is_other(istate, ent->name, ent->len))
Brandon Caseyb8224232010-09-26 21:49:13 -0500779 string_list_insert(&s->untracked, ent->name);
Junio C Hamano76378682009-08-10 00:36:33 -0700780 }
Junio C Hamanof5b26b12010-04-09 23:58:27 -0700781
Karsten Blees0aaf62b2013-04-15 21:15:03 +0200782 for (i = 0; i < dir.ignored_nr; i++) {
783 struct dir_entry *ent = dir.ignored[i];
Elijah Newren95c11ec2020-04-01 04:17:45 +0000784 if (index_name_is_other(istate, ent->name, ent->len))
Karsten Blees0aaf62b2013-04-15 21:15:03 +0200785 string_list_insert(&s->ignored, ent->name);
Junio C Hamano6cb3f6b2010-04-10 00:11:53 -0700786 }
787
Elijah Newreneceba532020-08-18 22:58:26 +0000788 dir_clear(&dir);
Nguyễn Thái Ngọc Duy6a38ef22013-03-13 19:59:16 +0700789
Ben Boeckeled9bff02021-08-23 12:44:00 +0200790 if (advice_enabled(ADVICE_STATUS_U_OPTION))
Karsten Blees132d41e2014-07-12 02:07:36 +0200791 s->untracked_in_ms = (getnanotime() - t_begin) / 1000000;
Junio C Hamano76378682009-08-10 00:36:33 -0700792}
793
Stephen P. Smithc01d8f92018-09-05 17:53:26 -0700794static int has_unmerged(struct wt_status *s)
795{
796 int i;
797
798 for (i = 0; i < s->change.nr; i++) {
799 struct wt_status_change_data *d;
800 d = s->change.items[i].util;
801 if (d->stagemask)
802 return 1;
803 }
804 return 0;
805}
806
Junio C Hamano76378682009-08-10 00:36:33 -0700807void wt_status_collect(struct wt_status *s)
Junio C Hamano50b7e702009-08-04 23:49:33 -0700808{
Jeff Hostetler942b2742019-02-22 14:25:03 -0800809 trace2_region_enter("status", "worktrees", s->repo);
Junio C Hamano50b7e702009-08-04 23:49:33 -0700810 wt_status_collect_changes_worktree(s);
Jeff Hostetler942b2742019-02-22 14:25:03 -0800811 trace2_region_leave("status", "worktrees", s->repo);
812
813 if (s->is_initial) {
814 trace2_region_enter("status", "initial", s->repo);
Junio C Hamano50b7e702009-08-04 23:49:33 -0700815 wt_status_collect_changes_initial(s);
Jeff Hostetler942b2742019-02-22 14:25:03 -0800816 trace2_region_leave("status", "initial", s->repo);
817 } else {
818 trace2_region_enter("status", "index", s->repo);
Junio C Hamano50b7e702009-08-04 23:49:33 -0700819 wt_status_collect_changes_index(s);
Jeff Hostetler942b2742019-02-22 14:25:03 -0800820 trace2_region_leave("status", "index", s->repo);
821 }
822
823 trace2_region_enter("status", "untracked", s->repo);
Junio C Hamano76378682009-08-10 00:36:33 -0700824 wt_status_collect_untracked(s);
Jeff Hostetler942b2742019-02-22 14:25:03 -0800825 trace2_region_leave("status", "untracked", s->repo);
Stephen P. Smithf3bd35f2018-09-05 17:53:29 -0700826
Nguyễn Thái Ngọc Duy78845452018-11-10 06:48:50 +0100827 wt_status_get_state(s->repo, &s->state, s->branch && !strcmp(s->branch, "HEAD"));
Stephen P. Smith73ba5d72018-09-30 07:12:45 -0700828 if (s->state.merge_in_progress && !has_unmerged(s))
Stephen P. Smithf3bd35f2018-09-05 17:53:29 -0700829 s->committable = 1;
Junio C Hamano50b7e702009-08-04 23:49:33 -0700830}
831
Stephen P. Smith73ba5d72018-09-30 07:12:45 -0700832void wt_status_collect_free_buffers(struct wt_status *s)
833{
Martin Ågren962dd7e2020-09-27 15:15:43 +0200834 wt_status_state_free_buffers(&s->state);
835}
836
837void wt_status_state_free_buffers(struct wt_status_state *state)
838{
839 FREE_AND_NULL(state->branch);
840 FREE_AND_NULL(state->onto);
841 FREE_AND_NULL(state->detached_from);
Junio C Hamano50b7e702009-08-04 23:49:33 -0700842}
843
Jeff Hostetler957a0fe2016-08-05 18:00:26 -0400844static void wt_longstatus_print_unmerged(struct wt_status *s)
Junio C Hamano4d4d5722009-08-05 00:04:51 -0700845{
846 int shown_header = 0;
847 int i;
848
849 for (i = 0; i < s->change.nr; i++) {
850 struct wt_status_change_data *d;
851 struct string_list_item *it;
852 it = &(s->change.items[i]);
853 d = it->util;
854 if (!d->stagemask)
855 continue;
856 if (!shown_header) {
Jeff Hostetler957a0fe2016-08-05 18:00:26 -0400857 wt_longstatus_print_unmerged_header(s);
Junio C Hamano4d4d5722009-08-05 00:04:51 -0700858 shown_header = 1;
859 }
Jeff Hostetler957a0fe2016-08-05 18:00:26 -0400860 wt_longstatus_print_unmerged_data(s, it);
Junio C Hamano4d4d5722009-08-05 00:04:51 -0700861 }
862 if (shown_header)
Jeff Hostetler957a0fe2016-08-05 18:00:26 -0400863 wt_longstatus_print_trailer(s);
Junio C Hamano4d4d5722009-08-05 00:04:51 -0700864
865}
866
Jeff Hostetler957a0fe2016-08-05 18:00:26 -0400867static void wt_longstatus_print_updated(struct wt_status *s)
Junio C Hamano50b7e702009-08-04 23:49:33 -0700868{
869 int shown_header = 0;
870 int i;
871
872 for (i = 0; i < s->change.nr; i++) {
873 struct wt_status_change_data *d;
874 struct string_list_item *it;
875 it = &(s->change.items[i]);
876 d = it->util;
877 if (!d->index_status ||
878 d->index_status == DIFF_STATUS_UNMERGED)
879 continue;
880 if (!shown_header) {
Jeff Hostetler957a0fe2016-08-05 18:00:26 -0400881 wt_longstatus_print_cached_header(s);
Junio C Hamano50b7e702009-08-04 23:49:33 -0700882 shown_header = 1;
883 }
Jeff Hostetler957a0fe2016-08-05 18:00:26 -0400884 wt_longstatus_print_change_data(s, WT_STATUS_UPDATED, it);
Junio C Hamano50b7e702009-08-04 23:49:33 -0700885 }
886 if (shown_header)
Jeff Hostetler957a0fe2016-08-05 18:00:26 -0400887 wt_longstatus_print_trailer(s);
Junio C Hamano50b7e702009-08-04 23:49:33 -0700888}
889
890/*
891 * -1 : has delete
892 * 0 : no change
893 * 1 : some change but no delete
894 */
Jens Lehmann9297f77e62010-03-08 13:53:19 +0100895static int wt_status_check_worktree_changes(struct wt_status *s,
896 int *dirty_submodules)
Junio C Hamano50b7e702009-08-04 23:49:33 -0700897{
898 int i;
899 int changes = 0;
900
Jens Lehmann9297f77e62010-03-08 13:53:19 +0100901 *dirty_submodules = 0;
902
Junio C Hamano50b7e702009-08-04 23:49:33 -0700903 for (i = 0; i < s->change.nr; i++) {
904 struct wt_status_change_data *d;
905 d = s->change.items[i].util;
Junio C Hamano4d4d5722009-08-05 00:04:51 -0700906 if (!d->worktree_status ||
907 d->worktree_status == DIFF_STATUS_UNMERGED)
Junio C Hamano50b7e702009-08-04 23:49:33 -0700908 continue;
Jens Lehmann9297f77e62010-03-08 13:53:19 +0100909 if (!changes)
910 changes = 1;
911 if (d->dirty_submodule)
912 *dirty_submodules = 1;
Junio C Hamano50b7e702009-08-04 23:49:33 -0700913 if (d->worktree_status == DIFF_STATUS_DELETED)
Jens Lehmann9297f77e62010-03-08 13:53:19 +0100914 changes = -1;
Junio C Hamano50b7e702009-08-04 23:49:33 -0700915 }
916 return changes;
917}
918
Jeff Hostetler957a0fe2016-08-05 18:00:26 -0400919static void wt_longstatus_print_changed(struct wt_status *s)
Jeff Kingc91f0d92006-09-08 04:05:34 -0400920{
Jens Lehmann9297f77e62010-03-08 13:53:19 +0100921 int i, dirty_submodules;
922 int worktree_changes = wt_status_check_worktree_changes(s, &dirty_submodules);
Junio C Hamano50b7e702009-08-04 23:49:33 -0700923
924 if (!worktree_changes)
925 return;
926
Jeff Hostetler957a0fe2016-08-05 18:00:26 -0400927 wt_longstatus_print_dirty_header(s, worktree_changes < 0, dirty_submodules);
Junio C Hamano50b7e702009-08-04 23:49:33 -0700928
929 for (i = 0; i < s->change.nr; i++) {
930 struct wt_status_change_data *d;
931 struct string_list_item *it;
932 it = &(s->change.items[i]);
933 d = it->util;
Junio C Hamano4d4d5722009-08-05 00:04:51 -0700934 if (!d->worktree_status ||
935 d->worktree_status == DIFF_STATUS_UNMERGED)
Junio C Hamano50b7e702009-08-04 23:49:33 -0700936 continue;
Jeff Hostetler957a0fe2016-08-05 18:00:26 -0400937 wt_longstatus_print_change_data(s, WT_STATUS_CHANGED, it);
Junio C Hamano50b7e702009-08-04 23:49:33 -0700938 }
Jeff Hostetler957a0fe2016-08-05 18:00:26 -0400939 wt_longstatus_print_trailer(s);
Jeff Kingc91f0d92006-09-08 04:05:34 -0400940}
941
Liam Beguinc1b5d012017-06-17 18:30:51 -0400942static int stash_count_refs(struct object_id *ooid, struct object_id *noid,
943 const char *email, timestamp_t timestamp, int tz,
944 const char *message, void *cb_data)
945{
946 int *c = cb_data;
947 (*c)++;
948 return 0;
949}
950
951static void wt_longstatus_print_stash_summary(struct wt_status *s)
952{
953 int stash_count = 0;
954
955 for_each_reflog_ent("refs/stash", stash_count_refs, &stash_count);
956 if (stash_count > 0)
957 status_printf_ln(s, GIT_COLOR_NORMAL,
958 Q_("Your stash currently has %d entry",
959 "Your stash currently has %d entries", stash_count),
960 stash_count);
961}
962
Jeff Hostetler957a0fe2016-08-05 18:00:26 -0400963static void wt_longstatus_print_submodule_summary(struct wt_status *s, int uncommitted)
Ping Yinac8d5af2008-04-12 23:05:32 +0800964{
René Scharfed3180272014-08-19 21:09:35 +0200965 struct child_process sm_summary = CHILD_PROCESS_INIT;
Matthieu Moy3ba74072013-09-06 19:43:06 +0200966 struct strbuf cmd_stdout = STRBUF_INIT;
967 struct strbuf summary = STRBUF_INIT;
968 char *summary_content;
Ping Yinac8d5af2008-04-12 23:05:32 +0800969
Jeff Kingf6d89422020-07-28 16:26:31 -0400970 strvec_pushf(&sm_summary.env_array, "GIT_INDEX_FILE=%s", s->index_file);
Ping Yinac8d5af2008-04-12 23:05:32 +0800971
Jeff Kingc972bf42020-07-28 16:25:12 -0400972 strvec_push(&sm_summary.args, "submodule");
973 strvec_push(&sm_summary.args, "summary");
974 strvec_push(&sm_summary.args, uncommitted ? "--files" : "--cached");
975 strvec_push(&sm_summary.args, "--for-status");
976 strvec_push(&sm_summary.args, "--summary-limit");
977 strvec_pushf(&sm_summary.args, "%d", s->submodule_summary);
Matthieu Moybb7e32e2013-09-06 19:43:05 +0200978 if (!uncommitted)
Jeff Kingc972bf42020-07-28 16:25:12 -0400979 strvec_push(&sm_summary.args, s->amend ? "HEAD^" : "HEAD");
Matthieu Moybb7e32e2013-09-06 19:43:05 +0200980
Ping Yinac8d5af2008-04-12 23:05:32 +0800981 sm_summary.git_cmd = 1;
982 sm_summary.no_stdin = 1;
Matthieu Moy3ba74072013-09-06 19:43:06 +0200983
Jeff King5c950e92015-03-22 23:53:52 -0400984 capture_command(&sm_summary, &cmd_stdout, 1024);
Matthieu Moy3ba74072013-09-06 19:43:06 +0200985
986 /* prepend header, only if there's an actual output */
Jeff Kingd56d9662015-03-22 06:00:32 -0400987 if (cmd_stdout.len) {
Matthieu Moy3ba74072013-09-06 19:43:06 +0200988 if (uncommitted)
989 strbuf_addstr(&summary, _("Submodules changed but not updated:"));
990 else
991 strbuf_addstr(&summary, _("Submodule changes to be committed:"));
992 strbuf_addstr(&summary, "\n\n");
993 }
994 strbuf_addbuf(&summary, &cmd_stdout);
995 strbuf_release(&cmd_stdout);
996
Matthieu Moy2556b992013-09-06 19:43:07 +0200997 if (s->display_comment_prefix) {
Jeff Kingd56d9662015-03-22 06:00:32 -0400998 size_t len;
Matthieu Moy2556b992013-09-06 19:43:07 +0200999 summary_content = strbuf_detach(&summary, &len);
1000 strbuf_add_commented_lines(&summary, summary_content, len);
1001 free(summary_content);
1002 }
Matthieu Moy3ba74072013-09-06 19:43:06 +02001003
1004 fputs(summary.buf, s->fp);
1005 strbuf_release(&summary);
Ping Yinac8d5af2008-04-12 23:05:32 +08001006}
1007
Jeff Hostetler957a0fe2016-08-05 18:00:26 -04001008static void wt_longstatus_print_other(struct wt_status *s,
1009 struct string_list *l,
1010 const char *what,
1011 const char *how)
Jeff Kingc91f0d92006-09-08 04:05:34 -04001012{
Jeff Kingc91f0d92006-09-08 04:05:34 -04001013 int i;
Brandon Caseyf285a2d2008-10-09 14:12:12 -05001014 struct strbuf buf = STRBUF_INIT;
Nguyễn Thái Ngọc Duy323d0532012-04-13 17:54:39 +07001015 static struct string_list output = STRING_LIST_INIT_DUP;
1016 struct column_options copts;
Jeff Kingc91f0d92006-09-08 04:05:34 -04001017
Jeff King12829882011-06-02 01:54:49 -04001018 if (!l->nr)
Junio C Hamano76378682009-08-10 00:36:33 -07001019 return;
Jeff Kingc91f0d92006-09-08 04:05:34 -04001020
Jeff Hostetler957a0fe2016-08-05 18:00:26 -04001021 wt_longstatus_print_other_header(s, what, how);
Junio C Hamano1b908b62010-04-10 00:19:46 -07001022
1023 for (i = 0; i < l->nr; i++) {
Junio C Hamano76378682009-08-10 00:36:33 -07001024 struct string_list_item *it;
Nguyễn Thái Ngọc Duy323d0532012-04-13 17:54:39 +07001025 const char *path;
Junio C Hamano1b908b62010-04-10 00:19:46 -07001026 it = &(l->items[i]);
Junio C Hamano88910c92020-09-10 10:01:54 -07001027 path = quote_path(it->string, s->prefix, &buf, 0);
Nguyễn Thái Ngọc Duy323d0532012-04-13 17:54:39 +07001028 if (column_active(s->colopts)) {
1029 string_list_append(&output, path);
1030 continue;
1031 }
Jonathan Niederb926c0d2011-02-25 23:11:37 -06001032 status_printf(s, color(WT_STATUS_HEADER, s), "\t");
1033 status_printf_more(s, color(WT_STATUS_UNTRACKED, s),
Nguyễn Thái Ngọc Duy323d0532012-04-13 17:54:39 +07001034 "%s\n", path);
Jeff Kingc91f0d92006-09-08 04:05:34 -04001035 }
Nguyễn Thái Ngọc Duy323d0532012-04-13 17:54:39 +07001036
1037 strbuf_release(&buf);
1038 if (!column_active(s->colopts))
Matthieu Moy2f0f7f12013-09-06 19:43:09 +02001039 goto conclude;
Nguyễn Thái Ngọc Duy323d0532012-04-13 17:54:39 +07001040
Matthieu Moy2556b992013-09-06 19:43:07 +02001041 strbuf_addf(&buf, "%s%s\t%s",
Nguyễn Thái Ngọc Duy323d0532012-04-13 17:54:39 +07001042 color(WT_STATUS_HEADER, s),
Matthieu Moy2556b992013-09-06 19:43:07 +02001043 s->display_comment_prefix ? "#" : "",
Nguyễn Thái Ngọc Duy323d0532012-04-13 17:54:39 +07001044 color(WT_STATUS_UNTRACKED, s));
1045 memset(&copts, 0, sizeof(copts));
1046 copts.padding = 1;
1047 copts.indent = buf.buf;
1048 if (want_color(s->use_color))
1049 copts.nl = GIT_COLOR_RESET "\n";
1050 print_columns(&output, s->colopts, &copts);
1051 string_list_clear(&output, 0);
Johannes Schindelin367c9882007-11-11 17:35:41 +00001052 strbuf_release(&buf);
Matthieu Moy2f0f7f12013-09-06 19:43:09 +02001053conclude:
Felipe Contreras7d7d6802014-05-04 01:12:55 -05001054 status_printf_ln(s, GIT_COLOR_NORMAL, "%s", "");
Jeff Kingc91f0d92006-09-08 04:05:34 -04001055}
1056
Brian Malehornd76650b2017-05-15 23:06:49 -07001057size_t wt_status_locate_end(const char *s, size_t len)
Jens Lehmann1a72cfd2013-12-05 20:44:14 +01001058{
1059 const char *p;
1060 struct strbuf pattern = STRBUF_INIT;
1061
SZEDER Gáborfbfa0972015-06-09 02:28:34 +02001062 strbuf_addf(&pattern, "\n%c %s", comment_line_char, cut_line);
Brian Malehornd76650b2017-05-15 23:06:49 -07001063 if (starts_with(s, pattern.buf + 1))
1064 len = 0;
1065 else if ((p = strstr(s, pattern.buf)))
1066 len = p - s + 1;
Jens Lehmann1a72cfd2013-12-05 20:44:14 +01001067 strbuf_release(&pattern);
Brian Malehornd76650b2017-05-15 23:06:49 -07001068 return len;
Jens Lehmann1a72cfd2013-12-05 20:44:14 +01001069}
1070
Denton Liud540b702019-04-17 11:23:27 +01001071void wt_status_append_cut_line(struct strbuf *buf)
Nguyễn Thái Ngọc Duyfcef9312014-02-17 19:15:31 +07001072{
Kaartic Sivaraam8c4b1a32017-09-13 13:05:38 +00001073 const char *explanation = _("Do not modify or remove the line above.\nEverything below it will be ignored.");
Denton Liud540b702019-04-17 11:23:27 +01001074
1075 strbuf_commented_addf(buf, "%s", cut_line);
1076 strbuf_add_commented_lines(buf, explanation, strlen(explanation));
1077}
1078
1079void wt_status_add_cut_line(FILE *fp)
1080{
Nguyễn Thái Ngọc Duyfcef9312014-02-17 19:15:31 +07001081 struct strbuf buf = STRBUF_INIT;
1082
Denton Liud540b702019-04-17 11:23:27 +01001083 wt_status_append_cut_line(&buf);
Nguyễn Thái Ngọc Duyfcef9312014-02-17 19:15:31 +07001084 fputs(buf.buf, fp);
1085 strbuf_release(&buf);
1086}
1087
Jeff Hostetler957a0fe2016-08-05 18:00:26 -04001088static void wt_longstatus_print_verbose(struct wt_status *s)
Jeff Kingc91f0d92006-09-08 04:05:34 -04001089{
1090 struct rev_info rev;
Junio C Hamano32962c92010-03-08 22:58:09 -08001091 struct setup_revision_opt opt;
Michael J Gruber40555002015-03-06 10:43:35 +01001092 int dirty_submodules;
1093 const char *c = color(WT_STATUS_HEADER, s);
Kristian Høgsberg99a12692007-11-21 21:54:49 -05001094
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +01001095 repo_init_revisions(s->repo, &rev, NULL);
Brandon Williams0d1e0e72017-10-31 11:19:11 -07001096 rev.diffopt.flags.allow_textconv = 1;
Nguyễn Thái Ngọc Duy425a28e2016-10-24 17:42:19 +07001097 rev.diffopt.ita_invisible_in_index = 1;
Junio C Hamano32962c92010-03-08 22:58:09 -08001098
1099 memset(&opt, 0, sizeof(opt));
brian m. carlsonf2e51192018-05-02 00:26:00 +00001100 opt.def = s->is_initial ? empty_tree_oid_hex() : s->reference;
Junio C Hamano32962c92010-03-08 22:58:09 -08001101 setup_revisions(0, NULL, &rev, &opt);
1102
Jeff Kingc91f0d92006-09-08 04:05:34 -04001103 rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
Ben Pearte8b2dc22018-05-11 15:38:58 +00001104 rev.diffopt.detect_rename = s->detect_rename >= 0 ? s->detect_rename : rev.diffopt.detect_rename;
1105 rev.diffopt.rename_limit = s->rename_limit >= 0 ? s->rename_limit : rev.diffopt.rename_limit;
1106 rev.diffopt.rename_score = s->rename_score >= 0 ? s->rename_score : rev.diffopt.rename_score;
Kristian Høgsberg4ba0cb22008-03-10 13:58:26 -04001107 rev.diffopt.file = s->fp;
1108 rev.diffopt.close_file = 0;
Jeff King4f672ad2008-10-26 00:49:35 -04001109 /*
1110 * If we're not going to stdout, then we definitely don't
1111 * want color, since we are going to the commit message
1112 * file (and even the "auto" setting won't work, since it
Jens Lehmann1a72cfd2013-12-05 20:44:14 +01001113 * will have checked isatty on stdout). But we then do want
1114 * to insert the scissor line here to reliably remove the
1115 * diff before committing.
Jeff King4f672ad2008-10-26 00:49:35 -04001116 */
Jens Lehmann1a72cfd2013-12-05 20:44:14 +01001117 if (s->fp != stdout) {
Jeff Kingf1c96262011-08-17 22:03:12 -07001118 rev.diffopt.use_color = 0;
Nguyễn Thái Ngọc Duyfcef9312014-02-17 19:15:31 +07001119 wt_status_add_cut_line(s->fp);
Jens Lehmann1a72cfd2013-12-05 20:44:14 +01001120 }
Stephen P. Smith6fa90192018-09-05 17:53:27 -07001121 if (s->verbose > 1 && s->committable) {
Michael J Gruber40555002015-03-06 10:43:35 +01001122 /* print_updated() printed a header, so do we */
1123 if (s->fp != stdout)
Jeff Hostetler957a0fe2016-08-05 18:00:26 -04001124 wt_longstatus_print_trailer(s);
Michael J Gruber40555002015-03-06 10:43:35 +01001125 status_printf_ln(s, c, _("Changes to be committed:"));
1126 rev.diffopt.a_prefix = "c/";
1127 rev.diffopt.b_prefix = "i/";
1128 } /* else use prefix as per user config */
Jeff Kingc91f0d92006-09-08 04:05:34 -04001129 run_diff_index(&rev, 1);
Michael J Gruber40555002015-03-06 10:43:35 +01001130 if (s->verbose > 1 &&
1131 wt_status_check_worktree_changes(s, &dirty_submodules)) {
1132 status_printf_ln(s, c,
1133 "--------------------------------------------------");
1134 status_printf_ln(s, c, _("Changes not staged for commit:"));
1135 setup_work_tree();
1136 rev.diffopt.a_prefix = "i/";
1137 rev.diffopt.b_prefix = "w/";
1138 run_diff_files(&rev, 0);
1139 }
Jeff Kingc91f0d92006-09-08 04:05:34 -04001140}
1141
Jeff Hostetler957a0fe2016-08-05 18:00:26 -04001142static void wt_longstatus_print_tracking(struct wt_status *s)
Junio C Hamanob6975ab2008-07-02 00:52:16 -07001143{
1144 struct strbuf sb = STRBUF_INIT;
René Scharfec72b49d2015-10-31 18:37:43 +01001145 const char *cp, *ep, *branch_name;
Junio C Hamanob6975ab2008-07-02 00:52:16 -07001146 struct branch *branch;
Matthieu Moy2556b992013-09-06 19:43:07 +02001147 char comment_line_string[3];
1148 int i;
Jeff Hostetler0a535612019-06-18 13:21:27 -07001149 uint64_t t_begin = 0;
Junio C Hamanob6975ab2008-07-02 00:52:16 -07001150
1151 assert(s->branch && !s->is_initial);
René Scharfec72b49d2015-10-31 18:37:43 +01001152 if (!skip_prefix(s->branch, "refs/heads/", &branch_name))
Junio C Hamanob6975ab2008-07-02 00:52:16 -07001153 return;
René Scharfec72b49d2015-10-31 18:37:43 +01001154 branch = branch_get(branch_name);
Jeff Hostetler0a535612019-06-18 13:21:27 -07001155
1156 t_begin = getnanotime();
1157
Jeff Hostetlerf39a7572018-01-09 18:50:18 +00001158 if (!format_tracking_info(branch, &sb, s->ahead_behind_flags))
Junio C Hamanob6975ab2008-07-02 00:52:16 -07001159 return;
1160
Ben Boeckeled9bff02021-08-23 12:44:00 +02001161 if (advice_enabled(ADVICE_STATUS_AHEAD_BEHIND_WARNING) &&
Jeff Hostetler0a535612019-06-18 13:21:27 -07001162 s->ahead_behind_flags == AHEAD_BEHIND_FULL) {
1163 uint64_t t_delta_in_ms = (getnanotime() - t_begin) / 1000000;
1164 if (t_delta_in_ms > AB_DELAY_WARNING_IN_MS) {
1165 strbuf_addf(&sb, _("\n"
1166 "It took %.2f seconds to compute the branch ahead/behind values.\n"
1167 "You can use '--no-ahead-behind' to avoid this.\n"),
1168 t_delta_in_ms / 1000.0);
1169 }
1170 }
1171
Matthieu Moy2556b992013-09-06 19:43:07 +02001172 i = 0;
1173 if (s->display_comment_prefix) {
1174 comment_line_string[i++] = comment_line_char;
1175 comment_line_string[i++] = ' ';
1176 }
1177 comment_line_string[i] = '\0';
1178
Junio C Hamanob6975ab2008-07-02 00:52:16 -07001179 for (cp = sb.buf; (ep = strchr(cp, '\n')) != NULL; cp = ep + 1)
Junio C Hamanod249b092009-08-09 21:59:30 -07001180 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s),
Matthieu Moy2556b992013-09-06 19:43:07 +02001181 "%s%.*s", comment_line_string,
Junio C Hamanoeff80a92013-01-16 20:18:48 +01001182 (int)(ep - cp), cp);
Matthieu Moy2556b992013-09-06 19:43:07 +02001183 if (s->display_comment_prefix)
1184 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s), "%c",
1185 comment_line_char);
1186 else
Jeff King75177c82017-04-27 05:01:05 -04001187 fputs("\n", s->fp);
Rene Scharfeb6ec3072017-08-30 20:20:18 +02001188 strbuf_release(&sb);
Junio C Hamanob6975ab2008-07-02 00:52:16 -07001189}
1190
Lucien Kong83c750a2012-06-05 22:21:24 +02001191static void show_merge_in_progress(struct wt_status *s,
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001192 const char *color)
Lucien Kong83c750a2012-06-05 22:21:24 +02001193{
1194 if (has_unmerged(s)) {
1195 status_printf_ln(s, color, _("You have unmerged paths."));
Matthieu Moyb0a61ab2016-07-21 14:58:37 +02001196 if (s->hints) {
Lucien Kong83c750a2012-06-05 22:21:24 +02001197 status_printf_ln(s, color,
Matthieu Moyb0a61ab2016-07-21 14:58:37 +02001198 _(" (fix conflicts and run \"git commit\")"));
1199 status_printf_ln(s, color,
1200 _(" (use \"git merge --abort\" to abort the merge)"));
1201 }
Lucien Kong83c750a2012-06-05 22:21:24 +02001202 } else {
1203 status_printf_ln(s, color,
1204 _("All conflicts fixed but you are still merging."));
Matthieu Moy6a964f52013-09-12 12:50:05 +02001205 if (s->hints)
Lucien Kong83c750a2012-06-05 22:21:24 +02001206 status_printf_ln(s, color,
1207 _(" (use \"git commit\" to conclude merge)"));
1208 }
Jeff Hostetler957a0fe2016-08-05 18:00:26 -04001209 wt_longstatus_print_trailer(s);
Lucien Kong83c750a2012-06-05 22:21:24 +02001210}
1211
1212static void show_am_in_progress(struct wt_status *s,
Lucien Kong83c750a2012-06-05 22:21:24 +02001213 const char *color)
1214{
1215 status_printf_ln(s, color,
1216 _("You are in the middle of an am session."));
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001217 if (s->state.am_empty_patch)
Lucien Kong83c750a2012-06-05 22:21:24 +02001218 status_printf_ln(s, color,
1219 _("The current patch is empty."));
Matthieu Moy6a964f52013-09-12 12:50:05 +02001220 if (s->hints) {
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001221 if (!s->state.am_empty_patch)
Lucien Kong83c750a2012-06-05 22:21:24 +02001222 status_printf_ln(s, color,
Kevin Bracey8ceb6fb2013-06-26 23:06:41 +03001223 _(" (fix conflicts and then run \"git am --continue\")"));
Lucien Kong83c750a2012-06-05 22:21:24 +02001224 status_printf_ln(s, color,
1225 _(" (use \"git am --skip\" to skip this patch)"));
1226 status_printf_ln(s, color,
1227 _(" (use \"git am --abort\" to restore the original branch)"));
1228 }
Jeff Hostetler957a0fe2016-08-05 18:00:26 -04001229 wt_longstatus_print_trailer(s);
Lucien Kong83c750a2012-06-05 22:21:24 +02001230}
1231
Lucien Kong2d1cceb2012-06-10 13:17:38 +02001232static char *read_line_from_git_path(const char *filename)
1233{
1234 struct strbuf buf = STRBUF_INIT;
Nguyễn Thái Ngọc Duye9d983f2017-05-03 17:16:50 +07001235 FILE *fp = fopen_or_warn(git_path("%s", filename), "r");
1236
Lucien Kong2d1cceb2012-06-10 13:17:38 +02001237 if (!fp) {
1238 strbuf_release(&buf);
1239 return NULL;
1240 }
Junio C Hamano8f309ae2016-01-13 15:31:17 -08001241 strbuf_getline_lf(&buf, fp);
Lucien Kong2d1cceb2012-06-10 13:17:38 +02001242 if (!fclose(fp)) {
1243 return strbuf_detach(&buf, NULL);
1244 } else {
1245 strbuf_release(&buf);
1246 return NULL;
1247 }
1248}
1249
1250static int split_commit_in_progress(struct wt_status *s)
1251{
1252 int split_in_progress = 0;
Johannes Schindelin41fc6b32017-05-04 15:56:44 +02001253 char *head, *orig_head, *rebase_amend, *rebase_orig_head;
Lucien Kong2d1cceb2012-06-10 13:17:38 +02001254
Johannes Schindelin41fc6b32017-05-04 15:56:44 +02001255 if ((!s->amend && !s->nowarn && !s->workdir_dirty) ||
Lucien Kong2d1cceb2012-06-10 13:17:38 +02001256 !s->branch || strcmp(s->branch, "HEAD"))
Johannes Schindelin41fc6b32017-05-04 15:56:44 +02001257 return 0;
Lucien Kong2d1cceb2012-06-10 13:17:38 +02001258
Johannes Schindelin41fc6b32017-05-04 15:56:44 +02001259 head = read_line_from_git_path("HEAD");
1260 orig_head = read_line_from_git_path("ORIG_HEAD");
1261 rebase_amend = read_line_from_git_path("rebase-merge/amend");
1262 rebase_orig_head = read_line_from_git_path("rebase-merge/orig-head");
1263
1264 if (!head || !orig_head || !rebase_amend || !rebase_orig_head)
1265 ; /* fall through, no split in progress */
1266 else if (!strcmp(rebase_amend, rebase_orig_head))
1267 split_in_progress = !!strcmp(head, rebase_amend);
1268 else if (strcmp(orig_head, rebase_orig_head))
Lucien Kong2d1cceb2012-06-10 13:17:38 +02001269 split_in_progress = 1;
Lucien Kong2d1cceb2012-06-10 13:17:38 +02001270
1271 free(head);
1272 free(orig_head);
1273 free(rebase_amend);
1274 free(rebase_orig_head);
Johannes Schindelin41fc6b32017-05-04 15:56:44 +02001275
Lucien Kong2d1cceb2012-06-10 13:17:38 +02001276 return split_in_progress;
1277}
1278
Guillaume Pagès84e6fb92015-07-06 22:56:03 +02001279/*
1280 * Turn
1281 * "pick d6a2f0303e897ec257dd0e0a39a5ccb709bc2047 some message"
1282 * into
1283 * "pick d6a2f03 some message"
1284 *
1285 * The function assumes that the line does not contain useless spaces
1286 * before or after the command.
1287 */
Martin Ågrenb1f1ade2020-09-27 15:15:41 +02001288static void abbrev_oid_in_line(struct strbuf *line)
Guillaume Pagès84e6fb92015-07-06 22:56:03 +02001289{
1290 struct strbuf **split;
1291 int i;
1292
1293 if (starts_with(line->buf, "exec ") ||
Johannes Schindelin225a7772019-05-10 13:23:14 -07001294 starts_with(line->buf, "x ") ||
1295 starts_with(line->buf, "label ") ||
1296 starts_with(line->buf, "l "))
Guillaume Pagès84e6fb92015-07-06 22:56:03 +02001297 return;
1298
1299 split = strbuf_split_max(line, ' ', 3);
1300 if (split[0] && split[1]) {
brian m. carlsone86ab2c2017-02-21 23:47:37 +00001301 struct object_id oid;
Guillaume Pagès84e6fb92015-07-06 22:56:03 +02001302
1303 /*
1304 * strbuf_split_max left a space. Trim it and re-add
1305 * it after abbreviation.
1306 */
1307 strbuf_trim(split[1]);
brian m. carlsone86ab2c2017-02-21 23:47:37 +00001308 if (!get_oid(split[1]->buf, &oid)) {
Guillaume Pagès84e6fb92015-07-06 22:56:03 +02001309 strbuf_reset(split[1]);
brian m. carlson30e677e2018-03-12 02:27:28 +00001310 strbuf_add_unique_abbrev(split[1], &oid,
René Scharfea94bb682016-10-08 17:38:47 +02001311 DEFAULT_ABBREV);
1312 strbuf_addch(split[1], ' ');
Guillaume Pagès84e6fb92015-07-06 22:56:03 +02001313 strbuf_reset(line);
1314 for (i = 0; split[i]; i++)
René Scharfe81099842016-07-19 20:36:29 +02001315 strbuf_addbuf(line, split[i]);
Guillaume Pagès84e6fb92015-07-06 22:56:03 +02001316 }
1317 }
Stefan Beller6eb60782016-03-31 17:35:44 -07001318 strbuf_list_free(split);
Guillaume Pagès84e6fb92015-07-06 22:56:03 +02001319}
1320
Johannes Schindelindf9ded42017-01-26 17:08:41 +01001321static int read_rebase_todolist(const char *fname, struct string_list *lines)
Guillaume Pagès84e6fb92015-07-06 22:56:03 +02001322{
1323 struct strbuf line = STRBUF_INIT;
1324 FILE *f = fopen(git_path("%s", fname), "r");
1325
Johannes Schindelindf9ded42017-01-26 17:08:41 +01001326 if (!f) {
1327 if (errno == ENOENT)
1328 return -1;
Guillaume Pagès84e6fb92015-07-06 22:56:03 +02001329 die_errno("Could not open file %s for reading",
1330 git_path("%s", fname));
Johannes Schindelindf9ded42017-01-26 17:08:41 +01001331 }
Junio C Hamano8f309ae2016-01-13 15:31:17 -08001332 while (!strbuf_getline_lf(&line, f)) {
Guillaume Pagès84e6fb92015-07-06 22:56:03 +02001333 if (line.len && line.buf[0] == comment_line_char)
1334 continue;
1335 strbuf_trim(&line);
1336 if (!line.len)
1337 continue;
Martin Ågrenb1f1ade2020-09-27 15:15:41 +02001338 abbrev_oid_in_line(&line);
Guillaume Pagès84e6fb92015-07-06 22:56:03 +02001339 string_list_append(lines, line.buf);
1340 }
Johannes Schindeline7b65e22017-05-04 15:55:52 +02001341 fclose(f);
Rene Scharfe6f495412017-08-30 20:20:17 +02001342 strbuf_release(&line);
Johannes Schindelindf9ded42017-01-26 17:08:41 +01001343 return 0;
Guillaume Pagès84e6fb92015-07-06 22:56:03 +02001344}
1345
1346static void show_rebase_information(struct wt_status *s,
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001347 const char *color)
Guillaume Pagès84e6fb92015-07-06 22:56:03 +02001348{
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001349 if (s->state.rebase_interactive_in_progress) {
Guillaume Pagès84e6fb92015-07-06 22:56:03 +02001350 int i;
1351 int nr_lines_to_show = 2;
1352
1353 struct string_list have_done = STRING_LIST_INIT_DUP;
1354 struct string_list yet_to_do = STRING_LIST_INIT_DUP;
1355
1356 read_rebase_todolist("rebase-merge/done", &have_done);
Johannes Schindelindf9ded42017-01-26 17:08:41 +01001357 if (read_rebase_todolist("rebase-merge/git-rebase-todo",
1358 &yet_to_do))
1359 status_printf_ln(s, color,
1360 _("git-rebase-todo is missing."));
Guillaume Pagès84e6fb92015-07-06 22:56:03 +02001361 if (have_done.nr == 0)
1362 status_printf_ln(s, color, _("No commands done."));
1363 else {
1364 status_printf_ln(s, color,
1365 Q_("Last command done (%d command done):",
1366 "Last commands done (%d commands done):",
1367 have_done.nr),
1368 have_done.nr);
1369 for (i = (have_done.nr > nr_lines_to_show)
1370 ? have_done.nr - nr_lines_to_show : 0;
1371 i < have_done.nr;
1372 i++)
1373 status_printf_ln(s, color, " %s", have_done.items[i].string);
1374 if (have_done.nr > nr_lines_to_show && s->hints)
1375 status_printf_ln(s, color,
1376 _(" (see more in file %s)"), git_path("rebase-merge/done"));
1377 }
1378
1379 if (yet_to_do.nr == 0)
1380 status_printf_ln(s, color,
1381 _("No commands remaining."));
1382 else {
1383 status_printf_ln(s, color,
1384 Q_("Next command to do (%d remaining command):",
1385 "Next commands to do (%d remaining commands):",
1386 yet_to_do.nr),
1387 yet_to_do.nr);
1388 for (i = 0; i < nr_lines_to_show && i < yet_to_do.nr; i++)
1389 status_printf_ln(s, color, " %s", yet_to_do.items[i].string);
1390 if (s->hints)
1391 status_printf_ln(s, color,
1392 _(" (use \"git rebase --edit-todo\" to view and edit)"));
1393 }
1394 string_list_clear(&yet_to_do, 0);
1395 string_list_clear(&have_done, 0);
1396 }
1397}
1398
Guillaume Pagès05eb5632015-06-30 15:01:12 +02001399static void print_rebase_state(struct wt_status *s,
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001400 const char *color)
Guillaume Pagès05eb5632015-06-30 15:01:12 +02001401{
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001402 if (s->state.branch)
Guillaume Pagès05eb5632015-06-30 15:01:12 +02001403 status_printf_ln(s, color,
1404 _("You are currently rebasing branch '%s' on '%s'."),
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001405 s->state.branch,
1406 s->state.onto);
Guillaume Pagès05eb5632015-06-30 15:01:12 +02001407 else
1408 status_printf_ln(s, color,
1409 _("You are currently rebasing."));
1410}
1411
Lucien Kong83c750a2012-06-05 22:21:24 +02001412static void show_rebase_in_progress(struct wt_status *s,
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001413 const char *color)
Lucien Kong83c750a2012-06-05 22:21:24 +02001414{
1415 struct stat st;
1416
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001417 show_rebase_information(s, color);
Lucien Kong83c750a2012-06-05 22:21:24 +02001418 if (has_unmerged(s)) {
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001419 print_rebase_state(s, color);
Matthieu Moy6a964f52013-09-12 12:50:05 +02001420 if (s->hints) {
Lucien Kong83c750a2012-06-05 22:21:24 +02001421 status_printf_ln(s, color,
1422 _(" (fix conflicts and then run \"git rebase --continue\")"));
1423 status_printf_ln(s, color,
1424 _(" (use \"git rebase --skip\" to skip this patch)"));
1425 status_printf_ln(s, color,
1426 _(" (use \"git rebase --abort\" to check out the original branch)"));
1427 }
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001428 } else if (s->state.rebase_in_progress ||
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +01001429 !stat(git_path_merge_msg(s->repo), &st)) {
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001430 print_rebase_state(s, color);
Matthieu Moy6a964f52013-09-12 12:50:05 +02001431 if (s->hints)
Lucien Kong83c750a2012-06-05 22:21:24 +02001432 status_printf_ln(s, color,
1433 _(" (all conflicts fixed: run \"git rebase --continue\")"));
Lucien Kong2d1cceb2012-06-10 13:17:38 +02001434 } else if (split_commit_in_progress(s)) {
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001435 if (s->state.branch)
Nguyễn Thái Ngọc Duy0722c802013-02-03 12:53:27 +07001436 status_printf_ln(s, color,
1437 _("You are currently splitting a commit while rebasing branch '%s' on '%s'."),
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001438 s->state.branch,
1439 s->state.onto);
Nguyễn Thái Ngọc Duy0722c802013-02-03 12:53:27 +07001440 else
1441 status_printf_ln(s, color,
1442 _("You are currently splitting a commit during a rebase."));
Matthieu Moy6a964f52013-09-12 12:50:05 +02001443 if (s->hints)
Lucien Kong2d1cceb2012-06-10 13:17:38 +02001444 status_printf_ln(s, color,
1445 _(" (Once your working directory is clean, run \"git rebase --continue\")"));
Lucien Kong83c750a2012-06-05 22:21:24 +02001446 } else {
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001447 if (s->state.branch)
Nguyễn Thái Ngọc Duy0722c802013-02-03 12:53:27 +07001448 status_printf_ln(s, color,
1449 _("You are currently editing a commit while rebasing branch '%s' on '%s'."),
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001450 s->state.branch,
1451 s->state.onto);
Nguyễn Thái Ngọc Duy0722c802013-02-03 12:53:27 +07001452 else
1453 status_printf_ln(s, color,
1454 _("You are currently editing a commit during a rebase."));
Matthieu Moy6a964f52013-09-12 12:50:05 +02001455 if (s->hints && !s->amend) {
Lucien Kong83c750a2012-06-05 22:21:24 +02001456 status_printf_ln(s, color,
1457 _(" (use \"git commit --amend\" to amend the current commit)"));
1458 status_printf_ln(s, color,
1459 _(" (use \"git rebase --continue\" once you are satisfied with your changes)"));
1460 }
1461 }
Jeff Hostetler957a0fe2016-08-05 18:00:26 -04001462 wt_longstatus_print_trailer(s);
Lucien Kong83c750a2012-06-05 22:21:24 +02001463}
1464
1465static void show_cherry_pick_in_progress(struct wt_status *s,
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001466 const char *color)
Lucien Kong83c750a2012-06-05 22:21:24 +02001467{
Phillip Wood4a724862019-04-16 11:18:42 +01001468 if (is_null_oid(&s->state.cherry_pick_head_oid))
1469 status_printf_ln(s, color,
1470 _("Cherry-pick currently in progress."));
1471 else
1472 status_printf_ln(s, color,
1473 _("You are currently cherry-picking commit %s."),
1474 find_unique_abbrev(&s->state.cherry_pick_head_oid,
1475 DEFAULT_ABBREV));
1476
Matthieu Moy6a964f52013-09-12 12:50:05 +02001477 if (s->hints) {
Lucien Kong83c750a2012-06-05 22:21:24 +02001478 if (has_unmerged(s))
1479 status_printf_ln(s, color,
Ralf Thielowb95e66f2013-06-17 06:28:26 +02001480 _(" (fix conflicts and run \"git cherry-pick --continue\")"));
Phillip Wood4a724862019-04-16 11:18:42 +01001481 else if (is_null_oid(&s->state.cherry_pick_head_oid))
1482 status_printf_ln(s, color,
1483 _(" (run \"git cherry-pick --continue\" to continue)"));
Lucien Kong83c750a2012-06-05 22:21:24 +02001484 else
1485 status_printf_ln(s, color,
Ralf Thielowb95e66f2013-06-17 06:28:26 +02001486 _(" (all conflicts fixed: run \"git cherry-pick --continue\")"));
1487 status_printf_ln(s, color,
Denton Liu86ae43d2019-08-27 00:45:41 -04001488 _(" (use \"git cherry-pick --skip\" to skip this patch)"));
1489 status_printf_ln(s, color,
Ralf Thielowb95e66f2013-06-17 06:28:26 +02001490 _(" (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"));
Lucien Kong83c750a2012-06-05 22:21:24 +02001491 }
Jeff Hostetler957a0fe2016-08-05 18:00:26 -04001492 wt_longstatus_print_trailer(s);
Lucien Kong83c750a2012-06-05 22:21:24 +02001493}
1494
Matthieu Moydb4ef442013-04-02 16:20:21 +02001495static void show_revert_in_progress(struct wt_status *s,
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001496 const char *color)
Matthieu Moydb4ef442013-04-02 16:20:21 +02001497{
Phillip Wood4a724862019-04-16 11:18:42 +01001498 if (is_null_oid(&s->state.revert_head_oid))
1499 status_printf_ln(s, color,
1500 _("Revert currently in progress."));
1501 else
1502 status_printf_ln(s, color,
1503 _("You are currently reverting commit %s."),
1504 find_unique_abbrev(&s->state.revert_head_oid,
1505 DEFAULT_ABBREV));
Matthieu Moy6a964f52013-09-12 12:50:05 +02001506 if (s->hints) {
Matthieu Moydb4ef442013-04-02 16:20:21 +02001507 if (has_unmerged(s))
1508 status_printf_ln(s, color,
1509 _(" (fix conflicts and run \"git revert --continue\")"));
Phillip Wood4a724862019-04-16 11:18:42 +01001510 else if (is_null_oid(&s->state.revert_head_oid))
1511 status_printf_ln(s, color,
1512 _(" (run \"git revert --continue\" to continue)"));
Matthieu Moydb4ef442013-04-02 16:20:21 +02001513 else
1514 status_printf_ln(s, color,
1515 _(" (all conflicts fixed: run \"git revert --continue\")"));
1516 status_printf_ln(s, color,
Denton Liu86ae43d2019-08-27 00:45:41 -04001517 _(" (use \"git revert --skip\" to skip this patch)"));
1518 status_printf_ln(s, color,
Matthieu Moydb4ef442013-04-02 16:20:21 +02001519 _(" (use \"git revert --abort\" to cancel the revert operation)"));
1520 }
Jeff Hostetler957a0fe2016-08-05 18:00:26 -04001521 wt_longstatus_print_trailer(s);
Matthieu Moydb4ef442013-04-02 16:20:21 +02001522}
1523
Lucien Kong83c750a2012-06-05 22:21:24 +02001524static void show_bisect_in_progress(struct wt_status *s,
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001525 const char *color)
Lucien Kong83c750a2012-06-05 22:21:24 +02001526{
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001527 if (s->state.branch)
Nguyễn Thái Ngọc Duy0722c802013-02-03 12:53:27 +07001528 status_printf_ln(s, color,
Nguyễn Thái Ngọc Duy6deab242013-03-23 10:52:44 +07001529 _("You are currently bisecting, started from branch '%s'."),
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001530 s->state.branch);
Nguyễn Thái Ngọc Duy0722c802013-02-03 12:53:27 +07001531 else
1532 status_printf_ln(s, color,
1533 _("You are currently bisecting."));
Matthieu Moy6a964f52013-09-12 12:50:05 +02001534 if (s->hints)
Lucien Kong83c750a2012-06-05 22:21:24 +02001535 status_printf_ln(s, color,
1536 _(" (use \"git bisect reset\" to get back to the original branch)"));
Jeff Hostetler957a0fe2016-08-05 18:00:26 -04001537 wt_longstatus_print_trailer(s);
Lucien Kong83c750a2012-06-05 22:21:24 +02001538}
1539
Elijah Newren051df3c2020-06-18 20:49:57 +00001540static void show_sparse_checkout_in_use(struct wt_status *s,
1541 const char *color)
1542{
1543 if (s->state.sparse_checkout_percentage == SPARSE_CHECKOUT_DISABLED)
1544 return;
1545
Derrick Stoleebf48e5a2021-07-14 13:12:36 +00001546 if (s->state.sparse_checkout_percentage == SPARSE_CHECKOUT_SPARSE_INDEX)
1547 status_printf_ln(s, color, _("You are in a sparse checkout."));
1548 else
1549 status_printf_ln(s, color,
1550 _("You are in a sparse checkout with %d%% of tracked files present."),
1551 s->state.sparse_checkout_percentage);
Elijah Newren051df3c2020-06-18 20:49:57 +00001552 wt_longstatus_print_trailer(s);
1553}
1554
Nguyễn Thái Ngọc Duy0722c802013-02-03 12:53:27 +07001555/*
1556 * Extract branch information from rebase/bisect
1557 */
Nguyễn Thái Ngọc Duy81eff272016-04-22 20:01:31 +07001558static char *get_branch(const struct worktree *wt, const char *path)
Nguyễn Thái Ngọc Duy0722c802013-02-03 12:53:27 +07001559{
Nguyễn Thái Ngọc Duy8b87cfd2013-03-16 09:12:36 +07001560 struct strbuf sb = STRBUF_INIT;
brian m. carlsone86ab2c2017-02-21 23:47:37 +00001561 struct object_id oid;
René Scharfec72b49d2015-10-31 18:37:43 +01001562 const char *branch_name;
Nguyễn Thái Ngọc Duy0722c802013-02-03 12:53:27 +07001563
Nguyễn Thái Ngọc Duy81eff272016-04-22 20:01:31 +07001564 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 +07001565 goto got_nothing;
Nguyễn Thái Ngọc Duy0722c802013-02-03 12:53:27 +07001566
Jeff King66ec9042015-01-28 12:57:35 -05001567 while (sb.len && sb.buf[sb.len - 1] == '\n')
Nguyễn Thái Ngọc Duy8b87cfd2013-03-16 09:12:36 +07001568 strbuf_setlen(&sb, sb.len - 1);
1569 if (!sb.len)
1570 goto got_nothing;
René Scharfec72b49d2015-10-31 18:37:43 +01001571 if (skip_prefix(sb.buf, "refs/heads/", &branch_name))
1572 strbuf_remove(&sb, 0, branch_name - sb.buf);
Christian Couder59556542013-11-30 21:55:40 +01001573 else if (starts_with(sb.buf, "refs/"))
Nguyễn Thái Ngọc Duy8b87cfd2013-03-16 09:12:36 +07001574 ;
brian m. carlsone86ab2c2017-02-21 23:47:37 +00001575 else if (!get_oid_hex(sb.buf, &oid)) {
Nguyễn Thái Ngọc Duy8b87cfd2013-03-16 09:12:36 +07001576 strbuf_reset(&sb);
brian m. carlson30e677e2018-03-12 02:27:28 +00001577 strbuf_add_unique_abbrev(&sb, &oid, DEFAULT_ABBREV);
Nguyễn Thái Ngọc Duy8b87cfd2013-03-16 09:12:36 +07001578 } else if (!strcmp(sb.buf, "detached HEAD")) /* rebase */
1579 goto got_nothing;
Nguyễn Thái Ngọc Duy0722c802013-02-03 12:53:27 +07001580 else /* bisect */
Nguyễn Thái Ngọc Duy8b87cfd2013-03-16 09:12:36 +07001581 ;
1582 return strbuf_detach(&sb, NULL);
1583
1584got_nothing:
1585 strbuf_release(&sb);
1586 return NULL;
Nguyễn Thái Ngọc Duy0722c802013-02-03 12:53:27 +07001587}
1588
Nguyễn Thái Ngọc Duyb397ea42013-03-13 18:42:52 +07001589struct grab_1st_switch_cbdata {
Nguyễn Thái Ngọc Duyb397ea42013-03-13 18:42:52 +07001590 struct strbuf buf;
brian m. carlsone86ab2c2017-02-21 23:47:37 +00001591 struct object_id noid;
Nguyễn Thái Ngọc Duyb397ea42013-03-13 18:42:52 +07001592};
1593
brian m. carlson9461d272017-02-21 23:47:32 +00001594static int grab_1st_switch(struct object_id *ooid, struct object_id *noid,
Johannes Schindelindddbad72017-04-26 21:29:31 +02001595 const char *email, timestamp_t timestamp, int tz,
Nguyễn Thái Ngọc Duyb397ea42013-03-13 18:42:52 +07001596 const char *message, void *cb_data)
Lucien Kong83c750a2012-06-05 22:21:24 +02001597{
Nguyễn Thái Ngọc Duyb397ea42013-03-13 18:42:52 +07001598 struct grab_1st_switch_cbdata *cb = cb_data;
1599 const char *target = NULL, *end;
1600
René Scharfec72b49d2015-10-31 18:37:43 +01001601 if (!skip_prefix(message, "checkout: moving from ", &message))
Nguyễn Thái Ngọc Duyb397ea42013-03-13 18:42:52 +07001602 return 0;
Nguyễn Thái Ngọc Duyb397ea42013-03-13 18:42:52 +07001603 target = strstr(message, " to ");
1604 if (!target)
1605 return 0;
1606 target += strlen(" to ");
1607 strbuf_reset(&cb->buf);
brian m. carlsone86ab2c2017-02-21 23:47:37 +00001608 oidcpy(&cb->noid, noid);
René Scharfe904de442015-11-25 15:10:18 +01001609 end = strchrnul(target, '\n');
1610 strbuf_add(&cb->buf, target, end - target);
1611 if (!strcmp(cb->buf.buf, "HEAD")) {
Matthieu Moy0eb85482015-09-27 17:13:42 +02001612 /* HEAD is relative. Resolve it to the right reflog entry. */
René Scharfe904de442015-11-25 15:10:18 +01001613 strbuf_reset(&cb->buf);
brian m. carlson30e677e2018-03-12 02:27:28 +00001614 strbuf_add_unique_abbrev(&cb->buf, noid, DEFAULT_ABBREV);
Matthieu Moy0eb85482015-09-27 17:13:42 +02001615 }
Nguyễn Thái Ngọc Duyb397ea42013-03-13 18:42:52 +07001616 return 1;
1617}
1618
Nguyễn Thái Ngọc Duy78845452018-11-10 06:48:50 +01001619static void wt_status_get_detached_from(struct repository *r,
1620 struct wt_status_state *state)
Nguyễn Thái Ngọc Duyb397ea42013-03-13 18:42:52 +07001621{
1622 struct grab_1st_switch_cbdata cb;
1623 struct commit *commit;
brian m. carlsone86ab2c2017-02-21 23:47:37 +00001624 struct object_id oid;
Nguyễn Thái Ngọc Duyb397ea42013-03-13 18:42:52 +07001625 char *ref = NULL;
1626
1627 strbuf_init(&cb.buf, 0);
1628 if (for_each_reflog_ent_reverse("HEAD", grab_1st_switch, &cb) <= 0) {
1629 strbuf_release(&cb.buf);
1630 return;
1631 }
1632
Jonathan Tanf24c30e2020-09-01 15:28:09 -07001633 if (dwim_ref(cb.buf.buf, cb.buf.len, &oid, &ref, 1) == 1 &&
Martin Ågrenb1f1ade2020-09-27 15:15:41 +02001634 /* oid is a commit? match without further lookup */
Jeff King4a7e27e2018-08-28 17:22:40 -04001635 (oideq(&cb.noid, &oid) ||
Martin Ågrenb1f1ade2020-09-27 15:15:41 +02001636 /* perhaps oid is a tag, try to dereference to a commit */
Nguyễn Thái Ngọc Duy78845452018-11-10 06:48:50 +01001637 ((commit = lookup_commit_reference_gently(r, &oid, 1)) != NULL &&
Jeff King4a7e27e2018-08-28 17:22:40 -04001638 oideq(&cb.noid, &commit->object.oid)))) {
René Scharfec72b49d2015-10-31 18:37:43 +01001639 const char *from = ref;
1640 if (!skip_prefix(from, "refs/tags/", &from))
1641 skip_prefix(from, "refs/remotes/", &from);
1642 state->detached_from = xstrdup(from);
Nguyễn Thái Ngọc Duyb397ea42013-03-13 18:42:52 +07001643 } else
1644 state->detached_from =
brian m. carlsonaab95832018-03-12 02:27:30 +00001645 xstrdup(find_unique_abbrev(&cb.noid, DEFAULT_ABBREV));
brian m. carlson40f55552018-03-12 02:27:29 +00001646 oidcpy(&state->detached_oid, &cb.noid);
brian m. carlsone86ab2c2017-02-21 23:47:37 +00001647 state->detached_at = !get_oid("HEAD", &oid) &&
Jeff King4a7e27e2018-08-28 17:22:40 -04001648 oideq(&oid, &state->detached_oid);
Nguyễn Thái Ngọc Duyb397ea42013-03-13 18:42:52 +07001649
1650 free(ref);
1651 strbuf_release(&cb.buf);
1652}
1653
Nguyễn Thái Ngọc Duy81eff272016-04-22 20:01:31 +07001654int wt_status_check_rebase(const struct worktree *wt,
1655 struct wt_status_state *state)
Nguyễn Thái Ngọc Duyb9691db2013-03-13 18:42:50 +07001656{
Lucien Kong83c750a2012-06-05 22:21:24 +02001657 struct stat st;
1658
Nguyễn Thái Ngọc Duy81eff272016-04-22 20:01:31 +07001659 if (!stat(worktree_git_path(wt, "rebase-apply"), &st)) {
1660 if (!stat(worktree_git_path(wt, "rebase-apply/applying"), &st)) {
Nguyễn Thái Ngọc Duyb9691db2013-03-13 18:42:50 +07001661 state->am_in_progress = 1;
Nguyễn Thái Ngọc Duy81eff272016-04-22 20:01:31 +07001662 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 +07001663 state->am_empty_patch = 1;
Lucien Kong83c750a2012-06-05 22:21:24 +02001664 } else {
Nguyễn Thái Ngọc Duyb9691db2013-03-13 18:42:50 +07001665 state->rebase_in_progress = 1;
Nguyễn Thái Ngọc Duy81eff272016-04-22 20:01:31 +07001666 state->branch = get_branch(wt, "rebase-apply/head-name");
1667 state->onto = get_branch(wt, "rebase-apply/onto");
Lucien Kong83c750a2012-06-05 22:21:24 +02001668 }
Nguyễn Thái Ngọc Duy81eff272016-04-22 20:01:31 +07001669 } else if (!stat(worktree_git_path(wt, "rebase-merge"), &st)) {
1670 if (!stat(worktree_git_path(wt, "rebase-merge/interactive"), &st))
Nguyễn Thái Ngọc Duyb9691db2013-03-13 18:42:50 +07001671 state->rebase_interactive_in_progress = 1;
Lucien Kong83c750a2012-06-05 22:21:24 +02001672 else
Nguyễn Thái Ngọc Duyb9691db2013-03-13 18:42:50 +07001673 state->rebase_in_progress = 1;
Nguyễn Thái Ngọc Duy81eff272016-04-22 20:01:31 +07001674 state->branch = get_branch(wt, "rebase-merge/head-name");
1675 state->onto = get_branch(wt, "rebase-merge/onto");
Nguyễn Thái Ngọc Duybcd522a2016-04-22 20:01:30 +07001676 } else
1677 return 0;
1678 return 1;
1679}
1680
Nguyễn Thái Ngọc Duyf5d067a2016-04-22 20:01:34 +07001681int wt_status_check_bisect(const struct worktree *wt,
1682 struct wt_status_state *state)
1683{
1684 struct stat st;
1685
1686 if (!stat(worktree_git_path(wt, "BISECT_LOG"), &st)) {
1687 state->bisect_in_progress = 1;
1688 state->branch = get_branch(wt, "BISECT_START");
1689 return 1;
1690 }
1691 return 0;
1692}
1693
Elijah Newren051df3c2020-06-18 20:49:57 +00001694static void wt_status_check_sparse_checkout(struct repository *r,
1695 struct wt_status_state *state)
1696{
1697 int skip_worktree = 0;
1698 int i;
1699
1700 if (!core_apply_sparse_checkout || r->index->cache_nr == 0) {
1701 /*
1702 * Don't compute percentage of checked out files if we
1703 * aren't in a sparse checkout or would get division by 0.
1704 */
1705 state->sparse_checkout_percentage = SPARSE_CHECKOUT_DISABLED;
1706 return;
1707 }
1708
Derrick Stoleebf48e5a2021-07-14 13:12:36 +00001709 if (r->index->sparse_index) {
1710 state->sparse_checkout_percentage = SPARSE_CHECKOUT_SPARSE_INDEX;
1711 return;
1712 }
1713
Elijah Newren051df3c2020-06-18 20:49:57 +00001714 for (i = 0; i < r->index->cache_nr; i++) {
1715 struct cache_entry *ce = r->index->cache[i];
1716 if (ce_skip_worktree(ce))
1717 skip_worktree++;
1718 }
1719
1720 state->sparse_checkout_percentage =
1721 100 - (100 * skip_worktree)/r->index->cache_nr;
1722}
1723
Nguyễn Thái Ngọc Duy78845452018-11-10 06:48:50 +01001724void wt_status_get_state(struct repository *r,
1725 struct wt_status_state *state,
Lucien Kong83c750a2012-06-05 22:21:24 +02001726 int get_detached_from)
1727{
1728 struct stat st;
brian m. carlsone86ab2c2017-02-21 23:47:37 +00001729 struct object_id oid;
Phillip Wood4a724862019-04-16 11:18:42 +01001730 enum replay_action action;
Lucien Kong83c750a2012-06-05 22:21:24 +02001731
Nguyễn Thái Ngọc Duy78845452018-11-10 06:48:50 +01001732 if (!stat(git_path_merge_head(r), &st)) {
Johannes Schindelin982288e2018-11-12 15:26:02 -08001733 wt_status_check_rebase(NULL, state);
Lucien Kong83c750a2012-06-05 22:21:24 +02001734 state->merge_in_progress = 1;
Nguyễn Thái Ngọc Duy81eff272016-04-22 20:01:31 +07001735 } else if (wt_status_check_rebase(NULL, state)) {
Nguyễn Thái Ngọc Duybcd522a2016-04-22 20:01:30 +07001736 ; /* all set */
Han-Wen Nienhuysc8e41592020-08-21 16:59:35 +00001737 } else if (refs_ref_exists(get_main_ref_store(r), "CHERRY_PICK_HEAD") &&
1738 !get_oid("CHERRY_PICK_HEAD", &oid)) {
Nguyễn Thái Ngọc Duyb9691db2013-03-13 18:42:50 +07001739 state->cherry_pick_in_progress = 1;
brian m. carlson40f55552018-03-12 02:27:29 +00001740 oidcpy(&state->cherry_pick_head_oid, &oid);
Lucien Kong83c750a2012-06-05 22:21:24 +02001741 }
Nguyễn Thái Ngọc Duyf5d067a2016-04-22 20:01:34 +07001742 wt_status_check_bisect(NULL, state);
Han-Wen Nienhuysb8825ef2020-08-21 16:59:37 +00001743 if (refs_ref_exists(get_main_ref_store(r), "REVERT_HEAD") &&
brian m. carlsone86ab2c2017-02-21 23:47:37 +00001744 !get_oid("REVERT_HEAD", &oid)) {
Matthieu Moydb4ef442013-04-02 16:20:21 +02001745 state->revert_in_progress = 1;
brian m. carlson40f55552018-03-12 02:27:29 +00001746 oidcpy(&state->revert_head_oid, &oid);
Matthieu Moydb4ef442013-04-02 16:20:21 +02001747 }
Phillip Wood4a724862019-04-16 11:18:42 +01001748 if (!sequencer_get_last_command(r, &action)) {
1749 if (action == REPLAY_PICK) {
1750 state->cherry_pick_in_progress = 1;
brian m. carlson14228442021-04-26 01:02:56 +00001751 oidcpy(&state->cherry_pick_head_oid, null_oid());
Phillip Wood4a724862019-04-16 11:18:42 +01001752 } else {
1753 state->revert_in_progress = 1;
brian m. carlson14228442021-04-26 01:02:56 +00001754 oidcpy(&state->revert_head_oid, null_oid());
Phillip Wood4a724862019-04-16 11:18:42 +01001755 }
1756 }
Nguyễn Thái Ngọc Duyb397ea42013-03-13 18:42:52 +07001757 if (get_detached_from)
Nguyễn Thái Ngọc Duy78845452018-11-10 06:48:50 +01001758 wt_status_get_detached_from(r, state);
Elijah Newren051df3c2020-06-18 20:49:57 +00001759 wt_status_check_sparse_checkout(r, state);
Nguyễn Thái Ngọc Duyb9691db2013-03-13 18:42:50 +07001760}
1761
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001762static void wt_longstatus_print_state(struct wt_status *s)
Lucien Kong83c750a2012-06-05 22:21:24 +02001763{
1764 const char *state_color = color(WT_STATUS_HEADER, s);
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001765 struct wt_status_state *state = &s->state;
1766
Johannes Schindelin982288e2018-11-12 15:26:02 -08001767 if (state->merge_in_progress) {
1768 if (state->rebase_interactive_in_progress) {
1769 show_rebase_information(s, state_color);
1770 fputs("\n", s->fp);
1771 }
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001772 show_merge_in_progress(s, state_color);
Johannes Schindelin982288e2018-11-12 15:26:02 -08001773 } else if (state->am_in_progress)
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001774 show_am_in_progress(s, state_color);
Nguyễn Thái Ngọc Duy3b691cc2013-03-13 18:42:51 +07001775 else if (state->rebase_in_progress || state->rebase_interactive_in_progress)
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001776 show_rebase_in_progress(s, state_color);
Nguyễn Thái Ngọc Duy3b691cc2013-03-13 18:42:51 +07001777 else if (state->cherry_pick_in_progress)
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001778 show_cherry_pick_in_progress(s, state_color);
Matthieu Moydb4ef442013-04-02 16:20:21 +02001779 else if (state->revert_in_progress)
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001780 show_revert_in_progress(s, state_color);
Nguyễn Thái Ngọc Duy3b691cc2013-03-13 18:42:51 +07001781 if (state->bisect_in_progress)
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001782 show_bisect_in_progress(s, state_color);
Elijah Newren051df3c2020-06-18 20:49:57 +00001783
1784 if (state->sparse_checkout_percentage != SPARSE_CHECKOUT_DISABLED)
1785 show_sparse_checkout_in_use(s, state_color);
Lucien Kong83c750a2012-06-05 22:21:24 +02001786}
1787
Jeff Hostetlerbe7e7952016-08-05 18:00:27 -04001788static void wt_longstatus_print(struct wt_status *s)
Jeff Kingc91f0d92006-09-08 04:05:34 -04001789{
Aleksi Aalto1d282322010-11-18 01:40:05 +02001790 const char *branch_color = color(WT_STATUS_ONBRANCH, s);
1791 const char *branch_status_color = color(WT_STATUS_HEADER, s);
Jürgen Rühle98bf8a42007-01-02 20:26:23 +01001792
Junio C Hamanobda324c2007-01-03 01:09:34 -08001793 if (s->branch) {
Ævar Arnfjörð Bjarmason355ec7a2011-02-22 23:42:13 +00001794 const char *on_what = _("On branch ");
Junio C Hamanobda324c2007-01-03 01:09:34 -08001795 const char *branch_name = s->branch;
René Scharfec72b49d2015-10-31 18:37:43 +01001796 if (!strcmp(branch_name, "HEAD")) {
Aleksi Aalto1d282322010-11-18 01:40:05 +02001797 branch_status_color = color(WT_STATUS_NOBRANCH, s);
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001798 if (s->state.rebase_in_progress ||
1799 s->state.rebase_interactive_in_progress) {
1800 if (s->state.rebase_interactive_in_progress)
Guillaume Pagèsdf25e942015-06-30 15:01:13 +02001801 on_what = _("interactive rebase in progress; onto ");
1802 else
1803 on_what = _("rebase in progress; onto ");
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001804 branch_name = s->state.onto;
1805 } else if (s->state.detached_from) {
1806 branch_name = s->state.detached_from;
1807 if (s->state.detached_at)
Ævar Arnfjörð Bjarmason2708ce62021-01-07 10:51:52 +01001808 on_what = _("HEAD detached at ");
Nguyễn Thái Ngọc Duyb397ea42013-03-13 18:42:52 +07001809 else
Ævar Arnfjörð Bjarmason2708ce62021-01-07 10:51:52 +01001810 on_what = _("HEAD detached from ");
Nguyễn Thái Ngọc Duyb397ea42013-03-13 18:42:52 +07001811 } else {
1812 branch_name = "";
1813 on_what = _("Not currently on any branch.");
1814 }
René Scharfec72b49d2015-10-31 18:37:43 +01001815 } else
1816 skip_prefix(branch_name, "refs/heads/", &branch_name);
Felipe Contreras7d7d6802014-05-04 01:12:55 -05001817 status_printf(s, color(WT_STATUS_HEADER, s), "%s", "");
Jonathan Niederb926c0d2011-02-25 23:11:37 -06001818 status_printf_more(s, branch_status_color, "%s", on_what);
1819 status_printf_more(s, branch_color, "%s\n", branch_name);
Junio C Hamanob6975ab2008-07-02 00:52:16 -07001820 if (!s->is_initial)
Jeff Hostetler957a0fe2016-08-05 18:00:26 -04001821 wt_longstatus_print_tracking(s);
Junio C Hamanobda324c2007-01-03 01:09:34 -08001822 }
Jeff Kingc91f0d92006-09-08 04:05:34 -04001823
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07001824 wt_longstatus_print_state(s);
Nguyễn Thái Ngọc Duy3b691cc2013-03-13 18:42:51 +07001825
Jeff Kingc91f0d92006-09-08 04:05:34 -04001826 if (s->is_initial) {
Felipe Contreras7d7d6802014-05-04 01:12:55 -05001827 status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", "");
Kaartic Sivaraam4ddb1352017-06-21 23:46:14 +05301828 status_printf_ln(s, color(WT_STATUS_HEADER, s),
1829 s->commit_template
1830 ? _("Initial commit")
1831 : _("No commits yet"));
Felipe Contreras7d7d6802014-05-04 01:12:55 -05001832 status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", "");
Jeff Kingc91f0d92006-09-08 04:05:34 -04001833 }
1834
Jeff Hostetler957a0fe2016-08-05 18:00:26 -04001835 wt_longstatus_print_updated(s);
1836 wt_longstatus_print_unmerged(s);
1837 wt_longstatus_print_changed(s);
Jens Lehmann46a958b2010-06-25 16:56:47 +02001838 if (s->submodule_summary &&
1839 (!s->ignore_submodule_arg ||
1840 strcmp(s->ignore_submodule_arg, "all"))) {
Jeff Hostetler957a0fe2016-08-05 18:00:26 -04001841 wt_longstatus_print_submodule_summary(s, 0); /* staged */
1842 wt_longstatus_print_submodule_summary(s, 1); /* unstaged */
Jens Lehmannf17a5d32010-01-17 20:42:31 +01001843 }
Junio C Hamano2381e392010-04-10 00:33:17 -07001844 if (s->show_untracked_files) {
Jeff Hostetler957a0fe2016-08-05 18:00:26 -04001845 wt_longstatus_print_other(s, &s->untracked, _("Untracked files"), "add");
Jameson Millereec0f7f2017-10-30 13:21:37 -04001846 if (s->show_ignored_mode)
Jeff Hostetler957a0fe2016-08-05 18:00:26 -04001847 wt_longstatus_print_other(s, &s->ignored, _("Ignored files"), "add -f");
Ben Boeckeled9bff02021-08-23 12:44:00 +02001848 if (advice_enabled(ADVICE_STATUS_U_OPTION) && 2000 < s->untracked_in_ms) {
Felipe Contreras7d7d6802014-05-04 01:12:55 -05001849 status_printf_ln(s, GIT_COLOR_NORMAL, "%s", "");
Nguyễn Thái Ngọc Duy6a38ef22013-03-13 19:59:16 +07001850 status_printf_ln(s, GIT_COLOR_NORMAL,
Jiang Xin62901172013-04-12 11:53:01 +08001851 _("It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1852 "may speed it up, but you have to be careful not to forget to add\n"
1853 "new files yourself (see 'git help status')."),
1854 s->untracked_in_ms / 1000.0);
Nguyễn Thái Ngọc Duy6a38ef22013-03-13 19:59:16 +07001855 }
Stephen P. Smith6fa90192018-09-05 17:53:27 -07001856 } else if (s->committable)
Ævar Arnfjörð Bjarmason355ec7a2011-02-22 23:42:13 +00001857 status_printf_ln(s, GIT_COLOR_NORMAL, _("Untracked files not listed%s"),
Matthieu Moy6a964f52013-09-12 12:50:05 +02001858 s->hints
Ævar Arnfjörð Bjarmason355ec7a2011-02-22 23:42:13 +00001859 ? _(" (use -u option to show untracked files)") : "");
Jeff Kingc91f0d92006-09-08 04:05:34 -04001860
Jeff King1324fb62008-11-12 03:23:37 -05001861 if (s->verbose)
Jeff Hostetler957a0fe2016-08-05 18:00:26 -04001862 wt_longstatus_print_verbose(s);
Stephen P. Smith6fa90192018-09-05 17:53:27 -07001863 if (!s->committable) {
Jürgen Rühle6e458bf2007-01-02 20:26:22 +01001864 if (s->amend)
Ævar Arnfjörð Bjarmason355ec7a2011-02-22 23:42:13 +00001865 status_printf_ln(s, GIT_COLOR_NORMAL, _("No changes"));
Junio C Hamano37d07f82007-12-12 19:09:16 -08001866 else if (s->nowarn)
1867 ; /* nothing */
Nguyễn Thái Ngọc Duy50bd8b72012-09-06 22:16:50 +07001868 else if (s->workdir_dirty) {
Matthieu Moy6a964f52013-09-12 12:50:05 +02001869 if (s->hints)
Martin Ågren8f7e3de2020-09-27 15:15:42 +02001870 fprintf(s->fp, _("no changes added to commit "
1871 "(use \"git add\" and/or "
1872 "\"git commit -a\")\n"));
Nguyễn Thái Ngọc Duy50bd8b72012-09-06 22:16:50 +07001873 else
Martin Ågren8f7e3de2020-09-27 15:15:42 +02001874 fprintf(s->fp, _("no changes added to "
1875 "commit\n"));
Nguyễn Thái Ngọc Duy50bd8b72012-09-06 22:16:50 +07001876 } else if (s->untracked.nr) {
Matthieu Moy6a964f52013-09-12 12:50:05 +02001877 if (s->hints)
Martin Ågren8f7e3de2020-09-27 15:15:42 +02001878 fprintf(s->fp, _("nothing added to commit but "
1879 "untracked files present (use "
1880 "\"git add\" to track)\n"));
Nguyễn Thái Ngọc Duy50bd8b72012-09-06 22:16:50 +07001881 else
Martin Ågren8f7e3de2020-09-27 15:15:42 +02001882 fprintf(s->fp, _("nothing added to commit but "
1883 "untracked files present\n"));
Nguyễn Thái Ngọc Duy50bd8b72012-09-06 22:16:50 +07001884 } else if (s->is_initial) {
Matthieu Moy6a964f52013-09-12 12:50:05 +02001885 if (s->hints)
Martin Ågren8f7e3de2020-09-27 15:15:42 +02001886 fprintf(s->fp, _("nothing to commit (create/"
1887 "copy files and use \"git "
1888 "add\" to track)\n"));
Nguyễn Thái Ngọc Duy50bd8b72012-09-06 22:16:50 +07001889 else
Martin Ågren8f7e3de2020-09-27 15:15:42 +02001890 fprintf(s->fp, _("nothing to commit\n"));
Nguyễn Thái Ngọc Duy50bd8b72012-09-06 22:16:50 +07001891 } else if (!s->show_untracked_files) {
Matthieu Moy6a964f52013-09-12 12:50:05 +02001892 if (s->hints)
Martin Ågren8f7e3de2020-09-27 15:15:42 +02001893 fprintf(s->fp, _("nothing to commit (use -u to "
1894 "show untracked files)\n"));
Nguyễn Thái Ngọc Duy50bd8b72012-09-06 22:16:50 +07001895 else
Martin Ågren8f7e3de2020-09-27 15:15:42 +02001896 fprintf(s->fp, _("nothing to commit\n"));
Nguyễn Thái Ngọc Duy50bd8b72012-09-06 22:16:50 +07001897 } else
Martin Ågren8f7e3de2020-09-27 15:15:42 +02001898 fprintf(s->fp, _("nothing to commit, working tree "
1899 "clean\n"));
Jürgen Rühle6e458bf2007-01-02 20:26:22 +01001900 }
Liam Beguinc1b5d012017-06-17 18:30:51 -04001901 if(s->show_stash)
1902 wt_longstatus_print_stash_summary(s);
Jeff Kingc91f0d92006-09-08 04:05:34 -04001903}
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01001904
Jeff King3207a3a2012-05-07 15:44:44 -04001905static void wt_shortstatus_unmerged(struct string_list_item *it,
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01001906 struct wt_status *s)
1907{
1908 struct wt_status_change_data *d = it->util;
1909 const char *how = "??";
1910
1911 switch (d->stagemask) {
1912 case 1: how = "DD"; break; /* both deleted */
1913 case 2: how = "AU"; break; /* added by us */
1914 case 3: how = "UD"; break; /* deleted by them */
1915 case 4: how = "UA"; break; /* added by them */
1916 case 5: how = "DU"; break; /* deleted by us */
1917 case 6: how = "AA"; break; /* both added */
1918 case 7: how = "UU"; break; /* both modified */
1919 }
Michael J Gruber3fe2a892009-12-05 16:04:38 +01001920 color_fprintf(s->fp, color(WT_STATUS_UNMERGED, s), "%s", how);
Jeff King3207a3a2012-05-07 15:44:44 -04001921 if (s->null_termination) {
Martin Ågren8f7e3de2020-09-27 15:15:42 +02001922 fprintf(s->fp, " %s%c", it->string, 0);
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01001923 } else {
1924 struct strbuf onebuf = STRBUF_INIT;
1925 const char *one;
Junio C Hamanoa361dd32020-09-10 10:01:57 -07001926 one = quote_path(it->string, s->prefix, &onebuf, QUOTE_PATH_QUOTE_SP);
Martin Ågren8f7e3de2020-09-27 15:15:42 +02001927 fprintf(s->fp, " %s\n", one);
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01001928 strbuf_release(&onebuf);
1929 }
1930}
1931
Jeff King3207a3a2012-05-07 15:44:44 -04001932static void wt_shortstatus_status(struct string_list_item *it,
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01001933 struct wt_status *s)
1934{
1935 struct wt_status_change_data *d = it->util;
1936
Michael J Gruber3fe2a892009-12-05 16:04:38 +01001937 if (d->index_status)
1938 color_fprintf(s->fp, color(WT_STATUS_UPDATED, s), "%c", d->index_status);
1939 else
Martin Ågren8f7e3de2020-09-27 15:15:42 +02001940 fputc(' ', s->fp);
Michael J Gruber3fe2a892009-12-05 16:04:38 +01001941 if (d->worktree_status)
1942 color_fprintf(s->fp, color(WT_STATUS_CHANGED, s), "%c", d->worktree_status);
1943 else
Martin Ågren8f7e3de2020-09-27 15:15:42 +02001944 fputc(' ', s->fp);
1945 fputc(' ', s->fp);
Jeff King3207a3a2012-05-07 15:44:44 -04001946 if (s->null_termination) {
Martin Ågren8f7e3de2020-09-27 15:15:42 +02001947 fprintf(s->fp, "%s%c", it->string, 0);
Nguyễn Thái Ngọc Duy5134ccd2017-12-27 17:18:38 +07001948 if (d->rename_source)
Martin Ågren8f7e3de2020-09-27 15:15:42 +02001949 fprintf(s->fp, "%s%c", d->rename_source, 0);
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01001950 } else {
1951 struct strbuf onebuf = STRBUF_INIT;
1952 const char *one;
Nguyễn Thái Ngọc Duy5134ccd2017-12-27 17:18:38 +07001953
1954 if (d->rename_source) {
Junio C Hamanof3fc4a12020-09-10 10:01:55 -07001955 one = quote_path(d->rename_source, s->prefix, &onebuf,
1956 QUOTE_PATH_QUOTE_SP);
Martin Ågren8f7e3de2020-09-27 15:15:42 +02001957 fprintf(s->fp, "%s -> ", one);
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01001958 strbuf_release(&onebuf);
1959 }
Junio C Hamanof3fc4a12020-09-10 10:01:55 -07001960 one = quote_path(it->string, s->prefix, &onebuf, QUOTE_PATH_QUOTE_SP);
Martin Ågren8f7e3de2020-09-27 15:15:42 +02001961 fprintf(s->fp, "%s\n", one);
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01001962 strbuf_release(&onebuf);
1963 }
1964}
1965
Jeff King3207a3a2012-05-07 15:44:44 -04001966static void wt_shortstatus_other(struct string_list_item *it,
Junio C Hamano2381e392010-04-10 00:33:17 -07001967 struct wt_status *s, const char *sign)
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01001968{
Jeff King3207a3a2012-05-07 15:44:44 -04001969 if (s->null_termination) {
Martin Ågren8f7e3de2020-09-27 15:15:42 +02001970 fprintf(s->fp, "%s %s%c", sign, it->string, 0);
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01001971 } else {
1972 struct strbuf onebuf = STRBUF_INIT;
1973 const char *one;
Junio C Hamanoa361dd32020-09-10 10:01:57 -07001974 one = quote_path(it->string, s->prefix, &onebuf, QUOTE_PATH_QUOTE_SP);
Junio C Hamanoc1909e72010-05-01 22:05:14 -07001975 color_fprintf(s->fp, color(WT_STATUS_UNTRACKED, s), "%s", sign);
Martin Ågren8f7e3de2020-09-27 15:15:42 +02001976 fprintf(s->fp, " %s\n", one);
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01001977 strbuf_release(&onebuf);
1978 }
1979}
1980
Daniel Knittl-Frank05a59a02010-05-25 15:45:51 +02001981static void wt_shortstatus_print_tracking(struct wt_status *s)
1982{
1983 struct branch *branch;
1984 const char *header_color = color(WT_STATUS_HEADER, s);
1985 const char *branch_color_local = color(WT_STATUS_LOCAL_BRANCH, s);
1986 const char *branch_color_remote = color(WT_STATUS_REMOTE_BRANCH, s);
1987
1988 const char *base;
René Scharfe5e8d2722017-07-08 12:51:01 +02001989 char *short_base;
Daniel Knittl-Frank05a59a02010-05-25 15:45:51 +02001990 const char *branch_name;
Jeff Hostetler3ca18972018-01-09 18:50:17 +00001991 int num_ours, num_theirs, sti;
Jiang Xinf2e08732013-08-26 15:02:48 +08001992 int upstream_is_gone = 0;
Daniel Knittl-Frank05a59a02010-05-25 15:45:51 +02001993
1994 color_fprintf(s->fp, color(WT_STATUS_HEADER, s), "## ");
1995
1996 if (!s->branch)
1997 return;
1998 branch_name = s->branch;
1999
Michael J Gruberb9e2bc52017-03-14 17:02:02 +01002000#define LABEL(string) (s->no_gettext ? (string) : _(string))
2001
Daniel Knittl-Frank05a59a02010-05-25 15:45:51 +02002002 if (s->is_initial)
Kaartic Sivaraam4ddb1352017-06-21 23:46:14 +05302003 color_fprintf(s->fp, header_color, LABEL(N_("No commits yet on ")));
Jiang Xinf2e08732013-08-26 15:02:48 +08002004
René Scharfebaf0a3e2015-10-31 18:36:35 +01002005 if (!strcmp(s->branch, "HEAD")) {
2006 color_fprintf(s->fp, color(WT_STATUS_NOBRANCH, s), "%s",
Michael J Gruberb9e2bc52017-03-14 17:02:02 +01002007 LABEL(N_("HEAD (no branch)")));
René Scharfebaf0a3e2015-10-31 18:36:35 +01002008 goto conclude;
2009 }
2010
René Scharfec72b49d2015-10-31 18:37:43 +01002011 skip_prefix(branch_name, "refs/heads/", &branch_name);
René Scharfebaf0a3e2015-10-31 18:36:35 +01002012
René Scharfe8d8325f2015-10-31 18:37:12 +01002013 branch = branch_get(branch_name);
René Scharfebaf0a3e2015-10-31 18:36:35 +01002014
Jiang Xinf2e08732013-08-26 15:02:48 +08002015 color_fprintf(s->fp, branch_color_local, "%s", branch_name);
2016
Jeff Hostetler3ca18972018-01-09 18:50:17 +00002017 sti = stat_tracking_info(branch, &num_ours, &num_theirs, &base,
Damien Robertc646d092019-04-16 14:16:46 +02002018 0, s->ahead_behind_flags);
Jeff Hostetler3ca18972018-01-09 18:50:17 +00002019 if (sti < 0) {
René Scharfebcf8cc22015-10-31 18:36:01 +01002020 if (!base)
2021 goto conclude;
Jeff King979cb242015-05-21 20:49:11 -04002022
Jiang Xinf2e08732013-08-26 15:02:48 +08002023 upstream_is_gone = 1;
Daniel Knittl-Frank05a59a02010-05-25 15:45:51 +02002024 }
2025
René Scharfe5e8d2722017-07-08 12:51:01 +02002026 short_base = shorten_unambiguous_ref(base, 0);
Daniel Knittl-Frank05a59a02010-05-25 15:45:51 +02002027 color_fprintf(s->fp, header_color, "...");
René Scharfe5e8d2722017-07-08 12:51:01 +02002028 color_fprintf(s->fp, branch_color_remote, "%s", short_base);
2029 free(short_base);
Daniel Knittl-Frank05a59a02010-05-25 15:45:51 +02002030
Jeff Hostetler3ca18972018-01-09 18:50:17 +00002031 if (!upstream_is_gone && !sti)
René Scharfebcf8cc22015-10-31 18:36:01 +01002032 goto conclude;
Jiang Xinf2234592013-08-26 15:02:49 +08002033
Daniel Knittl-Frank05a59a02010-05-25 15:45:51 +02002034 color_fprintf(s->fp, header_color, " [");
Jiang Xinf2e08732013-08-26 15:02:48 +08002035 if (upstream_is_gone) {
Matthieu Moy7a76c282014-03-20 13:12:41 +01002036 color_fprintf(s->fp, header_color, LABEL(N_("gone")));
Jeff Hostetler3ca18972018-01-09 18:50:17 +00002037 } else if (s->ahead_behind_flags == AHEAD_BEHIND_QUICK) {
2038 color_fprintf(s->fp, header_color, LABEL(N_("different")));
Jiang Xinf2e08732013-08-26 15:02:48 +08002039 } else if (!num_ours) {
Matthieu Moy7a76c282014-03-20 13:12:41 +01002040 color_fprintf(s->fp, header_color, LABEL(N_("behind ")));
Daniel Knittl-Frank05a59a02010-05-25 15:45:51 +02002041 color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
2042 } else if (!num_theirs) {
Michael J Gruberdf227242016-03-14 16:30:33 +01002043 color_fprintf(s->fp, header_color, LABEL(N_("ahead ")));
Daniel Knittl-Frank05a59a02010-05-25 15:45:51 +02002044 color_fprintf(s->fp, branch_color_local, "%d", num_ours);
2045 } else {
Michael J Gruberdf227242016-03-14 16:30:33 +01002046 color_fprintf(s->fp, header_color, LABEL(N_("ahead ")));
Daniel Knittl-Frank05a59a02010-05-25 15:45:51 +02002047 color_fprintf(s->fp, branch_color_local, "%d", num_ours);
Matthieu Moy7a76c282014-03-20 13:12:41 +01002048 color_fprintf(s->fp, header_color, ", %s", LABEL(N_("behind ")));
Daniel Knittl-Frank05a59a02010-05-25 15:45:51 +02002049 color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
2050 }
2051
Jeff Kinga5985232012-05-07 17:02:18 -04002052 color_fprintf(s->fp, header_color, "]");
René Scharfebcf8cc22015-10-31 18:36:01 +01002053 conclude:
Jeff Kinga5985232012-05-07 17:02:18 -04002054 fputc(s->null_termination ? '\0' : '\n', s->fp);
Daniel Knittl-Frank05a59a02010-05-25 15:45:51 +02002055}
2056
Jeff Hostetlerbe7e7952016-08-05 18:00:27 -04002057static void wt_shortstatus_print(struct wt_status *s)
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01002058{
Stefan Bellerd4aae452017-03-16 14:36:19 -07002059 struct string_list_item *it;
Daniel Knittl-Frank05a59a02010-05-25 15:45:51 +02002060
Jeff Kingd4a6bf12012-05-07 17:09:04 -04002061 if (s->show_branch)
Daniel Knittl-Frank05a59a02010-05-25 15:45:51 +02002062 wt_shortstatus_print_tracking(s);
2063
Stefan Bellerd4aae452017-03-16 14:36:19 -07002064 for_each_string_list_item(it, &s->change) {
2065 struct wt_status_change_data *d = it->util;
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01002066
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01002067 if (d->stagemask)
Jeff King3207a3a2012-05-07 15:44:44 -04002068 wt_shortstatus_unmerged(it, s);
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01002069 else
Jeff King3207a3a2012-05-07 15:44:44 -04002070 wt_shortstatus_status(it, s);
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01002071 }
Stefan Bellerd4aae452017-03-16 14:36:19 -07002072 for_each_string_list_item(it, &s->untracked)
Jeff King3207a3a2012-05-07 15:44:44 -04002073 wt_shortstatus_other(it, s, "??");
Junio C Hamano2381e392010-04-10 00:33:17 -07002074
Stefan Bellerd4aae452017-03-16 14:36:19 -07002075 for_each_string_list_item(it, &s->ignored)
Jeff King3207a3a2012-05-07 15:44:44 -04002076 wt_shortstatus_other(it, s, "!!");
Michael J Gruber84dbe7b2009-12-05 16:04:37 +01002077}
Jeff King4a7cc2f2009-12-07 00:17:15 -05002078
Jeff Hostetlerbe7e7952016-08-05 18:00:27 -04002079static void wt_porcelain_print(struct wt_status *s)
Jeff King4a7cc2f2009-12-07 00:17:15 -05002080{
2081 s->use_color = 0;
Jeff King86617682009-12-07 00:26:25 -05002082 s->relative_paths = 0;
2083 s->prefix = NULL;
Matthieu Moy7a76c282014-03-20 13:12:41 +01002084 s->no_gettext = 1;
Jeff Kingd4a6bf12012-05-07 17:09:04 -04002085 wt_shortstatus_print(s);
Jeff King4a7cc2f2009-12-07 00:17:15 -05002086}
Jeff Hostetlerbe7e7952016-08-05 18:00:27 -04002087
Jeff Hostetler24959ba2016-08-11 10:45:58 -04002088/*
Jeff Hostetlerd9fc7462016-08-11 10:45:59 -04002089 * Print branch information for porcelain v2 output. These lines
2090 * are printed when the '--branch' parameter is given.
2091 *
2092 * # branch.oid <commit><eol>
2093 * # branch.head <head><eol>
2094 * [# branch.upstream <upstream><eol>
2095 * [# branch.ab +<ahead> -<behind><eol>]]
2096 *
Elijah Newren6d12b532020-07-28 20:45:38 +00002097 * <commit> ::= the current commit hash or the literal
Jeff Hostetlerd9fc7462016-08-11 10:45:59 -04002098 * "(initial)" to indicate an initialized repo
2099 * with no commits.
2100 *
2101 * <head> ::= <branch_name> the current branch name or
2102 * "(detached)" literal when detached head or
2103 * "(unknown)" when something is wrong.
2104 *
2105 * <upstream> ::= the upstream branch name, when set.
2106 *
Jeff Hostetlerfd9b5442018-01-09 18:50:16 +00002107 * <ahead> ::= integer ahead value or '?'.
Jeff Hostetlerd9fc7462016-08-11 10:45:59 -04002108 *
Jeff Hostetlerfd9b5442018-01-09 18:50:16 +00002109 * <behind> ::= integer behind value or '?'.
Jeff Hostetlerd9fc7462016-08-11 10:45:59 -04002110 *
2111 * The end-of-line is defined by the -z flag.
2112 *
2113 * <eol> ::= NUL when -z,
2114 * LF when NOT -z.
2115 *
Jeff Hostetlerfd9b5442018-01-09 18:50:16 +00002116 * When an upstream is set and present, the 'branch.ab' line will
2117 * be printed with the ahead/behind counts for the branch and the
2118 * upstream. When AHEAD_BEHIND_QUICK is requested and the branches
2119 * are different, '?' will be substituted for the actual count.
Jeff Hostetlerd9fc7462016-08-11 10:45:59 -04002120 */
2121static void wt_porcelain_v2_print_tracking(struct wt_status *s)
2122{
2123 struct branch *branch;
2124 const char *base;
2125 const char *branch_name;
Jeff Hostetlerd9fc7462016-08-11 10:45:59 -04002126 int ab_info, nr_ahead, nr_behind;
2127 char eol = s->null_termination ? '\0' : '\n';
2128
Jeff Hostetlerd9fc7462016-08-11 10:45:59 -04002129 fprintf(s->fp, "# branch.oid %s%c",
brian m. carlsone0cb7cd2019-08-18 20:04:21 +00002130 (s->is_initial ? "(initial)" : oid_to_hex(&s->oid_commit)),
Jeff Hostetlerd9fc7462016-08-11 10:45:59 -04002131 eol);
2132
2133 if (!s->branch)
2134 fprintf(s->fp, "# branch.head %s%c", "(unknown)", eol);
2135 else {
2136 if (!strcmp(s->branch, "HEAD")) {
2137 fprintf(s->fp, "# branch.head %s%c", "(detached)", eol);
2138
Stephen P. Smith73ba5d72018-09-30 07:12:45 -07002139 if (s->state.rebase_in_progress ||
2140 s->state.rebase_interactive_in_progress)
2141 branch_name = s->state.onto;
2142 else if (s->state.detached_from)
2143 branch_name = s->state.detached_from;
Jeff Hostetlerd9fc7462016-08-11 10:45:59 -04002144 else
2145 branch_name = "";
2146 } else {
2147 branch_name = NULL;
2148 skip_prefix(s->branch, "refs/heads/", &branch_name);
2149
2150 fprintf(s->fp, "# branch.head %s%c", branch_name, eol);
2151 }
2152
2153 /* Lookup stats on the upstream tracking branch, if set. */
2154 branch = branch_get(branch_name);
2155 base = NULL;
Jeff Hostetlerfd9b5442018-01-09 18:50:16 +00002156 ab_info = stat_tracking_info(branch, &nr_ahead, &nr_behind,
Damien Robertc646d092019-04-16 14:16:46 +02002157 &base, 0, s->ahead_behind_flags);
Jeff Hostetlerd9fc7462016-08-11 10:45:59 -04002158 if (base) {
2159 base = shorten_unambiguous_ref(base, 0);
2160 fprintf(s->fp, "# branch.upstream %s%c", base, eol);
2161 free((char *)base);
2162
Jeff Hostetlerfd9b5442018-01-09 18:50:16 +00002163 if (ab_info > 0) {
2164 /* different */
2165 if (nr_ahead || nr_behind)
2166 fprintf(s->fp, "# branch.ab +%d -%d%c",
2167 nr_ahead, nr_behind, eol);
2168 else
2169 fprintf(s->fp, "# branch.ab +? -?%c",
2170 eol);
2171 } else if (!ab_info) {
2172 /* same */
2173 fprintf(s->fp, "# branch.ab +0 -0%c", eol);
2174 }
Jeff Hostetlerd9fc7462016-08-11 10:45:59 -04002175 }
2176 }
Jeff Hostetlerd9fc7462016-08-11 10:45:59 -04002177}
2178
2179/*
Jeff Hostetler24959ba2016-08-11 10:45:58 -04002180 * Convert various submodule status values into a
2181 * fixed-length string of characters in the buffer provided.
2182 */
2183static void wt_porcelain_v2_submodule_state(
2184 struct wt_status_change_data *d,
2185 char sub[5])
2186{
2187 if (S_ISGITLINK(d->mode_head) ||
2188 S_ISGITLINK(d->mode_index) ||
2189 S_ISGITLINK(d->mode_worktree)) {
2190 sub[0] = 'S';
2191 sub[1] = d->new_submodule_commits ? 'C' : '.';
2192 sub[2] = (d->dirty_submodule & DIRTY_SUBMODULE_MODIFIED) ? 'M' : '.';
2193 sub[3] = (d->dirty_submodule & DIRTY_SUBMODULE_UNTRACKED) ? 'U' : '.';
2194 } else {
2195 sub[0] = 'N';
2196 sub[1] = '.';
2197 sub[2] = '.';
2198 sub[3] = '.';
2199 }
2200 sub[4] = 0;
2201}
2202
2203/*
2204 * Fix-up changed entries before we print them.
2205 */
Jeff King13a17812019-05-09 17:30:19 -04002206static void wt_porcelain_v2_fix_up_changed(struct string_list_item *it)
Jeff Hostetler24959ba2016-08-11 10:45:58 -04002207{
2208 struct wt_status_change_data *d = it->util;
2209
2210 if (!d->index_status) {
2211 /*
2212 * This entry is unchanged in the index (relative to the head).
2213 * Therefore, the collect_updated_cb was never called for this
2214 * entry (during the head-vs-index scan) and so the head column
2215 * fields were never set.
2216 *
2217 * We must have data for the index column (from the
2218 * index-vs-worktree scan (otherwise, this entry should not be
2219 * in the list of changes)).
2220 *
2221 * Copy index column fields to the head column, so that our
2222 * output looks complete.
2223 */
2224 assert(d->mode_head == 0);
2225 d->mode_head = d->mode_index;
2226 oidcpy(&d->oid_head, &d->oid_index);
2227 }
2228
2229 if (!d->worktree_status) {
2230 /*
2231 * This entry is unchanged in the worktree (relative to the index).
2232 * Therefore, the collect_changed_cb was never called for this entry
2233 * (during the index-vs-worktree scan) and so the worktree column
2234 * fields were never set.
2235 *
2236 * We must have data for the index column (from the head-vs-index
2237 * scan).
2238 *
2239 * Copy the index column fields to the worktree column so that
2240 * our output looks complete.
2241 *
2242 * Note that we only have a mode field in the worktree column
2243 * because the scan code tries really hard to not have to compute it.
2244 */
2245 assert(d->mode_worktree == 0);
2246 d->mode_worktree = d->mode_index;
2247 }
2248}
2249
2250/*
2251 * Print porcelain v2 info for tracked entries with changes.
2252 */
2253static void wt_porcelain_v2_print_changed_entry(
2254 struct string_list_item *it,
2255 struct wt_status *s)
2256{
2257 struct wt_status_change_data *d = it->util;
Nguyễn Thái Ngọc Duy5134ccd2017-12-27 17:18:38 +07002258 struct strbuf buf = STRBUF_INIT;
2259 struct strbuf buf_from = STRBUF_INIT;
2260 const char *path = NULL;
2261 const char *path_from = NULL;
Jeff Hostetler24959ba2016-08-11 10:45:58 -04002262 char key[3];
2263 char submodule_token[5];
2264 char sep_char, eol_char;
2265
Jeff King13a17812019-05-09 17:30:19 -04002266 wt_porcelain_v2_fix_up_changed(it);
Jeff Hostetler24959ba2016-08-11 10:45:58 -04002267 wt_porcelain_v2_submodule_state(d, submodule_token);
2268
2269 key[0] = d->index_status ? d->index_status : '.';
2270 key[1] = d->worktree_status ? d->worktree_status : '.';
2271 key[2] = 0;
2272
2273 if (s->null_termination) {
2274 /*
2275 * In -z mode, we DO NOT C-quote pathnames. Current path is ALWAYS first.
2276 * A single NUL character separates them.
2277 */
2278 sep_char = '\0';
2279 eol_char = '\0';
Nguyễn Thái Ngọc Duy5134ccd2017-12-27 17:18:38 +07002280 path = it->string;
2281 path_from = d->rename_source;
Jeff Hostetler24959ba2016-08-11 10:45:58 -04002282 } else {
2283 /*
2284 * Path(s) are C-quoted if necessary. Current path is ALWAYS first.
2285 * The source path is only present when necessary.
2286 * A single TAB separates them (because paths can contain spaces
2287 * which are not escaped and C-quoting does escape TAB characters).
2288 */
2289 sep_char = '\t';
2290 eol_char = '\n';
Junio C Hamano88910c92020-09-10 10:01:54 -07002291 path = quote_path(it->string, s->prefix, &buf, 0);
Nguyễn Thái Ngọc Duy5134ccd2017-12-27 17:18:38 +07002292 if (d->rename_source)
Junio C Hamano88910c92020-09-10 10:01:54 -07002293 path_from = quote_path(d->rename_source, s->prefix, &buf_from, 0);
Jeff Hostetler24959ba2016-08-11 10:45:58 -04002294 }
2295
Nguyễn Thái Ngọc Duy5134ccd2017-12-27 17:18:38 +07002296 if (path_from)
Jeff Hostetler24959ba2016-08-11 10:45:58 -04002297 fprintf(s->fp, "2 %s %s %06o %06o %06o %s %s %c%d %s%c%s%c",
2298 key, submodule_token,
2299 d->mode_head, d->mode_index, d->mode_worktree,
2300 oid_to_hex(&d->oid_head), oid_to_hex(&d->oid_index),
Nguyễn Thái Ngọc Duy5134ccd2017-12-27 17:18:38 +07002301 d->rename_status, d->rename_score,
2302 path, sep_char, path_from, eol_char);
Jeff Hostetler24959ba2016-08-11 10:45:58 -04002303 else
2304 fprintf(s->fp, "1 %s %s %06o %06o %06o %s %s %s%c",
2305 key, submodule_token,
2306 d->mode_head, d->mode_index, d->mode_worktree,
2307 oid_to_hex(&d->oid_head), oid_to_hex(&d->oid_index),
Nguyễn Thái Ngọc Duy5134ccd2017-12-27 17:18:38 +07002308 path, eol_char);
Jeff Hostetler24959ba2016-08-11 10:45:58 -04002309
Nguyễn Thái Ngọc Duy5134ccd2017-12-27 17:18:38 +07002310 strbuf_release(&buf);
2311 strbuf_release(&buf_from);
Jeff Hostetler24959ba2016-08-11 10:45:58 -04002312}
2313
2314/*
2315 * Print porcelain v2 status info for unmerged entries.
2316 */
2317static void wt_porcelain_v2_print_unmerged_entry(
2318 struct string_list_item *it,
2319 struct wt_status *s)
2320{
2321 struct wt_status_change_data *d = it->util;
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +01002322 struct index_state *istate = s->repo->index;
Jeff Hostetler24959ba2016-08-11 10:45:58 -04002323 const struct cache_entry *ce;
2324 struct strbuf buf_index = STRBUF_INIT;
2325 const char *path_index = NULL;
2326 int pos, stage, sum;
2327 struct {
2328 int mode;
2329 struct object_id oid;
2330 } stages[3];
2331 char *key;
2332 char submodule_token[5];
2333 char unmerged_prefix = 'u';
2334 char eol_char = s->null_termination ? '\0' : '\n';
2335
2336 wt_porcelain_v2_submodule_state(d, submodule_token);
2337
2338 switch (d->stagemask) {
2339 case 1: key = "DD"; break; /* both deleted */
2340 case 2: key = "AU"; break; /* added by us */
2341 case 3: key = "UD"; break; /* deleted by them */
2342 case 4: key = "UA"; break; /* added by them */
2343 case 5: key = "DU"; break; /* deleted by us */
2344 case 6: key = "AA"; break; /* both added */
2345 case 7: key = "UU"; break; /* both modified */
2346 default:
Johannes Schindelin033abf92018-05-02 11:38:39 +02002347 BUG("unhandled unmerged status %x", d->stagemask);
Jeff Hostetler24959ba2016-08-11 10:45:58 -04002348 }
2349
2350 /*
2351 * Disregard d.aux.porcelain_v2 data that we accumulated
2352 * for the head and index columns during the scans and
2353 * replace with the actual stage data.
2354 *
2355 * Note that this is a last-one-wins for each the individual
2356 * stage [123] columns in the event of multiple cache entries
2357 * for same stage.
2358 */
2359 memset(stages, 0, sizeof(stages));
2360 sum = 0;
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +01002361 pos = index_name_pos(istate, it->string, strlen(it->string));
Jeff Hostetler24959ba2016-08-11 10:45:58 -04002362 assert(pos < 0);
2363 pos = -pos-1;
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +01002364 while (pos < istate->cache_nr) {
2365 ce = istate->cache[pos++];
Jeff Hostetler24959ba2016-08-11 10:45:58 -04002366 stage = ce_stage(ce);
2367 if (strcmp(ce->name, it->string) || !stage)
2368 break;
2369 stages[stage - 1].mode = ce->ce_mode;
René Scharfe86947692017-01-28 23:03:06 +01002370 oidcpy(&stages[stage - 1].oid, &ce->oid);
Jeff Hostetler24959ba2016-08-11 10:45:58 -04002371 sum |= (1 << (stage - 1));
2372 }
2373 if (sum != d->stagemask)
Johannes Schindelin033abf92018-05-02 11:38:39 +02002374 BUG("observed stagemask 0x%x != expected stagemask 0x%x", sum, d->stagemask);
Jeff Hostetler24959ba2016-08-11 10:45:58 -04002375
2376 if (s->null_termination)
2377 path_index = it->string;
2378 else
Junio C Hamano88910c92020-09-10 10:01:54 -07002379 path_index = quote_path(it->string, s->prefix, &buf_index, 0);
Jeff Hostetler24959ba2016-08-11 10:45:58 -04002380
2381 fprintf(s->fp, "%c %s %s %06o %06o %06o %06o %s %s %s %s%c",
2382 unmerged_prefix, key, submodule_token,
2383 stages[0].mode, /* stage 1 */
2384 stages[1].mode, /* stage 2 */
2385 stages[2].mode, /* stage 3 */
2386 d->mode_worktree,
2387 oid_to_hex(&stages[0].oid), /* stage 1 */
2388 oid_to_hex(&stages[1].oid), /* stage 2 */
2389 oid_to_hex(&stages[2].oid), /* stage 3 */
2390 path_index,
2391 eol_char);
2392
2393 strbuf_release(&buf_index);
2394}
2395
2396/*
2397 * Print porcelain V2 status info for untracked and ignored entries.
2398 */
2399static void wt_porcelain_v2_print_other(
2400 struct string_list_item *it,
2401 struct wt_status *s,
2402 char prefix)
2403{
2404 struct strbuf buf = STRBUF_INIT;
2405 const char *path;
2406 char eol_char;
2407
2408 if (s->null_termination) {
2409 path = it->string;
2410 eol_char = '\0';
2411 } else {
Junio C Hamano88910c92020-09-10 10:01:54 -07002412 path = quote_path(it->string, s->prefix, &buf, 0);
Jeff Hostetler24959ba2016-08-11 10:45:58 -04002413 eol_char = '\n';
2414 }
2415
2416 fprintf(s->fp, "%c %s%c", prefix, path, eol_char);
2417
2418 strbuf_release(&buf);
2419}
2420
2421/*
2422 * Print porcelain V2 status.
2423 *
Jeff Hostetlerd9fc7462016-08-11 10:45:59 -04002424 * [<v2_branch>]
Jeff Hostetler24959ba2016-08-11 10:45:58 -04002425 * [<v2_changed_items>]*
2426 * [<v2_unmerged_items>]*
2427 * [<v2_untracked_items>]*
2428 * [<v2_ignored_items>]*
2429 *
2430 */
2431static void wt_porcelain_v2_print(struct wt_status *s)
2432{
2433 struct wt_status_change_data *d;
2434 struct string_list_item *it;
2435 int i;
2436
Jeff Hostetlerd9fc7462016-08-11 10:45:59 -04002437 if (s->show_branch)
2438 wt_porcelain_v2_print_tracking(s);
2439
Jeff Hostetler24959ba2016-08-11 10:45:58 -04002440 for (i = 0; i < s->change.nr; i++) {
2441 it = &(s->change.items[i]);
2442 d = it->util;
2443 if (!d->stagemask)
2444 wt_porcelain_v2_print_changed_entry(it, s);
2445 }
2446
2447 for (i = 0; i < s->change.nr; i++) {
2448 it = &(s->change.items[i]);
2449 d = it->util;
2450 if (d->stagemask)
2451 wt_porcelain_v2_print_unmerged_entry(it, s);
2452 }
2453
2454 for (i = 0; i < s->untracked.nr; i++) {
2455 it = &(s->untracked.items[i]);
2456 wt_porcelain_v2_print_other(it, s, '?');
2457 }
2458
2459 for (i = 0; i < s->ignored.nr; i++) {
2460 it = &(s->ignored.items[i]);
2461 wt_porcelain_v2_print_other(it, s, '!');
2462 }
2463}
2464
Jeff Hostetlerbe7e7952016-08-05 18:00:27 -04002465void wt_status_print(struct wt_status *s)
2466{
Jeff Hostetler942b2742019-02-22 14:25:03 -08002467 trace2_data_intmax("status", s->repo, "count/changed", s->change.nr);
2468 trace2_data_intmax("status", s->repo, "count/untracked",
2469 s->untracked.nr);
2470 trace2_data_intmax("status", s->repo, "count/ignored", s->ignored.nr);
2471
2472 trace2_region_enter("status", "print", s->repo);
2473
Jeff Hostetlerbe7e7952016-08-05 18:00:27 -04002474 switch (s->status_format) {
2475 case STATUS_FORMAT_SHORT:
2476 wt_shortstatus_print(s);
2477 break;
2478 case STATUS_FORMAT_PORCELAIN:
2479 wt_porcelain_print(s);
2480 break;
Jeff Hostetler1ecdecc2016-08-11 10:45:57 -04002481 case STATUS_FORMAT_PORCELAIN_V2:
Jeff Hostetler24959ba2016-08-11 10:45:58 -04002482 wt_porcelain_v2_print(s);
Jeff Hostetler1ecdecc2016-08-11 10:45:57 -04002483 break;
Jeff Hostetlerbe7e7952016-08-05 18:00:27 -04002484 case STATUS_FORMAT_UNSPECIFIED:
Johannes Schindelin033abf92018-05-02 11:38:39 +02002485 BUG("finalize_deferred_config() should have been called");
Jeff Hostetlerbe7e7952016-08-05 18:00:27 -04002486 break;
2487 case STATUS_FORMAT_NONE:
2488 case STATUS_FORMAT_LONG:
2489 wt_longstatus_print(s);
2490 break;
2491 }
Jeff Hostetler942b2742019-02-22 14:25:03 -08002492
2493 trace2_region_leave("status", "print", s->repo);
Jeff Hostetlerbe7e7952016-08-05 18:00:27 -04002494}
Johannes Schindelinfd849862016-10-07 18:08:38 +02002495
2496/**
2497 * Returns 1 if there are unstaged changes, 0 otherwise.
2498 */
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +01002499int has_unstaged_changes(struct repository *r, int ignore_submodules)
Johannes Schindelinfd849862016-10-07 18:08:38 +02002500{
2501 struct rev_info rev_info;
2502 int result;
2503
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +01002504 repo_init_revisions(r, &rev_info, NULL);
Brandon Williamsc6d8ccf2017-11-06 14:08:19 -08002505 if (ignore_submodules) {
Brandon Williams0d1e0e72017-10-31 11:19:11 -07002506 rev_info.diffopt.flags.ignore_submodules = 1;
Junio C Hamanob50d82b2017-11-15 12:14:30 +09002507 rev_info.diffopt.flags.override_submodule_config = 1;
Brandon Williamsc6d8ccf2017-11-06 14:08:19 -08002508 }
Brandon Williams0d1e0e72017-10-31 11:19:11 -07002509 rev_info.diffopt.flags.quick = 1;
Johannes Schindelinfd849862016-10-07 18:08:38 +02002510 diff_setup_done(&rev_info.diffopt);
2511 result = run_diff_files(&rev_info, 0);
2512 return diff_result_code(&rev_info.diffopt, result);
2513}
2514
2515/**
2516 * Returns 1 if there are uncommitted changes, 0 otherwise.
2517 */
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +01002518int has_uncommitted_changes(struct repository *r,
2519 int ignore_submodules)
Johannes Schindelinfd849862016-10-07 18:08:38 +02002520{
2521 struct rev_info rev_info;
2522 int result;
2523
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +01002524 if (is_index_unborn(r->index))
Johannes Schindelinfd849862016-10-07 18:08:38 +02002525 return 0;
2526
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +01002527 repo_init_revisions(r, &rev_info, NULL);
Johannes Schindelind8cc92a2016-10-07 18:09:00 +02002528 if (ignore_submodules)
Brandon Williams0d1e0e72017-10-31 11:19:11 -07002529 rev_info.diffopt.flags.ignore_submodules = 1;
2530 rev_info.diffopt.flags.quick = 1;
Jeff King3506dc92018-07-11 10:14:06 -04002531
Johannes Schindelinfd849862016-10-07 18:08:38 +02002532 add_head_to_pending(&rev_info);
Jeff King3506dc92018-07-11 10:14:06 -04002533 if (!rev_info.pending.nr) {
2534 /*
2535 * We have no head (or it's corrupt); use the empty tree,
2536 * which will complain if the index is non-empty.
2537 */
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +01002538 struct tree *tree = lookup_tree(r, the_hash_algo->empty_tree);
Jeff King3506dc92018-07-11 10:14:06 -04002539 add_pending_object(&rev_info, &tree->object, "");
2540 }
2541
Johannes Schindelinfd849862016-10-07 18:08:38 +02002542 diff_setup_done(&rev_info.diffopt);
2543 result = run_diff_index(&rev_info, 1);
Andrzej Hunt5493ce72021-04-25 14:16:09 +00002544 object_array_clear(&rev_info.pending);
Johannes Schindelinfd849862016-10-07 18:08:38 +02002545 return diff_result_code(&rev_info.diffopt, result);
2546}
2547
2548/**
2549 * If the work tree has unstaged or uncommitted changes, dies with the
2550 * appropriate message.
2551 */
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +01002552int require_clean_work_tree(struct repository *r,
2553 const char *action,
2554 const char *hint,
2555 int ignore_submodules,
2556 int gently)
Johannes Schindelinfd849862016-10-07 18:08:38 +02002557{
Martin Ågren837e34e2017-10-05 22:32:04 +02002558 struct lock_file lock_file = LOCK_INIT;
Junio C Hamano89d38fb2016-12-07 11:11:26 -08002559 int err = 0, fd;
Johannes Schindelinfd849862016-10-07 18:08:38 +02002560
Nguyễn Thái Ngọc Duy3a95f312019-01-12 09:13:24 +07002561 fd = repo_hold_locked_index(r, &lock_file, 0);
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +01002562 refresh_index(r->index, REFRESH_QUIET, NULL, NULL, NULL);
Junio C Hamano89d38fb2016-12-07 11:11:26 -08002563 if (0 <= fd)
Nguyễn Thái Ngọc Duy1b0d9682019-01-12 09:13:27 +07002564 repo_update_index_if_able(r, &lock_file);
Martin Ågren837e34e2017-10-05 22:32:04 +02002565 rollback_lock_file(&lock_file);
Johannes Schindelinfd849862016-10-07 18:08:38 +02002566
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +01002567 if (has_unstaged_changes(r, ignore_submodules)) {
Johannes Schindelinfd849862016-10-07 18:08:38 +02002568 /* TRANSLATORS: the action is e.g. "pull with rebase" */
Johannes Schindelin4777e172016-10-07 18:09:04 +02002569 error(_("cannot %s: You have unstaged changes."), _(action));
Johannes Schindelinfd849862016-10-07 18:08:38 +02002570 err = 1;
2571 }
2572
Nguyễn Thái Ngọc Duy5b02ca32018-11-10 06:48:49 +01002573 if (has_uncommitted_changes(r, ignore_submodules)) {
Johannes Schindelinfd849862016-10-07 18:08:38 +02002574 if (err)
Johannes Schindelin4777e172016-10-07 18:09:04 +02002575 error(_("additionally, your index contains uncommitted changes."));
Johannes Schindelinfd849862016-10-07 18:08:38 +02002576 else
Johannes Schindelin4777e172016-10-07 18:09:04 +02002577 error(_("cannot %s: Your index contains uncommitted changes."),
Johannes Schindelinfd849862016-10-07 18:08:38 +02002578 _(action));
2579 err = 1;
2580 }
2581
2582 if (err) {
2583 if (hint)
2584 error("%s", hint);
2585 if (!gently)
2586 exit(128);
2587 }
2588
2589 return err;
2590}