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
13 #include "parse-options.h"
14 #include "resolve-undo.h"
15 #include "string-list.h"
19 static int show_deleted;
20 static int show_cached;
21 static int show_others;
22 static int show_stage;
23 static int show_unmerged;
24 static int show_resolve_undo;
25 static int show_modified;
26 static int show_killed;
27 static int show_valid_bit;
28 static int line_terminator = '\n';
29 static int debug_mode;
31 static const char *prefix;
32 static int max_prefix_len;
33 static int prefix_len;
34 static struct pathspec pathspec;
35 static int error_unmatch;
36 static char *ps_matched;
37 static const char *with_tree;
39 static int exclude_args;
41 static const char *tag_cached = "";
42 static const char *tag_unmerged = "";
43 static const char *tag_removed = "";
44 static const char *tag_other = "";
45 static const char *tag_killed = "";
46 static const char *tag_modified = "";
47 static const char *tag_skip_worktree = "";
48 static const char *tag_resolve_undo = "";
50 static void write_name(const char *name)
53 * With "--full-name", prefix_len=0; this caller needs to pass
54 * an empty string in that case (a NULL is good for "").
56 write_name_quoted_relative(name, prefix_len ? prefix : NULL,
57 stdout, line_terminator);
60 static void show_dir_entry(const char *tag, struct dir_entry *ent)
62 int len = max_prefix_len;
65 die("git ls-files: internal error - directory entry not superset of prefix");
67 if (!match_pathspec_depth(&pathspec, ent->name, ent->len, len, ps_matched))
71 write_name(ent->name);
74 static void show_other_files(struct dir_struct *dir)
78 for (i = 0; i < dir->nr; i++) {
79 struct dir_entry *ent = dir->entries[i];
80 if (!cache_name_is_other(ent->name, ent->len))
82 show_dir_entry(tag_other, ent);
86 static void show_killed_files(struct dir_struct *dir)
89 for (i = 0; i < dir->nr; i++) {
90 struct dir_entry *ent = dir->entries[i];
92 int pos, len, killed = 0;
94 for (cp = ent->name; cp - ent->name < ent->len; cp = sp + 1) {
97 /* If ent->name is prefix of an entry in the
98 * cache, it will be killed.
100 pos = cache_name_pos(ent->name, ent->len);
102 die("bug in show-killed-files");
104 while (pos < active_nr &&
105 ce_stage(active_cache[pos]))
106 pos++; /* skip unmerged */
107 if (active_nr <= pos)
109 /* pos points at a name immediately after
110 * ent->name in the cache. Does it expect
111 * ent->name to be a directory?
113 len = ce_namelen(active_cache[pos]);
114 if ((ent->len < len) &&
115 !strncmp(active_cache[pos]->name,
116 ent->name, ent->len) &&
117 active_cache[pos]->name[ent->len] == '/')
121 if (0 <= cache_name_pos(ent->name, sp - ent->name)) {
122 /* If any of the leading directories in
123 * ent->name is registered in the cache,
124 * ent->name will be killed.
131 show_dir_entry(tag_killed, dir->entries[i]);
135 static void show_ce_entry(const char *tag, const struct cache_entry *ce)
137 int len = max_prefix_len;
139 if (len >= ce_namelen(ce))
140 die("git ls-files: internal error - cache entry not superset of prefix");
142 if (!match_pathspec_depth(&pathspec, ce->name, ce_namelen(ce), len, ps_matched))
145 if (tag && *tag && show_valid_bit &&
146 (ce->ce_flags & CE_VALID)) {
147 static char alttag[4];
148 memcpy(alttag, tag, 3);
150 alttag[0] = tolower(tag[0]);
151 else if (tag[0] == '?')
165 printf("%s%06o %s %d\t",
168 find_unique_abbrev(ce->sha1,abbrev),
171 write_name(ce->name);
173 const struct stat_data *sd = &ce->ce_stat_data;
175 printf(" ctime: %d:%d\n", sd->sd_ctime.sec, sd->sd_ctime.nsec);
176 printf(" mtime: %d:%d\n", sd->sd_mtime.sec, sd->sd_mtime.nsec);
177 printf(" dev: %d\tino: %d\n", sd->sd_dev, sd->sd_ino);
178 printf(" uid: %d\tgid: %d\n", sd->sd_uid, sd->sd_gid);
179 printf(" size: %d\tflags: %x\n", sd->sd_size, ce->ce_flags);
183 static void show_ru_info(void)
185 struct string_list_item *item;
187 if (!the_index.resolve_undo)
190 for_each_string_list_item(item, the_index.resolve_undo) {
191 const char *path = item->string;
192 struct resolve_undo_info *ui = item->util;
196 if (len < max_prefix_len)
197 continue; /* outside of the prefix */
198 if (!match_pathspec_depth(&pathspec, path, len, max_prefix_len, ps_matched))
199 continue; /* uninterested */
200 for (i = 0; i < 3; i++) {
203 printf("%s%06o %s %d\t", tag_resolve_undo, ui->mode[i],
204 find_unique_abbrev(ui->sha1[i], abbrev),
211 static int ce_excluded(struct dir_struct *dir, const struct cache_entry *ce)
213 int dtype = ce_to_dtype(ce);
214 return is_excluded(dir, ce->name, &dtype);
217 static void show_files(struct dir_struct *dir)
221 /* For cached/deleted files we don't need to even do the readdir */
222 if (show_others || show_killed) {
224 dir->flags |= DIR_COLLECT_KILLED_ONLY;
225 fill_directory(dir, &pathspec);
227 show_other_files(dir);
229 show_killed_files(dir);
231 if (show_cached || show_stage) {
232 for (i = 0; i < active_nr; i++) {
233 const struct cache_entry *ce = active_cache[i];
234 if ((dir->flags & DIR_SHOW_IGNORED) &&
235 !ce_excluded(dir, ce))
237 if (show_unmerged && !ce_stage(ce))
239 if (ce->ce_flags & CE_UPDATE)
241 show_ce_entry(ce_stage(ce) ? tag_unmerged :
242 (ce_skip_worktree(ce) ? tag_skip_worktree : tag_cached), ce);
245 if (show_deleted || show_modified) {
246 for (i = 0; i < active_nr; i++) {
247 const struct cache_entry *ce = active_cache[i];
250 if ((dir->flags & DIR_SHOW_IGNORED) &&
251 !ce_excluded(dir, ce))
253 if (ce->ce_flags & CE_UPDATE)
255 if (ce_skip_worktree(ce))
257 err = lstat(ce->name, &st);
258 if (show_deleted && err)
259 show_ce_entry(tag_removed, ce);
260 if (show_modified && ce_modified(ce, &st, 0))
261 show_ce_entry(tag_modified, ce);
267 * Prune the index to only contain stuff starting with "prefix"
269 static void prune_cache(const char *prefix)
271 int pos = cache_name_pos(prefix, max_prefix_len);
272 unsigned int first, last;
276 memmove(active_cache, active_cache + pos,
277 (active_nr - pos) * sizeof(struct cache_entry *));
281 while (last > first) {
282 int next = (last + first) >> 1;
283 const struct cache_entry *ce = active_cache[next];
284 if (!strncmp(ce->name, prefix, max_prefix_len)) {
294 * Read the tree specified with --with-tree option
295 * (typically, HEAD) into stage #1 and then
296 * squash them down to stage #0. This is used for
297 * --error-unmatch to list and check the path patterns
298 * that were given from the command line. We are not
299 * going to write this index out.
301 void overlay_tree_on_cache(const char *tree_name, const char *prefix)
304 unsigned char sha1[20];
305 struct pathspec pathspec;
306 struct cache_entry *last_stage0 = NULL;
309 if (get_sha1(tree_name, sha1))
310 die("tree-ish %s not found.", tree_name);
311 tree = parse_tree_indirect(sha1);
313 die("bad tree-ish %s", tree_name);
315 /* Hoist the unmerged entries up to stage #3 to make room */
316 for (i = 0; i < active_nr; i++) {
317 struct cache_entry *ce = active_cache[i];
320 ce->ce_flags |= CE_STAGEMASK;
324 static const char *(matchbuf[1]);
326 parse_pathspec(&pathspec, PATHSPEC_ALL_MAGIC,
327 PATHSPEC_PREFER_CWD, prefix, matchbuf);
329 memset(&pathspec, 0, sizeof(pathspec));
330 if (read_tree(tree, 1, &pathspec))
331 die("unable to read tree entries %s", tree_name);
333 for (i = 0; i < active_nr; i++) {
334 struct cache_entry *ce = active_cache[i];
335 switch (ce_stage(ce)) {
343 * If there is stage #0 entry for this, we do not
344 * need to show it. We use CE_UPDATE bit to mark
348 !strcmp(last_stage0->name, ce->name))
349 ce->ce_flags |= CE_UPDATE;
354 int report_path_error(const char *ps_matched,
355 const struct pathspec *pathspec,
359 * Make sure all pathspec matched; otherwise it is an error.
361 struct strbuf sb = STRBUF_INIT;
363 for (num = 0; num < pathspec->nr; num++) {
364 int other, found_dup;
369 * The caller might have fed identical pathspec
370 * twice. Do not barf on such a mistake.
371 * FIXME: parse_pathspec should have eliminated
372 * duplicate pathspec.
374 for (found_dup = other = 0;
375 !found_dup && other < pathspec->nr;
377 if (other == num || !ps_matched[other])
379 if (!strcmp(pathspec->items[other].original,
380 pathspec->items[num].original))
382 * Ok, we have a match already.
389 error("pathspec '%s' did not match any file(s) known to git.",
390 pathspec->items[num].original);
397 static const char * const ls_files_usage[] = {
398 N_("git ls-files [options] [<file>...]"),
402 static int option_parse_z(const struct option *opt,
403 const char *arg, int unset)
405 line_terminator = unset ? '\n' : '\0';
410 static int option_parse_exclude(const struct option *opt,
411 const char *arg, int unset)
413 struct string_list *exclude_list = opt->value;
416 string_list_append(exclude_list, arg);
421 static int option_parse_exclude_from(const struct option *opt,
422 const char *arg, int unset)
424 struct dir_struct *dir = opt->value;
427 add_excludes_from_file(dir, arg);
432 static int option_parse_exclude_standard(const struct option *opt,
433 const char *arg, int unset)
435 struct dir_struct *dir = opt->value;
438 setup_standard_excludes(dir);
443 int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)
445 int require_work_tree = 0, show_tag = 0, i;
446 const char *max_prefix;
447 struct dir_struct dir;
448 struct exclude_list *el;
449 struct string_list exclude_list = STRING_LIST_INIT_NODUP;
450 struct option builtin_ls_files_options[] = {
451 { OPTION_CALLBACK, 'z', NULL, NULL, NULL,
452 N_("paths are separated with NUL character"),
453 PARSE_OPT_NOARG, option_parse_z },
454 OPT_BOOL('t', NULL, &show_tag,
455 N_("identify the file status with tags")),
456 OPT_BOOL('v', NULL, &show_valid_bit,
457 N_("use lowercase letters for 'assume unchanged' files")),
458 OPT_BOOL('c', "cached", &show_cached,
459 N_("show cached files in the output (default)")),
460 OPT_BOOL('d', "deleted", &show_deleted,
461 N_("show deleted files in the output")),
462 OPT_BOOL('m', "modified", &show_modified,
463 N_("show modified files in the output")),
464 OPT_BOOL('o', "others", &show_others,
465 N_("show other files in the output")),
466 OPT_BIT('i', "ignored", &dir.flags,
467 N_("show ignored files in the output"),
469 OPT_BOOL('s', "stage", &show_stage,
470 N_("show staged contents' object name in the output")),
471 OPT_BOOL('k', "killed", &show_killed,
472 N_("show files on the filesystem that need to be removed")),
473 OPT_BIT(0, "directory", &dir.flags,
474 N_("show 'other' directories' name only"),
475 DIR_SHOW_OTHER_DIRECTORIES),
476 OPT_NEGBIT(0, "empty-directory", &dir.flags,
477 N_("don't show empty directories"),
478 DIR_HIDE_EMPTY_DIRECTORIES),
479 OPT_BOOL('u', "unmerged", &show_unmerged,
480 N_("show unmerged files in the output")),
481 OPT_BOOL(0, "resolve-undo", &show_resolve_undo,
482 N_("show resolve-undo information")),
483 { OPTION_CALLBACK, 'x', "exclude", &exclude_list, N_("pattern"),
484 N_("skip files matching pattern"),
485 0, option_parse_exclude },
486 { OPTION_CALLBACK, 'X', "exclude-from", &dir, N_("file"),
487 N_("exclude patterns are read from <file>"),
488 0, option_parse_exclude_from },
489 OPT_STRING(0, "exclude-per-directory", &dir.exclude_per_dir, N_("file"),
490 N_("read additional per-directory exclude patterns in <file>")),
491 { OPTION_CALLBACK, 0, "exclude-standard", &dir, NULL,
492 N_("add the standard git exclusions"),
493 PARSE_OPT_NOARG, option_parse_exclude_standard },
494 { OPTION_SET_INT, 0, "full-name", &prefix_len, NULL,
495 N_("make the output relative to the project top directory"),
496 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL },
497 OPT_BOOL(0, "error-unmatch", &error_unmatch,
498 N_("if any <file> is not in the index, treat this as an error")),
499 OPT_STRING(0, "with-tree", &with_tree, N_("tree-ish"),
500 N_("pretend that paths removed since <tree-ish> are still present")),
501 OPT__ABBREV(&abbrev),
502 OPT_BOOL(0, "debug", &debug_mode, N_("show debugging data")),
506 if (argc == 2 && !strcmp(argv[1], "-h"))
507 usage_with_options(ls_files_usage, builtin_ls_files_options);
509 memset(&dir, 0, sizeof(dir));
512 prefix_len = strlen(prefix);
513 git_config(git_default_config, NULL);
515 if (read_cache() < 0)
516 die("index file corrupt");
518 argc = parse_options(argc, argv, prefix, builtin_ls_files_options,
520 el = add_exclude_list(&dir, EXC_CMDL, "--exclude option");
521 for (i = 0; i < exclude_list.nr; i++) {
522 add_exclude(exclude_list.items[i].string, "", 0, el, --exclude_args);
524 if (show_tag || show_valid_bit) {
531 tag_skip_worktree = "S ";
532 tag_resolve_undo = "U ";
534 if (show_modified || show_others || show_deleted || (dir.flags & DIR_SHOW_IGNORED) || show_killed)
535 require_work_tree = 1;
538 * There's no point in showing unmerged unless
539 * you also show the stage information.
542 if (dir.exclude_per_dir)
545 if (require_work_tree && !is_inside_work_tree())
548 parse_pathspec(&pathspec, 0,
549 PATHSPEC_PREFER_CWD |
550 PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAP,
553 /* Find common prefix for all pathspec's */
554 max_prefix = common_prefix(&pathspec);
555 max_prefix_len = max_prefix ? strlen(max_prefix) : 0;
557 /* Treat unmatching pathspec elements as errors */
558 if (pathspec.nr && error_unmatch)
559 ps_matched = xcalloc(1, pathspec.nr);
561 if ((dir.flags & DIR_SHOW_IGNORED) && !exc_given)
562 die("ls-files --ignored needs some exclude pattern");
564 /* With no flags, we default to showing the cached files */
565 if (!(show_stage || show_deleted || show_others || show_unmerged ||
566 show_killed || show_modified || show_resolve_undo))
570 prune_cache(max_prefix);
573 * Basic sanity check; show-stages and show-unmerged
574 * would not make any sense with this option.
576 if (show_stage || show_unmerged)
577 die("ls-files --with-tree is incompatible with -s or -u");
578 overlay_tree_on_cache(with_tree, max_prefix);
581 if (show_resolve_undo)
586 bad = report_path_error(ps_matched, &pathspec, prefix);
588 fprintf(stderr, "Did you forget to 'git add'?\n");