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