]>
Commit | Line | Data |
---|---|---|
b6fdc44c | 1 | #include "git-compat-util.h" |
fa796530 | 2 | #include "config.h" |
f394e093 | 3 | #include "gettext.h" |
41771fa4 | 4 | #include "hex.h" |
08fd81c9 DS |
5 | #include "lockfile.h" |
6 | #include "pack.h" | |
7 | #include "packfile.h" | |
8 | #include "commit.h" | |
9 | #include "object.h" | |
59fb8770 | 10 | #include "refs.h" |
08fd81c9 | 11 | #include "revision.h" |
bc626927 | 12 | #include "hash-lookup.h" |
08fd81c9 | 13 | #include "commit-graph.h" |
87bed179 | 14 | #include "object-file.h" |
a034e910 | 15 | #include "object-store-ll.h" |
6f2d7430 | 16 | #include "oid-array.h" |
c339932b | 17 | #include "path.h" |
96af91d4 | 18 | #include "alloc.h" |
d6538246 DS |
19 | #include "hashmap.h" |
20 | #include "replace-object.h" | |
7b0f2292 | 21 | #include "progress.h" |
f97b9325 | 22 | #include "bloom.h" |
d21ee7d1 | 23 | #include "commit-slab.h" |
120ad2b0 | 24 | #include "shallow.h" |
0087a87b DS |
25 | #include "json-writer.h" |
26 | #include "trace2.h" | |
d4a4f929 | 27 | #include "tree.h" |
47410aa8 | 28 | #include "chunk-format.h" |
08fd81c9 | 29 | |
b23ea979 DS |
30 | void git_test_write_commit_graph_or_die(void) |
31 | { | |
32 | int flags = 0; | |
33 | if (!git_env_bool(GIT_TEST_COMMIT_GRAPH, 0)) | |
34 | return; | |
35 | ||
36 | if (git_env_bool(GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS, 0)) | |
37 | flags = COMMIT_GRAPH_WRITE_BLOOM_FILTERS; | |
38 | ||
39 | if (write_commit_graph_reachable(the_repository->objects->odb, | |
40 | flags, NULL)) | |
41 | die("failed to write commit-graph under GIT_TEST_COMMIT_GRAPH"); | |
42 | } | |
43 | ||
08fd81c9 DS |
44 | #define GRAPH_SIGNATURE 0x43475048 /* "CGPH" */ |
45 | #define GRAPH_CHUNKID_OIDFANOUT 0x4f494446 /* "OIDF" */ | |
46 | #define GRAPH_CHUNKID_OIDLOOKUP 0x4f49444c /* "OIDL" */ | |
47 | #define GRAPH_CHUNKID_DATA 0x43444154 /* "CDAT" */ | |
6dbf4b81 DS |
48 | #define GRAPH_CHUNKID_GENERATION_DATA 0x47444132 /* "GDA2" */ |
49 | #define GRAPH_CHUNKID_GENERATION_DATA_OVERFLOW 0x47444f32 /* "GDO2" */ | |
5af7417b | 50 | #define GRAPH_CHUNKID_EXTRAEDGES 0x45444745 /* "EDGE" */ |
76ffbca7 GS |
51 | #define GRAPH_CHUNKID_BLOOMINDEXES 0x42494458 /* "BIDX" */ |
52 | #define GRAPH_CHUNKID_BLOOMDATA 0x42444154 /* "BDAT" */ | |
118bd570 | 53 | #define GRAPH_CHUNKID_BASE 0x42415345 /* "BASE" */ |
08fd81c9 | 54 | |
c1665998 | 55 | #define GRAPH_DATA_WIDTH (the_hash_algo->rawsz + 16) |
08fd81c9 DS |
56 | |
57 | #define GRAPH_VERSION_1 0x1 | |
58 | #define GRAPH_VERSION GRAPH_VERSION_1 | |
59 | ||
5af7417b | 60 | #define GRAPH_EXTRA_EDGES_NEEDED 0x80000000 |
08fd81c9 DS |
61 | #define GRAPH_EDGE_LAST_MASK 0x7fffffff |
62 | #define GRAPH_PARENT_NONE 0x70000000 | |
63 | ||
64 | #define GRAPH_LAST_EDGE 0x80000000 | |
65 | ||
0e3b97cc | 66 | #define GRAPH_HEADER_SIZE 8 |
08fd81c9 | 67 | #define GRAPH_FANOUT_SIZE (4 * 256) |
2692c2f6 | 68 | #define GRAPH_MIN_SIZE (GRAPH_HEADER_SIZE + 4 * CHUNK_TOC_ENTRY_SIZE \ |
c1665998 | 69 | + GRAPH_FANOUT_SIZE + the_hash_algo->rawsz) |
08fd81c9 | 70 | |
e8b63005 AK |
71 | #define CORRECTED_COMMIT_DATE_OFFSET_OVERFLOW (1ULL << 31) |
72 | ||
cb99a34e DS |
73 | /* Remember to update object flag allocation in object.h */ |
74 | #define REACHABLE (1u<<15) | |
75 | ||
72a2bfca AK |
76 | define_commit_slab(topo_level_slab, uint32_t); |
77 | ||
d21ee7d1 JK |
78 | /* Keep track of the order in which commits are added to our list. */ |
79 | define_commit_slab(commit_pos, int); | |
80 | static struct commit_pos commit_pos = COMMIT_SLAB_INIT(1, commit_pos); | |
81 | ||
82 | static void set_commit_pos(struct repository *r, const struct object_id *oid) | |
83 | { | |
84 | static int32_t max_pos; | |
85 | struct commit *commit = lookup_commit(r, oid); | |
86 | ||
87 | if (!commit) | |
88 | return; /* should never happen, but be lenient */ | |
89 | ||
90 | *commit_pos_at(&commit_pos, commit) = max_pos++; | |
91 | } | |
92 | ||
93 | static int commit_pos_cmp(const void *va, const void *vb) | |
08fd81c9 | 94 | { |
d21ee7d1 JK |
95 | const struct commit *a = *(const struct commit **)va; |
96 | const struct commit *b = *(const struct commit **)vb; | |
97 | return commit_pos_at(&commit_pos, a) - | |
98 | commit_pos_at(&commit_pos, b); | |
99 | } | |
100 | ||
4844812b AK |
101 | define_commit_slab(commit_graph_data_slab, struct commit_graph_data); |
102 | static struct commit_graph_data_slab commit_graph_data_slab = | |
103 | COMMIT_SLAB_INIT(1, commit_graph_data_slab); | |
104 | ||
702110aa DS |
105 | static int get_configured_generation_version(struct repository *r) |
106 | { | |
107 | int version = 2; | |
108 | repo_config_get_int(r, "commitgraph.generationversion", &version); | |
109 | return version; | |
110 | } | |
111 | ||
4844812b AK |
112 | uint32_t commit_graph_position(const struct commit *c) |
113 | { | |
114 | struct commit_graph_data *data = | |
115 | commit_graph_data_slab_peek(&commit_graph_data_slab, c); | |
116 | ||
117 | return data ? data->graph_pos : COMMIT_NOT_FROM_GRAPH; | |
118 | } | |
119 | ||
d7f92784 | 120 | timestamp_t commit_graph_generation(const struct commit *c) |
4844812b AK |
121 | { |
122 | struct commit_graph_data *data = | |
123 | commit_graph_data_slab_peek(&commit_graph_data_slab, c); | |
124 | ||
2ee11f72 DS |
125 | if (data && data->generation) |
126 | return data->generation; | |
4844812b | 127 | |
2ee11f72 | 128 | return GENERATION_NUMBER_INFINITY; |
4844812b AK |
129 | } |
130 | ||
868c9911 TB |
131 | static timestamp_t commit_graph_generation_from_graph(const struct commit *c) |
132 | { | |
133 | struct commit_graph_data *data = | |
134 | commit_graph_data_slab_peek(&commit_graph_data_slab, c); | |
135 | ||
136 | if (!data || data->graph_pos == COMMIT_NOT_FROM_GRAPH) | |
137 | return GENERATION_NUMBER_INFINITY; | |
138 | return data->generation; | |
139 | } | |
140 | ||
4844812b AK |
141 | static struct commit_graph_data *commit_graph_data_at(const struct commit *c) |
142 | { | |
143 | unsigned int i, nth_slab; | |
144 | struct commit_graph_data *data = | |
145 | commit_graph_data_slab_peek(&commit_graph_data_slab, c); | |
146 | ||
147 | if (data) | |
148 | return data; | |
149 | ||
150 | nth_slab = c->index / commit_graph_data_slab.slab_size; | |
151 | data = commit_graph_data_slab_at(&commit_graph_data_slab, c); | |
152 | ||
153 | /* | |
154 | * commit-slab initializes elements with zero, overwrite this with | |
155 | * COMMIT_NOT_FROM_GRAPH for graph_pos. | |
156 | * | |
157 | * We avoid initializing generation with checking if graph position | |
158 | * is not COMMIT_NOT_FROM_GRAPH. | |
159 | */ | |
160 | for (i = 0; i < commit_graph_data_slab.slab_size; i++) { | |
161 | commit_graph_data_slab.slab[nth_slab][i].graph_pos = | |
162 | COMMIT_NOT_FROM_GRAPH; | |
163 | } | |
164 | ||
165 | return data; | |
166 | } | |
167 | ||
e30c5ee7 AK |
168 | /* |
169 | * Should be used only while writing commit-graph as it compares | |
170 | * generation value of commits by directly accessing commit-slab. | |
171 | */ | |
3d112755 GS |
172 | static int commit_gen_cmp(const void *va, const void *vb) |
173 | { | |
174 | const struct commit *a = *(const struct commit **)va; | |
175 | const struct commit *b = *(const struct commit **)vb; | |
176 | ||
d7f92784 AK |
177 | const timestamp_t generation_a = commit_graph_data_at(a)->generation; |
178 | const timestamp_t generation_b = commit_graph_data_at(b)->generation; | |
3d112755 | 179 | /* lower generation commits first */ |
c752ad09 | 180 | if (generation_a < generation_b) |
3d112755 | 181 | return -1; |
c752ad09 | 182 | else if (generation_a > generation_b) |
3d112755 GS |
183 | return 1; |
184 | ||
185 | /* use date as a heuristic when generations are equal */ | |
186 | if (a->date < b->date) | |
187 | return -1; | |
188 | else if (a->date > b->date) | |
189 | return 1; | |
190 | return 0; | |
191 | } | |
192 | ||
d21ee7d1 | 193 | char *get_commit_graph_filename(struct object_directory *obj_dir) |
08fd81c9 | 194 | { |
d21ee7d1 | 195 | return xstrfmt("%s/info/commit-graph", obj_dir->path); |
08fd81c9 DS |
196 | } |
197 | ||
ad2dd5bb | 198 | static char *get_split_graph_filename(struct object_directory *odb, |
5c84b339 DS |
199 | const char *oid_hex) |
200 | { | |
ad2dd5bb TB |
201 | return xstrfmt("%s/info/commit-graphs/graph-%s.graph", odb->path, |
202 | oid_hex); | |
5c84b339 DS |
203 | } |
204 | ||
663b2b1b | 205 | char *get_commit_graph_chain_filename(struct object_directory *odb) |
5c84b339 | 206 | { |
ad2dd5bb | 207 | return xstrfmt("%s/info/commit-graphs/commit-graph-chain", odb->path); |
08fd81c9 DS |
208 | } |
209 | ||
2a2e32bd DS |
210 | static struct commit_graph *alloc_commit_graph(void) |
211 | { | |
212 | struct commit_graph *g = xcalloc(1, sizeof(*g)); | |
2a2e32bd DS |
213 | |
214 | return g; | |
215 | } | |
216 | ||
d6538246 DS |
217 | static int commit_graph_compatible(struct repository *r) |
218 | { | |
5cef295f DS |
219 | if (!r->gitdir) |
220 | return 0; | |
221 | ||
f1178380 | 222 | if (replace_refs_enabled(r)) { |
d6538246 | 223 | prepare_replace_object(r); |
cdc986a7 | 224 | if (hashmap_get_size(&r->objects->replace_map->map)) |
d6538246 DS |
225 | return 0; |
226 | } | |
227 | ||
20fd6d57 | 228 | prepare_commit_graft(r); |
ce16364e | 229 | if (r->parsed_objects && |
cdc986a7 | 230 | (r->parsed_objects->grafts_nr || r->parsed_objects->substituted_parent)) |
20fd6d57 | 231 | return 0; |
cdc986a7 | 232 | if (is_repository_shallow(r)) |
20fd6d57 DS |
233 | return 0; |
234 | ||
d6538246 DS |
235 | return 1; |
236 | } | |
237 | ||
61df89c8 ÆAB |
238 | int open_commit_graph(const char *graph_file, int *fd, struct stat *st) |
239 | { | |
240 | *fd = git_open(graph_file); | |
241 | if (*fd < 0) | |
242 | return 0; | |
243 | if (fstat(*fd, st)) { | |
244 | close(*fd); | |
245 | return 0; | |
246 | } | |
247 | return 1; | |
248 | } | |
249 | ||
ab14d067 TB |
250 | struct commit_graph *load_commit_graph_one_fd_st(struct repository *r, |
251 | int fd, struct stat *st, | |
a7df60ca | 252 | struct object_directory *odb) |
2a2e32bd DS |
253 | { |
254 | void *graph_map; | |
2a2e32bd | 255 | size_t graph_size; |
aa658574 | 256 | struct commit_graph *ret; |
2a2e32bd | 257 | |
61df89c8 | 258 | graph_size = xsize_t(st->st_size); |
2a2e32bd DS |
259 | |
260 | if (graph_size < GRAPH_MIN_SIZE) { | |
261 | close(fd); | |
67a530fa | 262 | error(_("commit-graph file is too small")); |
61df89c8 | 263 | return NULL; |
2a2e32bd DS |
264 | } |
265 | graph_map = xmmap(NULL, graph_size, PROT_READ, MAP_PRIVATE, fd, 0); | |
c8828530 | 266 | close(fd); |
a92d8523 TB |
267 | prepare_repo_settings(r); |
268 | ret = parse_commit_graph(&r->settings, graph_map, graph_size); | |
aa658574 | 269 | |
a7df60ca TB |
270 | if (ret) |
271 | ret->odb = odb; | |
c8828530 | 272 | else |
aa658574 | 273 | munmap(graph_map, graph_size); |
aa658574 JS |
274 | |
275 | return ret; | |
276 | } | |
277 | ||
2ac138d5 ÆAB |
278 | static int verify_commit_graph_lite(struct commit_graph *g) |
279 | { | |
4169d896 JK |
280 | int i; |
281 | ||
2ac138d5 ÆAB |
282 | /* |
283 | * Basic validation shared between parse_commit_graph() | |
284 | * which'll be called every time the graph is used, and the | |
285 | * much more expensive verify_commit_graph() used by | |
286 | * "commit-graph verify". | |
287 | * | |
288 | * There should only be very basic checks here to ensure that | |
289 | * we don't e.g. segfault in fill_commit_in_graph(), but | |
290 | * because this is a very hot codepath nothing that e.g. loops | |
291 | * over g->num_commits, or runs a checksum on the commit-graph | |
292 | * itself. | |
293 | */ | |
294 | if (!g->chunk_oid_fanout) { | |
295 | error("commit-graph is missing the OID Fanout chunk"); | |
296 | return 1; | |
297 | } | |
298 | if (!g->chunk_oid_lookup) { | |
299 | error("commit-graph is missing the OID Lookup chunk"); | |
300 | return 1; | |
301 | } | |
302 | if (!g->chunk_commit_data) { | |
303 | error("commit-graph is missing the Commit Data chunk"); | |
304 | return 1; | |
305 | } | |
306 | ||
4169d896 JK |
307 | for (i = 0; i < 255; i++) { |
308 | uint32_t oid_fanout1 = ntohl(g->chunk_oid_fanout[i]); | |
309 | uint32_t oid_fanout2 = ntohl(g->chunk_oid_fanout[i + 1]); | |
310 | ||
311 | if (oid_fanout1 > oid_fanout2) { | |
312 | error("commit-graph fanout values out of order"); | |
313 | return 1; | |
314 | } | |
315 | } | |
316 | if (ntohl(g->chunk_oid_fanout[255]) != g->num_commits) { | |
317 | error("commit-graph oid table and fanout disagree on size"); | |
318 | return 1; | |
319 | } | |
320 | ||
2ac138d5 ÆAB |
321 | return 0; |
322 | } | |
323 | ||
52e2e8d4 JK |
324 | static int graph_read_oid_fanout(const unsigned char *chunk_start, |
325 | size_t chunk_size, void *data) | |
326 | { | |
327 | struct commit_graph *g = data; | |
328 | if (chunk_size != 256 * sizeof(uint32_t)) | |
329 | return error("commit-graph oid fanout chunk is wrong size"); | |
330 | g->chunk_oid_fanout = (const uint32_t *)chunk_start; | |
2ac138d5 ÆAB |
331 | return 0; |
332 | } | |
333 | ||
2692c2f6 DS |
334 | static int graph_read_oid_lookup(const unsigned char *chunk_start, |
335 | size_t chunk_size, void *data) | |
336 | { | |
337 | struct commit_graph *g = data; | |
338 | g->chunk_oid_lookup = chunk_start; | |
339 | g->num_commits = chunk_size / g->hash_len; | |
340 | return 0; | |
341 | } | |
342 | ||
b72df612 JK |
343 | static int graph_read_commit_data(const unsigned char *chunk_start, |
344 | size_t chunk_size, void *data) | |
345 | { | |
346 | struct commit_graph *g = data; | |
347 | if (chunk_size != g->num_commits * GRAPH_DATA_WIDTH) | |
348 | return error("commit-graph commit data chunk is wrong size"); | |
349 | g->chunk_commit_data = chunk_start; | |
350 | return 0; | |
351 | } | |
352 | ||
4a3c3466 JK |
353 | static int graph_read_generation_data(const unsigned char *chunk_start, |
354 | size_t chunk_size, void *data) | |
355 | { | |
356 | struct commit_graph *g = data; | |
357 | if (chunk_size != g->num_commits * sizeof(uint32_t)) | |
358 | return error("commit-graph generations chunk is wrong size"); | |
359 | g->chunk_generation_data = chunk_start; | |
360 | return 0; | |
361 | } | |
362 | ||
581e0f8b JK |
363 | static int graph_read_bloom_index(const unsigned char *chunk_start, |
364 | size_t chunk_size, void *data) | |
365 | { | |
366 | struct commit_graph *g = data; | |
367 | if (chunk_size != g->num_commits * 4) { | |
368 | warning("commit-graph changed-path index chunk is too small"); | |
369 | return -1; | |
370 | } | |
371 | g->chunk_bloom_indexes = chunk_start; | |
372 | return 0; | |
373 | } | |
374 | ||
2692c2f6 DS |
375 | static int graph_read_bloom_data(const unsigned char *chunk_start, |
376 | size_t chunk_size, void *data) | |
377 | { | |
378 | struct commit_graph *g = data; | |
379 | uint32_t hash_version; | |
920f400e JK |
380 | |
381 | if (chunk_size < BLOOMDATA_CHUNK_HEADER_SIZE) { | |
382 | warning("ignoring too-small changed-path chunk" | |
383 | " (%"PRIuMAX" < %"PRIuMAX") in commit-graph file", | |
384 | (uintmax_t)chunk_size, | |
385 | (uintmax_t)BLOOMDATA_CHUNK_HEADER_SIZE); | |
386 | return -1; | |
387 | } | |
388 | ||
2692c2f6 | 389 | g->chunk_bloom_data = chunk_start; |
920f400e | 390 | g->chunk_bloom_data_size = chunk_size; |
2692c2f6 DS |
391 | hash_version = get_be32(chunk_start); |
392 | ||
393 | if (hash_version != 1) | |
394 | return 0; | |
395 | ||
396 | g->bloom_filter_settings = xmalloc(sizeof(struct bloom_filter_settings)); | |
397 | g->bloom_filter_settings->hash_version = hash_version; | |
398 | g->bloom_filter_settings->num_hashes = get_be32(chunk_start + 4); | |
399 | g->bloom_filter_settings->bits_per_entry = get_be32(chunk_start + 8); | |
400 | g->bloom_filter_settings->max_changed_paths = DEFAULT_BLOOM_MAX_CHANGES; | |
401 | ||
402 | return 0; | |
403 | } | |
404 | ||
a92d8523 | 405 | struct commit_graph *parse_commit_graph(struct repo_settings *s, |
ab14d067 | 406 | void *graph_map, size_t graph_size) |
aa658574 | 407 | { |
2692c2f6 | 408 | const unsigned char *data; |
aa658574 | 409 | struct commit_graph *graph; |
aa658574 JS |
410 | uint32_t graph_signature; |
411 | unsigned char graph_version, hash_version; | |
2692c2f6 | 412 | struct chunkfile *cf = NULL; |
aa658574 JS |
413 | |
414 | if (!graph_map) | |
415 | return NULL; | |
416 | ||
417 | if (graph_size < GRAPH_MIN_SIZE) | |
418 | return NULL; | |
419 | ||
2a2e32bd DS |
420 | data = (const unsigned char *)graph_map; |
421 | ||
422 | graph_signature = get_be32(data); | |
423 | if (graph_signature != GRAPH_SIGNATURE) { | |
93b4405f | 424 | error(_("commit-graph signature %X does not match signature %X"), |
2a2e32bd | 425 | graph_signature, GRAPH_SIGNATURE); |
aa658574 | 426 | return NULL; |
2a2e32bd DS |
427 | } |
428 | ||
429 | graph_version = *(unsigned char*)(data + 4); | |
430 | if (graph_version != GRAPH_VERSION) { | |
93b4405f | 431 | error(_("commit-graph version %X does not match version %X"), |
2a2e32bd | 432 | graph_version, GRAPH_VERSION); |
aa658574 | 433 | return NULL; |
2a2e32bd DS |
434 | } |
435 | ||
436 | hash_version = *(unsigned char*)(data + 5); | |
d9fef9d9 | 437 | if (hash_version != oid_version(the_hash_algo)) { |
93b4405f | 438 | error(_("commit-graph hash version %X does not match version %X"), |
d9fef9d9 | 439 | hash_version, oid_version(the_hash_algo)); |
aa658574 | 440 | return NULL; |
2a2e32bd DS |
441 | } |
442 | ||
443 | graph = alloc_commit_graph(); | |
444 | ||
c1665998 | 445 | graph->hash_len = the_hash_algo->rawsz; |
2a2e32bd | 446 | graph->num_chunks = *(unsigned char*)(data + 6); |
2a2e32bd DS |
447 | graph->data = graph_map; |
448 | graph->data_len = graph_size; | |
449 | ||
2ad4f1a7 | 450 | if (graph_size < GRAPH_HEADER_SIZE + |
2692c2f6 | 451 | (graph->num_chunks + 1) * CHUNK_TOC_ENTRY_SIZE + |
2ad4f1a7 SG |
452 | GRAPH_FANOUT_SIZE + the_hash_algo->rawsz) { |
453 | error(_("commit-graph file is too small to hold %u chunks"), | |
454 | graph->num_chunks); | |
455 | free(graph); | |
456 | return NULL; | |
457 | } | |
458 | ||
2692c2f6 | 459 | cf = init_chunkfile(NULL); |
118bd570 | 460 | |
2692c2f6 | 461 | if (read_table_of_contents(cf, graph->data, graph_size, |
c9b9fefc | 462 | GRAPH_HEADER_SIZE, graph->num_chunks, 1)) |
2692c2f6 | 463 | goto free_and_return; |
2a2e32bd | 464 | |
52e2e8d4 | 465 | read_chunk(cf, GRAPH_CHUNKID_OIDFANOUT, graph_read_oid_fanout, graph); |
2692c2f6 | 466 | read_chunk(cf, GRAPH_CHUNKID_OIDLOOKUP, graph_read_oid_lookup, graph); |
b72df612 | 467 | read_chunk(cf, GRAPH_CHUNKID_DATA, graph_read_commit_data, graph); |
9622610e JK |
468 | pair_chunk(cf, GRAPH_CHUNKID_EXTRAEDGES, &graph->chunk_extra_edges, |
469 | &graph->chunk_extra_edges_size); | |
6cf61d0d JK |
470 | pair_chunk(cf, GRAPH_CHUNKID_BASE, &graph->chunk_base_graphs, |
471 | &graph->chunk_base_graphs_size); | |
702110aa | 472 | |
a92d8523 | 473 | if (s->commit_graph_generation_version >= 2) { |
4a3c3466 JK |
474 | read_chunk(cf, GRAPH_CHUNKID_GENERATION_DATA, |
475 | graph_read_generation_data, graph); | |
702110aa | 476 | pair_chunk(cf, GRAPH_CHUNKID_GENERATION_DATA_OVERFLOW, |
ee6a7924 JK |
477 | &graph->chunk_generation_data_overflow, |
478 | &graph->chunk_generation_data_overflow_size); | |
3b0199d4 DS |
479 | |
480 | if (graph->chunk_generation_data) | |
481 | graph->read_generation_data = 1; | |
702110aa | 482 | } |
2692c2f6 | 483 | |
a92d8523 | 484 | if (s->commit_graph_read_changed_paths) { |
581e0f8b JK |
485 | read_chunk(cf, GRAPH_CHUNKID_BLOOMINDEXES, |
486 | graph_read_bloom_index, graph); | |
2692c2f6 DS |
487 | read_chunk(cf, GRAPH_CHUNKID_BLOOMDATA, |
488 | graph_read_bloom_data, graph); | |
2a2e32bd DS |
489 | } |
490 | ||
76ffbca7 GS |
491 | if (graph->chunk_bloom_indexes && graph->chunk_bloom_data) { |
492 | init_bloom_filters(); | |
493 | } else { | |
494 | /* We need both the bloom chunks to exist together. Else ignore the data */ | |
495 | graph->chunk_bloom_indexes = NULL; | |
496 | graph->chunk_bloom_data = NULL; | |
fbda77c6 | 497 | FREE_AND_NULL(graph->bloom_filter_settings); |
76ffbca7 GS |
498 | } |
499 | ||
92e2cab9 | 500 | oidread(&graph->oid, graph->data + graph->data_len - graph->hash_len); |
118bd570 | 501 | |
fbda77c6 JT |
502 | if (verify_commit_graph_lite(graph)) |
503 | goto free_and_return; | |
2ac138d5 | 504 | |
2692c2f6 | 505 | free_chunkfile(cf); |
2a2e32bd | 506 | return graph; |
fbda77c6 JT |
507 | |
508 | free_and_return: | |
2692c2f6 | 509 | free_chunkfile(cf); |
fbda77c6 JT |
510 | free(graph->bloom_filter_settings); |
511 | free(graph); | |
512 | return NULL; | |
2a2e32bd DS |
513 | } |
514 | ||
ab14d067 TB |
515 | static struct commit_graph *load_commit_graph_one(struct repository *r, |
516 | const char *graph_file, | |
a7df60ca | 517 | struct object_directory *odb) |
61df89c8 ÆAB |
518 | { |
519 | ||
520 | struct stat st; | |
521 | int fd; | |
6c622f9f | 522 | struct commit_graph *g; |
61df89c8 ÆAB |
523 | int open_ok = open_commit_graph(graph_file, &fd, &st); |
524 | ||
525 | if (!open_ok) | |
526 | return NULL; | |
527 | ||
ab14d067 | 528 | g = load_commit_graph_one_fd_st(r, fd, &st, odb); |
6c622f9f DS |
529 | |
530 | if (g) | |
531 | g->filename = xstrdup(graph_file); | |
532 | ||
533 | return g; | |
61df89c8 ÆAB |
534 | } |
535 | ||
13c24992 TB |
536 | static struct commit_graph *load_commit_graph_v1(struct repository *r, |
537 | struct object_directory *odb) | |
5c84b339 | 538 | { |
ad2dd5bb | 539 | char *graph_name = get_commit_graph_filename(odb); |
ab14d067 | 540 | struct commit_graph *g = load_commit_graph_one(r, graph_name, odb); |
5c84b339 DS |
541 | free(graph_name); |
542 | ||
543 | return g; | |
544 | } | |
545 | ||
8298b543 JK |
546 | /* |
547 | * returns 1 if and only if all graphs in the chain have | |
548 | * corrected commit dates stored in the generation_data chunk. | |
549 | */ | |
550 | static int validate_mixed_generation_chain(struct commit_graph *g) | |
551 | { | |
552 | int read_generation_data = 1; | |
553 | struct commit_graph *p = g; | |
554 | ||
555 | while (read_generation_data && p) { | |
556 | read_generation_data = p->read_generation_data; | |
557 | p = p->base_graph; | |
558 | } | |
559 | ||
560 | if (read_generation_data) | |
561 | return 1; | |
562 | ||
563 | while (g) { | |
564 | g->read_generation_data = 0; | |
565 | g = g->base_graph; | |
566 | } | |
567 | ||
568 | return 0; | |
569 | } | |
570 | ||
5c84b339 DS |
571 | static int add_graph_to_chain(struct commit_graph *g, |
572 | struct commit_graph *chain, | |
573 | struct object_id *oids, | |
574 | int n) | |
575 | { | |
576 | struct commit_graph *cur_g = chain; | |
577 | ||
118bd570 DS |
578 | if (n && !g->chunk_base_graphs) { |
579 | warning(_("commit-graph has no base graphs chunk")); | |
580 | return 0; | |
581 | } | |
582 | ||
6cf61d0d JK |
583 | if (g->chunk_base_graphs_size / g->hash_len < n) { |
584 | warning(_("commit-graph base graphs chunk is too small")); | |
585 | return 0; | |
586 | } | |
587 | ||
5c84b339 DS |
588 | while (n) { |
589 | n--; | |
118bd570 DS |
590 | |
591 | if (!cur_g || | |
592 | !oideq(&oids[n], &cur_g->oid) || | |
209250ef | 593 | !hasheq(oids[n].hash, g->chunk_base_graphs + st_mult(g->hash_len, n))) { |
118bd570 DS |
594 | warning(_("commit-graph chain does not match")); |
595 | return 0; | |
596 | } | |
597 | ||
5c84b339 DS |
598 | cur_g = cur_g->base_graph; |
599 | } | |
600 | ||
209250ef TB |
601 | if (chain) { |
602 | if (unsigned_add_overflows(chain->num_commits, | |
603 | chain->num_commits_in_base)) { | |
604 | warning(_("commit count in base graph too high: %"PRIuMAX), | |
605 | (uintmax_t)chain->num_commits_in_base); | |
606 | return 0; | |
607 | } | |
5c84b339 | 608 | g->num_commits_in_base = chain->num_commits + chain->num_commits_in_base; |
209250ef | 609 | } |
5c84b339 | 610 | |
991d549f JK |
611 | g->base_graph = chain; |
612 | ||
5c84b339 DS |
613 | return 1; |
614 | } | |
615 | ||
7ed76b4e JK |
616 | int open_commit_graph_chain(const char *chain_file, |
617 | int *fd, struct stat *st) | |
618 | { | |
619 | *fd = git_open(chain_file); | |
620 | if (*fd < 0) | |
621 | return 0; | |
622 | if (fstat(*fd, st)) { | |
623 | close(*fd); | |
624 | return 0; | |
625 | } | |
7754a565 | 626 | if (st->st_size < the_hash_algo->hexsz) { |
7ed76b4e | 627 | close(*fd); |
7754a565 JK |
628 | if (!st->st_size) { |
629 | /* treat empty files the same as missing */ | |
630 | errno = ENOENT; | |
631 | } else { | |
632 | warning("commit-graph chain file too small"); | |
633 | errno = EINVAL; | |
634 | } | |
7ed76b4e JK |
635 | return 0; |
636 | } | |
637 | return 1; | |
638 | } | |
639 | ||
640 | struct commit_graph *load_commit_graph_chain_fd_st(struct repository *r, | |
5f259197 JK |
641 | int fd, struct stat *st, |
642 | int *incomplete_chain) | |
5c84b339 DS |
643 | { |
644 | struct commit_graph *graph_chain = NULL; | |
645 | struct strbuf line = STRBUF_INIT; | |
5c84b339 DS |
646 | struct object_id *oids; |
647 | int i = 0, valid = 1, count; | |
7ed76b4e | 648 | FILE *fp = xfdopen(fd, "r"); |
5c84b339 | 649 | |
7ed76b4e | 650 | count = st->st_size / (the_hash_algo->hexsz + 1); |
ca56dadb | 651 | CALLOC_ARRAY(oids, count); |
5c84b339 | 652 | |
c523035c DS |
653 | prepare_alt_odb(r); |
654 | ||
655 | for (i = 0; i < count; i++) { | |
656 | struct object_directory *odb; | |
5c84b339 DS |
657 | |
658 | if (strbuf_getline_lf(&line, fp) == EOF) | |
659 | break; | |
660 | ||
661 | if (get_oid_hex(line.buf, &oids[i])) { | |
662 | warning(_("invalid commit-graph chain: line '%s' not a hash"), | |
663 | line.buf); | |
664 | valid = 0; | |
665 | break; | |
666 | } | |
667 | ||
c523035c DS |
668 | valid = 0; |
669 | for (odb = r->objects->odb; odb; odb = odb->next) { | |
ad2dd5bb | 670 | char *graph_name = get_split_graph_filename(odb, line.buf); |
ab14d067 | 671 | struct commit_graph *g = load_commit_graph_one(r, graph_name, odb); |
5c84b339 | 672 | |
c523035c DS |
673 | free(graph_name); |
674 | ||
675 | if (g) { | |
c523035c DS |
676 | if (add_graph_to_chain(g, graph_chain, oids, i)) { |
677 | graph_chain = g; | |
678 | valid = 1; | |
1d94abfe JK |
679 | } else { |
680 | free_commit_graph(g); | |
c523035c DS |
681 | } |
682 | ||
683 | break; | |
684 | } | |
685 | } | |
686 | ||
687 | if (!valid) { | |
688 | warning(_("unable to find all commit-graph files")); | |
689 | break; | |
690 | } | |
5c84b339 DS |
691 | } |
692 | ||
8298b543 JK |
693 | validate_mixed_generation_chain(graph_chain); |
694 | ||
5c84b339 DS |
695 | free(oids); |
696 | fclose(fp); | |
0aa6bce7 | 697 | strbuf_release(&line); |
5c84b339 | 698 | |
5f259197 | 699 | *incomplete_chain = !valid; |
5c84b339 DS |
700 | return graph_chain; |
701 | } | |
702 | ||
7ed76b4e JK |
703 | static struct commit_graph *load_commit_graph_chain(struct repository *r, |
704 | struct object_directory *odb) | |
705 | { | |
706 | char *chain_file = get_commit_graph_chain_filename(odb); | |
707 | struct stat st; | |
708 | int fd; | |
709 | struct commit_graph *g = NULL; | |
710 | ||
711 | if (open_commit_graph_chain(chain_file, &fd, &st)) { | |
5f259197 | 712 | int incomplete; |
7ed76b4e | 713 | /* ownership of fd is taken over by load function */ |
5f259197 | 714 | g = load_commit_graph_chain_fd_st(r, fd, &st, &incomplete); |
7ed76b4e JK |
715 | } |
716 | ||
717 | free(chain_file); | |
718 | return g; | |
719 | } | |
720 | ||
13c24992 TB |
721 | struct commit_graph *read_commit_graph_one(struct repository *r, |
722 | struct object_directory *odb) | |
5c84b339 | 723 | { |
13c24992 | 724 | struct commit_graph *g = load_commit_graph_v1(r, odb); |
5c84b339 DS |
725 | |
726 | if (!g) | |
13c24992 | 727 | g = load_commit_graph_chain(r, odb); |
5c84b339 DS |
728 | |
729 | return g; | |
61df89c8 ÆAB |
730 | } |
731 | ||
13c24992 TB |
732 | static void prepare_commit_graph_one(struct repository *r, |
733 | struct object_directory *odb) | |
177722b3 | 734 | { |
177722b3 | 735 | |
dade47c0 | 736 | if (r->objects->commit_graph) |
177722b3 DS |
737 | return; |
738 | ||
13c24992 | 739 | r->objects->commit_graph = read_commit_graph_one(r, odb); |
177722b3 DS |
740 | } |
741 | ||
5faf357b JT |
742 | /* |
743 | * Return 1 if commit_graph is non-NULL, and 0 otherwise. | |
744 | * | |
15beaaa3 | 745 | * On the first invocation, this function attempts to load the commit |
5faf357b JT |
746 | * graph if the_repository is configured to have one. |
747 | */ | |
dade47c0 | 748 | static int prepare_commit_graph(struct repository *r) |
177722b3 | 749 | { |
263db403 | 750 | struct object_directory *odb; |
dade47c0 | 751 | |
6abada18 | 752 | /* |
0803f9c7 LD |
753 | * Early return if there is no git dir or if the commit graph is |
754 | * disabled. | |
755 | * | |
6abada18 JK |
756 | * This must come before the "already attempted?" check below, because |
757 | * we want to disable even an already-loaded graph file. | |
758 | */ | |
0803f9c7 | 759 | if (!r->gitdir || r->commit_graph_disabled) |
6abada18 | 760 | return 0; |
43d35618 | 761 | |
dade47c0 JT |
762 | if (r->objects->commit_graph_attempted) |
763 | return !!r->objects->commit_graph; | |
764 | r->objects->commit_graph_attempted = 1; | |
765 | ||
7211b9e7 DS |
766 | prepare_repo_settings(r); |
767 | ||
859fdc0c | 768 | if (!git_env_bool(GIT_TEST_COMMIT_GRAPH, 0) && |
7211b9e7 | 769 | r->settings.core_commit_graph != 1) |
dade47c0 JT |
770 | /* |
771 | * This repository is not configured to use commit graphs, so | |
772 | * do not load one. (But report commit_graph_attempted anyway | |
773 | * so that commit graph loading is not attempted again for this | |
774 | * repository.) | |
775 | */ | |
5faf357b JT |
776 | return 0; |
777 | ||
d6538246 DS |
778 | if (!commit_graph_compatible(r)) |
779 | return 0; | |
780 | ||
dade47c0 | 781 | prepare_alt_odb(r); |
f0eaf638 | 782 | for (odb = r->objects->odb; |
263db403 JK |
783 | !r->objects->commit_graph && odb; |
784 | odb = odb->next) | |
13c24992 | 785 | prepare_commit_graph_one(r, odb); |
dade47c0 | 786 | return !!r->objects->commit_graph; |
177722b3 DS |
787 | } |
788 | ||
6cc01743 DS |
789 | int generation_numbers_enabled(struct repository *r) |
790 | { | |
791 | uint32_t first_generation; | |
792 | struct commit_graph *g; | |
793 | if (!prepare_commit_graph(r)) | |
794 | return 0; | |
795 | ||
796 | g = r->objects->commit_graph; | |
797 | ||
798 | if (!g->num_commits) | |
799 | return 0; | |
800 | ||
801 | first_generation = get_be32(g->chunk_commit_data + | |
802 | g->hash_len + 8) >> 2; | |
803 | ||
804 | return !!first_generation; | |
805 | } | |
806 | ||
8d00d7c3 AK |
807 | int corrected_commit_dates_enabled(struct repository *r) |
808 | { | |
809 | struct commit_graph *g; | |
810 | if (!prepare_commit_graph(r)) | |
811 | return 0; | |
812 | ||
813 | g = r->objects->commit_graph; | |
814 | ||
815 | if (!g->num_commits) | |
816 | return 0; | |
817 | ||
818 | return g->read_generation_data; | |
819 | } | |
820 | ||
4f364405 TB |
821 | struct bloom_filter_settings *get_bloom_filter_settings(struct repository *r) |
822 | { | |
823 | struct commit_graph *g = r->objects->commit_graph; | |
824 | while (g) { | |
825 | if (g->bloom_filter_settings) | |
826 | return g->bloom_filter_settings; | |
827 | g = g->base_graph; | |
828 | } | |
829 | return NULL; | |
830 | } | |
831 | ||
c3a3a964 | 832 | void close_commit_graph(struct raw_object_store *o) |
177722b3 | 833 | { |
ac6d45d1 | 834 | clear_commit_graph_data_slab(&commit_graph_data_slab); |
09a75abb | 835 | free_commit_graph(o->commit_graph); |
c3a3a964 | 836 | o->commit_graph = NULL; |
177722b3 DS |
837 | } |
838 | ||
809ea28f | 839 | static int bsearch_graph(struct commit_graph *g, const struct object_id *oid, uint32_t *pos) |
177722b3 DS |
840 | { |
841 | return bsearch_hash(oid->hash, g->chunk_oid_fanout, | |
842 | g->chunk_oid_lookup, g->hash_len, pos); | |
843 | } | |
844 | ||
d4f4d60f DS |
845 | static void load_oid_from_graph(struct commit_graph *g, |
846 | uint32_t pos, | |
847 | struct object_id *oid) | |
848 | { | |
849 | uint32_t lex_index; | |
850 | ||
851 | while (g && pos < g->num_commits_in_base) | |
852 | g = g->base_graph; | |
853 | ||
854 | if (!g) | |
855 | BUG("NULL commit-graph"); | |
856 | ||
857 | if (pos >= g->num_commits + g->num_commits_in_base) | |
858 | die(_("invalid commit position. commit-graph is likely corrupt")); | |
859 | ||
860 | lex_index = pos - g->num_commits_in_base; | |
861 | ||
0bd8f30a | 862 | oidread(oid, g->chunk_oid_lookup + st_mult(g->hash_len, lex_index)); |
d4f4d60f DS |
863 | } |
864 | ||
4f542b7a SB |
865 | static struct commit_list **insert_parent_or_die(struct repository *r, |
866 | struct commit_graph *g, | |
d4f4d60f | 867 | uint32_t pos, |
177722b3 DS |
868 | struct commit_list **pptr) |
869 | { | |
870 | struct commit *c; | |
871 | struct object_id oid; | |
96af91d4 | 872 | |
d4f4d60f DS |
873 | if (pos >= g->num_commits + g->num_commits_in_base) |
874 | die("invalid parent position %"PRIu32, pos); | |
53614b13 | 875 | |
d4f4d60f | 876 | load_oid_from_graph(g, pos, &oid); |
4f542b7a | 877 | c = lookup_commit(r, &oid); |
177722b3 | 878 | if (!c) |
4f5b532d | 879 | die(_("could not find commit %s"), oid_to_hex(&oid)); |
c49c82aa | 880 | commit_graph_data_at(c)->graph_pos = pos; |
177722b3 DS |
881 | return &commit_list_insert(c, pptr)->next; |
882 | } | |
883 | ||
e2838d85 DS |
884 | static void fill_commit_graph_info(struct commit *item, struct commit_graph *g, uint32_t pos) |
885 | { | |
d4f4d60f | 886 | const unsigned char *commit_data; |
c752ad09 | 887 | struct commit_graph_data *graph_data; |
e8b63005 AK |
888 | uint32_t lex_index, offset_pos; |
889 | uint64_t date_high, date_low, offset; | |
d4f4d60f DS |
890 | |
891 | while (pos < g->num_commits_in_base) | |
892 | g = g->base_graph; | |
893 | ||
f90fca63 AK |
894 | if (pos >= g->num_commits + g->num_commits_in_base) |
895 | die(_("invalid commit position. commit-graph is likely corrupt")); | |
896 | ||
d4f4d60f | 897 | lex_index = pos - g->num_commits_in_base; |
2740ed1c | 898 | commit_data = g->chunk_commit_data + st_mult(GRAPH_DATA_WIDTH, lex_index); |
c752ad09 AK |
899 | |
900 | graph_data = commit_graph_data_at(item); | |
901 | graph_data->graph_pos = pos; | |
f90fca63 AK |
902 | |
903 | date_high = get_be32(commit_data + g->hash_len + 8) & 0x3; | |
904 | date_low = get_be32(commit_data + g->hash_len + 12); | |
905 | item->date = (timestamp_t)((date_high << 32) | date_low); | |
906 | ||
1fdc383c | 907 | if (g->read_generation_data) { |
2740ed1c | 908 | offset = (timestamp_t)get_be32(g->chunk_generation_data + st_mult(sizeof(uint32_t), lex_index)); |
e8b63005 AK |
909 | |
910 | if (offset & CORRECTED_COMMIT_DATE_OFFSET_OVERFLOW) { | |
911 | if (!g->chunk_generation_data_overflow) | |
912 | die(_("commit-graph requires overflow generation data but has none")); | |
913 | ||
914 | offset_pos = offset ^ CORRECTED_COMMIT_DATE_OFFSET_OVERFLOW; | |
ee6a7924 JK |
915 | if (g->chunk_generation_data_overflow_size / sizeof(uint64_t) <= offset_pos) |
916 | die(_("commit-graph overflow generation data is too small")); | |
917 | graph_data->generation = item->date + | |
918 | get_be64(g->chunk_generation_data_overflow + sizeof(uint64_t) * offset_pos); | |
e8b63005 AK |
919 | } else |
920 | graph_data->generation = item->date + offset; | |
921 | } else | |
922 | graph_data->generation = get_be32(commit_data + g->hash_len + 8) >> 2; | |
72a2bfca AK |
923 | |
924 | if (g->topo_levels) | |
925 | *topo_level_slab_at(g->topo_levels, item) = get_be32(commit_data + g->hash_len + 8) >> 2; | |
e2838d85 DS |
926 | } |
927 | ||
a133c40b NTND |
928 | static inline void set_commit_tree(struct commit *c, struct tree *t) |
929 | { | |
930 | c->maybe_tree = t; | |
931 | } | |
932 | ||
4f542b7a SB |
933 | static int fill_commit_in_graph(struct repository *r, |
934 | struct commit *item, | |
935 | struct commit_graph *g, uint32_t pos) | |
177722b3 | 936 | { |
177722b3 | 937 | uint32_t edge_value; |
9622610e | 938 | uint32_t parent_data_pos; |
177722b3 | 939 | struct commit_list **pptr; |
d4f4d60f DS |
940 | const unsigned char *commit_data; |
941 | uint32_t lex_index; | |
177722b3 | 942 | |
d4f4d60f DS |
943 | while (pos < g->num_commits_in_base) |
944 | g = g->base_graph; | |
945 | ||
f90fca63 | 946 | fill_commit_graph_info(item, g, pos); |
d4f4d60f | 947 | |
d4f4d60f | 948 | lex_index = pos - g->num_commits_in_base; |
50a71c29 | 949 | commit_data = g->chunk_commit_data + st_mult(g->hash_len + 16, lex_index); |
d4f4d60f DS |
950 | |
951 | item->object.parsed = 1; | |
177722b3 | 952 | |
a133c40b | 953 | set_commit_tree(item, NULL); |
177722b3 | 954 | |
177722b3 DS |
955 | pptr = &item->parents; |
956 | ||
957 | edge_value = get_be32(commit_data + g->hash_len); | |
958 | if (edge_value == GRAPH_PARENT_NONE) | |
959 | return 1; | |
4f542b7a | 960 | pptr = insert_parent_or_die(r, g, edge_value, pptr); |
177722b3 DS |
961 | |
962 | edge_value = get_be32(commit_data + g->hash_len + 4); | |
963 | if (edge_value == GRAPH_PARENT_NONE) | |
964 | return 1; | |
5af7417b | 965 | if (!(edge_value & GRAPH_EXTRA_EDGES_NEEDED)) { |
4f542b7a | 966 | pptr = insert_parent_or_die(r, g, edge_value, pptr); |
177722b3 DS |
967 | return 1; |
968 | } | |
969 | ||
9622610e | 970 | parent_data_pos = edge_value & GRAPH_EDGE_LAST_MASK; |
177722b3 | 971 | do { |
9622610e JK |
972 | if (g->chunk_extra_edges_size / sizeof(uint32_t) <= parent_data_pos) { |
973 | error("commit-graph extra-edges pointer out of bounds"); | |
974 | free_commit_list(item->parents); | |
975 | item->parents = NULL; | |
976 | item->object.parsed = 0; | |
977 | return 0; | |
978 | } | |
979 | edge_value = get_be32(g->chunk_extra_edges + | |
980 | sizeof(uint32_t) * parent_data_pos); | |
4f542b7a | 981 | pptr = insert_parent_or_die(r, g, |
177722b3 DS |
982 | edge_value & GRAPH_EDGE_LAST_MASK, |
983 | pptr); | |
9622610e | 984 | parent_data_pos++; |
177722b3 DS |
985 | } while (!(edge_value & GRAPH_LAST_EDGE)); |
986 | ||
987 | return 1; | |
988 | } | |
989 | ||
809ea28f PS |
990 | static int search_commit_pos_in_graph(const struct object_id *id, struct commit_graph *g, uint32_t *pos) |
991 | { | |
992 | struct commit_graph *cur_g = g; | |
993 | uint32_t lex_index; | |
994 | ||
995 | while (cur_g && !bsearch_graph(cur_g, id, &lex_index)) | |
996 | cur_g = cur_g->base_graph; | |
997 | ||
998 | if (cur_g) { | |
999 | *pos = lex_index + cur_g->num_commits_in_base; | |
1000 | return 1; | |
1001 | } | |
1002 | ||
1003 | return 0; | |
1004 | } | |
1005 | ||
1006 | static int find_commit_pos_in_graph(struct commit *item, struct commit_graph *g, uint32_t *pos) | |
e2838d85 | 1007 | { |
c752ad09 AK |
1008 | uint32_t graph_pos = commit_graph_position(item); |
1009 | if (graph_pos != COMMIT_NOT_FROM_GRAPH) { | |
1010 | *pos = graph_pos; | |
e2838d85 DS |
1011 | return 1; |
1012 | } else { | |
809ea28f | 1013 | return search_commit_pos_in_graph(&item->object.oid, g, pos); |
e2838d85 DS |
1014 | } |
1015 | } | |
1016 | ||
7805360b TB |
1017 | int repo_find_commit_pos_in_graph(struct repository *r, struct commit *c, |
1018 | uint32_t *pos) | |
1019 | { | |
1020 | if (!prepare_commit_graph(r)) | |
1021 | return 0; | |
1022 | return find_commit_pos_in_graph(c, r->objects->commit_graph, pos); | |
1023 | } | |
1024 | ||
f559d6d4 PS |
1025 | struct commit *lookup_commit_in_graph(struct repository *repo, const struct object_id *id) |
1026 | { | |
1027 | struct commit *commit; | |
1028 | uint32_t pos; | |
1029 | ||
d6045294 | 1030 | if (!prepare_commit_graph(repo)) |
f559d6d4 PS |
1031 | return NULL; |
1032 | if (!search_commit_pos_in_graph(id, repo->objects->commit_graph, &pos)) | |
1033 | return NULL; | |
3a1ea94a | 1034 | if (!has_object(repo, id, 0)) |
f559d6d4 PS |
1035 | return NULL; |
1036 | ||
1037 | commit = lookup_commit(repo, id); | |
1038 | if (!commit) | |
1039 | return NULL; | |
1040 | if (commit->object.parsed) | |
1041 | return commit; | |
1042 | ||
1043 | if (!fill_commit_in_graph(repo, commit, repo->objects->commit_graph, pos)) | |
1044 | return NULL; | |
1045 | ||
1046 | return commit; | |
1047 | } | |
1048 | ||
4f542b7a SB |
1049 | static int parse_commit_in_graph_one(struct repository *r, |
1050 | struct commit_graph *g, | |
1051 | struct commit *item) | |
177722b3 | 1052 | { |
e2838d85 DS |
1053 | uint32_t pos; |
1054 | ||
177722b3 DS |
1055 | if (item->object.parsed) |
1056 | return 1; | |
ee797053 | 1057 | |
809ea28f | 1058 | if (find_commit_pos_in_graph(item, g, &pos)) |
4f542b7a | 1059 | return fill_commit_in_graph(r, item, g, pos); |
ee797053 DS |
1060 | |
1061 | return 0; | |
1062 | } | |
1063 | ||
dade47c0 | 1064 | int parse_commit_in_graph(struct repository *r, struct commit *item) |
ee797053 | 1065 | { |
7b671f8c DS |
1066 | static int checked_env = 0; |
1067 | ||
1068 | if (!checked_env && | |
1069 | git_env_bool(GIT_TEST_COMMIT_GRAPH_DIE_ON_PARSE, 0)) | |
1070 | die("dying as requested by the '%s' variable on commit-graph parse!", | |
1071 | GIT_TEST_COMMIT_GRAPH_DIE_ON_PARSE); | |
1072 | checked_env = 1; | |
1073 | ||
dade47c0 | 1074 | if (!prepare_commit_graph(r)) |
ee797053 | 1075 | return 0; |
4f542b7a | 1076 | return parse_commit_in_graph_one(r, r->objects->commit_graph, item); |
177722b3 DS |
1077 | } |
1078 | ||
dade47c0 | 1079 | void load_commit_graph_info(struct repository *r, struct commit *item) |
e2838d85 DS |
1080 | { |
1081 | uint32_t pos; | |
7805360b | 1082 | if (repo_find_commit_pos_in_graph(r, item, &pos)) |
dade47c0 | 1083 | fill_commit_graph_info(item, r->objects->commit_graph, pos); |
e2838d85 DS |
1084 | } |
1085 | ||
4f542b7a SB |
1086 | static struct tree *load_tree_for_commit(struct repository *r, |
1087 | struct commit_graph *g, | |
1088 | struct commit *c) | |
7b8a21db DS |
1089 | { |
1090 | struct object_id oid; | |
d4f4d60f | 1091 | const unsigned char *commit_data; |
c752ad09 | 1092 | uint32_t graph_pos = commit_graph_position(c); |
d4f4d60f | 1093 | |
c752ad09 | 1094 | while (graph_pos < g->num_commits_in_base) |
d4f4d60f DS |
1095 | g = g->base_graph; |
1096 | ||
1097 | commit_data = g->chunk_commit_data + | |
51c31a64 | 1098 | st_mult(GRAPH_DATA_WIDTH, graph_pos - g->num_commits_in_base); |
7b8a21db | 1099 | |
92e2cab9 | 1100 | oidread(&oid, commit_data); |
a133c40b | 1101 | set_commit_tree(c, lookup_tree(r, &oid)); |
7b8a21db DS |
1102 | |
1103 | return c->maybe_tree; | |
1104 | } | |
1105 | ||
4f542b7a SB |
1106 | static struct tree *get_commit_tree_in_graph_one(struct repository *r, |
1107 | struct commit_graph *g, | |
0cbef8f8 | 1108 | const struct commit *c) |
7b8a21db DS |
1109 | { |
1110 | if (c->maybe_tree) | |
1111 | return c->maybe_tree; | |
c49c82aa | 1112 | if (commit_graph_position(c) == COMMIT_NOT_FROM_GRAPH) |
0cbef8f8 DS |
1113 | BUG("get_commit_tree_in_graph_one called from non-commit-graph commit"); |
1114 | ||
4f542b7a | 1115 | return load_tree_for_commit(r, g, (struct commit *)c); |
0cbef8f8 | 1116 | } |
7b8a21db | 1117 | |
dade47c0 | 1118 | struct tree *get_commit_tree_in_graph(struct repository *r, const struct commit *c) |
0cbef8f8 | 1119 | { |
4f542b7a | 1120 | return get_commit_tree_in_graph_one(r, r->objects->commit_graph, c); |
7b8a21db DS |
1121 | } |
1122 | ||
c9905bea DS |
1123 | struct packed_commit_list { |
1124 | struct commit **list; | |
3361390c JK |
1125 | size_t nr; |
1126 | size_t alloc; | |
c9905bea DS |
1127 | }; |
1128 | ||
c9905bea DS |
1129 | struct write_commit_graph_context { |
1130 | struct repository *r; | |
0bd52e27 | 1131 | struct object_directory *odb; |
c9905bea | 1132 | char *graph_name; |
a5f1c448 | 1133 | struct oid_array oids; |
c9905bea DS |
1134 | struct packed_commit_list commits; |
1135 | int num_extra_edges; | |
e8b63005 | 1136 | int num_generation_data_overflows; |
c9905bea DS |
1137 | unsigned long approx_nr_objects; |
1138 | struct progress *progress; | |
1139 | int progress_done; | |
1140 | uint64_t progress_cnt; | |
6c622f9f DS |
1141 | |
1142 | char *base_graph_name; | |
1143 | int num_commit_graphs_before; | |
1144 | int num_commit_graphs_after; | |
1145 | char **commit_graph_filenames_before; | |
1146 | char **commit_graph_filenames_after; | |
1147 | char **commit_graph_hash_after; | |
1148 | uint32_t new_num_commits_in_base; | |
1149 | struct commit_graph *new_base_graph; | |
1150 | ||
c9905bea | 1151 | unsigned append:1, |
6c622f9f | 1152 | report_progress:1, |
7c5c9b9c | 1153 | split:1, |
3d112755 | 1154 | changed_paths:1, |
e8b63005 | 1155 | order_by_pack:1, |
fde55b09 DS |
1156 | write_generation_data:1, |
1157 | trust_generation_numbers:1; | |
c2bc6e6a | 1158 | |
72a2bfca | 1159 | struct topo_level_slab *topo_levels; |
98bb7961 | 1160 | const struct commit_graph_opts *opts; |
f97b9325 | 1161 | size_t total_bloom_filter_data_size; |
98037f2b | 1162 | const struct bloom_filter_settings *bloom_settings; |
312cff52 TB |
1163 | |
1164 | int count_bloom_filter_computed; | |
1165 | int count_bloom_filter_not_computed; | |
59f0d507 | 1166 | int count_bloom_filter_trunc_empty; |
312cff52 | 1167 | int count_bloom_filter_trunc_large; |
c9905bea DS |
1168 | }; |
1169 | ||
9bab081d | 1170 | static int write_graph_chunk_fanout(struct hashfile *f, |
eb907191 | 1171 | void *data) |
08fd81c9 | 1172 | { |
eb907191 | 1173 | struct write_commit_graph_context *ctx = data; |
08fd81c9 | 1174 | int i, count = 0; |
c9905bea | 1175 | struct commit **list = ctx->commits.list; |
08fd81c9 DS |
1176 | |
1177 | /* | |
1178 | * Write the first-level table (the list is sorted, | |
1179 | * but we use a 256-entry lookup to be able to avoid | |
1180 | * having to do eight extra binary search iterations). | |
1181 | */ | |
1182 | for (i = 0; i < 256; i++) { | |
c9905bea | 1183 | while (count < ctx->commits.nr) { |
08fd81c9 DS |
1184 | if ((*list)->object.oid.hash[0] != i) |
1185 | break; | |
c9905bea | 1186 | display_progress(ctx->progress, ++ctx->progress_cnt); |
08fd81c9 DS |
1187 | count++; |
1188 | list++; | |
1189 | } | |
1190 | ||
1191 | hashwrite_be32(f, count); | |
1192 | } | |
9bab081d SG |
1193 | |
1194 | return 0; | |
08fd81c9 DS |
1195 | } |
1196 | ||
9bab081d | 1197 | static int write_graph_chunk_oids(struct hashfile *f, |
eb907191 | 1198 | void *data) |
08fd81c9 | 1199 | { |
eb907191 | 1200 | struct write_commit_graph_context *ctx = data; |
c9905bea | 1201 | struct commit **list = ctx->commits.list; |
08fd81c9 | 1202 | int count; |
c9905bea DS |
1203 | for (count = 0; count < ctx->commits.nr; count++, list++) { |
1204 | display_progress(ctx->progress, ++ctx->progress_cnt); | |
9bab081d | 1205 | hashwrite(f, (*list)->object.oid.hash, the_hash_algo->rawsz); |
53035c4f | 1206 | } |
9bab081d SG |
1207 | |
1208 | return 0; | |
08fd81c9 DS |
1209 | } |
1210 | ||
8380dcd7 | 1211 | static const struct object_id *commit_to_oid(size_t index, const void *table) |
08fd81c9 | 1212 | { |
8380dcd7 | 1213 | const struct commit * const *commits = table; |
45ee13b9 | 1214 | return &commits[index]->object.oid; |
08fd81c9 DS |
1215 | } |
1216 | ||
9bab081d | 1217 | static int write_graph_chunk_data(struct hashfile *f, |
eb907191 | 1218 | void *data) |
08fd81c9 | 1219 | { |
eb907191 | 1220 | struct write_commit_graph_context *ctx = data; |
c9905bea DS |
1221 | struct commit **list = ctx->commits.list; |
1222 | struct commit **last = ctx->commits.list + ctx->commits.nr; | |
08fd81c9 DS |
1223 | uint32_t num_extra_edges = 0; |
1224 | ||
1225 | while (list < last) { | |
1226 | struct commit_list *parent; | |
806278de | 1227 | struct object_id *tree; |
08fd81c9 DS |
1228 | int edge_value; |
1229 | uint32_t packedDate[2]; | |
c9905bea | 1230 | display_progress(ctx->progress, ++ctx->progress_cnt); |
08fd81c9 | 1231 | |
c4cc0831 | 1232 | if (repo_parse_commit_no_graph(ctx->r, *list)) |
16749b8d TB |
1233 | die(_("unable to parse commit %s"), |
1234 | oid_to_hex(&(*list)->object.oid)); | |
806278de | 1235 | tree = get_commit_tree_oid(*list); |
9bab081d | 1236 | hashwrite(f, tree->hash, the_hash_algo->rawsz); |
08fd81c9 DS |
1237 | |
1238 | parent = (*list)->parents; | |
1239 | ||
1240 | if (!parent) | |
1241 | edge_value = GRAPH_PARENT_NONE; | |
1242 | else { | |
45ee13b9 JK |
1243 | edge_value = oid_pos(&parent->item->object.oid, |
1244 | ctx->commits.list, | |
1245 | ctx->commits.nr, | |
1246 | commit_to_oid); | |
08fd81c9 | 1247 | |
6c622f9f DS |
1248 | if (edge_value >= 0) |
1249 | edge_value += ctx->new_num_commits_in_base; | |
8a6ac287 | 1250 | else if (ctx->new_base_graph) { |
6c622f9f | 1251 | uint32_t pos; |
809ea28f PS |
1252 | if (find_commit_pos_in_graph(parent->item, |
1253 | ctx->new_base_graph, | |
1254 | &pos)) | |
6c622f9f DS |
1255 | edge_value = pos; |
1256 | } | |
1257 | ||
08fd81c9 | 1258 | if (edge_value < 0) |
cce99cd8 DS |
1259 | BUG("missing parent %s for commit %s", |
1260 | oid_to_hex(&parent->item->object.oid), | |
1261 | oid_to_hex(&(*list)->object.oid)); | |
08fd81c9 DS |
1262 | } |
1263 | ||
1264 | hashwrite_be32(f, edge_value); | |
1265 | ||
1266 | if (parent) | |
1267 | parent = parent->next; | |
1268 | ||
1269 | if (!parent) | |
1270 | edge_value = GRAPH_PARENT_NONE; | |
1271 | else if (parent->next) | |
5af7417b | 1272 | edge_value = GRAPH_EXTRA_EDGES_NEEDED | num_extra_edges; |
08fd81c9 | 1273 | else { |
45ee13b9 JK |
1274 | edge_value = oid_pos(&parent->item->object.oid, |
1275 | ctx->commits.list, | |
1276 | ctx->commits.nr, | |
1277 | commit_to_oid); | |
6c622f9f DS |
1278 | |
1279 | if (edge_value >= 0) | |
1280 | edge_value += ctx->new_num_commits_in_base; | |
8a6ac287 | 1281 | else if (ctx->new_base_graph) { |
6c622f9f | 1282 | uint32_t pos; |
809ea28f PS |
1283 | if (find_commit_pos_in_graph(parent->item, |
1284 | ctx->new_base_graph, | |
1285 | &pos)) | |
6c622f9f DS |
1286 | edge_value = pos; |
1287 | } | |
1288 | ||
08fd81c9 | 1289 | if (edge_value < 0) |
cce99cd8 DS |
1290 | BUG("missing parent %s for commit %s", |
1291 | oid_to_hex(&parent->item->object.oid), | |
1292 | oid_to_hex(&(*list)->object.oid)); | |
08fd81c9 DS |
1293 | } |
1294 | ||
1295 | hashwrite_be32(f, edge_value); | |
1296 | ||
5af7417b | 1297 | if (edge_value & GRAPH_EXTRA_EDGES_NEEDED) { |
08fd81c9 DS |
1298 | do { |
1299 | num_extra_edges++; | |
1300 | parent = parent->next; | |
1301 | } while (parent); | |
1302 | } | |
1303 | ||
1304 | if (sizeof((*list)->date) > 4) | |
1305 | packedDate[0] = htonl(((*list)->date >> 32) & 0x3); | |
1306 | else | |
1307 | packedDate[0] = 0; | |
1308 | ||
72a2bfca | 1309 | packedDate[0] |= htonl(*topo_level_slab_at(ctx->topo_levels, *list) << 2); |
3258c663 | 1310 | |
08fd81c9 DS |
1311 | packedDate[1] = htonl((*list)->date); |
1312 | hashwrite(f, packedDate, 8); | |
1313 | ||
1314 | list++; | |
1315 | } | |
9bab081d SG |
1316 | |
1317 | return 0; | |
08fd81c9 DS |
1318 | } |
1319 | ||
e8b63005 | 1320 | static int write_graph_chunk_generation_data(struct hashfile *f, |
eb907191 | 1321 | void *data) |
e8b63005 | 1322 | { |
eb907191 | 1323 | struct write_commit_graph_context *ctx = data; |
e8b63005 AK |
1324 | int i, num_generation_data_overflows = 0; |
1325 | ||
1326 | for (i = 0; i < ctx->commits.nr; i++) { | |
1327 | struct commit *c = ctx->commits.list[i]; | |
90cb1c47 DS |
1328 | timestamp_t offset; |
1329 | repo_parse_commit(ctx->r, c); | |
1330 | offset = commit_graph_data_at(c)->generation - c->date; | |
e8b63005 AK |
1331 | display_progress(ctx->progress, ++ctx->progress_cnt); |
1332 | ||
1333 | if (offset > GENERATION_NUMBER_V2_OFFSET_MAX) { | |
1334 | offset = CORRECTED_COMMIT_DATE_OFFSET_OVERFLOW | num_generation_data_overflows; | |
1335 | num_generation_data_overflows++; | |
1336 | } | |
1337 | ||
1338 | hashwrite_be32(f, offset); | |
1339 | } | |
1340 | ||
1341 | return 0; | |
1342 | } | |
1343 | ||
1344 | static int write_graph_chunk_generation_data_overflow(struct hashfile *f, | |
eb907191 | 1345 | void *data) |
e8b63005 | 1346 | { |
eb907191 | 1347 | struct write_commit_graph_context *ctx = data; |
e8b63005 AK |
1348 | int i; |
1349 | for (i = 0; i < ctx->commits.nr; i++) { | |
1350 | struct commit *c = ctx->commits.list[i]; | |
1351 | timestamp_t offset = commit_graph_data_at(c)->generation - c->date; | |
1352 | display_progress(ctx->progress, ++ctx->progress_cnt); | |
1353 | ||
1354 | if (offset > GENERATION_NUMBER_V2_OFFSET_MAX) { | |
1355 | hashwrite_be32(f, offset >> 32); | |
1356 | hashwrite_be32(f, (uint32_t) offset); | |
1357 | } | |
1358 | } | |
1359 | ||
1360 | return 0; | |
1361 | } | |
1362 | ||
9bab081d | 1363 | static int write_graph_chunk_extra_edges(struct hashfile *f, |
eb907191 | 1364 | void *data) |
08fd81c9 | 1365 | { |
eb907191 | 1366 | struct write_commit_graph_context *ctx = data; |
c9905bea DS |
1367 | struct commit **list = ctx->commits.list; |
1368 | struct commit **last = ctx->commits.list + ctx->commits.nr; | |
08fd81c9 DS |
1369 | struct commit_list *parent; |
1370 | ||
1371 | while (list < last) { | |
1372 | int num_parents = 0; | |
53035c4f | 1373 | |
c9905bea | 1374 | display_progress(ctx->progress, ++ctx->progress_cnt); |
53035c4f | 1375 | |
08fd81c9 DS |
1376 | for (parent = (*list)->parents; num_parents < 3 && parent; |
1377 | parent = parent->next) | |
1378 | num_parents++; | |
1379 | ||
1380 | if (num_parents <= 2) { | |
1381 | list++; | |
1382 | continue; | |
1383 | } | |
1384 | ||
1385 | /* Since num_parents > 2, this initializer is safe. */ | |
1386 | for (parent = (*list)->parents->next; parent; parent = parent->next) { | |
45ee13b9 JK |
1387 | int edge_value = oid_pos(&parent->item->object.oid, |
1388 | ctx->commits.list, | |
1389 | ctx->commits.nr, | |
1390 | commit_to_oid); | |
08fd81c9 | 1391 | |
6c622f9f DS |
1392 | if (edge_value >= 0) |
1393 | edge_value += ctx->new_num_commits_in_base; | |
8a6ac287 | 1394 | else if (ctx->new_base_graph) { |
6c622f9f | 1395 | uint32_t pos; |
809ea28f PS |
1396 | if (find_commit_pos_in_graph(parent->item, |
1397 | ctx->new_base_graph, | |
1398 | &pos)) | |
6c622f9f DS |
1399 | edge_value = pos; |
1400 | } | |
1401 | ||
08fd81c9 | 1402 | if (edge_value < 0) |
cce99cd8 DS |
1403 | BUG("missing parent %s for commit %s", |
1404 | oid_to_hex(&parent->item->object.oid), | |
1405 | oid_to_hex(&(*list)->object.oid)); | |
08fd81c9 DS |
1406 | else if (!parent->next) |
1407 | edge_value |= GRAPH_LAST_EDGE; | |
1408 | ||
1409 | hashwrite_be32(f, edge_value); | |
1410 | } | |
1411 | ||
1412 | list++; | |
1413 | } | |
9bab081d SG |
1414 | |
1415 | return 0; | |
08fd81c9 DS |
1416 | } |
1417 | ||
9bab081d | 1418 | static int write_graph_chunk_bloom_indexes(struct hashfile *f, |
eb907191 | 1419 | void *data) |
76ffbca7 | 1420 | { |
eb907191 | 1421 | struct write_commit_graph_context *ctx = data; |
76ffbca7 GS |
1422 | struct commit **list = ctx->commits.list; |
1423 | struct commit **last = ctx->commits.list + ctx->commits.nr; | |
1424 | uint32_t cur_pos = 0; | |
76ffbca7 GS |
1425 | |
1426 | while (list < last) { | |
312cff52 | 1427 | struct bloom_filter *filter = get_bloom_filter(ctx->r, *list); |
94919742 DS |
1428 | size_t len = filter ? filter->len : 0; |
1429 | cur_pos += len; | |
150cd3b6 | 1430 | display_progress(ctx->progress, ++ctx->progress_cnt); |
76ffbca7 GS |
1431 | hashwrite_be32(f, cur_pos); |
1432 | list++; | |
1433 | } | |
1434 | ||
9bab081d | 1435 | return 0; |
76ffbca7 GS |
1436 | } |
1437 | ||
0087a87b DS |
1438 | static void trace2_bloom_filter_settings(struct write_commit_graph_context *ctx) |
1439 | { | |
1440 | struct json_writer jw = JSON_WRITER_INIT; | |
1441 | ||
1442 | jw_object_begin(&jw, 0); | |
1443 | jw_object_intmax(&jw, "hash_version", ctx->bloom_settings->hash_version); | |
1444 | jw_object_intmax(&jw, "num_hashes", ctx->bloom_settings->num_hashes); | |
1445 | jw_object_intmax(&jw, "bits_per_entry", ctx->bloom_settings->bits_per_entry); | |
97ffa4fa | 1446 | jw_object_intmax(&jw, "max_changed_paths", ctx->bloom_settings->max_changed_paths); |
0087a87b DS |
1447 | jw_end(&jw); |
1448 | ||
1449 | trace2_data_json("bloom", ctx->r, "settings", &jw); | |
1450 | ||
1451 | jw_release(&jw); | |
76ffbca7 GS |
1452 | } |
1453 | ||
9bab081d | 1454 | static int write_graph_chunk_bloom_data(struct hashfile *f, |
eb907191 | 1455 | void *data) |
76ffbca7 | 1456 | { |
eb907191 | 1457 | struct write_commit_graph_context *ctx = data; |
76ffbca7 GS |
1458 | struct commit **list = ctx->commits.list; |
1459 | struct commit **last = ctx->commits.list + ctx->commits.nr; | |
76ffbca7 | 1460 | |
0087a87b DS |
1461 | trace2_bloom_filter_settings(ctx); |
1462 | ||
98037f2b DS |
1463 | hashwrite_be32(f, ctx->bloom_settings->hash_version); |
1464 | hashwrite_be32(f, ctx->bloom_settings->num_hashes); | |
1465 | hashwrite_be32(f, ctx->bloom_settings->bits_per_entry); | |
76ffbca7 GS |
1466 | |
1467 | while (list < last) { | |
312cff52 | 1468 | struct bloom_filter *filter = get_bloom_filter(ctx->r, *list); |
94919742 | 1469 | size_t len = filter ? filter->len : 0; |
94919742 | 1470 | |
150cd3b6 | 1471 | display_progress(ctx->progress, ++ctx->progress_cnt); |
94919742 DS |
1472 | if (len) |
1473 | hashwrite(f, filter->data, len * sizeof(unsigned char)); | |
76ffbca7 GS |
1474 | list++; |
1475 | } | |
1476 | ||
9bab081d | 1477 | return 0; |
76ffbca7 GS |
1478 | } |
1479 | ||
08fd81c9 DS |
1480 | static int add_packed_commits(const struct object_id *oid, |
1481 | struct packed_git *pack, | |
1482 | uint32_t pos, | |
1483 | void *data) | |
1484 | { | |
c9905bea | 1485 | struct write_commit_graph_context *ctx = (struct write_commit_graph_context*)data; |
08fd81c9 DS |
1486 | enum object_type type; |
1487 | off_t offset = nth_packed_object_offset(pack, pos); | |
1488 | struct object_info oi = OBJECT_INFO_INIT; | |
1489 | ||
c9905bea DS |
1490 | if (ctx->progress) |
1491 | display_progress(ctx->progress, ++ctx->progress_done); | |
7b0f2292 | 1492 | |
08fd81c9 | 1493 | oi.typep = &type; |
c9905bea | 1494 | if (packed_object_info(ctx->r, pack, offset, &oi) < 0) |
4f5b532d | 1495 | die(_("unable to get type of object %s"), oid_to_hex(oid)); |
08fd81c9 DS |
1496 | |
1497 | if (type != OBJ_COMMIT) | |
1498 | return 0; | |
1499 | ||
a5f1c448 | 1500 | oid_array_append(&ctx->oids, oid); |
d21ee7d1 JK |
1501 | set_commit_pos(ctx->r, oid); |
1502 | ||
08fd81c9 DS |
1503 | return 0; |
1504 | } | |
1505 | ||
c9905bea | 1506 | static void add_missing_parents(struct write_commit_graph_context *ctx, struct commit *commit) |
4f2542b4 DS |
1507 | { |
1508 | struct commit_list *parent; | |
1509 | for (parent = commit->parents; parent; parent = parent->next) { | |
cb99a34e | 1510 | if (!(parent->item->object.flags & REACHABLE)) { |
a5f1c448 | 1511 | oid_array_append(&ctx->oids, &parent->item->object.oid); |
cb99a34e | 1512 | parent->item->object.flags |= REACHABLE; |
4f2542b4 DS |
1513 | } |
1514 | } | |
1515 | } | |
1516 | ||
c9905bea | 1517 | static void close_reachable(struct write_commit_graph_context *ctx) |
4f2542b4 | 1518 | { |
49bbc57a | 1519 | int i; |
4f2542b4 | 1520 | struct commit *commit; |
98bb7961 TB |
1521 | enum commit_graph_split_flags flags = ctx->opts ? |
1522 | ctx->opts->split_flags : COMMIT_GRAPH_SPLIT_UNSPECIFIED; | |
4f2542b4 | 1523 | |
c9905bea DS |
1524 | if (ctx->report_progress) |
1525 | ctx->progress = start_delayed_progress( | |
1526 | _("Loading known commits in commit graph"), | |
1527 | ctx->oids.nr); | |
1528 | for (i = 0; i < ctx->oids.nr; i++) { | |
1529 | display_progress(ctx->progress, i + 1); | |
a5f1c448 | 1530 | commit = lookup_commit(ctx->r, &ctx->oids.oid[i]); |
4f2542b4 | 1531 | if (commit) |
cb99a34e | 1532 | commit->object.flags |= REACHABLE; |
4f2542b4 | 1533 | } |
c9905bea | 1534 | stop_progress(&ctx->progress); |
4f2542b4 DS |
1535 | |
1536 | /* | |
c9905bea | 1537 | * As this loop runs, ctx->oids.nr may grow, but not more |
4f2542b4 DS |
1538 | * than the number of missing commits in the reachable |
1539 | * closure. | |
1540 | */ | |
c9905bea DS |
1541 | if (ctx->report_progress) |
1542 | ctx->progress = start_delayed_progress( | |
1543 | _("Expanding reachable commits in commit graph"), | |
67fa6aac | 1544 | 0); |
c9905bea DS |
1545 | for (i = 0; i < ctx->oids.nr; i++) { |
1546 | display_progress(ctx->progress, i + 1); | |
a5f1c448 | 1547 | commit = lookup_commit(ctx->r, &ctx->oids.oid[i]); |
4f2542b4 | 1548 | |
6c622f9f DS |
1549 | if (!commit) |
1550 | continue; | |
1551 | if (ctx->split) { | |
c4cc0831 | 1552 | if ((!repo_parse_commit(ctx->r, commit) && |
c49c82aa | 1553 | commit_graph_position(commit) == COMMIT_NOT_FROM_GRAPH) || |
8a6ac287 | 1554 | flags == COMMIT_GRAPH_SPLIT_REPLACE) |
6c622f9f | 1555 | add_missing_parents(ctx, commit); |
c4cc0831 | 1556 | } else if (!repo_parse_commit_no_graph(ctx->r, commit)) |
c9905bea | 1557 | add_missing_parents(ctx, commit); |
4f2542b4 | 1558 | } |
c9905bea | 1559 | stop_progress(&ctx->progress); |
4f2542b4 | 1560 | |
c9905bea DS |
1561 | if (ctx->report_progress) |
1562 | ctx->progress = start_delayed_progress( | |
1563 | _("Clearing commit marks in commit graph"), | |
1564 | ctx->oids.nr); | |
1565 | for (i = 0; i < ctx->oids.nr; i++) { | |
1566 | display_progress(ctx->progress, i + 1); | |
a5f1c448 | 1567 | commit = lookup_commit(ctx->r, &ctx->oids.oid[i]); |
4f2542b4 DS |
1568 | |
1569 | if (commit) | |
cb99a34e | 1570 | commit->object.flags &= ~REACHABLE; |
4f2542b4 | 1571 | } |
c9905bea | 1572 | stop_progress(&ctx->progress); |
4f2542b4 DS |
1573 | } |
1574 | ||
368d19b0 DS |
1575 | struct compute_generation_info { |
1576 | struct repository *r; | |
1577 | struct packed_commit_list *commits; | |
1578 | struct progress *progress; | |
1579 | int progress_cnt; | |
1580 | ||
1581 | timestamp_t (*get_generation)(struct commit *c, void *data); | |
1582 | void (*set_generation)(struct commit *c, timestamp_t gen, void *data); | |
1583 | void *data; | |
1584 | }; | |
1585 | ||
1586 | static timestamp_t compute_generation_from_max(struct commit *c, | |
1587 | timestamp_t max_gen, | |
1588 | int generation_version) | |
1589 | { | |
1590 | switch (generation_version) { | |
1591 | case 1: /* topological levels */ | |
1592 | if (max_gen > GENERATION_NUMBER_V1_MAX - 1) | |
1593 | max_gen = GENERATION_NUMBER_V1_MAX - 1; | |
1594 | return max_gen + 1; | |
1595 | ||
1596 | case 2: /* corrected commit date */ | |
1597 | if (c->date && c->date > max_gen) | |
1598 | max_gen = c->date - 1; | |
1599 | return max_gen + 1; | |
1600 | ||
1601 | default: | |
1602 | BUG("attempting unimplemented version"); | |
1603 | } | |
1604 | } | |
1605 | ||
1606 | static void compute_reachable_generation_numbers( | |
1607 | struct compute_generation_info *info, | |
1608 | int generation_version) | |
3258c663 DS |
1609 | { |
1610 | int i; | |
1611 | struct commit_list *list = NULL; | |
1612 | ||
368d19b0 DS |
1613 | for (i = 0; i < info->commits->nr; i++) { |
1614 | struct commit *c = info->commits->list[i]; | |
1615 | timestamp_t gen; | |
1616 | repo_parse_commit(info->r, c); | |
1617 | gen = info->get_generation(c, info->data); | |
1618 | display_progress(info->progress, info->progress_cnt + 1); | |
4844812b | 1619 | |
368d19b0 | 1620 | if (gen != GENERATION_NUMBER_ZERO && gen != GENERATION_NUMBER_INFINITY) |
3258c663 DS |
1621 | continue; |
1622 | ||
90cb1c47 | 1623 | commit_list_insert(c, &list); |
3258c663 DS |
1624 | while (list) { |
1625 | struct commit *current = list->item; | |
1626 | struct commit_list *parent; | |
1627 | int all_parents_computed = 1; | |
368d19b0 | 1628 | uint32_t max_gen = 0; |
3258c663 DS |
1629 | |
1630 | for (parent = current->parents; parent; parent = parent->next) { | |
368d19b0 DS |
1631 | repo_parse_commit(info->r, parent->item); |
1632 | gen = info->get_generation(parent->item, info->data); | |
4844812b | 1633 | |
368d19b0 | 1634 | if (gen == GENERATION_NUMBER_ZERO) { |
3258c663 DS |
1635 | all_parents_computed = 0; |
1636 | commit_list_insert(parent->item, &list); | |
1637 | break; | |
3258c663 | 1638 | } |
c1a09119 | 1639 | |
368d19b0 DS |
1640 | if (gen > max_gen) |
1641 | max_gen = gen; | |
3258c663 DS |
1642 | } |
1643 | ||
1644 | if (all_parents_computed) { | |
3258c663 | 1645 | pop_commit(&list); |
368d19b0 DS |
1646 | gen = compute_generation_from_max( |
1647 | current, max_gen, | |
1648 | generation_version); | |
1649 | info->set_generation(current, gen, info->data); | |
9c2c0a82 DS |
1650 | } |
1651 | } | |
1652 | } | |
368d19b0 DS |
1653 | } |
1654 | ||
1655 | static timestamp_t get_topo_level(struct commit *c, void *data) | |
1656 | { | |
1657 | struct write_commit_graph_context *ctx = data; | |
1658 | return *topo_level_slab_at(ctx->topo_levels, c); | |
1659 | } | |
1660 | ||
1661 | static void set_topo_level(struct commit *c, timestamp_t t, void *data) | |
1662 | { | |
1663 | struct write_commit_graph_context *ctx = data; | |
1664 | *topo_level_slab_at(ctx->topo_levels, c) = (uint32_t)t; | |
1665 | } | |
1666 | ||
1667 | static void compute_topological_levels(struct write_commit_graph_context *ctx) | |
1668 | { | |
1669 | struct compute_generation_info info = { | |
1670 | .r = ctx->r, | |
1671 | .commits = &ctx->commits, | |
1672 | .get_generation = get_topo_level, | |
1673 | .set_generation = set_topo_level, | |
1674 | .data = ctx, | |
1675 | }; | |
1676 | ||
1677 | if (ctx->report_progress) | |
1678 | info.progress = ctx->progress | |
1679 | = start_delayed_progress( | |
1680 | _("Computing commit graph topological levels"), | |
1681 | ctx->commits.nr); | |
1682 | ||
1683 | compute_reachable_generation_numbers(&info, 1); | |
1684 | ||
9c2c0a82 DS |
1685 | stop_progress(&ctx->progress); |
1686 | } | |
1687 | ||
e1cba404 JK |
1688 | static timestamp_t get_generation_from_graph_data(struct commit *c, |
1689 | void *data UNUSED) | |
80c928d9 DS |
1690 | { |
1691 | return commit_graph_data_at(c)->generation; | |
1692 | } | |
1693 | ||
e1cba404 JK |
1694 | static void set_generation_v2(struct commit *c, timestamp_t t, |
1695 | void *data UNUSED) | |
80c928d9 DS |
1696 | { |
1697 | struct commit_graph_data *g = commit_graph_data_at(c); | |
d3af1c19 | 1698 | g->generation = t; |
80c928d9 DS |
1699 | } |
1700 | ||
9c2c0a82 DS |
1701 | static void compute_generation_numbers(struct write_commit_graph_context *ctx) |
1702 | { | |
1703 | int i; | |
80c928d9 DS |
1704 | struct compute_generation_info info = { |
1705 | .r = ctx->r, | |
1706 | .commits = &ctx->commits, | |
1707 | .get_generation = get_generation_from_graph_data, | |
1708 | .set_generation = set_generation_v2, | |
80c928d9 | 1709 | }; |
9c2c0a82 DS |
1710 | |
1711 | if (ctx->report_progress) | |
80c928d9 DS |
1712 | info.progress = ctx->progress |
1713 | = start_delayed_progress( | |
9c2c0a82 DS |
1714 | _("Computing commit graph generation numbers"), |
1715 | ctx->commits.nr); | |
fde55b09 DS |
1716 | |
1717 | if (!ctx->trust_generation_numbers) { | |
1718 | for (i = 0; i < ctx->commits.nr; i++) { | |
1719 | struct commit *c = ctx->commits.list[i]; | |
1720 | repo_parse_commit(ctx->r, c); | |
1721 | commit_graph_data_at(c)->generation = GENERATION_NUMBER_ZERO; | |
1722 | } | |
1723 | } | |
1724 | ||
80c928d9 | 1725 | compute_reachable_generation_numbers(&info, 2); |
75979d94 DS |
1726 | |
1727 | for (i = 0; i < ctx->commits.nr; i++) { | |
1728 | struct commit *c = ctx->commits.list[i]; | |
1729 | timestamp_t offset = commit_graph_data_at(c)->generation - c->date; | |
1730 | if (offset > GENERATION_NUMBER_V2_OFFSET_MAX) | |
1731 | ctx->num_generation_data_overflows++; | |
1732 | } | |
c9905bea | 1733 | stop_progress(&ctx->progress); |
3258c663 DS |
1734 | } |
1735 | ||
c08645b3 | 1736 | static void set_generation_in_graph_data(struct commit *c, timestamp_t t, |
e1cba404 | 1737 | void *data UNUSED) |
c08645b3 TB |
1738 | { |
1739 | commit_graph_data_at(c)->generation = t; | |
1740 | } | |
1741 | ||
1742 | /* | |
1743 | * After this method, all commits reachable from those in the given | |
1744 | * list will have non-zero, non-infinite generation numbers. | |
1745 | */ | |
1746 | void ensure_generations_valid(struct repository *r, | |
1747 | struct commit **commits, size_t nr) | |
1748 | { | |
1749 | int generation_version = get_configured_generation_version(r); | |
1750 | struct packed_commit_list list = { | |
1751 | .list = commits, | |
1752 | .alloc = nr, | |
1753 | .nr = nr, | |
1754 | }; | |
1755 | struct compute_generation_info info = { | |
1756 | .r = r, | |
1757 | .commits = &list, | |
1758 | .get_generation = get_generation_from_graph_data, | |
1759 | .set_generation = set_generation_in_graph_data, | |
1760 | }; | |
1761 | ||
1762 | compute_reachable_generation_numbers(&info, generation_version); | |
1763 | } | |
1764 | ||
312cff52 TB |
1765 | static void trace2_bloom_filter_write_statistics(struct write_commit_graph_context *ctx) |
1766 | { | |
1767 | trace2_data_intmax("commit-graph", ctx->r, "filter-computed", | |
1768 | ctx->count_bloom_filter_computed); | |
1769 | trace2_data_intmax("commit-graph", ctx->r, "filter-not-computed", | |
1770 | ctx->count_bloom_filter_not_computed); | |
59f0d507 TB |
1771 | trace2_data_intmax("commit-graph", ctx->r, "filter-trunc-empty", |
1772 | ctx->count_bloom_filter_trunc_empty); | |
312cff52 TB |
1773 | trace2_data_intmax("commit-graph", ctx->r, "filter-trunc-large", |
1774 | ctx->count_bloom_filter_trunc_large); | |
1775 | } | |
1776 | ||
f97b9325 GS |
1777 | static void compute_bloom_filters(struct write_commit_graph_context *ctx) |
1778 | { | |
1779 | int i; | |
1780 | struct progress *progress = NULL; | |
d21ee7d1 | 1781 | struct commit **sorted_commits; |
809e0327 | 1782 | int max_new_filters; |
f97b9325 GS |
1783 | |
1784 | init_bloom_filters(); | |
1785 | ||
1786 | if (ctx->report_progress) | |
1787 | progress = start_delayed_progress( | |
1788 | _("Computing commit changed paths Bloom filters"), | |
1789 | ctx->commits.nr); | |
1790 | ||
6e578410 | 1791 | DUP_ARRAY(sorted_commits, ctx->commits.list, ctx->commits.nr); |
3d112755 GS |
1792 | |
1793 | if (ctx->order_by_pack) | |
1794 | QSORT(sorted_commits, ctx->commits.nr, commit_pos_cmp); | |
1795 | else | |
1796 | QSORT(sorted_commits, ctx->commits.nr, commit_gen_cmp); | |
d21ee7d1 | 1797 | |
809e0327 TB |
1798 | max_new_filters = ctx->opts && ctx->opts->max_new_filters >= 0 ? |
1799 | ctx->opts->max_new_filters : ctx->commits.nr; | |
1800 | ||
f97b9325 | 1801 | for (i = 0; i < ctx->commits.nr; i++) { |
312cff52 | 1802 | enum bloom_filter_computed computed = 0; |
d21ee7d1 | 1803 | struct commit *c = sorted_commits[i]; |
312cff52 TB |
1804 | struct bloom_filter *filter = get_or_compute_bloom_filter( |
1805 | ctx->r, | |
1806 | c, | |
809e0327 | 1807 | ctx->count_bloom_filter_computed < max_new_filters, |
9a7a9ed1 | 1808 | ctx->bloom_settings, |
312cff52 TB |
1809 | &computed); |
1810 | if (computed & BLOOM_COMPUTED) { | |
1811 | ctx->count_bloom_filter_computed++; | |
59f0d507 TB |
1812 | if (computed & BLOOM_TRUNC_EMPTY) |
1813 | ctx->count_bloom_filter_trunc_empty++; | |
312cff52 TB |
1814 | if (computed & BLOOM_TRUNC_LARGE) |
1815 | ctx->count_bloom_filter_trunc_large++; | |
1816 | } else if (computed & BLOOM_NOT_COMPUTED) | |
1817 | ctx->count_bloom_filter_not_computed++; | |
809e0327 TB |
1818 | ctx->total_bloom_filter_data_size += filter |
1819 | ? sizeof(unsigned char) * filter->len : 0; | |
f97b9325 GS |
1820 | display_progress(progress, i + 1); |
1821 | } | |
1822 | ||
312cff52 TB |
1823 | if (trace2_is_enabled()) |
1824 | trace2_bloom_filter_write_statistics(ctx); | |
1825 | ||
d21ee7d1 | 1826 | free(sorted_commits); |
f97b9325 GS |
1827 | stop_progress(&progress); |
1828 | } | |
1829 | ||
1fe10844 TB |
1830 | struct refs_cb_data { |
1831 | struct oidset *commits; | |
d335ce8f | 1832 | struct progress *progress; |
1fe10844 TB |
1833 | }; |
1834 | ||
5cf88fd8 | 1835 | static int add_ref_to_set(const char *refname UNUSED, |
6830c360 | 1836 | const struct object_id *oid, |
5cf88fd8 | 1837 | int flags UNUSED, void *cb_data) |
59fb8770 | 1838 | { |
630cd519 | 1839 | struct object_id peeled; |
1fe10844 | 1840 | struct refs_cb_data *data = (struct refs_cb_data *)cb_data; |
59fb8770 | 1841 | |
36a31792 | 1842 | if (!peel_iterated_oid(oid, &peeled)) |
630cd519 TB |
1843 | oid = &peeled; |
1844 | if (oid_object_info(the_repository, oid, NULL) == OBJ_COMMIT) | |
1845 | oidset_insert(data->commits, oid); | |
d335ce8f TB |
1846 | |
1847 | display_progress(data->progress, oidset_size(data->commits)); | |
59fb8770 | 1848 | |
59fb8770 DS |
1849 | return 0; |
1850 | } | |
1851 | ||
0bd52e27 | 1852 | int write_commit_graph_reachable(struct object_directory *odb, |
39d88318 | 1853 | enum commit_graph_write_flags flags, |
98bb7961 | 1854 | const struct commit_graph_opts *opts) |
59fb8770 | 1855 | { |
6830c360 | 1856 | struct oidset commits = OIDSET_INIT; |
1fe10844 | 1857 | struct refs_cb_data data; |
e103f727 | 1858 | int result; |
59fb8770 | 1859 | |
1fe10844 TB |
1860 | memset(&data, 0, sizeof(data)); |
1861 | data.commits = &commits; | |
d335ce8f TB |
1862 | if (flags & COMMIT_GRAPH_WRITE_PROGRESS) |
1863 | data.progress = start_delayed_progress( | |
1864 | _("Collecting referenced commits"), 0); | |
1fe10844 TB |
1865 | |
1866 | for_each_ref(add_ref_to_set, &data); | |
6f9d5f2f SG |
1867 | |
1868 | stop_progress(&data.progress); | |
1869 | ||
6830c360 | 1870 | result = write_commit_graph(odb, NULL, &commits, |
98bb7961 | 1871 | flags, opts); |
f4dbdfc4 | 1872 | |
6830c360 | 1873 | oidset_clear(&commits); |
e103f727 | 1874 | return result; |
59fb8770 DS |
1875 | } |
1876 | ||
ef5b83f2 | 1877 | static int fill_oids_from_packs(struct write_commit_graph_context *ctx, |
4a047908 | 1878 | const struct string_list *pack_indexes) |
08fd81c9 | 1879 | { |
ef5b83f2 | 1880 | uint32_t i; |
28944739 | 1881 | struct strbuf progress_title = STRBUF_INIT; |
ef5b83f2 DS |
1882 | struct strbuf packname = STRBUF_INIT; |
1883 | int dirlen; | |
51a94d8f | 1884 | int ret = 0; |
08fd81c9 | 1885 | |
0bd52e27 | 1886 | strbuf_addf(&packname, "%s/pack/", ctx->odb->path); |
ef5b83f2 DS |
1887 | dirlen = packname.len; |
1888 | if (ctx->report_progress) { | |
1889 | strbuf_addf(&progress_title, | |
99d60545 ÆAB |
1890 | Q_("Finding commits for commit graph in %"PRIuMAX" pack", |
1891 | "Finding commits for commit graph in %"PRIuMAX" packs", | |
ef5b83f2 | 1892 | pack_indexes->nr), |
99d60545 | 1893 | (uintmax_t)pack_indexes->nr); |
ef5b83f2 DS |
1894 | ctx->progress = start_delayed_progress(progress_title.buf, 0); |
1895 | ctx->progress_done = 0; | |
7547b95b | 1896 | } |
ef5b83f2 DS |
1897 | for (i = 0; i < pack_indexes->nr; i++) { |
1898 | struct packed_git *p; | |
1899 | strbuf_setlen(&packname, dirlen); | |
1900 | strbuf_addstr(&packname, pack_indexes->items[i].string); | |
1901 | p = add_packed_git(packname.buf, packname.len, 1); | |
1902 | if (!p) { | |
51a94d8f ÆAB |
1903 | ret = error(_("error adding pack %s"), packname.buf); |
1904 | goto cleanup; | |
7547b95b | 1905 | } |
ef5b83f2 | 1906 | if (open_pack_index(p)) { |
51a94d8f ÆAB |
1907 | ret = error(_("error opening index for %s"), packname.buf); |
1908 | goto cleanup; | |
ef5b83f2 DS |
1909 | } |
1910 | for_each_object_in_pack(p, add_packed_commits, ctx, | |
1911 | FOR_EACH_OBJECT_PACK_ORDER); | |
1912 | close_pack(p); | |
1913 | free(p); | |
7547b95b DS |
1914 | } |
1915 | ||
51a94d8f | 1916 | cleanup: |
ef5b83f2 | 1917 | stop_progress(&ctx->progress); |
0aa6bce7 | 1918 | strbuf_release(&progress_title); |
ef5b83f2 DS |
1919 | strbuf_release(&packname); |
1920 | ||
51a94d8f | 1921 | return ret; |
ef5b83f2 DS |
1922 | } |
1923 | ||
6830c360 TB |
1924 | static int fill_oids_from_commits(struct write_commit_graph_context *ctx, |
1925 | struct oidset *commits) | |
4c9efe85 | 1926 | { |
6830c360 TB |
1927 | struct oidset_iter iter; |
1928 | struct object_id *oid; | |
1929 | ||
1930 | if (!oidset_size(commits)) | |
1931 | return 0; | |
4c9efe85 | 1932 | |
6830c360 TB |
1933 | oidset_iter_init(commits, &iter); |
1934 | while ((oid = oidset_iter_next(&iter))) { | |
a5f1c448 | 1935 | oid_array_append(&ctx->oids, oid); |
3d5df01b | 1936 | } |
6830c360 | 1937 | |
7c5c9b9c | 1938 | return 0; |
4c9efe85 | 1939 | } |
3d5df01b | 1940 | |
b2c83060 DS |
1941 | static void fill_oids_from_all_packs(struct write_commit_graph_context *ctx) |
1942 | { | |
1943 | if (ctx->report_progress) | |
1944 | ctx->progress = start_delayed_progress( | |
1945 | _("Finding commits for commit graph among packed objects"), | |
1946 | ctx->approx_nr_objects); | |
1947 | for_each_packed_object(add_packed_commits, ctx, | |
1948 | FOR_EACH_OBJECT_PACK_ORDER); | |
1949 | if (ctx->progress_done < ctx->approx_nr_objects) | |
1950 | display_progress(ctx->progress, ctx->approx_nr_objects); | |
1951 | stop_progress(&ctx->progress); | |
1952 | } | |
049d51a2 | 1953 | |
f998d542 DS |
1954 | static void copy_oids_to_commits(struct write_commit_graph_context *ctx) |
1955 | { | |
1956 | uint32_t i; | |
98bb7961 TB |
1957 | enum commit_graph_split_flags flags = ctx->opts ? |
1958 | ctx->opts->split_flags : COMMIT_GRAPH_SPLIT_UNSPECIFIED; | |
08fd81c9 | 1959 | |
f998d542 DS |
1960 | ctx->num_extra_edges = 0; |
1961 | if (ctx->report_progress) | |
1962 | ctx->progress = start_delayed_progress( | |
890226cc | 1963 | _("Finding extra edges in commit graph"), |
f998d542 | 1964 | ctx->oids.nr); |
a5f1c448 JK |
1965 | oid_array_sort(&ctx->oids); |
1966 | for (i = 0; i < ctx->oids.nr; i = oid_array_next_unique(&ctx->oids, i)) { | |
689a146c RS |
1967 | unsigned int num_parents; |
1968 | ||
f998d542 | 1969 | display_progress(ctx->progress, i + 1); |
08fd81c9 | 1970 | |
6c622f9f | 1971 | ALLOC_GROW(ctx->commits.list, ctx->commits.nr + 1, ctx->commits.alloc); |
a5f1c448 | 1972 | ctx->commits.list[ctx->commits.nr] = lookup_commit(ctx->r, &ctx->oids.oid[i]); |
6c622f9f | 1973 | |
8a6ac287 | 1974 | if (ctx->split && flags != COMMIT_GRAPH_SPLIT_REPLACE && |
c49c82aa | 1975 | commit_graph_position(ctx->commits.list[ctx->commits.nr]) != COMMIT_NOT_FROM_GRAPH) |
6c622f9f DS |
1976 | continue; |
1977 | ||
8a6ac287 | 1978 | if (ctx->split && flags == COMMIT_GRAPH_SPLIT_REPLACE) |
c4cc0831 | 1979 | repo_parse_commit(ctx->r, ctx->commits.list[ctx->commits.nr]); |
8a6ac287 | 1980 | else |
c4cc0831 | 1981 | repo_parse_commit_no_graph(ctx->r, ctx->commits.list[ctx->commits.nr]); |
08fd81c9 | 1982 | |
689a146c | 1983 | num_parents = commit_list_count(ctx->commits.list[ctx->commits.nr]->parents); |
08fd81c9 | 1984 | if (num_parents > 2) |
f998d542 | 1985 | ctx->num_extra_edges += num_parents - 1; |
08fd81c9 | 1986 | |
f998d542 | 1987 | ctx->commits.nr++; |
08fd81c9 | 1988 | } |
f998d542 DS |
1989 | stop_progress(&ctx->progress); |
1990 | } | |
08fd81c9 | 1991 | |
6c622f9f DS |
1992 | static int write_graph_chunk_base_1(struct hashfile *f, |
1993 | struct commit_graph *g) | |
1994 | { | |
1995 | int num = 0; | |
1996 | ||
1997 | if (!g) | |
1998 | return 0; | |
1999 | ||
2000 | num = write_graph_chunk_base_1(f, g->base_graph); | |
2001 | hashwrite(f, g->oid.hash, the_hash_algo->rawsz); | |
2002 | return num + 1; | |
2003 | } | |
2004 | ||
2005 | static int write_graph_chunk_base(struct hashfile *f, | |
eb907191 | 2006 | void *data) |
6c622f9f | 2007 | { |
eb907191 | 2008 | struct write_commit_graph_context *ctx = data; |
6c622f9f DS |
2009 | int num = write_graph_chunk_base_1(f, ctx->new_base_graph); |
2010 | ||
2011 | if (num != ctx->num_commit_graphs_after - 1) { | |
2012 | error(_("failed to write correct number of base graph ids")); | |
2013 | return -1; | |
2014 | } | |
2015 | ||
2016 | return 0; | |
2017 | } | |
2018 | ||
238def57 | 2019 | static int write_commit_graph_file(struct write_commit_graph_context *ctx) |
08fd81c9 | 2020 | { |
238def57 | 2021 | uint32_t i; |
6c622f9f | 2022 | int fd; |
08fd81c9 | 2023 | struct hashfile *f; |
08fd81c9 | 2024 | struct lock_file lk = LOCK_INIT; |
c1665998 | 2025 | const unsigned hashsz = the_hash_algo->rawsz; |
28944739 | 2026 | struct strbuf progress_title = STRBUF_INIT; |
47410aa8 | 2027 | struct chunkfile *cf; |
72871b13 | 2028 | unsigned char file_hash[GIT_MAX_RAWSZ]; |
6c622f9f DS |
2029 | |
2030 | if (ctx->split) { | |
2031 | struct strbuf tmp_file = STRBUF_INIT; | |
2032 | ||
2033 | strbuf_addf(&tmp_file, | |
2034 | "%s/info/commit-graphs/tmp_graph_XXXXXX", | |
0bd52e27 | 2035 | ctx->odb->path); |
6c622f9f DS |
2036 | ctx->graph_name = strbuf_detach(&tmp_file, NULL); |
2037 | } else { | |
ad2dd5bb | 2038 | ctx->graph_name = get_commit_graph_filename(ctx->odb); |
6c622f9f | 2039 | } |
238def57 | 2040 | |
238def57 DS |
2041 | if (safe_create_leading_directories(ctx->graph_name)) { |
2042 | UNLEAK(ctx->graph_name); | |
2043 | error(_("unable to create leading directories of %s"), | |
2044 | ctx->graph_name); | |
2045 | return -1; | |
f4dbdfc4 | 2046 | } |
08fd81c9 | 2047 | |
6c622f9f | 2048 | if (ctx->split) { |
663b2b1b | 2049 | char *lock_name = get_commit_graph_chain_filename(ctx->odb); |
08fd81c9 | 2050 | |
45a4365c TB |
2051 | hold_lock_file_for_update_mode(&lk, lock_name, |
2052 | LOCK_DIE_ON_ERROR, 0444); | |
ef3fe214 | 2053 | free(lock_name); |
08fd81c9 | 2054 | |
6c622f9f DS |
2055 | fd = git_mkstemp_mode(ctx->graph_name, 0444); |
2056 | if (fd < 0) { | |
a2d57e22 | 2057 | error(_("unable to create temporary graph layer")); |
6c622f9f DS |
2058 | return -1; |
2059 | } | |
2060 | ||
f4d62847 TB |
2061 | if (adjust_shared_perm(ctx->graph_name)) { |
2062 | error(_("unable to adjust shared permissions for '%s'"), | |
2063 | ctx->graph_name); | |
2064 | return -1; | |
2065 | } | |
2066 | ||
6c622f9f DS |
2067 | f = hashfd(fd, ctx->graph_name); |
2068 | } else { | |
1f9becae TB |
2069 | hold_lock_file_for_update_mode(&lk, ctx->graph_name, |
2070 | LOCK_DIE_ON_ERROR, 0444); | |
a52cdce9 MÅ |
2071 | fd = get_lock_file_fd(&lk); |
2072 | f = hashfd(fd, get_lock_file_path(&lk)); | |
6c622f9f | 2073 | } |
08fd81c9 | 2074 | |
47410aa8 DS |
2075 | cf = init_chunkfile(f); |
2076 | ||
2077 | add_chunk(cf, GRAPH_CHUNKID_OIDFANOUT, GRAPH_FANOUT_SIZE, | |
2078 | write_graph_chunk_fanout); | |
48f3f8cf | 2079 | add_chunk(cf, GRAPH_CHUNKID_OIDLOOKUP, st_mult(hashsz, ctx->commits.nr), |
47410aa8 | 2080 | write_graph_chunk_oids); |
48f3f8cf | 2081 | add_chunk(cf, GRAPH_CHUNKID_DATA, st_mult(hashsz + 16, ctx->commits.nr), |
47410aa8 | 2082 | write_graph_chunk_data); |
e8b63005 | 2083 | |
47410aa8 DS |
2084 | if (ctx->write_generation_data) |
2085 | add_chunk(cf, GRAPH_CHUNKID_GENERATION_DATA, | |
48f3f8cf | 2086 | st_mult(sizeof(uint32_t), ctx->commits.nr), |
47410aa8 DS |
2087 | write_graph_chunk_generation_data); |
2088 | if (ctx->num_generation_data_overflows) | |
2089 | add_chunk(cf, GRAPH_CHUNKID_GENERATION_DATA_OVERFLOW, | |
48f3f8cf | 2090 | st_mult(sizeof(timestamp_t), ctx->num_generation_data_overflows), |
47410aa8 DS |
2091 | write_graph_chunk_generation_data_overflow); |
2092 | if (ctx->num_extra_edges) | |
2093 | add_chunk(cf, GRAPH_CHUNKID_EXTRAEDGES, | |
48f3f8cf | 2094 | st_mult(4, ctx->num_extra_edges), |
47410aa8 | 2095 | write_graph_chunk_extra_edges); |
76ffbca7 | 2096 | if (ctx->changed_paths) { |
47410aa8 | 2097 | add_chunk(cf, GRAPH_CHUNKID_BLOOMINDEXES, |
48f3f8cf | 2098 | st_mult(sizeof(uint32_t), ctx->commits.nr), |
47410aa8 DS |
2099 | write_graph_chunk_bloom_indexes); |
2100 | add_chunk(cf, GRAPH_CHUNKID_BLOOMDATA, | |
48f3f8cf TB |
2101 | st_add(sizeof(uint32_t) * 3, |
2102 | ctx->total_bloom_filter_data_size), | |
47410aa8 | 2103 | write_graph_chunk_bloom_data); |
76ffbca7 | 2104 | } |
47410aa8 DS |
2105 | if (ctx->num_commit_graphs_after > 1) |
2106 | add_chunk(cf, GRAPH_CHUNKID_BASE, | |
48f3f8cf | 2107 | st_mult(hashsz, ctx->num_commit_graphs_after - 1), |
47410aa8 | 2108 | write_graph_chunk_base); |
144354b0 DS |
2109 | |
2110 | hashwrite_be32(f, GRAPH_SIGNATURE); | |
2111 | ||
2112 | hashwrite_u8(f, GRAPH_VERSION); | |
d9fef9d9 | 2113 | hashwrite_u8(f, oid_version(the_hash_algo)); |
47410aa8 | 2114 | hashwrite_u8(f, get_num_chunks(cf)); |
6c622f9f | 2115 | hashwrite_u8(f, ctx->num_commit_graphs_after - 1); |
08fd81c9 | 2116 | |
238def57 | 2117 | if (ctx->report_progress) { |
28944739 ÆAB |
2118 | strbuf_addf(&progress_title, |
2119 | Q_("Writing out commit graph in %d pass", | |
2120 | "Writing out commit graph in %d passes", | |
c4ff24bb TB |
2121 | get_num_chunks(cf)), |
2122 | get_num_chunks(cf)); | |
238def57 | 2123 | ctx->progress = start_delayed_progress( |
28944739 | 2124 | progress_title.buf, |
48f3f8cf | 2125 | st_mult(get_num_chunks(cf), ctx->commits.nr)); |
28944739 | 2126 | } |
17e6275f | 2127 | |
47410aa8 | 2128 | write_chunkfile(cf, ctx); |
17e6275f | 2129 | |
238def57 | 2130 | stop_progress(&ctx->progress); |
28944739 | 2131 | strbuf_release(&progress_title); |
08fd81c9 | 2132 | |
6c622f9f DS |
2133 | if (ctx->split && ctx->base_graph_name && ctx->num_commit_graphs_after > 1) { |
2134 | char *new_base_hash = xstrdup(oid_to_hex(&ctx->new_base_graph->oid)); | |
ad2dd5bb | 2135 | char *new_base_name = get_split_graph_filename(ctx->new_base_graph->odb, new_base_hash); |
6c622f9f DS |
2136 | |
2137 | free(ctx->commit_graph_filenames_after[ctx->num_commit_graphs_after - 2]); | |
2138 | free(ctx->commit_graph_hash_after[ctx->num_commit_graphs_after - 2]); | |
2139 | ctx->commit_graph_filenames_after[ctx->num_commit_graphs_after - 2] = new_base_name; | |
2140 | ctx->commit_graph_hash_after[ctx->num_commit_graphs_after - 2] = new_base_hash; | |
2141 | } | |
2142 | ||
c3a3a964 | 2143 | close_commit_graph(ctx->r->objects); |
020406ea NS |
2144 | finalize_hashfile(f, file_hash, FSYNC_COMPONENT_COMMIT_GRAPH, |
2145 | CSUM_HASH_IN_STREAM | CSUM_FSYNC); | |
47410aa8 | 2146 | free_chunkfile(cf); |
6c622f9f DS |
2147 | |
2148 | if (ctx->split) { | |
2149 | FILE *chainf = fdopen_lock_file(&lk, "w"); | |
2150 | char *final_graph_name; | |
2151 | int result; | |
2152 | ||
2153 | close(fd); | |
2154 | ||
2155 | if (!chainf) { | |
2156 | error(_("unable to open commit-graph chain file")); | |
2157 | return -1; | |
2158 | } | |
2159 | ||
2160 | if (ctx->base_graph_name) { | |
8a6ac287 TB |
2161 | const char *dest; |
2162 | int idx = ctx->num_commit_graphs_after - 1; | |
2163 | if (ctx->num_commit_graphs_after > 1) | |
2164 | idx--; | |
2165 | ||
2166 | dest = ctx->commit_graph_filenames_after[idx]; | |
6c622f9f | 2167 | |
135a7123 DS |
2168 | if (strcmp(ctx->base_graph_name, dest)) { |
2169 | result = rename(ctx->base_graph_name, dest); | |
2170 | ||
2171 | if (result) { | |
2172 | error(_("failed to rename base commit-graph file")); | |
2173 | return -1; | |
2174 | } | |
6c622f9f DS |
2175 | } |
2176 | } else { | |
ad2dd5bb | 2177 | char *graph_name = get_commit_graph_filename(ctx->odb); |
6c622f9f | 2178 | unlink(graph_name); |
ef3fe214 | 2179 | free(graph_name); |
6c622f9f DS |
2180 | } |
2181 | ||
274bfa7f | 2182 | free(ctx->commit_graph_hash_after[ctx->num_commit_graphs_after - 1]); |
72871b13 | 2183 | ctx->commit_graph_hash_after[ctx->num_commit_graphs_after - 1] = xstrdup(hash_to_hex(file_hash)); |
ad2dd5bb | 2184 | final_graph_name = get_split_graph_filename(ctx->odb, |
6c622f9f | 2185 | ctx->commit_graph_hash_after[ctx->num_commit_graphs_after - 1]); |
274bfa7f | 2186 | free(ctx->commit_graph_filenames_after[ctx->num_commit_graphs_after - 1]); |
6c622f9f DS |
2187 | ctx->commit_graph_filenames_after[ctx->num_commit_graphs_after - 1] = final_graph_name; |
2188 | ||
2189 | result = rename(ctx->graph_name, final_graph_name); | |
2190 | ||
2191 | for (i = 0; i < ctx->num_commit_graphs_after; i++) | |
a52cdce9 | 2192 | fprintf(get_lock_file_fp(&lk), "%s\n", ctx->commit_graph_hash_after[i]); |
6c622f9f DS |
2193 | |
2194 | if (result) { | |
2195 | error(_("failed to rename temporary commit-graph file")); | |
2196 | return -1; | |
2197 | } | |
2198 | } | |
2199 | ||
08fd81c9 DS |
2200 | commit_lock_file(&lk); |
2201 | ||
238def57 DS |
2202 | return 0; |
2203 | } | |
2204 | ||
1771be90 DS |
2205 | static void split_graph_merge_strategy(struct write_commit_graph_context *ctx) |
2206 | { | |
8da02ce6 AH |
2207 | struct commit_graph *g; |
2208 | uint32_t num_commits; | |
fdbde82f | 2209 | enum commit_graph_split_flags flags = COMMIT_GRAPH_SPLIT_UNSPECIFIED; |
1771be90 DS |
2210 | uint32_t i; |
2211 | ||
c2bc6e6a DS |
2212 | int max_commits = 0; |
2213 | int size_mult = 2; | |
2214 | ||
98bb7961 TB |
2215 | if (ctx->opts) { |
2216 | max_commits = ctx->opts->max_commits; | |
63020f17 | 2217 | |
98bb7961 TB |
2218 | if (ctx->opts->size_multiple) |
2219 | size_mult = ctx->opts->size_multiple; | |
fdbde82f | 2220 | |
98bb7961 | 2221 | flags = ctx->opts->split_flags; |
c2bc6e6a DS |
2222 | } |
2223 | ||
1771be90 | 2224 | g = ctx->r->objects->commit_graph; |
8da02ce6 | 2225 | num_commits = ctx->commits.nr; |
8a6ac287 TB |
2226 | if (flags == COMMIT_GRAPH_SPLIT_REPLACE) |
2227 | ctx->num_commit_graphs_after = 1; | |
2228 | else | |
2229 | ctx->num_commit_graphs_after = ctx->num_commit_graphs_before + 1; | |
1771be90 | 2230 | |
8a6ac287 TB |
2231 | if (flags != COMMIT_GRAPH_SPLIT_MERGE_PROHIBITED && |
2232 | flags != COMMIT_GRAPH_SPLIT_REPLACE) { | |
19565d09 | 2233 | while (g && (g->num_commits <= st_mult(size_mult, num_commits) || |
fdbde82f TB |
2234 | (max_commits && num_commits > max_commits))) { |
2235 | if (g->odb != ctx->odb) | |
2236 | break; | |
c523035c | 2237 | |
19565d09 TB |
2238 | if (unsigned_add_overflows(num_commits, g->num_commits)) |
2239 | die(_("cannot merge graphs with %"PRIuMAX", " | |
2240 | "%"PRIuMAX" commits"), | |
2241 | (uintmax_t)num_commits, | |
2242 | (uintmax_t)g->num_commits); | |
fdbde82f TB |
2243 | num_commits += g->num_commits; |
2244 | g = g->base_graph; | |
1771be90 | 2245 | |
fdbde82f TB |
2246 | ctx->num_commit_graphs_after--; |
2247 | } | |
1771be90 DS |
2248 | } |
2249 | ||
8a6ac287 TB |
2250 | if (flags != COMMIT_GRAPH_SPLIT_REPLACE) |
2251 | ctx->new_base_graph = g; | |
2252 | else if (ctx->num_commit_graphs_after != 1) | |
2253 | BUG("split_graph_merge_strategy: num_commit_graphs_after " | |
2254 | "should be 1 with --split=replace"); | |
1771be90 | 2255 | |
c523035c | 2256 | if (ctx->num_commit_graphs_after == 2) { |
ad2dd5bb | 2257 | char *old_graph_name = get_commit_graph_filename(g->odb); |
c523035c DS |
2258 | |
2259 | if (!strcmp(g->filename, old_graph_name) && | |
ad2dd5bb | 2260 | g->odb != ctx->odb) { |
c523035c DS |
2261 | ctx->num_commit_graphs_after = 1; |
2262 | ctx->new_base_graph = NULL; | |
2263 | } | |
2264 | ||
2265 | free(old_graph_name); | |
2266 | } | |
2267 | ||
b78a556a TB |
2268 | CALLOC_ARRAY(ctx->commit_graph_filenames_after, ctx->num_commit_graphs_after); |
2269 | CALLOC_ARRAY(ctx->commit_graph_hash_after, ctx->num_commit_graphs_after); | |
1771be90 DS |
2270 | |
2271 | for (i = 0; i < ctx->num_commit_graphs_after && | |
2272 | i < ctx->num_commit_graphs_before; i++) | |
2273 | ctx->commit_graph_filenames_after[i] = xstrdup(ctx->commit_graph_filenames_before[i]); | |
2274 | ||
2275 | i = ctx->num_commit_graphs_before - 1; | |
2276 | g = ctx->r->objects->commit_graph; | |
2277 | ||
2278 | while (g) { | |
2279 | if (i < ctx->num_commit_graphs_after) | |
2280 | ctx->commit_graph_hash_after[i] = xstrdup(oid_to_hex(&g->oid)); | |
2281 | ||
1fdc383c AK |
2282 | /* |
2283 | * If the topmost remaining layer has generation data chunk, the | |
2284 | * resultant layer also has generation data chunk. | |
2285 | */ | |
2286 | if (i == ctx->num_commit_graphs_after - 2) | |
2287 | ctx->write_generation_data = !!g->chunk_generation_data; | |
2288 | ||
1771be90 DS |
2289 | i--; |
2290 | g = g->base_graph; | |
2291 | } | |
2292 | } | |
2293 | ||
2294 | static void merge_commit_graph(struct write_commit_graph_context *ctx, | |
2295 | struct commit_graph *g) | |
2296 | { | |
2297 | uint32_t i; | |
2298 | uint32_t offset = g->num_commits_in_base; | |
2299 | ||
d76e0a74 TB |
2300 | if (unsigned_add_overflows(ctx->commits.nr, g->num_commits)) |
2301 | die(_("cannot merge graph %s, too many commits: %"PRIuMAX), | |
2302 | oid_to_hex(&g->oid), | |
2303 | (uintmax_t)st_add(ctx->commits.nr, g->num_commits)); | |
2304 | ||
1771be90 DS |
2305 | ALLOC_GROW(ctx->commits.list, ctx->commits.nr + g->num_commits, ctx->commits.alloc); |
2306 | ||
2307 | for (i = 0; i < g->num_commits; i++) { | |
2308 | struct object_id oid; | |
2309 | struct commit *result; | |
2310 | ||
2311 | display_progress(ctx->progress, i + 1); | |
2312 | ||
2313 | load_oid_from_graph(g, i + offset, &oid); | |
2314 | ||
2315 | /* only add commits if they still exist in the repo */ | |
2316 | result = lookup_commit_reference_gently(ctx->r, &oid, 1); | |
2317 | ||
2318 | if (result) { | |
2319 | ctx->commits.list[ctx->commits.nr] = result; | |
2320 | ctx->commits.nr++; | |
2321 | } | |
2322 | } | |
2323 | } | |
2324 | ||
2325 | static int commit_compare(const void *_a, const void *_b) | |
2326 | { | |
2327 | const struct commit *a = *(const struct commit **)_a; | |
2328 | const struct commit *b = *(const struct commit **)_b; | |
2329 | return oidcmp(&a->object.oid, &b->object.oid); | |
2330 | } | |
2331 | ||
2332 | static void sort_and_scan_merged_commits(struct write_commit_graph_context *ctx) | |
2333 | { | |
150f1157 | 2334 | uint32_t i, dedup_i = 0; |
1771be90 DS |
2335 | |
2336 | if (ctx->report_progress) | |
2337 | ctx->progress = start_delayed_progress( | |
2338 | _("Scanning merged commits"), | |
2339 | ctx->commits.nr); | |
2340 | ||
2341 | QSORT(ctx->commits.list, ctx->commits.nr, commit_compare); | |
2342 | ||
2343 | ctx->num_extra_edges = 0; | |
2344 | for (i = 0; i < ctx->commits.nr; i++) { | |
40112249 | 2345 | display_progress(ctx->progress, i + 1); |
1771be90 DS |
2346 | |
2347 | if (i && oideq(&ctx->commits.list[i - 1]->object.oid, | |
2348 | &ctx->commits.list[i]->object.oid)) { | |
150f1157 DS |
2349 | /* |
2350 | * Silently ignore duplicates. These were likely | |
2351 | * created due to a commit appearing in multiple | |
2352 | * layers of the chain, which is unexpected but | |
2353 | * not invalid. We should make sure there is a | |
2354 | * unique copy in the new layer. | |
2355 | */ | |
1771be90 | 2356 | } else { |
689a146c | 2357 | unsigned int num_parents; |
1771be90 | 2358 | |
150f1157 DS |
2359 | ctx->commits.list[dedup_i] = ctx->commits.list[i]; |
2360 | dedup_i++; | |
2361 | ||
689a146c | 2362 | num_parents = commit_list_count(ctx->commits.list[i]->parents); |
1771be90 | 2363 | if (num_parents > 2) |
a35bea40 | 2364 | ctx->num_extra_edges += num_parents - 1; |
1771be90 DS |
2365 | } |
2366 | } | |
2367 | ||
150f1157 DS |
2368 | ctx->commits.nr = dedup_i; |
2369 | ||
1771be90 DS |
2370 | stop_progress(&ctx->progress); |
2371 | } | |
2372 | ||
2373 | static void merge_commit_graphs(struct write_commit_graph_context *ctx) | |
2374 | { | |
2375 | struct commit_graph *g = ctx->r->objects->commit_graph; | |
2376 | uint32_t current_graph_number = ctx->num_commit_graphs_before; | |
1771be90 DS |
2377 | |
2378 | while (g && current_graph_number >= ctx->num_commit_graphs_after) { | |
2379 | current_graph_number--; | |
2380 | ||
d68ce906 RS |
2381 | if (ctx->report_progress) |
2382 | ctx->progress = start_delayed_progress(_("Merging commit-graph"), 0); | |
1771be90 DS |
2383 | |
2384 | merge_commit_graph(ctx, g); | |
2385 | stop_progress(&ctx->progress); | |
1771be90 DS |
2386 | |
2387 | g = g->base_graph; | |
2388 | } | |
2389 | ||
2390 | if (g) { | |
2391 | ctx->new_base_graph = g; | |
2392 | ctx->new_num_commits_in_base = g->num_commits + g->num_commits_in_base; | |
2393 | } | |
2394 | ||
2395 | if (ctx->new_base_graph) | |
2396 | ctx->base_graph_name = xstrdup(ctx->new_base_graph->filename); | |
2397 | ||
2398 | sort_and_scan_merged_commits(ctx); | |
2399 | } | |
2400 | ||
8d84097f DS |
2401 | static void mark_commit_graphs(struct write_commit_graph_context *ctx) |
2402 | { | |
2403 | uint32_t i; | |
2404 | time_t now = time(NULL); | |
2405 | ||
2406 | for (i = ctx->num_commit_graphs_after - 1; i < ctx->num_commit_graphs_before; i++) { | |
2407 | struct stat st; | |
2408 | struct utimbuf updated_time; | |
2409 | ||
7c898554 ÆAB |
2410 | if (stat(ctx->commit_graph_filenames_before[i], &st) < 0) |
2411 | continue; | |
8d84097f DS |
2412 | |
2413 | updated_time.actime = st.st_atime; | |
2414 | updated_time.modtime = now; | |
2415 | utime(ctx->commit_graph_filenames_before[i], &updated_time); | |
2416 | } | |
2417 | } | |
2418 | ||
2419 | static void expire_commit_graphs(struct write_commit_graph_context *ctx) | |
2420 | { | |
2421 | struct strbuf path = STRBUF_INIT; | |
2422 | DIR *dir; | |
2423 | struct dirent *de; | |
2424 | size_t dirnamelen; | |
c2bc6e6a DS |
2425 | timestamp_t expire_time = time(NULL); |
2426 | ||
98bb7961 TB |
2427 | if (ctx->opts && ctx->opts->expire_time) |
2428 | expire_time = ctx->opts->expire_time; | |
ba41112a | 2429 | if (!ctx->split) { |
663b2b1b | 2430 | char *chain_file_name = get_commit_graph_chain_filename(ctx->odb); |
ba41112a DS |
2431 | unlink(chain_file_name); |
2432 | free(chain_file_name); | |
2433 | ctx->num_commit_graphs_after = 0; | |
2434 | } | |
8d84097f | 2435 | |
0bd52e27 | 2436 | strbuf_addstr(&path, ctx->odb->path); |
8d84097f DS |
2437 | strbuf_addstr(&path, "/info/commit-graphs"); |
2438 | dir = opendir(path.buf); | |
2439 | ||
0aa6bce7 RS |
2440 | if (!dir) |
2441 | goto out; | |
8d84097f DS |
2442 | |
2443 | strbuf_addch(&path, '/'); | |
2444 | dirnamelen = path.len; | |
2445 | while ((de = readdir(dir)) != NULL) { | |
2446 | struct stat st; | |
2447 | uint32_t i, found = 0; | |
2448 | ||
2449 | strbuf_setlen(&path, dirnamelen); | |
2450 | strbuf_addstr(&path, de->d_name); | |
2451 | ||
7c898554 ÆAB |
2452 | if (stat(path.buf, &st) < 0) |
2453 | continue; | |
8d84097f DS |
2454 | |
2455 | if (st.st_mtime > expire_time) | |
2456 | continue; | |
2457 | if (path.len < 6 || strcmp(path.buf + path.len - 6, ".graph")) | |
2458 | continue; | |
2459 | ||
2460 | for (i = 0; i < ctx->num_commit_graphs_after; i++) { | |
2461 | if (!strcmp(ctx->commit_graph_filenames_after[i], | |
2462 | path.buf)) { | |
2463 | found = 1; | |
2464 | break; | |
2465 | } | |
2466 | } | |
2467 | ||
2468 | if (!found) | |
2469 | unlink(path.buf); | |
8d84097f | 2470 | } |
0aa6bce7 RS |
2471 | |
2472 | out: | |
12f1ae53 ML |
2473 | if(dir) |
2474 | closedir(dir); | |
0aa6bce7 | 2475 | strbuf_release(&path); |
8d84097f DS |
2476 | } |
2477 | ||
0bd52e27 | 2478 | int write_commit_graph(struct object_directory *odb, |
4a047908 | 2479 | const struct string_list *const pack_indexes, |
6830c360 | 2480 | struct oidset *commits, |
39d88318 | 2481 | enum commit_graph_write_flags flags, |
98bb7961 | 2482 | const struct commit_graph_opts *opts) |
238def57 | 2483 | { |
c7ef8fe6 | 2484 | struct repository *r = the_repository; |
238def57 | 2485 | struct write_commit_graph_context *ctx; |
1cbdbf3b | 2486 | uint32_t i; |
e103f727 | 2487 | int res = 0; |
8a6ac287 | 2488 | int replace = 0; |
9a7a9ed1 | 2489 | struct bloom_filter_settings bloom_settings = DEFAULT_BLOOM_FILTER_SETTINGS; |
72a2bfca | 2490 | struct topo_level_slab topo_levels; |
08fd81c9 | 2491 | |
c7ef8fe6 DS |
2492 | prepare_repo_settings(r); |
2493 | if (!r->settings.core_commit_graph) { | |
85102ac7 DS |
2494 | warning(_("attempting to write a commit-graph, but 'core.commitGraph' is disabled")); |
2495 | return 0; | |
2496 | } | |
c7ef8fe6 | 2497 | if (!commit_graph_compatible(r)) |
e103f727 | 2498 | return 0; |
d6538246 | 2499 | |
ca56dadb | 2500 | CALLOC_ARRAY(ctx, 1); |
c7ef8fe6 | 2501 | ctx->r = r; |
0bd52e27 | 2502 | ctx->odb = odb; |
39d88318 SG |
2503 | ctx->append = flags & COMMIT_GRAPH_WRITE_APPEND ? 1 : 0; |
2504 | ctx->report_progress = flags & COMMIT_GRAPH_WRITE_PROGRESS ? 1 : 0; | |
2505 | ctx->split = flags & COMMIT_GRAPH_WRITE_SPLIT ? 1 : 0; | |
98bb7961 | 2506 | ctx->opts = opts; |
f97b9325 | 2507 | ctx->total_bloom_filter_data_size = 0; |
702110aa | 2508 | ctx->write_generation_data = (get_configured_generation_version(r) == 2); |
e8b63005 | 2509 | ctx->num_generation_data_overflows = 0; |
6c622f9f | 2510 | |
9a7a9ed1 TB |
2511 | bloom_settings.bits_per_entry = git_env_ulong("GIT_TEST_BLOOM_SETTINGS_BITS_PER_ENTRY", |
2512 | bloom_settings.bits_per_entry); | |
2513 | bloom_settings.num_hashes = git_env_ulong("GIT_TEST_BLOOM_SETTINGS_NUM_HASHES", | |
2514 | bloom_settings.num_hashes); | |
2515 | bloom_settings.max_changed_paths = git_env_ulong("GIT_TEST_BLOOM_SETTINGS_MAX_CHANGED_PATHS", | |
2516 | bloom_settings.max_changed_paths); | |
2517 | ctx->bloom_settings = &bloom_settings; | |
2518 | ||
72a2bfca AK |
2519 | init_topo_level_slab(&topo_levels); |
2520 | ctx->topo_levels = &topo_levels; | |
2521 | ||
bc50d6c9 | 2522 | prepare_commit_graph(ctx->r); |
72a2bfca AK |
2523 | if (ctx->r->objects->commit_graph) { |
2524 | struct commit_graph *g = ctx->r->objects->commit_graph; | |
2525 | ||
2526 | while (g) { | |
2527 | g->topo_levels = &topo_levels; | |
2528 | g = g->base_graph; | |
2529 | } | |
2530 | } | |
2531 | ||
0087a87b DS |
2532 | if (flags & COMMIT_GRAPH_WRITE_BLOOM_FILTERS) |
2533 | ctx->changed_paths = 1; | |
2534 | if (!(flags & COMMIT_GRAPH_NO_WRITE_BLOOM_FILTERS)) { | |
2535 | struct commit_graph *g; | |
0087a87b DS |
2536 | |
2537 | g = ctx->r->objects->commit_graph; | |
2538 | ||
2539 | /* We have changed-paths already. Keep them in the next graph */ | |
2540 | if (g && g->chunk_bloom_data) { | |
2541 | ctx->changed_paths = 1; | |
2542 | ctx->bloom_settings = g->bloom_filter_settings; | |
2543 | } | |
2544 | } | |
2545 | ||
6c622f9f | 2546 | if (ctx->split) { |
bc50d6c9 | 2547 | struct commit_graph *g = ctx->r->objects->commit_graph; |
6c622f9f DS |
2548 | |
2549 | while (g) { | |
2550 | ctx->num_commit_graphs_before++; | |
2551 | g = g->base_graph; | |
2552 | } | |
2553 | ||
2554 | if (ctx->num_commit_graphs_before) { | |
2555 | ALLOC_ARRAY(ctx->commit_graph_filenames_before, ctx->num_commit_graphs_before); | |
2556 | i = ctx->num_commit_graphs_before; | |
2557 | g = ctx->r->objects->commit_graph; | |
2558 | ||
2559 | while (g) { | |
2560 | ctx->commit_graph_filenames_before[--i] = xstrdup(g->filename); | |
2561 | g = g->base_graph; | |
2562 | } | |
2563 | } | |
8a6ac287 | 2564 | |
98bb7961 TB |
2565 | if (ctx->opts) |
2566 | replace = ctx->opts->split_flags & COMMIT_GRAPH_SPLIT_REPLACE; | |
6c622f9f | 2567 | } |
c9905bea | 2568 | |
afe27c88 | 2569 | ctx->approx_nr_objects = repo_approximate_object_count(the_repository); |
c9905bea | 2570 | |
c9905bea DS |
2571 | if (ctx->append && ctx->r->objects->commit_graph) { |
2572 | struct commit_graph *g = ctx->r->objects->commit_graph; | |
2573 | for (i = 0; i < g->num_commits; i++) { | |
a5f1c448 | 2574 | struct object_id oid; |
588af1bf | 2575 | oidread(&oid, g->chunk_oid_lookup + st_mult(g->hash_len, i)); |
a5f1c448 | 2576 | oid_array_append(&ctx->oids, &oid); |
7547b95b DS |
2577 | } |
2578 | } | |
2579 | ||
049d51a2 | 2580 | if (pack_indexes) { |
3d112755 | 2581 | ctx->order_by_pack = 1; |
ef5b83f2 DS |
2582 | if ((res = fill_oids_from_packs(ctx, pack_indexes))) |
2583 | goto cleanup; | |
3d5df01b DS |
2584 | } |
2585 | ||
6830c360 TB |
2586 | if (commits) { |
2587 | if ((res = fill_oids_from_commits(ctx, commits))) | |
7c5c9b9c SG |
2588 | goto cleanup; |
2589 | } | |
3d5df01b | 2590 | |
9b6606f4 | 2591 | if (!pack_indexes && !commits) { |
3d112755 | 2592 | ctx->order_by_pack = 1; |
b2c83060 | 2593 | fill_oids_from_all_packs(ctx); |
3d112755 | 2594 | } |
049d51a2 | 2595 | |
c9905bea | 2596 | close_reachable(ctx); |
08fd81c9 | 2597 | |
f998d542 | 2598 | copy_oids_to_commits(ctx); |
08fd81c9 | 2599 | |
c9905bea | 2600 | if (ctx->commits.nr >= GRAPH_EDGE_LAST_MASK) { |
e103f727 DS |
2601 | error(_("too many commits to write graph")); |
2602 | res = -1; | |
2603 | goto cleanup; | |
2604 | } | |
08fd81c9 | 2605 | |
8a6ac287 | 2606 | if (!ctx->commits.nr && !replace) |
6c622f9f DS |
2607 | goto cleanup; |
2608 | ||
1771be90 DS |
2609 | if (ctx->split) { |
2610 | split_graph_merge_strategy(ctx); | |
2611 | ||
8a6ac287 TB |
2612 | if (!replace) |
2613 | merge_commit_graphs(ctx); | |
1771be90 | 2614 | } else |
6c622f9f DS |
2615 | ctx->num_commit_graphs_after = 1; |
2616 | ||
fde55b09 | 2617 | ctx->trust_generation_numbers = validate_mixed_generation_chain(ctx->r->objects->commit_graph); |
1fdc383c | 2618 | |
9c2c0a82 DS |
2619 | compute_topological_levels(ctx); |
2620 | if (ctx->write_generation_data) | |
2621 | compute_generation_numbers(ctx); | |
08fd81c9 | 2622 | |
f97b9325 GS |
2623 | if (ctx->changed_paths) |
2624 | compute_bloom_filters(ctx); | |
2625 | ||
238def57 | 2626 | res = write_commit_graph_file(ctx); |
08fd81c9 | 2627 | |
ba41112a | 2628 | if (ctx->split) |
8d84097f | 2629 | mark_commit_graphs(ctx); |
ba41112a DS |
2630 | |
2631 | expire_commit_graphs(ctx); | |
8d84097f | 2632 | |
e103f727 | 2633 | cleanup: |
238def57 | 2634 | free(ctx->graph_name); |
d9c84c6d | 2635 | free(ctx->base_graph_name); |
c9905bea | 2636 | free(ctx->commits.list); |
a5f1c448 | 2637 | oid_array_clear(&ctx->oids); |
bf4bb9f9 | 2638 | clear_topo_level_slab(&topo_levels); |
6c622f9f DS |
2639 | |
2640 | if (ctx->commit_graph_filenames_after) { | |
2641 | for (i = 0; i < ctx->num_commit_graphs_after; i++) { | |
2642 | free(ctx->commit_graph_filenames_after[i]); | |
2643 | free(ctx->commit_graph_hash_after[i]); | |
2644 | } | |
2645 | ||
2646 | for (i = 0; i < ctx->num_commit_graphs_before; i++) | |
2647 | free(ctx->commit_graph_filenames_before[i]); | |
2648 | ||
2649 | free(ctx->commit_graph_filenames_after); | |
2650 | free(ctx->commit_graph_filenames_before); | |
2651 | free(ctx->commit_graph_hash_after); | |
2652 | } | |
2653 | ||
c9905bea | 2654 | free(ctx); |
e103f727 DS |
2655 | |
2656 | return res; | |
08fd81c9 | 2657 | } |
283e68c7 | 2658 | |
41df0e30 | 2659 | #define VERIFY_COMMIT_GRAPH_ERROR_HASH 2 |
283e68c7 DS |
2660 | static int verify_commit_graph_error; |
2661 | ||
48ca53ca | 2662 | __attribute__((format (printf, 1, 2))) |
283e68c7 DS |
2663 | static void graph_report(const char *fmt, ...) |
2664 | { | |
2665 | va_list ap; | |
2666 | ||
2667 | verify_commit_graph_error = 1; | |
2668 | va_start(ap, fmt); | |
2669 | vfprintf(stderr, fmt, ap); | |
2670 | fprintf(stderr, "\n"); | |
2671 | va_end(ap); | |
2672 | } | |
2673 | ||
15316a47 TB |
2674 | static int commit_graph_checksum_valid(struct commit_graph *g) |
2675 | { | |
2676 | return hashfile_checksum_valid(g->data, g->data_len); | |
2677 | } | |
2678 | ||
eb319d67 TB |
2679 | static int verify_one_commit_graph(struct repository *r, |
2680 | struct commit_graph *g, | |
9281cd07 TB |
2681 | struct progress *progress, |
2682 | uint64_t *seen) | |
283e68c7 | 2683 | { |
9bda8467 | 2684 | uint32_t i, cur_fanout_pos = 0; |
72871b13 | 2685 | struct object_id prev_oid, cur_oid; |
db6044d7 TB |
2686 | struct commit *seen_gen_zero = NULL; |
2687 | struct commit *seen_gen_non_zero = NULL; | |
283e68c7 | 2688 | |
2ac138d5 | 2689 | verify_commit_graph_error = verify_commit_graph_lite(g); |
9bda8467 DS |
2690 | if (verify_commit_graph_error) |
2691 | return verify_commit_graph_error; | |
2692 | ||
15316a47 | 2693 | if (!commit_graph_checksum_valid(g)) { |
41df0e30 DS |
2694 | graph_report(_("the commit-graph file has incorrect checksum and is likely corrupt")); |
2695 | verify_commit_graph_error = VERIFY_COMMIT_GRAPH_ERROR_HASH; | |
2696 | } | |
2697 | ||
9bda8467 | 2698 | for (i = 0; i < g->num_commits; i++) { |
2e3c0737 DS |
2699 | struct commit *graph_commit; |
2700 | ||
9a25cad7 | 2701 | oidread(&cur_oid, g->chunk_oid_lookup + st_mult(g->hash_len, i)); |
9bda8467 DS |
2702 | |
2703 | if (i && oidcmp(&prev_oid, &cur_oid) >= 0) | |
93b4405f | 2704 | graph_report(_("commit-graph has incorrect OID order: %s then %s"), |
9bda8467 DS |
2705 | oid_to_hex(&prev_oid), |
2706 | oid_to_hex(&cur_oid)); | |
2707 | ||
2708 | oidcpy(&prev_oid, &cur_oid); | |
2709 | ||
2710 | while (cur_oid.hash[0] > cur_fanout_pos) { | |
2711 | uint32_t fanout_value = get_be32(g->chunk_oid_fanout + cur_fanout_pos); | |
2712 | ||
2713 | if (i != fanout_value) | |
93b4405f | 2714 | graph_report(_("commit-graph has incorrect fanout value: fanout[%d] = %u != %u"), |
9bda8467 DS |
2715 | cur_fanout_pos, fanout_value, i); |
2716 | cur_fanout_pos++; | |
2717 | } | |
2e3c0737 | 2718 | |
82952964 | 2719 | graph_commit = lookup_commit(r, &cur_oid); |
4f542b7a | 2720 | if (!parse_commit_in_graph_one(r, g, graph_commit)) |
93b4405f | 2721 | graph_report(_("failed to parse commit %s from commit-graph"), |
2e3c0737 | 2722 | oid_to_hex(&cur_oid)); |
9bda8467 DS |
2723 | } |
2724 | ||
2725 | while (cur_fanout_pos < 256) { | |
2726 | uint32_t fanout_value = get_be32(g->chunk_oid_fanout + cur_fanout_pos); | |
2727 | ||
2728 | if (g->num_commits != fanout_value) | |
93b4405f | 2729 | graph_report(_("commit-graph has incorrect fanout value: fanout[%d] = %u != %u"), |
9bda8467 DS |
2730 | cur_fanout_pos, fanout_value, i); |
2731 | ||
2732 | cur_fanout_pos++; | |
2733 | } | |
2734 | ||
41df0e30 | 2735 | if (verify_commit_graph_error & ~VERIFY_COMMIT_GRAPH_ERROR_HASH) |
96af91d4 DS |
2736 | return verify_commit_graph_error; |
2737 | ||
2738 | for (i = 0; i < g->num_commits; i++) { | |
2e3c0737 | 2739 | struct commit *graph_commit, *odb_commit; |
53614b13 | 2740 | struct commit_list *graph_parents, *odb_parents; |
d7f92784 AK |
2741 | timestamp_t max_generation = 0; |
2742 | timestamp_t generation; | |
96af91d4 | 2743 | |
9281cd07 | 2744 | display_progress(progress, ++(*seen)); |
9a25cad7 | 2745 | oidread(&cur_oid, g->chunk_oid_lookup + st_mult(g->hash_len, i)); |
96af91d4 | 2746 | |
82952964 | 2747 | graph_commit = lookup_commit(r, &cur_oid); |
a378509e | 2748 | odb_commit = (struct commit *)create_object(r, &cur_oid, alloc_commit_node(r)); |
4a93b899 | 2749 | if (repo_parse_commit_internal(r, odb_commit, 0, 0)) { |
93b4405f | 2750 | graph_report(_("failed to parse commit %s from object database for commit-graph"), |
96af91d4 DS |
2751 | oid_to_hex(&cur_oid)); |
2752 | continue; | |
2753 | } | |
2e3c0737 | 2754 | |
4f542b7a | 2755 | if (!oideq(&get_commit_tree_in_graph_one(r, g, graph_commit)->object.oid, |
2e3c0737 | 2756 | get_commit_tree_oid(odb_commit))) |
93b4405f | 2757 | graph_report(_("root tree OID for commit %s in commit-graph is %s != %s"), |
2e3c0737 DS |
2758 | oid_to_hex(&cur_oid), |
2759 | oid_to_hex(get_commit_tree_oid(graph_commit)), | |
2760 | oid_to_hex(get_commit_tree_oid(odb_commit))); | |
53614b13 DS |
2761 | |
2762 | graph_parents = graph_commit->parents; | |
2763 | odb_parents = odb_commit->parents; | |
2764 | ||
2765 | while (graph_parents) { | |
afe8a907 | 2766 | if (!odb_parents) { |
93b4405f | 2767 | graph_report(_("commit-graph parent list for commit %s is too long"), |
53614b13 DS |
2768 | oid_to_hex(&cur_oid)); |
2769 | break; | |
2770 | } | |
2771 | ||
3da4b609 DS |
2772 | /* parse parent in case it is in a base graph */ |
2773 | parse_commit_in_graph_one(r, g, graph_parents->item); | |
2774 | ||
9001dc2a | 2775 | if (!oideq(&graph_parents->item->object.oid, &odb_parents->item->object.oid)) |
93b4405f | 2776 | graph_report(_("commit-graph parent for %s is %s != %s"), |
53614b13 DS |
2777 | oid_to_hex(&cur_oid), |
2778 | oid_to_hex(&graph_parents->item->object.oid), | |
2779 | oid_to_hex(&odb_parents->item->object.oid)); | |
2780 | ||
868c9911 | 2781 | generation = commit_graph_generation_from_graph(graph_parents->item); |
c752ad09 AK |
2782 | if (generation > max_generation) |
2783 | max_generation = generation; | |
1373e547 | 2784 | |
53614b13 DS |
2785 | graph_parents = graph_parents->next; |
2786 | odb_parents = odb_parents->next; | |
2787 | } | |
2788 | ||
afe8a907 | 2789 | if (odb_parents) |
93b4405f | 2790 | graph_report(_("commit-graph parent list for commit %s terminates early"), |
53614b13 | 2791 | oid_to_hex(&cur_oid)); |
1373e547 | 2792 | |
db6044d7 TB |
2793 | if (commit_graph_generation_from_graph(graph_commit)) |
2794 | seen_gen_non_zero = graph_commit; | |
2795 | else | |
2796 | seen_gen_zero = graph_commit; | |
1373e547 | 2797 | |
db6044d7 | 2798 | if (seen_gen_zero) |
1373e547 DS |
2799 | continue; |
2800 | ||
2801 | /* | |
e8b63005 AK |
2802 | * If we are using topological level and one of our parents has |
2803 | * generation GENERATION_NUMBER_V1_MAX, then our generation is | |
2804 | * also GENERATION_NUMBER_V1_MAX. Decrement to avoid extra logic | |
2805 | * in the following condition. | |
1373e547 | 2806 | */ |
1fdc383c | 2807 | if (!g->read_generation_data && max_generation == GENERATION_NUMBER_V1_MAX) |
1373e547 DS |
2808 | max_generation--; |
2809 | ||
c752ad09 | 2810 | generation = commit_graph_generation(graph_commit); |
e8b63005 AK |
2811 | if (generation < max_generation + 1) |
2812 | graph_report(_("commit-graph generation for commit %s is %"PRItime" < %"PRItime), | |
1373e547 | 2813 | oid_to_hex(&cur_oid), |
c752ad09 | 2814 | generation, |
1373e547 | 2815 | max_generation + 1); |
88968ebf DS |
2816 | |
2817 | if (graph_commit->date != odb_commit->date) | |
93b4405f | 2818 | graph_report(_("commit date for commit %s in commit-graph is %"PRItime" != %"PRItime), |
88968ebf DS |
2819 | oid_to_hex(&cur_oid), |
2820 | graph_commit->date, | |
2821 | odb_commit->date); | |
96af91d4 | 2822 | } |
db6044d7 TB |
2823 | |
2824 | if (seen_gen_zero && seen_gen_non_zero) | |
2825 | graph_report(_("commit-graph has both zero and non-zero " | |
2826 | "generations (e.g., commits '%s' and '%s')"), | |
2827 | oid_to_hex(&seen_gen_zero->object.oid), | |
2828 | oid_to_hex(&seen_gen_non_zero->object.oid)); | |
96af91d4 | 2829 | |
eb319d67 TB |
2830 | return verify_commit_graph_error; |
2831 | } | |
2832 | ||
2833 | int verify_commit_graph(struct repository *r, struct commit_graph *g, int flags) | |
2834 | { | |
9281cd07 | 2835 | struct progress *progress = NULL; |
eb319d67 | 2836 | int local_error = 0; |
9281cd07 | 2837 | uint64_t seen = 0; |
eb319d67 TB |
2838 | |
2839 | if (!g) { | |
2840 | graph_report("no commit-graph file loaded"); | |
2841 | return 1; | |
2842 | } | |
2843 | ||
9281cd07 TB |
2844 | if (flags & COMMIT_GRAPH_WRITE_PROGRESS) { |
2845 | uint64_t total = g->num_commits; | |
2846 | if (!(flags & COMMIT_GRAPH_VERIFY_SHALLOW)) | |
2847 | total += g->num_commits_in_base; | |
2848 | ||
2849 | progress = start_progress(_("Verifying commits in commit graph"), | |
2850 | total); | |
2851 | } | |
7248857b | 2852 | |
9281cd07 TB |
2853 | for (; g; g = g->base_graph) { |
2854 | local_error |= verify_one_commit_graph(r, g, progress, &seen); | |
f5facaa4 TB |
2855 | if (flags & COMMIT_GRAPH_VERIFY_SHALLOW) |
2856 | break; | |
2857 | } | |
3da4b609 | 2858 | |
9281cd07 | 2859 | stop_progress(&progress); |
3da4b609 DS |
2860 | |
2861 | return local_error; | |
283e68c7 | 2862 | } |
c3756d5b JT |
2863 | |
2864 | void free_commit_graph(struct commit_graph *g) | |
2865 | { | |
09a75abb JK |
2866 | while (g) { |
2867 | struct commit_graph *next = g->base_graph; | |
2868 | ||
2869 | if (g->data) | |
2870 | munmap((void *)g->data, g->data_len); | |
2871 | free(g->filename); | |
2872 | free(g->bloom_filter_settings); | |
2873 | free(g); | |
2874 | ||
2875 | g = next; | |
c3756d5b | 2876 | } |
c3756d5b | 2877 | } |
6abada18 JK |
2878 | |
2879 | void disable_commit_graph(struct repository *r) | |
2880 | { | |
2881 | r->commit_graph_disabled = 1; | |
2882 | } |