4 #include "git-compat-util.h"
12 #include "sha1-lookup.h"
13 #include "commit-graph.h"
14 #include "object-store.h"
17 #include "replace-object.h"
20 #define GRAPH_SIGNATURE 0x43475048 /* "CGPH" */
21 #define GRAPH_CHUNKID_OIDFANOUT 0x4f494446 /* "OIDF" */
22 #define GRAPH_CHUNKID_OIDLOOKUP 0x4f49444c /* "OIDL" */
23 #define GRAPH_CHUNKID_DATA 0x43444154 /* "CDAT" */
24 #define GRAPH_CHUNKID_EXTRAEDGES 0x45444745 /* "EDGE" */
25 #define GRAPH_CHUNKID_BASE 0x42415345 /* "BASE" */
27 #define GRAPH_DATA_WIDTH (the_hash_algo->rawsz + 16)
29 #define GRAPH_VERSION_1 0x1
30 #define GRAPH_VERSION GRAPH_VERSION_1
32 #define GRAPH_EXTRA_EDGES_NEEDED 0x80000000
33 #define GRAPH_EDGE_LAST_MASK 0x7fffffff
34 #define GRAPH_PARENT_NONE 0x70000000
36 #define GRAPH_LAST_EDGE 0x80000000
38 #define GRAPH_HEADER_SIZE 8
39 #define GRAPH_FANOUT_SIZE (4 * 256)
40 #define GRAPH_CHUNKLOOKUP_WIDTH 12
41 #define GRAPH_MIN_SIZE (GRAPH_HEADER_SIZE + 4 * GRAPH_CHUNKLOOKUP_WIDTH \
42 + GRAPH_FANOUT_SIZE + the_hash_algo->rawsz)
44 char *get_commit_graph_filename(const char *obj_dir
)
46 return xstrfmt("%s/info/commit-graph", obj_dir
);
49 static char *get_split_graph_filename(const char *obj_dir
,
52 return xstrfmt("%s/info/commit-graphs/graph-%s.graph",
57 static char *get_chain_filename(const char *obj_dir
)
59 return xstrfmt("%s/info/commit-graphs/commit-graph-chain", obj_dir
);
62 static uint8_t oid_version(void)
67 static struct commit_graph
*alloc_commit_graph(void)
69 struct commit_graph
*g
= xcalloc(1, sizeof(*g
));
75 extern int read_replace_refs
;
77 static int commit_graph_compatible(struct repository
*r
)
82 if (read_replace_refs
) {
83 prepare_replace_object(r
);
84 if (hashmap_get_size(&r
->objects
->replace_map
->map
))
88 prepare_commit_graft(r
);
89 if (r
->parsed_objects
&& r
->parsed_objects
->grafts_nr
)
91 if (is_repository_shallow(r
))
97 int open_commit_graph(const char *graph_file
, int *fd
, struct stat
*st
)
99 *fd
= git_open(graph_file
);
102 if (fstat(*fd
, st
)) {
109 struct commit_graph
*load_commit_graph_one_fd_st(int fd
, struct stat
*st
)
113 struct commit_graph
*ret
;
115 graph_size
= xsize_t(st
->st_size
);
117 if (graph_size
< GRAPH_MIN_SIZE
) {
119 error(_("commit-graph file is too small"));
122 graph_map
= xmmap(NULL
, graph_size
, PROT_READ
, MAP_PRIVATE
, fd
, 0);
123 ret
= parse_commit_graph(graph_map
, fd
, graph_size
);
126 munmap(graph_map
, graph_size
);
133 static int verify_commit_graph_lite(struct commit_graph
*g
)
136 * Basic validation shared between parse_commit_graph()
137 * which'll be called every time the graph is used, and the
138 * much more expensive verify_commit_graph() used by
139 * "commit-graph verify".
141 * There should only be very basic checks here to ensure that
142 * we don't e.g. segfault in fill_commit_in_graph(), but
143 * because this is a very hot codepath nothing that e.g. loops
144 * over g->num_commits, or runs a checksum on the commit-graph
147 if (!g
->chunk_oid_fanout
) {
148 error("commit-graph is missing the OID Fanout chunk");
151 if (!g
->chunk_oid_lookup
) {
152 error("commit-graph is missing the OID Lookup chunk");
155 if (!g
->chunk_commit_data
) {
156 error("commit-graph is missing the Commit Data chunk");
163 struct commit_graph
*parse_commit_graph(void *graph_map
, int fd
,
166 const unsigned char *data
, *chunk_lookup
;
168 struct commit_graph
*graph
;
169 uint64_t last_chunk_offset
;
170 uint32_t last_chunk_id
;
171 uint32_t graph_signature
;
172 unsigned char graph_version
, hash_version
;
177 if (graph_size
< GRAPH_MIN_SIZE
)
180 data
= (const unsigned char *)graph_map
;
182 graph_signature
= get_be32(data
);
183 if (graph_signature
!= GRAPH_SIGNATURE
) {
184 error(_("commit-graph signature %X does not match signature %X"),
185 graph_signature
, GRAPH_SIGNATURE
);
189 graph_version
= *(unsigned char*)(data
+ 4);
190 if (graph_version
!= GRAPH_VERSION
) {
191 error(_("commit-graph version %X does not match version %X"),
192 graph_version
, GRAPH_VERSION
);
196 hash_version
= *(unsigned char*)(data
+ 5);
197 if (hash_version
!= oid_version()) {
198 error(_("commit-graph hash version %X does not match version %X"),
199 hash_version
, oid_version());
203 graph
= alloc_commit_graph();
205 graph
->hash_len
= the_hash_algo
->rawsz
;
206 graph
->num_chunks
= *(unsigned char*)(data
+ 6);
207 graph
->graph_fd
= fd
;
208 graph
->data
= graph_map
;
209 graph
->data_len
= graph_size
;
212 last_chunk_offset
= 8;
213 chunk_lookup
= data
+ 8;
214 for (i
= 0; i
< graph
->num_chunks
; i
++) {
216 uint64_t chunk_offset
;
217 int chunk_repeated
= 0;
219 if (data
+ graph_size
- chunk_lookup
<
220 GRAPH_CHUNKLOOKUP_WIDTH
) {
221 error(_("commit-graph chunk lookup table entry missing; file may be incomplete"));
226 chunk_id
= get_be32(chunk_lookup
+ 0);
227 chunk_offset
= get_be64(chunk_lookup
+ 4);
229 chunk_lookup
+= GRAPH_CHUNKLOOKUP_WIDTH
;
231 if (chunk_offset
> graph_size
- the_hash_algo
->rawsz
) {
232 error(_("commit-graph improper chunk offset %08x%08x"), (uint32_t)(chunk_offset
>> 32),
233 (uint32_t)chunk_offset
);
239 case GRAPH_CHUNKID_OIDFANOUT
:
240 if (graph
->chunk_oid_fanout
)
243 graph
->chunk_oid_fanout
= (uint32_t*)(data
+ chunk_offset
);
246 case GRAPH_CHUNKID_OIDLOOKUP
:
247 if (graph
->chunk_oid_lookup
)
250 graph
->chunk_oid_lookup
= data
+ chunk_offset
;
253 case GRAPH_CHUNKID_DATA
:
254 if (graph
->chunk_commit_data
)
257 graph
->chunk_commit_data
= data
+ chunk_offset
;
260 case GRAPH_CHUNKID_EXTRAEDGES
:
261 if (graph
->chunk_extra_edges
)
264 graph
->chunk_extra_edges
= data
+ chunk_offset
;
267 case GRAPH_CHUNKID_BASE
:
268 if (graph
->chunk_base_graphs
)
271 graph
->chunk_base_graphs
= data
+ chunk_offset
;
274 if (chunk_repeated
) {
275 error(_("commit-graph chunk id %08x appears multiple times"), chunk_id
);
280 if (last_chunk_id
== GRAPH_CHUNKID_OIDLOOKUP
)
282 graph
->num_commits
= (chunk_offset
- last_chunk_offset
)
286 last_chunk_id
= chunk_id
;
287 last_chunk_offset
= chunk_offset
;
290 hashcpy(graph
->oid
.hash
, graph
->data
+ graph
->data_len
- graph
->hash_len
);
292 if (verify_commit_graph_lite(graph
))
298 static struct commit_graph
*load_commit_graph_one(const char *graph_file
)
303 struct commit_graph
*g
;
304 int open_ok
= open_commit_graph(graph_file
, &fd
, &st
);
309 g
= load_commit_graph_one_fd_st(fd
, &st
);
312 g
->filename
= xstrdup(graph_file
);
317 static struct commit_graph
*load_commit_graph_v1(struct repository
*r
, const char *obj_dir
)
319 char *graph_name
= get_commit_graph_filename(obj_dir
);
320 struct commit_graph
*g
= load_commit_graph_one(graph_name
);
324 g
->obj_dir
= obj_dir
;
329 static int add_graph_to_chain(struct commit_graph
*g
,
330 struct commit_graph
*chain
,
331 struct object_id
*oids
,
334 struct commit_graph
*cur_g
= chain
;
336 if (n
&& !g
->chunk_base_graphs
) {
337 warning(_("commit-graph has no base graphs chunk"));
345 !oideq(&oids
[n
], &cur_g
->oid
) ||
346 !hasheq(oids
[n
].hash
, g
->chunk_base_graphs
+ g
->hash_len
* n
)) {
347 warning(_("commit-graph chain does not match"));
351 cur_g
= cur_g
->base_graph
;
354 g
->base_graph
= chain
;
357 g
->num_commits_in_base
= chain
->num_commits
+ chain
->num_commits_in_base
;
362 static struct commit_graph
*load_commit_graph_chain(struct repository
*r
, const char *obj_dir
)
364 struct commit_graph
*graph_chain
= NULL
;
365 struct strbuf line
= STRBUF_INIT
;
367 struct object_id
*oids
;
368 int i
= 0, valid
= 1, count
;
369 char *chain_name
= get_chain_filename(obj_dir
);
373 fp
= fopen(chain_name
, "r");
374 stat_res
= stat(chain_name
, &st
);
379 st
.st_size
<= the_hash_algo
->hexsz
)
382 count
= st
.st_size
/ (the_hash_algo
->hexsz
+ 1);
383 oids
= xcalloc(count
, sizeof(struct object_id
));
387 for (i
= 0; i
< count
; i
++) {
388 struct object_directory
*odb
;
390 if (strbuf_getline_lf(&line
, fp
) == EOF
)
393 if (get_oid_hex(line
.buf
, &oids
[i
])) {
394 warning(_("invalid commit-graph chain: line '%s' not a hash"),
401 for (odb
= r
->objects
->odb
; odb
; odb
= odb
->next
) {
402 char *graph_name
= get_split_graph_filename(odb
->path
, line
.buf
);
403 struct commit_graph
*g
= load_commit_graph_one(graph_name
);
408 g
->obj_dir
= odb
->path
;
410 if (add_graph_to_chain(g
, graph_chain
, oids
, i
)) {
420 warning(_("unable to find all commit-graph files"));
431 static struct commit_graph
*read_commit_graph_one(struct repository
*r
, const char *obj_dir
)
433 struct commit_graph
*g
= load_commit_graph_v1(r
, obj_dir
);
436 g
= load_commit_graph_chain(r
, obj_dir
);
441 static void prepare_commit_graph_one(struct repository
*r
, const char *obj_dir
)
444 if (r
->objects
->commit_graph
)
447 r
->objects
->commit_graph
= read_commit_graph_one(r
, obj_dir
);
451 * Return 1 if commit_graph is non-NULL, and 0 otherwise.
453 * On the first invocation, this function attemps to load the commit
454 * graph if the_repository is configured to have one.
456 static int prepare_commit_graph(struct repository
*r
)
458 struct object_directory
*odb
;
461 if (git_env_bool(GIT_TEST_COMMIT_GRAPH_DIE_ON_LOAD
, 0))
462 die("dying as requested by the '%s' variable on commit-graph load!",
463 GIT_TEST_COMMIT_GRAPH_DIE_ON_LOAD
);
465 if (r
->objects
->commit_graph_attempted
)
466 return !!r
->objects
->commit_graph
;
467 r
->objects
->commit_graph_attempted
= 1;
469 if (!git_env_bool(GIT_TEST_COMMIT_GRAPH
, 0) &&
470 (repo_config_get_bool(r
, "core.commitgraph", &config_value
) ||
473 * This repository is not configured to use commit graphs, so
474 * do not load one. (But report commit_graph_attempted anyway
475 * so that commit graph loading is not attempted again for this
480 if (!commit_graph_compatible(r
))
484 for (odb
= r
->objects
->odb
;
485 !r
->objects
->commit_graph
&& odb
;
487 prepare_commit_graph_one(r
, odb
->path
);
488 return !!r
->objects
->commit_graph
;
491 int generation_numbers_enabled(struct repository
*r
)
493 uint32_t first_generation
;
494 struct commit_graph
*g
;
495 if (!prepare_commit_graph(r
))
498 g
= r
->objects
->commit_graph
;
503 first_generation
= get_be32(g
->chunk_commit_data
+
504 g
->hash_len
+ 8) >> 2;
506 return !!first_generation
;
509 static void close_commit_graph_one(struct commit_graph
*g
)
514 close_commit_graph_one(g
->base_graph
);
515 free_commit_graph(g
);
518 void close_commit_graph(struct raw_object_store
*o
)
520 close_commit_graph_one(o
->commit_graph
);
521 o
->commit_graph
= NULL
;
524 static int bsearch_graph(struct commit_graph
*g
, struct object_id
*oid
, uint32_t *pos
)
526 return bsearch_hash(oid
->hash
, g
->chunk_oid_fanout
,
527 g
->chunk_oid_lookup
, g
->hash_len
, pos
);
530 static void load_oid_from_graph(struct commit_graph
*g
,
532 struct object_id
*oid
)
536 while (g
&& pos
< g
->num_commits_in_base
)
540 BUG("NULL commit-graph");
542 if (pos
>= g
->num_commits
+ g
->num_commits_in_base
)
543 die(_("invalid commit position. commit-graph is likely corrupt"));
545 lex_index
= pos
- g
->num_commits_in_base
;
547 hashcpy(oid
->hash
, g
->chunk_oid_lookup
+ g
->hash_len
* lex_index
);
550 static struct commit_list
**insert_parent_or_die(struct repository
*r
,
551 struct commit_graph
*g
,
553 struct commit_list
**pptr
)
556 struct object_id oid
;
558 if (pos
>= g
->num_commits
+ g
->num_commits_in_base
)
559 die("invalid parent position %"PRIu32
, pos
);
561 load_oid_from_graph(g
, pos
, &oid
);
562 c
= lookup_commit(r
, &oid
);
564 die(_("could not find commit %s"), oid_to_hex(&oid
));
566 return &commit_list_insert(c
, pptr
)->next
;
569 static void fill_commit_graph_info(struct commit
*item
, struct commit_graph
*g
, uint32_t pos
)
571 const unsigned char *commit_data
;
574 while (pos
< g
->num_commits_in_base
)
577 lex_index
= pos
- g
->num_commits_in_base
;
578 commit_data
= g
->chunk_commit_data
+ GRAPH_DATA_WIDTH
* lex_index
;
579 item
->graph_pos
= pos
;
580 item
->generation
= get_be32(commit_data
+ g
->hash_len
+ 8) >> 2;
583 static int fill_commit_in_graph(struct repository
*r
,
585 struct commit_graph
*g
, uint32_t pos
)
588 uint32_t *parent_data_ptr
;
589 uint64_t date_low
, date_high
;
590 struct commit_list
**pptr
;
591 const unsigned char *commit_data
;
594 while (pos
< g
->num_commits_in_base
)
597 if (pos
>= g
->num_commits
+ g
->num_commits_in_base
)
598 die(_("invalid commit position. commit-graph is likely corrupt"));
601 * Store the "full" position, but then use the
602 * "local" position for the rest of the calculation.
604 item
->graph_pos
= pos
;
605 lex_index
= pos
- g
->num_commits_in_base
;
607 commit_data
= g
->chunk_commit_data
+ (g
->hash_len
+ 16) * lex_index
;
609 item
->object
.parsed
= 1;
611 item
->maybe_tree
= NULL
;
613 date_high
= get_be32(commit_data
+ g
->hash_len
+ 8) & 0x3;
614 date_low
= get_be32(commit_data
+ g
->hash_len
+ 12);
615 item
->date
= (timestamp_t
)((date_high
<< 32) | date_low
);
617 item
->generation
= get_be32(commit_data
+ g
->hash_len
+ 8) >> 2;
619 pptr
= &item
->parents
;
621 edge_value
= get_be32(commit_data
+ g
->hash_len
);
622 if (edge_value
== GRAPH_PARENT_NONE
)
624 pptr
= insert_parent_or_die(r
, g
, edge_value
, pptr
);
626 edge_value
= get_be32(commit_data
+ g
->hash_len
+ 4);
627 if (edge_value
== GRAPH_PARENT_NONE
)
629 if (!(edge_value
& GRAPH_EXTRA_EDGES_NEEDED
)) {
630 pptr
= insert_parent_or_die(r
, g
, edge_value
, pptr
);
634 parent_data_ptr
= (uint32_t*)(g
->chunk_extra_edges
+
635 4 * (uint64_t)(edge_value
& GRAPH_EDGE_LAST_MASK
));
637 edge_value
= get_be32(parent_data_ptr
);
638 pptr
= insert_parent_or_die(r
, g
,
639 edge_value
& GRAPH_EDGE_LAST_MASK
,
642 } while (!(edge_value
& GRAPH_LAST_EDGE
));
647 static int find_commit_in_graph(struct commit
*item
, struct commit_graph
*g
, uint32_t *pos
)
649 if (item
->graph_pos
!= COMMIT_NOT_FROM_GRAPH
) {
650 *pos
= item
->graph_pos
;
653 struct commit_graph
*cur_g
= g
;
656 while (cur_g
&& !bsearch_graph(cur_g
, &(item
->object
.oid
), &lex_index
))
657 cur_g
= cur_g
->base_graph
;
660 *pos
= lex_index
+ cur_g
->num_commits_in_base
;
668 static int parse_commit_in_graph_one(struct repository
*r
,
669 struct commit_graph
*g
,
674 if (item
->object
.parsed
)
677 if (find_commit_in_graph(item
, g
, &pos
))
678 return fill_commit_in_graph(r
, item
, g
, pos
);
683 int parse_commit_in_graph(struct repository
*r
, struct commit
*item
)
685 if (!prepare_commit_graph(r
))
687 return parse_commit_in_graph_one(r
, r
->objects
->commit_graph
, item
);
690 void load_commit_graph_info(struct repository
*r
, struct commit
*item
)
693 if (!prepare_commit_graph(r
))
695 if (find_commit_in_graph(item
, r
->objects
->commit_graph
, &pos
))
696 fill_commit_graph_info(item
, r
->objects
->commit_graph
, pos
);
699 static struct tree
*load_tree_for_commit(struct repository
*r
,
700 struct commit_graph
*g
,
703 struct object_id oid
;
704 const unsigned char *commit_data
;
706 while (c
->graph_pos
< g
->num_commits_in_base
)
709 commit_data
= g
->chunk_commit_data
+
710 GRAPH_DATA_WIDTH
* (c
->graph_pos
- g
->num_commits_in_base
);
712 hashcpy(oid
.hash
, commit_data
);
713 c
->maybe_tree
= lookup_tree(r
, &oid
);
715 return c
->maybe_tree
;
718 static struct tree
*get_commit_tree_in_graph_one(struct repository
*r
,
719 struct commit_graph
*g
,
720 const struct commit
*c
)
723 return c
->maybe_tree
;
724 if (c
->graph_pos
== COMMIT_NOT_FROM_GRAPH
)
725 BUG("get_commit_tree_in_graph_one called from non-commit-graph commit");
727 return load_tree_for_commit(r
, g
, (struct commit
*)c
);
730 struct tree
*get_commit_tree_in_graph(struct repository
*r
, const struct commit
*c
)
732 return get_commit_tree_in_graph_one(r
, r
->objects
->commit_graph
, c
);
735 struct packed_commit_list
{
736 struct commit
**list
;
741 struct packed_oid_list
{
742 struct object_id
*list
;
747 struct write_commit_graph_context
{
748 struct repository
*r
;
751 struct packed_oid_list oids
;
752 struct packed_commit_list commits
;
754 unsigned long approx_nr_objects
;
755 struct progress
*progress
;
757 uint64_t progress_cnt
;
759 char *base_graph_name
;
760 int num_commit_graphs_before
;
761 int num_commit_graphs_after
;
762 char **commit_graph_filenames_before
;
763 char **commit_graph_filenames_after
;
764 char **commit_graph_hash_after
;
765 uint32_t new_num_commits_in_base
;
766 struct commit_graph
*new_base_graph
;
773 static void write_graph_chunk_fanout(struct hashfile
*f
,
774 struct write_commit_graph_context
*ctx
)
777 struct commit
**list
= ctx
->commits
.list
;
780 * Write the first-level table (the list is sorted,
781 * but we use a 256-entry lookup to be able to avoid
782 * having to do eight extra binary search iterations).
784 for (i
= 0; i
< 256; i
++) {
785 while (count
< ctx
->commits
.nr
) {
786 if ((*list
)->object
.oid
.hash
[0] != i
)
788 display_progress(ctx
->progress
, ++ctx
->progress_cnt
);
793 hashwrite_be32(f
, count
);
797 static void write_graph_chunk_oids(struct hashfile
*f
, int hash_len
,
798 struct write_commit_graph_context
*ctx
)
800 struct commit
**list
= ctx
->commits
.list
;
802 for (count
= 0; count
< ctx
->commits
.nr
; count
++, list
++) {
803 display_progress(ctx
->progress
, ++ctx
->progress_cnt
);
804 hashwrite(f
, (*list
)->object
.oid
.hash
, (int)hash_len
);
808 static const unsigned char *commit_to_sha1(size_t index
, void *table
)
810 struct commit
**commits
= table
;
811 return commits
[index
]->object
.oid
.hash
;
814 static void write_graph_chunk_data(struct hashfile
*f
, int hash_len
,
815 struct write_commit_graph_context
*ctx
)
817 struct commit
**list
= ctx
->commits
.list
;
818 struct commit
**last
= ctx
->commits
.list
+ ctx
->commits
.nr
;
819 uint32_t num_extra_edges
= 0;
821 while (list
< last
) {
822 struct commit_list
*parent
;
824 uint32_t packedDate
[2];
825 display_progress(ctx
->progress
, ++ctx
->progress_cnt
);
827 parse_commit_no_graph(*list
);
828 hashwrite(f
, get_commit_tree_oid(*list
)->hash
, hash_len
);
830 parent
= (*list
)->parents
;
833 edge_value
= GRAPH_PARENT_NONE
;
835 edge_value
= sha1_pos(parent
->item
->object
.oid
.hash
,
841 edge_value
+= ctx
->new_num_commits_in_base
;
844 if (find_commit_in_graph(parent
->item
,
851 BUG("missing parent %s for commit %s",
852 oid_to_hex(&parent
->item
->object
.oid
),
853 oid_to_hex(&(*list
)->object
.oid
));
856 hashwrite_be32(f
, edge_value
);
859 parent
= parent
->next
;
862 edge_value
= GRAPH_PARENT_NONE
;
863 else if (parent
->next
)
864 edge_value
= GRAPH_EXTRA_EDGES_NEEDED
| num_extra_edges
;
866 edge_value
= sha1_pos(parent
->item
->object
.oid
.hash
,
872 edge_value
+= ctx
->new_num_commits_in_base
;
875 if (find_commit_in_graph(parent
->item
,
882 BUG("missing parent %s for commit %s",
883 oid_to_hex(&parent
->item
->object
.oid
),
884 oid_to_hex(&(*list
)->object
.oid
));
887 hashwrite_be32(f
, edge_value
);
889 if (edge_value
& GRAPH_EXTRA_EDGES_NEEDED
) {
892 parent
= parent
->next
;
896 if (sizeof((*list
)->date
) > 4)
897 packedDate
[0] = htonl(((*list
)->date
>> 32) & 0x3);
901 packedDate
[0] |= htonl((*list
)->generation
<< 2);
903 packedDate
[1] = htonl((*list
)->date
);
904 hashwrite(f
, packedDate
, 8);
910 static void write_graph_chunk_extra_edges(struct hashfile
*f
,
911 struct write_commit_graph_context
*ctx
)
913 struct commit
**list
= ctx
->commits
.list
;
914 struct commit
**last
= ctx
->commits
.list
+ ctx
->commits
.nr
;
915 struct commit_list
*parent
;
917 while (list
< last
) {
920 display_progress(ctx
->progress
, ++ctx
->progress_cnt
);
922 for (parent
= (*list
)->parents
; num_parents
< 3 && parent
;
923 parent
= parent
->next
)
926 if (num_parents
<= 2) {
931 /* Since num_parents > 2, this initializer is safe. */
932 for (parent
= (*list
)->parents
->next
; parent
; parent
= parent
->next
) {
933 int edge_value
= sha1_pos(parent
->item
->object
.oid
.hash
,
939 edge_value
+= ctx
->new_num_commits_in_base
;
942 if (find_commit_in_graph(parent
->item
,
949 BUG("missing parent %s for commit %s",
950 oid_to_hex(&parent
->item
->object
.oid
),
951 oid_to_hex(&(*list
)->object
.oid
));
952 else if (!parent
->next
)
953 edge_value
|= GRAPH_LAST_EDGE
;
955 hashwrite_be32(f
, edge_value
);
962 static int oid_compare(const void *_a
, const void *_b
)
964 const struct object_id
*a
= (const struct object_id
*)_a
;
965 const struct object_id
*b
= (const struct object_id
*)_b
;
969 static int add_packed_commits(const struct object_id
*oid
,
970 struct packed_git
*pack
,
974 struct write_commit_graph_context
*ctx
= (struct write_commit_graph_context
*)data
;
975 enum object_type type
;
976 off_t offset
= nth_packed_object_offset(pack
, pos
);
977 struct object_info oi
= OBJECT_INFO_INIT
;
980 display_progress(ctx
->progress
, ++ctx
->progress_done
);
983 if (packed_object_info(ctx
->r
, pack
, offset
, &oi
) < 0)
984 die(_("unable to get type of object %s"), oid_to_hex(oid
));
986 if (type
!= OBJ_COMMIT
)
989 ALLOC_GROW(ctx
->oids
.list
, ctx
->oids
.nr
+ 1, ctx
->oids
.alloc
);
990 oidcpy(&(ctx
->oids
.list
[ctx
->oids
.nr
]), oid
);
996 static void add_missing_parents(struct write_commit_graph_context
*ctx
, struct commit
*commit
)
998 struct commit_list
*parent
;
999 for (parent
= commit
->parents
; parent
; parent
= parent
->next
) {
1000 if (!(parent
->item
->object
.flags
& UNINTERESTING
)) {
1001 ALLOC_GROW(ctx
->oids
.list
, ctx
->oids
.nr
+ 1, ctx
->oids
.alloc
);
1002 oidcpy(&ctx
->oids
.list
[ctx
->oids
.nr
], &(parent
->item
->object
.oid
));
1004 parent
->item
->object
.flags
|= UNINTERESTING
;
1009 static void close_reachable(struct write_commit_graph_context
*ctx
)
1012 struct commit
*commit
;
1014 if (ctx
->report_progress
)
1015 ctx
->progress
= start_delayed_progress(
1016 _("Loading known commits in commit graph"),
1018 for (i
= 0; i
< ctx
->oids
.nr
; i
++) {
1019 display_progress(ctx
->progress
, i
+ 1);
1020 commit
= lookup_commit(ctx
->r
, &ctx
->oids
.list
[i
]);
1022 commit
->object
.flags
|= UNINTERESTING
;
1024 stop_progress(&ctx
->progress
);
1027 * As this loop runs, ctx->oids.nr may grow, but not more
1028 * than the number of missing commits in the reachable
1031 if (ctx
->report_progress
)
1032 ctx
->progress
= start_delayed_progress(
1033 _("Expanding reachable commits in commit graph"),
1035 for (i
= 0; i
< ctx
->oids
.nr
; i
++) {
1036 display_progress(ctx
->progress
, i
+ 1);
1037 commit
= lookup_commit(ctx
->r
, &ctx
->oids
.list
[i
]);
1042 if (!parse_commit(commit
) &&
1043 commit
->graph_pos
== COMMIT_NOT_FROM_GRAPH
)
1044 add_missing_parents(ctx
, commit
);
1045 } else if (!parse_commit_no_graph(commit
))
1046 add_missing_parents(ctx
, commit
);
1048 stop_progress(&ctx
->progress
);
1050 if (ctx
->report_progress
)
1051 ctx
->progress
= start_delayed_progress(
1052 _("Clearing commit marks in commit graph"),
1054 for (i
= 0; i
< ctx
->oids
.nr
; i
++) {
1055 display_progress(ctx
->progress
, i
+ 1);
1056 commit
= lookup_commit(ctx
->r
, &ctx
->oids
.list
[i
]);
1059 commit
->object
.flags
&= ~UNINTERESTING
;
1061 stop_progress(&ctx
->progress
);
1064 static void compute_generation_numbers(struct write_commit_graph_context
*ctx
)
1067 struct commit_list
*list
= NULL
;
1069 if (ctx
->report_progress
)
1070 ctx
->progress
= start_progress(
1071 _("Computing commit graph generation numbers"),
1073 for (i
= 0; i
< ctx
->commits
.nr
; i
++) {
1074 display_progress(ctx
->progress
, i
+ 1);
1075 if (ctx
->commits
.list
[i
]->generation
!= GENERATION_NUMBER_INFINITY
&&
1076 ctx
->commits
.list
[i
]->generation
!= GENERATION_NUMBER_ZERO
)
1079 commit_list_insert(ctx
->commits
.list
[i
], &list
);
1081 struct commit
*current
= list
->item
;
1082 struct commit_list
*parent
;
1083 int all_parents_computed
= 1;
1084 uint32_t max_generation
= 0;
1086 for (parent
= current
->parents
; parent
; parent
= parent
->next
) {
1087 if (parent
->item
->generation
== GENERATION_NUMBER_INFINITY
||
1088 parent
->item
->generation
== GENERATION_NUMBER_ZERO
) {
1089 all_parents_computed
= 0;
1090 commit_list_insert(parent
->item
, &list
);
1092 } else if (parent
->item
->generation
> max_generation
) {
1093 max_generation
= parent
->item
->generation
;
1097 if (all_parents_computed
) {
1098 current
->generation
= max_generation
+ 1;
1101 if (current
->generation
> GENERATION_NUMBER_MAX
)
1102 current
->generation
= GENERATION_NUMBER_MAX
;
1106 stop_progress(&ctx
->progress
);
1109 static int add_ref_to_list(const char *refname
,
1110 const struct object_id
*oid
,
1111 int flags
, void *cb_data
)
1113 struct string_list
*list
= (struct string_list
*)cb_data
;
1115 string_list_append(list
, oid_to_hex(oid
));
1119 int write_commit_graph_reachable(const char *obj_dir
, unsigned int flags
)
1121 struct string_list list
= STRING_LIST_INIT_DUP
;
1124 for_each_ref(add_ref_to_list
, &list
);
1125 result
= write_commit_graph(obj_dir
, NULL
, &list
,
1128 string_list_clear(&list
, 0);
1132 static int fill_oids_from_packs(struct write_commit_graph_context
*ctx
,
1133 struct string_list
*pack_indexes
)
1136 struct strbuf progress_title
= STRBUF_INIT
;
1137 struct strbuf packname
= STRBUF_INIT
;
1140 strbuf_addf(&packname
, "%s/pack/", ctx
->obj_dir
);
1141 dirlen
= packname
.len
;
1142 if (ctx
->report_progress
) {
1143 strbuf_addf(&progress_title
,
1144 Q_("Finding commits for commit graph in %d pack",
1145 "Finding commits for commit graph in %d packs",
1148 ctx
->progress
= start_delayed_progress(progress_title
.buf
, 0);
1149 ctx
->progress_done
= 0;
1151 for (i
= 0; i
< pack_indexes
->nr
; i
++) {
1152 struct packed_git
*p
;
1153 strbuf_setlen(&packname
, dirlen
);
1154 strbuf_addstr(&packname
, pack_indexes
->items
[i
].string
);
1155 p
= add_packed_git(packname
.buf
, packname
.len
, 1);
1157 error(_("error adding pack %s"), packname
.buf
);
1160 if (open_pack_index(p
)) {
1161 error(_("error opening index for %s"), packname
.buf
);
1164 for_each_object_in_pack(p
, add_packed_commits
, ctx
,
1165 FOR_EACH_OBJECT_PACK_ORDER
);
1170 stop_progress(&ctx
->progress
);
1171 strbuf_reset(&progress_title
);
1172 strbuf_release(&packname
);
1177 static void fill_oids_from_commit_hex(struct write_commit_graph_context
*ctx
,
1178 struct string_list
*commit_hex
)
1181 struct strbuf progress_title
= STRBUF_INIT
;
1183 if (ctx
->report_progress
) {
1184 strbuf_addf(&progress_title
,
1185 Q_("Finding commits for commit graph from %d ref",
1186 "Finding commits for commit graph from %d refs",
1189 ctx
->progress
= start_delayed_progress(
1193 for (i
= 0; i
< commit_hex
->nr
; i
++) {
1195 struct object_id oid
;
1196 struct commit
*result
;
1198 display_progress(ctx
->progress
, i
+ 1);
1199 if (commit_hex
->items
[i
].string
&&
1200 parse_oid_hex(commit_hex
->items
[i
].string
, &oid
, &end
))
1203 result
= lookup_commit_reference_gently(ctx
->r
, &oid
, 1);
1206 ALLOC_GROW(ctx
->oids
.list
, ctx
->oids
.nr
+ 1, ctx
->oids
.alloc
);
1207 oidcpy(&ctx
->oids
.list
[ctx
->oids
.nr
], &(result
->object
.oid
));
1211 stop_progress(&ctx
->progress
);
1212 strbuf_release(&progress_title
);
1215 static void fill_oids_from_all_packs(struct write_commit_graph_context
*ctx
)
1217 if (ctx
->report_progress
)
1218 ctx
->progress
= start_delayed_progress(
1219 _("Finding commits for commit graph among packed objects"),
1220 ctx
->approx_nr_objects
);
1221 for_each_packed_object(add_packed_commits
, ctx
,
1222 FOR_EACH_OBJECT_PACK_ORDER
);
1223 if (ctx
->progress_done
< ctx
->approx_nr_objects
)
1224 display_progress(ctx
->progress
, ctx
->approx_nr_objects
);
1225 stop_progress(&ctx
->progress
);
1228 static uint32_t count_distinct_commits(struct write_commit_graph_context
*ctx
)
1230 uint32_t i
, count_distinct
= 1;
1232 if (ctx
->report_progress
)
1233 ctx
->progress
= start_delayed_progress(
1234 _("Counting distinct commits in commit graph"),
1236 display_progress(ctx
->progress
, 0); /* TODO: Measure QSORT() progress */
1237 QSORT(ctx
->oids
.list
, ctx
->oids
.nr
, oid_compare
);
1239 for (i
= 1; i
< ctx
->oids
.nr
; i
++) {
1240 display_progress(ctx
->progress
, i
+ 1);
1241 if (!oideq(&ctx
->oids
.list
[i
- 1], &ctx
->oids
.list
[i
])) {
1243 struct commit
*c
= lookup_commit(ctx
->r
, &ctx
->oids
.list
[i
]);
1245 if (!c
|| c
->graph_pos
!= COMMIT_NOT_FROM_GRAPH
)
1252 stop_progress(&ctx
->progress
);
1254 return count_distinct
;
1257 static void copy_oids_to_commits(struct write_commit_graph_context
*ctx
)
1260 struct commit_list
*parent
;
1262 ctx
->num_extra_edges
= 0;
1263 if (ctx
->report_progress
)
1264 ctx
->progress
= start_delayed_progress(
1265 _("Finding extra edges in commit graph"),
1267 for (i
= 0; i
< ctx
->oids
.nr
; i
++) {
1268 int num_parents
= 0;
1269 display_progress(ctx
->progress
, i
+ 1);
1270 if (i
> 0 && oideq(&ctx
->oids
.list
[i
- 1], &ctx
->oids
.list
[i
]))
1273 ALLOC_GROW(ctx
->commits
.list
, ctx
->commits
.nr
+ 1, ctx
->commits
.alloc
);
1274 ctx
->commits
.list
[ctx
->commits
.nr
] = lookup_commit(ctx
->r
, &ctx
->oids
.list
[i
]);
1277 ctx
->commits
.list
[ctx
->commits
.nr
]->graph_pos
!= COMMIT_NOT_FROM_GRAPH
)
1280 parse_commit_no_graph(ctx
->commits
.list
[ctx
->commits
.nr
]);
1282 for (parent
= ctx
->commits
.list
[ctx
->commits
.nr
]->parents
;
1283 parent
; parent
= parent
->next
)
1286 if (num_parents
> 2)
1287 ctx
->num_extra_edges
+= num_parents
- 1;
1291 stop_progress(&ctx
->progress
);
1294 static int write_graph_chunk_base_1(struct hashfile
*f
,
1295 struct commit_graph
*g
)
1302 num
= write_graph_chunk_base_1(f
, g
->base_graph
);
1303 hashwrite(f
, g
->oid
.hash
, the_hash_algo
->rawsz
);
1307 static int write_graph_chunk_base(struct hashfile
*f
,
1308 struct write_commit_graph_context
*ctx
)
1310 int num
= write_graph_chunk_base_1(f
, ctx
->new_base_graph
);
1312 if (num
!= ctx
->num_commit_graphs_after
- 1) {
1313 error(_("failed to write correct number of base graph ids"));
1320 static int write_commit_graph_file(struct write_commit_graph_context
*ctx
)
1325 struct lock_file lk
= LOCK_INIT
;
1326 uint32_t chunk_ids
[6];
1327 uint64_t chunk_offsets
[6];
1328 const unsigned hashsz
= the_hash_algo
->rawsz
;
1329 struct strbuf progress_title
= STRBUF_INIT
;
1331 struct object_id file_hash
;
1334 struct strbuf tmp_file
= STRBUF_INIT
;
1336 strbuf_addf(&tmp_file
,
1337 "%s/info/commit-graphs/tmp_graph_XXXXXX",
1339 ctx
->graph_name
= strbuf_detach(&tmp_file
, NULL
);
1341 ctx
->graph_name
= get_commit_graph_filename(ctx
->obj_dir
);
1344 if (safe_create_leading_directories(ctx
->graph_name
)) {
1345 UNLEAK(ctx
->graph_name
);
1346 error(_("unable to create leading directories of %s"),
1352 char *lock_name
= get_chain_filename(ctx
->obj_dir
);
1354 hold_lock_file_for_update(&lk
, lock_name
, LOCK_DIE_ON_ERROR
);
1356 fd
= git_mkstemp_mode(ctx
->graph_name
, 0444);
1358 error(_("unable to create '%s'"), ctx
->graph_name
);
1362 f
= hashfd(fd
, ctx
->graph_name
);
1364 hold_lock_file_for_update(&lk
, ctx
->graph_name
, LOCK_DIE_ON_ERROR
);
1365 fd
= lk
.tempfile
->fd
;
1366 f
= hashfd(lk
.tempfile
->fd
, lk
.tempfile
->filename
.buf
);
1369 chunk_ids
[0] = GRAPH_CHUNKID_OIDFANOUT
;
1370 chunk_ids
[1] = GRAPH_CHUNKID_OIDLOOKUP
;
1371 chunk_ids
[2] = GRAPH_CHUNKID_DATA
;
1372 if (ctx
->num_extra_edges
) {
1373 chunk_ids
[num_chunks
] = GRAPH_CHUNKID_EXTRAEDGES
;
1376 if (ctx
->num_commit_graphs_after
> 1) {
1377 chunk_ids
[num_chunks
] = GRAPH_CHUNKID_BASE
;
1381 chunk_ids
[num_chunks
] = 0;
1383 chunk_offsets
[0] = 8 + (num_chunks
+ 1) * GRAPH_CHUNKLOOKUP_WIDTH
;
1384 chunk_offsets
[1] = chunk_offsets
[0] + GRAPH_FANOUT_SIZE
;
1385 chunk_offsets
[2] = chunk_offsets
[1] + hashsz
* ctx
->commits
.nr
;
1386 chunk_offsets
[3] = chunk_offsets
[2] + (hashsz
+ 16) * ctx
->commits
.nr
;
1389 if (ctx
->num_extra_edges
) {
1390 chunk_offsets
[num_chunks
+ 1] = chunk_offsets
[num_chunks
] +
1391 4 * ctx
->num_extra_edges
;
1394 if (ctx
->num_commit_graphs_after
> 1) {
1395 chunk_offsets
[num_chunks
+ 1] = chunk_offsets
[num_chunks
] +
1396 hashsz
* (ctx
->num_commit_graphs_after
- 1);
1400 hashwrite_be32(f
, GRAPH_SIGNATURE
);
1402 hashwrite_u8(f
, GRAPH_VERSION
);
1403 hashwrite_u8(f
, oid_version());
1404 hashwrite_u8(f
, num_chunks
);
1405 hashwrite_u8(f
, ctx
->num_commit_graphs_after
- 1);
1407 for (i
= 0; i
<= num_chunks
; i
++) {
1408 uint32_t chunk_write
[3];
1410 chunk_write
[0] = htonl(chunk_ids
[i
]);
1411 chunk_write
[1] = htonl(chunk_offsets
[i
] >> 32);
1412 chunk_write
[2] = htonl(chunk_offsets
[i
] & 0xffffffff);
1413 hashwrite(f
, chunk_write
, 12);
1416 if (ctx
->report_progress
) {
1417 strbuf_addf(&progress_title
,
1418 Q_("Writing out commit graph in %d pass",
1419 "Writing out commit graph in %d passes",
1422 ctx
->progress
= start_delayed_progress(
1424 num_chunks
* ctx
->commits
.nr
);
1426 write_graph_chunk_fanout(f
, ctx
);
1427 write_graph_chunk_oids(f
, hashsz
, ctx
);
1428 write_graph_chunk_data(f
, hashsz
, ctx
);
1429 if (ctx
->num_extra_edges
)
1430 write_graph_chunk_extra_edges(f
, ctx
);
1431 if (ctx
->num_commit_graphs_after
> 1 &&
1432 write_graph_chunk_base(f
, ctx
)) {
1435 stop_progress(&ctx
->progress
);
1436 strbuf_release(&progress_title
);
1438 if (ctx
->split
&& ctx
->base_graph_name
&& ctx
->num_commit_graphs_after
> 1) {
1439 char *new_base_hash
= xstrdup(oid_to_hex(&ctx
->new_base_graph
->oid
));
1440 char *new_base_name
= get_split_graph_filename(ctx
->new_base_graph
->obj_dir
, new_base_hash
);
1442 free(ctx
->commit_graph_filenames_after
[ctx
->num_commit_graphs_after
- 2]);
1443 free(ctx
->commit_graph_hash_after
[ctx
->num_commit_graphs_after
- 2]);
1444 ctx
->commit_graph_filenames_after
[ctx
->num_commit_graphs_after
- 2] = new_base_name
;
1445 ctx
->commit_graph_hash_after
[ctx
->num_commit_graphs_after
- 2] = new_base_hash
;
1448 close_commit_graph(ctx
->r
->objects
);
1449 finalize_hashfile(f
, file_hash
.hash
, CSUM_HASH_IN_STREAM
| CSUM_FSYNC
);
1452 FILE *chainf
= fdopen_lock_file(&lk
, "w");
1453 char *final_graph_name
;
1459 error(_("unable to open commit-graph chain file"));
1463 if (ctx
->base_graph_name
) {
1464 const char *dest
= ctx
->commit_graph_filenames_after
[
1465 ctx
->num_commit_graphs_after
- 2];
1467 if (strcmp(ctx
->base_graph_name
, dest
)) {
1468 result
= rename(ctx
->base_graph_name
, dest
);
1471 error(_("failed to rename base commit-graph file"));
1476 char *graph_name
= get_commit_graph_filename(ctx
->obj_dir
);
1480 ctx
->commit_graph_hash_after
[ctx
->num_commit_graphs_after
- 1] = xstrdup(oid_to_hex(&file_hash
));
1481 final_graph_name
= get_split_graph_filename(ctx
->obj_dir
,
1482 ctx
->commit_graph_hash_after
[ctx
->num_commit_graphs_after
- 1]);
1483 ctx
->commit_graph_filenames_after
[ctx
->num_commit_graphs_after
- 1] = final_graph_name
;
1485 result
= rename(ctx
->graph_name
, final_graph_name
);
1487 for (i
= 0; i
< ctx
->num_commit_graphs_after
; i
++)
1488 fprintf(lk
.tempfile
->fp
, "%s\n", ctx
->commit_graph_hash_after
[i
]);
1491 error(_("failed to rename temporary commit-graph file"));
1496 commit_lock_file(&lk
);
1501 static int split_strategy_max_commits
= 64000;
1502 static float split_strategy_size_mult
= 2.0f
;
1504 static void split_graph_merge_strategy(struct write_commit_graph_context
*ctx
)
1506 struct commit_graph
*g
= ctx
->r
->objects
->commit_graph
;
1507 uint32_t num_commits
= ctx
->commits
.nr
;
1510 g
= ctx
->r
->objects
->commit_graph
;
1511 ctx
->num_commit_graphs_after
= ctx
->num_commit_graphs_before
+ 1;
1513 while (g
&& (g
->num_commits
<= split_strategy_size_mult
* num_commits
||
1514 num_commits
> split_strategy_max_commits
)) {
1515 if (strcmp(g
->obj_dir
, ctx
->obj_dir
))
1518 num_commits
+= g
->num_commits
;
1521 ctx
->num_commit_graphs_after
--;
1524 ctx
->new_base_graph
= g
;
1526 if (ctx
->num_commit_graphs_after
== 2) {
1527 char *old_graph_name
= get_commit_graph_filename(g
->obj_dir
);
1529 if (!strcmp(g
->filename
, old_graph_name
) &&
1530 strcmp(g
->obj_dir
, ctx
->obj_dir
)) {
1531 ctx
->num_commit_graphs_after
= 1;
1532 ctx
->new_base_graph
= NULL
;
1535 free(old_graph_name
);
1538 ALLOC_ARRAY(ctx
->commit_graph_filenames_after
, ctx
->num_commit_graphs_after
);
1539 ALLOC_ARRAY(ctx
->commit_graph_hash_after
, ctx
->num_commit_graphs_after
);
1541 for (i
= 0; i
< ctx
->num_commit_graphs_after
&&
1542 i
< ctx
->num_commit_graphs_before
; i
++)
1543 ctx
->commit_graph_filenames_after
[i
] = xstrdup(ctx
->commit_graph_filenames_before
[i
]);
1545 i
= ctx
->num_commit_graphs_before
- 1;
1546 g
= ctx
->r
->objects
->commit_graph
;
1549 if (i
< ctx
->num_commit_graphs_after
)
1550 ctx
->commit_graph_hash_after
[i
] = xstrdup(oid_to_hex(&g
->oid
));
1557 static void merge_commit_graph(struct write_commit_graph_context
*ctx
,
1558 struct commit_graph
*g
)
1561 uint32_t offset
= g
->num_commits_in_base
;
1563 ALLOC_GROW(ctx
->commits
.list
, ctx
->commits
.nr
+ g
->num_commits
, ctx
->commits
.alloc
);
1565 for (i
= 0; i
< g
->num_commits
; i
++) {
1566 struct object_id oid
;
1567 struct commit
*result
;
1569 display_progress(ctx
->progress
, i
+ 1);
1571 load_oid_from_graph(g
, i
+ offset
, &oid
);
1573 /* only add commits if they still exist in the repo */
1574 result
= lookup_commit_reference_gently(ctx
->r
, &oid
, 1);
1577 ctx
->commits
.list
[ctx
->commits
.nr
] = result
;
1583 static int commit_compare(const void *_a
, const void *_b
)
1585 const struct commit
*a
= *(const struct commit
**)_a
;
1586 const struct commit
*b
= *(const struct commit
**)_b
;
1587 return oidcmp(&a
->object
.oid
, &b
->object
.oid
);
1590 static void sort_and_scan_merged_commits(struct write_commit_graph_context
*ctx
)
1592 uint32_t i
, num_parents
;
1593 struct commit_list
*parent
;
1595 if (ctx
->report_progress
)
1596 ctx
->progress
= start_delayed_progress(
1597 _("Scanning merged commits"),
1600 QSORT(ctx
->commits
.list
, ctx
->commits
.nr
, commit_compare
);
1602 ctx
->num_extra_edges
= 0;
1603 for (i
= 0; i
< ctx
->commits
.nr
; i
++) {
1604 display_progress(ctx
->progress
, i
);
1606 if (i
&& oideq(&ctx
->commits
.list
[i
- 1]->object
.oid
,
1607 &ctx
->commits
.list
[i
]->object
.oid
)) {
1608 die(_("unexpected duplicate commit id %s"),
1609 oid_to_hex(&ctx
->commits
.list
[i
]->object
.oid
));
1612 for (parent
= ctx
->commits
.list
[i
]->parents
; parent
; parent
= parent
->next
)
1615 if (num_parents
> 2)
1616 ctx
->num_extra_edges
+= num_parents
- 2;
1620 stop_progress(&ctx
->progress
);
1623 static void merge_commit_graphs(struct write_commit_graph_context
*ctx
)
1625 struct commit_graph
*g
= ctx
->r
->objects
->commit_graph
;
1626 uint32_t current_graph_number
= ctx
->num_commit_graphs_before
;
1627 struct strbuf progress_title
= STRBUF_INIT
;
1629 while (g
&& current_graph_number
>= ctx
->num_commit_graphs_after
) {
1630 current_graph_number
--;
1632 if (ctx
->report_progress
) {
1633 strbuf_addstr(&progress_title
, _("Merging commit-graph"));
1634 ctx
->progress
= start_delayed_progress(progress_title
.buf
, 0);
1637 merge_commit_graph(ctx
, g
);
1638 stop_progress(&ctx
->progress
);
1639 strbuf_release(&progress_title
);
1645 ctx
->new_base_graph
= g
;
1646 ctx
->new_num_commits_in_base
= g
->num_commits
+ g
->num_commits_in_base
;
1649 if (ctx
->new_base_graph
)
1650 ctx
->base_graph_name
= xstrdup(ctx
->new_base_graph
->filename
);
1652 sort_and_scan_merged_commits(ctx
);
1655 int write_commit_graph(const char *obj_dir
,
1656 struct string_list
*pack_indexes
,
1657 struct string_list
*commit_hex
,
1660 struct write_commit_graph_context
*ctx
;
1661 uint32_t i
, count_distinct
= 0;
1664 if (!commit_graph_compatible(the_repository
))
1667 ctx
= xcalloc(1, sizeof(struct write_commit_graph_context
));
1668 ctx
->r
= the_repository
;
1669 ctx
->obj_dir
= obj_dir
;
1670 ctx
->append
= flags
& COMMIT_GRAPH_APPEND
? 1 : 0;
1671 ctx
->report_progress
= flags
& COMMIT_GRAPH_PROGRESS
? 1 : 0;
1672 ctx
->split
= flags
& COMMIT_GRAPH_SPLIT
? 1 : 0;
1675 struct commit_graph
*g
;
1676 prepare_commit_graph(ctx
->r
);
1678 g
= ctx
->r
->objects
->commit_graph
;
1681 ctx
->num_commit_graphs_before
++;
1685 if (ctx
->num_commit_graphs_before
) {
1686 ALLOC_ARRAY(ctx
->commit_graph_filenames_before
, ctx
->num_commit_graphs_before
);
1687 i
= ctx
->num_commit_graphs_before
;
1688 g
= ctx
->r
->objects
->commit_graph
;
1691 ctx
->commit_graph_filenames_before
[--i
] = xstrdup(g
->filename
);
1697 ctx
->approx_nr_objects
= approximate_object_count();
1698 ctx
->oids
.alloc
= ctx
->approx_nr_objects
/ 32;
1700 if (ctx
->split
&& ctx
->oids
.alloc
> split_strategy_max_commits
)
1701 ctx
->oids
.alloc
= split_strategy_max_commits
;
1704 prepare_commit_graph_one(ctx
->r
, ctx
->obj_dir
);
1705 if (ctx
->r
->objects
->commit_graph
)
1706 ctx
->oids
.alloc
+= ctx
->r
->objects
->commit_graph
->num_commits
;
1709 if (ctx
->oids
.alloc
< 1024)
1710 ctx
->oids
.alloc
= 1024;
1711 ALLOC_ARRAY(ctx
->oids
.list
, ctx
->oids
.alloc
);
1713 if (ctx
->append
&& ctx
->r
->objects
->commit_graph
) {
1714 struct commit_graph
*g
= ctx
->r
->objects
->commit_graph
;
1715 for (i
= 0; i
< g
->num_commits
; i
++) {
1716 const unsigned char *hash
= g
->chunk_oid_lookup
+ g
->hash_len
* i
;
1717 hashcpy(ctx
->oids
.list
[ctx
->oids
.nr
++].hash
, hash
);
1722 if ((res
= fill_oids_from_packs(ctx
, pack_indexes
)))
1727 fill_oids_from_commit_hex(ctx
, commit_hex
);
1729 if (!pack_indexes
&& !commit_hex
)
1730 fill_oids_from_all_packs(ctx
);
1732 close_reachable(ctx
);
1734 count_distinct
= count_distinct_commits(ctx
);
1736 if (count_distinct
>= GRAPH_EDGE_LAST_MASK
) {
1737 error(_("the commit graph format cannot write %d commits"), count_distinct
);
1742 ctx
->commits
.alloc
= count_distinct
;
1743 ALLOC_ARRAY(ctx
->commits
.list
, ctx
->commits
.alloc
);
1745 copy_oids_to_commits(ctx
);
1747 if (ctx
->commits
.nr
>= GRAPH_EDGE_LAST_MASK
) {
1748 error(_("too many commits to write graph"));
1753 if (!ctx
->commits
.nr
)
1757 split_graph_merge_strategy(ctx
);
1759 merge_commit_graphs(ctx
);
1761 ctx
->num_commit_graphs_after
= 1;
1763 compute_generation_numbers(ctx
);
1765 res
= write_commit_graph_file(ctx
);
1768 free(ctx
->graph_name
);
1769 free(ctx
->commits
.list
);
1770 free(ctx
->oids
.list
);
1772 if (ctx
->commit_graph_filenames_after
) {
1773 for (i
= 0; i
< ctx
->num_commit_graphs_after
; i
++) {
1774 free(ctx
->commit_graph_filenames_after
[i
]);
1775 free(ctx
->commit_graph_hash_after
[i
]);
1778 for (i
= 0; i
< ctx
->num_commit_graphs_before
; i
++)
1779 free(ctx
->commit_graph_filenames_before
[i
]);
1781 free(ctx
->commit_graph_filenames_after
);
1782 free(ctx
->commit_graph_filenames_before
);
1783 free(ctx
->commit_graph_hash_after
);
1791 #define VERIFY_COMMIT_GRAPH_ERROR_HASH 2
1792 static int verify_commit_graph_error
;
1794 static void graph_report(const char *fmt
, ...)
1798 verify_commit_graph_error
= 1;
1800 vfprintf(stderr
, fmt
, ap
);
1801 fprintf(stderr
, "\n");
1805 #define GENERATION_ZERO_EXISTS 1
1806 #define GENERATION_NUMBER_EXISTS 2
1808 int verify_commit_graph(struct repository
*r
, struct commit_graph
*g
)
1810 uint32_t i
, cur_fanout_pos
= 0;
1811 struct object_id prev_oid
, cur_oid
, checksum
;
1812 int generation_zero
= 0;
1815 struct progress
*progress
= NULL
;
1818 graph_report("no commit-graph file loaded");
1822 verify_commit_graph_error
= verify_commit_graph_lite(g
);
1823 if (verify_commit_graph_error
)
1824 return verify_commit_graph_error
;
1826 devnull
= open("/dev/null", O_WRONLY
);
1827 f
= hashfd(devnull
, NULL
);
1828 hashwrite(f
, g
->data
, g
->data_len
- g
->hash_len
);
1829 finalize_hashfile(f
, checksum
.hash
, CSUM_CLOSE
);
1830 if (!hasheq(checksum
.hash
, g
->data
+ g
->data_len
- g
->hash_len
)) {
1831 graph_report(_("the commit-graph file has incorrect checksum and is likely corrupt"));
1832 verify_commit_graph_error
= VERIFY_COMMIT_GRAPH_ERROR_HASH
;
1835 for (i
= 0; i
< g
->num_commits
; i
++) {
1836 struct commit
*graph_commit
;
1838 hashcpy(cur_oid
.hash
, g
->chunk_oid_lookup
+ g
->hash_len
* i
);
1840 if (i
&& oidcmp(&prev_oid
, &cur_oid
) >= 0)
1841 graph_report(_("commit-graph has incorrect OID order: %s then %s"),
1842 oid_to_hex(&prev_oid
),
1843 oid_to_hex(&cur_oid
));
1845 oidcpy(&prev_oid
, &cur_oid
);
1847 while (cur_oid
.hash
[0] > cur_fanout_pos
) {
1848 uint32_t fanout_value
= get_be32(g
->chunk_oid_fanout
+ cur_fanout_pos
);
1850 if (i
!= fanout_value
)
1851 graph_report(_("commit-graph has incorrect fanout value: fanout[%d] = %u != %u"),
1852 cur_fanout_pos
, fanout_value
, i
);
1856 graph_commit
= lookup_commit(r
, &cur_oid
);
1857 if (!parse_commit_in_graph_one(r
, g
, graph_commit
))
1858 graph_report(_("failed to parse commit %s from commit-graph"),
1859 oid_to_hex(&cur_oid
));
1862 while (cur_fanout_pos
< 256) {
1863 uint32_t fanout_value
= get_be32(g
->chunk_oid_fanout
+ cur_fanout_pos
);
1865 if (g
->num_commits
!= fanout_value
)
1866 graph_report(_("commit-graph has incorrect fanout value: fanout[%d] = %u != %u"),
1867 cur_fanout_pos
, fanout_value
, i
);
1872 if (verify_commit_graph_error
& ~VERIFY_COMMIT_GRAPH_ERROR_HASH
)
1873 return verify_commit_graph_error
;
1875 progress
= start_progress(_("Verifying commits in commit graph"),
1877 for (i
= 0; i
< g
->num_commits
; i
++) {
1878 struct commit
*graph_commit
, *odb_commit
;
1879 struct commit_list
*graph_parents
, *odb_parents
;
1880 uint32_t max_generation
= 0;
1882 display_progress(progress
, i
+ 1);
1883 hashcpy(cur_oid
.hash
, g
->chunk_oid_lookup
+ g
->hash_len
* i
);
1885 graph_commit
= lookup_commit(r
, &cur_oid
);
1886 odb_commit
= (struct commit
*)create_object(r
, cur_oid
.hash
, alloc_commit_node(r
));
1887 if (parse_commit_internal(odb_commit
, 0, 0)) {
1888 graph_report(_("failed to parse commit %s from object database for commit-graph"),
1889 oid_to_hex(&cur_oid
));
1893 if (!oideq(&get_commit_tree_in_graph_one(r
, g
, graph_commit
)->object
.oid
,
1894 get_commit_tree_oid(odb_commit
)))
1895 graph_report(_("root tree OID for commit %s in commit-graph is %s != %s"),
1896 oid_to_hex(&cur_oid
),
1897 oid_to_hex(get_commit_tree_oid(graph_commit
)),
1898 oid_to_hex(get_commit_tree_oid(odb_commit
)));
1900 graph_parents
= graph_commit
->parents
;
1901 odb_parents
= odb_commit
->parents
;
1903 while (graph_parents
) {
1904 if (odb_parents
== NULL
) {
1905 graph_report(_("commit-graph parent list for commit %s is too long"),
1906 oid_to_hex(&cur_oid
));
1910 if (!oideq(&graph_parents
->item
->object
.oid
, &odb_parents
->item
->object
.oid
))
1911 graph_report(_("commit-graph parent for %s is %s != %s"),
1912 oid_to_hex(&cur_oid
),
1913 oid_to_hex(&graph_parents
->item
->object
.oid
),
1914 oid_to_hex(&odb_parents
->item
->object
.oid
));
1916 if (graph_parents
->item
->generation
> max_generation
)
1917 max_generation
= graph_parents
->item
->generation
;
1919 graph_parents
= graph_parents
->next
;
1920 odb_parents
= odb_parents
->next
;
1923 if (odb_parents
!= NULL
)
1924 graph_report(_("commit-graph parent list for commit %s terminates early"),
1925 oid_to_hex(&cur_oid
));
1927 if (!graph_commit
->generation
) {
1928 if (generation_zero
== GENERATION_NUMBER_EXISTS
)
1929 graph_report(_("commit-graph has generation number zero for commit %s, but non-zero elsewhere"),
1930 oid_to_hex(&cur_oid
));
1931 generation_zero
= GENERATION_ZERO_EXISTS
;
1932 } else if (generation_zero
== GENERATION_ZERO_EXISTS
)
1933 graph_report(_("commit-graph has non-zero generation number for commit %s, but zero elsewhere"),
1934 oid_to_hex(&cur_oid
));
1936 if (generation_zero
== GENERATION_ZERO_EXISTS
)
1940 * If one of our parents has generation GENERATION_NUMBER_MAX, then
1941 * our generation is also GENERATION_NUMBER_MAX. Decrement to avoid
1942 * extra logic in the following condition.
1944 if (max_generation
== GENERATION_NUMBER_MAX
)
1947 if (graph_commit
->generation
!= max_generation
+ 1)
1948 graph_report(_("commit-graph generation for commit %s is %u != %u"),
1949 oid_to_hex(&cur_oid
),
1950 graph_commit
->generation
,
1951 max_generation
+ 1);
1953 if (graph_commit
->date
!= odb_commit
->date
)
1954 graph_report(_("commit date for commit %s in commit-graph is %"PRItime
" != %"PRItime
),
1955 oid_to_hex(&cur_oid
),
1959 stop_progress(&progress
);
1961 return verify_commit_graph_error
;
1964 void free_commit_graph(struct commit_graph
*g
)
1968 if (g
->graph_fd
>= 0) {
1969 munmap((void *)g
->data
, g
->data_len
);