ls-files.c 15.3 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
static int show_eol;
31

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

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

51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67
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);
	}
}

68
static void write_name(const char *name)
69
{
70
	/*
71 72
	 * With "--full-name", prefix_len=0; this caller needs to pass
	 * an empty string in that case (a NULL is good for "").
73
	 */
74 75
	write_name_quoted_relative(name, prefix_len ? prefix : NULL,
				   stdout, line_terminator);
76 77
}

78
static void show_dir_entry(const char *tag, struct dir_entry *ent)
79
{
80
	int len = max_prefix_len;
81 82

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

85
	if (!dir_path_match(ent, &pathspec, len, ps_matched))
86 87
		return;

88
	fputs(tag, stdout);
89
	write_eolinfo(NULL, ent->name);
90
	write_name(ent->name);
91 92
}

93
static void show_other_files(struct dir_struct *dir)
94 95
{
	int i;
96

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

105
static void show_killed_files(struct dir_struct *dir)
106 107
{
	int i;
108 109
	for (i = 0; i < dir->nr; i++) {
		struct dir_entry *ent = dir->entries[i];
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 147 148 149
		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)
150
			show_dir_entry(tag_killed, dir->entries[i]);
151
	}
152 153
}

154
static void show_ce_entry(const char *tag, const struct cache_entry *ce)
155
{
156
	int len = max_prefix_len;
157 158

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

161
	if (!match_pathspec(&pathspec, ce->name, ce_namelen(ce),
162 163
			    len, ps_matched,
			    S_ISDIR(ce->ce_mode) || S_ISGITLINK(ce->ce_mode)))
164 165
		return;

166
	if (tag && *tag && show_valid_bit &&
167
	    (ce->ce_flags & CE_VALID)) {
168 169 170 171 172 173 174 175 176 177 178 179 180 181 182
		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;
	}

183 184
	if (!show_stage) {
		fputs(tag, stdout);
185
	} else {
186
		printf("%s%06o %s %d\t",
187
		       tag,
188
		       ce->ce_mode,
E
Erik Faye-Lund 已提交
189
		       find_unique_abbrev(ce->sha1,abbrev),
190 191
		       ce_stage(ce));
	}
192
	write_eolinfo(ce, ce->name);
193
	write_name(ce->name);
194
	if (debug_mode) {
195
		const struct stat_data *sd = &ce->ce_stat_data;
196 197 198 199 200 201

		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);
202
	}
203 204
}

205
static void show_ru_info(void)
J
Junio C Hamano 已提交
206
{
207 208
	struct string_list_item *item;

J
Junio C Hamano 已提交
209 210
	if (!the_index.resolve_undo)
		return;
211 212 213 214 215 216 217 218 219

	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 */
220
		if (!match_pathspec(&pathspec, path, len,
221
				    max_prefix_len, ps_matched, 0))
222 223 224 225 226 227 228
			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);
229
			write_name(path);
230 231
		}
	}
J
Junio C Hamano 已提交
232 233
}

234
static int ce_excluded(struct dir_struct *dir, const struct cache_entry *ce)
235 236
{
	int dtype = ce_to_dtype(ce);
237
	return is_excluded(dir, ce->name, &dtype);
238 239
}

240
static void show_files(struct dir_struct *dir)
241 242 243 244
{
	int i;

	/* For cached/deleted files we don't need to even do the readdir */
245
	if (show_others || show_killed) {
246 247
		if (!show_others)
			dir->flags |= DIR_COLLECT_KILLED_ONLY;
248
		fill_directory(dir, &pathspec);
249
		if (show_others)
250
			show_other_files(dir);
251
		if (show_killed)
252
			show_killed_files(dir);
253
	}
254
	if (show_cached || show_stage) {
255
		for (i = 0; i < active_nr; i++) {
256
			const struct cache_entry *ce = active_cache[i];
257
			if ((dir->flags & DIR_SHOW_IGNORED) &&
258
			    !ce_excluded(dir, ce))
J
Jeff King 已提交
259
				continue;
260 261
			if (show_unmerged && !ce_stage(ce))
				continue;
262
			if (ce->ce_flags & CE_UPDATE)
263
				continue;
264 265
			show_ce_entry(ce_stage(ce) ? tag_unmerged :
				(ce_skip_worktree(ce) ? tag_skip_worktree : tag_cached), ce);
266 267
		}
	}
268
	if (show_deleted || show_modified) {
269
		for (i = 0; i < active_nr; i++) {
270
			const struct cache_entry *ce = active_cache[i];
271
			struct stat st;
272
			int err;
273
			if ((dir->flags & DIR_SHOW_IGNORED) &&
274
			    !ce_excluded(dir, ce))
J
Jeff King 已提交
275
				continue;
276 277
			if (ce->ce_flags & CE_UPDATE)
				continue;
278 279
			if (ce_skip_worktree(ce))
				continue;
280 281 282
			err = lstat(ce->name, &st);
			if (show_deleted && err)
				show_ce_entry(tag_removed, ce);
283
			if (show_modified && ce_modified(ce, &st, 0))
284
				show_ce_entry(tag_modified, ce);
285 286 287 288 289 290 291
		}
	}
}

/*
 * Prune the index to only contain stuff starting with "prefix"
 */
292
static void prune_cache(const char *prefix)
293
{
294
	int pos = cache_name_pos(prefix, max_prefix_len);
295 296 297 298
	unsigned int first, last;

	if (pos < 0)
		pos = -pos-1;
299 300
	memmove(active_cache, active_cache + pos,
		(active_nr - pos) * sizeof(struct cache_entry *));
301 302 303 304 305
	active_nr -= pos;
	first = 0;
	last = active_nr;
	while (last > first) {
		int next = (last + first) >> 1;
306
		const struct cache_entry *ce = active_cache[next];
307
		if (!strncmp(ce->name, prefix, max_prefix_len)) {
308 309
			first = next+1;
			continue;
310
		}
311 312 313 314 315
		last = next;
	}
	active_nr = last;
}

316 317 318 319 320 321 322 323
/*
 * 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.
 */
324
void overlay_tree_on_cache(const char *tree_name, const char *prefix)
325 326 327
{
	struct tree *tree;
	unsigned char sha1[20];
328
	struct pathspec pathspec;
329 330 331 332 333 334 335 336 337 338 339 340 341 342
	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;
343
		ce->ce_flags |= CE_STAGEMASK;
344 345 346
	}

	if (prefix) {
347 348 349 350
		static const char *(matchbuf[1]);
		matchbuf[0] = NULL;
		parse_pathspec(&pathspec, PATHSPEC_ALL_MAGIC,
			       PATHSPEC_PREFER_CWD, prefix, matchbuf);
351
	} else
352
		memset(&pathspec, 0, sizeof(pathspec));
353
	if (read_tree(tree, 1, &pathspec))
354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371
		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))
372
				ce->ce_flags |= CE_UPDATE;
373 374 375 376
		}
	}
}

377
static const char * const ls_files_usage[] = {
378
	N_("git ls-files [<options>] [<file>...]"),
379 380 381 382 383 384
	NULL
};

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

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

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

415
int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)
416
{
417
	int require_work_tree = 0, show_tag = 0, i;
418
	const char *max_prefix;
419
	struct dir_struct dir;
420 421
	struct exclude_list *el;
	struct string_list exclude_list = STRING_LIST_INIT_NODUP;
422
	struct option builtin_ls_files_options[] = {
423 424 425
		/* Think twice before adding "--nul" synonym to this */
		OPT_SET_INT('z', NULL, &line_terminator,
			N_("paths are separated with NUL character"), '\0'),
426
		OPT_BOOL('t', NULL, &show_tag,
427
			N_("identify the file status with tags")),
428
		OPT_BOOL('v', NULL, &show_valid_bit,
429
			N_("use lowercase letters for 'assume unchanged' files")),
430
		OPT_BOOL('c', "cached", &show_cached,
431
			N_("show cached files in the output (default)")),
432
		OPT_BOOL('d', "deleted", &show_deleted,
433
			N_("show deleted files in the output")),
434
		OPT_BOOL('m', "modified", &show_modified,
435
			N_("show modified files in the output")),
436
		OPT_BOOL('o', "others", &show_others,
437
			N_("show other files in the output")),
438
		OPT_BIT('i', "ignored", &dir.flags,
439
			N_("show ignored files in the output"),
440
			DIR_SHOW_IGNORED),
441
		OPT_BOOL('s', "stage", &show_stage,
442
			N_("show staged contents' object name in the output")),
443
		OPT_BOOL('k', "killed", &show_killed,
444
			N_("show files on the filesystem that need to be removed")),
445
		OPT_BIT(0, "directory", &dir.flags,
A
Alex Henrie 已提交
446
			N_("show 'other' directories' names only"),
447
			DIR_SHOW_OTHER_DIRECTORIES),
448
		OPT_BOOL(0, "eol", &show_eol, N_("show line endings of files")),
J
Jeff King 已提交
449
		OPT_NEGBIT(0, "empty-directory", &dir.flags,
450
			N_("don't show empty directories"),
451
			DIR_HIDE_EMPTY_DIRECTORIES),
452
		OPT_BOOL('u', "unmerged", &show_unmerged,
453
			N_("show unmerged files in the output")),
454
		OPT_BOOL(0, "resolve-undo", &show_resolve_undo,
455
			    N_("show resolve-undo information")),
J
Junio C Hamano 已提交
456
		{ OPTION_CALLBACK, 'x', "exclude", &exclude_list, N_("pattern"),
457
			N_("skip files matching pattern"),
458
			0, option_parse_exclude },
459 460
		{ OPTION_CALLBACK, 'X', "exclude-from", &dir, N_("file"),
			N_("exclude patterns are read from <file>"),
461
			0, option_parse_exclude_from },
462 463
		OPT_STRING(0, "exclude-per-directory", &dir.exclude_per_dir, N_("file"),
			N_("read additional per-directory exclude patterns in <file>")),
464
		{ OPTION_CALLBACK, 0, "exclude-standard", &dir, NULL,
465
			N_("add the standard git exclusions"),
466
			PARSE_OPT_NOARG, option_parse_exclude_standard },
467
		{ OPTION_SET_INT, 0, "full-name", &prefix_len, NULL,
468
			N_("make the output relative to the project top directory"),
469
			PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL },
470
		OPT_BOOL(0, "error-unmatch", &error_unmatch,
471 472 473
			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")),
474
		OPT__ABBREV(&abbrev),
475
		OPT_BOOL(0, "debug", &debug_mode, N_("show debugging data")),
476 477
		OPT_END()
	};
478

479 480 481
	if (argc == 2 && !strcmp(argv[1], "-h"))
		usage_with_options(ls_files_usage, builtin_ls_files_options);

482
	memset(&dir, 0, sizeof(dir));
483
	prefix = cmd_prefix;
484
	if (prefix)
485
		prefix_len = strlen(prefix);
486
	git_config(git_default_config, NULL);
487

488 489 490
	if (read_cache() < 0)
		die("index file corrupt");

491
	argc = parse_options(argc, argv, prefix, builtin_ls_files_options,
492
			ls_files_usage, 0);
493 494 495 496
	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);
	}
497 498 499 500 501 502 503
	if (show_tag || show_valid_bit) {
		tag_cached = "H ";
		tag_unmerged = "M ";
		tag_removed = "R ";
		tag_modified = "C ";
		tag_other = "? ";
		tag_killed = "K ";
504
		tag_skip_worktree = "S ";
J
Junio C Hamano 已提交
505
		tag_resolve_undo = "U ";
506
	}
507
	if (show_modified || show_others || show_deleted || (dir.flags & DIR_SHOW_IGNORED) || show_killed)
508 509 510 511 512 513 514 515 516
		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;
517

518 519
	if (require_work_tree && !is_inside_work_tree())
		setup_work_tree();
520

521 522 523 524
	parse_pathspec(&pathspec, 0,
		       PATHSPEC_PREFER_CWD |
		       PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAP,
		       prefix, argv);
525

526
	/* Find common prefix for all pathspec's */
527
	max_prefix = common_prefix(&pathspec);
528
	max_prefix_len = max_prefix ? strlen(max_prefix) : 0;
529

530
	/* Treat unmatching pathspec elements as errors */
531
	if (pathspec.nr && error_unmatch)
532
		ps_matched = xcalloc(pathspec.nr, 1);
533

534 535
	if ((dir.flags & DIR_SHOW_IGNORED) && !exc_given)
		die("ls-files --ignored needs some exclude pattern");
536 537

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

542 543
	if (max_prefix)
		prune_cache(max_prefix);
544 545 546 547 548 549 550
	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");
551
		overlay_tree_on_cache(with_tree, max_prefix);
552
	}
553
	show_files(&dir);
J
Junio C Hamano 已提交
554
	if (show_resolve_undo)
555
		show_ru_info();
556 557

	if (ps_matched) {
558
		int bad;
559
		bad = report_path_error(ps_matched, &pathspec, prefix);
560
		if (bad)
561 562
			fprintf(stderr, "Did you forget to 'git add'?\n");

563
		return bad ? 1 : 0;
564 565
	}

566 567
	return 0;
}