cache-tree.c 16.9 KB
Newer Older
J
Junio C Hamano 已提交
1
#include "cache.h"
2
#include "lockfile.h"
J
Junio C Hamano 已提交
3
#include "tree.h"
4
#include "tree-walk.h"
J
Junio C Hamano 已提交
5 6
#include "cache-tree.h"

7
#ifndef DEBUG
J
Junio C Hamano 已提交
8
#define DEBUG 0
9
#endif
J
Junio C Hamano 已提交
10 11 12 13 14 15 16 17

struct cache_tree *cache_tree(void)
{
	struct cache_tree *it = xcalloc(1, sizeof(struct cache_tree));
	it->entry_count = -1;
	return it;
}

18
void cache_tree_free(struct cache_tree **it_p)
J
Junio C Hamano 已提交
19 20
{
	int i;
21
	struct cache_tree *it = *it_p;
J
Junio C Hamano 已提交
22 23 24 25

	if (!it)
		return;
	for (i = 0; i < it->subtree_nr; i++)
26
		if (it->down[i]) {
27
			cache_tree_free(&it->down[i]->cache_tree);
28 29
			free(it->down[i]);
		}
J
Junio C Hamano 已提交
30 31
	free(it->down);
	free(it);
32
	*it_p = NULL;
J
Junio C Hamano 已提交
33 34
}

35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65
static int subtree_name_cmp(const char *one, int onelen,
			    const char *two, int twolen)
{
	if (onelen < twolen)
		return -1;
	if (twolen < onelen)
		return 1;
	return memcmp(one, two, onelen);
}

static int subtree_pos(struct cache_tree *it, const char *path, int pathlen)
{
	struct cache_tree_sub **down = it->down;
	int lo, hi;
	lo = 0;
	hi = it->subtree_nr;
	while (lo < hi) {
		int mi = (lo + hi) / 2;
		struct cache_tree_sub *mdl = down[mi];
		int cmp = subtree_name_cmp(path, pathlen,
					   mdl->name, mdl->namelen);
		if (!cmp)
			return mi;
		if (cmp < 0)
			hi = mi;
		else
			lo = mi + 1;
	}
	return -lo-1;
}

J
Junio C Hamano 已提交
66 67 68 69 70 71
static struct cache_tree_sub *find_subtree(struct cache_tree *it,
					   const char *path,
					   int pathlen,
					   int create)
{
	struct cache_tree_sub *down;
72 73 74
	int pos = subtree_pos(it, path, pathlen);
	if (0 <= pos)
		return it->down[pos];
J
Junio C Hamano 已提交
75 76
	if (!create)
		return NULL;
77 78

	pos = -pos-1;
79
	ALLOC_GROW(it->down, it->subtree_nr + 1, it->subtree_alloc);
80 81
	it->subtree_nr++;

J
Junio C Hamano 已提交
82
	down = xmalloc(sizeof(*down) + pathlen + 1);
83
	down->cache_tree = NULL;
J
Junio C Hamano 已提交
84 85
	down->namelen = pathlen;
	memcpy(down->name, path, pathlen);
86 87 88 89 90 91 92
	down->name[pathlen] = 0;

	if (pos < it->subtree_nr)
		memmove(it->down + pos + 1,
			it->down + pos,
			sizeof(down) * (it->subtree_nr - pos - 1));
	it->down[pos] = down;
J
Junio C Hamano 已提交
93 94 95
	return down;
}

96 97 98 99 100 101
struct cache_tree_sub *cache_tree_sub(struct cache_tree *it, const char *path)
{
	int pathlen = strlen(path);
	return find_subtree(it, path, pathlen, 1);
}

102
static int do_invalidate_path(struct cache_tree *it, const char *path)
J
Junio C Hamano 已提交
103 104 105 106 107 108 109 110 111 112 113 114
{
	/* a/b/c
	 * ==> invalidate self
	 * ==> find "a", have it invalidate "b/c"
	 * a
	 * ==> invalidate self
	 * ==> if "a" exists as a subtree, remove it.
	 */
	const char *slash;
	int namelen;
	struct cache_tree_sub *down;

115 116 117 118
#if DEBUG
	fprintf(stderr, "cache-tree invalidate <%s>\n", path);
#endif

J
Junio C Hamano 已提交
119
	if (!it)
120
		return 0;
121 122
	slash = strchrnul(path, '/');
	namelen = slash - path;
J
Junio C Hamano 已提交
123
	it->entry_count = -1;
124
	if (!*slash) {
125 126 127 128 129
		int pos;
		pos = subtree_pos(it, path, namelen);
		if (0 <= pos) {
			cache_tree_free(&it->down[pos]->cache_tree);
			free(it->down[pos]);
J
Junio C Hamano 已提交
130 131
			/* 0 1 2 3 4 5
			 *       ^     ^subtree_nr = 6
132
			 *       pos
J
Junio C Hamano 已提交
133
			 * move 4 and 5 up one place (2 entries)
134
			 * 2 = 6 - 3 - 1 = subtree_nr - pos - 1
J
Junio C Hamano 已提交
135
			 */
136
			memmove(it->down+pos, it->down+pos+1,
J
Junio C Hamano 已提交
137
				sizeof(struct cache_tree_sub *) *
138
				(it->subtree_nr - pos - 1));
J
Junio C Hamano 已提交
139 140
			it->subtree_nr--;
		}
141
		return 1;
J
Junio C Hamano 已提交
142 143 144
	}
	down = find_subtree(it, path, namelen, 0);
	if (down)
145 146 147 148 149 150 151 152
		do_invalidate_path(down->cache_tree, slash + 1);
	return 1;
}

void cache_tree_invalidate_path(struct index_state *istate, const char *path)
{
	if (do_invalidate_path(istate->cache_tree, path))
		istate->cache_changed |= CACHE_TREE_CHANGED;
J
Junio C Hamano 已提交
153 154
}

155
static int verify_cache(struct cache_entry **cache,
156
			int entries, int flags)
J
Junio C Hamano 已提交
157 158
{
	int i, funny;
159
	int silent = flags & WRITE_TREE_SILENT;
J
Junio C Hamano 已提交
160 161 162 163

	/* Verify that the tree is merged */
	funny = 0;
	for (i = 0; i < entries; i++) {
164
		const struct cache_entry *ce = cache[i];
165
		if (ce_stage(ce)) {
166 167
			if (silent)
				return -1;
J
Junio C Hamano 已提交
168 169 170 171
			if (10 < ++funny) {
				fprintf(stderr, "...\n");
				break;
			}
172 173
			fprintf(stderr, "%s: unmerged (%s)\n",
				ce->name, sha1_to_hex(ce->sha1));
J
Junio C Hamano 已提交
174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217
		}
	}
	if (funny)
		return -1;

	/* Also verify that the cache does not have path and path/file
	 * at the same time.  At this point we know the cache has only
	 * stage 0 entries.
	 */
	funny = 0;
	for (i = 0; i < entries - 1; i++) {
		/* path/file always comes after path because of the way
		 * the cache is sorted.  Also path can appear only once,
		 * which means conflicting one would immediately follow.
		 */
		const char *this_name = cache[i]->name;
		const char *next_name = cache[i+1]->name;
		int this_len = strlen(this_name);
		if (this_len < strlen(next_name) &&
		    strncmp(this_name, next_name, this_len) == 0 &&
		    next_name[this_len] == '/') {
			if (10 < ++funny) {
				fprintf(stderr, "...\n");
				break;
			}
			fprintf(stderr, "You have both %s and %s\n",
				this_name, next_name);
		}
	}
	if (funny)
		return -1;
	return 0;
}

static void discard_unused_subtrees(struct cache_tree *it)
{
	struct cache_tree_sub **down = it->down;
	int nr = it->subtree_nr;
	int dst, src;
	for (dst = src = 0; src < nr; src++) {
		struct cache_tree_sub *s = down[src];
		if (s->used)
			down[dst++] = s;
		else {
218
			cache_tree_free(&s->cache_tree);
J
Junio C Hamano 已提交
219 220 221 222 223 224
			free(s);
			it->subtree_nr--;
		}
	}
}

225 226 227 228 229 230 231 232 233 234 235 236 237 238
int cache_tree_fully_valid(struct cache_tree *it)
{
	int i;
	if (!it)
		return 0;
	if (it->entry_count < 0 || !has_sha1_file(it->sha1))
		return 0;
	for (i = 0; i < it->subtree_nr; i++) {
		if (!cache_tree_fully_valid(it->down[i]->cache_tree))
			return 0;
	}
	return 1;
}

J
Junio C Hamano 已提交
239
static int update_one(struct cache_tree *it,
240
		      struct cache_entry **cache,
J
Junio C Hamano 已提交
241 242 243
		      int entries,
		      const char *base,
		      int baselen,
244
		      int *skip_count,
245
		      int flags)
J
Junio C Hamano 已提交
246
{
P
Pierre Habouzit 已提交
247
	struct strbuf buffer;
248 249
	int missing_ok = flags & WRITE_TREE_MISSING_OK;
	int dryrun = flags & WRITE_TREE_DRY_RUN;
250
	int repair = flags & WRITE_TREE_REPAIR;
251
	int to_invalidate = 0;
J
Junio C Hamano 已提交
252 253
	int i;

254 255
	assert(!(dryrun && repair));

256 257
	*skip_count = 0;

258
	if (0 <= it->entry_count && has_sha1_file(it->sha1))
J
Junio C Hamano 已提交
259 260 261 262 263 264 265 266 267 268 269 270 271
		return it->entry_count;

	/*
	 * We first scan for subtrees and update them; we start by
	 * marking existing subtrees -- the ones that are unmarked
	 * should not be in the result.
	 */
	for (i = 0; i < it->subtree_nr; i++)
		it->down[i]->used = 0;

	/*
	 * Find the subtrees and update them.
	 */
272 273
	i = 0;
	while (i < entries) {
274
		const struct cache_entry *ce = cache[i];
J
Junio C Hamano 已提交
275 276
		struct cache_tree_sub *sub;
		const char *path, *slash;
277
		int pathlen, sublen, subcnt, subskip;
J
Junio C Hamano 已提交
278 279 280 281 282 283 284

		path = ce->name;
		pathlen = ce_namelen(ce);
		if (pathlen <= baselen || memcmp(base, path, baselen))
			break; /* at the end of this level */

		slash = strchr(path + baselen, '/');
285 286
		if (!slash) {
			i++;
J
Junio C Hamano 已提交
287
			continue;
288
		}
J
Junio C Hamano 已提交
289 290 291 292 293 294 295 296 297 298 299 300 301
		/*
		 * a/bbb/c (base = a/, slash = /c)
		 * ==>
		 * path+baselen = bbb/c, sublen = 3
		 */
		sublen = slash - (path + baselen);
		sub = find_subtree(it, path + baselen, sublen, 1);
		if (!sub->cache_tree)
			sub->cache_tree = cache_tree();
		subcnt = update_one(sub->cache_tree,
				    cache + i, entries - i,
				    path,
				    baselen + sublen + 1,
302
				    &subskip,
303
				    flags);
304 305
		if (subcnt < 0)
			return subcnt;
306 307
		if (!subcnt)
			die("index cache-tree records empty sub-tree");
308
		i += subcnt;
309 310
		sub->count = subcnt; /* to be used in the next loop */
		*skip_count += subskip;
J
Junio C Hamano 已提交
311 312 313 314 315 316 317 318
		sub->used = 1;
	}

	discard_unused_subtrees(it);

	/*
	 * Then write out the tree object for this level.
	 */
319
	strbuf_init(&buffer, 8192);
J
Junio C Hamano 已提交
320

321 322
	i = 0;
	while (i < entries) {
323
		const struct cache_entry *ce = cache[i];
J
Junio C Hamano 已提交
324 325 326 327 328
		struct cache_tree_sub *sub;
		const char *path, *slash;
		int pathlen, entlen;
		const unsigned char *sha1;
		unsigned mode;
329
		int expected_missing = 0;
J
Junio C Hamano 已提交
330 331 332 333 334 335 336 337 338 339 340 341 342

		path = ce->name;
		pathlen = ce_namelen(ce);
		if (pathlen <= baselen || memcmp(base, path, baselen))
			break; /* at the end of this level */

		slash = strchr(path + baselen, '/');
		if (slash) {
			entlen = slash - (path + baselen);
			sub = find_subtree(it, path + baselen, entlen, 0);
			if (!sub)
				die("cache-tree.c: '%.*s' in '%s' not found",
				    entlen, path + baselen, path);
343
			i += sub->count;
J
Junio C Hamano 已提交
344 345
			sha1 = sub->cache_tree->sha1;
			mode = S_IFDIR;
346
			if (sub->cache_tree->entry_count < 0) {
347
				to_invalidate = 1;
348 349
				expected_missing = 1;
			}
J
Junio C Hamano 已提交
350 351 352
		}
		else {
			sha1 = ce->sha1;
353
			mode = ce->ce_mode;
J
Junio C Hamano 已提交
354
			entlen = pathlen - baselen;
355
			i++;
J
Junio C Hamano 已提交
356
		}
357 358
		if (mode != S_IFGITLINK && !missing_ok && !has_sha1_file(sha1)) {
			strbuf_release(&buffer);
359 360
			if (expected_missing)
				return -1;
361 362
			return error("invalid object %06o %s for '%.*s'",
				mode, sha1_to_hex(sha1), entlen+baselen, path);
363
		}
J
Junio C Hamano 已提交
364

365 366 367 368 369 370 371 372 373 374
		/*
		 * CE_REMOVE entries are removed before the index is
		 * written to disk. Skip them to remain consistent
		 * with the future on-disk index.
		 */
		if (ce->ce_flags & CE_REMOVE) {
			*skip_count = *skip_count + 1;
			continue;
		}

375 376 377 378 379 380 381
		/*
		 * CE_INTENT_TO_ADD entries exist on on-disk index but
		 * they are not part of generated trees. Invalidate up
		 * to root to force cache-tree users to read elsewhere.
		 */
		if (ce->ce_flags & CE_INTENT_TO_ADD) {
			to_invalidate = 1;
382
			continue;
383
		}
J
Junio C Hamano 已提交
384

P
Pierre Habouzit 已提交
385 386 387
		strbuf_grow(&buffer, entlen + 100);
		strbuf_addf(&buffer, "%o %.*s%c", mode, entlen, path + baselen, '\0');
		strbuf_add(&buffer, sha1, 20);
J
Junio C Hamano 已提交
388 389

#if DEBUG
390
		fprintf(stderr, "cache-tree update-one %o %.*s\n",
J
Junio C Hamano 已提交
391 392 393 394
			mode, entlen, path + baselen);
#endif
	}

395 396 397 398 399 400 401 402
	if (repair) {
		unsigned char sha1[20];
		hash_sha1_file(buffer.buf, buffer.len, tree_type, sha1);
		if (has_sha1_file(sha1))
			hashcpy(it->sha1, sha1);
		else
			to_invalidate = 1;
	} else if (dryrun)
P
Pierre Habouzit 已提交
403
		hash_sha1_file(buffer.buf, buffer.len, tree_type, it->sha1);
404 405 406 407 408
	else if (write_sha1_file(buffer.buf, buffer.len, tree_type, it->sha1)) {
		strbuf_release(&buffer);
		return -1;
	}

P
Pierre Habouzit 已提交
409
	strbuf_release(&buffer);
410
	it->entry_count = to_invalidate ? -1 : i - *skip_count;
J
Junio C Hamano 已提交
411
#if DEBUG
412
	fprintf(stderr, "cache-tree update-one (%d ent, %d subtree) %s\n",
J
Junio C Hamano 已提交
413 414 415 416 417 418
		it->entry_count, it->subtree_nr,
		sha1_to_hex(it->sha1));
#endif
	return i;
}

419
int cache_tree_update(struct index_state *istate, int flags)
J
Junio C Hamano 已提交
420
{
421 422 423 424 425
	struct cache_tree *it = istate->cache_tree;
	struct cache_entry **cache = istate->cache;
	int entries = istate->cache_nr;
	int skip, i = verify_cache(cache, entries, flags);

J
Junio C Hamano 已提交
426 427
	if (i)
		return i;
428
	i = update_one(it, cache, entries, "", 0, &skip, flags);
J
Junio C Hamano 已提交
429 430
	if (i < 0)
		return i;
431
	istate->cache_changed |= CACHE_TREE_CHANGED;
J
Junio C Hamano 已提交
432 433 434
	return 0;
}

435 436
static void write_one(struct strbuf *buffer, struct cache_tree *it,
                      const char *path, int pathlen)
J
Junio C Hamano 已提交
437 438 439 440 441 442 443 444 445
{
	int i;

	/* One "cache-tree" entry consists of the following:
	 * path (NUL terminated)
	 * entry_count, subtree_nr ("%d %d\n")
	 * tree-sha1 (missing if invalid)
	 * subtree_nr "cache-tree" entries for subtrees.
	 */
P
Pierre Habouzit 已提交
446 447 448
	strbuf_grow(buffer, pathlen + 100);
	strbuf_add(buffer, path, pathlen);
	strbuf_addf(buffer, "%c%d %d\n", 0, it->entry_count, it->subtree_nr);
J
Junio C Hamano 已提交
449 450 451 452 453 454 455 456 457 458 459 460

#if DEBUG
	if (0 <= it->entry_count)
		fprintf(stderr, "cache-tree <%.*s> (%d ent, %d subtree) %s\n",
			pathlen, path, it->entry_count, it->subtree_nr,
			sha1_to_hex(it->sha1));
	else
		fprintf(stderr, "cache-tree <%.*s> (%d subtree) invalid\n",
			pathlen, path, it->subtree_nr);
#endif

	if (0 <= it->entry_count) {
P
Pierre Habouzit 已提交
461
		strbuf_add(buffer, it->sha1, 20);
J
Junio C Hamano 已提交
462 463 464
	}
	for (i = 0; i < it->subtree_nr; i++) {
		struct cache_tree_sub *down = it->down[i];
465 466 467 468 469 470
		if (i) {
			struct cache_tree_sub *prev = it->down[i-1];
			if (subtree_name_cmp(down->name, down->namelen,
					     prev->name, prev->namelen) <= 0)
				die("fatal - unsorted cache subtree");
		}
471
		write_one(buffer, down->cache_tree, down->name, down->namelen);
J
Junio C Hamano 已提交
472 473 474
	}
}

475
void cache_tree_write(struct strbuf *sb, struct cache_tree *root)
J
Junio C Hamano 已提交
476
{
477
	write_one(sb, root, "", 0);
J
Junio C Hamano 已提交
478 479 480 481 482 483
}

static struct cache_tree *read_one(const char **buffer, unsigned long *size_p)
{
	const char *buf = *buffer;
	unsigned long size = *size_p;
484 485
	const char *cp;
	char *ep;
J
Junio C Hamano 已提交
486 487 488 489 490 491 492 493 494 495 496 497 498
	struct cache_tree *it;
	int i, subtree_nr;

	it = NULL;
	/* skip name, but make sure name exists */
	while (size && *buf) {
		size--;
		buf++;
	}
	if (!size)
		goto free_return;
	buf++; size--;
	it = cache_tree();
499 500 501 502 503 504 505 506

	cp = buf;
	it->entry_count = strtol(cp, &ep, 10);
	if (cp == ep)
		goto free_return;
	cp = ep;
	subtree_nr = strtol(cp, &ep, 10);
	if (cp == ep)
J
Junio C Hamano 已提交
507 508 509 510 511 512 513 514 515 516 517
		goto free_return;
	while (size && *buf && *buf != '\n') {
		size--;
		buf++;
	}
	if (!size)
		goto free_return;
	buf++; size--;
	if (0 <= it->entry_count) {
		if (size < 20)
			goto free_return;
J
Junio C Hamano 已提交
518
		hashcpy(it->sha1, (const unsigned char*)buf);
J
Junio C Hamano 已提交
519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542
		buf += 20;
		size -= 20;
	}

#if DEBUG
	if (0 <= it->entry_count)
		fprintf(stderr, "cache-tree <%s> (%d ent, %d subtree) %s\n",
			*buffer, it->entry_count, subtree_nr,
			sha1_to_hex(it->sha1));
	else
		fprintf(stderr, "cache-tree <%s> (%d subtrees) invalid\n",
			*buffer, subtree_nr);
#endif

	/*
	 * Just a heuristic -- we do not add directories that often but
	 * we do not want to have to extend it immediately when we do,
	 * hence +2.
	 */
	it->subtree_alloc = subtree_nr + 2;
	it->down = xcalloc(it->subtree_alloc, sizeof(struct cache_tree_sub *));
	for (i = 0; i < subtree_nr; i++) {
		/* read each subtree */
		struct cache_tree *sub;
543
		struct cache_tree_sub *subtree;
J
Junio C Hamano 已提交
544
		const char *name = buf;
545

J
Junio C Hamano 已提交
546 547 548
		sub = read_one(&buf, &size);
		if (!sub)
			goto free_return;
549
		subtree = cache_tree_sub(it, name);
550
		subtree->cache_tree = sub;
J
Junio C Hamano 已提交
551 552 553 554 555 556 557 558
	}
	if (subtree_nr != it->subtree_nr)
		die("cache-tree: internal error");
	*buffer = buf;
	*size_p = size;
	return it;

 free_return:
559
	cache_tree_free(&it);
J
Junio C Hamano 已提交
560 561 562
	return NULL;
}

563
struct cache_tree *cache_tree_read(const char *buffer, unsigned long size)
J
Junio C Hamano 已提交
564
{
565
	if (buffer[0])
J
Junio C Hamano 已提交
566 567 568
		return NULL; /* not the whole tree */
	return read_one(&buffer, &size);
}
J
Junio C Hamano 已提交
569

570
static struct cache_tree *cache_tree_find(struct cache_tree *it, const char *path)
J
Junio C Hamano 已提交
571
{
572 573
	if (!it)
		return NULL;
J
Junio C Hamano 已提交
574 575 576 577
	while (*path) {
		const char *slash;
		struct cache_tree_sub *sub;

578
		slash = strchrnul(path, '/');
579 580 581
		/*
		 * Between path and slash is the name of the subtree
		 * to look for.
J
Junio C Hamano 已提交
582 583 584 585 586
		 */
		sub = find_subtree(it, path, slash - path, 0);
		if (!sub)
			return NULL;
		it = sub->cache_tree;
587

J
Junio C Hamano 已提交
588
		path = slash;
589 590
		while (*path == '/')
			path++;
J
Junio C Hamano 已提交
591 592 593
	}
	return it;
}
594

J
Junio C Hamano 已提交
595
int write_cache_as_tree(unsigned char *sha1, int flags, const char *prefix)
596 597
{
	int entries, was_valid, newfd;
J
Junio C Hamano 已提交
598
	struct lock_file *lock_file;
599 600 601 602 603

	/*
	 * We can't free this memory, it becomes part of a linked list
	 * parsed atexit()
	 */
J
Junio C Hamano 已提交
604
	lock_file = xcalloc(1, sizeof(struct lock_file));
605 606 607 608 609 610

	newfd = hold_locked_index(lock_file, 1);

	entries = read_cache();
	if (entries < 0)
		return WRITE_TREE_UNREADABLE_INDEX;
J
Junio C Hamano 已提交
611 612
	if (flags & WRITE_TREE_IGNORE_CACHE_TREE)
		cache_tree_free(&(active_cache_tree));
613 614 615 616 617 618

	if (!active_cache_tree)
		active_cache_tree = cache_tree();

	was_valid = cache_tree_fully_valid(active_cache_tree);
	if (!was_valid) {
619
		if (cache_tree_update(&the_index, flags) < 0)
620 621
			return WRITE_TREE_UNMERGED_INDEX;
		if (0 <= newfd) {
622
			if (!write_locked_index(&the_index, lock_file, COMMIT_LOCK))
623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647
				newfd = -1;
		}
		/* Not being able to write is fine -- we are only interested
		 * in updating the cache-tree part, and if the next caller
		 * ends up using the old index with unupdated cache-tree part
		 * it misses the work we did here, but that is just a
		 * performance penalty and not a big deal.
		 */
	}

	if (prefix) {
		struct cache_tree *subtree =
			cache_tree_find(active_cache_tree, prefix);
		if (!subtree)
			return WRITE_TREE_PREFIX_ERROR;
		hashcpy(sha1, subtree->sha1);
	}
	else
		hashcpy(sha1, active_cache_tree->sha1);

	if (0 <= newfd)
		rollback_lock_file(lock_file);

	return 0;
}
648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674

static void prime_cache_tree_rec(struct cache_tree *it, struct tree *tree)
{
	struct tree_desc desc;
	struct name_entry entry;
	int cnt;

	hashcpy(it->sha1, tree->object.sha1);
	init_tree_desc(&desc, tree->buffer, tree->size);
	cnt = 0;
	while (tree_entry(&desc, &entry)) {
		if (!S_ISDIR(entry.mode))
			cnt++;
		else {
			struct cache_tree_sub *sub;
			struct tree *subtree = lookup_tree(entry.sha1);
			if (!subtree->object.parsed)
				parse_tree(subtree);
			sub = cache_tree_sub(it, entry.path);
			sub->cache_tree = cache_tree();
			prime_cache_tree_rec(sub->cache_tree, subtree);
			cnt += sub->cache_tree->entry_count;
		}
	}
	it->entry_count = cnt;
}

675
void prime_cache_tree(struct index_state *istate, struct tree *tree)
676
{
677 678 679 680
	cache_tree_free(&istate->cache_tree);
	istate->cache_tree = cache_tree();
	prime_cache_tree_rec(istate->cache_tree, tree);
	istate->cache_changed |= CACHE_TREE_CHANGED;
681
}
682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713

/*
 * find the cache_tree that corresponds to the current level without
 * exploding the full path into textual form.  The root of the
 * cache tree is given as "root", and our current level is "info".
 * (1) When at root level, info->prev is NULL, so it is "root" itself.
 * (2) Otherwise, find the cache_tree that corresponds to one level
 *     above us, and find ourselves in there.
 */
static struct cache_tree *find_cache_tree_from_traversal(struct cache_tree *root,
							 struct traverse_info *info)
{
	struct cache_tree *our_parent;

	if (!info->prev)
		return root;
	our_parent = find_cache_tree_from_traversal(root, info->prev);
	return cache_tree_find(our_parent, info->name.path);
}

int cache_tree_matches_traversal(struct cache_tree *root,
				 struct name_entry *ent,
				 struct traverse_info *info)
{
	struct cache_tree *it;

	it = find_cache_tree_from_traversal(root, info);
	it = cache_tree_find(it, ent->path);
	if (it && it->entry_count > 0 && !hashcmp(ent->sha1, it->sha1))
		return it->entry_count;
	return 0;
}
714

715
int update_main_cache_tree(int flags)
716 717 718
{
	if (!the_index.cache_tree)
		the_index.cache_tree = cache_tree();
719
	return cache_tree_update(&the_index, flags);
720
}