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
;
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
,
54 static void show_dir_entry(const char *tag
, struct dir_entry
*ent
)
56 int len
= max_prefix_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
))
65 write_name(ent
->name
, ent
->len
);
68 static void show_other_files(struct dir_struct
*dir
)
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
))
76 show_dir_entry(tag_other
, ent
);
80 static void show_killed_files(struct dir_struct
*dir
)
83 for (i
= 0; i
< dir
->nr
; i
++) {
84 struct dir_entry
*ent
= dir
->entries
[i
];
86 int pos
, len
, killed
= 0;
88 for (cp
= ent
->name
; cp
- ent
->name
< ent
->len
; cp
= sp
+ 1) {
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
);
96 die("bug in show-killed-files");
98 while (pos
< active_nr
&&
99 ce_stage(active_cache
[pos
]))
100 pos
++; /* skip unmerged */
101 if (active_nr
<= pos
)
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
] == '/')
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.
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
))
139 if (tag
&& *tag
&& show_valid_bit
&&
140 (ce
->ce_flags
& CE_VALID
)) {
141 static char alttag
[4];
142 memcpy(alttag
, tag
, 3);
144 alttag
[0] = tolower(tag
[0]);
145 else if (tag
[0] == '?')
159 printf("%s%06o %s %d\t",
162 find_unique_abbrev(ce
->sha1
,abbrev
),
165 write_name(ce
->name
, ce_namelen(ce
));
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 void show_ru_info(void)
177 struct string_list_item
*item
;
179 if (!the_index
.resolve_undo
)
182 for_each_string_list_item(item
, the_index
.resolve_undo
) {
183 const char *path
= item
->string
;
184 struct resolve_undo_info
*ui
= item
->util
;
188 if (len
< max_prefix_len
)
189 continue; /* outside of the prefix */
190 if (!match_pathspec(pathspec
, path
, len
, max_prefix_len
, ps_matched
))
191 continue; /* uninterested */
192 for (i
= 0; i
< 3; i
++) {
195 printf("%s%06o %s %d\t", tag_resolve_undo
, ui
->mode
[i
],
196 find_unique_abbrev(ui
->sha1
[i
], abbrev
),
198 write_name(path
, len
);
203 static int ce_excluded(struct path_exclude_check
*check
, struct cache_entry
*ce
)
205 int dtype
= ce_to_dtype(ce
);
206 return is_path_excluded(check
, ce
->name
, ce_namelen(ce
), &dtype
);
209 static void show_files(struct dir_struct
*dir
)
212 struct path_exclude_check check
;
214 if ((dir
->flags
& DIR_SHOW_IGNORED
))
215 path_exclude_check_init(&check
, 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(&check
, 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(&check
, 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
);
259 if ((dir
->flags
& DIR_SHOW_IGNORED
))
260 path_exclude_check_clear(&check
);
264 * Prune the index to only contain stuff starting with "prefix"
266 static void prune_cache(const char *prefix
)
268 int pos
= cache_name_pos(prefix
, max_prefix_len
);
269 unsigned int first
, last
;
273 memmove(active_cache
, active_cache
+ pos
,
274 (active_nr
- pos
) * sizeof(struct cache_entry
*));
278 while (last
> first
) {
279 int next
= (last
+ first
) >> 1;
280 struct cache_entry
*ce
= active_cache
[next
];
281 if (!strncmp(ce
->name
, prefix
, max_prefix_len
)) {
290 static void strip_trailing_slash_from_submodules(void)
294 for (p
= pathspec
; *p
!= NULL
; p
++) {
295 int len
= strlen(*p
), pos
;
297 if (len
< 1 || (*p
)[len
- 1] != '/')
299 pos
= cache_name_pos(*p
, len
- 1);
300 if (pos
>= 0 && S_ISGITLINK(active_cache
[pos
]->ce_mode
))
301 *p
= xstrndup(*p
, len
- 1);
306 * Read the tree specified with --with-tree option
307 * (typically, HEAD) into stage #1 and then
308 * squash them down to stage #0. This is used for
309 * --error-unmatch to list and check the path patterns
310 * that were given from the command line. We are not
311 * going to write this index out.
313 void overlay_tree_on_cache(const char *tree_name
, const char *prefix
)
316 unsigned char sha1
[20];
317 struct pathspec pathspec
;
318 struct cache_entry
*last_stage0
= NULL
;
321 if (get_sha1(tree_name
, sha1
))
322 die("tree-ish %s not found.", tree_name
);
323 tree
= parse_tree_indirect(sha1
);
325 die("bad tree-ish %s", tree_name
);
327 /* Hoist the unmerged entries up to stage #3 to make room */
328 for (i
= 0; i
< active_nr
; i
++) {
329 struct cache_entry
*ce
= active_cache
[i
];
332 ce
->ce_flags
|= CE_STAGEMASK
;
336 static const char *(matchbuf
[2]);
337 matchbuf
[0] = prefix
;
339 init_pathspec(&pathspec
, matchbuf
);
340 pathspec
.items
[0].nowildcard_len
= pathspec
.items
[0].len
;
342 init_pathspec(&pathspec
, NULL
);
343 if (read_tree(tree
, 1, &pathspec
))
344 die("unable to read tree entries %s", tree_name
);
346 for (i
= 0; i
< active_nr
; i
++) {
347 struct cache_entry
*ce
= active_cache
[i
];
348 switch (ce_stage(ce
)) {
356 * If there is stage #0 entry for this, we do not
357 * need to show it. We use CE_UPDATE bit to mark
361 !strcmp(last_stage0
->name
, ce
->name
))
362 ce
->ce_flags
|= CE_UPDATE
;
367 int report_path_error(const char *ps_matched
, const char **pathspec
, const char *prefix
)
370 * Make sure all pathspec matched; otherwise it is an error.
372 struct strbuf sb
= STRBUF_INIT
;
375 for (num
= 0; pathspec
[num
]; num
++) {
376 int other
, found_dup
;
381 * The caller might have fed identical pathspec
382 * twice. Do not barf on such a mistake.
384 for (found_dup
= other
= 0;
385 !found_dup
&& pathspec
[other
];
387 if (other
== num
|| !ps_matched
[other
])
389 if (!strcmp(pathspec
[other
], pathspec
[num
]))
391 * Ok, we have a match already.
398 name
= quote_path_relative(pathspec
[num
], -1, &sb
, prefix
);
399 error("pathspec '%s' did not match any file(s) known to git.",
407 static const char * const ls_files_usage
[] = {
408 N_("git ls-files [options] [<file>...]"),
412 static int option_parse_z(const struct option
*opt
,
413 const char *arg
, int unset
)
415 line_terminator
= unset
? '\n' : '\0';
420 static int option_parse_exclude(const struct option
*opt
,
421 const char *arg
, int unset
)
423 struct exclude_list
*list
= opt
->value
;
426 add_exclude(arg
, "", 0, list
);
431 static int option_parse_exclude_from(const struct option
*opt
,
432 const char *arg
, int unset
)
434 struct dir_struct
*dir
= opt
->value
;
437 add_excludes_from_file(dir
, arg
);
442 static int option_parse_exclude_standard(const struct option
*opt
,
443 const char *arg
, int unset
)
445 struct dir_struct
*dir
= opt
->value
;
448 setup_standard_excludes(dir
);
453 int cmd_ls_files(int argc
, const char **argv
, const char *cmd_prefix
)
455 int require_work_tree
= 0, show_tag
= 0;
456 const char *max_prefix
;
457 struct dir_struct dir
;
458 struct option builtin_ls_files_options
[] = {
459 { OPTION_CALLBACK
, 'z', NULL
, NULL
, NULL
,
460 N_("paths are separated with NUL character"),
461 PARSE_OPT_NOARG
, option_parse_z
},
462 OPT_BOOLEAN('t', NULL
, &show_tag
,
463 N_("identify the file status with tags")),
464 OPT_BOOLEAN('v', NULL
, &show_valid_bit
,
465 N_("use lowercase letters for 'assume unchanged' files")),
466 OPT_BOOLEAN('c', "cached", &show_cached
,
467 N_("show cached files in the output (default)")),
468 OPT_BOOLEAN('d', "deleted", &show_deleted
,
469 N_("show deleted files in the output")),
470 OPT_BOOLEAN('m', "modified", &show_modified
,
471 N_("show modified files in the output")),
472 OPT_BOOLEAN('o', "others", &show_others
,
473 N_("show other files in the output")),
474 OPT_BIT('i', "ignored", &dir
.flags
,
475 N_("show ignored files in the output"),
477 OPT_BOOLEAN('s', "stage", &show_stage
,
478 N_("show staged contents' object name in the output")),
479 OPT_BOOLEAN('k', "killed", &show_killed
,
480 N_("show files on the filesystem that need to be removed")),
481 OPT_BIT(0, "directory", &dir
.flags
,
482 N_("show 'other' directories' name only"),
483 DIR_SHOW_OTHER_DIRECTORIES
),
484 OPT_NEGBIT(0, "empty-directory", &dir
.flags
,
485 N_("don't show empty directories"),
486 DIR_HIDE_EMPTY_DIRECTORIES
),
487 OPT_BOOLEAN('u', "unmerged", &show_unmerged
,
488 N_("show unmerged files in the output")),
489 OPT_BOOLEAN(0, "resolve-undo", &show_resolve_undo
,
490 N_("show resolve-undo information")),
491 { OPTION_CALLBACK
, 'x', "exclude", &dir
.exclude_list
[EXC_CMDL
], N_("pattern"),
492 N_("skip files matching pattern"),
493 0, option_parse_exclude
},
494 { OPTION_CALLBACK
, 'X', "exclude-from", &dir
, N_("file"),
495 N_("exclude patterns are read from <file>"),
496 0, option_parse_exclude_from
},
497 OPT_STRING(0, "exclude-per-directory", &dir
.exclude_per_dir
, N_("file"),
498 N_("read additional per-directory exclude patterns in <file>")),
499 { OPTION_CALLBACK
, 0, "exclude-standard", &dir
, NULL
,
500 N_("add the standard git exclusions"),
501 PARSE_OPT_NOARG
, option_parse_exclude_standard
},
502 { OPTION_SET_INT
, 0, "full-name", &prefix_len
, NULL
,
503 N_("make the output relative to the project top directory"),
504 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
},
505 OPT_BOOLEAN(0, "error-unmatch", &error_unmatch
,
506 N_("if any <file> is not in the index, treat this as an error")),
507 OPT_STRING(0, "with-tree", &with_tree
, N_("tree-ish"),
508 N_("pretend that paths removed since <tree-ish> are still present")),
509 OPT__ABBREV(&abbrev
),
510 OPT_BOOLEAN(0, "debug", &debug_mode
, N_("show debugging data")),
514 if (argc
== 2 && !strcmp(argv
[1], "-h"))
515 usage_with_options(ls_files_usage
, builtin_ls_files_options
);
517 memset(&dir
, 0, sizeof(dir
));
520 prefix_len
= strlen(prefix
);
521 git_config(git_default_config
, NULL
);
523 if (read_cache() < 0)
524 die("index file corrupt");
526 argc
= parse_options(argc
, argv
, prefix
, builtin_ls_files_options
,
528 if (show_tag
|| show_valid_bit
) {
535 tag_skip_worktree
= "S ";
536 tag_resolve_undo
= "U ";
538 if (show_modified
|| show_others
|| show_deleted
|| (dir
.flags
& DIR_SHOW_IGNORED
) || show_killed
)
539 require_work_tree
= 1;
542 * There's no point in showing unmerged unless
543 * you also show the stage information.
546 if (dir
.exclude_per_dir
)
549 if (require_work_tree
&& !is_inside_work_tree())
552 pathspec
= get_pathspec(prefix
, argv
);
554 /* be nice with submodule paths ending in a slash */
556 strip_trailing_slash_from_submodules();
558 /* Find common prefix for all pathspec's */
559 max_prefix
= common_prefix(pathspec
);
560 max_prefix_len
= max_prefix
? strlen(max_prefix
) : 0;
562 /* Treat unmatching pathspec elements as errors */
563 if (pathspec
&& error_unmatch
) {
565 for (num
= 0; pathspec
[num
]; num
++)
567 ps_matched
= xcalloc(1, num
);
570 if ((dir
.flags
& DIR_SHOW_IGNORED
) && !exc_given
)
571 die("ls-files --ignored needs some exclude pattern");
573 /* With no flags, we default to showing the cached files */
574 if (!(show_stage
| show_deleted
| show_others
| show_unmerged
|
575 show_killed
| show_modified
| show_resolve_undo
))
579 prune_cache(max_prefix
);
582 * Basic sanity check; show-stages and show-unmerged
583 * would not make any sense with this option.
585 if (show_stage
|| show_unmerged
)
586 die("ls-files --with-tree is incompatible with -s or -u");
587 overlay_tree_on_cache(with_tree
, max_prefix
);
590 if (show_resolve_undo
)
595 bad
= report_path_error(ps_matched
, pathspec
, prefix
);
597 fprintf(stderr
, "Did you forget to 'git add'?\n");