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