]> git.ipfire.org Git - thirdparty/git.git/blame - cache-tree.c
merge-recursive: fix the fix to the diff3 common ancestor label
[thirdparty/git.git] / cache-tree.c
CommitLineData
74986462 1#include "cache.h"
697cc8ef 2#include "lockfile.h"
74986462 3#include "tree.h"
b9d37a54 4#include "tree-walk.h"
74986462 5#include "cache-tree.h"
cbd53a21 6#include "object-store.h"
4592e608 7#include "replace-object.h"
74986462 8
e9b9cc56
JH
9#ifndef DEBUG_CACHE_TREE
10#define DEBUG_CACHE_TREE 0
4903161f 11#endif
74986462
JH
12
13struct cache_tree *cache_tree(void)
14{
15 struct cache_tree *it = xcalloc(1, sizeof(struct cache_tree));
16 it->entry_count = -1;
17 return it;
18}
19
bad68ec9 20void cache_tree_free(struct cache_tree **it_p)
74986462
JH
21{
22 int i;
bad68ec9 23 struct cache_tree *it = *it_p;
74986462
JH
24
25 if (!it)
26 return;
27 for (i = 0; i < it->subtree_nr; i++)
e92fa514 28 if (it->down[i]) {
61fa3097 29 cache_tree_free(&it->down[i]->cache_tree);
e92fa514
EN
30 free(it->down[i]);
31 }
74986462
JH
32 free(it->down);
33 free(it);
bad68ec9 34 *it_p = NULL;
74986462
JH
35}
36
61fa3097
JH
37static int subtree_name_cmp(const char *one, int onelen,
38 const char *two, int twolen)
39{
40 if (onelen < twolen)
41 return -1;
42 if (twolen < onelen)
43 return 1;
44 return memcmp(one, two, onelen);
45}
46
47static int subtree_pos(struct cache_tree *it, const char *path, int pathlen)
48{
49 struct cache_tree_sub **down = it->down;
50 int lo, hi;
51 lo = 0;
52 hi = it->subtree_nr;
53 while (lo < hi) {
19716b21 54 int mi = lo + (hi - lo) / 2;
61fa3097
JH
55 struct cache_tree_sub *mdl = down[mi];
56 int cmp = subtree_name_cmp(path, pathlen,
57 mdl->name, mdl->namelen);
58 if (!cmp)
59 return mi;
60 if (cmp < 0)
61 hi = mi;
62 else
63 lo = mi + 1;
64 }
65 return -lo-1;
66}
67
74986462
JH
68static struct cache_tree_sub *find_subtree(struct cache_tree *it,
69 const char *path,
70 int pathlen,
71 int create)
72{
74986462 73 struct cache_tree_sub *down;
61fa3097
JH
74 int pos = subtree_pos(it, path, pathlen);
75 if (0 <= pos)
76 return it->down[pos];
74986462
JH
77 if (!create)
78 return NULL;
61fa3097
JH
79
80 pos = -pos-1;
bcc7a032 81 ALLOC_GROW(it->down, it->subtree_nr + 1, it->subtree_alloc);
61fa3097
JH
82 it->subtree_nr++;
83
96ffc06f 84 FLEX_ALLOC_MEM(down, name, path, pathlen);
61fa3097 85 down->cache_tree = NULL;
74986462 86 down->namelen = pathlen;
61fa3097
JH
87
88 if (pos < it->subtree_nr)
f919ffeb
SG
89 MOVE_ARRAY(it->down + pos + 1, it->down + pos,
90 it->subtree_nr - pos - 1);
61fa3097 91 it->down[pos] = down;
74986462
JH
92 return down;
93}
94
7927a55d
JH
95struct cache_tree_sub *cache_tree_sub(struct cache_tree *it, const char *path)
96{
97 int pathlen = strlen(path);
98 return find_subtree(it, path, pathlen, 1);
99}
100
a5400efe 101static int do_invalidate_path(struct cache_tree *it, const char *path)
74986462
JH
102{
103 /* a/b/c
104 * ==> invalidate self
105 * ==> find "a", have it invalidate "b/c"
106 * a
107 * ==> invalidate self
108 * ==> if "a" exists as a subtree, remove it.
109 */
110 const char *slash;
111 int namelen;
112 struct cache_tree_sub *down;
113
e9b9cc56 114#if DEBUG_CACHE_TREE
00703e6d
JH
115 fprintf(stderr, "cache-tree invalidate <%s>\n", path);
116#endif
117
74986462 118 if (!it)
a5400efe 119 return 0;
2c5495f7
RM
120 slash = strchrnul(path, '/');
121 namelen = slash - path;
74986462 122 it->entry_count = -1;
2c5495f7 123 if (!*slash) {
61fa3097 124 int pos;
61fa3097
JH
125 pos = subtree_pos(it, path, namelen);
126 if (0 <= pos) {
127 cache_tree_free(&it->down[pos]->cache_tree);
128 free(it->down[pos]);
74986462
JH
129 /* 0 1 2 3 4 5
130 * ^ ^subtree_nr = 6
61fa3097 131 * pos
74986462 132 * move 4 and 5 up one place (2 entries)
61fa3097 133 * 2 = 6 - 3 - 1 = subtree_nr - pos - 1
74986462 134 */
f331ab9d
RS
135 MOVE_ARRAY(it->down + pos, it->down + pos + 1,
136 it->subtree_nr - pos - 1);
74986462
JH
137 it->subtree_nr--;
138 }
a5400efe 139 return 1;
74986462 140 }
74986462
JH
141 down = find_subtree(it, path, namelen, 0);
142 if (down)
a5400efe
NTND
143 do_invalidate_path(down->cache_tree, slash + 1);
144 return 1;
145}
146
147void cache_tree_invalidate_path(struct index_state *istate, const char *path)
148{
149 if (do_invalidate_path(istate->cache_tree, path))
150 istate->cache_changed |= CACHE_TREE_CHANGED;
74986462
JH
151}
152
d0cfc3e8 153static int verify_cache(struct cache_entry **cache,
e859c69b 154 int entries, int flags)
74986462
JH
155{
156 int i, funny;
e859c69b 157 int silent = flags & WRITE_TREE_SILENT;
74986462
JH
158
159 /* Verify that the tree is merged */
160 funny = 0;
161 for (i = 0; i < entries; i++) {
9c5e6c80 162 const struct cache_entry *ce = cache[i];
3f6d56de 163 if (ce_stage(ce)) {
996277c5
TR
164 if (silent)
165 return -1;
74986462
JH
166 if (10 < ++funny) {
167 fprintf(stderr, "...\n");
168 break;
169 }
dbc3904e 170 fprintf(stderr, "%s: unmerged (%s)\n",
99d1a986 171 ce->name, oid_to_hex(&ce->oid));
74986462
JH
172 }
173 }
174 if (funny)
175 return -1;
176
177 /* Also verify that the cache does not have path and path/file
178 * at the same time. At this point we know the cache has only
179 * stage 0 entries.
180 */
181 funny = 0;
182 for (i = 0; i < entries - 1; i++) {
183 /* path/file always comes after path because of the way
184 * the cache is sorted. Also path can appear only once,
185 * which means conflicting one would immediately follow.
186 */
187 const char *this_name = cache[i]->name;
188 const char *next_name = cache[i+1]->name;
189 int this_len = strlen(this_name);
190 if (this_len < strlen(next_name) &&
191 strncmp(this_name, next_name, this_len) == 0 &&
192 next_name[this_len] == '/') {
193 if (10 < ++funny) {
194 fprintf(stderr, "...\n");
195 break;
196 }
197 fprintf(stderr, "You have both %s and %s\n",
198 this_name, next_name);
199 }
200 }
201 if (funny)
202 return -1;
203 return 0;
204}
205
206static void discard_unused_subtrees(struct cache_tree *it)
207{
208 struct cache_tree_sub **down = it->down;
209 int nr = it->subtree_nr;
210 int dst, src;
211 for (dst = src = 0; src < nr; src++) {
212 struct cache_tree_sub *s = down[src];
213 if (s->used)
214 down[dst++] = s;
215 else {
bad68ec9 216 cache_tree_free(&s->cache_tree);
74986462
JH
217 free(s);
218 it->subtree_nr--;
219 }
220 }
221}
222
bad68ec9
JH
223int cache_tree_fully_valid(struct cache_tree *it)
224{
225 int i;
226 if (!it)
227 return 0;
98374a07 228 if (it->entry_count < 0 || !has_object_file(&it->oid))
bad68ec9
JH
229 return 0;
230 for (i = 0; i < it->subtree_nr; i++) {
231 if (!cache_tree_fully_valid(it->down[i]->cache_tree))
232 return 0;
233 }
234 return 1;
235}
236
74986462 237static int update_one(struct cache_tree *it,
d0cfc3e8 238 struct cache_entry **cache,
74986462
JH
239 int entries,
240 const char *base,
241 int baselen,
3cf773e4 242 int *skip_count,
e859c69b 243 int flags)
74986462 244{
5242bcbb 245 struct strbuf buffer;
e859c69b
NTND
246 int missing_ok = flags & WRITE_TREE_MISSING_OK;
247 int dryrun = flags & WRITE_TREE_DRY_RUN;
aecf567c 248 int repair = flags & WRITE_TREE_REPAIR;
eec3e7e4 249 int to_invalidate = 0;
74986462
JH
250 int i;
251
aecf567c
DT
252 assert(!(dryrun && repair));
253
3cf773e4
NTND
254 *skip_count = 0;
255
98374a07 256 if (0 <= it->entry_count && has_object_file(&it->oid))
74986462
JH
257 return it->entry_count;
258
259 /*
260 * We first scan for subtrees and update them; we start by
261 * marking existing subtrees -- the ones that are unmarked
262 * should not be in the result.
263 */
264 for (i = 0; i < it->subtree_nr; i++)
265 it->down[i]->used = 0;
266
267 /*
268 * Find the subtrees and update them.
269 */
386cc8b0
NTND
270 i = 0;
271 while (i < entries) {
9c5e6c80 272 const struct cache_entry *ce = cache[i];
74986462
JH
273 struct cache_tree_sub *sub;
274 const char *path, *slash;
3cf773e4 275 int pathlen, sublen, subcnt, subskip;
74986462
JH
276
277 path = ce->name;
278 pathlen = ce_namelen(ce);
279 if (pathlen <= baselen || memcmp(base, path, baselen))
280 break; /* at the end of this level */
281
282 slash = strchr(path + baselen, '/');
386cc8b0
NTND
283 if (!slash) {
284 i++;
74986462 285 continue;
386cc8b0 286 }
74986462
JH
287 /*
288 * a/bbb/c (base = a/, slash = /c)
289 * ==>
290 * path+baselen = bbb/c, sublen = 3
291 */
292 sublen = slash - (path + baselen);
293 sub = find_subtree(it, path + baselen, sublen, 1);
294 if (!sub->cache_tree)
295 sub->cache_tree = cache_tree();
296 subcnt = update_one(sub->cache_tree,
297 cache + i, entries - i,
298 path,
299 baselen + sublen + 1,
3cf773e4 300 &subskip,
e859c69b 301 flags);
3d12d0cf
JS
302 if (subcnt < 0)
303 return subcnt;
729dbbd9
JK
304 if (!subcnt)
305 die("index cache-tree records empty sub-tree");
386cc8b0 306 i += subcnt;
3cf773e4
NTND
307 sub->count = subcnt; /* to be used in the next loop */
308 *skip_count += subskip;
74986462
JH
309 sub->used = 1;
310 }
311
312 discard_unused_subtrees(it);
313
314 /*
315 * Then write out the tree object for this level.
316 */
f1696ee3 317 strbuf_init(&buffer, 8192);
74986462 318
386cc8b0
NTND
319 i = 0;
320 while (i < entries) {
9c5e6c80 321 const struct cache_entry *ce = cache[i];
c041d54a 322 struct cache_tree_sub *sub = NULL;
74986462
JH
323 const char *path, *slash;
324 int pathlen, entlen;
6dcb4625 325 const struct object_id *oid;
74986462 326 unsigned mode;
4ed115e9 327 int expected_missing = 0;
6d6a782f 328 int contains_ita = 0;
2f215ff1 329 int ce_missing_ok;
74986462
JH
330
331 path = ce->name;
332 pathlen = ce_namelen(ce);
333 if (pathlen <= baselen || memcmp(base, path, baselen))
334 break; /* at the end of this level */
335
336 slash = strchr(path + baselen, '/');
337 if (slash) {
338 entlen = slash - (path + baselen);
339 sub = find_subtree(it, path + baselen, entlen, 0);
340 if (!sub)
341 die("cache-tree.c: '%.*s' in '%s' not found",
342 entlen, path + baselen, path);
3cf773e4 343 i += sub->count;
6dcb4625 344 oid = &sub->cache_tree->oid;
74986462 345 mode = S_IFDIR;
6d6a782f
NTND
346 contains_ita = sub->cache_tree->entry_count < 0;
347 if (contains_ita) {
eec3e7e4 348 to_invalidate = 1;
4ed115e9
JH
349 expected_missing = 1;
350 }
74986462
JH
351 }
352 else {
6dcb4625 353 oid = &ce->oid;
7a51ed66 354 mode = ce->ce_mode;
74986462 355 entlen = pathlen - baselen;
386cc8b0 356 i++;
74986462 357 }
a96d3cc3 358
2f215ff1
JT
359 ce_missing_ok = mode == S_IFGITLINK || missing_ok ||
360 (repository_format_partial_clone &&
361 ce_skip_worktree(ce));
6dcb4625 362 if (is_null_oid(oid) ||
2f215ff1 363 (!ce_missing_ok && !has_object_file(oid))) {
b6b56ace 364 strbuf_release(&buffer);
4ed115e9
JH
365 if (expected_missing)
366 return -1;
a3883734 367 return error("invalid object %06o %s for '%.*s'",
6dcb4625 368 mode, oid_to_hex(oid), entlen+baselen, path);
b6b56ace 369 }
74986462 370
3cf773e4
NTND
371 /*
372 * CE_REMOVE entries are removed before the index is
373 * written to disk. Skip them to remain consistent
374 * with the future on-disk index.
375 */
376 if (ce->ce_flags & CE_REMOVE) {
377 *skip_count = *skip_count + 1;
378 continue;
379 }
380
eec3e7e4
NTND
381 /*
382 * CE_INTENT_TO_ADD entries exist on on-disk index but
383 * they are not part of generated trees. Invalidate up
384 * to root to force cache-tree users to read elsewhere.
385 */
c041d54a 386 if (!sub && ce_intent_to_add(ce)) {
eec3e7e4 387 to_invalidate = 1;
3cf773e4 388 continue;
eec3e7e4 389 }
74986462 390
6d6a782f
NTND
391 /*
392 * "sub" can be an empty tree if all subentries are i-t-a.
393 */
a0554934 394 if (contains_ita && is_empty_tree_oid(oid))
6d6a782f
NTND
395 continue;
396
5242bcbb
PH
397 strbuf_grow(&buffer, entlen + 100);
398 strbuf_addf(&buffer, "%o %.*s%c", mode, entlen, path + baselen, '\0');
6dcb4625 399 strbuf_add(&buffer, oid->hash, the_hash_algo->rawsz);
74986462 400
e9b9cc56 401#if DEBUG_CACHE_TREE
00703e6d 402 fprintf(stderr, "cache-tree update-one %o %.*s\n",
74986462
JH
403 mode, entlen, path + baselen);
404#endif
405 }
406
aecf567c 407 if (repair) {
f070facc
PO
408 struct object_id oid;
409 hash_object_file(buffer.buf, buffer.len, tree_type, &oid);
6dcb4625 410 if (has_object_file(&oid))
f070facc 411 oidcpy(&it->oid, &oid);
aecf567c
DT
412 else
413 to_invalidate = 1;
a09c985e 414 } else if (dryrun) {
f070facc 415 hash_object_file(buffer.buf, buffer.len, tree_type, &it->oid);
a09c985e
PO
416 } else if (write_object_file(buffer.buf, buffer.len, tree_type,
417 &it->oid)) {
edae5f0c
JH
418 strbuf_release(&buffer);
419 return -1;
420 }
421
5242bcbb 422 strbuf_release(&buffer);
eec3e7e4 423 it->entry_count = to_invalidate ? -1 : i - *skip_count;
e9b9cc56 424#if DEBUG_CACHE_TREE
00703e6d 425 fprintf(stderr, "cache-tree update-one (%d ent, %d subtree) %s\n",
74986462 426 it->entry_count, it->subtree_nr,
e0a92804 427 oid_to_hex(&it->oid));
74986462
JH
428#endif
429 return i;
430}
431
d0cfc3e8 432int cache_tree_update(struct index_state *istate, int flags)
74986462 433{
d0cfc3e8
NTND
434 struct cache_tree *it = istate->cache_tree;
435 struct cache_entry **cache = istate->cache;
436 int entries = istate->cache_nr;
437 int skip, i = verify_cache(cache, entries, flags);
438
74986462
JH
439 if (i)
440 return i;
0d1ed596 441 trace_performance_enter();
3cf773e4 442 i = update_one(it, cache, entries, "", 0, &skip, flags);
0d1ed596 443 trace_performance_leave("cache_tree_update");
74986462
JH
444 if (i < 0)
445 return i;
d0cfc3e8 446 istate->cache_changed |= CACHE_TREE_CHANGED;
74986462
JH
447 return 0;
448}
449
1dffb8fa 450static void write_one(struct strbuf *buffer, struct cache_tree *it,
ec36c42a 451 const char *path, int pathlen)
74986462
JH
452{
453 int i;
454
455 /* One "cache-tree" entry consists of the following:
456 * path (NUL terminated)
457 * entry_count, subtree_nr ("%d %d\n")
458 * tree-sha1 (missing if invalid)
459 * subtree_nr "cache-tree" entries for subtrees.
460 */
5242bcbb
PH
461 strbuf_grow(buffer, pathlen + 100);
462 strbuf_add(buffer, path, pathlen);
463 strbuf_addf(buffer, "%c%d %d\n", 0, it->entry_count, it->subtree_nr);
74986462 464
e9b9cc56 465#if DEBUG_CACHE_TREE
74986462
JH
466 if (0 <= it->entry_count)
467 fprintf(stderr, "cache-tree <%.*s> (%d ent, %d subtree) %s\n",
468 pathlen, path, it->entry_count, it->subtree_nr,
e0a92804 469 oid_to_hex(&it->oid));
74986462
JH
470 else
471 fprintf(stderr, "cache-tree <%.*s> (%d subtree) invalid\n",
472 pathlen, path, it->subtree_nr);
473#endif
474
475 if (0 <= it->entry_count) {
6dcb4625 476 strbuf_add(buffer, it->oid.hash, the_hash_algo->rawsz);
74986462
JH
477 }
478 for (i = 0; i < it->subtree_nr; i++) {
479 struct cache_tree_sub *down = it->down[i];
61fa3097
JH
480 if (i) {
481 struct cache_tree_sub *prev = it->down[i-1];
482 if (subtree_name_cmp(down->name, down->namelen,
483 prev->name, prev->namelen) <= 0)
484 die("fatal - unsorted cache subtree");
485 }
1dffb8fa 486 write_one(buffer, down->cache_tree, down->name, down->namelen);
74986462 487 }
74986462
JH
488}
489
1dffb8fa 490void cache_tree_write(struct strbuf *sb, struct cache_tree *root)
74986462 491{
1dffb8fa 492 write_one(sb, root, "", 0);
74986462
JH
493}
494
495static struct cache_tree *read_one(const char **buffer, unsigned long *size_p)
496{
497 const char *buf = *buffer;
498 unsigned long size = *size_p;
0111ea38
JS
499 const char *cp;
500 char *ep;
74986462
JH
501 struct cache_tree *it;
502 int i, subtree_nr;
6dcb4625 503 const unsigned rawsz = the_hash_algo->rawsz;
74986462
JH
504
505 it = NULL;
506 /* skip name, but make sure name exists */
507 while (size && *buf) {
508 size--;
509 buf++;
510 }
511 if (!size)
512 goto free_return;
513 buf++; size--;
514 it = cache_tree();
0111ea38
JS
515
516 cp = buf;
517 it->entry_count = strtol(cp, &ep, 10);
518 if (cp == ep)
519 goto free_return;
520 cp = ep;
521 subtree_nr = strtol(cp, &ep, 10);
522 if (cp == ep)
74986462
JH
523 goto free_return;
524 while (size && *buf && *buf != '\n') {
525 size--;
526 buf++;
527 }
528 if (!size)
529 goto free_return;
530 buf++; size--;
531 if (0 <= it->entry_count) {
6dcb4625 532 if (size < rawsz)
74986462 533 goto free_return;
69d12425 534 oidread(&it->oid, (const unsigned char *)buf);
6dcb4625 535 buf += rawsz;
536 size -= rawsz;
74986462
JH
537 }
538
e9b9cc56 539#if DEBUG_CACHE_TREE
74986462
JH
540 if (0 <= it->entry_count)
541 fprintf(stderr, "cache-tree <%s> (%d ent, %d subtree) %s\n",
542 *buffer, it->entry_count, subtree_nr,
e0a92804 543 oid_to_hex(&it->oid));
74986462
JH
544 else
545 fprintf(stderr, "cache-tree <%s> (%d subtrees) invalid\n",
546 *buffer, subtree_nr);
547#endif
548
549 /*
550 * Just a heuristic -- we do not add directories that often but
551 * we do not want to have to extend it immediately when we do,
552 * hence +2.
553 */
554 it->subtree_alloc = subtree_nr + 2;
555 it->down = xcalloc(it->subtree_alloc, sizeof(struct cache_tree_sub *));
556 for (i = 0; i < subtree_nr; i++) {
557 /* read each subtree */
558 struct cache_tree *sub;
61fa3097 559 struct cache_tree_sub *subtree;
74986462 560 const char *name = buf;
7927a55d 561
74986462
JH
562 sub = read_one(&buf, &size);
563 if (!sub)
564 goto free_return;
7927a55d 565 subtree = cache_tree_sub(it, name);
61fa3097 566 subtree->cache_tree = sub;
74986462
JH
567 }
568 if (subtree_nr != it->subtree_nr)
569 die("cache-tree: internal error");
570 *buffer = buf;
571 *size_p = size;
572 return it;
573
574 free_return:
bad68ec9 575 cache_tree_free(&it);
74986462
JH
576 return NULL;
577}
578
bad68ec9 579struct cache_tree *cache_tree_read(const char *buffer, unsigned long size)
74986462 580{
bad68ec9 581 if (buffer[0])
74986462 582 return NULL; /* not the whole tree */
74986462
JH
583 return read_one(&buffer, &size);
584}
6bd20358 585
7ba04d9f 586static struct cache_tree *cache_tree_find(struct cache_tree *it, const char *path)
6bd20358 587{
b87fc964
JH
588 if (!it)
589 return NULL;
6bd20358
JH
590 while (*path) {
591 const char *slash;
592 struct cache_tree_sub *sub;
593
17e22ddc 594 slash = strchrnul(path, '/');
79192b87
MH
595 /*
596 * Between path and slash is the name of the subtree
597 * to look for.
6bd20358
JH
598 */
599 sub = find_subtree(it, path, slash - path, 0);
600 if (!sub)
601 return NULL;
602 it = sub->cache_tree;
3491047e 603
6bd20358 604 path = slash;
3491047e
MH
605 while (*path == '/')
606 path++;
6bd20358
JH
607 }
608 return it;
609}
45525bd0 610
724dd767
EN
611static int write_index_as_tree_internal(struct object_id *oid,
612 struct index_state *index_state,
613 int cache_tree_valid,
614 int flags,
615 const char *prefix)
616{
617 if (flags & WRITE_TREE_IGNORE_CACHE_TREE) {
618 cache_tree_free(&index_state->cache_tree);
619 cache_tree_valid = 0;
620 }
621
622 if (!index_state->cache_tree)
623 index_state->cache_tree = cache_tree();
624
625 if (!cache_tree_valid && cache_tree_update(index_state, flags) < 0)
626 return WRITE_TREE_UNMERGED_INDEX;
627
628 if (prefix) {
629 struct cache_tree *subtree;
630 subtree = cache_tree_find(index_state->cache_tree, prefix);
631 if (!subtree)
632 return WRITE_TREE_PREFIX_ERROR;
633 oidcpy(oid, &subtree->oid);
634 }
635 else
636 oidcpy(oid, &index_state->cache_tree->oid);
637
638 return 0;
639}
640
641struct tree* write_in_core_index_as_tree(struct repository *repo) {
642 struct object_id o;
643 int was_valid, ret;
644
645 struct index_state *index_state = repo->index;
646 was_valid = index_state->cache_tree &&
647 cache_tree_fully_valid(index_state->cache_tree);
648
649 ret = write_index_as_tree_internal(&o, index_state, was_valid, 0, NULL);
650 if (ret == WRITE_TREE_UNMERGED_INDEX) {
651 int i;
652 fprintf(stderr, "BUG: There are unmerged index entries:\n");
653 for (i = 0; i < index_state->cache_nr; i++) {
654 const struct cache_entry *ce = index_state->cache[i];
655 if (ce_stage(ce))
656 fprintf(stderr, "BUG: %d %.*s\n", ce_stage(ce),
657 (int)ce_namelen(ce), ce->name);
658 }
659 BUG("unmerged index entries when writing inmemory index");
660 }
661
662 return lookup_tree(repo, &index_state->cache_tree->oid);
663}
664
665
fc5cb99f 666int write_index_as_tree(struct object_id *oid, struct index_state *index_state, const char *index_path, int flags, const char *prefix)
45525bd0 667{
2954e5ec 668 int entries, was_valid;
bfffb48c 669 struct lock_file lock_file = LOCK_INIT;
724dd767 670 int ret;
45525bd0 671
2954e5ec 672 hold_lock_file_for_update(&lock_file, index_path, LOCK_DIE_ON_ERROR);
45525bd0 673
a125a223 674 entries = read_index_from(index_state, index_path, get_git_dir());
c82c75b9
JK
675 if (entries < 0) {
676 ret = WRITE_TREE_UNREADABLE_INDEX;
677 goto out;
678 }
45525bd0 679
724dd767
EN
680 was_valid = !(flags & WRITE_TREE_IGNORE_CACHE_TREE) &&
681 index_state->cache_tree &&
682 cache_tree_fully_valid(index_state->cache_tree);
45525bd0 683
724dd767
EN
684 ret = write_index_as_tree_internal(oid, index_state, was_valid, flags,
685 prefix);
686 if (!ret && !was_valid) {
2954e5ec 687 write_locked_index(index_state, &lock_file, COMMIT_LOCK);
45525bd0
JH
688 /* Not being able to write is fine -- we are only interested
689 * in updating the cache-tree part, and if the next caller
690 * ends up using the old index with unupdated cache-tree part
691 * it misses the work we did here, but that is just a
692 * performance penalty and not a big deal.
693 */
694 }
695
c82c75b9 696out:
2954e5ec 697 rollback_lock_file(&lock_file);
c82c75b9 698 return ret;
45525bd0 699}
b9d37a54 700
c207e9e1
NTND
701static void prime_cache_tree_rec(struct repository *r,
702 struct cache_tree *it,
703 struct tree *tree)
b9d37a54
JH
704{
705 struct tree_desc desc;
706 struct name_entry entry;
707 int cnt;
708
e0a92804 709 oidcpy(&it->oid, &tree->object.oid);
b9d37a54
JH
710 init_tree_desc(&desc, tree->buffer, tree->size);
711 cnt = 0;
712 while (tree_entry(&desc, &entry)) {
713 if (!S_ISDIR(entry.mode))
714 cnt++;
715 else {
716 struct cache_tree_sub *sub;
ea82b2a0 717 struct tree *subtree = lookup_tree(r, &entry.oid);
b9d37a54
JH
718 if (!subtree->object.parsed)
719 parse_tree(subtree);
720 sub = cache_tree_sub(it, entry.path);
721 sub->cache_tree = cache_tree();
c207e9e1 722 prime_cache_tree_rec(r, sub->cache_tree, subtree);
b9d37a54
JH
723 cnt += sub->cache_tree->entry_count;
724 }
725 }
726 it->entry_count = cnt;
727}
728
c207e9e1
NTND
729void prime_cache_tree(struct repository *r,
730 struct index_state *istate,
731 struct tree *tree)
b9d37a54 732{
e6c286e8
NTND
733 cache_tree_free(&istate->cache_tree);
734 istate->cache_tree = cache_tree();
c207e9e1 735 prime_cache_tree_rec(r, istate->cache_tree, tree);
e6c286e8 736 istate->cache_changed |= CACHE_TREE_CHANGED;
b9d37a54 737}
b65982b6
JH
738
739/*
740 * find the cache_tree that corresponds to the current level without
741 * exploding the full path into textual form. The root of the
742 * cache tree is given as "root", and our current level is "info".
743 * (1) When at root level, info->prev is NULL, so it is "root" itself.
744 * (2) Otherwise, find the cache_tree that corresponds to one level
745 * above us, and find ourselves in there.
746 */
747static struct cache_tree *find_cache_tree_from_traversal(struct cache_tree *root,
748 struct traverse_info *info)
749{
750 struct cache_tree *our_parent;
751
752 if (!info->prev)
753 return root;
754 our_parent = find_cache_tree_from_traversal(root, info->prev);
755 return cache_tree_find(our_parent, info->name.path);
756}
757
758int cache_tree_matches_traversal(struct cache_tree *root,
759 struct name_entry *ent,
760 struct traverse_info *info)
761{
762 struct cache_tree *it;
763
764 it = find_cache_tree_from_traversal(root, info);
765 it = cache_tree_find(it, ent->path);
ea82b2a0 766 if (it && it->entry_count > 0 && oideq(&ent->oid, &it->oid))
b65982b6
JH
767 return it->entry_count;
768 return 0;
769}
996277c5 770
c207e9e1
NTND
771static void verify_one(struct repository *r,
772 struct index_state *istate,
4592e608
NTND
773 struct cache_tree *it,
774 struct strbuf *path)
775{
776 int i, pos, len = path->len;
777 struct strbuf tree_buf = STRBUF_INIT;
778 struct object_id new_oid;
779
780 for (i = 0; i < it->subtree_nr; i++) {
781 strbuf_addf(path, "%s/", it->down[i]->name);
c207e9e1 782 verify_one(r, istate, it->down[i]->cache_tree, path);
4592e608
NTND
783 strbuf_setlen(path, len);
784 }
785
786 if (it->entry_count < 0 ||
787 /* no verification on tests (t7003) that replace trees */
c207e9e1 788 lookup_replace_object(r, &it->oid) != &it->oid)
4592e608
NTND
789 return;
790
791 if (path->len) {
792 pos = index_name_pos(istate, path->buf, path->len);
793 pos = -pos - 1;
794 } else {
795 pos = 0;
796 }
797
798 i = 0;
799 while (i < it->entry_count) {
800 struct cache_entry *ce = istate->cache[pos + i];
801 const char *slash;
802 struct cache_tree_sub *sub = NULL;
803 const struct object_id *oid;
804 const char *name;
805 unsigned mode;
806 int entlen;
807
808 if (ce->ce_flags & (CE_STAGEMASK | CE_INTENT_TO_ADD | CE_REMOVE))
809 BUG("%s with flags 0x%x should not be in cache-tree",
810 ce->name, ce->ce_flags);
811 name = ce->name + path->len;
812 slash = strchr(name, '/');
813 if (slash) {
814 entlen = slash - name;
815 sub = find_subtree(it, ce->name + path->len, entlen, 0);
816 if (!sub || sub->cache_tree->entry_count < 0)
817 BUG("bad subtree '%.*s'", entlen, name);
818 oid = &sub->cache_tree->oid;
819 mode = S_IFDIR;
820 i += sub->cache_tree->entry_count;
821 } else {
822 oid = &ce->oid;
823 mode = ce->ce_mode;
824 entlen = ce_namelen(ce) - path->len;
825 i++;
826 }
827 strbuf_addf(&tree_buf, "%o %.*s%c", mode, entlen, name, '\0');
828 strbuf_add(&tree_buf, oid->hash, the_hash_algo->rawsz);
829 }
830 hash_object_file(tree_buf.buf, tree_buf.len, tree_type, &new_oid);
e43d2dcc 831 if (!oideq(&new_oid, &it->oid))
4592e608
NTND
832 BUG("cache-tree for path %.*s does not match. "
833 "Expected %s got %s", len, path->buf,
834 oid_to_hex(&new_oid), oid_to_hex(&it->oid));
835 strbuf_setlen(path, len);
836 strbuf_release(&tree_buf);
837}
838
c207e9e1 839void cache_tree_verify(struct repository *r, struct index_state *istate)
4592e608
NTND
840{
841 struct strbuf path = STRBUF_INIT;
842
843 if (!istate->cache_tree)
844 return;
c207e9e1 845 verify_one(r, istate, istate->cache_tree, &path);
4592e608
NTND
846 strbuf_release(&path);
847}