]>
Commit | Line | Data |
---|---|---|
8695c8bf LT |
1 | /* |
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. | |
5 | * | |
6 | * Copyright (C) Linus Torvalds, 2005 | |
7 | */ | |
8695c8bf | 8 | #include "cache.h" |
22ddf719 | 9 | #include "quote.h" |
453ec4bd | 10 | #include "dir.h" |
0864f264 | 11 | #include "builtin.h" |
64586e75 | 12 | #include "tree.h" |
ce8e8804 | 13 | #include "parse-options.h" |
9d9a2f4a JH |
14 | #include "resolve-undo.h" |
15 | #include "string-list.h" | |
64acde94 | 16 | #include "pathspec.h" |
e77aa336 | 17 | #include "run-command.h" |
2e5d6503 | 18 | #include "submodule.h" |
8695c8bf | 19 | |
96f1e58f DR |
20 | static int abbrev; |
21 | static int show_deleted; | |
22 | static int show_cached; | |
23 | static int show_others; | |
24 | static int show_stage; | |
25 | static int show_unmerged; | |
9d9a2f4a | 26 | static int show_resolve_undo; |
96f1e58f DR |
27 | static int show_modified; |
28 | static int show_killed; | |
29 | static int show_valid_bit; | |
b83c8345 | 30 | static int line_terminator = '\n'; |
84974217 | 31 | static int debug_mode; |
a7630bd4 | 32 | static int show_eol; |
e77aa336 | 33 | static int recurse_submodules; |
e4770f67 | 34 | static struct argv_array submodule_options = ARGV_ARRAY_INIT; |
8695c8bf | 35 | |
efad1a56 | 36 | static const char *prefix; |
e77aa336 | 37 | static const char *super_prefix; |
efad1a56 | 38 | static int max_prefix_len; |
96f1e58f | 39 | static int prefix_len; |
9e06d6ed | 40 | static struct pathspec pathspec; |
96f1e58f DR |
41 | static int error_unmatch; |
42 | static char *ps_matched; | |
64586e75 | 43 | static const char *with_tree; |
ce8e8804 | 44 | static int exc_given; |
c04318e4 | 45 | static int exclude_args; |
5be4efbe | 46 | |
20d37ef6 PB |
47 | static const char *tag_cached = ""; |
48 | static const char *tag_unmerged = ""; | |
49 | static const char *tag_removed = ""; | |
50 | static const char *tag_other = ""; | |
6ca45943 | 51 | static const char *tag_killed = ""; |
b0391890 | 52 | static const char *tag_modified = ""; |
44a36913 | 53 | static const char *tag_skip_worktree = ""; |
9d9a2f4a | 54 | static const char *tag_resolve_undo = ""; |
20d37ef6 | 55 | |
a7630bd4 TB |
56 | static void write_eolinfo(const struct cache_entry *ce, const char *path) |
57 | { | |
58 | if (!show_eol) | |
59 | return; | |
60 | else { | |
61 | struct stat st; | |
62 | const char *i_txt = ""; | |
63 | const char *w_txt = ""; | |
64 | const char *a_txt = get_convert_attr_ascii(path); | |
65 | if (ce && S_ISREG(ce->ce_mode)) | |
66 | i_txt = get_cached_convert_stats_ascii(ce->name); | |
67 | if (!lstat(path, &st) && S_ISREG(st.st_mode)) | |
68 | w_txt = get_wt_convert_stats_ascii(path); | |
69 | printf("i/%-5s w/%-5s attr/%-17s\t", i_txt, w_txt, a_txt); | |
70 | } | |
71 | } | |
72 | ||
e9a820ce | 73 | static void write_name(const char *name) |
efad1a56 | 74 | { |
e77aa336 BW |
75 | /* |
76 | * Prepend the super_prefix to name to construct the full_name to be | |
77 | * written. | |
78 | */ | |
79 | struct strbuf full_name = STRBUF_INIT; | |
80 | if (super_prefix) { | |
81 | strbuf_addstr(&full_name, super_prefix); | |
82 | strbuf_addstr(&full_name, name); | |
83 | name = full_name.buf; | |
84 | } | |
85 | ||
ad66df2d | 86 | /* |
e9a820ce JX |
87 | * With "--full-name", prefix_len=0; this caller needs to pass |
88 | * an empty string in that case (a NULL is good for ""). | |
ad66df2d | 89 | */ |
e9a820ce JX |
90 | write_name_quoted_relative(name, prefix_len ? prefix : NULL, |
91 | stdout, line_terminator); | |
e77aa336 BW |
92 | |
93 | strbuf_release(&full_name); | |
efad1a56 CB |
94 | } |
95 | ||
453ec4bd | 96 | static void show_dir_entry(const char *tag, struct dir_entry *ent) |
5be4efbe | 97 | { |
efad1a56 | 98 | int len = max_prefix_len; |
5be4efbe LT |
99 | |
100 | if (len >= ent->len) | |
7e44c935 | 101 | die("git ls-files: internal error - directory entry not superset of prefix"); |
5be4efbe | 102 | |
ebb32893 | 103 | if (!dir_path_match(ent, &pathspec, len, ps_matched)) |
5be4efbe LT |
104 | return; |
105 | ||
22ddf719 | 106 | fputs(tag, stdout); |
a7630bd4 | 107 | write_eolinfo(NULL, ent->name); |
e9a820ce | 108 | write_name(ent->name); |
5be4efbe LT |
109 | } |
110 | ||
453ec4bd | 111 | static void show_other_files(struct dir_struct *dir) |
fcbc3083 JH |
112 | { |
113 | int i; | |
5698454e | 114 | |
453ec4bd | 115 | for (i = 0; i < dir->nr; i++) { |
453ec4bd | 116 | struct dir_entry *ent = dir->entries[i]; |
98fa4738 JK |
117 | if (!cache_name_is_other(ent->name, ent->len)) |
118 | continue; | |
fcbc3083 JH |
119 | show_dir_entry(tag_other, ent); |
120 | } | |
121 | } | |
122 | ||
453ec4bd | 123 | static void show_killed_files(struct dir_struct *dir) |
6ca45943 JH |
124 | { |
125 | int i; | |
453ec4bd LT |
126 | for (i = 0; i < dir->nr; i++) { |
127 | struct dir_entry *ent = dir->entries[i]; | |
6ca45943 JH |
128 | char *cp, *sp; |
129 | int pos, len, killed = 0; | |
130 | ||
131 | for (cp = ent->name; cp - ent->name < ent->len; cp = sp + 1) { | |
132 | sp = strchr(cp, '/'); | |
133 | if (!sp) { | |
134 | /* If ent->name is prefix of an entry in the | |
135 | * cache, it will be killed. | |
136 | */ | |
137 | pos = cache_name_pos(ent->name, ent->len); | |
138 | if (0 <= pos) | |
ef1177d1 JS |
139 | die("BUG: killed-file %.*s not found", |
140 | ent->len, ent->name); | |
6ca45943 JH |
141 | pos = -pos - 1; |
142 | while (pos < active_nr && | |
143 | ce_stage(active_cache[pos])) | |
144 | pos++; /* skip unmerged */ | |
145 | if (active_nr <= pos) | |
146 | break; | |
147 | /* pos points at a name immediately after | |
148 | * ent->name in the cache. Does it expect | |
149 | * ent->name to be a directory? | |
150 | */ | |
151 | len = ce_namelen(active_cache[pos]); | |
152 | if ((ent->len < len) && | |
153 | !strncmp(active_cache[pos]->name, | |
154 | ent->name, ent->len) && | |
155 | active_cache[pos]->name[ent->len] == '/') | |
156 | killed = 1; | |
157 | break; | |
158 | } | |
159 | if (0 <= cache_name_pos(ent->name, sp - ent->name)) { | |
160 | /* If any of the leading directories in | |
161 | * ent->name is registered in the cache, | |
162 | * ent->name will be killed. | |
163 | */ | |
164 | killed = 1; | |
165 | break; | |
166 | } | |
167 | } | |
168 | if (killed) | |
453ec4bd | 169 | show_dir_entry(tag_killed, dir->entries[i]); |
6ca45943 | 170 | } |
8695c8bf LT |
171 | } |
172 | ||
07c01b9f BW |
173 | /* |
174 | * Compile an argv_array with all of the options supported by --recurse_submodules | |
175 | */ | |
b2dfeb7c BW |
176 | static void compile_submodule_options(const char **argv, |
177 | const struct dir_struct *dir, | |
178 | int show_tag) | |
07c01b9f BW |
179 | { |
180 | if (line_terminator == '\0') | |
e4770f67 | 181 | argv_array_push(&submodule_options, "-z"); |
07c01b9f | 182 | if (show_tag) |
e4770f67 | 183 | argv_array_push(&submodule_options, "-t"); |
07c01b9f | 184 | if (show_valid_bit) |
e4770f67 | 185 | argv_array_push(&submodule_options, "-v"); |
07c01b9f | 186 | if (show_cached) |
e4770f67 | 187 | argv_array_push(&submodule_options, "--cached"); |
07c01b9f | 188 | if (show_eol) |
e4770f67 | 189 | argv_array_push(&submodule_options, "--eol"); |
07c01b9f | 190 | if (debug_mode) |
e4770f67 | 191 | argv_array_push(&submodule_options, "--debug"); |
b2dfeb7c BW |
192 | |
193 | /* Add Pathspecs */ | |
194 | argv_array_push(&submodule_options, "--"); | |
195 | for (; *argv; argv++) | |
196 | argv_array_push(&submodule_options, *argv); | |
07c01b9f BW |
197 | } |
198 | ||
e77aa336 BW |
199 | /** |
200 | * Recursively call ls-files on a submodule | |
201 | */ | |
202 | static void show_gitlink(const struct cache_entry *ce) | |
203 | { | |
204 | struct child_process cp = CHILD_PROCESS_INIT; | |
205 | int status; | |
2cfe66a8 | 206 | char *dir; |
e77aa336 | 207 | |
2e5d6503 JK |
208 | prepare_submodule_repo_env(&cp.env_array); |
209 | argv_array_push(&cp.env_array, GIT_DIR_ENVIRONMENT); | |
210 | ||
b2dfeb7c BW |
211 | if (prefix_len) |
212 | argv_array_pushf(&cp.env_array, "%s=%s", | |
213 | GIT_TOPLEVEL_PREFIX_ENVIRONMENT, | |
214 | prefix); | |
e77aa336 BW |
215 | argv_array_pushf(&cp.args, "--super-prefix=%s%s/", |
216 | super_prefix ? super_prefix : "", | |
217 | ce->name); | |
218 | argv_array_push(&cp.args, "ls-files"); | |
219 | argv_array_push(&cp.args, "--recurse-submodules"); | |
220 | ||
07c01b9f | 221 | /* add supported options */ |
e4770f67 | 222 | argv_array_pushv(&cp.args, submodule_options.argv); |
07c01b9f | 223 | |
e77aa336 | 224 | cp.git_cmd = 1; |
2cfe66a8 JK |
225 | dir = mkpathdup("%s/%s", get_git_work_tree(), ce->name); |
226 | cp.dir = dir; | |
e77aa336 | 227 | status = run_command(&cp); |
2cfe66a8 | 228 | free(dir); |
e77aa336 BW |
229 | if (status) |
230 | exit(status); | |
231 | } | |
232 | ||
9c5e6c80 | 233 | static void show_ce_entry(const char *tag, const struct cache_entry *ce) |
5be4efbe | 234 | { |
e77aa336 | 235 | struct strbuf name = STRBUF_INIT; |
efad1a56 | 236 | int len = max_prefix_len; |
e77aa336 BW |
237 | if (super_prefix) |
238 | strbuf_addstr(&name, super_prefix); | |
239 | strbuf_addstr(&name, ce->name); | |
5be4efbe LT |
240 | |
241 | if (len >= ce_namelen(ce)) | |
7e44c935 | 242 | die("git ls-files: internal error - cache entry not superset of prefix"); |
5be4efbe | 243 | |
75a6315f BW |
244 | if (recurse_submodules && S_ISGITLINK(ce->ce_mode) && |
245 | submodule_path_match(&pathspec, name.buf, ps_matched)) { | |
e77aa336 BW |
246 | show_gitlink(ce); |
247 | } else if (match_pathspec(&pathspec, name.buf, name.len, | |
248 | len, ps_matched, | |
249 | S_ISDIR(ce->ce_mode) || | |
250 | S_ISGITLINK(ce->ce_mode))) { | |
251 | if (tag && *tag && show_valid_bit && | |
252 | (ce->ce_flags & CE_VALID)) { | |
253 | static char alttag[4]; | |
254 | memcpy(alttag, tag, 3); | |
255 | if (isalpha(tag[0])) | |
256 | alttag[0] = tolower(tag[0]); | |
257 | else if (tag[0] == '?') | |
258 | alttag[0] = '!'; | |
259 | else { | |
260 | alttag[0] = 'v'; | |
261 | alttag[1] = tag[0]; | |
262 | alttag[2] = ' '; | |
263 | alttag[3] = 0; | |
264 | } | |
265 | tag = alttag; | |
266 | } | |
5be4efbe | 267 | |
e77aa336 BW |
268 | if (!show_stage) { |
269 | fputs(tag, stdout); | |
270 | } else { | |
271 | printf("%s%06o %s %d\t", | |
272 | tag, | |
273 | ce->ce_mode, | |
1c2b1f70 | 274 | find_unique_abbrev(ce->oid.hash, abbrev), |
e77aa336 BW |
275 | ce_stage(ce)); |
276 | } | |
277 | write_eolinfo(ce, ce->name); | |
278 | write_name(ce->name); | |
279 | if (debug_mode) { | |
280 | const struct stat_data *sd = &ce->ce_stat_data; | |
281 | ||
282 | printf(" ctime: %d:%d\n", sd->sd_ctime.sec, sd->sd_ctime.nsec); | |
283 | printf(" mtime: %d:%d\n", sd->sd_mtime.sec, sd->sd_mtime.nsec); | |
284 | printf(" dev: %d\tino: %d\n", sd->sd_dev, sd->sd_ino); | |
285 | printf(" uid: %d\tgid: %d\n", sd->sd_uid, sd->sd_gid); | |
286 | printf(" size: %d\tflags: %x\n", sd->sd_size, ce->ce_flags); | |
2bcab240 | 287 | } |
2bcab240 JH |
288 | } |
289 | ||
e77aa336 | 290 | strbuf_release(&name); |
5be4efbe LT |
291 | } |
292 | ||
efad1a56 | 293 | static void show_ru_info(void) |
9d9a2f4a | 294 | { |
8a57c6e9 AR |
295 | struct string_list_item *item; |
296 | ||
9d9a2f4a JH |
297 | if (!the_index.resolve_undo) |
298 | return; | |
8a57c6e9 AR |
299 | |
300 | for_each_string_list_item(item, the_index.resolve_undo) { | |
301 | const char *path = item->string; | |
302 | struct resolve_undo_info *ui = item->util; | |
303 | int i, len; | |
304 | ||
305 | len = strlen(path); | |
306 | if (len < max_prefix_len) | |
307 | continue; /* outside of the prefix */ | |
854b0959 | 308 | if (!match_pathspec(&pathspec, path, len, |
ae8d0824 | 309 | max_prefix_len, ps_matched, 0)) |
8a57c6e9 AR |
310 | continue; /* uninterested */ |
311 | for (i = 0; i < 3; i++) { | |
312 | if (!ui->mode[i]) | |
313 | continue; | |
314 | printf("%s%06o %s %d\t", tag_resolve_undo, ui->mode[i], | |
315 | find_unique_abbrev(ui->sha1[i], abbrev), | |
316 | i + 1); | |
e9a820ce | 317 | write_name(path); |
8a57c6e9 AR |
318 | } |
319 | } | |
9d9a2f4a JH |
320 | } |
321 | ||
9c5e6c80 | 322 | static int ce_excluded(struct dir_struct *dir, const struct cache_entry *ce) |
782cd4c0 JH |
323 | { |
324 | int dtype = ce_to_dtype(ce); | |
b07bc8c8 | 325 | return is_excluded(dir, ce->name, &dtype); |
782cd4c0 JH |
326 | } |
327 | ||
efad1a56 | 328 | static void show_files(struct dir_struct *dir) |
8695c8bf LT |
329 | { |
330 | int i; | |
331 | ||
332 | /* For cached/deleted files we don't need to even do the readdir */ | |
6ca45943 | 333 | if (show_others || show_killed) { |
2eac2a4c JH |
334 | if (!show_others) |
335 | dir->flags |= DIR_COLLECT_KILLED_ONLY; | |
7327d3d1 | 336 | fill_directory(dir, &pathspec); |
6ca45943 | 337 | if (show_others) |
453ec4bd | 338 | show_other_files(dir); |
6ca45943 | 339 | if (show_killed) |
453ec4bd | 340 | show_killed_files(dir); |
8695c8bf | 341 | } |
0b437a18 | 342 | if (show_cached || show_stage) { |
8695c8bf | 343 | for (i = 0; i < active_nr; i++) { |
9c5e6c80 | 344 | const struct cache_entry *ce = active_cache[i]; |
eb41775e | 345 | if ((dir->flags & DIR_SHOW_IGNORED) && |
b07bc8c8 | 346 | !ce_excluded(dir, ce)) |
500348aa | 347 | continue; |
eec8c633 LT |
348 | if (show_unmerged && !ce_stage(ce)) |
349 | continue; | |
7a51ed66 | 350 | if (ce->ce_flags & CE_UPDATE) |
64586e75 | 351 | continue; |
44a36913 NTND |
352 | show_ce_entry(ce_stage(ce) ? tag_unmerged : |
353 | (ce_skip_worktree(ce) ? tag_skip_worktree : tag_cached), ce); | |
8695c8bf LT |
354 | } |
355 | } | |
0b437a18 | 356 | if (show_deleted || show_modified) { |
8695c8bf | 357 | for (i = 0; i < active_nr; i++) { |
9c5e6c80 | 358 | const struct cache_entry *ce = active_cache[i]; |
8695c8bf | 359 | struct stat st; |
b0391890 | 360 | int err; |
eb41775e | 361 | if ((dir->flags & DIR_SHOW_IGNORED) && |
b07bc8c8 | 362 | !ce_excluded(dir, ce)) |
500348aa | 363 | continue; |
4b4e26d2 JH |
364 | if (ce->ce_flags & CE_UPDATE) |
365 | continue; | |
b4d1690d NTND |
366 | if (ce_skip_worktree(ce)) |
367 | continue; | |
b0391890 JH |
368 | err = lstat(ce->name, &st); |
369 | if (show_deleted && err) | |
370 | show_ce_entry(tag_removed, ce); | |
2bcab240 | 371 | if (show_modified && ce_modified(ce, &st, 0)) |
b0391890 | 372 | show_ce_entry(tag_modified, ce); |
5be4efbe LT |
373 | } |
374 | } | |
375 | } | |
376 | ||
377 | /* | |
378 | * Prune the index to only contain stuff starting with "prefix" | |
379 | */ | |
7b4158a8 | 380 | static void prune_cache(const char *prefix, size_t prefixlen) |
5be4efbe | 381 | { |
7b4158a8 | 382 | int pos; |
5be4efbe LT |
383 | unsigned int first, last; |
384 | ||
7b4158a8 RS |
385 | if (!prefix) |
386 | return; | |
387 | pos = cache_name_pos(prefix, prefixlen); | |
5be4efbe LT |
388 | if (pos < 0) |
389 | pos = -pos-1; | |
96f6d3f6 | 390 | first = pos; |
5be4efbe LT |
391 | last = active_nr; |
392 | while (last > first) { | |
393 | int next = (last + first) >> 1; | |
9c5e6c80 | 394 | const struct cache_entry *ce = active_cache[next]; |
7b4158a8 | 395 | if (!strncmp(ce->name, prefix, prefixlen)) { |
5be4efbe LT |
396 | first = next+1; |
397 | continue; | |
8695c8bf | 398 | } |
5be4efbe LT |
399 | last = next; |
400 | } | |
96f6d3f6 RS |
401 | memmove(active_cache, active_cache + pos, |
402 | (last - pos) * sizeof(struct cache_entry *)); | |
403 | active_nr = last - pos; | |
5be4efbe LT |
404 | } |
405 | ||
64586e75 JH |
406 | /* |
407 | * Read the tree specified with --with-tree option | |
408 | * (typically, HEAD) into stage #1 and then | |
409 | * squash them down to stage #0. This is used for | |
410 | * --error-unmatch to list and check the path patterns | |
411 | * that were given from the command line. We are not | |
412 | * going to write this index out. | |
413 | */ | |
ee425e46 | 414 | void overlay_tree_on_cache(const char *tree_name, const char *prefix) |
64586e75 JH |
415 | { |
416 | struct tree *tree; | |
6f37eb7d | 417 | struct object_id oid; |
f0096c06 | 418 | struct pathspec pathspec; |
64586e75 JH |
419 | struct cache_entry *last_stage0 = NULL; |
420 | int i; | |
421 | ||
6f37eb7d | 422 | if (get_oid(tree_name, &oid)) |
64586e75 | 423 | die("tree-ish %s not found.", tree_name); |
a9dbc179 | 424 | tree = parse_tree_indirect(&oid); |
64586e75 JH |
425 | if (!tree) |
426 | die("bad tree-ish %s", tree_name); | |
427 | ||
428 | /* Hoist the unmerged entries up to stage #3 to make room */ | |
429 | for (i = 0; i < active_nr; i++) { | |
430 | struct cache_entry *ce = active_cache[i]; | |
431 | if (!ce_stage(ce)) | |
432 | continue; | |
7a51ed66 | 433 | ce->ce_flags |= CE_STAGEMASK; |
64586e75 JH |
434 | } |
435 | ||
436 | if (prefix) { | |
9a087274 NTND |
437 | static const char *(matchbuf[1]); |
438 | matchbuf[0] = NULL; | |
439 | parse_pathspec(&pathspec, PATHSPEC_ALL_MAGIC, | |
440 | PATHSPEC_PREFER_CWD, prefix, matchbuf); | |
64586e75 | 441 | } else |
9a087274 | 442 | memset(&pathspec, 0, sizeof(pathspec)); |
f0096c06 | 443 | if (read_tree(tree, 1, &pathspec)) |
64586e75 JH |
444 | die("unable to read tree entries %s", tree_name); |
445 | ||
446 | for (i = 0; i < active_nr; i++) { | |
447 | struct cache_entry *ce = active_cache[i]; | |
448 | switch (ce_stage(ce)) { | |
449 | case 0: | |
450 | last_stage0 = ce; | |
451 | /* fallthru */ | |
452 | default: | |
453 | continue; | |
454 | case 1: | |
455 | /* | |
456 | * If there is stage #0 entry for this, we do not | |
457 | * need to show it. We use CE_UPDATE bit to mark | |
458 | * such an entry. | |
459 | */ | |
460 | if (last_stage0 && | |
461 | !strcmp(last_stage0->name, ce->name)) | |
7a51ed66 | 462 | ce->ce_flags |= CE_UPDATE; |
64586e75 JH |
463 | } |
464 | } | |
465 | } | |
466 | ||
ce8e8804 | 467 | static const char * const ls_files_usage[] = { |
9c9b4f2f | 468 | N_("git ls-files [<options>] [<file>...]"), |
ce8e8804 MV |
469 | NULL |
470 | }; | |
471 | ||
ce8e8804 MV |
472 | static int option_parse_exclude(const struct option *opt, |
473 | const char *arg, int unset) | |
474 | { | |
72aeb187 | 475 | struct string_list *exclude_list = opt->value; |
ce8e8804 MV |
476 | |
477 | exc_given = 1; | |
72aeb187 | 478 | string_list_append(exclude_list, arg); |
ce8e8804 MV |
479 | |
480 | return 0; | |
481 | } | |
482 | ||
483 | static int option_parse_exclude_from(const struct option *opt, | |
484 | const char *arg, int unset) | |
485 | { | |
486 | struct dir_struct *dir = opt->value; | |
487 | ||
488 | exc_given = 1; | |
489 | add_excludes_from_file(dir, arg); | |
490 | ||
491 | return 0; | |
492 | } | |
493 | ||
494 | static int option_parse_exclude_standard(const struct option *opt, | |
495 | const char *arg, int unset) | |
496 | { | |
497 | struct dir_struct *dir = opt->value; | |
498 | ||
499 | exc_given = 1; | |
500 | setup_standard_excludes(dir); | |
501 | ||
502 | return 0; | |
503 | } | |
cf9a113d | 504 | |
efad1a56 | 505 | int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix) |
8695c8bf | 506 | { |
72aeb187 | 507 | int require_work_tree = 0, show_tag = 0, i; |
efad1a56 | 508 | const char *max_prefix; |
453ec4bd | 509 | struct dir_struct dir; |
72aeb187 AS |
510 | struct exclude_list *el; |
511 | struct string_list exclude_list = STRING_LIST_INIT_NODUP; | |
ce8e8804 | 512 | struct option builtin_ls_files_options[] = { |
1f3c79a9 JK |
513 | /* Think twice before adding "--nul" synonym to this */ |
514 | OPT_SET_INT('z', NULL, &line_terminator, | |
515 | N_("paths are separated with NUL character"), '\0'), | |
d5d09d47 | 516 | OPT_BOOL('t', NULL, &show_tag, |
377adc3a | 517 | N_("identify the file status with tags")), |
d5d09d47 | 518 | OPT_BOOL('v', NULL, &show_valid_bit, |
377adc3a | 519 | N_("use lowercase letters for 'assume unchanged' files")), |
d5d09d47 | 520 | OPT_BOOL('c', "cached", &show_cached, |
377adc3a | 521 | N_("show cached files in the output (default)")), |
d5d09d47 | 522 | OPT_BOOL('d', "deleted", &show_deleted, |
377adc3a | 523 | N_("show deleted files in the output")), |
d5d09d47 | 524 | OPT_BOOL('m', "modified", &show_modified, |
377adc3a | 525 | N_("show modified files in the output")), |
d5d09d47 | 526 | OPT_BOOL('o', "others", &show_others, |
377adc3a | 527 | N_("show other files in the output")), |
ce8e8804 | 528 | OPT_BIT('i', "ignored", &dir.flags, |
377adc3a | 529 | N_("show ignored files in the output"), |
ce8e8804 | 530 | DIR_SHOW_IGNORED), |
d5d09d47 | 531 | OPT_BOOL('s', "stage", &show_stage, |
377adc3a | 532 | N_("show staged contents' object name in the output")), |
d5d09d47 | 533 | OPT_BOOL('k', "killed", &show_killed, |
377adc3a | 534 | N_("show files on the filesystem that need to be removed")), |
ce8e8804 | 535 | OPT_BIT(0, "directory", &dir.flags, |
ad5fe377 | 536 | N_("show 'other' directories' names only"), |
ce8e8804 | 537 | DIR_SHOW_OTHER_DIRECTORIES), |
a7630bd4 | 538 | OPT_BOOL(0, "eol", &show_eol, N_("show line endings of files")), |
e9008b9a | 539 | OPT_NEGBIT(0, "empty-directory", &dir.flags, |
377adc3a | 540 | N_("don't show empty directories"), |
ce8e8804 | 541 | DIR_HIDE_EMPTY_DIRECTORIES), |
d5d09d47 | 542 | OPT_BOOL('u', "unmerged", &show_unmerged, |
377adc3a | 543 | N_("show unmerged files in the output")), |
d5d09d47 | 544 | OPT_BOOL(0, "resolve-undo", &show_resolve_undo, |
377adc3a | 545 | N_("show resolve-undo information")), |
a39b15b4 | 546 | { OPTION_CALLBACK, 'x', "exclude", &exclude_list, N_("pattern"), |
377adc3a | 547 | N_("skip files matching pattern"), |
ce8e8804 | 548 | 0, option_parse_exclude }, |
377adc3a NTND |
549 | { OPTION_CALLBACK, 'X', "exclude-from", &dir, N_("file"), |
550 | N_("exclude patterns are read from <file>"), | |
ce8e8804 | 551 | 0, option_parse_exclude_from }, |
377adc3a NTND |
552 | OPT_STRING(0, "exclude-per-directory", &dir.exclude_per_dir, N_("file"), |
553 | N_("read additional per-directory exclude patterns in <file>")), | |
ce8e8804 | 554 | { OPTION_CALLBACK, 0, "exclude-standard", &dir, NULL, |
377adc3a | 555 | N_("add the standard git exclusions"), |
ce8e8804 | 556 | PARSE_OPT_NOARG, option_parse_exclude_standard }, |
efad1a56 | 557 | { OPTION_SET_INT, 0, "full-name", &prefix_len, NULL, |
377adc3a | 558 | N_("make the output relative to the project top directory"), |
ce8e8804 | 559 | PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL }, |
e77aa336 BW |
560 | OPT_BOOL(0, "recurse-submodules", &recurse_submodules, |
561 | N_("recurse through submodules")), | |
d5d09d47 | 562 | OPT_BOOL(0, "error-unmatch", &error_unmatch, |
377adc3a NTND |
563 | N_("if any <file> is not in the index, treat this as an error")), |
564 | OPT_STRING(0, "with-tree", &with_tree, N_("tree-ish"), | |
565 | N_("pretend that paths removed since <tree-ish> are still present")), | |
ce8e8804 | 566 | OPT__ABBREV(&abbrev), |
d5d09d47 | 567 | OPT_BOOL(0, "debug", &debug_mode, N_("show debugging data")), |
ce8e8804 MV |
568 | OPT_END() |
569 | }; | |
8695c8bf | 570 | |
cbb3167e NTND |
571 | if (argc == 2 && !strcmp(argv[1], "-h")) |
572 | usage_with_options(ls_files_usage, builtin_ls_files_options); | |
573 | ||
453ec4bd | 574 | memset(&dir, 0, sizeof(dir)); |
efad1a56 | 575 | prefix = cmd_prefix; |
5be4efbe | 576 | if (prefix) |
efad1a56 | 577 | prefix_len = strlen(prefix); |
e77aa336 | 578 | super_prefix = get_super_prefix(); |
ef90d6d4 | 579 | git_config(git_default_config, NULL); |
5be4efbe | 580 | |
c28b3d6e NTND |
581 | if (read_cache() < 0) |
582 | die("index file corrupt"); | |
583 | ||
37782920 | 584 | argc = parse_options(argc, argv, prefix, builtin_ls_files_options, |
ce8e8804 | 585 | ls_files_usage, 0); |
72aeb187 AS |
586 | el = add_exclude_list(&dir, EXC_CMDL, "--exclude option"); |
587 | for (i = 0; i < exclude_list.nr; i++) { | |
588 | add_exclude(exclude_list.items[i].string, "", 0, el, --exclude_args); | |
589 | } | |
ce8e8804 MV |
590 | if (show_tag || show_valid_bit) { |
591 | tag_cached = "H "; | |
592 | tag_unmerged = "M "; | |
593 | tag_removed = "R "; | |
594 | tag_modified = "C "; | |
595 | tag_other = "? "; | |
596 | tag_killed = "K "; | |
44a36913 | 597 | tag_skip_worktree = "S "; |
9d9a2f4a | 598 | tag_resolve_undo = "U "; |
9ff768e9 | 599 | } |
de2e3b04 | 600 | if (show_modified || show_others || show_deleted || (dir.flags & DIR_SHOW_IGNORED) || show_killed) |
ce8e8804 MV |
601 | require_work_tree = 1; |
602 | if (show_unmerged) | |
603 | /* | |
604 | * There's no point in showing unmerged unless | |
605 | * you also show the stage information. | |
606 | */ | |
607 | show_stage = 1; | |
608 | if (dir.exclude_per_dir) | |
609 | exc_given = 1; | |
9ff768e9 | 610 | |
7d8ae932 MH |
611 | if (require_work_tree && !is_inside_work_tree()) |
612 | setup_work_tree(); | |
6d9ba67b | 613 | |
07c01b9f | 614 | if (recurse_submodules) |
b2dfeb7c | 615 | compile_submodule_options(argv, &dir, show_tag); |
07c01b9f | 616 | |
e77aa336 BW |
617 | if (recurse_submodules && |
618 | (show_stage || show_deleted || show_others || show_unmerged || | |
07c01b9f | 619 | show_killed || show_modified || show_resolve_undo || with_tree)) |
e77aa336 BW |
620 | die("ls-files --recurse-submodules unsupported mode"); |
621 | ||
622 | if (recurse_submodules && error_unmatch) | |
623 | die("ls-files --recurse-submodules does not support " | |
624 | "--error-unmatch"); | |
625 | ||
9e06d6ed NTND |
626 | parse_pathspec(&pathspec, 0, |
627 | PATHSPEC_PREFER_CWD | | |
628 | PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAP, | |
629 | prefix, argv); | |
f3670a57 | 630 | |
75a6315f BW |
631 | /* |
632 | * Find common prefix for all pathspec's | |
633 | * This is used as a performance optimization which unfortunately cannot | |
634 | * be done when recursing into submodules | |
635 | */ | |
636 | if (recurse_submodules) | |
637 | max_prefix = NULL; | |
638 | else | |
639 | max_prefix = common_prefix(&pathspec); | |
8894d535 | 640 | max_prefix_len = max_prefix ? strlen(max_prefix) : 0; |
5be4efbe | 641 | |
bba319b5 | 642 | /* Treat unmatching pathspec elements as errors */ |
9e06d6ed | 643 | if (pathspec.nr && error_unmatch) |
8b54c234 | 644 | ps_matched = xcalloc(pathspec.nr, 1); |
bba319b5 | 645 | |
ac78b009 BW |
646 | if ((dir.flags & DIR_SHOW_IGNORED) && !exc_given) |
647 | die("ls-files --ignored needs some exclude pattern"); | |
8695c8bf LT |
648 | |
649 | /* With no flags, we default to showing the cached files */ | |
0b437a18 RS |
650 | if (!(show_stage || show_deleted || show_others || show_unmerged || |
651 | show_killed || show_modified || show_resolve_undo)) | |
8695c8bf LT |
652 | show_cached = 1; |
653 | ||
7b4158a8 | 654 | prune_cache(max_prefix, max_prefix_len); |
64586e75 JH |
655 | if (with_tree) { |
656 | /* | |
657 | * Basic sanity check; show-stages and show-unmerged | |
658 | * would not make any sense with this option. | |
659 | */ | |
660 | if (show_stage || show_unmerged) | |
661 | die("ls-files --with-tree is incompatible with -s or -u"); | |
efad1a56 | 662 | overlay_tree_on_cache(with_tree, max_prefix); |
64586e75 | 663 | } |
efad1a56 | 664 | show_files(&dir); |
9d9a2f4a | 665 | if (show_resolve_undo) |
efad1a56 | 666 | show_ru_info(); |
bba319b5 JH |
667 | |
668 | if (ps_matched) { | |
ee425e46 | 669 | int bad; |
17ddc66e | 670 | bad = report_path_error(ps_matched, &pathspec, prefix); |
ee425e46 | 671 | if (bad) |
ced7b828 AE |
672 | fprintf(stderr, "Did you forget to 'git add'?\n"); |
673 | ||
ee425e46 | 674 | return bad ? 1 : 0; |
bba319b5 JH |
675 | } |
676 | ||
8695c8bf LT |
677 | return 0; |
678 | } |