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