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