ls-files.c 15.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"
J
Junio C Hamano 已提交
14 15
#include "resolve-undo.h"
#include "string-list.h"
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;
J
Junio C Hamano 已提交
23
static int show_resolve_undo;
24 25 26
static int show_modified;
static int show_killed;
static int show_valid_bit;
27
static int line_terminator = '\n';
28

29 30
static const char *prefix;
static int max_prefix_len;
31 32 33 34
static int prefix_len;
static const char **pathspec;
static int error_unmatch;
static char *ps_matched;
35
static const char *with_tree;
36
static int exc_given;
37

38 39 40 41
static const char *tag_cached = "";
static const char *tag_unmerged = "";
static const char *tag_removed = "";
static const char *tag_other = "";
42
static const char *tag_killed = "";
43
static const char *tag_modified = "";
44
static const char *tag_skip_worktree = "";
J
Junio C Hamano 已提交
45
static const char *tag_resolve_undo = "";
46

47 48 49 50 51 52
static void write_name(const char* name, size_t len)
{
	write_name_quoted_relative(name, len, prefix, prefix_len, stdout,
			line_terminator);
}

53
static void show_dir_entry(const char *tag, struct dir_entry *ent)
54
{
55
	int len = max_prefix_len;
56 57

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

60
	if (!match_pathspec(pathspec, ent->name, ent->len, len, ps_matched))
61 62
		return;

63
	fputs(tag, stdout);
64
	write_name(ent->name, ent->len);
65 66
}

67
static void show_other_files(struct dir_struct *dir)
68 69
{
	int i;
70

71 72
	for (i = 0; i < dir->nr; i++) {
		struct dir_entry *ent = dir->entries[i];
73 74
		if (!cache_name_is_other(ent->name, ent->len))
			continue;
75 76 77 78
		show_dir_entry(tag_other, ent);
	}
}

79
static void show_killed_files(struct dir_struct *dir)
80 81
{
	int i;
82 83
	for (i = 0; i < dir->nr; i++) {
		struct dir_entry *ent = dir->entries[i];
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 114 115 116 117 118 119 120 121 122 123
		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)
124
			show_dir_entry(tag_killed, dir->entries[i]);
125
	}
126 127
}

128 129
static void show_ce_entry(const char *tag, struct cache_entry *ce)
{
130
	int len = max_prefix_len;
131 132

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

135
	if (!match_pathspec(pathspec, ce->name, ce_namelen(ce), len, ps_matched))
136 137
		return;

138
	if (tag && *tag && show_valid_bit &&
139
	    (ce->ce_flags & CE_VALID)) {
140 141 142 143 144 145 146 147 148 149 150 151 152 153 154
		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;
	}

155 156
	if (!show_stage) {
		fputs(tag, stdout);
157
	} else {
158
		printf("%s%06o %s %d\t",
159
		       tag,
160
		       ce->ce_mode,
E
Erik Faye-Lund 已提交
161
		       find_unique_abbrev(ce->sha1,abbrev),
162 163
		       ce_stage(ce));
	}
164
	write_name(ce->name, ce_namelen(ce));
165 166
}

J
Junio C Hamano 已提交
167 168 169 170 171 172 173
static int show_one_ru(struct string_list_item *item, void *cbdata)
{
	const char *path = item->string;
	struct resolve_undo_info *ui = item->util;
	int i, len;

	len = strlen(path);
174
	if (len < max_prefix_len)
J
Junio C Hamano 已提交
175
		return 0; /* outside of the prefix */
176
	if (!match_pathspec(pathspec, path, len, max_prefix_len, ps_matched))
J
Junio C Hamano 已提交
177 178 179 180 181
		return 0; /* uninterested */
	for (i = 0; i < 3; i++) {
		if (!ui->mode[i])
			continue;
		printf("%s%06o %s %d\t", tag_resolve_undo, ui->mode[i],
E
Erik Faye-Lund 已提交
182
		       find_unique_abbrev(ui->sha1[i], abbrev),
J
Junio C Hamano 已提交
183
		       i + 1);
184
		write_name(path, len);
J
Junio C Hamano 已提交
185 186 187 188
	}
	return 0;
}

189
static void show_ru_info(void)
J
Junio C Hamano 已提交
190 191 192
{
	if (!the_index.resolve_undo)
		return;
193
	for_each_string_list(the_index.resolve_undo, show_one_ru, NULL);
J
Junio C Hamano 已提交
194 195
}

196
static void show_files(struct dir_struct *dir)
197 198 199 200
{
	int i;

	/* For cached/deleted files we don't need to even do the readdir */
201
	if (show_others || show_killed) {
202
		fill_directory(dir, pathspec);
203
		if (show_others)
204
			show_other_files(dir);
205
		if (show_killed)
206
			show_killed_files(dir);
207
	}
208
	if (show_cached | show_stage) {
209 210
		for (i = 0; i < active_nr; i++) {
			struct cache_entry *ce = active_cache[i];
J
Jeff King 已提交
211 212 213 214
			int dtype = ce_to_dtype(ce);
			if (dir->flags & DIR_SHOW_IGNORED &&
			    !excluded(dir, ce->name, &dtype))
				continue;
215 216
			if (show_unmerged && !ce_stage(ce))
				continue;
217
			if (ce->ce_flags & CE_UPDATE)
218
				continue;
219 220
			show_ce_entry(ce_stage(ce) ? tag_unmerged :
				(ce_skip_worktree(ce) ? tag_skip_worktree : tag_cached), ce);
221 222
		}
	}
223
	if (show_deleted | show_modified) {
224 225 226
		for (i = 0; i < active_nr; i++) {
			struct cache_entry *ce = active_cache[i];
			struct stat st;
227
			int err;
J
Jeff King 已提交
228 229 230 231
			int dtype = ce_to_dtype(ce);
			if (dir->flags & DIR_SHOW_IGNORED &&
			    !excluded(dir, ce->name, &dtype))
				continue;
232 233
			if (ce->ce_flags & CE_UPDATE)
				continue;
234 235
			if (ce_skip_worktree(ce))
				continue;
236 237 238
			err = lstat(ce->name, &st);
			if (show_deleted && err)
				show_ce_entry(tag_removed, ce);
239
			if (show_modified && ce_modified(ce, &st, 0))
240
				show_ce_entry(tag_modified, ce);
241 242 243 244 245 246 247
		}
	}
}

/*
 * Prune the index to only contain stuff starting with "prefix"
 */
248
static void prune_cache(const char *prefix)
249
{
250
	int pos = cache_name_pos(prefix, max_prefix_len);
251 252 253 254
	unsigned int first, last;

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

272
static const char *pathspec_prefix(const char *prefix)
273
{
274 275 276
	const char **p, *n, *prev;
	unsigned long max;

277 278 279 280 281
	if (!pathspec) {
		max_prefix_len = prefix ? strlen(prefix) : 0;
		return prefix;
	}

282 283 284 285 286 287 288 289
	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;
290
			if (!c || c == '*' || c == '?')
291 292 293 294 295 296 297 298 299 300
				break;
			if (c == '/')
				len = i+1;
		}
		prev = n;
		if (len < max) {
			max = len;
			if (!max)
				break;
		}
301
	}
302

303
	max_prefix_len = max;
P
Pierre Habouzit 已提交
304
	return max ? xmemdupz(prev, max) : NULL;
305 306
}

307 308 309 310 311 312 313 314 315 316 317 318 319 320 321
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);
	}
}

322 323 324 325 326 327 328 329
/*
 * 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.
 */
330
void overlay_tree_on_cache(const char *tree_name, const char *prefix)
331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348
{
	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;
349
		ce->ce_flags |= CE_STAGEMASK;
350 351 352 353 354
	}

	if (prefix) {
		static const char *(matchbuf[2]);
		matchbuf[0] = prefix;
355
		matchbuf[1] = NULL;
356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377
		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))
378
				ce->ce_flags |= CE_UPDATE;
379 380 381 382
		}
	}
}

383
int report_path_error(const char *ps_matched, const char **pathspec, int prefix_len)
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
{
	/*
	 * 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.",
413
		      pathspec[num] + prefix_len);
414 415 416 417 418
		errors++;
	}
	return errors;
}

419 420 421 422 423 424 425 426 427 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 454 455 456 457 458 459 460 461 462 463
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;
}
464

465
int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)
466
{
467
	int require_work_tree = 0, show_tag = 0;
468
	const char *max_prefix;
469
	struct dir_struct dir;
470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495
	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 已提交
496
		OPT_NEGBIT(0, "empty-directory", &dir.flags,
497
			"don't show empty directories",
498 499 500
			DIR_HIDE_EMPTY_DIRECTORIES),
		OPT_BOOLEAN('u', "unmerged", &show_unmerged,
			"show unmerged files in the output"),
J
Junio C Hamano 已提交
501 502
		OPT_BOOLEAN(0, "resolve-undo", &show_resolve_undo,
			    "show resolve-undo information"),
503 504 505 506 507 508 509 510 511 512 513
		{ 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 },
514
		{ OPTION_SET_INT, 0, "full-name", &prefix_len, NULL,
515 516 517 518 519 520 521 522 523
			"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()
	};
524

525
	memset(&dir, 0, sizeof(dir));
526
	prefix = cmd_prefix;
527
	if (prefix)
528
		prefix_len = strlen(prefix);
529
	git_config(git_default_config, NULL);
530

531 532 533
	if (read_cache() < 0)
		die("index file corrupt");

534
	argc = parse_options(argc, argv, prefix, builtin_ls_files_options,
535 536 537 538 539 540 541 542
			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 ";
543
		tag_skip_worktree = "S ";
J
Junio C Hamano 已提交
544
		tag_resolve_undo = "U ";
545
	}
546
	if (show_modified || show_others || show_deleted || (dir.flags & DIR_SHOW_IGNORED) || show_killed)
547 548 549 550 551 552 553 554 555
		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;
556

557 558
	if (require_work_tree && !is_inside_work_tree())
		setup_work_tree();
559

560
	pathspec = get_pathspec(prefix, argv);
561

M
Mike Ralphson 已提交
562
	/* be nice with submodule paths ending in a slash */
563 564 565
	if (pathspec)
		strip_trailing_slash_from_submodules();

566 567
	/* Find common prefix for all pathspec's */
	max_prefix = pathspec_prefix(prefix);
568

569 570 571 572 573 574 575 576
	/* Treat unmatching pathspec elements as errors */
	if (pathspec && error_unmatch) {
		int num;
		for (num = 0; pathspec[num]; num++)
			;
		ps_matched = xcalloc(1, num);
	}

577 578
	if ((dir.flags & DIR_SHOW_IGNORED) && !exc_given)
		die("ls-files --ignored needs some exclude pattern");
579 580

	/* With no flags, we default to showing the cached files */
581
	if (!(show_stage | show_deleted | show_others | show_unmerged |
J
Junio C Hamano 已提交
582
	      show_killed | show_modified | show_resolve_undo))
583 584
		show_cached = 1;

585 586
	if (max_prefix)
		prune_cache(max_prefix);
587 588 589 590 591 592 593
	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");
594
		overlay_tree_on_cache(with_tree, max_prefix);
595
	}
596
	show_files(&dir);
J
Junio C Hamano 已提交
597
	if (show_resolve_undo)
598
		show_ru_info();
599 600

	if (ps_matched) {
601
		int bad;
602
		bad = report_path_error(ps_matched, pathspec, prefix_len);
603
		if (bad)
604 605
			fprintf(stderr, "Did you forget to 'git add'?\n");

606
		return bad ? 1 : 0;
607 608
	}

609 610
	return 0;
}