ls-files.c 17.0 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
#include "run-command.h"
18

19 20 21 22 23 24
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 已提交
25
static int show_resolve_undo;
26 27 28
static int show_modified;
static int show_killed;
static int show_valid_bit;
29
static int line_terminator = '\n';
30
static int debug_mode;
31
static int show_eol;
32
static int recurse_submodules;
33

34
static const char *prefix;
35
static const char *super_prefix;
36
static int max_prefix_len;
37
static int prefix_len;
38
static struct pathspec pathspec;
39 40
static int error_unmatch;
static char *ps_matched;
41
static const char *with_tree;
42
static int exc_given;
43
static int exclude_args;
44

45 46 47 48
static const char *tag_cached = "";
static const char *tag_unmerged = "";
static const char *tag_removed = "";
static const char *tag_other = "";
49
static const char *tag_killed = "";
50
static const char *tag_modified = "";
51
static const char *tag_skip_worktree = "";
J
Junio C Hamano 已提交
52
static const char *tag_resolve_undo = "";
53

54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70
static void write_eolinfo(const struct cache_entry *ce, const char *path)
{
	if (!show_eol)
		return;
	else {
		struct stat st;
		const char *i_txt = "";
		const char *w_txt = "";
		const char *a_txt = get_convert_attr_ascii(path);
		if (ce && S_ISREG(ce->ce_mode))
			i_txt = get_cached_convert_stats_ascii(ce->name);
		if (!lstat(path, &st) && S_ISREG(st.st_mode))
			w_txt = get_wt_convert_stats_ascii(path);
		printf("i/%-5s w/%-5s attr/%-17s\t", i_txt, w_txt, a_txt);
	}
}

71
static void write_name(const char *name)
72
{
73 74 75 76 77 78 79 80 81 82 83
	/*
	 * Prepend the super_prefix to name to construct the full_name to be
	 * written.
	 */
	struct strbuf full_name = STRBUF_INIT;
	if (super_prefix) {
		strbuf_addstr(&full_name, super_prefix);
		strbuf_addstr(&full_name, name);
		name = full_name.buf;
	}

84
	/*
85 86
	 * With "--full-name", prefix_len=0; this caller needs to pass
	 * an empty string in that case (a NULL is good for "").
87
	 */
88 89
	write_name_quoted_relative(name, prefix_len ? prefix : NULL,
				   stdout, line_terminator);
90 91

	strbuf_release(&full_name);
92 93
}

94
static void show_dir_entry(const char *tag, struct dir_entry *ent)
95
{
96
	int len = max_prefix_len;
97 98

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

101
	if (!dir_path_match(ent, &pathspec, len, ps_matched))
102 103
		return;

104
	fputs(tag, stdout);
105
	write_eolinfo(NULL, ent->name);
106
	write_name(ent->name);
107 108
}

109
static void show_other_files(struct dir_struct *dir)
110 111
{
	int i;
112

113 114
	for (i = 0; i < dir->nr; i++) {
		struct dir_entry *ent = dir->entries[i];
115 116
		if (!cache_name_is_other(ent->name, ent->len))
			continue;
117 118 119 120
		show_dir_entry(tag_other, ent);
	}
}

121
static void show_killed_files(struct dir_struct *dir)
122 123
{
	int i;
124 125
	for (i = 0; i < dir->nr; i++) {
		struct dir_entry *ent = dir->entries[i];
126 127 128 129 130 131 132 133 134 135 136
		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)
137 138
					die("BUG: killed-file %.*s not found",
						ent->len, ent->name);
139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166
				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)
167
			show_dir_entry(tag_killed, dir->entries[i]);
168
	}
169 170
}

171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191
/**
 * Recursively call ls-files on a submodule
 */
static void show_gitlink(const struct cache_entry *ce)
{
	struct child_process cp = CHILD_PROCESS_INIT;
	int status;

	argv_array_pushf(&cp.args, "--super-prefix=%s%s/",
			 super_prefix ? super_prefix : "",
			 ce->name);
	argv_array_push(&cp.args, "ls-files");
	argv_array_push(&cp.args, "--recurse-submodules");

	cp.git_cmd = 1;
	cp.dir = ce->name;
	status = run_command(&cp);
	if (status)
		exit(status);
}

192
static void show_ce_entry(const char *tag, const struct cache_entry *ce)
193
{
194
	struct strbuf name = STRBUF_INIT;
195
	int len = max_prefix_len;
196 197 198
	if (super_prefix)
		strbuf_addstr(&name, super_prefix);
	strbuf_addstr(&name, ce->name);
199 200

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

203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224
	if (recurse_submodules && S_ISGITLINK(ce->ce_mode)) {
		show_gitlink(ce);
	} else if (match_pathspec(&pathspec, name.buf, name.len,
				  len, ps_matched,
				  S_ISDIR(ce->ce_mode) ||
				  S_ISGITLINK(ce->ce_mode))) {
		if (tag && *tag && show_valid_bit &&
		    (ce->ce_flags & CE_VALID)) {
			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;
		}
225

226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244
		if (!show_stage) {
			fputs(tag, stdout);
		} else {
			printf("%s%06o %s %d\t",
			       tag,
			       ce->ce_mode,
			       find_unique_abbrev(ce->sha1,abbrev),
			       ce_stage(ce));
		}
		write_eolinfo(ce, ce->name);
		write_name(ce->name);
		if (debug_mode) {
			const struct stat_data *sd = &ce->ce_stat_data;

			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);
245 246 247
		}
	}

248
	strbuf_release(&name);
249 250
}

251
static void show_ru_info(void)
J
Junio C Hamano 已提交
252
{
253 254
	struct string_list_item *item;

J
Junio C Hamano 已提交
255 256
	if (!the_index.resolve_undo)
		return;
257 258 259 260 261 262 263 264 265

	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 */
266
		if (!match_pathspec(&pathspec, path, len,
267
				    max_prefix_len, ps_matched, 0))
268 269 270 271 272 273 274
			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);
275
			write_name(path);
276 277
		}
	}
J
Junio C Hamano 已提交
278 279
}

280
static int ce_excluded(struct dir_struct *dir, const struct cache_entry *ce)
281 282
{
	int dtype = ce_to_dtype(ce);
283
	return is_excluded(dir, ce->name, &dtype);
284 285
}

286
static void show_files(struct dir_struct *dir)
287 288 289 290
{
	int i;

	/* For cached/deleted files we don't need to even do the readdir */
291
	if (show_others || show_killed) {
292 293
		if (!show_others)
			dir->flags |= DIR_COLLECT_KILLED_ONLY;
294
		fill_directory(dir, &pathspec);
295
		if (show_others)
296
			show_other_files(dir);
297
		if (show_killed)
298
			show_killed_files(dir);
299
	}
300
	if (show_cached || show_stage) {
301
		for (i = 0; i < active_nr; i++) {
302
			const struct cache_entry *ce = active_cache[i];
303
			if ((dir->flags & DIR_SHOW_IGNORED) &&
304
			    !ce_excluded(dir, ce))
J
Jeff King 已提交
305
				continue;
306 307
			if (show_unmerged && !ce_stage(ce))
				continue;
308
			if (ce->ce_flags & CE_UPDATE)
309
				continue;
310 311
			show_ce_entry(ce_stage(ce) ? tag_unmerged :
				(ce_skip_worktree(ce) ? tag_skip_worktree : tag_cached), ce);
312 313
		}
	}
314
	if (show_deleted || show_modified) {
315
		for (i = 0; i < active_nr; i++) {
316
			const struct cache_entry *ce = active_cache[i];
317
			struct stat st;
318
			int err;
319
			if ((dir->flags & DIR_SHOW_IGNORED) &&
320
			    !ce_excluded(dir, ce))
J
Jeff King 已提交
321
				continue;
322 323
			if (ce->ce_flags & CE_UPDATE)
				continue;
324 325
			if (ce_skip_worktree(ce))
				continue;
326 327 328
			err = lstat(ce->name, &st);
			if (show_deleted && err)
				show_ce_entry(tag_removed, ce);
329
			if (show_modified && ce_modified(ce, &st, 0))
330
				show_ce_entry(tag_modified, ce);
331 332 333 334 335 336 337
		}
	}
}

/*
 * Prune the index to only contain stuff starting with "prefix"
 */
338
static void prune_cache(const char *prefix)
339
{
340
	int pos = cache_name_pos(prefix, max_prefix_len);
341 342 343 344
	unsigned int first, last;

	if (pos < 0)
		pos = -pos-1;
345 346
	memmove(active_cache, active_cache + pos,
		(active_nr - pos) * sizeof(struct cache_entry *));
347 348 349 350 351
	active_nr -= pos;
	first = 0;
	last = active_nr;
	while (last > first) {
		int next = (last + first) >> 1;
352
		const struct cache_entry *ce = active_cache[next];
353
		if (!strncmp(ce->name, prefix, max_prefix_len)) {
354 355
			first = next+1;
			continue;
356
		}
357 358 359 360 361
		last = next;
	}
	active_nr = last;
}

362 363 364 365 366 367 368 369
/*
 * 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.
 */
370
void overlay_tree_on_cache(const char *tree_name, const char *prefix)
371 372 373
{
	struct tree *tree;
	unsigned char sha1[20];
374
	struct pathspec pathspec;
375 376 377 378 379 380 381 382 383 384 385 386 387 388
	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;
389
		ce->ce_flags |= CE_STAGEMASK;
390 391 392
	}

	if (prefix) {
393 394 395 396
		static const char *(matchbuf[1]);
		matchbuf[0] = NULL;
		parse_pathspec(&pathspec, PATHSPEC_ALL_MAGIC,
			       PATHSPEC_PREFER_CWD, prefix, matchbuf);
397
	} else
398
		memset(&pathspec, 0, sizeof(pathspec));
399
	if (read_tree(tree, 1, &pathspec))
400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417
		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))
418
				ce->ce_flags |= CE_UPDATE;
419 420 421 422
		}
	}
}

423
static const char * const ls_files_usage[] = {
424
	N_("git ls-files [<options>] [<file>...]"),
425 426 427 428 429 430
	NULL
};

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

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

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

461
int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)
462
{
463
	int require_work_tree = 0, show_tag = 0, i;
464
	const char *max_prefix;
465
	struct dir_struct dir;
466 467
	struct exclude_list *el;
	struct string_list exclude_list = STRING_LIST_INIT_NODUP;
468
	struct option builtin_ls_files_options[] = {
469 470 471
		/* Think twice before adding "--nul" synonym to this */
		OPT_SET_INT('z', NULL, &line_terminator,
			N_("paths are separated with NUL character"), '\0'),
472
		OPT_BOOL('t', NULL, &show_tag,
473
			N_("identify the file status with tags")),
474
		OPT_BOOL('v', NULL, &show_valid_bit,
475
			N_("use lowercase letters for 'assume unchanged' files")),
476
		OPT_BOOL('c', "cached", &show_cached,
477
			N_("show cached files in the output (default)")),
478
		OPT_BOOL('d', "deleted", &show_deleted,
479
			N_("show deleted files in the output")),
480
		OPT_BOOL('m', "modified", &show_modified,
481
			N_("show modified files in the output")),
482
		OPT_BOOL('o', "others", &show_others,
483
			N_("show other files in the output")),
484
		OPT_BIT('i', "ignored", &dir.flags,
485
			N_("show ignored files in the output"),
486
			DIR_SHOW_IGNORED),
487
		OPT_BOOL('s', "stage", &show_stage,
488
			N_("show staged contents' object name in the output")),
489
		OPT_BOOL('k', "killed", &show_killed,
490
			N_("show files on the filesystem that need to be removed")),
491
		OPT_BIT(0, "directory", &dir.flags,
A
Alex Henrie 已提交
492
			N_("show 'other' directories' names only"),
493
			DIR_SHOW_OTHER_DIRECTORIES),
494
		OPT_BOOL(0, "eol", &show_eol, N_("show line endings of files")),
J
Jeff King 已提交
495
		OPT_NEGBIT(0, "empty-directory", &dir.flags,
496
			N_("don't show empty directories"),
497
			DIR_HIDE_EMPTY_DIRECTORIES),
498
		OPT_BOOL('u', "unmerged", &show_unmerged,
499
			N_("show unmerged files in the output")),
500
		OPT_BOOL(0, "resolve-undo", &show_resolve_undo,
501
			    N_("show resolve-undo information")),
J
Junio C Hamano 已提交
502
		{ OPTION_CALLBACK, 'x', "exclude", &exclude_list, N_("pattern"),
503
			N_("skip files matching pattern"),
504
			0, option_parse_exclude },
505 506
		{ OPTION_CALLBACK, 'X', "exclude-from", &dir, N_("file"),
			N_("exclude patterns are read from <file>"),
507
			0, option_parse_exclude_from },
508 509
		OPT_STRING(0, "exclude-per-directory", &dir.exclude_per_dir, N_("file"),
			N_("read additional per-directory exclude patterns in <file>")),
510
		{ OPTION_CALLBACK, 0, "exclude-standard", &dir, NULL,
511
			N_("add the standard git exclusions"),
512
			PARSE_OPT_NOARG, option_parse_exclude_standard },
513
		{ OPTION_SET_INT, 0, "full-name", &prefix_len, NULL,
514
			N_("make the output relative to the project top directory"),
515
			PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL },
516 517
		OPT_BOOL(0, "recurse-submodules", &recurse_submodules,
			N_("recurse through submodules")),
518
		OPT_BOOL(0, "error-unmatch", &error_unmatch,
519 520 521
			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")),
522
		OPT__ABBREV(&abbrev),
523
		OPT_BOOL(0, "debug", &debug_mode, N_("show debugging data")),
524 525
		OPT_END()
	};
526

527 528 529
	if (argc == 2 && !strcmp(argv[1], "-h"))
		usage_with_options(ls_files_usage, builtin_ls_files_options);

530
	memset(&dir, 0, sizeof(dir));
531
	prefix = cmd_prefix;
532
	if (prefix)
533
		prefix_len = strlen(prefix);
534
	super_prefix = get_super_prefix();
535
	git_config(git_default_config, NULL);
536

537 538 539
	if (read_cache() < 0)
		die("index file corrupt");

540
	argc = parse_options(argc, argv, prefix, builtin_ls_files_options,
541
			ls_files_usage, 0);
542 543 544 545
	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);
	}
546 547 548 549 550 551 552
	if (show_tag || show_valid_bit) {
		tag_cached = "H ";
		tag_unmerged = "M ";
		tag_removed = "R ";
		tag_modified = "C ";
		tag_other = "? ";
		tag_killed = "K ";
553
		tag_skip_worktree = "S ";
J
Junio C Hamano 已提交
554
		tag_resolve_undo = "U ";
555
	}
556
	if (show_modified || show_others || show_deleted || (dir.flags & DIR_SHOW_IGNORED) || show_killed)
557 558 559 560 561 562 563 564 565
		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;
566

567 568
	if (require_work_tree && !is_inside_work_tree())
		setup_work_tree();
569

570 571 572 573 574 575 576 577 578 579 580 581 582 583
	if (recurse_submodules &&
	    (show_stage || show_deleted || show_others || show_unmerged ||
	     show_killed || show_modified || show_resolve_undo ||
	     show_valid_bit || show_tag || show_eol || with_tree ||
	     (line_terminator == '\0')))
		die("ls-files --recurse-submodules unsupported mode");

	if (recurse_submodules && error_unmatch)
		die("ls-files --recurse-submodules does not support "
		    "--error-unmatch");

	if (recurse_submodules && argc)
		die("ls-files --recurse-submodules does not support pathspec");

584 585 586 587
	parse_pathspec(&pathspec, 0,
		       PATHSPEC_PREFER_CWD |
		       PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAP,
		       prefix, argv);
588

589
	/* Find common prefix for all pathspec's */
590
	max_prefix = common_prefix(&pathspec);
591
	max_prefix_len = max_prefix ? strlen(max_prefix) : 0;
592

593
	/* Treat unmatching pathspec elements as errors */
594
	if (pathspec.nr && error_unmatch)
595
		ps_matched = xcalloc(pathspec.nr, 1);
596

597 598
	if ((dir.flags & DIR_SHOW_IGNORED) && !exc_given)
		die("ls-files --ignored needs some exclude pattern");
599 600

	/* With no flags, we default to showing the cached files */
601 602
	if (!(show_stage || show_deleted || show_others || show_unmerged ||
	      show_killed || show_modified || show_resolve_undo))
603 604
		show_cached = 1;

605 606
	if (max_prefix)
		prune_cache(max_prefix);
607 608 609 610 611 612 613
	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");
614
		overlay_tree_on_cache(with_tree, max_prefix);
615
	}
616
	show_files(&dir);
J
Junio C Hamano 已提交
617
	if (show_resolve_undo)
618
		show_ru_info();
619 620

	if (ps_matched) {
621
		int bad;
622
		bad = report_path_error(ps_matched, &pathspec, prefix);
623
		if (bad)
624 625
			fprintf(stderr, "Did you forget to 'git add'?\n");

626
		return bad ? 1 : 0;
627 628
	}

629 630
	return 0;
}