commit-graph: pass a 'struct repository *' in more places

[thirdparty/git.git] / commit-graph.c

diff --git a/commit-graph.c b/commit-graph.c
index e51c91dd5b0af4e4946091e5ca7f06707b3a0c5b..0c1030641cff8d94b7095bb2aba8f0e5cb0ebde4 100644 (file)
--- a/commit-graph.c
+++ b/commit-graph.c
@@ -224,7 +224,8 @@ int open_commit_graph(const char *graph_file, int *fd, struct stat *st)
        return 1;
 }
 
-struct commit_graph *load_commit_graph_one_fd_st(int fd, struct stat *st,
+struct commit_graph *load_commit_graph_one_fd_st(struct repository *r,
+                                                int fd, struct stat *st,
                                                 struct object_directory *odb)
 {
        void *graph_map;
@@ -240,7 +241,7 @@ struct commit_graph *load_commit_graph_one_fd_st(int fd, struct stat *st,
        }
        graph_map = xmmap(NULL, graph_size, PROT_READ, MAP_PRIVATE, fd, 0);
        close(fd);
-       ret = parse_commit_graph(graph_map, graph_size);
+       ret = parse_commit_graph(r, graph_map, graph_size);
 
        if (ret)
                ret->odb = odb;
@@ -280,7 +281,8 @@ static int verify_commit_graph_lite(struct commit_graph *g)
        return 0;
 }
 
-struct commit_graph *parse_commit_graph(void *graph_map, size_t graph_size)
+struct commit_graph *parse_commit_graph(struct repository *r,
+                                       void *graph_map, size_t graph_size)
 {
        const unsigned char *data, *chunk_lookup;
        uint32_t i;
@@ -445,7 +447,8 @@ free_and_return:
        return NULL;
 }
 
-static struct commit_graph *load_commit_graph_one(const char *graph_file,
+static struct commit_graph *load_commit_graph_one(struct repository *r,
+                                                 const char *graph_file,
                                                  struct object_directory *odb)
 {
 
@@ -457,7 +460,7 @@ static struct commit_graph *load_commit_graph_one(const char *graph_file,
        if (!open_ok)
                return NULL;
 
-       g = load_commit_graph_one_fd_st(fd, &st, odb);
+       g = load_commit_graph_one_fd_st(r, fd, &st, odb);
 
        if (g)
                g->filename = xstrdup(graph_file);
@@ -469,7 +472,7 @@ static struct commit_graph *load_commit_graph_v1(struct repository *r,
                                                 struct object_directory *odb)
 {
        char *graph_name = get_commit_graph_filename(odb);
-       struct commit_graph *g = load_commit_graph_one(graph_name, odb);
+       struct commit_graph *g = load_commit_graph_one(r, graph_name, odb);
        free(graph_name);
 
        return g;
@@ -550,7 +553,7 @@ static struct commit_graph *load_commit_graph_chain(struct repository *r,
                valid = 0;
                for (odb = r->objects->odb; odb; odb = odb->next) {
                        char *graph_name = get_split_graph_filename(odb, line.buf);
-                       struct commit_graph *g = load_commit_graph_one(graph_name, odb);
+                       struct commit_graph *g = load_commit_graph_one(r, graph_name, odb);
 
                        free(graph_name);
 
@@ -660,6 +663,17 @@ int generation_numbers_enabled(struct repository *r)
        return !!first_generation;
 }
 
+struct bloom_filter_settings *get_bloom_filter_settings(struct repository *r)
+{
+       struct commit_graph *g = r->objects->commit_graph;
+       while (g) {
+               if (g->bloom_filter_settings)
+                       return g->bloom_filter_settings;
+               g = g->base_graph;
+       }
+       return NULL;
+}
+
 static void close_commit_graph_one(struct commit_graph *g)
 {
        if (!g)