builtin-ls-files.c 14.2 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
#include "parse-options.h"
14

15 16 17 18 19 20 21 22 23
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;
24
static int line_terminator = '\n';
25

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

34 35 36 37
static const char *tag_cached = "";
static const char *tag_unmerged = "";
static const char *tag_removed = "";
static const char *tag_other = "";
38
static const char *tag_killed = "";
39
static const char *tag_modified = "";
40
static const char *tag_skip_worktree = "";
41

42
static void show_dir_entry(const char *tag, struct dir_entry *ent)
43 44 45 46 47
{
	int len = prefix_len;
	int offset = prefix_offset;

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

50
	if (!match_pathspec(pathspec, ent->name, ent->len, len, ps_matched))
51 52
		return;

53
	fputs(tag, stdout);
54
	write_name_quoted(ent->name + offset, stdout, line_terminator);
55 56
}

57
static void show_other_files(struct dir_struct *dir)
58 59
{
	int i;
60

61 62
	for (i = 0; i < dir->nr; i++) {
		struct dir_entry *ent = dir->entries[i];
63 64
		if (!cache_name_is_other(ent->name, ent->len))
			continue;
65 66 67 68
		show_dir_entry(tag_other, ent);
	}
}

69
static void show_killed_files(struct dir_struct *dir)
70 71
{
	int i;
72 73
	for (i = 0; i < dir->nr; i++) {
		struct dir_entry *ent = dir->entries[i];
74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113
		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)
114
			show_dir_entry(tag_killed, dir->entries[i]);
115
	}
116 117
}

118 119 120 121 122 123
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))
124
		die("git ls-files: internal error - cache entry not superset of prefix");
125

126
	if (!match_pathspec(pathspec, ce->name, ce_namelen(ce), len, ps_matched))
127 128
		return;

129
	if (tag && *tag && show_valid_bit &&
130
	    (ce->ce_flags & CE_VALID)) {
131 132 133 134 135 136 137 138 139 140 141 142 143 144 145
		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;
	}

146 147
	if (!show_stage) {
		fputs(tag, stdout);
148
	} else {
149
		printf("%s%06o %s %d\t",
150
		       tag,
151
		       ce->ce_mode,
E
Eric Wong 已提交
152 153
		       abbrev ? find_unique_abbrev(ce->sha1,abbrev)
				: sha1_to_hex(ce->sha1),
154 155
		       ce_stage(ce));
	}
156
	write_name_quoted(ce->name + offset, stdout, line_terminator);
157 158
}

159
static void show_files(struct dir_struct *dir, const char *prefix)
160 161 162 163
{
	int i;

	/* For cached/deleted files we don't need to even do the readdir */
164
	if (show_others || show_killed) {
165
		fill_directory(dir, pathspec);
166
		if (show_others)
167
			show_other_files(dir);
168
		if (show_killed)
169
			show_killed_files(dir);
170
	}
171
	if (show_cached | show_stage) {
172 173
		for (i = 0; i < active_nr; i++) {
			struct cache_entry *ce = active_cache[i];
J
Junio C Hamano 已提交
174
			int dtype = ce_to_dtype(ce);
175 176
			if (excluded(dir, ce->name, &dtype) !=
					!!(dir->flags & DIR_SHOW_IGNORED))
177
				continue;
178 179
			if (show_unmerged && !ce_stage(ce))
				continue;
180
			if (ce->ce_flags & CE_UPDATE)
181
				continue;
182 183
			show_ce_entry(ce_stage(ce) ? tag_unmerged :
				(ce_skip_worktree(ce) ? tag_skip_worktree : tag_cached), ce);
184 185
		}
	}
186
	if (show_deleted | show_modified) {
187 188 189
		for (i = 0; i < active_nr; i++) {
			struct cache_entry *ce = active_cache[i];
			struct stat st;
190
			int err;
J
Junio C Hamano 已提交
191
			int dtype = ce_to_dtype(ce);
192 193
			if (excluded(dir, ce->name, &dtype) !=
					!!(dir->flags & DIR_SHOW_IGNORED))
194
				continue;
195 196
			if (ce->ce_flags & CE_UPDATE)
				continue;
197 198 199
			err = lstat(ce->name, &st);
			if (show_deleted && err)
				show_ce_entry(tag_removed, ce);
200
			if (show_modified && ce_modified(ce, &st, 0))
201
				show_ce_entry(tag_modified, ce);
202 203 204 205 206 207 208
		}
	}
}

/*
 * Prune the index to only contain stuff starting with "prefix"
 */
209
static void prune_cache(const char *prefix)
210 211 212 213 214 215
{
	int pos = cache_name_pos(prefix, prefix_len);
	unsigned int first, last;

	if (pos < 0)
		pos = -pos-1;
216 217
	memmove(active_cache, active_cache + pos,
		(active_nr - pos) * sizeof(struct cache_entry *));
218 219 220 221 222 223 224 225 226
	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;
227
		}
228 229 230 231 232
		last = next;
	}
	active_nr = last;
}

233
static const char *verify_pathspec(const char *prefix)
234
{
235 236 237 238 239 240 241 242 243 244 245
	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;
246
			if (!c || c == '*' || c == '?')
247 248 249 250 251 252 253 254 255 256
				break;
			if (c == '/')
				len = i+1;
		}
		prev = n;
		if (len < max) {
			max = len;
			if (!max)
				break;
		}
257
	}
258 259

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

	prefix_len = max;
P
Pierre Habouzit 已提交
263
	return max ? xmemdupz(prev, max) : NULL;
264 265
}

266 267 268 269 270 271 272 273 274 275 276 277 278 279 280
static void strip_trailing_slash_from_submodules(void)
{
	const char **p;

	for (p = pathspec; *p != NULL; p++) {
		int len = strlen(*p), pos;

		if (len < 1 || (*p)[len - 1] != '/')
			continue;
		pos = cache_name_pos(*p, len - 1);
		if (pos >= 0 && S_ISGITLINK(active_cache[pos]->ce_mode))
			*p = xstrndup(*p, len - 1);
	}
}

281 282 283 284 285 286 287 288
/*
 * 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.
 */
289
void overlay_tree_on_cache(const char *tree_name, const char *prefix)
290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307
{
	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;
308
		ce->ce_flags |= CE_STAGEMASK;
309 310 311 312 313
	}

	if (prefix) {
		static const char *(matchbuf[2]);
		matchbuf[0] = prefix;
314
		matchbuf[1] = NULL;
315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336
		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))
337
				ce->ce_flags |= CE_UPDATE;
338 339 340 341
		}
	}
}

342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377
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;
}

378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422
static const char * const ls_files_usage[] = {
	"git ls-files [options] [<file>]*",
	NULL
};

static int option_parse_z(const struct option *opt,
			  const char *arg, int unset)
{
	line_terminator = unset ? '\n' : '\0';

	return 0;
}

static int option_parse_exclude(const struct option *opt,
				const char *arg, int unset)
{
	struct exclude_list *list = opt->value;

	exc_given = 1;
	add_exclude(arg, "", 0, list);

	return 0;
}

static int option_parse_exclude_from(const struct option *opt,
				     const char *arg, int unset)
{
	struct dir_struct *dir = opt->value;

	exc_given = 1;
	add_excludes_from_file(dir, arg);

	return 0;
}

static int option_parse_exclude_standard(const struct option *opt,
					 const char *arg, int unset)
{
	struct dir_struct *dir = opt->value;

	exc_given = 1;
	setup_standard_excludes(dir);

	return 0;
}
423

424
int cmd_ls_files(int argc, const char **argv, const char *prefix)
425
{
426
	int require_work_tree = 0, show_tag = 0;
427
	struct dir_struct dir;
428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453
	struct option builtin_ls_files_options[] = {
		{ OPTION_CALLBACK, 'z', NULL, NULL, NULL,
			"paths are separated with NUL character",
			PARSE_OPT_NOARG, option_parse_z },
		OPT_BOOLEAN('t', NULL, &show_tag,
			"identify the file status with tags"),
		OPT_BOOLEAN('v', NULL, &show_valid_bit,
			"use lowercase letters for 'assume unchanged' files"),
		OPT_BOOLEAN('c', "cached", &show_cached,
			"show cached files in the output (default)"),
		OPT_BOOLEAN('d', "deleted", &show_deleted,
			"show deleted files in the output"),
		OPT_BOOLEAN('m', "modified", &show_modified,
			"show modified files in the output"),
		OPT_BOOLEAN('o', "others", &show_others,
			"show other files in the output"),
		OPT_BIT('i', "ignored", &dir.flags,
			"show ignored files in the output",
			DIR_SHOW_IGNORED),
		OPT_BOOLEAN('s', "stage", &show_stage,
			"show staged contents' object name in the output"),
		OPT_BOOLEAN('k', "killed", &show_killed,
			"show files on the filesystem that need to be removed"),
		OPT_BIT(0, "directory", &dir.flags,
			"show 'other' directories' name only",
			DIR_SHOW_OTHER_DIRECTORIES),
J
Jeff King 已提交
454
		OPT_NEGBIT(0, "empty-directory", &dir.flags,
455
			"don't show empty directories",
456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479
			DIR_HIDE_EMPTY_DIRECTORIES),
		OPT_BOOLEAN('u', "unmerged", &show_unmerged,
			"show unmerged files in the output"),
		{ OPTION_CALLBACK, 'x', "exclude", &dir.exclude_list[EXC_CMDL], "pattern",
			"skip files matching pattern",
			0, option_parse_exclude },
		{ OPTION_CALLBACK, 'X', "exclude-from", &dir, "file",
			"exclude patterns are read from <file>",
			0, option_parse_exclude_from },
		OPT_STRING(0, "exclude-per-directory", &dir.exclude_per_dir, "file",
			"read additional per-directory exclude patterns in <file>"),
		{ OPTION_CALLBACK, 0, "exclude-standard", &dir, NULL,
			"add the standard git exclusions",
			PARSE_OPT_NOARG, option_parse_exclude_standard },
		{ OPTION_SET_INT, 0, "full-name", &prefix_offset, NULL,
			"make the output relative to the project top directory",
			PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL },
		OPT_BOOLEAN(0, "error-unmatch", &error_unmatch,
			"if any <file> is not in the index, treat this as an error"),
		OPT_STRING(0, "with-tree", &with_tree, "tree-ish",
			"pretend that paths removed since <tree-ish> are still present"),
		OPT__ABBREV(&abbrev),
		OPT_END()
	};
480

481
	memset(&dir, 0, sizeof(dir));
482
	if (prefix)
483
		prefix_offset = strlen(prefix);
484
	git_config(git_default_config, NULL);
485

486
	argc = parse_options(argc, argv, prefix, builtin_ls_files_options,
487 488 489 490 491 492 493 494
			ls_files_usage, 0);
	if (show_tag || show_valid_bit) {
		tag_cached = "H ";
		tag_unmerged = "M ";
		tag_removed = "R ";
		tag_modified = "C ";
		tag_other = "? ";
		tag_killed = "K ";
495
		tag_skip_worktree = "S ";
496
	}
497
	if (show_modified || show_others || show_deleted || (dir.flags & DIR_SHOW_IGNORED) || show_killed)
498 499 500 501 502 503 504 505 506
		require_work_tree = 1;
	if (show_unmerged)
		/*
		 * There's no point in showing unmerged unless
		 * you also show the stage information.
		 */
		show_stage = 1;
	if (dir.exclude_per_dir)
		exc_given = 1;
507

508 509
	if (require_work_tree && !is_inside_work_tree())
		setup_work_tree();
510

511
	pathspec = get_pathspec(prefix, argv);
512

M
Mike Ralphson 已提交
513
	/* be nice with submodule paths ending in a slash */
514 515 516 517
	read_cache();
	if (pathspec)
		strip_trailing_slash_from_submodules();

518
	/* Verify that the pathspec matches the prefix */
519
	if (pathspec)
520
		prefix = verify_pathspec(prefix);
521

522 523 524 525 526 527 528 529
	/* Treat unmatching pathspec elements as errors */
	if (pathspec && error_unmatch) {
		int num;
		for (num = 0; pathspec[num]; num++)
			;
		ps_matched = xcalloc(1, num);
	}

530
	if ((dir.flags & DIR_SHOW_IGNORED) && !exc_given) {
531 532
		fprintf(stderr, "%s: --ignored needs some exclude pattern\n",
			argv[0]);
533
		exit(1);
534 535 536
	}

	/* With no flags, we default to showing the cached files */
537 538
	if (!(show_stage | show_deleted | show_others | show_unmerged |
	      show_killed | show_modified))
539 540
		show_cached = 1;

541
	if (prefix)
542
		prune_cache(prefix);
543 544 545 546 547 548 549
	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");
550
		overlay_tree_on_cache(with_tree, prefix);
551
	}
552
	show_files(&dir, prefix);
553 554

	if (ps_matched) {
555 556 557
		int bad;
		bad = report_path_error(ps_matched, pathspec, prefix_offset);
		if (bad)
558 559
			fprintf(stderr, "Did you forget to 'git add'?\n");

560
		return bad ? 1 : 0;
561 562
	}

563 564
	return 0;
}