builtin-ls-files.c 13.9 KB
Newer Older
1 2 3 4 5 6 7 8
/*
 * This merges the file listing in the directory cache index
 * with the actual working directory list, and shows different
 * combinations of the two.
 *
 * Copyright (C) Linus Torvalds, 2005
 */
#include "cache.h"
9
#include "quote.h"
10
#include "dir.h"
P
Peter Eriksen 已提交
11
#include "builtin.h"
12
#include "tree.h"
13

14 15 16 17 18 19 20 21 22
static int abbrev;
static int show_deleted;
static int show_cached;
static int show_others;
static int show_stage;
static int show_unmerged;
static int show_modified;
static int show_killed;
static int show_valid_bit;
23
static int line_terminator = '\n';
24

25 26 27 28 29
static int prefix_len;
static int prefix_offset;
static const char **pathspec;
static int error_unmatch;
static char *ps_matched;
30
static const char *with_tree;
31

32 33 34 35
static const char *tag_cached = "";
static const char *tag_unmerged = "";
static const char *tag_removed = "";
static const char *tag_other = "";
36
static const char *tag_killed = "";
37
static const char *tag_modified = "";
38

39

40
/*
41
 * Match a pathspec against a filename. The first "skiplen" characters
42 43
 * are the common prefix
 */
44 45
int pathspec_match(const char **spec, char *ps_matched,
		   const char *filename, int skiplen)
46 47 48 49
{
	const char *m;

	while ((m = *spec++) != NULL) {
50
		int matchlen = strlen(m + skiplen);
51 52

		if (!matchlen)
53
			goto matched;
54 55
		if (!strncmp(m + skiplen, filename + skiplen, matchlen)) {
			if (m[skiplen + matchlen - 1] == '/')
56
				goto matched;
57
			switch (filename[skiplen + matchlen]) {
58
			case '/': case '\0':
59
				goto matched;
60 61
			}
		}
62
		if (!fnmatch(m + skiplen, filename + skiplen, 0))
63 64 65 66 67 68 69 70
			goto matched;
		if (ps_matched)
			ps_matched++;
		continue;
	matched:
		if (ps_matched)
			*ps_matched = 1;
		return 1;
71 72 73 74
	}
	return 0;
}

75
static void show_dir_entry(const char *tag, struct dir_entry *ent)
76 77 78 79 80
{
	int len = prefix_len;
	int offset = prefix_offset;

	if (len >= ent->len)
81
		die("git ls-files: internal error - directory entry not superset of prefix");
82

83
	if (pathspec && !pathspec_match(pathspec, ps_matched, ent->name, len))
84 85
		return;

86
	fputs(tag, stdout);
87
	write_name_quoted(ent->name + offset, stdout, line_terminator);
88 89
}

90
static void show_other_files(struct dir_struct *dir)
91 92
{
	int i;
93

94 95
	for (i = 0; i < dir->nr; i++) {
		struct dir_entry *ent = dir->entries[i];
96 97
		if (!cache_name_is_other(ent->name, ent->len))
			continue;
98 99 100 101
		show_dir_entry(tag_other, ent);
	}
}

102
static void show_killed_files(struct dir_struct *dir)
103 104
{
	int i;
105 106
	for (i = 0; i < dir->nr; i++) {
		struct dir_entry *ent = dir->entries[i];
107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146
		char *cp, *sp;
		int pos, len, killed = 0;

		for (cp = ent->name; cp - ent->name < ent->len; cp = sp + 1) {
			sp = strchr(cp, '/');
			if (!sp) {
				/* If ent->name is prefix of an entry in the
				 * cache, it will be killed.
				 */
				pos = cache_name_pos(ent->name, ent->len);
				if (0 <= pos)
					die("bug in show-killed-files");
				pos = -pos - 1;
				while (pos < active_nr &&
				       ce_stage(active_cache[pos]))
					pos++; /* skip unmerged */
				if (active_nr <= pos)
					break;
				/* pos points at a name immediately after
				 * ent->name in the cache.  Does it expect
				 * ent->name to be a directory?
				 */
				len = ce_namelen(active_cache[pos]);
				if ((ent->len < len) &&
				    !strncmp(active_cache[pos]->name,
					     ent->name, ent->len) &&
				    active_cache[pos]->name[ent->len] == '/')
					killed = 1;
				break;
			}
			if (0 <= cache_name_pos(ent->name, sp - ent->name)) {
				/* If any of the leading directories in
				 * ent->name is registered in the cache,
				 * ent->name will be killed.
				 */
				killed = 1;
				break;
			}
		}
		if (killed)
147
			show_dir_entry(tag_killed, dir->entries[i]);
148
	}
149 150
}

151 152 153 154 155 156
static void show_ce_entry(const char *tag, struct cache_entry *ce)
{
	int len = prefix_len;
	int offset = prefix_offset;

	if (len >= ce_namelen(ce))
157
		die("git ls-files: internal error - cache entry not superset of prefix");
158

159
	if (pathspec && !pathspec_match(pathspec, ps_matched, ce->name, len))
160 161
		return;

162
	if (tag && *tag && show_valid_bit &&
163
	    (ce->ce_flags & CE_VALID)) {
164 165 166 167 168 169 170 171 172 173 174 175 176 177 178
		static char alttag[4];
		memcpy(alttag, tag, 3);
		if (isalpha(tag[0]))
			alttag[0] = tolower(tag[0]);
		else if (tag[0] == '?')
			alttag[0] = '!';
		else {
			alttag[0] = 'v';
			alttag[1] = tag[0];
			alttag[2] = ' ';
			alttag[3] = 0;
		}
		tag = alttag;
	}

179 180
	if (!show_stage) {
		fputs(tag, stdout);
181
	} else {
182
		printf("%s%06o %s %d\t",
183
		       tag,
184
		       ce->ce_mode,
E
Eric Wong 已提交
185 186
		       abbrev ? find_unique_abbrev(ce->sha1,abbrev)
				: sha1_to_hex(ce->sha1),
187 188
		       ce_stage(ce));
	}
189
	write_name_quoted(ce->name + offset, stdout, line_terminator);
190 191
}

192
static void show_files(struct dir_struct *dir, const char *prefix)
193 194 195 196
{
	int i;

	/* For cached/deleted files we don't need to even do the readdir */
197
	if (show_others || show_killed) {
198 199 200
		const char *path = ".", *base = "";
		int baselen = prefix_len;

201
		if (baselen)
202
			path = base = prefix;
203
		read_directory(dir, path, base, baselen, pathspec);
204
		if (show_others)
205
			show_other_files(dir);
206
		if (show_killed)
207
			show_killed_files(dir);
208
	}
209
	if (show_cached | show_stage) {
210 211
		for (i = 0; i < active_nr; i++) {
			struct cache_entry *ce = active_cache[i];
J
Junio C Hamano 已提交
212 213
			int dtype = ce_to_dtype(ce);
			if (excluded(dir, ce->name, &dtype) != dir->show_ignored)
214
				continue;
215 216
			if (show_unmerged && !ce_stage(ce))
				continue;
217
			if (ce->ce_flags & CE_UPDATE)
218
				continue;
219
			show_ce_entry(ce_stage(ce) ? tag_unmerged : tag_cached, ce);
220 221
		}
	}
222
	if (show_deleted | show_modified) {
223 224 225
		for (i = 0; i < active_nr; i++) {
			struct cache_entry *ce = active_cache[i];
			struct stat st;
226
			int err;
J
Junio C Hamano 已提交
227 228
			int dtype = ce_to_dtype(ce);
			if (excluded(dir, ce->name, &dtype) != dir->show_ignored)
229
				continue;
230 231
			if (ce->ce_flags & CE_UPDATE)
				continue;
232 233 234
			err = lstat(ce->name, &st);
			if (show_deleted && err)
				show_ce_entry(tag_removed, ce);
235
			if (show_modified && ce_modified(ce, &st, 0))
236
				show_ce_entry(tag_modified, ce);
237 238 239 240 241 242 243
		}
	}
}

/*
 * Prune the index to only contain stuff starting with "prefix"
 */
244
static void prune_cache(const char *prefix)
245 246 247 248 249 250
{
	int pos = cache_name_pos(prefix, prefix_len);
	unsigned int first, last;

	if (pos < 0)
		pos = -pos-1;
251 252
	memmove(active_cache, active_cache + pos,
		(active_nr - pos) * sizeof(struct cache_entry *));
253 254 255 256 257 258 259 260 261
	active_nr -= pos;
	first = 0;
	last = active_nr;
	while (last > first) {
		int next = (last + first) >> 1;
		struct cache_entry *ce = active_cache[next];
		if (!strncmp(ce->name, prefix, prefix_len)) {
			first = next+1;
			continue;
262
		}
263 264 265 266 267
		last = next;
	}
	active_nr = last;
}

268
static const char *verify_pathspec(const char *prefix)
269
{
270 271 272 273 274 275 276 277 278 279 280
	const char **p, *n, *prev;
	unsigned long max;

	prev = NULL;
	max = PATH_MAX;
	for (p = pathspec; (n = *p) != NULL; p++) {
		int i, len = 0;
		for (i = 0; i < max; i++) {
			char c = n[i];
			if (prev && prev[i] != c)
				break;
281
			if (!c || c == '*' || c == '?')
282 283 284 285 286 287 288 289 290 291
				break;
			if (c == '/')
				len = i+1;
		}
		prev = n;
		if (len < max) {
			max = len;
			if (!max)
				break;
		}
292
	}
293 294

	if (prefix_offset > max || memcmp(prev, prefix, prefix_offset))
295
		die("git ls-files: cannot generate relative filenames containing '..'");
296 297

	prefix_len = max;
P
Pierre Habouzit 已提交
298
	return max ? xmemdupz(prev, max) : NULL;
299 300
}

301 302 303 304 305 306 307 308
/*
 * Read the tree specified with --with-tree option
 * (typically, HEAD) into stage #1 and then
 * squash them down to stage #0.  This is used for
 * --error-unmatch to list and check the path patterns
 * that were given from the command line.  We are not
 * going to write this index out.
 */
309
void overlay_tree_on_cache(const char *tree_name, const char *prefix)
310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327
{
	struct tree *tree;
	unsigned char sha1[20];
	const char **match;
	struct cache_entry *last_stage0 = NULL;
	int i;

	if (get_sha1(tree_name, sha1))
		die("tree-ish %s not found.", tree_name);
	tree = parse_tree_indirect(sha1);
	if (!tree)
		die("bad tree-ish %s", tree_name);

	/* Hoist the unmerged entries up to stage #3 to make room */
	for (i = 0; i < active_nr; i++) {
		struct cache_entry *ce = active_cache[i];
		if (!ce_stage(ce))
			continue;
328
		ce->ce_flags |= CE_STAGEMASK;
329 330 331 332 333
	}

	if (prefix) {
		static const char *(matchbuf[2]);
		matchbuf[0] = prefix;
334
		matchbuf[1] = NULL;
335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356
		match = matchbuf;
	} else
		match = NULL;
	if (read_tree(tree, 1, match))
		die("unable to read tree entries %s", tree_name);

	for (i = 0; i < active_nr; i++) {
		struct cache_entry *ce = active_cache[i];
		switch (ce_stage(ce)) {
		case 0:
			last_stage0 = ce;
			/* fallthru */
		default:
			continue;
		case 1:
			/*
			 * If there is stage #0 entry for this, we do not
			 * need to show it.  We use CE_UPDATE bit to mark
			 * such an entry.
			 */
			if (last_stage0 &&
			    !strcmp(last_stage0->name, ce->name))
357
				ce->ce_flags |= CE_UPDATE;
358 359 360 361
		}
	}
}

362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397
int report_path_error(const char *ps_matched, const char **pathspec, int prefix_offset)
{
	/*
	 * Make sure all pathspec matched; otherwise it is an error.
	 */
	int num, errors = 0;
	for (num = 0; pathspec[num]; num++) {
		int other, found_dup;

		if (ps_matched[num])
			continue;
		/*
		 * The caller might have fed identical pathspec
		 * twice.  Do not barf on such a mistake.
		 */
		for (found_dup = other = 0;
		     !found_dup && pathspec[other];
		     other++) {
			if (other == num || !ps_matched[other])
				continue;
			if (!strcmp(pathspec[other], pathspec[num]))
				/*
				 * Ok, we have a match already.
				 */
				found_dup = 1;
		}
		if (found_dup)
			continue;

		error("pathspec '%s' did not match any file(s) known to git.",
		      pathspec[num] + prefix_offset);
		errors++;
	}
	return errors;
}

398
static const char ls_files_usage[] =
S
Stephan Beyer 已提交
399
	"git ls-files [-z] [-t] [-v] (--[cached|deleted|others|stage|unmerged|killed|modified])* "
400
	"[ --ignored ] [--exclude=<pattern>] [--exclude-from=<file>] "
J
Jeff King 已提交
401 402
	"[ --exclude-per-directory=<filename> ] [--exclude-standard] "
	"[--full-name] [--abbrev] [--] [<file>]*";
403

404
int cmd_ls_files(int argc, const char **argv, const char *prefix)
405 406
{
	int i;
407
	int exc_given = 0, require_work_tree = 0;
408
	struct dir_struct dir;
409

410
	memset(&dir, 0, sizeof(dir));
411
	if (prefix)
412
		prefix_offset = strlen(prefix);
413
	git_config(git_default_config, NULL);
414

415
	for (i = 1; i < argc; i++) {
J
Junio C Hamano 已提交
416
		const char *arg = argv[i];
417

418 419 420 421
		if (!strcmp(arg, "--")) {
			i++;
			break;
		}
422 423
		if (!strcmp(arg, "-z")) {
			line_terminator = 0;
424 425
			continue;
		}
426
		if (!strcmp(arg, "-t") || !strcmp(arg, "-v")) {
427 428 429
			tag_cached = "H ";
			tag_unmerged = "M ";
			tag_removed = "R ";
430
			tag_modified = "C ";
431
			tag_other = "? ";
432
			tag_killed = "K ";
433 434
			if (arg[1] == 'v')
				show_valid_bit = 1;
435 436 437
			continue;
		}
		if (!strcmp(arg, "-c") || !strcmp(arg, "--cached")) {
438
			show_cached = 1;
439 440 441
			continue;
		}
		if (!strcmp(arg, "-d") || !strcmp(arg, "--deleted")) {
442
			show_deleted = 1;
443 444
			continue;
		}
445 446
		if (!strcmp(arg, "-m") || !strcmp(arg, "--modified")) {
			show_modified = 1;
447
			require_work_tree = 1;
448 449
			continue;
		}
450
		if (!strcmp(arg, "-o") || !strcmp(arg, "--others")) {
451
			show_others = 1;
452
			require_work_tree = 1;
453 454 455
			continue;
		}
		if (!strcmp(arg, "-i") || !strcmp(arg, "--ignored")) {
456
			dir.show_ignored = 1;
457
			require_work_tree = 1;
458 459 460
			continue;
		}
		if (!strcmp(arg, "-s") || !strcmp(arg, "--stage")) {
461
			show_stage = 1;
462 463 464
			continue;
		}
		if (!strcmp(arg, "-k") || !strcmp(arg, "--killed")) {
465
			show_killed = 1;
466
			require_work_tree = 1;
467 468
			continue;
		}
469
		if (!strcmp(arg, "--directory")) {
470
			dir.show_other_directories = 1;
471 472
			continue;
		}
473
		if (!strcmp(arg, "--no-empty-directory")) {
474
			dir.hide_empty_directories = 1;
475 476
			continue;
		}
477
		if (!strcmp(arg, "-u") || !strcmp(arg, "--unmerged")) {
478 479 480
			/* There's no point in showing unmerged unless
			 * you also show the stage information.
			 */
481 482
			show_stage = 1;
			show_unmerged = 1;
483 484 485
			continue;
		}
		if (!strcmp(arg, "-x") && i+1 < argc) {
486
			exc_given = 1;
487
			add_exclude(argv[++i], "", 0, &dir.exclude_list[EXC_CMDL]);
488 489
			continue;
		}
490
		if (!prefixcmp(arg, "--exclude=")) {
491
			exc_given = 1;
492
			add_exclude(arg+10, "", 0, &dir.exclude_list[EXC_CMDL]);
493 494 495
			continue;
		}
		if (!strcmp(arg, "-X") && i+1 < argc) {
496
			exc_given = 1;
497
			add_excludes_from_file(&dir, argv[++i]);
498 499
			continue;
		}
500
		if (!prefixcmp(arg, "--exclude-from=")) {
501
			exc_given = 1;
502
			add_excludes_from_file(&dir, arg+15);
503 504
			continue;
		}
505
		if (!prefixcmp(arg, "--exclude-per-directory=")) {
506
			exc_given = 1;
507
			dir.exclude_per_dir = arg + 24;
508 509
			continue;
		}
J
Jeff King 已提交
510 511 512 513 514
		if (!strcmp(arg, "--exclude-standard")) {
			exc_given = 1;
			setup_standard_excludes(&dir);
			continue;
		}
515 516 517 518
		if (!strcmp(arg, "--full-name")) {
			prefix_offset = 0;
			continue;
		}
519 520 521 522
		if (!strcmp(arg, "--error-unmatch")) {
			error_unmatch = 1;
			continue;
		}
523 524 525 526
		if (!prefixcmp(arg, "--with-tree=")) {
			with_tree = arg + 12;
			continue;
		}
527
		if (!prefixcmp(arg, "--abbrev=")) {
E
Eric Wong 已提交
528 529 530 531 532 533 534 535 536 537 538
			abbrev = strtoul(arg+9, NULL, 10);
			if (abbrev && abbrev < MINIMUM_ABBREV)
				abbrev = MINIMUM_ABBREV;
			else if (abbrev > 40)
				abbrev = 40;
			continue;
		}
		if (!strcmp(arg, "--abbrev")) {
			abbrev = DEFAULT_ABBREV;
			continue;
		}
539
		if (*arg == '-')
540
			usage(ls_files_usage);
541
		break;
542 543
	}

544 545
	if (require_work_tree && !is_inside_work_tree())
		setup_work_tree();
546

547 548 549
	pathspec = get_pathspec(prefix, argv + i);

	/* Verify that the pathspec matches the prefix */
550
	if (pathspec)
551
		prefix = verify_pathspec(prefix);
552

553 554 555 556 557 558 559 560
	/* Treat unmatching pathspec elements as errors */
	if (pathspec && error_unmatch) {
		int num;
		for (num = 0; pathspec[num]; num++)
			;
		ps_matched = xcalloc(1, num);
	}

561
	if (dir.show_ignored && !exc_given) {
562 563
		fprintf(stderr, "%s: --ignored needs some exclude pattern\n",
			argv[0]);
564
		exit(1);
565 566 567
	}

	/* With no flags, we default to showing the cached files */
568 569
	if (!(show_stage | show_deleted | show_others | show_unmerged |
	      show_killed | show_modified))
570 571 572
		show_cached = 1;

	read_cache();
573
	if (prefix)
574
		prune_cache(prefix);
575 576 577 578 579 580 581
	if (with_tree) {
		/*
		 * Basic sanity check; show-stages and show-unmerged
		 * would not make any sense with this option.
		 */
		if (show_stage || show_unmerged)
			die("ls-files --with-tree is incompatible with -s or -u");
582
		overlay_tree_on_cache(with_tree, prefix);
583
	}
584
	show_files(&dir, prefix);
585 586

	if (ps_matched) {
587 588 589
		int bad;
		bad = report_path_error(ps_matched, pathspec, prefix_offset);
		if (bad)
590 591
			fprintf(stderr, "Did you forget to 'git add'?\n");

592
		return bad ? 1 : 0;
593 594
	}

595 596
	return 0;
}