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"
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
;
38 static int exclude_args
;
40 static const char *tag_cached
= "";
41 static const char *tag_unmerged
= "";
42 static const char *tag_removed
= "";
43 static const char *tag_other
= "";
44 static const char *tag_killed
= "";
45 static const char *tag_modified
= "";
46 static const char *tag_skip_worktree
= "";
47 static const char *tag_resolve_undo
= "";
49 static void write_name(const char *name
)
52 * With "--full-name", prefix_len=0; this caller needs to pass
53 * an empty string in that case (a NULL is good for "").
55 write_name_quoted_relative(name
, prefix_len
? prefix
: NULL
,
56 stdout
, line_terminator
);
59 static void show_dir_entry(const char *tag
, struct dir_entry
*ent
)
61 int len
= max_prefix_len
;
64 die("git ls-files: internal error - directory entry not superset of prefix");
66 if (!match_pathspec(pathspec
, ent
->name
, ent
->len
, len
, ps_matched
))
70 write_name(ent
->name
);
73 static void show_other_files(struct dir_struct
*dir
)
77 for (i
= 0; i
< dir
->nr
; i
++) {
78 struct dir_entry
*ent
= dir
->entries
[i
];
79 if (!cache_name_is_other(ent
->name
, ent
->len
))
81 show_dir_entry(tag_other
, ent
);
85 static void show_killed_files(struct dir_struct
*dir
)
88 for (i
= 0; i
< dir
->nr
; i
++) {
89 struct dir_entry
*ent
= dir
->entries
[i
];
91 int pos
, len
, killed
= 0;
93 for (cp
= ent
->name
; cp
- ent
->name
< ent
->len
; cp
= sp
+ 1) {
96 /* If ent->name is prefix of an entry in the
97 * cache, it will be killed.
99 pos
= cache_name_pos(ent
->name
, ent
->len
);
101 die("bug in show-killed-files");
103 while (pos
< active_nr
&&
104 ce_stage(active_cache
[pos
]))
105 pos
++; /* skip unmerged */
106 if (active_nr
<= pos
)
108 /* pos points at a name immediately after
109 * ent->name in the cache. Does it expect
110 * ent->name to be a directory?
112 len
= ce_namelen(active_cache
[pos
]);
113 if ((ent
->len
< len
) &&
114 !strncmp(active_cache
[pos
]->name
,
115 ent
->name
, ent
->len
) &&
116 active_cache
[pos
]->name
[ent
->len
] == '/')
120 if (0 <= cache_name_pos(ent
->name
, sp
- ent
->name
)) {
121 /* If any of the leading directories in
122 * ent->name is registered in the cache,
123 * ent->name will be killed.
130 show_dir_entry(tag_killed
, dir
->entries
[i
]);
134 static void show_ce_entry(const char *tag
, const struct cache_entry
*ce
)
136 int len
= max_prefix_len
;
138 if (len
>= ce_namelen(ce
))
139 die("git ls-files: internal error - cache entry not superset of prefix");
141 if (!match_pathspec(pathspec
, ce
->name
, ce_namelen(ce
), len
, ps_matched
))
144 if (tag
&& *tag
&& show_valid_bit
&&
145 (ce
->ce_flags
& CE_VALID
)) {
146 static char alttag
[4];
147 memcpy(alttag
, tag
, 3);
149 alttag
[0] = tolower(tag
[0]);
150 else if (tag
[0] == '?')
164 printf("%s%06o %s %d\t",
167 find_unique_abbrev(ce
->sha1
,abbrev
),
170 write_name(ce
->name
);
172 const struct stat_data
*sd
= &ce
->ce_stat_data
;
174 printf(" ctime: %d:%d\n", sd
->sd_ctime
.sec
, sd
->sd_ctime
.nsec
);
175 printf(" mtime: %d:%d\n", sd
->sd_mtime
.sec
, sd
->sd_mtime
.nsec
);
176 printf(" dev: %d\tino: %d\n", sd
->sd_dev
, sd
->sd_ino
);
177 printf(" uid: %d\tgid: %d\n", sd
->sd_uid
, sd
->sd_gid
);
178 printf(" size: %d\tflags: %x\n", sd
->sd_size
, ce
->ce_flags
);
182 static void show_ru_info(void)
184 struct string_list_item
*item
;
186 if (!the_index
.resolve_undo
)
189 for_each_string_list_item(item
, the_index
.resolve_undo
) {
190 const char *path
= item
->string
;
191 struct resolve_undo_info
*ui
= item
->util
;
195 if (len
< max_prefix_len
)
196 continue; /* outside of the prefix */
197 if (!match_pathspec(pathspec
, path
, len
, max_prefix_len
, ps_matched
))
198 continue; /* uninterested */
199 for (i
= 0; i
< 3; i
++) {
202 printf("%s%06o %s %d\t", tag_resolve_undo
, ui
->mode
[i
],
203 find_unique_abbrev(ui
->sha1
[i
], abbrev
),
210 static int ce_excluded(struct dir_struct
*dir
, const struct cache_entry
*ce
)
212 int dtype
= ce_to_dtype(ce
);
213 return is_excluded(dir
, ce
->name
, &dtype
);
216 static void show_files(struct dir_struct
*dir
)
220 /* For cached/deleted files we don't need to even do the readdir */
221 if (show_others
|| show_killed
) {
223 dir
->flags
|= DIR_COLLECT_KILLED_ONLY
;
224 fill_directory(dir
, pathspec
);
226 show_other_files(dir
);
228 show_killed_files(dir
);
230 if (show_cached
|| show_stage
) {
231 for (i
= 0; i
< active_nr
; i
++) {
232 const struct cache_entry
*ce
= active_cache
[i
];
233 if ((dir
->flags
& DIR_SHOW_IGNORED
) &&
234 !ce_excluded(dir
, ce
))
236 if (show_unmerged
&& !ce_stage(ce
))
238 if (ce
->ce_flags
& CE_UPDATE
)
240 show_ce_entry(ce_stage(ce
) ? tag_unmerged
:
241 (ce_skip_worktree(ce
) ? tag_skip_worktree
: tag_cached
), ce
);
244 if (show_deleted
|| show_modified
) {
245 for (i
= 0; i
< active_nr
; i
++) {
246 const struct cache_entry
*ce
= active_cache
[i
];
249 if ((dir
->flags
& DIR_SHOW_IGNORED
) &&
250 !ce_excluded(dir
, ce
))
252 if (ce
->ce_flags
& CE_UPDATE
)
254 if (ce_skip_worktree(ce
))
256 err
= lstat(ce
->name
, &st
);
257 if (show_deleted
&& err
)
258 show_ce_entry(tag_removed
, ce
);
259 if (show_modified
&& ce_modified(ce
, &st
, 0))
260 show_ce_entry(tag_modified
, ce
);
266 * Prune the index to only contain stuff starting with "prefix"
268 static void prune_cache(const char *prefix
)
270 int pos
= cache_name_pos(prefix
, max_prefix_len
);
271 unsigned int first
, last
;
275 memmove(active_cache
, active_cache
+ pos
,
276 (active_nr
- pos
) * sizeof(struct cache_entry
*));
280 while (last
> first
) {
281 int next
= (last
+ first
) >> 1;
282 const struct cache_entry
*ce
= active_cache
[next
];
283 if (!strncmp(ce
->name
, prefix
, max_prefix_len
)) {
292 static void strip_trailing_slash_from_submodules(void)
296 for (p
= pathspec
; *p
!= NULL
; p
++) {
297 int len
= strlen(*p
), pos
;
299 if (len
< 1 || (*p
)[len
- 1] != '/')
301 pos
= cache_name_pos(*p
, len
- 1);
302 if (pos
>= 0 && S_ISGITLINK(active_cache
[pos
]->ce_mode
))
303 *p
= xstrndup(*p
, len
- 1);
308 * Read the tree specified with --with-tree option
309 * (typically, HEAD) into stage #1 and then
310 * squash them down to stage #0. This is used for
311 * --error-unmatch to list and check the path patterns
312 * that were given from the command line. We are not
313 * going to write this index out.
315 void overlay_tree_on_cache(const char *tree_name
, const char *prefix
)
318 unsigned char sha1
[20];
319 struct pathspec pathspec
;
320 struct cache_entry
*last_stage0
= NULL
;
323 if (get_sha1(tree_name
, sha1
))
324 die("tree-ish %s not found.", tree_name
);
325 tree
= parse_tree_indirect(sha1
);
327 die("bad tree-ish %s", tree_name
);
329 /* Hoist the unmerged entries up to stage #3 to make room */
330 for (i
= 0; i
< active_nr
; i
++) {
331 struct cache_entry
*ce
= active_cache
[i
];
334 ce
->ce_flags
|= CE_STAGEMASK
;
338 static const char *(matchbuf
[2]);
339 matchbuf
[0] = prefix
;
341 init_pathspec(&pathspec
, matchbuf
);
342 pathspec
.items
[0].nowildcard_len
= pathspec
.items
[0].len
;
344 init_pathspec(&pathspec
, NULL
);
345 if (read_tree(tree
, 1, &pathspec
))
346 die("unable to read tree entries %s", tree_name
);
348 for (i
= 0; i
< active_nr
; i
++) {
349 struct cache_entry
*ce
= active_cache
[i
];
350 switch (ce_stage(ce
)) {
358 * If there is stage #0 entry for this, we do not
359 * need to show it. We use CE_UPDATE bit to mark
363 !strcmp(last_stage0
->name
, ce
->name
))
364 ce
->ce_flags
|= CE_UPDATE
;
369 int report_path_error(const char *ps_matched
, const char **pathspec
, const char *prefix
)
372 * Make sure all pathspec matched; otherwise it is an error.
374 struct strbuf sb
= STRBUF_INIT
;
377 for (num
= 0; pathspec
[num
]; num
++) {
378 int other
, found_dup
;
383 * The caller might have fed identical pathspec
384 * twice. Do not barf on such a mistake.
386 for (found_dup
= other
= 0;
387 !found_dup
&& pathspec
[other
];
389 if (other
== num
|| !ps_matched
[other
])
391 if (!strcmp(pathspec
[other
], pathspec
[num
]))
393 * Ok, we have a match already.
400 name
= quote_path_relative(pathspec
[num
], prefix
, &sb
);
401 error("pathspec '%s' did not match any file(s) known to git.",
409 static const char * const ls_files_usage
[] = {
410 N_("git ls-files [options] [<file>...]"),
414 static int option_parse_z(const struct option
*opt
,
415 const char *arg
, int unset
)
417 line_terminator
= unset
? '\n' : '\0';
422 static int option_parse_exclude(const struct option
*opt
,
423 const char *arg
, int unset
)
425 struct string_list
*exclude_list
= opt
->value
;
428 string_list_append(exclude_list
, arg
);
433 static int option_parse_exclude_from(const struct option
*opt
,
434 const char *arg
, int unset
)
436 struct dir_struct
*dir
= opt
->value
;
439 add_excludes_from_file(dir
, arg
);
444 static int option_parse_exclude_standard(const struct option
*opt
,
445 const char *arg
, int unset
)
447 struct dir_struct
*dir
= opt
->value
;
450 setup_standard_excludes(dir
);
455 int cmd_ls_files(int argc
, const char **argv
, const char *cmd_prefix
)
457 int require_work_tree
= 0, show_tag
= 0, i
;
458 const char *max_prefix
;
459 struct dir_struct dir
;
460 struct exclude_list
*el
;
461 struct string_list exclude_list
= STRING_LIST_INIT_NODUP
;
462 struct option builtin_ls_files_options
[] = {
463 { OPTION_CALLBACK
, 'z', NULL
, NULL
, NULL
,
464 N_("paths are separated with NUL character"),
465 PARSE_OPT_NOARG
, option_parse_z
},
466 OPT_BOOLEAN('t', NULL
, &show_tag
,
467 N_("identify the file status with tags")),
468 OPT_BOOLEAN('v', NULL
, &show_valid_bit
,
469 N_("use lowercase letters for 'assume unchanged' files")),
470 OPT_BOOLEAN('c', "cached", &show_cached
,
471 N_("show cached files in the output (default)")),
472 OPT_BOOLEAN('d', "deleted", &show_deleted
,
473 N_("show deleted files in the output")),
474 OPT_BOOLEAN('m', "modified", &show_modified
,
475 N_("show modified files in the output")),
476 OPT_BOOLEAN('o', "others", &show_others
,
477 N_("show other files in the output")),
478 OPT_BIT('i', "ignored", &dir
.flags
,
479 N_("show ignored files in the output"),
481 OPT_BOOLEAN('s', "stage", &show_stage
,
482 N_("show staged contents' object name in the output")),
483 OPT_BOOLEAN('k', "killed", &show_killed
,
484 N_("show files on the filesystem that need to be removed")),
485 OPT_BIT(0, "directory", &dir
.flags
,
486 N_("show 'other' directories' name only"),
487 DIR_SHOW_OTHER_DIRECTORIES
),
488 OPT_NEGBIT(0, "empty-directory", &dir
.flags
,
489 N_("don't show empty directories"),
490 DIR_HIDE_EMPTY_DIRECTORIES
),
491 OPT_BOOLEAN('u', "unmerged", &show_unmerged
,
492 N_("show unmerged files in the output")),
493 OPT_BOOLEAN(0, "resolve-undo", &show_resolve_undo
,
494 N_("show resolve-undo information")),
495 { OPTION_CALLBACK
, 'x', "exclude", &exclude_list
, N_("pattern"),
496 N_("skip files matching pattern"),
497 0, option_parse_exclude
},
498 { OPTION_CALLBACK
, 'X', "exclude-from", &dir
, N_("file"),
499 N_("exclude patterns are read from <file>"),
500 0, option_parse_exclude_from
},
501 OPT_STRING(0, "exclude-per-directory", &dir
.exclude_per_dir
, N_("file"),
502 N_("read additional per-directory exclude patterns in <file>")),
503 { OPTION_CALLBACK
, 0, "exclude-standard", &dir
, NULL
,
504 N_("add the standard git exclusions"),
505 PARSE_OPT_NOARG
, option_parse_exclude_standard
},
506 { OPTION_SET_INT
, 0, "full-name", &prefix_len
, NULL
,
507 N_("make the output relative to the project top directory"),
508 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
},
509 OPT_BOOLEAN(0, "error-unmatch", &error_unmatch
,
510 N_("if any <file> is not in the index, treat this as an error")),
511 OPT_STRING(0, "with-tree", &with_tree
, N_("tree-ish"),
512 N_("pretend that paths removed since <tree-ish> are still present")),
513 OPT__ABBREV(&abbrev
),
514 OPT_BOOLEAN(0, "debug", &debug_mode
, N_("show debugging data")),
518 if (argc
== 2 && !strcmp(argv
[1], "-h"))
519 usage_with_options(ls_files_usage
, builtin_ls_files_options
);
521 memset(&dir
, 0, sizeof(dir
));
524 prefix_len
= strlen(prefix
);
525 git_config(git_default_config
, NULL
);
527 if (read_cache() < 0)
528 die("index file corrupt");
530 argc
= parse_options(argc
, argv
, prefix
, builtin_ls_files_options
,
532 el
= add_exclude_list(&dir
, EXC_CMDL
, "--exclude option");
533 for (i
= 0; i
< exclude_list
.nr
; i
++) {
534 add_exclude(exclude_list
.items
[i
].string
, "", 0, el
, --exclude_args
);
536 if (show_tag
|| show_valid_bit
) {
543 tag_skip_worktree
= "S ";
544 tag_resolve_undo
= "U ";
546 if (show_modified
|| show_others
|| show_deleted
|| (dir
.flags
& DIR_SHOW_IGNORED
) || show_killed
)
547 require_work_tree
= 1;
550 * There's no point in showing unmerged unless
551 * you also show the stage information.
554 if (dir
.exclude_per_dir
)
557 if (require_work_tree
&& !is_inside_work_tree())
560 pathspec
= get_pathspec(prefix
, argv
);
562 /* be nice with submodule paths ending in a slash */
564 strip_trailing_slash_from_submodules();
566 /* Find common prefix for all pathspec's */
567 max_prefix
= common_prefix(pathspec
);
568 max_prefix_len
= max_prefix
? strlen(max_prefix
) : 0;
570 /* Treat unmatching pathspec elements as errors */
571 if (pathspec
&& error_unmatch
) {
573 for (num
= 0; pathspec
[num
]; num
++)
575 ps_matched
= xcalloc(1, num
);
578 if ((dir
.flags
& DIR_SHOW_IGNORED
) && !exc_given
)
579 die("ls-files --ignored needs some exclude pattern");
581 /* With no flags, we default to showing the cached files */
582 if (!(show_stage
|| show_deleted
|| show_others
|| show_unmerged
||
583 show_killed
|| show_modified
|| show_resolve_undo
))
587 prune_cache(max_prefix
);
590 * Basic sanity check; show-stages and show-unmerged
591 * would not make any sense with this option.
593 if (show_stage
|| show_unmerged
)
594 die("ls-files --with-tree is incompatible with -s or -u");
595 overlay_tree_on_cache(with_tree
, max_prefix
);
598 if (show_resolve_undo
)
603 bad
= report_path_error(ps_matched
, pathspec
, prefix
);
605 fprintf(stderr
, "Did you forget to 'git add'?\n");