git-rm: don't remove newly added file without -f
[git/dscho.git] / wt-status.c
bloba25632bc87867748016e32a4ba4652918c8705a3
1 #include "cache.h"
2 #include "wt-status.h"
3 #include "color.h"
4 #include "object.h"
5 #include "dir.h"
6 #include "commit.h"
7 #include "diff.h"
8 #include "revision.h"
9 #include "diffcore.h"
11 int wt_status_use_color = 0;
12 static char wt_status_colors[][COLOR_MAXLEN] = {
13 "", /* WT_STATUS_HEADER: normal */
14 "\033[32m", /* WT_STATUS_UPDATED: green */
15 "\033[31m", /* WT_STATUS_CHANGED: red */
16 "\033[31m", /* WT_STATUS_UNTRACKED: red */
19 static const char use_add_msg[] =
20 "use \"git add <file>...\" to update what will be committed";
21 static const char use_add_rm_msg[] =
22 "use \"git add/rm <file>...\" to update what will be committed";
23 static const char use_add_to_include_msg[] =
24 "use \"git add <file>...\" to include in what will be committed";
26 static int parse_status_slot(const char *var, int offset)
28 if (!strcasecmp(var+offset, "header"))
29 return WT_STATUS_HEADER;
30 if (!strcasecmp(var+offset, "updated")
31 || !strcasecmp(var+offset, "added"))
32 return WT_STATUS_UPDATED;
33 if (!strcasecmp(var+offset, "changed"))
34 return WT_STATUS_CHANGED;
35 if (!strcasecmp(var+offset, "untracked"))
36 return WT_STATUS_UNTRACKED;
37 die("bad config variable '%s'", var);
40 static const char* color(int slot)
42 return wt_status_use_color ? wt_status_colors[slot] : "";
45 void wt_status_prepare(struct wt_status *s)
47 unsigned char sha1[20];
48 const char *head;
50 memset(s, 0, sizeof(*s));
51 head = resolve_ref("HEAD", sha1, 0, NULL);
52 s->branch = head ? xstrdup(head) : NULL;
53 s->reference = "HEAD";
56 static void wt_status_print_cached_header(const char *reference)
58 const char *c = color(WT_STATUS_HEADER);
59 color_printf_ln(c, "# Changes to be committed:");
60 if (reference) {
61 color_printf_ln(c, "# (use \"git reset %s <file>...\" to unstage)", reference);
62 } else {
63 color_printf_ln(c, "# (use \"git rm --cached <file>...\" to unstage)");
65 color_printf_ln(c, "#");
68 static void wt_status_print_header(const char *main, const char *sub)
70 const char *c = color(WT_STATUS_HEADER);
71 color_printf_ln(c, "# %s:", main);
72 color_printf_ln(c, "# (%s)", sub);
73 color_printf_ln(c, "#");
76 static void wt_status_print_trailer(void)
78 color_printf_ln(color(WT_STATUS_HEADER), "#");
81 static const char *quote_crlf(const char *in, char *buf, size_t sz)
83 const char *scan;
84 char *out;
85 const char *ret = in;
87 for (scan = in, out = buf; *scan; scan++) {
88 int ch = *scan;
89 int quoted;
91 switch (ch) {
92 case '\n':
93 quoted = 'n';
94 break;
95 case '\r':
96 quoted = 'r';
97 break;
98 default:
99 *out++ = ch;
100 continue;
102 *out++ = '\\';
103 *out++ = quoted;
104 ret = buf;
106 *out = '\0';
107 return ret;
110 static void wt_status_print_filepair(int t, struct diff_filepair *p)
112 const char *c = color(t);
113 const char *one, *two;
114 char onebuf[PATH_MAX], twobuf[PATH_MAX];
116 one = quote_crlf(p->one->path, onebuf, sizeof(onebuf));
117 two = quote_crlf(p->two->path, twobuf, sizeof(twobuf));
119 color_printf(color(WT_STATUS_HEADER), "#\t");
120 switch (p->status) {
121 case DIFF_STATUS_ADDED:
122 color_printf(c, "new file: %s", one);
123 break;
124 case DIFF_STATUS_COPIED:
125 color_printf(c, "copied: %s -> %s", one, two);
126 break;
127 case DIFF_STATUS_DELETED:
128 color_printf(c, "deleted: %s", one);
129 break;
130 case DIFF_STATUS_MODIFIED:
131 color_printf(c, "modified: %s", one);
132 break;
133 case DIFF_STATUS_RENAMED:
134 color_printf(c, "renamed: %s -> %s", one, two);
135 break;
136 case DIFF_STATUS_TYPE_CHANGED:
137 color_printf(c, "typechange: %s", one);
138 break;
139 case DIFF_STATUS_UNKNOWN:
140 color_printf(c, "unknown: %s", one);
141 break;
142 case DIFF_STATUS_UNMERGED:
143 color_printf(c, "unmerged: %s", one);
144 break;
145 default:
146 die("bug: unhandled diff status %c", p->status);
148 printf("\n");
151 static void wt_status_print_updated_cb(struct diff_queue_struct *q,
152 struct diff_options *options,
153 void *data)
155 struct wt_status *s = data;
156 int shown_header = 0;
157 int i;
158 for (i = 0; i < q->nr; i++) {
159 if (q->queue[i]->status == 'U')
160 continue;
161 if (!shown_header) {
162 wt_status_print_cached_header(s->reference);
163 s->commitable = 1;
164 shown_header = 1;
166 wt_status_print_filepair(WT_STATUS_UPDATED, q->queue[i]);
168 if (shown_header)
169 wt_status_print_trailer();
172 static void wt_status_print_changed_cb(struct diff_queue_struct *q,
173 struct diff_options *options,
174 void *data)
176 struct wt_status *s = data;
177 int i;
178 if (q->nr) {
179 const char *msg = use_add_msg;
180 s->workdir_dirty = 1;
181 for (i = 0; i < q->nr; i++)
182 if (q->queue[i]->status == DIFF_STATUS_DELETED) {
183 msg = use_add_rm_msg;
184 break;
186 wt_status_print_header("Changed but not updated", msg);
188 for (i = 0; i < q->nr; i++)
189 wt_status_print_filepair(WT_STATUS_CHANGED, q->queue[i]);
190 if (q->nr)
191 wt_status_print_trailer();
194 static void wt_read_cache(struct wt_status *s)
196 discard_cache();
197 read_cache();
200 void wt_status_print_initial(struct wt_status *s)
202 int i;
203 char buf[PATH_MAX];
205 wt_read_cache(s);
206 if (active_nr) {
207 s->commitable = 1;
208 wt_status_print_cached_header(NULL);
210 for (i = 0; i < active_nr; i++) {
211 color_printf(color(WT_STATUS_HEADER), "#\t");
212 color_printf_ln(color(WT_STATUS_UPDATED), "new file: %s",
213 quote_crlf(active_cache[i]->name,
214 buf, sizeof(buf)));
216 if (active_nr)
217 wt_status_print_trailer();
220 static void wt_status_print_updated(struct wt_status *s)
222 struct rev_info rev;
223 init_revisions(&rev, NULL);
224 setup_revisions(0, NULL, &rev, s->reference);
225 rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
226 rev.diffopt.format_callback = wt_status_print_updated_cb;
227 rev.diffopt.format_callback_data = s;
228 rev.diffopt.detect_rename = 1;
229 wt_read_cache(s);
230 run_diff_index(&rev, 1);
233 static void wt_status_print_changed(struct wt_status *s)
235 struct rev_info rev;
236 init_revisions(&rev, "");
237 setup_revisions(0, NULL, &rev, NULL);
238 rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
239 rev.diffopt.format_callback = wt_status_print_changed_cb;
240 rev.diffopt.format_callback_data = s;
241 wt_read_cache(s);
242 run_diff_files(&rev, 0);
245 static void wt_status_print_untracked(struct wt_status *s)
247 struct dir_struct dir;
248 const char *x;
249 int i;
250 int shown_header = 0;
252 memset(&dir, 0, sizeof(dir));
254 dir.exclude_per_dir = ".gitignore";
255 if (!s->untracked) {
256 dir.show_other_directories = 1;
257 dir.hide_empty_directories = 1;
259 x = git_path("info/exclude");
260 if (file_exists(x))
261 add_excludes_from_file(&dir, x);
263 read_directory(&dir, ".", "", 0);
264 for(i = 0; i < dir.nr; i++) {
265 /* check for matching entry, which is unmerged; lifted from
266 * builtin-ls-files:show_other_files */
267 struct dir_entry *ent = dir.entries[i];
268 int pos = cache_name_pos(ent->name, ent->len);
269 struct cache_entry *ce;
270 if (0 <= pos)
271 die("bug in wt_status_print_untracked");
272 pos = -pos - 1;
273 if (pos < active_nr) {
274 ce = active_cache[pos];
275 if (ce_namelen(ce) == ent->len &&
276 !memcmp(ce->name, ent->name, ent->len))
277 continue;
279 if (!shown_header) {
280 s->workdir_untracked = 1;
281 wt_status_print_header("Untracked files",
282 use_add_to_include_msg);
283 shown_header = 1;
285 color_printf(color(WT_STATUS_HEADER), "#\t");
286 color_printf_ln(color(WT_STATUS_UNTRACKED), "%.*s",
287 ent->len, ent->name);
291 static void wt_status_print_verbose(struct wt_status *s)
293 struct rev_info rev;
294 init_revisions(&rev, NULL);
295 setup_revisions(0, NULL, &rev, s->reference);
296 rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
297 rev.diffopt.detect_rename = 1;
298 wt_read_cache(s);
299 run_diff_index(&rev, 1);
302 void wt_status_print(struct wt_status *s)
304 unsigned char sha1[20];
305 s->is_initial = get_sha1(s->reference, sha1) ? 1 : 0;
307 if (s->branch) {
308 const char *on_what = "On branch ";
309 const char *branch_name = s->branch;
310 if (!prefixcmp(branch_name, "refs/heads/"))
311 branch_name += 11;
312 else if (!strcmp(branch_name, "HEAD")) {
313 branch_name = "";
314 on_what = "Not currently on any branch.";
316 color_printf_ln(color(WT_STATUS_HEADER),
317 "# %s%s", on_what, branch_name);
320 if (s->is_initial) {
321 color_printf_ln(color(WT_STATUS_HEADER), "#");
322 color_printf_ln(color(WT_STATUS_HEADER), "# Initial commit");
323 color_printf_ln(color(WT_STATUS_HEADER), "#");
324 wt_status_print_initial(s);
326 else {
327 wt_status_print_updated(s);
330 wt_status_print_changed(s);
331 wt_status_print_untracked(s);
333 if (s->verbose && !s->is_initial)
334 wt_status_print_verbose(s);
335 if (!s->commitable) {
336 if (s->amend)
337 printf("# No changes\n");
338 else if (s->workdir_dirty)
339 printf("no changes added to commit (use \"git add\" and/or \"git commit -a\")\n");
340 else if (s->workdir_untracked)
341 printf("nothing added to commit but untracked files present (use \"git add\" to track)\n");
342 else if (s->is_initial)
343 printf("nothing to commit (create/copy files and use \"git add\" to track)\n");
344 else
345 printf("nothing to commit (working directory clean)\n");
349 int git_status_config(const char *k, const char *v)
351 if (!strcmp(k, "status.color") || !strcmp(k, "color.status")) {
352 wt_status_use_color = git_config_colorbool(k, v);
353 return 0;
355 if (!prefixcmp(k, "status.color.") || !prefixcmp(k, "color.status.")) {
356 int slot = parse_status_slot(k, 13);
357 color_parse(v, k, wt_status_colors[slot]);
359 return git_default_config(k, v);