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
15 static int show_deleted
;
16 static int show_cached
;
17 static int show_others
;
18 static int show_stage
;
19 static int show_unmerged
;
20 static int show_modified
;
21 static int show_killed
;
22 static int show_valid_bit
;
23 static int line_terminator
= '\n';
25 static int prefix_len
;
26 static int prefix_offset
;
27 static const char **pathspec
;
28 static int error_unmatch
;
29 static char *ps_matched
;
30 static const char *with_tree
;
32 static const char *tag_cached
= "";
33 static const char *tag_unmerged
= "";
34 static const char *tag_removed
= "";
35 static const char *tag_other
= "";
36 static const char *tag_killed
= "";
37 static const char *tag_modified
= "";
41 * Match a pathspec against a filename. The first "skiplen" characters
42 * are the common prefix
44 int pathspec_match(const char **spec
, char *ps_matched
,
45 const char *filename
, int skiplen
)
49 while ((m
= *spec
++) != NULL
) {
50 int matchlen
= strlen(m
+ skiplen
);
54 if (!strncmp(m
+ skiplen
, filename
+ skiplen
, matchlen
)) {
55 if (m
[skiplen
+ matchlen
- 1] == '/')
57 switch (filename
[skiplen
+ matchlen
]) {
62 if (!fnmatch(m
+ skiplen
, filename
+ skiplen
, 0))
75 static void show_dir_entry(const char *tag
, struct dir_entry
*ent
)
78 int offset
= prefix_offset
;
81 die("git-ls-files: internal error - directory entry not superset of prefix");
83 if (pathspec
&& !pathspec_match(pathspec
, ps_matched
, ent
->name
, len
))
87 write_name_quoted(ent
->name
+ offset
, stdout
, line_terminator
);
90 static void show_other_files(struct dir_struct
*dir
)
96 * Skip matching and unmerged entries for the paths,
97 * since we want just "others".
99 * (Matching entries are normally pruned during
100 * the directory tree walk, but will show up for
101 * gitlinks because we don't necessarily have
102 * dir->show_other_directories set to suppress
105 for (i
= 0; i
< dir
->nr
; i
++) {
106 struct dir_entry
*ent
= dir
->entries
[i
];
108 struct cache_entry
*ce
;
111 * Remove the '/' at the end that directory
112 * walking adds for directory entries.
115 if (len
&& ent
->name
[len
-1] == '/')
117 pos
= cache_name_pos(ent
->name
, len
);
119 continue; /* exact match */
121 if (pos
< active_nr
) {
122 ce
= active_cache
[pos
];
123 if (ce_namelen(ce
) == len
&&
124 !memcmp(ce
->name
, ent
->name
, len
))
125 continue; /* Yup, this one exists unmerged */
127 show_dir_entry(tag_other
, ent
);
131 static void show_killed_files(struct dir_struct
*dir
)
134 for (i
= 0; i
< dir
->nr
; i
++) {
135 struct dir_entry
*ent
= dir
->entries
[i
];
137 int pos
, len
, killed
= 0;
139 for (cp
= ent
->name
; cp
- ent
->name
< ent
->len
; cp
= sp
+ 1) {
140 sp
= strchr(cp
, '/');
142 /* If ent->name is prefix of an entry in the
143 * cache, it will be killed.
145 pos
= cache_name_pos(ent
->name
, ent
->len
);
147 die("bug in show-killed-files");
149 while (pos
< active_nr
&&
150 ce_stage(active_cache
[pos
]))
151 pos
++; /* skip unmerged */
152 if (active_nr
<= pos
)
154 /* pos points at a name immediately after
155 * ent->name in the cache. Does it expect
156 * ent->name to be a directory?
158 len
= ce_namelen(active_cache
[pos
]);
159 if ((ent
->len
< len
) &&
160 !strncmp(active_cache
[pos
]->name
,
161 ent
->name
, ent
->len
) &&
162 active_cache
[pos
]->name
[ent
->len
] == '/')
166 if (0 <= cache_name_pos(ent
->name
, sp
- ent
->name
)) {
167 /* If any of the leading directories in
168 * ent->name is registered in the cache,
169 * ent->name will be killed.
176 show_dir_entry(tag_killed
, dir
->entries
[i
]);
180 static void show_ce_entry(const char *tag
, struct cache_entry
*ce
)
182 int len
= prefix_len
;
183 int offset
= prefix_offset
;
185 if (len
>= ce_namelen(ce
))
186 die("git-ls-files: internal error - cache entry not superset of prefix");
188 if (pathspec
&& !pathspec_match(pathspec
, ps_matched
, ce
->name
, len
))
191 if (tag
&& *tag
&& show_valid_bit
&&
192 (ce
->ce_flags
& htons(CE_VALID
))) {
193 static char alttag
[4];
194 memcpy(alttag
, tag
, 3);
196 alttag
[0] = tolower(tag
[0]);
197 else if (tag
[0] == '?')
211 printf("%s%06o %s %d\t",
214 abbrev
? find_unique_abbrev(ce
->sha1
,abbrev
)
215 : sha1_to_hex(ce
->sha1
),
218 write_name_quoted(ce
->name
+ offset
, stdout
, line_terminator
);
221 static void show_files(struct dir_struct
*dir
, const char *prefix
)
225 /* For cached/deleted files we don't need to even do the readdir */
226 if (show_others
|| show_killed
) {
227 const char *path
= ".", *base
= "";
228 int baselen
= prefix_len
;
231 path
= base
= prefix
;
232 read_directory(dir
, path
, base
, baselen
, pathspec
);
234 show_other_files(dir
);
236 show_killed_files(dir
);
238 if (show_cached
| show_stage
) {
239 for (i
= 0; i
< active_nr
; i
++) {
240 struct cache_entry
*ce
= active_cache
[i
];
241 if (excluded(dir
, ce
->name
) != dir
->show_ignored
)
243 if (show_unmerged
&& !ce_stage(ce
))
245 if (ce
->ce_flags
& htons(CE_UPDATE
))
247 show_ce_entry(ce_stage(ce
) ? tag_unmerged
: tag_cached
, ce
);
250 if (show_deleted
| show_modified
) {
251 for (i
= 0; i
< active_nr
; i
++) {
252 struct cache_entry
*ce
= active_cache
[i
];
255 if (excluded(dir
, ce
->name
) != dir
->show_ignored
)
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
, 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 struct cache_entry
*ce
= active_cache
[next
];
284 if (!strncmp(ce
->name
, prefix
, prefix_len
)) {
293 static const char *verify_pathspec(const char *prefix
)
295 const char **p
, *n
, *prev
;
300 for (p
= pathspec
; (n
= *p
) != NULL
; p
++) {
302 for (i
= 0; i
< max
; i
++) {
304 if (prev
&& prev
[i
] != c
)
306 if (!c
|| c
== '*' || c
== '?')
319 if (prefix_offset
> max
|| memcmp(prev
, prefix
, prefix_offset
))
320 die("git-ls-files: cannot generate relative filenames containing '..'");
323 return max
? xmemdupz(prev
, max
) : NULL
;
327 * Read the tree specified with --with-tree option
328 * (typically, HEAD) into stage #1 and then
329 * squash them down to stage #0. This is used for
330 * --error-unmatch to list and check the path patterns
331 * that were given from the command line. We are not
332 * going to write this index out.
334 void overlay_tree_on_cache(const char *tree_name
, const char *prefix
)
337 unsigned char sha1
[20];
339 struct cache_entry
*last_stage0
= NULL
;
342 if (get_sha1(tree_name
, sha1
))
343 die("tree-ish %s not found.", tree_name
);
344 tree
= parse_tree_indirect(sha1
);
346 die("bad tree-ish %s", tree_name
);
348 /* Hoist the unmerged entries up to stage #3 to make room */
349 for (i
= 0; i
< active_nr
; i
++) {
350 struct cache_entry
*ce
= active_cache
[i
];
353 ce
->ce_flags
|= htons(CE_STAGEMASK
);
357 static const char *(matchbuf
[2]);
358 matchbuf
[0] = prefix
;
363 if (read_tree(tree
, 1, match
))
364 die("unable to read tree entries %s", tree_name
);
366 for (i
= 0; i
< active_nr
; i
++) {
367 struct cache_entry
*ce
= active_cache
[i
];
368 switch (ce_stage(ce
)) {
376 * If there is stage #0 entry for this, we do not
377 * need to show it. We use CE_UPDATE bit to mark
381 !strcmp(last_stage0
->name
, ce
->name
))
382 ce
->ce_flags
|= htons(CE_UPDATE
);
387 int report_path_error(const char *ps_matched
, const char **pathspec
, int prefix_offset
)
390 * Make sure all pathspec matched; otherwise it is an error.
393 for (num
= 0; pathspec
[num
]; num
++) {
394 int other
, found_dup
;
399 * The caller might have fed identical pathspec
400 * twice. Do not barf on such a mistake.
402 for (found_dup
= other
= 0;
403 !found_dup
&& pathspec
[other
];
405 if (other
== num
|| !ps_matched
[other
])
407 if (!strcmp(pathspec
[other
], pathspec
[num
]))
409 * Ok, we have a match already.
416 error("pathspec '%s' did not match any file(s) known to git.",
417 pathspec
[num
] + prefix_offset
);
423 static const char ls_files_usage
[] =
424 "git-ls-files [-z] [-t] [-v] (--[cached|deleted|others|stage|unmerged|killed|modified])* "
425 "[ --ignored ] [--exclude=<pattern>] [--exclude-from=<file>] "
426 "[ --exclude-per-directory=<filename> ] [--exclude-standard] "
427 "[--full-name] [--abbrev] [--] [<file>]*";
429 int cmd_ls_files(int argc
, const char **argv
, const char *prefix
)
432 int exc_given
= 0, require_work_tree
= 0;
433 struct dir_struct dir
;
435 memset(&dir
, 0, sizeof(dir
));
437 prefix_offset
= strlen(prefix
);
438 git_config(git_default_config
);
440 for (i
= 1; i
< argc
; i
++) {
441 const char *arg
= argv
[i
];
443 if (!strcmp(arg
, "--")) {
447 if (!strcmp(arg
, "-z")) {
451 if (!strcmp(arg
, "-t") || !strcmp(arg
, "-v")) {
462 if (!strcmp(arg
, "-c") || !strcmp(arg
, "--cached")) {
466 if (!strcmp(arg
, "-d") || !strcmp(arg
, "--deleted")) {
470 if (!strcmp(arg
, "-m") || !strcmp(arg
, "--modified")) {
472 require_work_tree
= 1;
475 if (!strcmp(arg
, "-o") || !strcmp(arg
, "--others")) {
477 require_work_tree
= 1;
480 if (!strcmp(arg
, "-i") || !strcmp(arg
, "--ignored")) {
481 dir
.show_ignored
= 1;
482 require_work_tree
= 1;
485 if (!strcmp(arg
, "-s") || !strcmp(arg
, "--stage")) {
489 if (!strcmp(arg
, "-k") || !strcmp(arg
, "--killed")) {
491 require_work_tree
= 1;
494 if (!strcmp(arg
, "--directory")) {
495 dir
.show_other_directories
= 1;
498 if (!strcmp(arg
, "--no-empty-directory")) {
499 dir
.hide_empty_directories
= 1;
502 if (!strcmp(arg
, "-u") || !strcmp(arg
, "--unmerged")) {
503 /* There's no point in showing unmerged unless
504 * you also show the stage information.
510 if (!strcmp(arg
, "-x") && i
+1 < argc
) {
512 add_exclude(argv
[++i
], "", 0, &dir
.exclude_list
[EXC_CMDL
]);
515 if (!prefixcmp(arg
, "--exclude=")) {
517 add_exclude(arg
+10, "", 0, &dir
.exclude_list
[EXC_CMDL
]);
520 if (!strcmp(arg
, "-X") && i
+1 < argc
) {
522 add_excludes_from_file(&dir
, argv
[++i
]);
525 if (!prefixcmp(arg
, "--exclude-from=")) {
527 add_excludes_from_file(&dir
, arg
+15);
530 if (!prefixcmp(arg
, "--exclude-per-directory=")) {
532 dir
.exclude_per_dir
= arg
+ 24;
535 if (!strcmp(arg
, "--exclude-standard")) {
537 setup_standard_excludes(&dir
);
540 if (!strcmp(arg
, "--full-name")) {
544 if (!strcmp(arg
, "--error-unmatch")) {
548 if (!prefixcmp(arg
, "--with-tree=")) {
549 with_tree
= arg
+ 12;
552 if (!prefixcmp(arg
, "--abbrev=")) {
553 abbrev
= strtoul(arg
+9, NULL
, 10);
554 if (abbrev
&& abbrev
< MINIMUM_ABBREV
)
555 abbrev
= MINIMUM_ABBREV
;
556 else if (abbrev
> 40)
560 if (!strcmp(arg
, "--abbrev")) {
561 abbrev
= DEFAULT_ABBREV
;
565 usage(ls_files_usage
);
569 if (require_work_tree
&& !is_inside_work_tree())
572 pathspec
= get_pathspec(prefix
, argv
+ i
);
574 /* Verify that the pathspec matches the prefix */
576 prefix
= verify_pathspec(prefix
);
578 /* Treat unmatching pathspec elements as errors */
579 if (pathspec
&& error_unmatch
) {
581 for (num
= 0; pathspec
[num
]; num
++)
583 ps_matched
= xcalloc(1, num
);
586 if (dir
.show_ignored
&& !exc_given
) {
587 fprintf(stderr
, "%s: --ignored needs some exclude pattern\n",
592 /* With no flags, we default to showing the cached files */
593 if (!(show_stage
| show_deleted
| show_others
| show_unmerged
|
594 show_killed
| show_modified
))
602 * Basic sanity check; show-stages and show-unmerged
603 * would not make any sense with this option.
605 if (show_stage
|| show_unmerged
)
606 die("ls-files --with-tree is incompatible with -s or -u");
607 overlay_tree_on_cache(with_tree
, prefix
);
609 show_files(&dir
, prefix
);
613 bad
= report_path_error(ps_matched
, pathspec
, prefix_offset
);
615 fprintf(stderr
, "Did you forget to 'git add'?\n");