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