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