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