Merge branch 'jk/diff-tree-t-fix' into next
[git/jrn.git] / cache-tree.c
blob134ab4333d767b2a76e07f0c5501b2251d258861
1 #include "cache.h"
2 #include "tree.h"
3 #include "tree-walk.h"
4 #include "cache-tree.h"
6 #ifndef DEBUG
7 #define DEBUG 0
8 #endif
10 struct cache_tree *cache_tree(void)
12 struct cache_tree *it = xcalloc(1, sizeof(struct cache_tree));
13 it->entry_count = -1;
14 return it;
17 void cache_tree_free(struct cache_tree **it_p)
19 int i;
20 struct cache_tree *it = *it_p;
22 if (!it)
23 return;
24 for (i = 0; i < it->subtree_nr; i++)
25 if (it->down[i]) {
26 cache_tree_free(&it->down[i]->cache_tree);
27 free(it->down[i]);
29 free(it->down);
30 free(it);
31 *it_p = NULL;
34 static int subtree_name_cmp(const char *one, int onelen,
35 const char *two, int twolen)
37 if (onelen < twolen)
38 return -1;
39 if (twolen < onelen)
40 return 1;
41 return memcmp(one, two, onelen);
44 static int subtree_pos(struct cache_tree *it, const char *path, int pathlen)
46 struct cache_tree_sub **down = it->down;
47 int lo, hi;
48 lo = 0;
49 hi = it->subtree_nr;
50 while (lo < hi) {
51 int mi = (lo + hi) / 2;
52 struct cache_tree_sub *mdl = down[mi];
53 int cmp = subtree_name_cmp(path, pathlen,
54 mdl->name, mdl->namelen);
55 if (!cmp)
56 return mi;
57 if (cmp < 0)
58 hi = mi;
59 else
60 lo = mi + 1;
62 return -lo-1;
65 static struct cache_tree_sub *find_subtree(struct cache_tree *it,
66 const char *path,
67 int pathlen,
68 int create)
70 struct cache_tree_sub *down;
71 int pos = subtree_pos(it, path, pathlen);
72 if (0 <= pos)
73 return it->down[pos];
74 if (!create)
75 return NULL;
77 pos = -pos-1;
78 ALLOC_GROW(it->down, it->subtree_nr + 1, it->subtree_alloc);
79 it->subtree_nr++;
81 down = xmalloc(sizeof(*down) + pathlen + 1);
82 down->cache_tree = NULL;
83 down->namelen = pathlen;
84 memcpy(down->name, path, pathlen);
85 down->name[pathlen] = 0;
87 if (pos < it->subtree_nr)
88 memmove(it->down + pos + 1,
89 it->down + pos,
90 sizeof(down) * (it->subtree_nr - pos - 1));
91 it->down[pos] = down;
92 return down;
95 struct cache_tree_sub *cache_tree_sub(struct cache_tree *it, const char *path)
97 int pathlen = strlen(path);
98 return find_subtree(it, path, pathlen, 1);
101 static int do_invalidate_path(struct cache_tree *it, const char *path)
103 /* a/b/c
104 * ==> invalidate self
105 * ==> find "a", have it invalidate "b/c"
107 * ==> invalidate self
108 * ==> if "a" exists as a subtree, remove it.
110 const char *slash;
111 int namelen;
112 struct cache_tree_sub *down;
114 #if DEBUG
115 fprintf(stderr, "cache-tree invalidate <%s>\n", path);
116 #endif
118 if (!it)
119 return 0;
120 slash = strchrnul(path, '/');
121 namelen = slash - path;
122 it->entry_count = -1;
123 if (!*slash) {
124 int pos;
125 pos = subtree_pos(it, path, namelen);
126 if (0 <= pos) {
127 cache_tree_free(&it->down[pos]->cache_tree);
128 free(it->down[pos]);
129 /* 0 1 2 3 4 5
130 * ^ ^subtree_nr = 6
131 * pos
132 * move 4 and 5 up one place (2 entries)
133 * 2 = 6 - 3 - 1 = subtree_nr - pos - 1
135 memmove(it->down+pos, it->down+pos+1,
136 sizeof(struct cache_tree_sub *) *
137 (it->subtree_nr - pos - 1));
138 it->subtree_nr--;
140 return 1;
142 down = find_subtree(it, path, namelen, 0);
143 if (down)
144 do_invalidate_path(down->cache_tree, slash + 1);
145 return 1;
148 void cache_tree_invalidate_path(struct index_state *istate, const char *path)
150 if (do_invalidate_path(istate->cache_tree, path))
151 istate->cache_changed |= CACHE_TREE_CHANGED;
154 static int verify_cache(struct cache_entry **cache,
155 int entries, int flags)
157 int i, funny;
158 int silent = flags & WRITE_TREE_SILENT;
160 /* Verify that the tree is merged */
161 funny = 0;
162 for (i = 0; i < entries; i++) {
163 const struct cache_entry *ce = cache[i];
164 if (ce_stage(ce)) {
165 if (silent)
166 return -1;
167 if (10 < ++funny) {
168 fprintf(stderr, "...\n");
169 break;
171 fprintf(stderr, "%s: unmerged (%s)\n",
172 ce->name, sha1_to_hex(ce->sha1));
175 if (funny)
176 return -1;
178 /* Also verify that the cache does not have path and path/file
179 * at the same time. At this point we know the cache has only
180 * stage 0 entries.
182 funny = 0;
183 for (i = 0; i < entries - 1; i++) {
184 /* path/file always comes after path because of the way
185 * the cache is sorted. Also path can appear only once,
186 * which means conflicting one would immediately follow.
188 const char *this_name = cache[i]->name;
189 const char *next_name = cache[i+1]->name;
190 int this_len = strlen(this_name);
191 if (this_len < strlen(next_name) &&
192 strncmp(this_name, next_name, this_len) == 0 &&
193 next_name[this_len] == '/') {
194 if (10 < ++funny) {
195 fprintf(stderr, "...\n");
196 break;
198 fprintf(stderr, "You have both %s and %s\n",
199 this_name, next_name);
202 if (funny)
203 return -1;
204 return 0;
207 static void discard_unused_subtrees(struct cache_tree *it)
209 struct cache_tree_sub **down = it->down;
210 int nr = it->subtree_nr;
211 int dst, src;
212 for (dst = src = 0; src < nr; src++) {
213 struct cache_tree_sub *s = down[src];
214 if (s->used)
215 down[dst++] = s;
216 else {
217 cache_tree_free(&s->cache_tree);
218 free(s);
219 it->subtree_nr--;
224 int cache_tree_fully_valid(struct cache_tree *it)
226 int i;
227 if (!it)
228 return 0;
229 if (it->entry_count < 0 || !has_sha1_file(it->sha1))
230 return 0;
231 for (i = 0; i < it->subtree_nr; i++) {
232 if (!cache_tree_fully_valid(it->down[i]->cache_tree))
233 return 0;
235 return 1;
238 static int update_one(struct cache_tree *it,
239 struct cache_entry **cache,
240 int entries,
241 const char *base,
242 int baselen,
243 int *skip_count,
244 int flags)
246 struct strbuf buffer;
247 int missing_ok = flags & WRITE_TREE_MISSING_OK;
248 int dryrun = flags & WRITE_TREE_DRY_RUN;
249 int repair = flags & WRITE_TREE_REPAIR;
250 int to_invalidate = 0;
251 int i;
253 assert(!(dryrun && repair));
255 *skip_count = 0;
257 if (0 <= it->entry_count && has_sha1_file(it->sha1))
258 return it->entry_count;
261 * We first scan for subtrees and update them; we start by
262 * marking existing subtrees -- the ones that are unmarked
263 * should not be in the result.
265 for (i = 0; i < it->subtree_nr; i++)
266 it->down[i]->used = 0;
269 * Find the subtrees and update them.
271 i = 0;
272 while (i < entries) {
273 const struct cache_entry *ce = cache[i];
274 struct cache_tree_sub *sub;
275 const char *path, *slash;
276 int pathlen, sublen, subcnt, subskip;
278 path = ce->name;
279 pathlen = ce_namelen(ce);
280 if (pathlen <= baselen || memcmp(base, path, baselen))
281 break; /* at the end of this level */
283 slash = strchr(path + baselen, '/');
284 if (!slash) {
285 i++;
286 continue;
289 * a/bbb/c (base = a/, slash = /c)
290 * ==>
291 * path+baselen = bbb/c, sublen = 3
293 sublen = slash - (path + baselen);
294 sub = find_subtree(it, path + baselen, sublen, 1);
295 if (!sub->cache_tree)
296 sub->cache_tree = cache_tree();
297 subcnt = update_one(sub->cache_tree,
298 cache + i, entries - i,
299 path,
300 baselen + sublen + 1,
301 &subskip,
302 flags);
303 if (subcnt < 0)
304 return subcnt;
305 i += subcnt;
306 sub->count = subcnt; /* to be used in the next loop */
307 *skip_count += subskip;
308 sub->used = 1;
311 discard_unused_subtrees(it);
314 * Then write out the tree object for this level.
316 strbuf_init(&buffer, 8192);
318 i = 0;
319 while (i < entries) {
320 const struct cache_entry *ce = cache[i];
321 struct cache_tree_sub *sub;
322 const char *path, *slash;
323 int pathlen, entlen;
324 const unsigned char *sha1;
325 unsigned mode;
327 path = ce->name;
328 pathlen = ce_namelen(ce);
329 if (pathlen <= baselen || memcmp(base, path, baselen))
330 break; /* at the end of this level */
332 slash = strchr(path + baselen, '/');
333 if (slash) {
334 entlen = slash - (path + baselen);
335 sub = find_subtree(it, path + baselen, entlen, 0);
336 if (!sub)
337 die("cache-tree.c: '%.*s' in '%s' not found",
338 entlen, path + baselen, path);
339 i += sub->count;
340 sha1 = sub->cache_tree->sha1;
341 mode = S_IFDIR;
342 if (sub->cache_tree->entry_count < 0)
343 to_invalidate = 1;
345 else {
346 sha1 = ce->sha1;
347 mode = ce->ce_mode;
348 entlen = pathlen - baselen;
349 i++;
351 if (mode != S_IFGITLINK && !missing_ok && !has_sha1_file(sha1)) {
352 strbuf_release(&buffer);
353 return error("invalid object %06o %s for '%.*s'",
354 mode, sha1_to_hex(sha1), entlen+baselen, path);
358 * CE_REMOVE entries are removed before the index is
359 * written to disk. Skip them to remain consistent
360 * with the future on-disk index.
362 if (ce->ce_flags & CE_REMOVE) {
363 *skip_count = *skip_count + 1;
364 continue;
368 * CE_INTENT_TO_ADD entries exist on on-disk index but
369 * they are not part of generated trees. Invalidate up
370 * to root to force cache-tree users to read elsewhere.
372 if (ce->ce_flags & CE_INTENT_TO_ADD) {
373 to_invalidate = 1;
374 continue;
377 strbuf_grow(&buffer, entlen + 100);
378 strbuf_addf(&buffer, "%o %.*s%c", mode, entlen, path + baselen, '\0');
379 strbuf_add(&buffer, sha1, 20);
381 #if DEBUG
382 fprintf(stderr, "cache-tree update-one %o %.*s\n",
383 mode, entlen, path + baselen);
384 #endif
387 if (repair) {
388 unsigned char sha1[20];
389 hash_sha1_file(buffer.buf, buffer.len, tree_type, sha1);
390 if (has_sha1_file(sha1))
391 hashcpy(it->sha1, sha1);
392 else
393 to_invalidate = 1;
394 } else if (dryrun)
395 hash_sha1_file(buffer.buf, buffer.len, tree_type, it->sha1);
396 else if (write_sha1_file(buffer.buf, buffer.len, tree_type, it->sha1)) {
397 strbuf_release(&buffer);
398 return -1;
401 strbuf_release(&buffer);
402 it->entry_count = to_invalidate ? -1 : i - *skip_count;
403 #if DEBUG
404 fprintf(stderr, "cache-tree update-one (%d ent, %d subtree) %s\n",
405 it->entry_count, it->subtree_nr,
406 sha1_to_hex(it->sha1));
407 #endif
408 return i;
411 int cache_tree_update(struct index_state *istate, int flags)
413 struct cache_tree *it = istate->cache_tree;
414 struct cache_entry **cache = istate->cache;
415 int entries = istate->cache_nr;
416 int skip, i = verify_cache(cache, entries, flags);
418 if (i)
419 return i;
420 i = update_one(it, cache, entries, "", 0, &skip, flags);
421 if (i < 0)
422 return i;
423 istate->cache_changed |= CACHE_TREE_CHANGED;
424 return 0;
427 static void write_one(struct strbuf *buffer, struct cache_tree *it,
428 const char *path, int pathlen)
430 int i;
432 /* One "cache-tree" entry consists of the following:
433 * path (NUL terminated)
434 * entry_count, subtree_nr ("%d %d\n")
435 * tree-sha1 (missing if invalid)
436 * subtree_nr "cache-tree" entries for subtrees.
438 strbuf_grow(buffer, pathlen + 100);
439 strbuf_add(buffer, path, pathlen);
440 strbuf_addf(buffer, "%c%d %d\n", 0, it->entry_count, it->subtree_nr);
442 #if DEBUG
443 if (0 <= it->entry_count)
444 fprintf(stderr, "cache-tree <%.*s> (%d ent, %d subtree) %s\n",
445 pathlen, path, it->entry_count, it->subtree_nr,
446 sha1_to_hex(it->sha1));
447 else
448 fprintf(stderr, "cache-tree <%.*s> (%d subtree) invalid\n",
449 pathlen, path, it->subtree_nr);
450 #endif
452 if (0 <= it->entry_count) {
453 strbuf_add(buffer, it->sha1, 20);
455 for (i = 0; i < it->subtree_nr; i++) {
456 struct cache_tree_sub *down = it->down[i];
457 if (i) {
458 struct cache_tree_sub *prev = it->down[i-1];
459 if (subtree_name_cmp(down->name, down->namelen,
460 prev->name, prev->namelen) <= 0)
461 die("fatal - unsorted cache subtree");
463 write_one(buffer, down->cache_tree, down->name, down->namelen);
467 void cache_tree_write(struct strbuf *sb, struct cache_tree *root)
469 write_one(sb, root, "", 0);
472 static struct cache_tree *read_one(const char **buffer, unsigned long *size_p)
474 const char *buf = *buffer;
475 unsigned long size = *size_p;
476 const char *cp;
477 char *ep;
478 struct cache_tree *it;
479 int i, subtree_nr;
481 it = NULL;
482 /* skip name, but make sure name exists */
483 while (size && *buf) {
484 size--;
485 buf++;
487 if (!size)
488 goto free_return;
489 buf++; size--;
490 it = cache_tree();
492 cp = buf;
493 it->entry_count = strtol(cp, &ep, 10);
494 if (cp == ep)
495 goto free_return;
496 cp = ep;
497 subtree_nr = strtol(cp, &ep, 10);
498 if (cp == ep)
499 goto free_return;
500 while (size && *buf && *buf != '\n') {
501 size--;
502 buf++;
504 if (!size)
505 goto free_return;
506 buf++; size--;
507 if (0 <= it->entry_count) {
508 if (size < 20)
509 goto free_return;
510 hashcpy(it->sha1, (const unsigned char*)buf);
511 buf += 20;
512 size -= 20;
515 #if DEBUG
516 if (0 <= it->entry_count)
517 fprintf(stderr, "cache-tree <%s> (%d ent, %d subtree) %s\n",
518 *buffer, it->entry_count, subtree_nr,
519 sha1_to_hex(it->sha1));
520 else
521 fprintf(stderr, "cache-tree <%s> (%d subtrees) invalid\n",
522 *buffer, subtree_nr);
523 #endif
526 * Just a heuristic -- we do not add directories that often but
527 * we do not want to have to extend it immediately when we do,
528 * hence +2.
530 it->subtree_alloc = subtree_nr + 2;
531 it->down = xcalloc(it->subtree_alloc, sizeof(struct cache_tree_sub *));
532 for (i = 0; i < subtree_nr; i++) {
533 /* read each subtree */
534 struct cache_tree *sub;
535 struct cache_tree_sub *subtree;
536 const char *name = buf;
538 sub = read_one(&buf, &size);
539 if (!sub)
540 goto free_return;
541 subtree = cache_tree_sub(it, name);
542 subtree->cache_tree = sub;
544 if (subtree_nr != it->subtree_nr)
545 die("cache-tree: internal error");
546 *buffer = buf;
547 *size_p = size;
548 return it;
550 free_return:
551 cache_tree_free(&it);
552 return NULL;
555 struct cache_tree *cache_tree_read(const char *buffer, unsigned long size)
557 if (buffer[0])
558 return NULL; /* not the whole tree */
559 return read_one(&buffer, &size);
562 static struct cache_tree *cache_tree_find(struct cache_tree *it, const char *path)
564 if (!it)
565 return NULL;
566 while (*path) {
567 const char *slash;
568 struct cache_tree_sub *sub;
570 slash = strchrnul(path, '/');
572 * Between path and slash is the name of the subtree
573 * to look for.
575 sub = find_subtree(it, path, slash - path, 0);
576 if (!sub)
577 return NULL;
578 it = sub->cache_tree;
580 path = slash;
581 while (*path == '/')
582 path++;
584 return it;
587 int write_cache_as_tree(unsigned char *sha1, int flags, const char *prefix)
589 int entries, was_valid, newfd;
590 struct lock_file *lock_file;
593 * We can't free this memory, it becomes part of a linked list
594 * parsed atexit()
596 lock_file = xcalloc(1, sizeof(struct lock_file));
598 newfd = hold_locked_index(lock_file, 1);
600 entries = read_cache();
601 if (entries < 0)
602 return WRITE_TREE_UNREADABLE_INDEX;
603 if (flags & WRITE_TREE_IGNORE_CACHE_TREE)
604 cache_tree_free(&(active_cache_tree));
606 if (!active_cache_tree)
607 active_cache_tree = cache_tree();
609 was_valid = cache_tree_fully_valid(active_cache_tree);
610 if (!was_valid) {
611 if (cache_tree_update(&the_index, flags) < 0)
612 return WRITE_TREE_UNMERGED_INDEX;
613 if (0 <= newfd) {
614 if (!write_locked_index(&the_index, lock_file, COMMIT_LOCK))
615 newfd = -1;
617 /* Not being able to write is fine -- we are only interested
618 * in updating the cache-tree part, and if the next caller
619 * ends up using the old index with unupdated cache-tree part
620 * it misses the work we did here, but that is just a
621 * performance penalty and not a big deal.
625 if (prefix) {
626 struct cache_tree *subtree =
627 cache_tree_find(active_cache_tree, prefix);
628 if (!subtree)
629 return WRITE_TREE_PREFIX_ERROR;
630 hashcpy(sha1, subtree->sha1);
632 else
633 hashcpy(sha1, active_cache_tree->sha1);
635 if (0 <= newfd)
636 rollback_lock_file(lock_file);
638 return 0;
641 static void prime_cache_tree_rec(struct cache_tree *it, struct tree *tree)
643 struct tree_desc desc;
644 struct name_entry entry;
645 int cnt;
647 hashcpy(it->sha1, tree->object.sha1);
648 init_tree_desc(&desc, tree->buffer, tree->size);
649 cnt = 0;
650 while (tree_entry(&desc, &entry)) {
651 if (!S_ISDIR(entry.mode))
652 cnt++;
653 else {
654 struct cache_tree_sub *sub;
655 struct tree *subtree = lookup_tree(entry.sha1);
656 if (!subtree->object.parsed)
657 parse_tree(subtree);
658 sub = cache_tree_sub(it, entry.path);
659 sub->cache_tree = cache_tree();
660 prime_cache_tree_rec(sub->cache_tree, subtree);
661 cnt += sub->cache_tree->entry_count;
664 it->entry_count = cnt;
667 void prime_cache_tree(struct index_state *istate, struct tree *tree)
669 cache_tree_free(&istate->cache_tree);
670 istate->cache_tree = cache_tree();
671 prime_cache_tree_rec(istate->cache_tree, tree);
672 istate->cache_changed |= CACHE_TREE_CHANGED;
676 * find the cache_tree that corresponds to the current level without
677 * exploding the full path into textual form. The root of the
678 * cache tree is given as "root", and our current level is "info".
679 * (1) When at root level, info->prev is NULL, so it is "root" itself.
680 * (2) Otherwise, find the cache_tree that corresponds to one level
681 * above us, and find ourselves in there.
683 static struct cache_tree *find_cache_tree_from_traversal(struct cache_tree *root,
684 struct traverse_info *info)
686 struct cache_tree *our_parent;
688 if (!info->prev)
689 return root;
690 our_parent = find_cache_tree_from_traversal(root, info->prev);
691 return cache_tree_find(our_parent, info->name.path);
694 int cache_tree_matches_traversal(struct cache_tree *root,
695 struct name_entry *ent,
696 struct traverse_info *info)
698 struct cache_tree *it;
700 it = find_cache_tree_from_traversal(root, info);
701 it = cache_tree_find(it, ent->path);
702 if (it && it->entry_count > 0 && !hashcmp(ent->sha1, it->sha1))
703 return it->entry_count;
704 return 0;
707 int update_main_cache_tree(int flags)
709 if (!the_index.cache_tree)
710 the_index.cache_tree = cache_tree();
711 return cache_tree_update(&the_index, flags);