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