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
, size_t len
)
51 write_name_quoted_relative(name
, len
, prefix
, prefix_len
, stdout
,
55 static void show_dir_entry(const char *tag
, struct dir_entry
*ent
)
57 int len
= max_prefix_len
;
60 die("git ls-files: internal error - directory entry not superset of prefix");
62 if (!match_pathspec(pathspec
, ent
->name
, ent
->len
, len
, ps_matched
))
66 write_name(ent
->name
, ent
->len
);
69 static void show_other_files(struct dir_struct
*dir
)
73 for (i
= 0; i
< dir
->nr
; i
++) {
74 struct dir_entry
*ent
= dir
->entries
[i
];
75 if (!cache_name_is_other(ent
->name
, ent
->len
))
77 show_dir_entry(tag_other
, ent
);
81 static void show_killed_files(struct dir_struct
*dir
)
84 for (i
= 0; i
< dir
->nr
; i
++) {
85 struct dir_entry
*ent
= dir
->entries
[i
];
87 int pos
, len
, killed
= 0;
89 for (cp
= ent
->name
; cp
- ent
->name
< ent
->len
; cp
= sp
+ 1) {
92 /* If ent->name is prefix of an entry in the
93 * cache, it will be killed.
95 pos
= cache_name_pos(ent
->name
, ent
->len
);
97 die("bug in show-killed-files");
99 while (pos
< active_nr
&&
100 ce_stage(active_cache
[pos
]))
101 pos
++; /* skip unmerged */
102 if (active_nr
<= pos
)
104 /* pos points at a name immediately after
105 * ent->name in the cache. Does it expect
106 * ent->name to be a directory?
108 len
= ce_namelen(active_cache
[pos
]);
109 if ((ent
->len
< len
) &&
110 !strncmp(active_cache
[pos
]->name
,
111 ent
->name
, ent
->len
) &&
112 active_cache
[pos
]->name
[ent
->len
] == '/')
116 if (0 <= cache_name_pos(ent
->name
, sp
- ent
->name
)) {
117 /* If any of the leading directories in
118 * ent->name is registered in the cache,
119 * ent->name will be killed.
126 show_dir_entry(tag_killed
, dir
->entries
[i
]);
130 static void show_ce_entry(const char *tag
, struct cache_entry
*ce
)
132 int len
= max_prefix_len
;
134 if (len
>= ce_namelen(ce
))
135 die("git ls-files: internal error - cache entry not superset of prefix");
137 if (!match_pathspec(pathspec
, ce
->name
, ce_namelen(ce
), len
, ps_matched
))
140 if (tag
&& *tag
&& show_valid_bit
&&
141 (ce
->ce_flags
& CE_VALID
)) {
142 static char alttag
[4];
143 memcpy(alttag
, tag
, 3);
145 alttag
[0] = tolower(tag
[0]);
146 else if (tag
[0] == '?')
160 printf("%s%06o %s %d\t",
163 find_unique_abbrev(ce
->sha1
,abbrev
),
166 write_name(ce
->name
, ce_namelen(ce
));
168 struct stat_data
*sd
= &ce
->ce_stat_data
;
170 printf(" ctime: %d:%d\n", sd
->sd_ctime
.sec
, sd
->sd_ctime
.nsec
);
171 printf(" mtime: %d:%d\n", sd
->sd_mtime
.sec
, sd
->sd_mtime
.nsec
);
172 printf(" dev: %d\tino: %d\n", sd
->sd_dev
, sd
->sd_ino
);
173 printf(" uid: %d\tgid: %d\n", sd
->sd_uid
, sd
->sd_gid
);
174 printf(" size: %d\tflags: %x\n", sd
->sd_size
, ce
->ce_flags
);
178 static void show_ru_info(void)
180 struct string_list_item
*item
;
182 if (!the_index
.resolve_undo
)
185 for_each_string_list_item(item
, the_index
.resolve_undo
) {
186 const char *path
= item
->string
;
187 struct resolve_undo_info
*ui
= item
->util
;
191 if (len
< max_prefix_len
)
192 continue; /* outside of the prefix */
193 if (!match_pathspec(pathspec
, path
, len
, max_prefix_len
, ps_matched
))
194 continue; /* uninterested */
195 for (i
= 0; i
< 3; i
++) {
198 printf("%s%06o %s %d\t", tag_resolve_undo
, ui
->mode
[i
],
199 find_unique_abbrev(ui
->sha1
[i
], abbrev
),
201 write_name(path
, len
);
206 static int ce_excluded(struct dir_struct
*dir
, struct cache_entry
*ce
)
208 int dtype
= ce_to_dtype(ce
);
209 return is_excluded(dir
, ce
->name
, &dtype
);
212 static void show_files(struct dir_struct
*dir
)
216 /* For cached/deleted files we don't need to even do the readdir */
217 if (show_others
|| show_killed
) {
218 fill_directory(dir
, pathspec
);
220 show_other_files(dir
);
222 show_killed_files(dir
);
224 if (show_cached
| show_stage
) {
225 for (i
= 0; i
< active_nr
; i
++) {
226 struct cache_entry
*ce
= active_cache
[i
];
227 if ((dir
->flags
& DIR_SHOW_IGNORED
) &&
228 !ce_excluded(dir
, ce
))
230 if (show_unmerged
&& !ce_stage(ce
))
232 if (ce
->ce_flags
& CE_UPDATE
)
234 show_ce_entry(ce_stage(ce
) ? tag_unmerged
:
235 (ce_skip_worktree(ce
) ? tag_skip_worktree
: tag_cached
), ce
);
238 if (show_deleted
| show_modified
) {
239 for (i
= 0; i
< active_nr
; i
++) {
240 struct cache_entry
*ce
= active_cache
[i
];
243 if ((dir
->flags
& DIR_SHOW_IGNORED
) &&
244 !ce_excluded(dir
, ce
))
246 if (ce
->ce_flags
& CE_UPDATE
)
248 if (ce_skip_worktree(ce
))
250 err
= lstat(ce
->name
, &st
);
251 if (show_deleted
&& err
)
252 show_ce_entry(tag_removed
, ce
);
253 if (show_modified
&& ce_modified(ce
, &st
, 0))
254 show_ce_entry(tag_modified
, ce
);
260 * Prune the index to only contain stuff starting with "prefix"
262 static void prune_cache(const char *prefix
)
264 int pos
= cache_name_pos(prefix
, max_prefix_len
);
265 unsigned int first
, last
;
269 memmove(active_cache
, active_cache
+ pos
,
270 (active_nr
- pos
) * sizeof(struct cache_entry
*));
274 while (last
> first
) {
275 int next
= (last
+ first
) >> 1;
276 struct cache_entry
*ce
= active_cache
[next
];
277 if (!strncmp(ce
->name
, prefix
, max_prefix_len
)) {
286 static void strip_trailing_slash_from_submodules(void)
290 for (p
= pathspec
; *p
!= NULL
; p
++) {
291 int len
= strlen(*p
), pos
;
293 if (len
< 1 || (*p
)[len
- 1] != '/')
295 pos
= cache_name_pos(*p
, len
- 1);
296 if (pos
>= 0 && S_ISGITLINK(active_cache
[pos
]->ce_mode
))
297 *p
= xstrndup(*p
, len
- 1);
302 * Read the tree specified with --with-tree option
303 * (typically, HEAD) into stage #1 and then
304 * squash them down to stage #0. This is used for
305 * --error-unmatch to list and check the path patterns
306 * that were given from the command line. We are not
307 * going to write this index out.
309 void overlay_tree_on_cache(const char *tree_name
, const char *prefix
)
312 unsigned char sha1
[20];
313 struct pathspec pathspec
;
314 struct cache_entry
*last_stage0
= NULL
;
317 if (get_sha1(tree_name
, sha1
))
318 die("tree-ish %s not found.", tree_name
);
319 tree
= parse_tree_indirect(sha1
);
321 die("bad tree-ish %s", tree_name
);
323 /* Hoist the unmerged entries up to stage #3 to make room */
324 for (i
= 0; i
< active_nr
; i
++) {
325 struct cache_entry
*ce
= active_cache
[i
];
328 ce
->ce_flags
|= CE_STAGEMASK
;
332 static const char *(matchbuf
[2]);
333 matchbuf
[0] = prefix
;
335 init_pathspec(&pathspec
, matchbuf
);
336 pathspec
.items
[0].nowildcard_len
= pathspec
.items
[0].len
;
338 init_pathspec(&pathspec
, NULL
);
339 if (read_tree(tree
, 1, &pathspec
))
340 die("unable to read tree entries %s", tree_name
);
342 for (i
= 0; i
< active_nr
; i
++) {
343 struct cache_entry
*ce
= active_cache
[i
];
344 switch (ce_stage(ce
)) {
352 * If there is stage #0 entry for this, we do not
353 * need to show it. We use CE_UPDATE bit to mark
357 !strcmp(last_stage0
->name
, ce
->name
))
358 ce
->ce_flags
|= CE_UPDATE
;
363 int report_path_error(const char *ps_matched
, const char **pathspec
, const char *prefix
)
366 * Make sure all pathspec matched; otherwise it is an error.
368 struct strbuf sb
= STRBUF_INIT
;
371 for (num
= 0; pathspec
[num
]; num
++) {
372 int other
, found_dup
;
377 * The caller might have fed identical pathspec
378 * twice. Do not barf on such a mistake.
380 for (found_dup
= other
= 0;
381 !found_dup
&& pathspec
[other
];
383 if (other
== num
|| !ps_matched
[other
])
385 if (!strcmp(pathspec
[other
], pathspec
[num
]))
387 * Ok, we have a match already.
394 name
= quote_path_relative(pathspec
[num
], -1, &sb
, prefix
);
395 error("pathspec '%s' did not match any file(s) known to git.",
403 static const char * const ls_files_usage
[] = {
404 N_("git ls-files [options] [<file>...]"),
408 static int option_parse_z(const struct option
*opt
,
409 const char *arg
, int unset
)
411 line_terminator
= unset
? '\n' : '\0';
416 static int option_parse_exclude(const struct option
*opt
,
417 const char *arg
, int unset
)
419 struct string_list
*exclude_list
= opt
->value
;
422 string_list_append(exclude_list
, arg
);
427 static int option_parse_exclude_from(const struct option
*opt
,
428 const char *arg
, int unset
)
430 struct dir_struct
*dir
= opt
->value
;
433 add_excludes_from_file(dir
, arg
);
438 static int option_parse_exclude_standard(const struct option
*opt
,
439 const char *arg
, int unset
)
441 struct dir_struct
*dir
= opt
->value
;
444 setup_standard_excludes(dir
);
449 int cmd_ls_files(int argc
, const char **argv
, const char *cmd_prefix
)
451 int require_work_tree
= 0, show_tag
= 0, i
;
452 const char *max_prefix
;
453 struct dir_struct dir
;
454 struct exclude_list
*el
;
455 struct string_list exclude_list
= STRING_LIST_INIT_NODUP
;
456 struct option builtin_ls_files_options
[] = {
457 { OPTION_CALLBACK
, 'z', NULL
, NULL
, NULL
,
458 N_("paths are separated with NUL character"),
459 PARSE_OPT_NOARG
, option_parse_z
},
460 OPT_BOOLEAN('t', NULL
, &show_tag
,
461 N_("identify the file status with tags")),
462 OPT_BOOLEAN('v', NULL
, &show_valid_bit
,
463 N_("use lowercase letters for 'assume unchanged' files")),
464 OPT_BOOLEAN('c', "cached", &show_cached
,
465 N_("show cached files in the output (default)")),
466 OPT_BOOLEAN('d', "deleted", &show_deleted
,
467 N_("show deleted files in the output")),
468 OPT_BOOLEAN('m', "modified", &show_modified
,
469 N_("show modified files in the output")),
470 OPT_BOOLEAN('o', "others", &show_others
,
471 N_("show other files in the output")),
472 OPT_BIT('i', "ignored", &dir
.flags
,
473 N_("show ignored files in the output"),
475 OPT_BOOLEAN('s', "stage", &show_stage
,
476 N_("show staged contents' object name in the output")),
477 OPT_BOOLEAN('k', "killed", &show_killed
,
478 N_("show files on the filesystem that need to be removed")),
479 OPT_BIT(0, "directory", &dir
.flags
,
480 N_("show 'other' directories' name only"),
481 DIR_SHOW_OTHER_DIRECTORIES
),
482 OPT_NEGBIT(0, "empty-directory", &dir
.flags
,
483 N_("don't show empty directories"),
484 DIR_HIDE_EMPTY_DIRECTORIES
),
485 OPT_BOOLEAN('u', "unmerged", &show_unmerged
,
486 N_("show unmerged files in the output")),
487 OPT_BOOLEAN(0, "resolve-undo", &show_resolve_undo
,
488 N_("show resolve-undo information")),
489 { OPTION_CALLBACK
, 'x', "exclude", &exclude_list
, N_("pattern"),
490 N_("skip files matching pattern"),
491 0, option_parse_exclude
},
492 { OPTION_CALLBACK
, 'X', "exclude-from", &dir
, N_("file"),
493 N_("exclude patterns are read from <file>"),
494 0, option_parse_exclude_from
},
495 OPT_STRING(0, "exclude-per-directory", &dir
.exclude_per_dir
, N_("file"),
496 N_("read additional per-directory exclude patterns in <file>")),
497 { OPTION_CALLBACK
, 0, "exclude-standard", &dir
, NULL
,
498 N_("add the standard git exclusions"),
499 PARSE_OPT_NOARG
, option_parse_exclude_standard
},
500 { OPTION_SET_INT
, 0, "full-name", &prefix_len
, NULL
,
501 N_("make the output relative to the project top directory"),
502 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
},
503 OPT_BOOLEAN(0, "error-unmatch", &error_unmatch
,
504 N_("if any <file> is not in the index, treat this as an error")),
505 OPT_STRING(0, "with-tree", &with_tree
, N_("tree-ish"),
506 N_("pretend that paths removed since <tree-ish> are still present")),
507 OPT__ABBREV(&abbrev
),
508 OPT_BOOLEAN(0, "debug", &debug_mode
, N_("show debugging data")),
512 if (argc
== 2 && !strcmp(argv
[1], "-h"))
513 usage_with_options(ls_files_usage
, builtin_ls_files_options
);
515 memset(&dir
, 0, sizeof(dir
));
518 prefix_len
= strlen(prefix
);
519 git_config(git_default_config
, NULL
);
521 if (read_cache() < 0)
522 die("index file corrupt");
524 argc
= parse_options(argc
, argv
, prefix
, builtin_ls_files_options
,
526 el
= add_exclude_list(&dir
, EXC_CMDL
, "--exclude option");
527 for (i
= 0; i
< exclude_list
.nr
; i
++) {
528 add_exclude(exclude_list
.items
[i
].string
, "", 0, el
, --exclude_args
);
530 if (show_tag
|| show_valid_bit
) {
537 tag_skip_worktree
= "S ";
538 tag_resolve_undo
= "U ";
540 if (show_modified
|| show_others
|| show_deleted
|| (dir
.flags
& DIR_SHOW_IGNORED
) || show_killed
)
541 require_work_tree
= 1;
544 * There's no point in showing unmerged unless
545 * you also show the stage information.
548 if (dir
.exclude_per_dir
)
551 if (require_work_tree
&& !is_inside_work_tree())
554 pathspec
= get_pathspec(prefix
, argv
);
556 /* be nice with submodule paths ending in a slash */
558 strip_trailing_slash_from_submodules();
560 /* Find common prefix for all pathspec's */
561 max_prefix
= common_prefix(pathspec
);
562 max_prefix_len
= max_prefix
? strlen(max_prefix
) : 0;
564 /* Treat unmatching pathspec elements as errors */
565 if (pathspec
&& error_unmatch
) {
567 for (num
= 0; pathspec
[num
]; num
++)
569 ps_matched
= xcalloc(1, num
);
572 if ((dir
.flags
& DIR_SHOW_IGNORED
) && !exc_given
)
573 die("ls-files --ignored needs some exclude pattern");
575 /* With no flags, we default to showing the cached files */
576 if (!(show_stage
| show_deleted
| show_others
| show_unmerged
|
577 show_killed
| show_modified
| show_resolve_undo
))
581 prune_cache(max_prefix
);
584 * Basic sanity check; show-stages and show-unmerged
585 * would not make any sense with this option.
587 if (show_stage
|| show_unmerged
)
588 die("ls-files --with-tree is incompatible with -s or -u");
589 overlay_tree_on_cache(with_tree
, max_prefix
);
592 if (show_resolve_undo
)
597 bad
= report_path_error(ps_matched
, pathspec
, prefix
);
599 fprintf(stderr
, "Did you forget to 'git add'?\n");