(WIP) rough ideas for git-abort / git-continue
[git/wpalmer.git] / builtin / ls-files.c
blobcc202c5f6fa6f2be7da857d2f4af7a2e4f3300d6
1 /*
2 * This merges the file listing in the directory cache index
3 * with the actual working directory list, and shows different
4 * combinations of the two.
6 * Copyright (C) Linus Torvalds, 2005
7 */
8 #include "cache.h"
9 #include "quote.h"
10 #include "dir.h"
11 #include "builtin.h"
12 #include "tree.h"
13 #include "parse-options.h"
14 #include "resolve-undo.h"
15 #include "string-list.h"
17 static int abbrev;
18 static int show_deleted;
19 static int show_cached;
20 static int show_others;
21 static int show_stage;
22 static int show_unmerged;
23 static int show_resolve_undo;
24 static int show_modified;
25 static int show_killed;
26 static int show_valid_bit;
27 static int line_terminator = '\n';
28 static int debug_mode;
30 static const char *prefix;
31 static int max_prefix_len;
32 static int prefix_len;
33 static const char **pathspec;
34 static int error_unmatch;
35 static char *ps_matched;
36 static const char *with_tree;
37 static int exc_given;
39 static const char *tag_cached = "";
40 static const char *tag_unmerged = "";
41 static const char *tag_removed = "";
42 static const char *tag_other = "";
43 static const char *tag_killed = "";
44 static const char *tag_modified = "";
45 static const char *tag_skip_worktree = "";
46 static const char *tag_resolve_undo = "";
48 static void write_name(const char* name, size_t len)
50 write_name_quoted_relative(name, len, prefix, prefix_len, stdout,
51 line_terminator);
54 static void show_dir_entry(const char *tag, struct dir_entry *ent)
56 int len = max_prefix_len;
58 if (len >= ent->len)
59 die("git ls-files: internal error - directory entry not superset of prefix");
61 if (!match_pathspec(pathspec, ent->name, ent->len, len, ps_matched))
62 return;
64 fputs(tag, stdout);
65 write_name(ent->name, ent->len);
68 static void show_other_files(struct dir_struct *dir)
70 int i;
72 for (i = 0; i < dir->nr; i++) {
73 struct dir_entry *ent = dir->entries[i];
74 if (!cache_name_is_other(ent->name, ent->len))
75 continue;
76 show_dir_entry(tag_other, ent);
80 static void show_killed_files(struct dir_struct *dir)
82 int i;
83 for (i = 0; i < dir->nr; i++) {
84 struct dir_entry *ent = dir->entries[i];
85 char *cp, *sp;
86 int pos, len, killed = 0;
88 for (cp = ent->name; cp - ent->name < ent->len; cp = sp + 1) {
89 sp = strchr(cp, '/');
90 if (!sp) {
91 /* If ent->name is prefix of an entry in the
92 * cache, it will be killed.
94 pos = cache_name_pos(ent->name, ent->len);
95 if (0 <= pos)
96 die("bug in show-killed-files");
97 pos = -pos - 1;
98 while (pos < active_nr &&
99 ce_stage(active_cache[pos]))
100 pos++; /* skip unmerged */
101 if (active_nr <= pos)
102 break;
103 /* pos points at a name immediately after
104 * ent->name in the cache. Does it expect
105 * ent->name to be a directory?
107 len = ce_namelen(active_cache[pos]);
108 if ((ent->len < len) &&
109 !strncmp(active_cache[pos]->name,
110 ent->name, ent->len) &&
111 active_cache[pos]->name[ent->len] == '/')
112 killed = 1;
113 break;
115 if (0 <= cache_name_pos(ent->name, sp - ent->name)) {
116 /* If any of the leading directories in
117 * ent->name is registered in the cache,
118 * ent->name will be killed.
120 killed = 1;
121 break;
124 if (killed)
125 show_dir_entry(tag_killed, dir->entries[i]);
129 static void show_ce_entry(const char *tag, struct cache_entry *ce)
131 int len = max_prefix_len;
133 if (len >= ce_namelen(ce))
134 die("git ls-files: internal error - cache entry not superset of prefix");
136 if (!match_pathspec(pathspec, ce->name, ce_namelen(ce), len, ps_matched))
137 return;
139 if (tag && *tag && show_valid_bit &&
140 (ce->ce_flags & CE_VALID)) {
141 static char alttag[4];
142 memcpy(alttag, tag, 3);
143 if (isalpha(tag[0]))
144 alttag[0] = tolower(tag[0]);
145 else if (tag[0] == '?')
146 alttag[0] = '!';
147 else {
148 alttag[0] = 'v';
149 alttag[1] = tag[0];
150 alttag[2] = ' ';
151 alttag[3] = 0;
153 tag = alttag;
156 if (!show_stage) {
157 fputs(tag, stdout);
158 } else {
159 printf("%s%06o %s %d\t",
160 tag,
161 ce->ce_mode,
162 find_unique_abbrev(ce->sha1,abbrev),
163 ce_stage(ce));
165 write_name(ce->name, ce_namelen(ce));
166 if (debug_mode) {
167 printf(" ctime: %d:%d\n", ce->ce_ctime.sec, ce->ce_ctime.nsec);
168 printf(" mtime: %d:%d\n", ce->ce_mtime.sec, ce->ce_mtime.nsec);
169 printf(" dev: %d\tino: %d\n", ce->ce_dev, ce->ce_ino);
170 printf(" uid: %d\tgid: %d\n", ce->ce_uid, ce->ce_gid);
171 printf(" size: %d\tflags: %x\n", ce->ce_size, ce->ce_flags);
175 static int show_one_ru(struct string_list_item *item, void *cbdata)
177 const char *path = item->string;
178 struct resolve_undo_info *ui = item->util;
179 int i, len;
181 len = strlen(path);
182 if (len < max_prefix_len)
183 return 0; /* outside of the prefix */
184 if (!match_pathspec(pathspec, path, len, max_prefix_len, ps_matched))
185 return 0; /* uninterested */
186 for (i = 0; i < 3; i++) {
187 if (!ui->mode[i])
188 continue;
189 printf("%s%06o %s %d\t", tag_resolve_undo, ui->mode[i],
190 find_unique_abbrev(ui->sha1[i], abbrev),
191 i + 1);
192 write_name(path, len);
194 return 0;
197 static void show_ru_info(void)
199 if (!the_index.resolve_undo)
200 return;
201 for_each_string_list(the_index.resolve_undo, show_one_ru, NULL);
204 static void show_files(struct dir_struct *dir)
206 int i;
208 /* For cached/deleted files we don't need to even do the readdir */
209 if (show_others || show_killed) {
210 fill_directory(dir, pathspec);
211 if (show_others)
212 show_other_files(dir);
213 if (show_killed)
214 show_killed_files(dir);
216 if (show_cached | show_stage) {
217 for (i = 0; i < active_nr; i++) {
218 struct cache_entry *ce = active_cache[i];
219 int dtype = ce_to_dtype(ce);
220 if (dir->flags & DIR_SHOW_IGNORED &&
221 !excluded(dir, ce->name, &dtype))
222 continue;
223 if (show_unmerged && !ce_stage(ce))
224 continue;
225 if (ce->ce_flags & CE_UPDATE)
226 continue;
227 show_ce_entry(ce_stage(ce) ? tag_unmerged :
228 (ce_skip_worktree(ce) ? tag_skip_worktree : tag_cached), ce);
231 if (show_deleted | show_modified) {
232 for (i = 0; i < active_nr; i++) {
233 struct cache_entry *ce = active_cache[i];
234 struct stat st;
235 int err;
236 int dtype = ce_to_dtype(ce);
237 if (dir->flags & DIR_SHOW_IGNORED &&
238 !excluded(dir, ce->name, &dtype))
239 continue;
240 if (ce->ce_flags & CE_UPDATE)
241 continue;
242 if (ce_skip_worktree(ce))
243 continue;
244 err = lstat(ce->name, &st);
245 if (show_deleted && err)
246 show_ce_entry(tag_removed, ce);
247 if (show_modified && ce_modified(ce, &st, 0))
248 show_ce_entry(tag_modified, ce);
254 * Prune the index to only contain stuff starting with "prefix"
256 static void prune_cache(const char *prefix)
258 int pos = cache_name_pos(prefix, max_prefix_len);
259 unsigned int first, last;
261 if (pos < 0)
262 pos = -pos-1;
263 memmove(active_cache, active_cache + pos,
264 (active_nr - pos) * sizeof(struct cache_entry *));
265 active_nr -= pos;
266 first = 0;
267 last = active_nr;
268 while (last > first) {
269 int next = (last + first) >> 1;
270 struct cache_entry *ce = active_cache[next];
271 if (!strncmp(ce->name, prefix, max_prefix_len)) {
272 first = next+1;
273 continue;
275 last = next;
277 active_nr = last;
280 static const char *pathspec_prefix(const char *prefix)
282 const char **p, *n, *prev;
283 unsigned long max;
285 if (!pathspec) {
286 max_prefix_len = prefix ? strlen(prefix) : 0;
287 return prefix;
290 prev = NULL;
291 max = PATH_MAX;
292 for (p = pathspec; (n = *p) != NULL; p++) {
293 int i, len = 0;
294 for (i = 0; i < max; i++) {
295 char c = n[i];
296 if (prev && prev[i] != c)
297 break;
298 if (!c || c == '*' || c == '?')
299 break;
300 if (c == '/')
301 len = i+1;
303 prev = n;
304 if (len < max) {
305 max = len;
306 if (!max)
307 break;
311 max_prefix_len = max;
312 return max ? xmemdupz(prev, max) : NULL;
315 static void strip_trailing_slash_from_submodules(void)
317 const char **p;
319 for (p = pathspec; *p != NULL; p++) {
320 int len = strlen(*p), pos;
322 if (len < 1 || (*p)[len - 1] != '/')
323 continue;
324 pos = cache_name_pos(*p, len - 1);
325 if (pos >= 0 && S_ISGITLINK(active_cache[pos]->ce_mode))
326 *p = xstrndup(*p, len - 1);
331 * Read the tree specified with --with-tree option
332 * (typically, HEAD) into stage #1 and then
333 * squash them down to stage #0. This is used for
334 * --error-unmatch to list and check the path patterns
335 * that were given from the command line. We are not
336 * going to write this index out.
338 void overlay_tree_on_cache(const char *tree_name, const char *prefix)
340 struct tree *tree;
341 unsigned char sha1[20];
342 const char **match;
343 struct cache_entry *last_stage0 = NULL;
344 int i;
346 if (get_sha1(tree_name, sha1))
347 die("tree-ish %s not found.", tree_name);
348 tree = parse_tree_indirect(sha1);
349 if (!tree)
350 die("bad tree-ish %s", tree_name);
352 /* Hoist the unmerged entries up to stage #3 to make room */
353 for (i = 0; i < active_nr; i++) {
354 struct cache_entry *ce = active_cache[i];
355 if (!ce_stage(ce))
356 continue;
357 ce->ce_flags |= CE_STAGEMASK;
360 if (prefix) {
361 static const char *(matchbuf[2]);
362 matchbuf[0] = prefix;
363 matchbuf[1] = NULL;
364 match = matchbuf;
365 } else
366 match = NULL;
367 if (read_tree(tree, 1, match))
368 die("unable to read tree entries %s", tree_name);
370 for (i = 0; i < active_nr; i++) {
371 struct cache_entry *ce = active_cache[i];
372 switch (ce_stage(ce)) {
373 case 0:
374 last_stage0 = ce;
375 /* fallthru */
376 default:
377 continue;
378 case 1:
380 * If there is stage #0 entry for this, we do not
381 * need to show it. We use CE_UPDATE bit to mark
382 * such an entry.
384 if (last_stage0 &&
385 !strcmp(last_stage0->name, ce->name))
386 ce->ce_flags |= CE_UPDATE;
391 int report_path_error(const char *ps_matched, const char **pathspec, int prefix_len)
394 * Make sure all pathspec matched; otherwise it is an error.
396 int num, errors = 0;
397 for (num = 0; pathspec[num]; num++) {
398 int other, found_dup;
400 if (ps_matched[num])
401 continue;
403 * The caller might have fed identical pathspec
404 * twice. Do not barf on such a mistake.
406 for (found_dup = other = 0;
407 !found_dup && pathspec[other];
408 other++) {
409 if (other == num || !ps_matched[other])
410 continue;
411 if (!strcmp(pathspec[other], pathspec[num]))
413 * Ok, we have a match already.
415 found_dup = 1;
417 if (found_dup)
418 continue;
420 error("pathspec '%s' did not match any file(s) known to git.",
421 pathspec[num] + prefix_len);
422 errors++;
424 return errors;
427 static const char * const ls_files_usage[] = {
428 "git ls-files [options] [<file>]*",
429 NULL
432 static int option_parse_z(const struct option *opt,
433 const char *arg, int unset)
435 line_terminator = unset ? '\n' : '\0';
437 return 0;
440 static int option_parse_exclude(const struct option *opt,
441 const char *arg, int unset)
443 struct exclude_list *list = opt->value;
445 exc_given = 1;
446 add_exclude(arg, "", 0, list);
448 return 0;
451 static int option_parse_exclude_from(const struct option *opt,
452 const char *arg, int unset)
454 struct dir_struct *dir = opt->value;
456 exc_given = 1;
457 add_excludes_from_file(dir, arg);
459 return 0;
462 static int option_parse_exclude_standard(const struct option *opt,
463 const char *arg, int unset)
465 struct dir_struct *dir = opt->value;
467 exc_given = 1;
468 setup_standard_excludes(dir);
470 return 0;
473 int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)
475 int require_work_tree = 0, show_tag = 0;
476 const char *max_prefix;
477 struct dir_struct dir;
478 struct option builtin_ls_files_options[] = {
479 { OPTION_CALLBACK, 'z', NULL, NULL, NULL,
480 "paths are separated with NUL character",
481 PARSE_OPT_NOARG, option_parse_z },
482 OPT_BOOLEAN('t', NULL, &show_tag,
483 "identify the file status with tags"),
484 OPT_BOOLEAN('v', NULL, &show_valid_bit,
485 "use lowercase letters for 'assume unchanged' files"),
486 OPT_BOOLEAN('c', "cached", &show_cached,
487 "show cached files in the output (default)"),
488 OPT_BOOLEAN('d', "deleted", &show_deleted,
489 "show deleted files in the output"),
490 OPT_BOOLEAN('m', "modified", &show_modified,
491 "show modified files in the output"),
492 OPT_BOOLEAN('o', "others", &show_others,
493 "show other files in the output"),
494 OPT_BIT('i', "ignored", &dir.flags,
495 "show ignored files in the output",
496 DIR_SHOW_IGNORED),
497 OPT_BOOLEAN('s', "stage", &show_stage,
498 "show staged contents' object name in the output"),
499 OPT_BOOLEAN('k', "killed", &show_killed,
500 "show files on the filesystem that need to be removed"),
501 OPT_BIT(0, "directory", &dir.flags,
502 "show 'other' directories' name only",
503 DIR_SHOW_OTHER_DIRECTORIES),
504 OPT_NEGBIT(0, "empty-directory", &dir.flags,
505 "don't show empty directories",
506 DIR_HIDE_EMPTY_DIRECTORIES),
507 OPT_BOOLEAN('u', "unmerged", &show_unmerged,
508 "show unmerged files in the output"),
509 OPT_BOOLEAN(0, "resolve-undo", &show_resolve_undo,
510 "show resolve-undo information"),
511 { OPTION_CALLBACK, 'x', "exclude", &dir.exclude_list[EXC_CMDL], "pattern",
512 "skip files matching pattern",
513 0, option_parse_exclude },
514 { OPTION_CALLBACK, 'X', "exclude-from", &dir, "file",
515 "exclude patterns are read from <file>",
516 0, option_parse_exclude_from },
517 OPT_STRING(0, "exclude-per-directory", &dir.exclude_per_dir, "file",
518 "read additional per-directory exclude patterns in <file>"),
519 { OPTION_CALLBACK, 0, "exclude-standard", &dir, NULL,
520 "add the standard git exclusions",
521 PARSE_OPT_NOARG, option_parse_exclude_standard },
522 { OPTION_SET_INT, 0, "full-name", &prefix_len, NULL,
523 "make the output relative to the project top directory",
524 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL },
525 OPT_BOOLEAN(0, "error-unmatch", &error_unmatch,
526 "if any <file> is not in the index, treat this as an error"),
527 OPT_STRING(0, "with-tree", &with_tree, "tree-ish",
528 "pretend that paths removed since <tree-ish> are still present"),
529 OPT__ABBREV(&abbrev),
530 OPT_BOOLEAN(0, "debug", &debug_mode, "show debugging data"),
531 OPT_END()
534 memset(&dir, 0, sizeof(dir));
535 prefix = cmd_prefix;
536 if (prefix)
537 prefix_len = strlen(prefix);
538 git_config(git_default_config, NULL);
540 if (read_cache() < 0)
541 die("index file corrupt");
543 argc = parse_options(argc, argv, prefix, builtin_ls_files_options,
544 ls_files_usage, 0);
545 if (show_tag || show_valid_bit) {
546 tag_cached = "H ";
547 tag_unmerged = "M ";
548 tag_removed = "R ";
549 tag_modified = "C ";
550 tag_other = "? ";
551 tag_killed = "K ";
552 tag_skip_worktree = "S ";
553 tag_resolve_undo = "U ";
555 if (show_modified || show_others || show_deleted || (dir.flags & DIR_SHOW_IGNORED) || show_killed)
556 require_work_tree = 1;
557 if (show_unmerged)
559 * There's no point in showing unmerged unless
560 * you also show the stage information.
562 show_stage = 1;
563 if (dir.exclude_per_dir)
564 exc_given = 1;
566 if (require_work_tree && !is_inside_work_tree())
567 setup_work_tree();
569 pathspec = get_pathspec(prefix, argv);
571 /* be nice with submodule paths ending in a slash */
572 if (pathspec)
573 strip_trailing_slash_from_submodules();
575 /* Find common prefix for all pathspec's */
576 max_prefix = pathspec_prefix(prefix);
578 /* Treat unmatching pathspec elements as errors */
579 if (pathspec && error_unmatch) {
580 int num;
581 for (num = 0; pathspec[num]; num++)
583 ps_matched = xcalloc(1, num);
586 if ((dir.flags & DIR_SHOW_IGNORED) && !exc_given)
587 die("ls-files --ignored needs some exclude pattern");
589 /* With no flags, we default to showing the cached files */
590 if (!(show_stage | show_deleted | show_others | show_unmerged |
591 show_killed | show_modified | show_resolve_undo))
592 show_cached = 1;
594 if (max_prefix)
595 prune_cache(max_prefix);
596 if (with_tree) {
598 * Basic sanity check; show-stages and show-unmerged
599 * would not make any sense with this option.
601 if (show_stage || show_unmerged)
602 die("ls-files --with-tree is incompatible with -s or -u");
603 overlay_tree_on_cache(with_tree, max_prefix);
605 show_files(&dir);
606 if (show_resolve_undo)
607 show_ru_info();
609 if (ps_matched) {
610 int bad;
611 bad = report_path_error(ps_matched, pathspec, prefix_len);
612 if (bad)
613 fprintf(stderr, "Did you forget to 'git add'?\n");
615 return bad ? 1 : 0;
618 return 0;