cache-tree.c 17.4 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++;

82
	FLEX_ALLOC_MEM(down, name, path, pathlen);
83
	down->cache_tree = NULL;
J
Junio C Hamano 已提交
84
	down->namelen = pathlen;
85 86 87 88 89 90

	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 已提交
91 92 93
	return down;
}

94 95 96 97 98 99
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);
}

100
static int do_invalidate_path(struct cache_tree *it, const char *path)
J
Junio C Hamano 已提交
101 102 103 104 105 106 107 108 109 110 111 112
{
	/* 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;

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

J
Junio C Hamano 已提交
117
	if (!it)
118
		return 0;
119 120
	slash = strchrnul(path, '/');
	namelen = slash - path;
J
Junio C Hamano 已提交
121
	it->entry_count = -1;
122
	if (!*slash) {
123 124 125 126 127
		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 已提交
128 129
			/* 0 1 2 3 4 5
			 *       ^     ^subtree_nr = 6
130
			 *       pos
J
Junio C Hamano 已提交
131
			 * move 4 and 5 up one place (2 entries)
132
			 * 2 = 6 - 3 - 1 = subtree_nr - pos - 1
J
Junio C Hamano 已提交
133
			 */
R
René Scharfe 已提交
134 135
			MOVE_ARRAY(it->down + pos, it->down + pos + 1,
				   it->subtree_nr - pos - 1);
J
Junio C Hamano 已提交
136 137
			it->subtree_nr--;
		}
138
		return 1;
J
Junio C Hamano 已提交
139 140 141
	}
	down = find_subtree(it, path, namelen, 0);
	if (down)
142 143 144 145 146 147 148 149
		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 已提交
150 151
}

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

	/* Verify that the tree is merged */
	funny = 0;
	for (i = 0; i < entries; i++) {
161
		const struct cache_entry *ce = cache[i];
162
		if (ce_stage(ce)) {
163 164
			if (silent)
				return -1;
J
Junio C Hamano 已提交
165 166 167 168
			if (10 < ++funny) {
				fprintf(stderr, "...\n");
				break;
			}
169
			fprintf(stderr, "%s: unmerged (%s)\n",
170
				ce->name, oid_to_hex(&ce->oid));
J
Junio C Hamano 已提交
171 172 173 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
		}
	}
	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 {
215
			cache_tree_free(&s->cache_tree);
J
Junio C Hamano 已提交
216 217 218 219 220 221
			free(s);
			it->subtree_nr--;
		}
	}
}

222 223 224 225 226
int cache_tree_fully_valid(struct cache_tree *it)
{
	int i;
	if (!it)
		return 0;
227
	if (it->entry_count < 0 || !has_sha1_file(it->oid.hash))
228 229 230 231 232 233 234 235
		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 已提交
236
static int update_one(struct cache_tree *it,
237
		      struct cache_entry **cache,
J
Junio C Hamano 已提交
238 239 240
		      int entries,
		      const char *base,
		      int baselen,
241
		      int *skip_count,
242
		      int flags)
J
Junio C Hamano 已提交
243
{
P
Pierre Habouzit 已提交
244
	struct strbuf buffer;
245 246
	int missing_ok = flags & WRITE_TREE_MISSING_OK;
	int dryrun = flags & WRITE_TREE_DRY_RUN;
247
	int repair = flags & WRITE_TREE_REPAIR;
248
	int to_invalidate = 0;
J
Junio C Hamano 已提交
249 250
	int i;

251 252
	assert(!(dryrun && repair));

253 254
	*skip_count = 0;

255
	if (0 <= it->entry_count && has_sha1_file(it->oid.hash))
J
Junio C Hamano 已提交
256 257 258 259 260 261 262 263 264 265 266 267 268
		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.
	 */
269 270
	i = 0;
	while (i < entries) {
271
		const struct cache_entry *ce = cache[i];
J
Junio C Hamano 已提交
272 273
		struct cache_tree_sub *sub;
		const char *path, *slash;
274
		int pathlen, sublen, subcnt, subskip;
J
Junio C Hamano 已提交
275 276 277 278 279 280 281

		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, '/');
282 283
		if (!slash) {
			i++;
J
Junio C Hamano 已提交
284
			continue;
285
		}
J
Junio C Hamano 已提交
286 287 288 289 290 291 292 293 294 295 296 297 298
		/*
		 * 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,
299
				    &subskip,
300
				    flags);
301 302
		if (subcnt < 0)
			return subcnt;
303 304
		if (!subcnt)
			die("index cache-tree records empty sub-tree");
305
		i += subcnt;
306 307
		sub->count = subcnt; /* to be used in the next loop */
		*skip_count += subskip;
J
Junio C Hamano 已提交
308 309 310 311 312 313 314 315
		sub->used = 1;
	}

	discard_unused_subtrees(it);

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

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

		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);
341
			i += sub->count;
342
			sha1 = sub->cache_tree->oid.hash;
J
Junio C Hamano 已提交
343
			mode = S_IFDIR;
344 345
			contains_ita = sub->cache_tree->entry_count < 0;
			if (contains_ita) {
346
				to_invalidate = 1;
347 348
				expected_missing = 1;
			}
J
Junio C Hamano 已提交
349 350
		}
		else {
351
			sha1 = ce->oid.hash;
352
			mode = ce->ce_mode;
J
Junio C Hamano 已提交
353
			entlen = pathlen - baselen;
354
			i++;
J
Junio C Hamano 已提交
355
		}
356 357 358

		if (is_null_sha1(sha1) ||
		    (mode != S_IFGITLINK && !missing_ok && !has_sha1_file(sha1))) {
359
			strbuf_release(&buffer);
360 361
			if (expected_missing)
				return -1;
362 363
			return error("invalid object %06o %s for '%.*s'",
				mode, sha1_to_hex(sha1), entlen+baselen, path);
364
		}
J
Junio C Hamano 已提交
365

366 367 368 369 370 371 372 373 374 375
		/*
		 * 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;
		}

376 377 378 379 380
		/*
		 * 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.
		 */
381
		if (!sub && ce_intent_to_add(ce)) {
382
			to_invalidate = 1;
383
			continue;
384
		}
J
Junio C Hamano 已提交
385

386 387 388 389 390 391
		/*
		 * "sub" can be an empty tree if all subentries are i-t-a.
		 */
		if (contains_ita && !hashcmp(sha1, EMPTY_TREE_SHA1_BIN))
			continue;

P
Pierre Habouzit 已提交
392 393 394
		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 已提交
395 396

#if DEBUG
397
		fprintf(stderr, "cache-tree update-one %o %.*s\n",
J
Junio C Hamano 已提交
398 399 400 401
			mode, entlen, path + baselen);
#endif
	}

402 403 404 405
	if (repair) {
		unsigned char sha1[20];
		hash_sha1_file(buffer.buf, buffer.len, tree_type, sha1);
		if (has_sha1_file(sha1))
406
			hashcpy(it->oid.hash, sha1);
407 408 409
		else
			to_invalidate = 1;
	} else if (dryrun)
410 411 412
		hash_sha1_file(buffer.buf, buffer.len, tree_type,
			       it->oid.hash);
	else if (write_sha1_file(buffer.buf, buffer.len, tree_type, it->oid.hash)) {
413 414 415 416
		strbuf_release(&buffer);
		return -1;
	}

P
Pierre Habouzit 已提交
417
	strbuf_release(&buffer);
418
	it->entry_count = to_invalidate ? -1 : i - *skip_count;
J
Junio C Hamano 已提交
419
#if DEBUG
420
	fprintf(stderr, "cache-tree update-one (%d ent, %d subtree) %s\n",
J
Junio C Hamano 已提交
421
		it->entry_count, it->subtree_nr,
422
		oid_to_hex(&it->oid));
J
Junio C Hamano 已提交
423 424 425 426
#endif
	return i;
}

427
int cache_tree_update(struct index_state *istate, int flags)
J
Junio C Hamano 已提交
428
{
429 430 431 432 433
	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 已提交
434 435
	if (i)
		return i;
436
	i = update_one(it, cache, entries, "", 0, &skip, flags);
J
Junio C Hamano 已提交
437 438
	if (i < 0)
		return i;
439
	istate->cache_changed |= CACHE_TREE_CHANGED;
J
Junio C Hamano 已提交
440 441 442
	return 0;
}

443 444
static void write_one(struct strbuf *buffer, struct cache_tree *it,
                      const char *path, int pathlen)
J
Junio C Hamano 已提交
445 446 447 448 449 450 451 452 453
{
	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 已提交
454 455 456
	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 已提交
457 458 459 460 461

#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,
462
			oid_to_hex(&it->oid));
J
Junio C Hamano 已提交
463 464 465 466 467 468
	else
		fprintf(stderr, "cache-tree <%.*s> (%d subtree) invalid\n",
			pathlen, path, it->subtree_nr);
#endif

	if (0 <= it->entry_count) {
469
		strbuf_add(buffer, it->oid.hash, 20);
J
Junio C Hamano 已提交
470 471 472
	}
	for (i = 0; i < it->subtree_nr; i++) {
		struct cache_tree_sub *down = it->down[i];
473 474 475 476 477 478
		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");
		}
479
		write_one(buffer, down->cache_tree, down->name, down->namelen);
J
Junio C Hamano 已提交
480 481 482
	}
}

483
void cache_tree_write(struct strbuf *sb, struct cache_tree *root)
J
Junio C Hamano 已提交
484
{
485
	write_one(sb, root, "", 0);
J
Junio C Hamano 已提交
486 487 488 489 490 491
}

static struct cache_tree *read_one(const char **buffer, unsigned long *size_p)
{
	const char *buf = *buffer;
	unsigned long size = *size_p;
492 493
	const char *cp;
	char *ep;
J
Junio C Hamano 已提交
494 495 496 497 498 499 500 501 502 503 504 505 506
	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();
507 508 509 510 511 512 513 514

	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 已提交
515 516 517 518 519 520 521 522 523 524 525
		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;
526
		hashcpy(it->oid.hash, (const unsigned char*)buf);
J
Junio C Hamano 已提交
527 528 529 530 531 532 533 534
		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,
535
			oid_to_hex(&it->oid));
J
Junio C Hamano 已提交
536 537 538 539 540 541 542 543 544 545 546 547 548 549 550
	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;
551
		struct cache_tree_sub *subtree;
J
Junio C Hamano 已提交
552
		const char *name = buf;
553

J
Junio C Hamano 已提交
554 555 556
		sub = read_one(&buf, &size);
		if (!sub)
			goto free_return;
557
		subtree = cache_tree_sub(it, name);
558
		subtree->cache_tree = sub;
J
Junio C Hamano 已提交
559 560 561 562 563 564 565 566
	}
	if (subtree_nr != it->subtree_nr)
		die("cache-tree: internal error");
	*buffer = buf;
	*size_p = size;
	return it;

 free_return:
567
	cache_tree_free(&it);
J
Junio C Hamano 已提交
568 569 570
	return NULL;
}

571
struct cache_tree *cache_tree_read(const char *buffer, unsigned long size)
J
Junio C Hamano 已提交
572
{
573
	if (buffer[0])
J
Junio C Hamano 已提交
574 575 576
		return NULL; /* not the whole tree */
	return read_one(&buffer, &size);
}
J
Junio C Hamano 已提交
577

578
static struct cache_tree *cache_tree_find(struct cache_tree *it, const char *path)
J
Junio C Hamano 已提交
579
{
580 581
	if (!it)
		return NULL;
J
Junio C Hamano 已提交
582 583 584 585
	while (*path) {
		const char *slash;
		struct cache_tree_sub *sub;

586
		slash = strchrnul(path, '/');
587 588 589
		/*
		 * Between path and slash is the name of the subtree
		 * to look for.
J
Junio C Hamano 已提交
590 591 592 593 594
		 */
		sub = find_subtree(it, path, slash - path, 0);
		if (!sub)
			return NULL;
		it = sub->cache_tree;
595

J
Junio C Hamano 已提交
596
		path = slash;
597 598
		while (*path == '/')
			path++;
J
Junio C Hamano 已提交
599 600 601
	}
	return it;
}
602

603
int write_index_as_tree(unsigned char *sha1, struct index_state *index_state, const char *index_path, int flags, const char *prefix)
604 605
{
	int entries, was_valid, newfd;
606
	struct lock_file lock_file = LOCK_INIT;
607
	int ret = 0;
608

609
	newfd = hold_lock_file_for_update(&lock_file, index_path, LOCK_DIE_ON_ERROR);
610

611
	entries = read_index_from(index_state, index_path);
612 613 614 615
	if (entries < 0) {
		ret = WRITE_TREE_UNREADABLE_INDEX;
		goto out;
	}
J
Junio C Hamano 已提交
616
	if (flags & WRITE_TREE_IGNORE_CACHE_TREE)
617
		cache_tree_free(&index_state->cache_tree);
618

619 620
	if (!index_state->cache_tree)
		index_state->cache_tree = cache_tree();
621

622
	was_valid = cache_tree_fully_valid(index_state->cache_tree);
623
	if (!was_valid) {
624 625 626 627
		if (cache_tree_update(index_state, flags) < 0) {
			ret = WRITE_TREE_UNMERGED_INDEX;
			goto out;
		}
628
		if (0 <= newfd) {
629
			if (!write_locked_index(index_state, &lock_file, COMMIT_LOCK))
630 631 632 633 634 635 636 637 638 639 640
				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) {
641 642
		struct cache_tree *subtree;
		subtree = cache_tree_find(index_state->cache_tree, prefix);
643 644 645 646
		if (!subtree) {
			ret = WRITE_TREE_PREFIX_ERROR;
			goto out;
		}
647
		hashcpy(sha1, subtree->oid.hash);
648 649
	}
	else
650
		hashcpy(sha1, index_state->cache_tree->oid.hash);
651

652
out:
653
	if (0 <= newfd)
654
		rollback_lock_file(&lock_file);
655
	return ret;
656
}
657

658 659 660 661 662
int write_cache_as_tree(unsigned char *sha1, int flags, const char *prefix)
{
	return write_index_as_tree(sha1, &the_index, get_index_file(), flags, prefix);
}

663 664 665 666 667 668
static void prime_cache_tree_rec(struct cache_tree *it, struct tree *tree)
{
	struct tree_desc desc;
	struct name_entry entry;
	int cnt;

669
	oidcpy(&it->oid, &tree->object.oid);
670 671 672 673 674 675 676
	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;
677
			struct tree *subtree = lookup_tree(entry.oid);
678 679 680 681 682 683 684 685 686 687 688
			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;
}

689
void prime_cache_tree(struct index_state *istate, struct tree *tree)
690
{
691 692 693 694
	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;
695
}
696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723

/*
 * 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);
724
	if (it && it->entry_count > 0 && !oidcmp(ent->oid, &it->oid))
725 726 727
		return it->entry_count;
	return 0;
}
728

729
int update_main_cache_tree(int flags)
730 731 732
{
	if (!the_index.cache_tree)
		the_index.cache_tree = cache_tree();
733
	return cache_tree_update(&the_index, flags);
734
}