blob: 0f0ab2da167c57402efad9dc09e58964759c23cd [file] [log] [blame]
Linus Torvalds8695c8b2005-04-11 18:55:38 -07001/*
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 */
Linus Torvalds8695c8b2005-04-11 18:55:38 -07008#include "cache.h"
Junio C Hamano22ddf712005-10-14 21:56:46 -07009#include "quote.h"
Linus Torvalds453ec4b2006-05-16 19:02:14 -070010#include "dir.h"
Peter Eriksen0864f262006-05-23 14:15:29 +020011#include "builtin.h"
Junio C Hamano64586e72007-09-12 16:04:22 -070012#include "tree.h"
Linus Torvalds8695c8b2005-04-11 18:55:38 -070013
David Rientjes96f1e582006-08-15 10:23:48 -070014static int abbrev;
15static int show_deleted;
16static int show_cached;
17static int show_others;
18static int show_stage;
19static int show_unmerged;
20static int show_modified;
21static int show_killed;
22static int show_valid_bit;
Junio C Hamanob83c8342005-04-15 11:11:01 -070023static int line_terminator = '\n';
Linus Torvalds8695c8b2005-04-11 18:55:38 -070024
David Rientjes96f1e582006-08-15 10:23:48 -070025static int prefix_len;
26static int prefix_offset;
27static const char **pathspec;
28static int error_unmatch;
29static char *ps_matched;
Junio C Hamano64586e72007-09-12 16:04:22 -070030static const char *with_tree;
Linus Torvalds5be4efb2005-08-21 12:55:33 -070031
Petr Baudis20d37ef2005-04-21 19:47:08 -070032static const char *tag_cached = "";
33static const char *tag_unmerged = "";
34static const char *tag_removed = "";
35static const char *tag_other = "";
Junio C Hamano6ca45942005-05-12 17:17:54 -070036static const char *tag_killed = "";
Junio C Hamanob0391892005-09-19 15:11:15 -070037static const char *tag_modified = "";
Petr Baudis20d37ef2005-04-21 19:47:08 -070038
Junio C Hamano6ca45942005-05-12 17:17:54 -070039
Linus Torvalds56fc5102005-08-21 17:27:50 -070040/*
Junio C Hamanoee425e42007-11-18 01:13:32 -080041 * Match a pathspec against a filename. The first "skiplen" characters
Linus Torvalds56fc5102005-08-21 17:27:50 -070042 * are the common prefix
43 */
Junio C Hamanoee425e42007-11-18 01:13:32 -080044int pathspec_match(const char **spec, char *ps_matched,
45 const char *filename, int skiplen)
Linus Torvalds56fc5102005-08-21 17:27:50 -070046{
47 const char *m;
48
49 while ((m = *spec++) != NULL) {
Junio C Hamanoee425e42007-11-18 01:13:32 -080050 int matchlen = strlen(m + skiplen);
Linus Torvalds56fc5102005-08-21 17:27:50 -070051
52 if (!matchlen)
Junio C Hamanobba319b2006-02-14 12:40:20 -080053 goto matched;
Junio C Hamanoee425e42007-11-18 01:13:32 -080054 if (!strncmp(m + skiplen, filename + skiplen, matchlen)) {
55 if (m[skiplen + matchlen - 1] == '/')
Junio C Hamanobba319b2006-02-14 12:40:20 -080056 goto matched;
Junio C Hamanoee425e42007-11-18 01:13:32 -080057 switch (filename[skiplen + matchlen]) {
Linus Torvalds56fc5102005-08-21 17:27:50 -070058 case '/': case '\0':
Junio C Hamanobba319b2006-02-14 12:40:20 -080059 goto matched;
Linus Torvalds56fc5102005-08-21 17:27:50 -070060 }
61 }
Junio C Hamanoee425e42007-11-18 01:13:32 -080062 if (!fnmatch(m + skiplen, filename + skiplen, 0))
Junio C Hamanobba319b2006-02-14 12:40:20 -080063 goto matched;
64 if (ps_matched)
65 ps_matched++;
66 continue;
67 matched:
68 if (ps_matched)
69 *ps_matched = 1;
70 return 1;
Linus Torvalds56fc5102005-08-21 17:27:50 -070071 }
72 return 0;
73}
74
Linus Torvalds453ec4b2006-05-16 19:02:14 -070075static void show_dir_entry(const char *tag, struct dir_entry *ent)
Linus Torvalds5be4efb2005-08-21 12:55:33 -070076{
77 int len = prefix_len;
78 int offset = prefix_offset;
79
80 if (len >= ent->len)
81 die("git-ls-files: internal error - directory entry not superset of prefix");
82
Junio C Hamanoee425e42007-11-18 01:13:32 -080083 if (pathspec && !pathspec_match(pathspec, ps_matched, ent->name, len))
Linus Torvalds5be4efb2005-08-21 12:55:33 -070084 return;
85
Junio C Hamano22ddf712005-10-14 21:56:46 -070086 fputs(tag, stdout);
Pierre Habouzit663af342007-09-20 00:42:15 +020087 write_name_quoted(ent->name + offset, stdout, line_terminator);
Linus Torvalds5be4efb2005-08-21 12:55:33 -070088}
89
Linus Torvalds453ec4b2006-05-16 19:02:14 -070090static void show_other_files(struct dir_struct *dir)
Junio C Hamanofcbc3082005-11-06 17:26:31 -080091{
92 int i;
Linus Torvalds56984542007-04-14 16:22:08 -070093
94
95 /*
96 * Skip matching and unmerged entries for the paths,
97 * since we want just "others".
98 *
99 * (Matching entries are normally pruned during
100 * the directory tree walk, but will show up for
101 * gitlinks because we don't necessarily have
102 * dir->show_other_directories set to suppress
103 * them).
104 */
Linus Torvalds453ec4b2006-05-16 19:02:14 -0700105 for (i = 0; i < dir->nr; i++) {
Linus Torvalds453ec4b2006-05-16 19:02:14 -0700106 struct dir_entry *ent = dir->entries[i];
Linus Torvalds56984542007-04-14 16:22:08 -0700107 int len, pos;
Junio C Hamanofcbc3082005-11-06 17:26:31 -0800108 struct cache_entry *ce;
Linus Torvalds56984542007-04-14 16:22:08 -0700109
110 /*
111 * Remove the '/' at the end that directory
112 * walking adds for directory entries.
113 */
114 len = ent->len;
115 if (len && ent->name[len-1] == '/')
116 len--;
117 pos = cache_name_pos(ent->name, len);
Junio C Hamanofcbc3082005-11-06 17:26:31 -0800118 if (0 <= pos)
Linus Torvalds56984542007-04-14 16:22:08 -0700119 continue; /* exact match */
Junio C Hamanofcbc3082005-11-06 17:26:31 -0800120 pos = -pos - 1;
Junio C Hamanoa6080a02007-06-07 00:04:01 -0700121 if (pos < active_nr) {
Junio C Hamanofcbc3082005-11-06 17:26:31 -0800122 ce = active_cache[pos];
Linus Torvalds56984542007-04-14 16:22:08 -0700123 if (ce_namelen(ce) == len &&
124 !memcmp(ce->name, ent->name, len))
Junio C Hamanofcbc3082005-11-06 17:26:31 -0800125 continue; /* Yup, this one exists unmerged */
126 }
127 show_dir_entry(tag_other, ent);
128 }
129}
130
Linus Torvalds453ec4b2006-05-16 19:02:14 -0700131static void show_killed_files(struct dir_struct *dir)
Junio C Hamano6ca45942005-05-12 17:17:54 -0700132{
133 int i;
Linus Torvalds453ec4b2006-05-16 19:02:14 -0700134 for (i = 0; i < dir->nr; i++) {
135 struct dir_entry *ent = dir->entries[i];
Junio C Hamano6ca45942005-05-12 17:17:54 -0700136 char *cp, *sp;
137 int pos, len, killed = 0;
138
139 for (cp = ent->name; cp - ent->name < ent->len; cp = sp + 1) {
140 sp = strchr(cp, '/');
141 if (!sp) {
142 /* If ent->name is prefix of an entry in the
143 * cache, it will be killed.
144 */
145 pos = cache_name_pos(ent->name, ent->len);
146 if (0 <= pos)
147 die("bug in show-killed-files");
148 pos = -pos - 1;
149 while (pos < active_nr &&
150 ce_stage(active_cache[pos]))
151 pos++; /* skip unmerged */
152 if (active_nr <= pos)
153 break;
154 /* pos points at a name immediately after
155 * ent->name in the cache. Does it expect
156 * ent->name to be a directory?
157 */
158 len = ce_namelen(active_cache[pos]);
159 if ((ent->len < len) &&
160 !strncmp(active_cache[pos]->name,
161 ent->name, ent->len) &&
162 active_cache[pos]->name[ent->len] == '/')
163 killed = 1;
164 break;
165 }
166 if (0 <= cache_name_pos(ent->name, sp - ent->name)) {
167 /* If any of the leading directories in
168 * ent->name is registered in the cache,
169 * ent->name will be killed.
170 */
171 killed = 1;
172 break;
173 }
174 }
175 if (killed)
Linus Torvalds453ec4b2006-05-16 19:02:14 -0700176 show_dir_entry(tag_killed, dir->entries[i]);
Junio C Hamano6ca45942005-05-12 17:17:54 -0700177 }
Linus Torvalds8695c8b2005-04-11 18:55:38 -0700178}
179
Linus Torvalds5be4efb2005-08-21 12:55:33 -0700180static void show_ce_entry(const char *tag, struct cache_entry *ce)
181{
182 int len = prefix_len;
183 int offset = prefix_offset;
184
185 if (len >= ce_namelen(ce))
186 die("git-ls-files: internal error - cache entry not superset of prefix");
187
Junio C Hamanoee425e42007-11-18 01:13:32 -0800188 if (pathspec && !pathspec_match(pathspec, ps_matched, ce->name, len))
Linus Torvalds5be4efb2005-08-21 12:55:33 -0700189 return;
190
Junio C Hamano8bb2e032006-02-12 01:47:57 -0800191 if (tag && *tag && show_valid_bit &&
192 (ce->ce_flags & htons(CE_VALID))) {
Junio C Hamano2bcab242006-02-08 21:50:18 -0800193 static char alttag[4];
194 memcpy(alttag, tag, 3);
195 if (isalpha(tag[0]))
196 alttag[0] = tolower(tag[0]);
197 else if (tag[0] == '?')
198 alttag[0] = '!';
199 else {
200 alttag[0] = 'v';
201 alttag[1] = tag[0];
202 alttag[2] = ' ';
203 alttag[3] = 0;
204 }
205 tag = alttag;
206 }
207
Junio C Hamano22ddf712005-10-14 21:56:46 -0700208 if (!show_stage) {
209 fputs(tag, stdout);
Pierre Habouzit663af342007-09-20 00:42:15 +0200210 } else {
Junio C Hamano22ddf712005-10-14 21:56:46 -0700211 printf("%s%06o %s %d\t",
Linus Torvalds5be4efb2005-08-21 12:55:33 -0700212 tag,
213 ntohl(ce->ce_mode),
Eric Wongad0cae42006-03-07 11:59:17 -0800214 abbrev ? find_unique_abbrev(ce->sha1,abbrev)
215 : sha1_to_hex(ce->sha1),
Junio C Hamano22ddf712005-10-14 21:56:46 -0700216 ce_stage(ce));
Junio C Hamano22ddf712005-10-14 21:56:46 -0700217 }
Pierre Habouzit663af342007-09-20 00:42:15 +0200218 write_name_quoted(ce->name + offset, stdout, line_terminator);
Linus Torvalds5be4efb2005-08-21 12:55:33 -0700219}
220
Linus Torvalds3e042282006-07-31 13:13:55 -0700221static void show_files(struct dir_struct *dir, const char *prefix)
Linus Torvalds8695c8b2005-04-11 18:55:38 -0700222{
223 int i;
224
225 /* For cached/deleted files we don't need to even do the readdir */
Junio C Hamano6ca45942005-05-12 17:17:54 -0700226 if (show_others || show_killed) {
Linus Torvalds5be4efb2005-08-21 12:55:33 -0700227 const char *path = ".", *base = "";
228 int baselen = prefix_len;
229
Linus Torvaldsb4189aa2006-05-16 19:46:16 -0700230 if (baselen)
Linus Torvalds5be4efb2005-08-21 12:55:33 -0700231 path = base = prefix;
Linus Torvalds9fc42d62007-03-30 20:39:30 -0700232 read_directory(dir, path, base, baselen, pathspec);
Junio C Hamano6ca45942005-05-12 17:17:54 -0700233 if (show_others)
Linus Torvalds453ec4b2006-05-16 19:02:14 -0700234 show_other_files(dir);
Junio C Hamano6ca45942005-05-12 17:17:54 -0700235 if (show_killed)
Linus Torvalds453ec4b2006-05-16 19:02:14 -0700236 show_killed_files(dir);
Linus Torvalds8695c8b2005-04-11 18:55:38 -0700237 }
Junio C Hamanoaee46192005-04-16 08:33:23 -0700238 if (show_cached | show_stage) {
Linus Torvalds8695c8b2005-04-11 18:55:38 -0700239 for (i = 0; i < active_nr; i++) {
240 struct cache_entry *ce = active_cache[i];
Linus Torvalds453ec4b2006-05-16 19:02:14 -0700241 if (excluded(dir, ce->name) != dir->show_ignored)
Nicolas Pitre9ff768e2005-04-28 11:44:04 -0700242 continue;
Linus Torvaldseec8c632005-04-16 12:43:32 -0700243 if (show_unmerged && !ce_stage(ce))
244 continue;
Junio C Hamano64586e72007-09-12 16:04:22 -0700245 if (ce->ce_flags & htons(CE_UPDATE))
246 continue;
Linus Torvalds5be4efb2005-08-21 12:55:33 -0700247 show_ce_entry(ce_stage(ce) ? tag_unmerged : tag_cached, ce);
Linus Torvalds8695c8b2005-04-11 18:55:38 -0700248 }
249 }
Junio C Hamanob0391892005-09-19 15:11:15 -0700250 if (show_deleted | show_modified) {
Linus Torvalds8695c8b2005-04-11 18:55:38 -0700251 for (i = 0; i < active_nr; i++) {
252 struct cache_entry *ce = active_cache[i];
253 struct stat st;
Junio C Hamanob0391892005-09-19 15:11:15 -0700254 int err;
Linus Torvalds453ec4b2006-05-16 19:02:14 -0700255 if (excluded(dir, ce->name) != dir->show_ignored)
Nicolas Pitre9ff768e2005-04-28 11:44:04 -0700256 continue;
Junio C Hamanob0391892005-09-19 15:11:15 -0700257 err = lstat(ce->name, &st);
258 if (show_deleted && err)
259 show_ce_entry(tag_removed, ce);
Junio C Hamano2bcab242006-02-08 21:50:18 -0800260 if (show_modified && ce_modified(ce, &st, 0))
Junio C Hamanob0391892005-09-19 15:11:15 -0700261 show_ce_entry(tag_modified, ce);
Linus Torvalds8695c8b2005-04-11 18:55:38 -0700262 }
263 }
Linus Torvalds8695c8b2005-04-11 18:55:38 -0700264}
265
Linus Torvalds5be4efb2005-08-21 12:55:33 -0700266/*
267 * Prune the index to only contain stuff starting with "prefix"
268 */
Linus Torvalds3e042282006-07-31 13:13:55 -0700269static void prune_cache(const char *prefix)
Linus Torvalds5be4efb2005-08-21 12:55:33 -0700270{
271 int pos = cache_name_pos(prefix, prefix_len);
272 unsigned int first, last;
273
274 if (pos < 0)
275 pos = -pos-1;
Keith Packard95af39f2007-10-02 22:44:15 -0700276 memmove(active_cache, active_cache + pos,
277 (active_nr - pos) * sizeof(struct cache_entry *));
Linus Torvalds5be4efb2005-08-21 12:55:33 -0700278 active_nr -= pos;
279 first = 0;
280 last = active_nr;
281 while (last > first) {
282 int next = (last + first) >> 1;
283 struct cache_entry *ce = active_cache[next];
284 if (!strncmp(ce->name, prefix, prefix_len)) {
285 first = next+1;
286 continue;
287 }
288 last = next;
289 }
290 active_nr = last;
291}
292
Linus Torvalds3e042282006-07-31 13:13:55 -0700293static const char *verify_pathspec(const char *prefix)
Linus Torvalds5be4efb2005-08-21 12:55:33 -0700294{
Linus Torvalds56fc5102005-08-21 17:27:50 -0700295 const char **p, *n, *prev;
Linus Torvalds56fc5102005-08-21 17:27:50 -0700296 unsigned long max;
Linus Torvalds5be4efb2005-08-21 12:55:33 -0700297
Linus Torvalds56fc5102005-08-21 17:27:50 -0700298 prev = NULL;
299 max = PATH_MAX;
300 for (p = pathspec; (n = *p) != NULL; p++) {
301 int i, len = 0;
302 for (i = 0; i < max; i++) {
303 char c = n[i];
304 if (prev && prev[i] != c)
305 break;
Linus Torvalds56906142005-08-23 17:14:13 -0700306 if (!c || c == '*' || c == '?')
Linus Torvalds56fc5102005-08-21 17:27:50 -0700307 break;
308 if (c == '/')
309 len = i+1;
310 }
311 prev = n;
312 if (len < max) {
313 max = len;
314 if (!max)
315 break;
316 }
Linus Torvalds5be4efb2005-08-21 12:55:33 -0700317 }
Linus Torvalds56fc5102005-08-21 17:27:50 -0700318
319 if (prefix_offset > max || memcmp(prev, prefix, prefix_offset))
320 die("git-ls-files: cannot generate relative filenames containing '..'");
321
Linus Torvalds56fc5102005-08-21 17:27:50 -0700322 prefix_len = max;
Pierre Habouzit182af832007-09-16 00:32:36 +0200323 return max ? xmemdupz(prev, max) : NULL;
Linus Torvalds5be4efb2005-08-21 12:55:33 -0700324}
325
Junio C Hamano64586e72007-09-12 16:04:22 -0700326/*
327 * Read the tree specified with --with-tree option
328 * (typically, HEAD) into stage #1 and then
329 * squash them down to stage #0. This is used for
330 * --error-unmatch to list and check the path patterns
331 * that were given from the command line. We are not
332 * going to write this index out.
333 */
Junio C Hamanoee425e42007-11-18 01:13:32 -0800334void overlay_tree_on_cache(const char *tree_name, const char *prefix)
Junio C Hamano64586e72007-09-12 16:04:22 -0700335{
336 struct tree *tree;
337 unsigned char sha1[20];
338 const char **match;
339 struct cache_entry *last_stage0 = NULL;
340 int i;
341
342 if (get_sha1(tree_name, sha1))
343 die("tree-ish %s not found.", tree_name);
344 tree = parse_tree_indirect(sha1);
345 if (!tree)
346 die("bad tree-ish %s", tree_name);
347
348 /* Hoist the unmerged entries up to stage #3 to make room */
349 for (i = 0; i < active_nr; i++) {
350 struct cache_entry *ce = active_cache[i];
351 if (!ce_stage(ce))
352 continue;
353 ce->ce_flags |= htons(CE_STAGEMASK);
354 }
355
356 if (prefix) {
357 static const char *(matchbuf[2]);
358 matchbuf[0] = prefix;
359 matchbuf [1] = NULL;
360 match = matchbuf;
361 } else
362 match = NULL;
363 if (read_tree(tree, 1, match))
364 die("unable to read tree entries %s", tree_name);
365
366 for (i = 0; i < active_nr; i++) {
367 struct cache_entry *ce = active_cache[i];
368 switch (ce_stage(ce)) {
369 case 0:
370 last_stage0 = ce;
371 /* fallthru */
372 default:
373 continue;
374 case 1:
375 /*
376 * If there is stage #0 entry for this, we do not
377 * need to show it. We use CE_UPDATE bit to mark
378 * such an entry.
379 */
380 if (last_stage0 &&
381 !strcmp(last_stage0->name, ce->name))
382 ce->ce_flags |= htons(CE_UPDATE);
383 }
384 }
385}
386
Junio C Hamanoee425e42007-11-18 01:13:32 -0800387int report_path_error(const char *ps_matched, const char **pathspec, int prefix_offset)
388{
389 /*
390 * Make sure all pathspec matched; otherwise it is an error.
391 */
392 int num, errors = 0;
393 for (num = 0; pathspec[num]; num++) {
394 int other, found_dup;
395
396 if (ps_matched[num])
397 continue;
398 /*
399 * The caller might have fed identical pathspec
400 * twice. Do not barf on such a mistake.
401 */
402 for (found_dup = other = 0;
403 !found_dup && pathspec[other];
404 other++) {
405 if (other == num || !ps_matched[other])
406 continue;
407 if (!strcmp(pathspec[other], pathspec[num]))
408 /*
409 * Ok, we have a match already.
410 */
411 found_dup = 1;
412 }
413 if (found_dup)
414 continue;
415
416 error("pathspec '%s' did not match any file(s) known to git.",
417 pathspec[num] + prefix_offset);
418 errors++;
419 }
420 return errors;
421}
422
Petr Baudis4d1f1192005-07-29 11:01:26 +0200423static const char ls_files_usage[] =
Junio C Hamano8bb2e032006-02-12 01:47:57 -0800424 "git-ls-files [-z] [-t] [-v] (--[cached|deleted|others|stage|unmerged|killed|modified])* "
Junio C Hamanof87f9492005-07-24 15:26:09 -0700425 "[ --ignored ] [--exclude=<pattern>] [--exclude-from=<file>] "
Jeff King8e7b07c2007-11-15 02:04:30 -0500426 "[ --exclude-per-directory=<filename> ] [--exclude-standard] "
427 "[--full-name] [--abbrev] [--] [<file>]*";
Nicolas Pitrecf9a1132005-04-28 15:06:25 -0700428
Linus Torvaldsa633fca2006-07-28 22:44:25 -0700429int cmd_ls_files(int argc, const char **argv, const char *prefix)
Linus Torvalds8695c8b2005-04-11 18:55:38 -0700430{
431 int i;
Johannes Schindelin6d9ba672007-01-23 13:30:20 +0100432 int exc_given = 0, require_work_tree = 0;
Linus Torvalds453ec4b2006-05-16 19:02:14 -0700433 struct dir_struct dir;
Linus Torvalds8695c8b2005-04-11 18:55:38 -0700434
Linus Torvalds453ec4b2006-05-16 19:02:14 -0700435 memset(&dir, 0, sizeof(dir));
Linus Torvalds5be4efb2005-08-21 12:55:33 -0700436 if (prefix)
Linus Torvalds56fc5102005-08-21 17:27:50 -0700437 prefix_offset = strlen(prefix);
Alex Riesen39b4ac92005-11-08 09:23:37 +0100438 git_config(git_default_config);
Linus Torvalds5be4efb2005-08-21 12:55:33 -0700439
Linus Torvalds8695c8b2005-04-11 18:55:38 -0700440 for (i = 1; i < argc; i++) {
Junio C Hamano6b5ee132005-09-21 00:00:47 -0700441 const char *arg = argv[i];
Linus Torvalds8695c8b2005-04-11 18:55:38 -0700442
Fredrik Kuivinen500b97e2005-10-02 17:33:38 +0200443 if (!strcmp(arg, "--")) {
444 i++;
445 break;
446 }
Junio C Hamanob83c8342005-04-15 11:11:01 -0700447 if (!strcmp(arg, "-z")) {
448 line_terminator = 0;
Linus Torvalds5be4efb2005-08-21 12:55:33 -0700449 continue;
450 }
Junio C Hamano8bb2e032006-02-12 01:47:57 -0800451 if (!strcmp(arg, "-t") || !strcmp(arg, "-v")) {
Petr Baudis20d37ef2005-04-21 19:47:08 -0700452 tag_cached = "H ";
453 tag_unmerged = "M ";
454 tag_removed = "R ";
Junio C Hamanob0391892005-09-19 15:11:15 -0700455 tag_modified = "C ";
Petr Baudis20d37ef2005-04-21 19:47:08 -0700456 tag_other = "? ";
Junio C Hamano6ca45942005-05-12 17:17:54 -0700457 tag_killed = "K ";
Junio C Hamano8bb2e032006-02-12 01:47:57 -0800458 if (arg[1] == 'v')
459 show_valid_bit = 1;
Linus Torvalds5be4efb2005-08-21 12:55:33 -0700460 continue;
461 }
462 if (!strcmp(arg, "-c") || !strcmp(arg, "--cached")) {
Linus Torvalds8695c8b2005-04-11 18:55:38 -0700463 show_cached = 1;
Linus Torvalds5be4efb2005-08-21 12:55:33 -0700464 continue;
465 }
466 if (!strcmp(arg, "-d") || !strcmp(arg, "--deleted")) {
Linus Torvalds8695c8b2005-04-11 18:55:38 -0700467 show_deleted = 1;
Linus Torvalds5be4efb2005-08-21 12:55:33 -0700468 continue;
469 }
Junio C Hamanob0391892005-09-19 15:11:15 -0700470 if (!strcmp(arg, "-m") || !strcmp(arg, "--modified")) {
471 show_modified = 1;
Johannes Schindelin6d9ba672007-01-23 13:30:20 +0100472 require_work_tree = 1;
Junio C Hamanob0391892005-09-19 15:11:15 -0700473 continue;
474 }
Linus Torvalds5be4efb2005-08-21 12:55:33 -0700475 if (!strcmp(arg, "-o") || !strcmp(arg, "--others")) {
Linus Torvalds8695c8b2005-04-11 18:55:38 -0700476 show_others = 1;
Johannes Schindelin6d9ba672007-01-23 13:30:20 +0100477 require_work_tree = 1;
Linus Torvalds5be4efb2005-08-21 12:55:33 -0700478 continue;
479 }
480 if (!strcmp(arg, "-i") || !strcmp(arg, "--ignored")) {
Linus Torvalds453ec4b2006-05-16 19:02:14 -0700481 dir.show_ignored = 1;
Johannes Schindelin6d9ba672007-01-23 13:30:20 +0100482 require_work_tree = 1;
Linus Torvalds5be4efb2005-08-21 12:55:33 -0700483 continue;
484 }
485 if (!strcmp(arg, "-s") || !strcmp(arg, "--stage")) {
Junio C Hamanoaee46192005-04-16 08:33:23 -0700486 show_stage = 1;
Linus Torvalds5be4efb2005-08-21 12:55:33 -0700487 continue;
488 }
489 if (!strcmp(arg, "-k") || !strcmp(arg, "--killed")) {
Junio C Hamano6ca45942005-05-12 17:17:54 -0700490 show_killed = 1;
Johannes Schindelin6d9ba672007-01-23 13:30:20 +0100491 require_work_tree = 1;
Linus Torvalds5be4efb2005-08-21 12:55:33 -0700492 continue;
493 }
Linus Torvalds9518eb22006-01-04 13:31:25 -0800494 if (!strcmp(arg, "--directory")) {
Linus Torvalds453ec4b2006-05-16 19:02:14 -0700495 dir.show_other_directories = 1;
Linus Torvalds9518eb22006-01-04 13:31:25 -0800496 continue;
497 }
Petr Baudisb0a3de42006-03-26 16:59:52 +0200498 if (!strcmp(arg, "--no-empty-directory")) {
Linus Torvalds453ec4b2006-05-16 19:02:14 -0700499 dir.hide_empty_directories = 1;
Petr Baudisb0a3de42006-03-26 16:59:52 +0200500 continue;
501 }
Linus Torvalds5be4efb2005-08-21 12:55:33 -0700502 if (!strcmp(arg, "-u") || !strcmp(arg, "--unmerged")) {
Petr Baudis20d37ef2005-04-21 19:47:08 -0700503 /* There's no point in showing unmerged unless
504 * you also show the stage information.
505 */
Linus Torvaldseec8c632005-04-16 12:43:32 -0700506 show_stage = 1;
507 show_unmerged = 1;
Linus Torvalds5be4efb2005-08-21 12:55:33 -0700508 continue;
509 }
510 if (!strcmp(arg, "-x") && i+1 < argc) {
Junio C Hamanofee88252005-07-28 23:32:20 -0700511 exc_given = 1;
Linus Torvalds453ec4b2006-05-16 19:02:14 -0700512 add_exclude(argv[++i], "", 0, &dir.exclude_list[EXC_CMDL]);
Linus Torvalds5be4efb2005-08-21 12:55:33 -0700513 continue;
514 }
Junio C Hamanocc44c762007-02-20 01:53:29 -0800515 if (!prefixcmp(arg, "--exclude=")) {
Junio C Hamanofee88252005-07-28 23:32:20 -0700516 exc_given = 1;
Linus Torvalds453ec4b2006-05-16 19:02:14 -0700517 add_exclude(arg+10, "", 0, &dir.exclude_list[EXC_CMDL]);
Linus Torvalds5be4efb2005-08-21 12:55:33 -0700518 continue;
519 }
520 if (!strcmp(arg, "-X") && i+1 < argc) {
Junio C Hamanofee88252005-07-28 23:32:20 -0700521 exc_given = 1;
Linus Torvalds453ec4b2006-05-16 19:02:14 -0700522 add_excludes_from_file(&dir, argv[++i]);
Linus Torvalds5be4efb2005-08-21 12:55:33 -0700523 continue;
524 }
Junio C Hamanocc44c762007-02-20 01:53:29 -0800525 if (!prefixcmp(arg, "--exclude-from=")) {
Junio C Hamanofee88252005-07-28 23:32:20 -0700526 exc_given = 1;
Linus Torvalds453ec4b2006-05-16 19:02:14 -0700527 add_excludes_from_file(&dir, arg+15);
Linus Torvalds5be4efb2005-08-21 12:55:33 -0700528 continue;
529 }
Junio C Hamanocc44c762007-02-20 01:53:29 -0800530 if (!prefixcmp(arg, "--exclude-per-directory=")) {
Junio C Hamanofee88252005-07-28 23:32:20 -0700531 exc_given = 1;
Linus Torvalds453ec4b2006-05-16 19:02:14 -0700532 dir.exclude_per_dir = arg + 24;
Linus Torvalds5be4efb2005-08-21 12:55:33 -0700533 continue;
534 }
Jeff King8e7b07c2007-11-15 02:04:30 -0500535 if (!strcmp(arg, "--exclude-standard")) {
536 exc_given = 1;
537 setup_standard_excludes(&dir);
538 continue;
539 }
Linus Torvalds5be4efb2005-08-21 12:55:33 -0700540 if (!strcmp(arg, "--full-name")) {
541 prefix_offset = 0;
542 continue;
543 }
Junio C Hamanobba319b2006-02-14 12:40:20 -0800544 if (!strcmp(arg, "--error-unmatch")) {
545 error_unmatch = 1;
546 continue;
547 }
Junio C Hamano64586e72007-09-12 16:04:22 -0700548 if (!prefixcmp(arg, "--with-tree=")) {
549 with_tree = arg + 12;
550 continue;
551 }
Junio C Hamanocc44c762007-02-20 01:53:29 -0800552 if (!prefixcmp(arg, "--abbrev=")) {
Eric Wongad0cae42006-03-07 11:59:17 -0800553 abbrev = strtoul(arg+9, NULL, 10);
554 if (abbrev && abbrev < MINIMUM_ABBREV)
555 abbrev = MINIMUM_ABBREV;
556 else if (abbrev > 40)
557 abbrev = 40;
558 continue;
559 }
560 if (!strcmp(arg, "--abbrev")) {
561 abbrev = DEFAULT_ABBREV;
562 continue;
563 }
Linus Torvalds56fc5102005-08-21 17:27:50 -0700564 if (*arg == '-')
Nicolas Pitre17710392005-04-30 13:59:38 -0700565 usage(ls_files_usage);
Linus Torvalds56fc5102005-08-21 17:27:50 -0700566 break;
Nicolas Pitre9ff768e2005-04-28 11:44:04 -0700567 }
568
Mike Hommey7d8ae932007-11-03 12:23:12 +0100569 if (require_work_tree && !is_inside_work_tree())
570 setup_work_tree();
Johannes Schindelin6d9ba672007-01-23 13:30:20 +0100571
Linus Torvalds56fc5102005-08-21 17:27:50 -0700572 pathspec = get_pathspec(prefix, argv + i);
573
574 /* Verify that the pathspec matches the prefix */
575 if (pathspec)
Linus Torvalds3e042282006-07-31 13:13:55 -0700576 prefix = verify_pathspec(prefix);
Linus Torvalds5be4efb2005-08-21 12:55:33 -0700577
Junio C Hamanobba319b2006-02-14 12:40:20 -0800578 /* Treat unmatching pathspec elements as errors */
579 if (pathspec && error_unmatch) {
580 int num;
581 for (num = 0; pathspec[num]; num++)
582 ;
583 ps_matched = xcalloc(1, num);
584 }
585
Linus Torvalds453ec4b2006-05-16 19:02:14 -0700586 if (dir.show_ignored && !exc_given) {
Petr Baudis20d37ef2005-04-21 19:47:08 -0700587 fprintf(stderr, "%s: --ignored needs some exclude pattern\n",
588 argv[0]);
Nicolas Pitre9ff768e2005-04-28 11:44:04 -0700589 exit(1);
Linus Torvalds8695c8b2005-04-11 18:55:38 -0700590 }
591
592 /* With no flags, we default to showing the cached files */
Junio C Hamanob0391892005-09-19 15:11:15 -0700593 if (!(show_stage | show_deleted | show_others | show_unmerged |
594 show_killed | show_modified))
Linus Torvalds8695c8b2005-04-11 18:55:38 -0700595 show_cached = 1;
596
597 read_cache();
Linus Torvalds5be4efb2005-08-21 12:55:33 -0700598 if (prefix)
Linus Torvalds3e042282006-07-31 13:13:55 -0700599 prune_cache(prefix);
Junio C Hamano64586e72007-09-12 16:04:22 -0700600 if (with_tree) {
601 /*
602 * Basic sanity check; show-stages and show-unmerged
603 * would not make any sense with this option.
604 */
605 if (show_stage || show_unmerged)
606 die("ls-files --with-tree is incompatible with -s or -u");
Junio C Hamanoee425e42007-11-18 01:13:32 -0800607 overlay_tree_on_cache(with_tree, prefix);
Junio C Hamano64586e72007-09-12 16:04:22 -0700608 }
Linus Torvalds3e042282006-07-31 13:13:55 -0700609 show_files(&dir, prefix);
Junio C Hamanobba319b2006-02-14 12:40:20 -0800610
611 if (ps_matched) {
Junio C Hamanoee425e42007-11-18 01:13:32 -0800612 int bad;
613 bad = report_path_error(ps_matched, pathspec, prefix_offset);
614 if (bad)
Andreas Ericssonced7b822006-11-30 12:28:28 +0100615 fprintf(stderr, "Did you forget to 'git add'?\n");
616
Junio C Hamanoee425e42007-11-18 01:13:32 -0800617 return bad ? 1 : 0;
Junio C Hamanobba319b2006-02-14 12:40:20 -0800618 }
619
Linus Torvalds8695c8b2005-04-11 18:55:38 -0700620 return 0;
621}