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