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
, size_t len
)
52 write_name_quoted_relative(name
, len
, prefix
, prefix_len
, stdout
,
56 static void show_dir_entry(const char *tag
, struct dir_entry
*ent
)
58 int len
= max_prefix_len
;
61 die("git ls-files: internal error - directory entry not superset of prefix");
63 if (!match_pathspec_depth(&pathspec
, ent
->name
, ent
->len
, len
, ps_matched
))
67 write_name(ent
->name
, ent
->len
);
70 static void show_other_files(struct dir_struct
*dir
)
74 for (i
= 0; i
< dir
->nr
; i
++) {
75 struct dir_entry
*ent
= dir
->entries
[i
];
76 if (!cache_name_is_other(ent
->name
, ent
->len
))
78 show_dir_entry(tag_other
, ent
);
82 static void show_killed_files(struct dir_struct
*dir
)
85 for (i
= 0; i
< dir
->nr
; i
++) {
86 struct dir_entry
*ent
= dir
->entries
[i
];
88 int pos
, len
, killed
= 0;
90 for (cp
= ent
->name
; cp
- ent
->name
< ent
->len
; cp
= sp
+ 1) {
93 /* If ent->name is prefix of an entry in the
94 * cache, it will be killed.
96 pos
= cache_name_pos(ent
->name
, ent
->len
);
98 die("bug in show-killed-files");
100 while (pos
< active_nr
&&
101 ce_stage(active_cache
[pos
]))
102 pos
++; /* skip unmerged */
103 if (active_nr
<= pos
)
105 /* pos points at a name immediately after
106 * ent->name in the cache. Does it expect
107 * ent->name to be a directory?
109 len
= ce_namelen(active_cache
[pos
]);
110 if ((ent
->len
< len
) &&
111 !strncmp(active_cache
[pos
]->name
,
112 ent
->name
, ent
->len
) &&
113 active_cache
[pos
]->name
[ent
->len
] == '/')
117 if (0 <= cache_name_pos(ent
->name
, sp
- ent
->name
)) {
118 /* If any of the leading directories in
119 * ent->name is registered in the cache,
120 * ent->name will be killed.
127 show_dir_entry(tag_killed
, dir
->entries
[i
]);
131 static void show_ce_entry(const char *tag
, struct cache_entry
*ce
)
133 int len
= max_prefix_len
;
135 if (len
>= ce_namelen(ce
))
136 die("git ls-files: internal error - cache entry not superset of prefix");
138 if (!match_pathspec_depth(&pathspec
, ce
->name
, ce_namelen(ce
), len
, ps_matched
))
141 if (tag
&& *tag
&& show_valid_bit
&&
142 (ce
->ce_flags
& CE_VALID
)) {
143 static char alttag
[4];
144 memcpy(alttag
, tag
, 3);
146 alttag
[0] = tolower(tag
[0]);
147 else if (tag
[0] == '?')
161 printf("%s%06o %s %d\t",
164 find_unique_abbrev(ce
->sha1
,abbrev
),
167 write_name(ce
->name
, ce_namelen(ce
));
169 struct stat_data
*sd
= &ce
->ce_stat_data
;
171 printf(" ctime: %d:%d\n", sd
->sd_ctime
.sec
, sd
->sd_ctime
.nsec
);
172 printf(" mtime: %d:%d\n", sd
->sd_mtime
.sec
, sd
->sd_mtime
.nsec
);
173 printf(" dev: %d\tino: %d\n", sd
->sd_dev
, sd
->sd_ino
);
174 printf(" uid: %d\tgid: %d\n", sd
->sd_uid
, sd
->sd_gid
);
175 printf(" size: %d\tflags: %x\n", sd
->sd_size
, ce
->ce_flags
);
179 static void show_ru_info(void)
181 struct string_list_item
*item
;
183 if (!the_index
.resolve_undo
)
186 for_each_string_list_item(item
, the_index
.resolve_undo
) {
187 const char *path
= item
->string
;
188 struct resolve_undo_info
*ui
= item
->util
;
192 if (len
< max_prefix_len
)
193 continue; /* outside of the prefix */
194 if (!match_pathspec_depth(&pathspec
, path
, len
, max_prefix_len
, ps_matched
))
195 continue; /* uninterested */
196 for (i
= 0; i
< 3; i
++) {
199 printf("%s%06o %s %d\t", tag_resolve_undo
, ui
->mode
[i
],
200 find_unique_abbrev(ui
->sha1
[i
], abbrev
),
202 write_name(path
, len
);
207 static int ce_excluded(struct dir_struct
*dir
, struct cache_entry
*ce
)
209 int dtype
= ce_to_dtype(ce
);
210 return is_excluded(dir
, ce
->name
, &dtype
);
213 static void show_files(struct dir_struct
*dir
)
217 /* For cached/deleted files we don't need to even do the readdir */
218 if (show_others
|| show_killed
) {
219 fill_directory(dir
, &pathspec
);
221 show_other_files(dir
);
223 show_killed_files(dir
);
225 if (show_cached
|| show_stage
) {
226 for (i
= 0; i
< active_nr
; i
++) {
227 struct cache_entry
*ce
= active_cache
[i
];
228 if ((dir
->flags
& DIR_SHOW_IGNORED
) &&
229 !ce_excluded(dir
, ce
))
231 if (show_unmerged
&& !ce_stage(ce
))
233 if (ce
->ce_flags
& CE_UPDATE
)
235 show_ce_entry(ce_stage(ce
) ? tag_unmerged
:
236 (ce_skip_worktree(ce
) ? tag_skip_worktree
: tag_cached
), ce
);
239 if (show_deleted
|| show_modified
) {
240 for (i
= 0; i
< active_nr
; i
++) {
241 struct cache_entry
*ce
= active_cache
[i
];
244 if ((dir
->flags
& DIR_SHOW_IGNORED
) &&
245 !ce_excluded(dir
, ce
))
247 if (ce
->ce_flags
& CE_UPDATE
)
249 if (ce_skip_worktree(ce
))
251 err
= lstat(ce
->name
, &st
);
252 if (show_deleted
&& err
)
253 show_ce_entry(tag_removed
, ce
);
254 if (show_modified
&& ce_modified(ce
, &st
, 0))
255 show_ce_entry(tag_modified
, ce
);
261 * Prune the index to only contain stuff starting with "prefix"
263 static void prune_cache(const char *prefix
)
265 int pos
= cache_name_pos(prefix
, max_prefix_len
);
266 unsigned int first
, last
;
270 memmove(active_cache
, active_cache
+ pos
,
271 (active_nr
- pos
) * sizeof(struct cache_entry
*));
275 while (last
> first
) {
276 int next
= (last
+ first
) >> 1;
277 struct cache_entry
*ce
= active_cache
[next
];
278 if (!strncmp(ce
->name
, prefix
, max_prefix_len
)) {
288 * Read the tree specified with --with-tree option
289 * (typically, HEAD) into stage #1 and then
290 * squash them down to stage #0. This is used for
291 * --error-unmatch to list and check the path patterns
292 * that were given from the command line. We are not
293 * going to write this index out.
295 void overlay_tree_on_cache(const char *tree_name
, const char *prefix
)
298 unsigned char sha1
[20];
299 struct pathspec pathspec
;
300 struct cache_entry
*last_stage0
= NULL
;
303 if (get_sha1(tree_name
, sha1
))
304 die("tree-ish %s not found.", tree_name
);
305 tree
= parse_tree_indirect(sha1
);
307 die("bad tree-ish %s", tree_name
);
309 /* Hoist the unmerged entries up to stage #3 to make room */
310 for (i
= 0; i
< active_nr
; i
++) {
311 struct cache_entry
*ce
= active_cache
[i
];
314 ce
->ce_flags
|= CE_STAGEMASK
;
318 static const char *(matchbuf
[2]);
319 matchbuf
[0] = prefix
;
321 init_pathspec(&pathspec
, matchbuf
);
322 pathspec
.items
[0].nowildcard_len
= pathspec
.items
[0].len
;
324 init_pathspec(&pathspec
, NULL
);
325 if (read_tree(tree
, 1, &pathspec
))
326 die("unable to read tree entries %s", tree_name
);
328 for (i
= 0; i
< active_nr
; i
++) {
329 struct cache_entry
*ce
= active_cache
[i
];
330 switch (ce_stage(ce
)) {
338 * If there is stage #0 entry for this, we do not
339 * need to show it. We use CE_UPDATE bit to mark
343 !strcmp(last_stage0
->name
, ce
->name
))
344 ce
->ce_flags
|= CE_UPDATE
;
349 int report_path_error(const char *ps_matched
,
350 const struct pathspec
*pathspec
,
354 * Make sure all pathspec matched; otherwise it is an error.
356 struct strbuf sb
= STRBUF_INIT
;
358 for (num
= 0; num
< pathspec
->nr
; num
++) {
359 int other
, found_dup
;
364 * The caller might have fed identical pathspec
365 * twice. Do not barf on such a mistake.
366 * FIXME: parse_pathspec should have eliminated
367 * duplicate pathspec.
369 for (found_dup
= other
= 0;
370 !found_dup
&& other
< pathspec
->nr
;
372 if (other
== num
|| !ps_matched
[other
])
374 if (!strcmp(pathspec
->items
[other
].original
,
375 pathspec
->items
[num
].original
))
377 * Ok, we have a match already.
384 error("pathspec '%s' did not match any file(s) known to git.",
385 pathspec
->items
[num
].original
);
392 static const char * const ls_files_usage
[] = {
393 N_("git ls-files [options] [<file>...]"),
397 static int option_parse_z(const struct option
*opt
,
398 const char *arg
, int unset
)
400 line_terminator
= unset
? '\n' : '\0';
405 static int option_parse_exclude(const struct option
*opt
,
406 const char *arg
, int unset
)
408 struct string_list
*exclude_list
= opt
->value
;
411 string_list_append(exclude_list
, arg
);
416 static int option_parse_exclude_from(const struct option
*opt
,
417 const char *arg
, int unset
)
419 struct dir_struct
*dir
= opt
->value
;
422 add_excludes_from_file(dir
, arg
);
427 static int option_parse_exclude_standard(const struct option
*opt
,
428 const char *arg
, int unset
)
430 struct dir_struct
*dir
= opt
->value
;
433 setup_standard_excludes(dir
);
438 int cmd_ls_files(int argc
, const char **argv
, const char *cmd_prefix
)
440 int require_work_tree
= 0, show_tag
= 0, i
;
441 const char *max_prefix
;
442 struct dir_struct dir
;
443 struct exclude_list
*el
;
444 struct string_list exclude_list
= STRING_LIST_INIT_NODUP
;
445 struct option builtin_ls_files_options
[] = {
446 { OPTION_CALLBACK
, 'z', NULL
, NULL
, NULL
,
447 N_("paths are separated with NUL character"),
448 PARSE_OPT_NOARG
, option_parse_z
},
449 OPT_BOOLEAN('t', NULL
, &show_tag
,
450 N_("identify the file status with tags")),
451 OPT_BOOLEAN('v', NULL
, &show_valid_bit
,
452 N_("use lowercase letters for 'assume unchanged' files")),
453 OPT_BOOLEAN('c', "cached", &show_cached
,
454 N_("show cached files in the output (default)")),
455 OPT_BOOLEAN('d', "deleted", &show_deleted
,
456 N_("show deleted files in the output")),
457 OPT_BOOLEAN('m', "modified", &show_modified
,
458 N_("show modified files in the output")),
459 OPT_BOOLEAN('o', "others", &show_others
,
460 N_("show other files in the output")),
461 OPT_BIT('i', "ignored", &dir
.flags
,
462 N_("show ignored files in the output"),
464 OPT_BOOLEAN('s', "stage", &show_stage
,
465 N_("show staged contents' object name in the output")),
466 OPT_BOOLEAN('k', "killed", &show_killed
,
467 N_("show files on the filesystem that need to be removed")),
468 OPT_BIT(0, "directory", &dir
.flags
,
469 N_("show 'other' directories' name only"),
470 DIR_SHOW_OTHER_DIRECTORIES
),
471 OPT_NEGBIT(0, "empty-directory", &dir
.flags
,
472 N_("don't show empty directories"),
473 DIR_HIDE_EMPTY_DIRECTORIES
),
474 OPT_BOOLEAN('u', "unmerged", &show_unmerged
,
475 N_("show unmerged files in the output")),
476 OPT_BOOLEAN(0, "resolve-undo", &show_resolve_undo
,
477 N_("show resolve-undo information")),
478 { OPTION_CALLBACK
, 'x', "exclude", &exclude_list
, N_("pattern"),
479 N_("skip files matching pattern"),
480 0, option_parse_exclude
},
481 { OPTION_CALLBACK
, 'X', "exclude-from", &dir
, N_("file"),
482 N_("exclude patterns are read from <file>"),
483 0, option_parse_exclude_from
},
484 OPT_STRING(0, "exclude-per-directory", &dir
.exclude_per_dir
, N_("file"),
485 N_("read additional per-directory exclude patterns in <file>")),
486 { OPTION_CALLBACK
, 0, "exclude-standard", &dir
, NULL
,
487 N_("add the standard git exclusions"),
488 PARSE_OPT_NOARG
, option_parse_exclude_standard
},
489 { OPTION_SET_INT
, 0, "full-name", &prefix_len
, NULL
,
490 N_("make the output relative to the project top directory"),
491 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
},
492 OPT_BOOLEAN(0, "error-unmatch", &error_unmatch
,
493 N_("if any <file> is not in the index, treat this as an error")),
494 OPT_STRING(0, "with-tree", &with_tree
, N_("tree-ish"),
495 N_("pretend that paths removed since <tree-ish> are still present")),
496 OPT__ABBREV(&abbrev
),
497 OPT_BOOLEAN(0, "debug", &debug_mode
, N_("show debugging data")),
501 if (argc
== 2 && !strcmp(argv
[1], "-h"))
502 usage_with_options(ls_files_usage
, builtin_ls_files_options
);
504 memset(&dir
, 0, sizeof(dir
));
507 prefix_len
= strlen(prefix
);
508 git_config(git_default_config
, NULL
);
510 if (read_cache() < 0)
511 die("index file corrupt");
513 argc
= parse_options(argc
, argv
, prefix
, builtin_ls_files_options
,
515 el
= add_exclude_list(&dir
, EXC_CMDL
, "--exclude option");
516 for (i
= 0; i
< exclude_list
.nr
; i
++) {
517 add_exclude(exclude_list
.items
[i
].string
, "", 0, el
, --exclude_args
);
519 if (show_tag
|| show_valid_bit
) {
526 tag_skip_worktree
= "S ";
527 tag_resolve_undo
= "U ";
529 if (show_modified
|| show_others
|| show_deleted
|| (dir
.flags
& DIR_SHOW_IGNORED
) || show_killed
)
530 require_work_tree
= 1;
533 * There's no point in showing unmerged unless
534 * you also show the stage information.
537 if (dir
.exclude_per_dir
)
540 if (require_work_tree
&& !is_inside_work_tree())
543 parse_pathspec(&pathspec
, 0,
544 PATHSPEC_PREFER_CWD
|
545 PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAP
,
548 /* Find common prefix for all pathspec's */
549 max_prefix
= common_prefix(pathspec
.raw
);
550 max_prefix_len
= max_prefix
? strlen(max_prefix
) : 0;
552 /* Treat unmatching pathspec elements as errors */
553 if (pathspec
.nr
&& error_unmatch
)
554 ps_matched
= xcalloc(1, pathspec
.nr
);
556 if ((dir
.flags
& DIR_SHOW_IGNORED
) && !exc_given
)
557 die("ls-files --ignored needs some exclude pattern");
559 /* With no flags, we default to showing the cached files */
560 if (!(show_stage
|| show_deleted
|| show_others
|| show_unmerged
||
561 show_killed
|| show_modified
|| show_resolve_undo
))
565 prune_cache(max_prefix
);
568 * Basic sanity check; show-stages and show-unmerged
569 * would not make any sense with this option.
571 if (show_stage
|| show_unmerged
)
572 die("ls-files --with-tree is incompatible with -s or -u");
573 overlay_tree_on_cache(with_tree
, max_prefix
);
576 if (show_resolve_undo
)
581 bad
= report_path_error(ps_matched
, &pathspec
, prefix
);
583 fprintf(stderr
, "Did you forget to 'git add'?\n");