ls-files.c 15.8 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
#include "pathspec.h"
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;
J
Junio C Hamano 已提交
24
static int show_resolve_undo;
25 26 27
static int show_modified;
static int show_killed;
static int show_valid_bit;
28
static int line_terminator = '\n';
29
static int debug_mode;
30

31 32
static const char *prefix;
static int max_prefix_len;
33
static int prefix_len;
34
static struct pathspec pathspec;
35 36
static int error_unmatch;
static char *ps_matched;
37
static const char *with_tree;
38
static int exc_given;
39
static int exclude_args;
40

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

50
static void write_name(const char *name)
51
{
52
	/*
53 54
	 * With "--full-name", prefix_len=0; this caller needs to pass
	 * an empty string in that case (a NULL is good for "").
55
	 */
56 57
	write_name_quoted_relative(name, prefix_len ? prefix : NULL,
				   stdout, line_terminator);
58 59
}

60
static void show_dir_entry(const char *tag, struct dir_entry *ent)
61
{
62
	int len = max_prefix_len;
63 64

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

67
	if (!dir_path_match(ent, &pathspec, len, ps_matched))
68 69
		return;

70
	fputs(tag, stdout);
71
	write_name(ent->name);
72 73
}

74
static void show_other_files(struct dir_struct *dir)
75 76
{
	int i;
77

78 79
	for (i = 0; i < dir->nr; i++) {
		struct dir_entry *ent = dir->entries[i];
80 81
		if (!cache_name_is_other(ent->name, ent->len))
			continue;
82 83 84 85
		show_dir_entry(tag_other, ent);
	}
}

86
static void show_killed_files(struct dir_struct *dir)
87 88
{
	int i;
89 90
	for (i = 0; i < dir->nr; i++) {
		struct dir_entry *ent = dir->entries[i];
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 124 125 126 127 128 129 130
		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)
131
			show_dir_entry(tag_killed, dir->entries[i]);
132
	}
133 134
}

135
static void show_ce_entry(const char *tag, const struct cache_entry *ce)
136
{
137
	int len = max_prefix_len;
138 139

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

142
	if (!match_pathspec(&pathspec, ce->name, ce_namelen(ce),
143 144
			    len, ps_matched,
			    S_ISDIR(ce->ce_mode) || S_ISGITLINK(ce->ce_mode)))
145 146
		return;

147
	if (tag && *tag && show_valid_bit &&
148
	    (ce->ce_flags & CE_VALID)) {
149 150 151 152 153 154 155 156 157 158 159 160 161 162 163
		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;
	}

164 165
	if (!show_stage) {
		fputs(tag, stdout);
166
	} else {
167
		printf("%s%06o %s %d\t",
168
		       tag,
169
		       ce->ce_mode,
E
Erik Faye-Lund 已提交
170
		       find_unique_abbrev(ce->sha1,abbrev),
171 172
		       ce_stage(ce));
	}
173
	write_name(ce->name);
174
	if (debug_mode) {
175
		const struct stat_data *sd = &ce->ce_stat_data;
176 177 178 179 180 181

		printf("  ctime: %d:%d\n", sd->sd_ctime.sec, sd->sd_ctime.nsec);
		printf("  mtime: %d:%d\n", sd->sd_mtime.sec, sd->sd_mtime.nsec);
		printf("  dev: %d\tino: %d\n", sd->sd_dev, sd->sd_ino);
		printf("  uid: %d\tgid: %d\n", sd->sd_uid, sd->sd_gid);
		printf("  size: %d\tflags: %x\n", sd->sd_size, ce->ce_flags);
182
	}
183 184
}

185
static void show_ru_info(void)
J
Junio C Hamano 已提交
186
{
187 188
	struct string_list_item *item;

J
Junio C Hamano 已提交
189 190
	if (!the_index.resolve_undo)
		return;
191 192 193 194 195 196 197 198 199

	for_each_string_list_item(item, the_index.resolve_undo) {
		const char *path = item->string;
		struct resolve_undo_info *ui = item->util;
		int i, len;

		len = strlen(path);
		if (len < max_prefix_len)
			continue; /* outside of the prefix */
200
		if (!match_pathspec(&pathspec, path, len,
201
				    max_prefix_len, ps_matched, 0))
202 203 204 205 206 207 208
			continue; /* uninterested */
		for (i = 0; i < 3; i++) {
			if (!ui->mode[i])
				continue;
			printf("%s%06o %s %d\t", tag_resolve_undo, ui->mode[i],
			       find_unique_abbrev(ui->sha1[i], abbrev),
			       i + 1);
209
			write_name(path);
210 211
		}
	}
J
Junio C Hamano 已提交
212 213
}

214
static int ce_excluded(struct dir_struct *dir, const struct cache_entry *ce)
215 216
{
	int dtype = ce_to_dtype(ce);
217
	return is_excluded(dir, ce->name, &dtype);
218 219
}

220
static void show_files(struct dir_struct *dir)
221 222 223 224
{
	int i;

	/* For cached/deleted files we don't need to even do the readdir */
225
	if (show_others || show_killed) {
226 227
		if (!show_others)
			dir->flags |= DIR_COLLECT_KILLED_ONLY;
228
		fill_directory(dir, &pathspec);
229
		if (show_others)
230
			show_other_files(dir);
231
		if (show_killed)
232
			show_killed_files(dir);
233
	}
234
	if (show_cached || show_stage) {
235
		for (i = 0; i < active_nr; i++) {
236
			const struct cache_entry *ce = active_cache[i];
237
			if ((dir->flags & DIR_SHOW_IGNORED) &&
238
			    !ce_excluded(dir, ce))
J
Jeff King 已提交
239
				continue;
240 241
			if (show_unmerged && !ce_stage(ce))
				continue;
242
			if (ce->ce_flags & CE_UPDATE)
243
				continue;
244 245
			show_ce_entry(ce_stage(ce) ? tag_unmerged :
				(ce_skip_worktree(ce) ? tag_skip_worktree : tag_cached), ce);
246 247
		}
	}
248
	if (show_deleted || show_modified) {
249
		for (i = 0; i < active_nr; i++) {
250
			const struct cache_entry *ce = active_cache[i];
251
			struct stat st;
252
			int err;
253
			if ((dir->flags & DIR_SHOW_IGNORED) &&
254
			    !ce_excluded(dir, ce))
J
Jeff King 已提交
255
				continue;
256 257
			if (ce->ce_flags & CE_UPDATE)
				continue;
258 259
			if (ce_skip_worktree(ce))
				continue;
260 261 262
			err = lstat(ce->name, &st);
			if (show_deleted && err)
				show_ce_entry(tag_removed, ce);
263
			if (show_modified && ce_modified(ce, &st, 0))
264
				show_ce_entry(tag_modified, ce);
265 266 267 268 269 270 271
		}
	}
}

/*
 * Prune the index to only contain stuff starting with "prefix"
 */
272
static void prune_cache(const char *prefix)
273
{
274
	int pos = cache_name_pos(prefix, max_prefix_len);
275 276 277 278
	unsigned int first, last;

	if (pos < 0)
		pos = -pos-1;
279 280
	memmove(active_cache, active_cache + pos,
		(active_nr - pos) * sizeof(struct cache_entry *));
281 282 283 284 285
	active_nr -= pos;
	first = 0;
	last = active_nr;
	while (last > first) {
		int next = (last + first) >> 1;
286
		const struct cache_entry *ce = active_cache[next];
287
		if (!strncmp(ce->name, prefix, max_prefix_len)) {
288 289
			first = next+1;
			continue;
290
		}
291 292 293 294 295
		last = next;
	}
	active_nr = last;
}

296 297 298 299 300 301 302 303
/*
 * 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.
 */
304
void overlay_tree_on_cache(const char *tree_name, const char *prefix)
305 306 307
{
	struct tree *tree;
	unsigned char sha1[20];
308
	struct pathspec pathspec;
309 310 311 312 313 314 315 316 317 318 319 320 321 322
	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;
323
		ce->ce_flags |= CE_STAGEMASK;
324 325 326
	}

	if (prefix) {
327 328 329 330
		static const char *(matchbuf[1]);
		matchbuf[0] = NULL;
		parse_pathspec(&pathspec, PATHSPEC_ALL_MAGIC,
			       PATHSPEC_PREFER_CWD, prefix, matchbuf);
331
	} else
332
		memset(&pathspec, 0, sizeof(pathspec));
333
	if (read_tree(tree, 1, &pathspec))
334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351
		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))
352
				ce->ce_flags |= CE_UPDATE;
353 354 355 356
		}
	}
}

357 358 359
int report_path_error(const char *ps_matched,
		      const struct pathspec *pathspec,
		      const char *prefix)
360 361 362 363
{
	/*
	 * Make sure all pathspec matched; otherwise it is an error.
	 */
364
	struct strbuf sb = STRBUF_INIT;
365
	int num, errors = 0;
366
	for (num = 0; num < pathspec->nr; num++) {
367 368 369 370 371 372 373
		int other, found_dup;

		if (ps_matched[num])
			continue;
		/*
		 * The caller might have fed identical pathspec
		 * twice.  Do not barf on such a mistake.
374 375
		 * FIXME: parse_pathspec should have eliminated
		 * duplicate pathspec.
376 377
		 */
		for (found_dup = other = 0;
378
		     !found_dup && other < pathspec->nr;
379 380 381
		     other++) {
			if (other == num || !ps_matched[other])
				continue;
382 383
			if (!strcmp(pathspec->items[other].original,
				    pathspec->items[num].original))
384 385 386 387 388 389 390 391 392
				/*
				 * 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.",
393
		      pathspec->items[num].original);
394 395
		errors++;
	}
396
	strbuf_release(&sb);
397 398 399
	return errors;
}

400
static const char * const ls_files_usage[] = {
401
	N_("git ls-files [options] [<file>...]"),
402 403 404 405 406 407 408 409 410 411 412 413 414 415
	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)
{
416
	struct string_list *exclude_list = opt->value;
417 418

	exc_given = 1;
419
	string_list_append(exclude_list, arg);
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

	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;
}
445

446
int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)
447
{
448
	int require_work_tree = 0, show_tag = 0, i;
449
	const char *max_prefix;
450
	struct dir_struct dir;
451 452
	struct exclude_list *el;
	struct string_list exclude_list = STRING_LIST_INIT_NODUP;
453 454
	struct option builtin_ls_files_options[] = {
		{ OPTION_CALLBACK, 'z', NULL, NULL, NULL,
455
			N_("paths are separated with NUL character"),
456
			PARSE_OPT_NOARG, option_parse_z },
457
		OPT_BOOL('t', NULL, &show_tag,
458
			N_("identify the file status with tags")),
459
		OPT_BOOL('v', NULL, &show_valid_bit,
460
			N_("use lowercase letters for 'assume unchanged' files")),
461
		OPT_BOOL('c', "cached", &show_cached,
462
			N_("show cached files in the output (default)")),
463
		OPT_BOOL('d', "deleted", &show_deleted,
464
			N_("show deleted files in the output")),
465
		OPT_BOOL('m', "modified", &show_modified,
466
			N_("show modified files in the output")),
467
		OPT_BOOL('o', "others", &show_others,
468
			N_("show other files in the output")),
469
		OPT_BIT('i', "ignored", &dir.flags,
470
			N_("show ignored files in the output"),
471
			DIR_SHOW_IGNORED),
472
		OPT_BOOL('s', "stage", &show_stage,
473
			N_("show staged contents' object name in the output")),
474
		OPT_BOOL('k', "killed", &show_killed,
475
			N_("show files on the filesystem that need to be removed")),
476
		OPT_BIT(0, "directory", &dir.flags,
477
			N_("show 'other' directories' name only"),
478
			DIR_SHOW_OTHER_DIRECTORIES),
J
Jeff King 已提交
479
		OPT_NEGBIT(0, "empty-directory", &dir.flags,
480
			N_("don't show empty directories"),
481
			DIR_HIDE_EMPTY_DIRECTORIES),
482
		OPT_BOOL('u', "unmerged", &show_unmerged,
483
			N_("show unmerged files in the output")),
484
		OPT_BOOL(0, "resolve-undo", &show_resolve_undo,
485
			    N_("show resolve-undo information")),
J
Junio C Hamano 已提交
486
		{ OPTION_CALLBACK, 'x', "exclude", &exclude_list, N_("pattern"),
487
			N_("skip files matching pattern"),
488
			0, option_parse_exclude },
489 490
		{ OPTION_CALLBACK, 'X', "exclude-from", &dir, N_("file"),
			N_("exclude patterns are read from <file>"),
491
			0, option_parse_exclude_from },
492 493
		OPT_STRING(0, "exclude-per-directory", &dir.exclude_per_dir, N_("file"),
			N_("read additional per-directory exclude patterns in <file>")),
494
		{ OPTION_CALLBACK, 0, "exclude-standard", &dir, NULL,
495
			N_("add the standard git exclusions"),
496
			PARSE_OPT_NOARG, option_parse_exclude_standard },
497
		{ OPTION_SET_INT, 0, "full-name", &prefix_len, NULL,
498
			N_("make the output relative to the project top directory"),
499
			PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL },
500
		OPT_BOOL(0, "error-unmatch", &error_unmatch,
501 502 503
			N_("if any <file> is not in the index, treat this as an error")),
		OPT_STRING(0, "with-tree", &with_tree, N_("tree-ish"),
			N_("pretend that paths removed since <tree-ish> are still present")),
504
		OPT__ABBREV(&abbrev),
505
		OPT_BOOL(0, "debug", &debug_mode, N_("show debugging data")),
506 507
		OPT_END()
	};
508

509 510 511
	if (argc == 2 && !strcmp(argv[1], "-h"))
		usage_with_options(ls_files_usage, builtin_ls_files_options);

512
	memset(&dir, 0, sizeof(dir));
513
	prefix = cmd_prefix;
514
	if (prefix)
515
		prefix_len = strlen(prefix);
516
	git_config(git_default_config, NULL);
517

518 519 520
	if (read_cache() < 0)
		die("index file corrupt");

521
	argc = parse_options(argc, argv, prefix, builtin_ls_files_options,
522
			ls_files_usage, 0);
523 524 525 526
	el = add_exclude_list(&dir, EXC_CMDL, "--exclude option");
	for (i = 0; i < exclude_list.nr; i++) {
		add_exclude(exclude_list.items[i].string, "", 0, el, --exclude_args);
	}
527 528 529 530 531 532 533
	if (show_tag || show_valid_bit) {
		tag_cached = "H ";
		tag_unmerged = "M ";
		tag_removed = "R ";
		tag_modified = "C ";
		tag_other = "? ";
		tag_killed = "K ";
534
		tag_skip_worktree = "S ";
J
Junio C Hamano 已提交
535
		tag_resolve_undo = "U ";
536
	}
537
	if (show_modified || show_others || show_deleted || (dir.flags & DIR_SHOW_IGNORED) || show_killed)
538 539 540 541 542 543 544 545 546
		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;
547

548 549
	if (require_work_tree && !is_inside_work_tree())
		setup_work_tree();
550

551 552 553 554
	parse_pathspec(&pathspec, 0,
		       PATHSPEC_PREFER_CWD |
		       PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAP,
		       prefix, argv);
555

556
	/* Find common prefix for all pathspec's */
557
	max_prefix = common_prefix(&pathspec);
558
	max_prefix_len = max_prefix ? strlen(max_prefix) : 0;
559

560
	/* Treat unmatching pathspec elements as errors */
561 562
	if (pathspec.nr && error_unmatch)
		ps_matched = xcalloc(1, pathspec.nr);
563

564 565
	if ((dir.flags & DIR_SHOW_IGNORED) && !exc_given)
		die("ls-files --ignored needs some exclude pattern");
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 || show_resolve_undo))
570 571
		show_cached = 1;

572 573
	if (max_prefix)
		prune_cache(max_prefix);
574 575 576 577 578 579 580
	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");
581
		overlay_tree_on_cache(with_tree, max_prefix);
582
	}
583
	show_files(&dir);
J
Junio C Hamano 已提交
584
	if (show_resolve_undo)
585
		show_ru_info();
586 587

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

593
		return bad ? 1 : 0;
594 595
	}

596 597
	return 0;
}