Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 1 | #include "cache.h" |
Michael Haggerty | 697cc8e | 2014-10-01 12:28:42 +0200 | [diff] [blame] | 2 | #include "lockfile.h" |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 3 | #include "tree.h" |
Junio C Hamano | b9d37a5 | 2009-04-20 03:58:18 -0700 | [diff] [blame] | 4 | #include "tree-walk.h" |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 5 | #include "cache-tree.h" |
| 6 | |
Junio C Hamano | 4903161 | 2006-10-30 15:29:53 -0800 | [diff] [blame] | 7 | #ifndef DEBUG |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 8 | #define DEBUG 0 |
Junio C Hamano | 4903161 | 2006-10-30 15:29:53 -0800 | [diff] [blame] | 9 | #endif |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 10 | |
| 11 | struct cache_tree *cache_tree(void) |
| 12 | { |
| 13 | struct cache_tree *it = xcalloc(1, sizeof(struct cache_tree)); |
| 14 | it->entry_count = -1; |
| 15 | return it; |
| 16 | } |
| 17 | |
Junio C Hamano | bad68ec | 2006-04-24 21:18:58 -0700 | [diff] [blame] | 18 | void cache_tree_free(struct cache_tree **it_p) |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 19 | { |
| 20 | int i; |
Junio C Hamano | bad68ec | 2006-04-24 21:18:58 -0700 | [diff] [blame] | 21 | struct cache_tree *it = *it_p; |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 22 | |
| 23 | if (!it) |
| 24 | return; |
| 25 | for (i = 0; i < it->subtree_nr; i++) |
Elijah Newren | e92fa51 | 2010-09-06 15:40:16 -0600 | [diff] [blame] | 26 | if (it->down[i]) { |
Junio C Hamano | 61fa309 | 2006-04-25 17:40:02 -0700 | [diff] [blame] | 27 | cache_tree_free(&it->down[i]->cache_tree); |
Elijah Newren | e92fa51 | 2010-09-06 15:40:16 -0600 | [diff] [blame] | 28 | free(it->down[i]); |
| 29 | } |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 30 | free(it->down); |
| 31 | free(it); |
Junio C Hamano | bad68ec | 2006-04-24 21:18:58 -0700 | [diff] [blame] | 32 | *it_p = NULL; |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 33 | } |
| 34 | |
Junio C Hamano | 61fa309 | 2006-04-25 17:40:02 -0700 | [diff] [blame] | 35 | static int subtree_name_cmp(const char *one, int onelen, |
| 36 | const char *two, int twolen) |
| 37 | { |
| 38 | if (onelen < twolen) |
| 39 | return -1; |
| 40 | if (twolen < onelen) |
| 41 | return 1; |
| 42 | return memcmp(one, two, onelen); |
| 43 | } |
| 44 | |
| 45 | static int subtree_pos(struct cache_tree *it, const char *path, int pathlen) |
| 46 | { |
| 47 | struct cache_tree_sub **down = it->down; |
| 48 | int lo, hi; |
| 49 | lo = 0; |
| 50 | hi = it->subtree_nr; |
| 51 | while (lo < hi) { |
| 52 | int mi = (lo + hi) / 2; |
| 53 | struct cache_tree_sub *mdl = down[mi]; |
| 54 | int cmp = subtree_name_cmp(path, pathlen, |
| 55 | mdl->name, mdl->namelen); |
| 56 | if (!cmp) |
| 57 | return mi; |
| 58 | if (cmp < 0) |
| 59 | hi = mi; |
| 60 | else |
| 61 | lo = mi + 1; |
| 62 | } |
| 63 | return -lo-1; |
| 64 | } |
| 65 | |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 66 | static struct cache_tree_sub *find_subtree(struct cache_tree *it, |
| 67 | const char *path, |
| 68 | int pathlen, |
| 69 | int create) |
| 70 | { |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 71 | struct cache_tree_sub *down; |
Junio C Hamano | 61fa309 | 2006-04-25 17:40:02 -0700 | [diff] [blame] | 72 | int pos = subtree_pos(it, path, pathlen); |
| 73 | if (0 <= pos) |
| 74 | return it->down[pos]; |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 75 | if (!create) |
| 76 | return NULL; |
Junio C Hamano | 61fa309 | 2006-04-25 17:40:02 -0700 | [diff] [blame] | 77 | |
| 78 | pos = -pos-1; |
Dmitry S. Dolzhenko | bcc7a03 | 2014-03-04 02:31:51 +0400 | [diff] [blame] | 79 | ALLOC_GROW(it->down, it->subtree_nr + 1, it->subtree_alloc); |
Junio C Hamano | 61fa309 | 2006-04-25 17:40:02 -0700 | [diff] [blame] | 80 | it->subtree_nr++; |
| 81 | |
Jeff King | 96ffc06 | 2016-02-22 17:44:32 -0500 | [diff] [blame] | 82 | FLEX_ALLOC_MEM(down, name, path, pathlen); |
Junio C Hamano | 61fa309 | 2006-04-25 17:40:02 -0700 | [diff] [blame] | 83 | down->cache_tree = NULL; |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 84 | down->namelen = pathlen; |
Junio C Hamano | 61fa309 | 2006-04-25 17:40:02 -0700 | [diff] [blame] | 85 | |
| 86 | if (pos < it->subtree_nr) |
| 87 | memmove(it->down + pos + 1, |
| 88 | it->down + pos, |
| 89 | sizeof(down) * (it->subtree_nr - pos - 1)); |
| 90 | it->down[pos] = down; |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 91 | return down; |
| 92 | } |
| 93 | |
Junio C Hamano | 7927a55 | 2006-04-27 01:33:07 -0700 | [diff] [blame] | 94 | struct cache_tree_sub *cache_tree_sub(struct cache_tree *it, const char *path) |
| 95 | { |
| 96 | int pathlen = strlen(path); |
| 97 | return find_subtree(it, path, pathlen, 1); |
| 98 | } |
| 99 | |
Nguyễn Thái Ngọc Duy | a5400ef | 2014-06-13 19:19:31 +0700 | [diff] [blame] | 100 | static int do_invalidate_path(struct cache_tree *it, const char *path) |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 101 | { |
| 102 | /* a/b/c |
| 103 | * ==> invalidate self |
| 104 | * ==> find "a", have it invalidate "b/c" |
| 105 | * a |
| 106 | * ==> invalidate self |
| 107 | * ==> if "a" exists as a subtree, remove it. |
| 108 | */ |
| 109 | const char *slash; |
| 110 | int namelen; |
| 111 | struct cache_tree_sub *down; |
| 112 | |
Junio C Hamano | 00703e6 | 2006-05-03 16:10:45 -0700 | [diff] [blame] | 113 | #if DEBUG |
| 114 | fprintf(stderr, "cache-tree invalidate <%s>\n", path); |
| 115 | #endif |
| 116 | |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 117 | if (!it) |
Nguyễn Thái Ngọc Duy | a5400ef | 2014-06-13 19:19:31 +0700 | [diff] [blame] | 118 | return 0; |
Rohit Mani | 2c5495f | 2014-03-07 22:48:31 -0800 | [diff] [blame] | 119 | slash = strchrnul(path, '/'); |
| 120 | namelen = slash - path; |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 121 | it->entry_count = -1; |
Rohit Mani | 2c5495f | 2014-03-07 22:48:31 -0800 | [diff] [blame] | 122 | if (!*slash) { |
Junio C Hamano | 61fa309 | 2006-04-25 17:40:02 -0700 | [diff] [blame] | 123 | int pos; |
Junio C Hamano | 61fa309 | 2006-04-25 17:40:02 -0700 | [diff] [blame] | 124 | pos = subtree_pos(it, path, namelen); |
| 125 | if (0 <= pos) { |
| 126 | cache_tree_free(&it->down[pos]->cache_tree); |
| 127 | free(it->down[pos]); |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 128 | /* 0 1 2 3 4 5 |
| 129 | * ^ ^subtree_nr = 6 |
Junio C Hamano | 61fa309 | 2006-04-25 17:40:02 -0700 | [diff] [blame] | 130 | * pos |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 131 | * move 4 and 5 up one place (2 entries) |
Junio C Hamano | 61fa309 | 2006-04-25 17:40:02 -0700 | [diff] [blame] | 132 | * 2 = 6 - 3 - 1 = subtree_nr - pos - 1 |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 133 | */ |
René Scharfe | f331ab9 | 2017-07-15 22:00:45 +0200 | [diff] [blame] | 134 | MOVE_ARRAY(it->down + pos, it->down + pos + 1, |
| 135 | it->subtree_nr - pos - 1); |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 136 | it->subtree_nr--; |
| 137 | } |
Nguyễn Thái Ngọc Duy | a5400ef | 2014-06-13 19:19:31 +0700 | [diff] [blame] | 138 | return 1; |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 139 | } |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 140 | down = find_subtree(it, path, namelen, 0); |
| 141 | if (down) |
Nguyễn Thái Ngọc Duy | a5400ef | 2014-06-13 19:19:31 +0700 | [diff] [blame] | 142 | do_invalidate_path(down->cache_tree, slash + 1); |
| 143 | return 1; |
| 144 | } |
| 145 | |
| 146 | void cache_tree_invalidate_path(struct index_state *istate, const char *path) |
| 147 | { |
| 148 | if (do_invalidate_path(istate->cache_tree, path)) |
| 149 | istate->cache_changed |= CACHE_TREE_CHANGED; |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 150 | } |
| 151 | |
Nguyễn Thái Ngọc Duy | d0cfc3e | 2014-06-13 19:19:32 +0700 | [diff] [blame] | 152 | static int verify_cache(struct cache_entry **cache, |
Nguyễn Thái Ngọc Duy | e859c69 | 2012-01-16 09:36:46 +0700 | [diff] [blame] | 153 | int entries, int flags) |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 154 | { |
| 155 | int i, funny; |
Nguyễn Thái Ngọc Duy | e859c69 | 2012-01-16 09:36:46 +0700 | [diff] [blame] | 156 | int silent = flags & WRITE_TREE_SILENT; |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 157 | |
| 158 | /* Verify that the tree is merged */ |
| 159 | funny = 0; |
| 160 | for (i = 0; i < entries; i++) { |
Nguyễn Thái Ngọc Duy | 9c5e6c8 | 2013-07-09 22:29:00 +0700 | [diff] [blame] | 161 | const struct cache_entry *ce = cache[i]; |
Junio C Hamano | 3f6d56d | 2012-02-07 11:55:48 -0800 | [diff] [blame] | 162 | if (ce_stage(ce)) { |
Thomas Rast | 996277c | 2011-12-06 18:43:37 +0100 | [diff] [blame] | 163 | if (silent) |
| 164 | return -1; |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 165 | if (10 < ++funny) { |
| 166 | fprintf(stderr, "...\n"); |
| 167 | break; |
| 168 | } |
Nguyễn Thái Ngọc Duy | dbc3904 | 2012-12-16 11:15:25 +0700 | [diff] [blame] | 169 | fprintf(stderr, "%s: unmerged (%s)\n", |
brian m. carlson | 99d1a98 | 2016-09-05 20:07:52 +0000 | [diff] [blame] | 170 | ce->name, oid_to_hex(&ce->oid)); |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 171 | } |
| 172 | } |
| 173 | if (funny) |
| 174 | return -1; |
| 175 | |
| 176 | /* Also verify that the cache does not have path and path/file |
| 177 | * at the same time. At this point we know the cache has only |
| 178 | * stage 0 entries. |
| 179 | */ |
| 180 | funny = 0; |
| 181 | for (i = 0; i < entries - 1; i++) { |
| 182 | /* path/file always comes after path because of the way |
| 183 | * the cache is sorted. Also path can appear only once, |
| 184 | * which means conflicting one would immediately follow. |
| 185 | */ |
| 186 | const char *this_name = cache[i]->name; |
| 187 | const char *next_name = cache[i+1]->name; |
| 188 | int this_len = strlen(this_name); |
| 189 | if (this_len < strlen(next_name) && |
| 190 | strncmp(this_name, next_name, this_len) == 0 && |
| 191 | next_name[this_len] == '/') { |
| 192 | if (10 < ++funny) { |
| 193 | fprintf(stderr, "...\n"); |
| 194 | break; |
| 195 | } |
| 196 | fprintf(stderr, "You have both %s and %s\n", |
| 197 | this_name, next_name); |
| 198 | } |
| 199 | } |
| 200 | if (funny) |
| 201 | return -1; |
| 202 | return 0; |
| 203 | } |
| 204 | |
| 205 | static void discard_unused_subtrees(struct cache_tree *it) |
| 206 | { |
| 207 | struct cache_tree_sub **down = it->down; |
| 208 | int nr = it->subtree_nr; |
| 209 | int dst, src; |
| 210 | for (dst = src = 0; src < nr; src++) { |
| 211 | struct cache_tree_sub *s = down[src]; |
| 212 | if (s->used) |
| 213 | down[dst++] = s; |
| 214 | else { |
Junio C Hamano | bad68ec | 2006-04-24 21:18:58 -0700 | [diff] [blame] | 215 | cache_tree_free(&s->cache_tree); |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 216 | free(s); |
| 217 | it->subtree_nr--; |
| 218 | } |
| 219 | } |
| 220 | } |
| 221 | |
Junio C Hamano | bad68ec | 2006-04-24 21:18:58 -0700 | [diff] [blame] | 222 | int cache_tree_fully_valid(struct cache_tree *it) |
| 223 | { |
| 224 | int i; |
| 225 | if (!it) |
| 226 | return 0; |
brian m. carlson | e0a9280 | 2017-05-01 02:28:56 +0000 | [diff] [blame] | 227 | if (it->entry_count < 0 || !has_sha1_file(it->oid.hash)) |
Junio C Hamano | bad68ec | 2006-04-24 21:18:58 -0700 | [diff] [blame] | 228 | return 0; |
| 229 | for (i = 0; i < it->subtree_nr; i++) { |
| 230 | if (!cache_tree_fully_valid(it->down[i]->cache_tree)) |
| 231 | return 0; |
| 232 | } |
| 233 | return 1; |
| 234 | } |
| 235 | |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 236 | static int update_one(struct cache_tree *it, |
Nguyễn Thái Ngọc Duy | d0cfc3e | 2014-06-13 19:19:32 +0700 | [diff] [blame] | 237 | struct cache_entry **cache, |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 238 | int entries, |
| 239 | const char *base, |
| 240 | int baselen, |
Nguyễn Thái Ngọc Duy | 3cf773e | 2012-12-16 11:15:27 +0700 | [diff] [blame] | 241 | int *skip_count, |
Nguyễn Thái Ngọc Duy | e859c69 | 2012-01-16 09:36:46 +0700 | [diff] [blame] | 242 | int flags) |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 243 | { |
Pierre Habouzit | 5242bcb | 2007-09-06 13:20:11 +0200 | [diff] [blame] | 244 | struct strbuf buffer; |
Nguyễn Thái Ngọc Duy | e859c69 | 2012-01-16 09:36:46 +0700 | [diff] [blame] | 245 | int missing_ok = flags & WRITE_TREE_MISSING_OK; |
| 246 | int dryrun = flags & WRITE_TREE_DRY_RUN; |
David Turner | aecf567 | 2014-07-05 21:06:56 -0700 | [diff] [blame] | 247 | int repair = flags & WRITE_TREE_REPAIR; |
Nguyễn Thái Ngọc Duy | eec3e7e | 2012-12-16 11:15:28 +0700 | [diff] [blame] | 248 | int to_invalidate = 0; |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 249 | int i; |
| 250 | |
David Turner | aecf567 | 2014-07-05 21:06:56 -0700 | [diff] [blame] | 251 | assert(!(dryrun && repair)); |
| 252 | |
Nguyễn Thái Ngọc Duy | 3cf773e | 2012-12-16 11:15:27 +0700 | [diff] [blame] | 253 | *skip_count = 0; |
| 254 | |
brian m. carlson | e0a9280 | 2017-05-01 02:28:56 +0000 | [diff] [blame] | 255 | if (0 <= it->entry_count && has_sha1_file(it->oid.hash)) |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 256 | return it->entry_count; |
| 257 | |
| 258 | /* |
| 259 | * We first scan for subtrees and update them; we start by |
| 260 | * marking existing subtrees -- the ones that are unmarked |
| 261 | * should not be in the result. |
| 262 | */ |
| 263 | for (i = 0; i < it->subtree_nr; i++) |
| 264 | it->down[i]->used = 0; |
| 265 | |
| 266 | /* |
| 267 | * Find the subtrees and update them. |
| 268 | */ |
Nguyễn Thái Ngọc Duy | 386cc8b | 2012-12-16 11:15:26 +0700 | [diff] [blame] | 269 | i = 0; |
| 270 | while (i < entries) { |
Nguyễn Thái Ngọc Duy | 9c5e6c8 | 2013-07-09 22:29:00 +0700 | [diff] [blame] | 271 | const struct cache_entry *ce = cache[i]; |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 272 | struct cache_tree_sub *sub; |
| 273 | const char *path, *slash; |
Nguyễn Thái Ngọc Duy | 3cf773e | 2012-12-16 11:15:27 +0700 | [diff] [blame] | 274 | int pathlen, sublen, subcnt, subskip; |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 275 | |
| 276 | path = ce->name; |
| 277 | pathlen = ce_namelen(ce); |
| 278 | if (pathlen <= baselen || memcmp(base, path, baselen)) |
| 279 | break; /* at the end of this level */ |
| 280 | |
| 281 | slash = strchr(path + baselen, '/'); |
Nguyễn Thái Ngọc Duy | 386cc8b | 2012-12-16 11:15:26 +0700 | [diff] [blame] | 282 | if (!slash) { |
| 283 | i++; |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 284 | continue; |
Nguyễn Thái Ngọc Duy | 386cc8b | 2012-12-16 11:15:26 +0700 | [diff] [blame] | 285 | } |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 286 | /* |
| 287 | * a/bbb/c (base = a/, slash = /c) |
| 288 | * ==> |
| 289 | * path+baselen = bbb/c, sublen = 3 |
| 290 | */ |
| 291 | sublen = slash - (path + baselen); |
| 292 | sub = find_subtree(it, path + baselen, sublen, 1); |
| 293 | if (!sub->cache_tree) |
| 294 | sub->cache_tree = cache_tree(); |
| 295 | subcnt = update_one(sub->cache_tree, |
| 296 | cache + i, entries - i, |
| 297 | path, |
| 298 | baselen + sublen + 1, |
Nguyễn Thái Ngọc Duy | 3cf773e | 2012-12-16 11:15:27 +0700 | [diff] [blame] | 299 | &subskip, |
Nguyễn Thái Ngọc Duy | e859c69 | 2012-01-16 09:36:46 +0700 | [diff] [blame] | 300 | flags); |
Johannes Sixt | 3d12d0c | 2006-11-13 13:50:00 +0000 | [diff] [blame] | 301 | if (subcnt < 0) |
| 302 | return subcnt; |
Jeff King | 729dbbd | 2014-10-29 13:11:58 -0400 | [diff] [blame] | 303 | if (!subcnt) |
| 304 | die("index cache-tree records empty sub-tree"); |
Nguyễn Thái Ngọc Duy | 386cc8b | 2012-12-16 11:15:26 +0700 | [diff] [blame] | 305 | i += subcnt; |
Nguyễn Thái Ngọc Duy | 3cf773e | 2012-12-16 11:15:27 +0700 | [diff] [blame] | 306 | sub->count = subcnt; /* to be used in the next loop */ |
| 307 | *skip_count += subskip; |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 308 | sub->used = 1; |
| 309 | } |
| 310 | |
| 311 | discard_unused_subtrees(it); |
| 312 | |
| 313 | /* |
| 314 | * Then write out the tree object for this level. |
| 315 | */ |
Pierre Habouzit | f1696ee | 2007-09-10 12:35:04 +0200 | [diff] [blame] | 316 | strbuf_init(&buffer, 8192); |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 317 | |
Nguyễn Thái Ngọc Duy | 386cc8b | 2012-12-16 11:15:26 +0700 | [diff] [blame] | 318 | i = 0; |
| 319 | while (i < entries) { |
Nguyễn Thái Ngọc Duy | 9c5e6c8 | 2013-07-09 22:29:00 +0700 | [diff] [blame] | 320 | const struct cache_entry *ce = cache[i]; |
Nguyễn Thái Ngọc Duy | c041d54 | 2016-07-16 07:06:26 +0200 | [diff] [blame] | 321 | struct cache_tree_sub *sub = NULL; |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 322 | const char *path, *slash; |
| 323 | int pathlen, entlen; |
| 324 | const unsigned char *sha1; |
| 325 | unsigned mode; |
Junio C Hamano | 4ed115e | 2014-09-02 14:16:20 -0700 | [diff] [blame] | 326 | int expected_missing = 0; |
Nguyễn Thái Ngọc Duy | 6d6a782 | 2016-07-16 07:06:27 +0200 | [diff] [blame] | 327 | int contains_ita = 0; |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 328 | |
| 329 | path = ce->name; |
| 330 | pathlen = ce_namelen(ce); |
| 331 | if (pathlen <= baselen || memcmp(base, path, baselen)) |
| 332 | break; /* at the end of this level */ |
| 333 | |
| 334 | slash = strchr(path + baselen, '/'); |
| 335 | if (slash) { |
| 336 | entlen = slash - (path + baselen); |
| 337 | sub = find_subtree(it, path + baselen, entlen, 0); |
| 338 | if (!sub) |
| 339 | die("cache-tree.c: '%.*s' in '%s' not found", |
| 340 | entlen, path + baselen, path); |
Nguyễn Thái Ngọc Duy | 3cf773e | 2012-12-16 11:15:27 +0700 | [diff] [blame] | 341 | i += sub->count; |
brian m. carlson | e0a9280 | 2017-05-01 02:28:56 +0000 | [diff] [blame] | 342 | sha1 = sub->cache_tree->oid.hash; |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 343 | mode = S_IFDIR; |
Nguyễn Thái Ngọc Duy | 6d6a782 | 2016-07-16 07:06:27 +0200 | [diff] [blame] | 344 | contains_ita = sub->cache_tree->entry_count < 0; |
| 345 | if (contains_ita) { |
Nguyễn Thái Ngọc Duy | eec3e7e | 2012-12-16 11:15:28 +0700 | [diff] [blame] | 346 | to_invalidate = 1; |
Junio C Hamano | 4ed115e | 2014-09-02 14:16:20 -0700 | [diff] [blame] | 347 | expected_missing = 1; |
| 348 | } |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 349 | } |
| 350 | else { |
brian m. carlson | 99d1a98 | 2016-09-05 20:07:52 +0000 | [diff] [blame] | 351 | sha1 = ce->oid.hash; |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 352 | mode = ce->ce_mode; |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 353 | entlen = pathlen - baselen; |
Nguyễn Thái Ngọc Duy | 386cc8b | 2012-12-16 11:15:26 +0700 | [diff] [blame] | 354 | i++; |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 355 | } |
Jeff King | a96d3cc | 2017-04-21 14:46:17 -0400 | [diff] [blame] | 356 | |
| 357 | if (is_null_sha1(sha1) || |
| 358 | (mode != S_IFGITLINK && !missing_ok && !has_sha1_file(sha1))) { |
Jonathan Nieder | b6b56ac | 2010-08-09 22:32:11 -0500 | [diff] [blame] | 359 | strbuf_release(&buffer); |
Junio C Hamano | 4ed115e | 2014-09-02 14:16:20 -0700 | [diff] [blame] | 360 | if (expected_missing) |
| 361 | return -1; |
Linus Torvalds | a388373 | 2009-07-14 11:25:17 -0700 | [diff] [blame] | 362 | return error("invalid object %06o %s for '%.*s'", |
| 363 | mode, sha1_to_hex(sha1), entlen+baselen, path); |
Jonathan Nieder | b6b56ac | 2010-08-09 22:32:11 -0500 | [diff] [blame] | 364 | } |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 365 | |
Nguyễn Thái Ngọc Duy | 3cf773e | 2012-12-16 11:15:27 +0700 | [diff] [blame] | 366 | /* |
| 367 | * CE_REMOVE entries are removed before the index is |
| 368 | * written to disk. Skip them to remain consistent |
| 369 | * with the future on-disk index. |
| 370 | */ |
| 371 | if (ce->ce_flags & CE_REMOVE) { |
| 372 | *skip_count = *skip_count + 1; |
| 373 | continue; |
| 374 | } |
| 375 | |
Nguyễn Thái Ngọc Duy | eec3e7e | 2012-12-16 11:15:28 +0700 | [diff] [blame] | 376 | /* |
| 377 | * CE_INTENT_TO_ADD entries exist on on-disk index but |
| 378 | * they are not part of generated trees. Invalidate up |
| 379 | * to root to force cache-tree users to read elsewhere. |
| 380 | */ |
Nguyễn Thái Ngọc Duy | c041d54 | 2016-07-16 07:06:26 +0200 | [diff] [blame] | 381 | if (!sub && ce_intent_to_add(ce)) { |
Nguyễn Thái Ngọc Duy | eec3e7e | 2012-12-16 11:15:28 +0700 | [diff] [blame] | 382 | to_invalidate = 1; |
Nguyễn Thái Ngọc Duy | 3cf773e | 2012-12-16 11:15:27 +0700 | [diff] [blame] | 383 | continue; |
Nguyễn Thái Ngọc Duy | eec3e7e | 2012-12-16 11:15:28 +0700 | [diff] [blame] | 384 | } |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 385 | |
Nguyễn Thái Ngọc Duy | 6d6a782 | 2016-07-16 07:06:27 +0200 | [diff] [blame] | 386 | /* |
| 387 | * "sub" can be an empty tree if all subentries are i-t-a. |
| 388 | */ |
| 389 | if (contains_ita && !hashcmp(sha1, EMPTY_TREE_SHA1_BIN)) |
| 390 | continue; |
| 391 | |
Pierre Habouzit | 5242bcb | 2007-09-06 13:20:11 +0200 | [diff] [blame] | 392 | strbuf_grow(&buffer, entlen + 100); |
| 393 | strbuf_addf(&buffer, "%o %.*s%c", mode, entlen, path + baselen, '\0'); |
| 394 | strbuf_add(&buffer, sha1, 20); |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 395 | |
| 396 | #if DEBUG |
Junio C Hamano | 00703e6 | 2006-05-03 16:10:45 -0700 | [diff] [blame] | 397 | fprintf(stderr, "cache-tree update-one %o %.*s\n", |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 398 | mode, entlen, path + baselen); |
| 399 | #endif |
| 400 | } |
| 401 | |
David Turner | aecf567 | 2014-07-05 21:06:56 -0700 | [diff] [blame] | 402 | if (repair) { |
| 403 | unsigned char sha1[20]; |
| 404 | hash_sha1_file(buffer.buf, buffer.len, tree_type, sha1); |
| 405 | if (has_sha1_file(sha1)) |
brian m. carlson | e0a9280 | 2017-05-01 02:28:56 +0000 | [diff] [blame] | 406 | hashcpy(it->oid.hash, sha1); |
David Turner | aecf567 | 2014-07-05 21:06:56 -0700 | [diff] [blame] | 407 | else |
| 408 | to_invalidate = 1; |
| 409 | } else if (dryrun) |
brian m. carlson | e0a9280 | 2017-05-01 02:28:56 +0000 | [diff] [blame] | 410 | hash_sha1_file(buffer.buf, buffer.len, tree_type, |
| 411 | it->oid.hash); |
| 412 | else if (write_sha1_file(buffer.buf, buffer.len, tree_type, it->oid.hash)) { |
Junio C Hamano | edae5f0 | 2008-04-23 09:47:17 -0700 | [diff] [blame] | 413 | strbuf_release(&buffer); |
| 414 | return -1; |
| 415 | } |
| 416 | |
Pierre Habouzit | 5242bcb | 2007-09-06 13:20:11 +0200 | [diff] [blame] | 417 | strbuf_release(&buffer); |
Nguyễn Thái Ngọc Duy | eec3e7e | 2012-12-16 11:15:28 +0700 | [diff] [blame] | 418 | it->entry_count = to_invalidate ? -1 : i - *skip_count; |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 419 | #if DEBUG |
Junio C Hamano | 00703e6 | 2006-05-03 16:10:45 -0700 | [diff] [blame] | 420 | fprintf(stderr, "cache-tree update-one (%d ent, %d subtree) %s\n", |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 421 | it->entry_count, it->subtree_nr, |
brian m. carlson | e0a9280 | 2017-05-01 02:28:56 +0000 | [diff] [blame] | 422 | oid_to_hex(&it->oid)); |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 423 | #endif |
| 424 | return i; |
| 425 | } |
| 426 | |
Nguyễn Thái Ngọc Duy | d0cfc3e | 2014-06-13 19:19:32 +0700 | [diff] [blame] | 427 | int cache_tree_update(struct index_state *istate, int flags) |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 428 | { |
Nguyễn Thái Ngọc Duy | d0cfc3e | 2014-06-13 19:19:32 +0700 | [diff] [blame] | 429 | struct cache_tree *it = istate->cache_tree; |
| 430 | struct cache_entry **cache = istate->cache; |
| 431 | int entries = istate->cache_nr; |
| 432 | int skip, i = verify_cache(cache, entries, flags); |
| 433 | |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 434 | if (i) |
| 435 | return i; |
Nguyễn Thái Ngọc Duy | 3cf773e | 2012-12-16 11:15:27 +0700 | [diff] [blame] | 436 | i = update_one(it, cache, entries, "", 0, &skip, flags); |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 437 | if (i < 0) |
| 438 | return i; |
Nguyễn Thái Ngọc Duy | d0cfc3e | 2014-06-13 19:19:32 +0700 | [diff] [blame] | 439 | istate->cache_changed |= CACHE_TREE_CHANGED; |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 440 | return 0; |
| 441 | } |
| 442 | |
Pierre Habouzit | 1dffb8f | 2007-09-25 10:22:44 +0200 | [diff] [blame] | 443 | static void write_one(struct strbuf *buffer, struct cache_tree *it, |
| 444 | const char *path, int pathlen) |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 445 | { |
| 446 | int i; |
| 447 | |
| 448 | /* One "cache-tree" entry consists of the following: |
| 449 | * path (NUL terminated) |
| 450 | * entry_count, subtree_nr ("%d %d\n") |
| 451 | * tree-sha1 (missing if invalid) |
| 452 | * subtree_nr "cache-tree" entries for subtrees. |
| 453 | */ |
Pierre Habouzit | 5242bcb | 2007-09-06 13:20:11 +0200 | [diff] [blame] | 454 | strbuf_grow(buffer, pathlen + 100); |
| 455 | strbuf_add(buffer, path, pathlen); |
| 456 | strbuf_addf(buffer, "%c%d %d\n", 0, it->entry_count, it->subtree_nr); |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 457 | |
| 458 | #if DEBUG |
| 459 | if (0 <= it->entry_count) |
| 460 | fprintf(stderr, "cache-tree <%.*s> (%d ent, %d subtree) %s\n", |
| 461 | pathlen, path, it->entry_count, it->subtree_nr, |
brian m. carlson | e0a9280 | 2017-05-01 02:28:56 +0000 | [diff] [blame] | 462 | oid_to_hex(&it->oid)); |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 463 | else |
| 464 | fprintf(stderr, "cache-tree <%.*s> (%d subtree) invalid\n", |
| 465 | pathlen, path, it->subtree_nr); |
| 466 | #endif |
| 467 | |
| 468 | if (0 <= it->entry_count) { |
brian m. carlson | e0a9280 | 2017-05-01 02:28:56 +0000 | [diff] [blame] | 469 | strbuf_add(buffer, it->oid.hash, 20); |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 470 | } |
| 471 | for (i = 0; i < it->subtree_nr; i++) { |
| 472 | struct cache_tree_sub *down = it->down[i]; |
Junio C Hamano | 61fa309 | 2006-04-25 17:40:02 -0700 | [diff] [blame] | 473 | if (i) { |
| 474 | struct cache_tree_sub *prev = it->down[i-1]; |
| 475 | if (subtree_name_cmp(down->name, down->namelen, |
| 476 | prev->name, prev->namelen) <= 0) |
| 477 | die("fatal - unsorted cache subtree"); |
| 478 | } |
Pierre Habouzit | 1dffb8f | 2007-09-25 10:22:44 +0200 | [diff] [blame] | 479 | write_one(buffer, down->cache_tree, down->name, down->namelen); |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 480 | } |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 481 | } |
| 482 | |
Pierre Habouzit | 1dffb8f | 2007-09-25 10:22:44 +0200 | [diff] [blame] | 483 | void cache_tree_write(struct strbuf *sb, struct cache_tree *root) |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 484 | { |
Pierre Habouzit | 1dffb8f | 2007-09-25 10:22:44 +0200 | [diff] [blame] | 485 | write_one(sb, root, "", 0); |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 486 | } |
| 487 | |
| 488 | static struct cache_tree *read_one(const char **buffer, unsigned long *size_p) |
| 489 | { |
| 490 | const char *buf = *buffer; |
| 491 | unsigned long size = *size_p; |
Johannes Schindelin | 0111ea3 | 2006-05-02 03:31:02 +0200 | [diff] [blame] | 492 | const char *cp; |
| 493 | char *ep; |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 494 | struct cache_tree *it; |
| 495 | int i, subtree_nr; |
| 496 | |
| 497 | it = NULL; |
| 498 | /* skip name, but make sure name exists */ |
| 499 | while (size && *buf) { |
| 500 | size--; |
| 501 | buf++; |
| 502 | } |
| 503 | if (!size) |
| 504 | goto free_return; |
| 505 | buf++; size--; |
| 506 | it = cache_tree(); |
Johannes Schindelin | 0111ea3 | 2006-05-02 03:31:02 +0200 | [diff] [blame] | 507 | |
| 508 | cp = buf; |
| 509 | it->entry_count = strtol(cp, &ep, 10); |
| 510 | if (cp == ep) |
| 511 | goto free_return; |
| 512 | cp = ep; |
| 513 | subtree_nr = strtol(cp, &ep, 10); |
| 514 | if (cp == ep) |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 515 | goto free_return; |
| 516 | while (size && *buf && *buf != '\n') { |
| 517 | size--; |
| 518 | buf++; |
| 519 | } |
| 520 | if (!size) |
| 521 | goto free_return; |
| 522 | buf++; size--; |
| 523 | if (0 <= it->entry_count) { |
| 524 | if (size < 20) |
| 525 | goto free_return; |
brian m. carlson | e0a9280 | 2017-05-01 02:28:56 +0000 | [diff] [blame] | 526 | hashcpy(it->oid.hash, (const unsigned char*)buf); |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 527 | buf += 20; |
| 528 | size -= 20; |
| 529 | } |
| 530 | |
| 531 | #if DEBUG |
| 532 | if (0 <= it->entry_count) |
| 533 | fprintf(stderr, "cache-tree <%s> (%d ent, %d subtree) %s\n", |
| 534 | *buffer, it->entry_count, subtree_nr, |
brian m. carlson | e0a9280 | 2017-05-01 02:28:56 +0000 | [diff] [blame] | 535 | oid_to_hex(&it->oid)); |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 536 | else |
| 537 | fprintf(stderr, "cache-tree <%s> (%d subtrees) invalid\n", |
| 538 | *buffer, subtree_nr); |
| 539 | #endif |
| 540 | |
| 541 | /* |
| 542 | * Just a heuristic -- we do not add directories that often but |
| 543 | * we do not want to have to extend it immediately when we do, |
| 544 | * hence +2. |
| 545 | */ |
| 546 | it->subtree_alloc = subtree_nr + 2; |
| 547 | it->down = xcalloc(it->subtree_alloc, sizeof(struct cache_tree_sub *)); |
| 548 | for (i = 0; i < subtree_nr; i++) { |
| 549 | /* read each subtree */ |
| 550 | struct cache_tree *sub; |
Junio C Hamano | 61fa309 | 2006-04-25 17:40:02 -0700 | [diff] [blame] | 551 | struct cache_tree_sub *subtree; |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 552 | const char *name = buf; |
Junio C Hamano | 7927a55 | 2006-04-27 01:33:07 -0700 | [diff] [blame] | 553 | |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 554 | sub = read_one(&buf, &size); |
| 555 | if (!sub) |
| 556 | goto free_return; |
Junio C Hamano | 7927a55 | 2006-04-27 01:33:07 -0700 | [diff] [blame] | 557 | subtree = cache_tree_sub(it, name); |
Junio C Hamano | 61fa309 | 2006-04-25 17:40:02 -0700 | [diff] [blame] | 558 | subtree->cache_tree = sub; |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 559 | } |
| 560 | if (subtree_nr != it->subtree_nr) |
| 561 | die("cache-tree: internal error"); |
| 562 | *buffer = buf; |
| 563 | *size_p = size; |
| 564 | return it; |
| 565 | |
| 566 | free_return: |
Junio C Hamano | bad68ec | 2006-04-24 21:18:58 -0700 | [diff] [blame] | 567 | cache_tree_free(&it); |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 568 | return NULL; |
| 569 | } |
| 570 | |
Junio C Hamano | bad68ec | 2006-04-24 21:18:58 -0700 | [diff] [blame] | 571 | struct cache_tree *cache_tree_read(const char *buffer, unsigned long size) |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 572 | { |
Junio C Hamano | bad68ec | 2006-04-24 21:18:58 -0700 | [diff] [blame] | 573 | if (buffer[0]) |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 574 | return NULL; /* not the whole tree */ |
Junio C Hamano | 7498646 | 2006-04-23 16:52:20 -0700 | [diff] [blame] | 575 | return read_one(&buffer, &size); |
| 576 | } |
Junio C Hamano | 6bd2035 | 2006-04-26 01:20:50 -0700 | [diff] [blame] | 577 | |
Nanako Shiraishi | 7ba04d9 | 2008-07-16 19:42:10 +0900 | [diff] [blame] | 578 | static struct cache_tree *cache_tree_find(struct cache_tree *it, const char *path) |
Junio C Hamano | 6bd2035 | 2006-04-26 01:20:50 -0700 | [diff] [blame] | 579 | { |
Junio C Hamano | b87fc96 | 2009-05-20 15:53:57 -0700 | [diff] [blame] | 580 | if (!it) |
| 581 | return NULL; |
Junio C Hamano | 6bd2035 | 2006-04-26 01:20:50 -0700 | [diff] [blame] | 582 | while (*path) { |
| 583 | const char *slash; |
| 584 | struct cache_tree_sub *sub; |
| 585 | |
Michael Haggerty | 17e22dd | 2014-03-05 18:26:26 +0100 | [diff] [blame] | 586 | slash = strchrnul(path, '/'); |
Michael Haggerty | 79192b8 | 2014-03-05 18:26:27 +0100 | [diff] [blame] | 587 | /* |
| 588 | * Between path and slash is the name of the subtree |
| 589 | * to look for. |
Junio C Hamano | 6bd2035 | 2006-04-26 01:20:50 -0700 | [diff] [blame] | 590 | */ |
| 591 | sub = find_subtree(it, path, slash - path, 0); |
| 592 | if (!sub) |
| 593 | return NULL; |
| 594 | it = sub->cache_tree; |
Michael Haggerty | 3491047 | 2014-03-05 18:26:30 +0100 | [diff] [blame] | 595 | |
Junio C Hamano | 6bd2035 | 2006-04-26 01:20:50 -0700 | [diff] [blame] | 596 | path = slash; |
Michael Haggerty | 3491047 | 2014-03-05 18:26:30 +0100 | [diff] [blame] | 597 | while (*path == '/') |
| 598 | path++; |
Junio C Hamano | 6bd2035 | 2006-04-26 01:20:50 -0700 | [diff] [blame] | 599 | } |
| 600 | return it; |
| 601 | } |
Junio C Hamano | 45525bd | 2008-01-10 22:49:35 -0800 | [diff] [blame] | 602 | |
Paul Tan | d23a511 | 2015-08-04 21:51:40 +0800 | [diff] [blame] | 603 | int write_index_as_tree(unsigned char *sha1, struct index_state *index_state, const char *index_path, int flags, const char *prefix) |
Junio C Hamano | 45525bd | 2008-01-10 22:49:35 -0800 | [diff] [blame] | 604 | { |
| 605 | int entries, was_valid, newfd; |
Junio C Hamano | d11b8d3 | 2009-05-20 11:04:35 -0700 | [diff] [blame] | 606 | struct lock_file *lock_file; |
Junio C Hamano | 45525bd | 2008-01-10 22:49:35 -0800 | [diff] [blame] | 607 | |
| 608 | /* |
| 609 | * We can't free this memory, it becomes part of a linked list |
| 610 | * parsed atexit() |
| 611 | */ |
Junio C Hamano | d11b8d3 | 2009-05-20 11:04:35 -0700 | [diff] [blame] | 612 | lock_file = xcalloc(1, sizeof(struct lock_file)); |
Junio C Hamano | 45525bd | 2008-01-10 22:49:35 -0800 | [diff] [blame] | 613 | |
Paul Tan | d23a511 | 2015-08-04 21:51:40 +0800 | [diff] [blame] | 614 | newfd = hold_lock_file_for_update(lock_file, index_path, LOCK_DIE_ON_ERROR); |
Junio C Hamano | 45525bd | 2008-01-10 22:49:35 -0800 | [diff] [blame] | 615 | |
Paul Tan | d23a511 | 2015-08-04 21:51:40 +0800 | [diff] [blame] | 616 | entries = read_index_from(index_state, index_path); |
Junio C Hamano | 45525bd | 2008-01-10 22:49:35 -0800 | [diff] [blame] | 617 | if (entries < 0) |
| 618 | return WRITE_TREE_UNREADABLE_INDEX; |
Junio C Hamano | d11b8d3 | 2009-05-20 11:04:35 -0700 | [diff] [blame] | 619 | if (flags & WRITE_TREE_IGNORE_CACHE_TREE) |
Paul Tan | d23a511 | 2015-08-04 21:51:40 +0800 | [diff] [blame] | 620 | cache_tree_free(&index_state->cache_tree); |
Junio C Hamano | 45525bd | 2008-01-10 22:49:35 -0800 | [diff] [blame] | 621 | |
Paul Tan | d23a511 | 2015-08-04 21:51:40 +0800 | [diff] [blame] | 622 | if (!index_state->cache_tree) |
| 623 | index_state->cache_tree = cache_tree(); |
Junio C Hamano | 45525bd | 2008-01-10 22:49:35 -0800 | [diff] [blame] | 624 | |
Paul Tan | d23a511 | 2015-08-04 21:51:40 +0800 | [diff] [blame] | 625 | was_valid = cache_tree_fully_valid(index_state->cache_tree); |
Junio C Hamano | 45525bd | 2008-01-10 22:49:35 -0800 | [diff] [blame] | 626 | if (!was_valid) { |
Paul Tan | d23a511 | 2015-08-04 21:51:40 +0800 | [diff] [blame] | 627 | if (cache_tree_update(index_state, flags) < 0) |
Junio C Hamano | 45525bd | 2008-01-10 22:49:35 -0800 | [diff] [blame] | 628 | return WRITE_TREE_UNMERGED_INDEX; |
| 629 | if (0 <= newfd) { |
Paul Tan | d23a511 | 2015-08-04 21:51:40 +0800 | [diff] [blame] | 630 | if (!write_locked_index(index_state, lock_file, COMMIT_LOCK)) |
Junio C Hamano | 45525bd | 2008-01-10 22:49:35 -0800 | [diff] [blame] | 631 | newfd = -1; |
| 632 | } |
| 633 | /* Not being able to write is fine -- we are only interested |
| 634 | * in updating the cache-tree part, and if the next caller |
| 635 | * ends up using the old index with unupdated cache-tree part |
| 636 | * it misses the work we did here, but that is just a |
| 637 | * performance penalty and not a big deal. |
| 638 | */ |
| 639 | } |
| 640 | |
| 641 | if (prefix) { |
Paul Tan | d23a511 | 2015-08-04 21:51:40 +0800 | [diff] [blame] | 642 | struct cache_tree *subtree; |
| 643 | subtree = cache_tree_find(index_state->cache_tree, prefix); |
Junio C Hamano | 45525bd | 2008-01-10 22:49:35 -0800 | [diff] [blame] | 644 | if (!subtree) |
| 645 | return WRITE_TREE_PREFIX_ERROR; |
brian m. carlson | e0a9280 | 2017-05-01 02:28:56 +0000 | [diff] [blame] | 646 | hashcpy(sha1, subtree->oid.hash); |
Junio C Hamano | 45525bd | 2008-01-10 22:49:35 -0800 | [diff] [blame] | 647 | } |
| 648 | else |
brian m. carlson | e0a9280 | 2017-05-01 02:28:56 +0000 | [diff] [blame] | 649 | hashcpy(sha1, index_state->cache_tree->oid.hash); |
Junio C Hamano | 45525bd | 2008-01-10 22:49:35 -0800 | [diff] [blame] | 650 | |
| 651 | if (0 <= newfd) |
| 652 | rollback_lock_file(lock_file); |
| 653 | |
| 654 | return 0; |
| 655 | } |
Junio C Hamano | b9d37a5 | 2009-04-20 03:58:18 -0700 | [diff] [blame] | 656 | |
Paul Tan | d23a511 | 2015-08-04 21:51:40 +0800 | [diff] [blame] | 657 | int write_cache_as_tree(unsigned char *sha1, int flags, const char *prefix) |
| 658 | { |
| 659 | return write_index_as_tree(sha1, &the_index, get_index_file(), flags, prefix); |
| 660 | } |
| 661 | |
Junio C Hamano | b9d37a5 | 2009-04-20 03:58:18 -0700 | [diff] [blame] | 662 | static void prime_cache_tree_rec(struct cache_tree *it, struct tree *tree) |
| 663 | { |
| 664 | struct tree_desc desc; |
| 665 | struct name_entry entry; |
| 666 | int cnt; |
| 667 | |
brian m. carlson | e0a9280 | 2017-05-01 02:28:56 +0000 | [diff] [blame] | 668 | oidcpy(&it->oid, &tree->object.oid); |
Junio C Hamano | b9d37a5 | 2009-04-20 03:58:18 -0700 | [diff] [blame] | 669 | init_tree_desc(&desc, tree->buffer, tree->size); |
| 670 | cnt = 0; |
| 671 | while (tree_entry(&desc, &entry)) { |
| 672 | if (!S_ISDIR(entry.mode)) |
| 673 | cnt++; |
| 674 | else { |
| 675 | struct cache_tree_sub *sub; |
brian m. carlson | 740ee05 | 2017-05-06 22:10:17 +0000 | [diff] [blame] | 676 | struct tree *subtree = lookup_tree(entry.oid); |
Junio C Hamano | b9d37a5 | 2009-04-20 03:58:18 -0700 | [diff] [blame] | 677 | if (!subtree->object.parsed) |
| 678 | parse_tree(subtree); |
| 679 | sub = cache_tree_sub(it, entry.path); |
| 680 | sub->cache_tree = cache_tree(); |
| 681 | prime_cache_tree_rec(sub->cache_tree, subtree); |
| 682 | cnt += sub->cache_tree->entry_count; |
| 683 | } |
| 684 | } |
| 685 | it->entry_count = cnt; |
| 686 | } |
| 687 | |
Nguyễn Thái Ngọc Duy | e6c286e | 2014-06-13 19:19:33 +0700 | [diff] [blame] | 688 | void prime_cache_tree(struct index_state *istate, struct tree *tree) |
Junio C Hamano | b9d37a5 | 2009-04-20 03:58:18 -0700 | [diff] [blame] | 689 | { |
Nguyễn Thái Ngọc Duy | e6c286e | 2014-06-13 19:19:33 +0700 | [diff] [blame] | 690 | cache_tree_free(&istate->cache_tree); |
| 691 | istate->cache_tree = cache_tree(); |
| 692 | prime_cache_tree_rec(istate->cache_tree, tree); |
| 693 | istate->cache_changed |= CACHE_TREE_CHANGED; |
Junio C Hamano | b9d37a5 | 2009-04-20 03:58:18 -0700 | [diff] [blame] | 694 | } |
Junio C Hamano | b65982b | 2009-05-20 15:57:22 -0700 | [diff] [blame] | 695 | |
| 696 | /* |
| 697 | * find the cache_tree that corresponds to the current level without |
| 698 | * exploding the full path into textual form. The root of the |
| 699 | * cache tree is given as "root", and our current level is "info". |
| 700 | * (1) When at root level, info->prev is NULL, so it is "root" itself. |
| 701 | * (2) Otherwise, find the cache_tree that corresponds to one level |
| 702 | * above us, and find ourselves in there. |
| 703 | */ |
| 704 | static struct cache_tree *find_cache_tree_from_traversal(struct cache_tree *root, |
| 705 | struct traverse_info *info) |
| 706 | { |
| 707 | struct cache_tree *our_parent; |
| 708 | |
| 709 | if (!info->prev) |
| 710 | return root; |
| 711 | our_parent = find_cache_tree_from_traversal(root, info->prev); |
| 712 | return cache_tree_find(our_parent, info->name.path); |
| 713 | } |
| 714 | |
| 715 | int cache_tree_matches_traversal(struct cache_tree *root, |
| 716 | struct name_entry *ent, |
| 717 | struct traverse_info *info) |
| 718 | { |
| 719 | struct cache_tree *it; |
| 720 | |
| 721 | it = find_cache_tree_from_traversal(root, info); |
| 722 | it = cache_tree_find(it, ent->path); |
brian m. carlson | e0a9280 | 2017-05-01 02:28:56 +0000 | [diff] [blame] | 723 | if (it && it->entry_count > 0 && !oidcmp(ent->oid, &it->oid)) |
Junio C Hamano | b65982b | 2009-05-20 15:57:22 -0700 | [diff] [blame] | 724 | return it->entry_count; |
| 725 | return 0; |
| 726 | } |
Thomas Rast | 996277c | 2011-12-06 18:43:37 +0100 | [diff] [blame] | 727 | |
Nguyễn Thái Ngọc Duy | e859c69 | 2012-01-16 09:36:46 +0700 | [diff] [blame] | 728 | int update_main_cache_tree(int flags) |
Thomas Rast | 996277c | 2011-12-06 18:43:37 +0100 | [diff] [blame] | 729 | { |
| 730 | if (!the_index.cache_tree) |
| 731 | the_index.cache_tree = cache_tree(); |
Nguyễn Thái Ngọc Duy | d0cfc3e | 2014-06-13 19:19:32 +0700 | [diff] [blame] | 732 | return cache_tree_update(&the_index, flags); |
Thomas Rast | 996277c | 2011-12-06 18:43:37 +0100 | [diff] [blame] | 733 | } |