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