commit-graph: add repo arg to graph readers

Add a struct repository argument to the functions in commit-graph.h that
read the commit graph. (This commit does not affect functions that write
commit graphs.)

Because the commit graph functions can now read the commit graph of any
repository, the global variable core_commit_graph has been removed.
Instead, the config option core.commitGraph is now read on the first
time in a repository that a commit is attempted to be parsed using its
commit graph.

This commit includes a test that exercises the functionality on an
arbitrary repository that is not the_repository.

Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Makefile b/Makefile
index 0cb6590f24acdaec89fa85815e7af584c48ed620..bb8bd672016ddbe3bf89db9f035b89b85cd3a4a9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -719,6 +719,7 @@ TEST_BUILTINS_OBJS += test-prio-queue.o
 TEST_BUILTINS_OBJS += test-read-cache.o
 TEST_BUILTINS_OBJS += test-ref-store.o
 TEST_BUILTINS_OBJS += test-regex.o
+TEST_BUILTINS_OBJS += test-repository.o
 TEST_BUILTINS_OBJS += test-revision-walking.o
 TEST_BUILTINS_OBJS += test-run-command.o
 TEST_BUILTINS_OBJS += test-scrap-cache-tree.o

diff --git a/builtin/fsck.c b/builtin/fsck.c
index ea5e2a03e6c882c674dbef9b3f6e99e93b552f64..c96f3f4fccea0bbd78e4fe1b09e5d8c51e302bb0 100644 (file)
--- a/builtin/fsck.c
+++ b/builtin/fsck.c
@@ -830,7 +830,7 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)
 
        check_connectivity();
 
-       if (core_commit_graph) {
+       if (!git_config_get_bool("core.commitgraph", &i) && i) {
                struct child_process commit_graph_verify = CHILD_PROCESS_INIT;
                const char *verify_argv[] = { "commit-graph", "verify", NULL, NULL, NULL };
 

diff --git a/cache.h b/cache.h
index 8b447652a7e94ad31fd28134e0f548baa37265db..3311f4c9e2711f4560f4151f1777c9b04459345a 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -813,7 +813,6 @@ extern char *git_replace_ref_base;
 
 extern int fsync_object_files;
 extern int core_preload_index;
-extern int core_commit_graph;
 extern int core_apply_sparse_checkout;
 extern int precomposed_unicode;
 extern int protect_hfs;

diff --git a/commit-graph.c b/commit-graph.c
index b6a76a1413f6208c6b74a21e047f47dca5fa754a..b0a55ad128fbcaa2e34c25b8487856d20d0ad3d5 100644 (file)
--- a/commit-graph.c
+++ b/commit-graph.c
@@ -183,15 +183,15 @@ struct commit_graph *load_commit_graph_one(const char *graph_file)
        exit(1);
 }
 
-static void prepare_commit_graph_one(const char *obj_dir)
+static void prepare_commit_graph_one(struct repository *r, const char *obj_dir)
 {
        char *graph_name;
 
-       if (the_repository->objects->commit_graph)
+       if (r->objects->commit_graph)
                return;
 
        graph_name = get_commit_graph_filename(obj_dir);
-       the_repository->objects->commit_graph =
+       r->objects->commit_graph =
                load_commit_graph_one(graph_name);
 
        FREE_AND_NULL(graph_name);
@@ -203,26 +203,34 @@ static void prepare_commit_graph_one(const char *obj_dir)
  * On the first invocation, this function attemps to load the commit
  * graph if the_repository is configured to have one.
  */
-static int prepare_commit_graph(void)
+static int prepare_commit_graph(struct repository *r)
 {
        struct alternate_object_database *alt;
        char *obj_dir;
+       int config_value;
 
-       if (the_repository->objects->commit_graph_attempted)
-               return !!the_repository->objects->commit_graph;
-       the_repository->objects->commit_graph_attempted = 1;
+       if (r->objects->commit_graph_attempted)
+               return !!r->objects->commit_graph;
+       r->objects->commit_graph_attempted = 1;
 
-       if (!core_commit_graph)
+       if (repo_config_get_bool(r, "core.commitgraph", &config_value) ||
+           !config_value)
+               /*
+                * This repository is not configured to use commit graphs, so
+                * do not load one. (But report commit_graph_attempted anyway
+                * so that commit graph loading is not attempted again for this
+                * repository.)
+                */
                return 0;
 
-       obj_dir = get_object_directory();
-       prepare_commit_graph_one(obj_dir);
-       prepare_alt_odb(the_repository);
-       for (alt = the_repository->objects->alt_odb_list;
-            !the_repository->objects->commit_graph && alt;
+       obj_dir = r->objects->objectdir;
+       prepare_commit_graph_one(r, obj_dir);
+       prepare_alt_odb(r);
+       for (alt = r->objects->alt_odb_list;
+            !r->objects->commit_graph && alt;
             alt = alt->next)
-               prepare_commit_graph_one(alt->path);
-       return !!the_repository->objects->commit_graph;
+               prepare_commit_graph_one(r, alt->path);
+       return !!r->objects->commit_graph;
 }
 
 static void close_commit_graph(void)
@@ -323,8 +331,6 @@ static int parse_commit_in_graph_one(struct commit_graph *g, struct commit *item
 {
        uint32_t pos;
 
-       if (!core_commit_graph)
-               return 0;
        if (item->object.parsed)
                return 1;
 
@@ -334,20 +340,20 @@ static int parse_commit_in_graph_one(struct commit_graph *g, struct commit *item
        return 0;
 }
 
-int parse_commit_in_graph(struct commit *item)
+int parse_commit_in_graph(struct repository *r, struct commit *item)
 {
-       if (!prepare_commit_graph())
+       if (!prepare_commit_graph(r))
                return 0;
-       return parse_commit_in_graph_one(the_repository->objects->commit_graph, item);
+       return parse_commit_in_graph_one(r->objects->commit_graph, item);
 }
 
-void load_commit_graph_info(struct commit *item)
+void load_commit_graph_info(struct repository *r, struct commit *item)
 {
        uint32_t pos;
-       if (!prepare_commit_graph())
+       if (!prepare_commit_graph(r))
                return;
-       if (find_commit_in_graph(item, the_repository->objects->commit_graph, &pos))
-               fill_commit_graph_info(item, the_repository->objects->commit_graph, pos);
+       if (find_commit_in_graph(item, r->objects->commit_graph, &pos))
+               fill_commit_graph_info(item, r->objects->commit_graph, pos);
 }
 
 static struct tree *load_tree_for_commit(struct commit_graph *g, struct commit *c)
@@ -373,9 +379,9 @@ static struct tree *get_commit_tree_in_graph_one(struct commit_graph *g,
        return load_tree_for_commit(g, (struct commit *)c);
 }
 
-struct tree *get_commit_tree_in_graph(const struct commit *c)
+struct tree *get_commit_tree_in_graph(struct repository *r, const struct commit *c)
 {
-       return get_commit_tree_in_graph_one(the_repository->objects->commit_graph, c);
+       return get_commit_tree_in_graph_one(r->objects->commit_graph, c);
 }
 
 static void write_graph_chunk_fanout(struct hashfile *f,
@@ -691,7 +697,7 @@ void write_commit_graph(const char *obj_dir,
        oids.alloc = approximate_object_count() / 4;
 
        if (append) {
-               prepare_commit_graph_one(obj_dir);
+               prepare_commit_graph_one(the_repository, obj_dir);
                if (the_repository->objects->commit_graph)
                        oids.alloc += the_repository->objects->commit_graph->num_commits;
        }

diff --git a/commit-graph.h b/commit-graph.h
index 94defb04a9247892937f506e8316151f49f80024..76e098934a7f6740b52a479baa5c68fe605d1ea6 100644 (file)
--- a/commit-graph.h
+++ b/commit-graph.h
@@ -19,7 +19,7 @@ char *get_commit_graph_filename(const char *obj_dir);
  *
  * See parse_commit_buffer() for the fallback after this call.
  */
-int parse_commit_in_graph(struct commit *item);
+int parse_commit_in_graph(struct repository *r, struct commit *item);
 
 /*
  * It is possible that we loaded commit contents from the commit buffer,
@@ -27,9 +27,10 @@ int parse_commit_in_graph(struct commit *item);
  * checked and filled. Fill the graph_pos and generation members of
  * the given commit.
  */
-void load_commit_graph_info(struct commit *item);
+void load_commit_graph_info(struct repository *r, struct commit *item);
 
-struct tree *get_commit_tree_in_graph(const struct commit *c);
+struct tree *get_commit_tree_in_graph(struct repository *r,
+                                     const struct commit *c);
 
 struct commit_graph {
        int graph_fd;

diff --git a/commit.c b/commit.c
index c0a83d2644c54ad8916900128ba13f200a2b6f97..39b80bd21d59ca66c113d87371cf5b0159ed2dd9 100644 (file)
--- a/commit.c
+++ b/commit.c
@@ -342,7 +342,7 @@ struct tree *get_commit_tree(const struct commit *commit)
        if (commit->graph_pos == COMMIT_NOT_FROM_GRAPH)
                BUG("commit has NULL tree, but was not loaded from commit-graph");
 
-       return get_commit_tree_in_graph(commit);
+       return get_commit_tree_in_graph(the_repository, commit);
 }
 
 struct object_id *get_commit_tree_oid(const struct commit *commit)
@@ -438,7 +438,7 @@ int parse_commit_buffer(struct repository *r, struct commit *item, const void *b
        item->date = parse_commit_date(bufptr, tail);
 
        if (check_graph)
-               load_commit_graph_info(item);
+               load_commit_graph_info(the_repository, item);
 
        return 0;
 }
@@ -454,7 +454,7 @@ int parse_commit_internal(struct commit *item, int quiet_on_missing, int use_com
                return -1;
        if (item->object.parsed)
                return 0;
-       if (use_commit_graph && parse_commit_in_graph(item))
+       if (use_commit_graph && parse_commit_in_graph(the_repository, item))
                return 0;
        buffer = read_object_file(&item->object.oid, &type, &size);
        if (!buffer)

diff --git a/config.c b/config.c
index 139c903f6b3f1f35f2a443ebcd8b09b74ffcb7b5..3aacddfec4b9dd1a066af099ff018001bfb95d19 100644 (file)
--- a/config.c
+++ b/config.c
@@ -1309,11 +1309,6 @@ static int git_default_core_config(const char *var, const char *value)
                return 0;
        }
 
-       if (!strcmp(var, "core.commitgraph")) {
-               core_commit_graph = git_config_bool(var, value);
-               return 0;
-       }
-
        if (!strcmp(var, "core.sparsecheckout")) {
                core_apply_sparse_checkout = git_config_bool(var, value);
                return 0;

diff --git a/environment.c b/environment.c
index 013e845235ea88e977c3181258b3e77e6ecb4c2f..6cf00793894f75230e5d66d39d56fe2e5388c8a6 100644 (file)
--- a/environment.c
+++ b/environment.c
@@ -66,7 +66,6 @@ enum push_default_type push_default = PUSH_DEFAULT_UNSPECIFIED;
 enum object_creation_mode object_creation_mode = OBJECT_CREATION_MODE;
 char *notes_ref_name;
 int grafts_replace_parents = 1;
-int core_commit_graph;
 int core_apply_sparse_checkout;
 int merge_log_config = -1;
 int precomposed_unicode = -1; /* see probe_utf8_pathname_composition() */

diff --git a/ref-filter.c b/ref-filter.c
index 49021ee4467de5a3f12845ab47507a6222cd07ae..9b2da883926dcee0210b5fd0b0051ee84f9adadb 100644 (file)
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -1713,7 +1713,7 @@ static enum contains_result contains_tag_algo(struct commit *candidate,
 
        for (p = want; p; p = p->next) {
                struct commit *c = p->item;
-               load_commit_graph_info(c);
+               load_commit_graph_info(the_repository, c);
                if (c->generation < cutoff)
                        cutoff = c->generation;
        }

diff --git a/t/helper/test-repository.c b/t/helper/test-repository.c
new file mode 100644 (file)
index 0000000..2762ca6
--- /dev/null
+++ b/t/helper/test-repository.c
@@ -0,0 +1,82 @@
+#include "test-tool.h"
+#include "cache.h"
+#include "commit-graph.h"
+#include "commit.h"
+#include "config.h"
+#include "object-store.h"
+#include "object.h"
+#include "repository.h"
+#include "tree.h"
+
+static void test_parse_commit_in_graph(const char *gitdir, const char *worktree,
+                                      const struct object_id *commit_oid)
+{
+       struct repository r;
+       struct commit *c;
+       struct commit_list *parent;
+
+       repo_init(&r, gitdir, worktree);
+
+       c = lookup_commit(&r, commit_oid);
+
+       if (!parse_commit_in_graph(&r, c))
+               die("Couldn't parse commit");
+
+       printf("%"PRItime, c->date);
+       for (parent = c->parents; parent; parent = parent->next)
+               printf(" %s", oid_to_hex(&parent->item->object.oid));
+       printf("\n");
+
+       repo_clear(&r);
+}
+
+static void test_get_commit_tree_in_graph(const char *gitdir,
+                                         const char *worktree,
+                                         const struct object_id *commit_oid)
+{
+       struct repository r;
+       struct commit *c;
+       struct tree *tree;
+
+       repo_init(&r, gitdir, worktree);
+
+       c = lookup_commit(&r, commit_oid);
+
+       /*
+        * get_commit_tree_in_graph does not automatically parse the commit, so
+        * parse it first.
+        */
+       if (!parse_commit_in_graph(&r, c))
+               die("Couldn't parse commit");
+       tree = get_commit_tree_in_graph(&r, c);
+       if (!tree)
+               die("Couldn't get commit tree");
+
+       printf("%s\n", oid_to_hex(&tree->object.oid));
+
+       repo_clear(&r);
+}
+
+int cmd__repository(int argc, const char **argv)
+{
+       if (argc < 2)
+               die("must have at least 2 arguments");
+       if (!strcmp(argv[1], "parse_commit_in_graph")) {
+               struct object_id oid;
+               if (argc < 5)
+                       die("not enough arguments");
+               if (parse_oid_hex(argv[4], &oid, &argv[4]))
+                       die("cannot parse oid '%s'", argv[4]);
+               test_parse_commit_in_graph(argv[2], argv[3], &oid);
+       } else if (!strcmp(argv[1], "get_commit_tree_in_graph")) {
+               struct object_id oid;
+               if (argc < 5)
+                       die("not enough arguments");
+               if (parse_oid_hex(argv[4], &oid, &argv[4]))
+                       die("cannot parse oid '%s'", argv[4]);
+               test_get_commit_tree_in_graph(argv[2], argv[3], &oid);
+       } else {
+               die("unrecognized '%s'", argv[1]);
+       }
+       return 0;
+}

diff --git a/t/helper/test-tool.c b/t/helper/test-tool.c
index 805a45de9c877d9e5fecb6aa543e6ac985443d5b..dafc91c240a44079c82db1cf8a400650ccb5fbea 100644 (file)
--- a/t/helper/test-tool.c
+++ b/t/helper/test-tool.c
@@ -29,6 +29,7 @@ static struct test_cmd cmds[] = {
        { "read-cache", cmd__read_cache },
        { "ref-store", cmd__ref_store },
        { "regex", cmd__regex },
+       { "repository", cmd__repository },
        { "revision-walking", cmd__revision_walking },
        { "run-command", cmd__run_command },
        { "scrap-cache-tree", cmd__scrap_cache_tree },

diff --git a/t/helper/test-tool.h b/t/helper/test-tool.h
index 7116ddfb94398da98063b7efed77240058c6961f..80cbcf08575d5e365f8d025d5f3b1d99c6e4fec2 100644 (file)
--- a/t/helper/test-tool.h
+++ b/t/helper/test-tool.h
@@ -23,6 +23,7 @@ int cmd__prio_queue(int argc, const char **argv);
 int cmd__read_cache(int argc, const char **argv);
 int cmd__ref_store(int argc, const char **argv);
 int cmd__regex(int argc, const char **argv);
+int cmd__repository(int argc, const char **argv);
 int cmd__revision_walking(int argc, const char **argv);
 int cmd__run_command(int argc, const char **argv);
 int cmd__scrap_cache_tree(int argc, const char **argv);

diff --git a/t/t5318-commit-graph.sh b/t/t5318-commit-graph.sh
index 5947de3d2438ea301e33f2fc3430ee703d1436b9..4f17d7701e456bbb0992efdba2861e1dac8f7c23 100755 (executable)
--- a/t/t5318-commit-graph.sh
+++ b/t/t5318-commit-graph.sh
@@ -431,4 +431,39 @@ test_expect_success 'git fsck (checks commit-graph)' '
        test_must_fail git fsck
 '
 
+test_expect_success 'setup non-the_repository tests' '
+       rm -rf repo &&
+       git init repo &&
+       test_commit -C repo one &&
+       test_commit -C repo two &&
+       git -C repo config core.commitGraph true &&
+       git -C repo rev-parse two | \
+               git -C repo commit-graph write --stdin-commits
+'
+
+test_expect_success 'parse_commit_in_graph works for non-the_repository' '
+       test-tool repository parse_commit_in_graph \
+               repo/.git repo "$(git -C repo rev-parse two)" >actual &&
+       echo $(git -C repo log --pretty="%ct" -1) \
+               $(git -C repo rev-parse one) >expect &&
+       test_cmp expect actual &&
+
+       test-tool repository parse_commit_in_graph \
+               repo/.git repo "$(git -C repo rev-parse one)" >actual &&
+       echo $(git -C repo log --pretty="%ct" -1 one) >expect &&
+       test_cmp expect actual
+'
+
+test_expect_success 'get_commit_tree_in_graph works for non-the_repository' '
+       test-tool repository get_commit_tree_in_graph \
+               repo/.git repo "$(git -C repo rev-parse two)" >actual &&
+       echo $(git -C repo rev-parse two^{tree}) >expect &&
+       test_cmp expect actual &&
+
+       test-tool repository get_commit_tree_in_graph \
+               repo/.git repo "$(git -C repo rev-parse one)" >actual &&
+       echo $(git -C repo rev-parse one^{tree}) >expect &&
+       test_cmp expect actual
+'
+
 test_done