Imported Upstream version 2.27.0

[platform/upstream/git.git] / builtin / commit-graph.c

diff --git a/builtin/commit-graph.c b/builtin/commit-graph.c
index 4a70b33..15fe603 100644 (file)
--- a/builtin/commit-graph.c
+++ b/builtin/commit-graph.c
@@ -9,7 +9,9 @@
 
 static char const * const builtin_commit_graph_usage[] = {
        N_("git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"),
-       N_("git commit-graph write [--object-dir <objdir>] [--append|--split] [--reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>"),
+       N_("git commit-graph write [--object-dir <objdir>] [--append] "
+          "[--split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] "
+          "[--changed-paths] [--[no-]progress] <split options>"),
        NULL
 };
 
@@ -19,7 +21,9 @@ static const char * const builtin_commit_graph_verify_usage[] = {
 };
 
 static const char * const builtin_commit_graph_write_usage[] = {
-       N_("git commit-graph write [--object-dir <objdir>] [--append|--split] [--reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>"),
+       N_("git commit-graph write [--object-dir <objdir>] [--append] "
+          "[--split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] "
+          "[--changed-paths] [--[no-]progress] <split options>"),
        NULL
 };
 
@@ -32,6 +36,7 @@ static struct opts_commit_graph {
        int split;
        int shallow;
        int progress;
+       int enable_changed_paths;
 } opts;
 
 static struct object_directory *find_odb(struct repository *r,
@@ -39,14 +44,17 @@ static struct object_directory *find_odb(struct repository *r,
 {
        struct object_directory *odb;
        char *obj_dir_real = real_pathdup(obj_dir, 1);
+       struct strbuf odb_path_real = STRBUF_INIT;
 
        prepare_alt_odb(r);
        for (odb = r->objects->odb; odb; odb = odb->next) {
-               if (!strcmp(obj_dir_real, real_path(odb->path)))
+               strbuf_realpath(&odb_path_real, odb->path, 1);
+               if (!strcmp(obj_dir_real, odb_path_real.buf))
                        break;
        }
 
        free(obj_dir_real);
+       strbuf_release(&odb_path_real);
 
        if (!odb)
                die(_("could not find object directory matching %s"), obj_dir);
@@ -111,10 +119,29 @@ static int graph_verify(int argc, const char **argv)
 extern int read_replace_refs;
 static struct split_commit_graph_opts split_opts;
 
+static int write_option_parse_split(const struct option *opt, const char *arg,
+                                   int unset)
+{
+       enum commit_graph_split_flags *flags = opt->value;
+
+       opts.split = 1;
+       if (!arg)
+               return 0;
+
+       if (!strcmp(arg, "no-merge"))
+               *flags = COMMIT_GRAPH_SPLIT_MERGE_PROHIBITED;
+       else if (!strcmp(arg, "replace"))
+               *flags = COMMIT_GRAPH_SPLIT_REPLACE;
+       else
+               die(_("unrecognized --split argument, %s"), arg);
+
+       return 0;
+}
+
 static int graph_write(int argc, const char **argv)
 {
        struct string_list *pack_indexes = NULL;
-       struct string_list *commit_hex = NULL;
+       struct oidset commits = OIDSET_INIT;
        struct object_directory *odb = NULL;
        struct string_list lines;
        int result = 0;
@@ -132,15 +159,19 @@ static int graph_write(int argc, const char **argv)
                        N_("start walk at commits listed by stdin")),
                OPT_BOOL(0, "append", &opts.append,
                        N_("include all commits already in the commit-graph file")),
+               OPT_BOOL(0, "changed-paths", &opts.enable_changed_paths,
+                       N_("enable computation for changed paths")),
                OPT_BOOL(0, "progress", &opts.progress, N_("force progress reporting")),
-               OPT_BOOL(0, "split", &opts.split,
-                       N_("allow writing an incremental commit-graph file")),
+               OPT_CALLBACK_F(0, "split", &split_opts.flags, NULL,
+                       N_("allow writing an incremental commit-graph file"),
+                       PARSE_OPT_OPTARG | PARSE_OPT_NONEG,
+                       write_option_parse_split),
                OPT_INTEGER(0, "max-commits", &split_opts.max_commits,
                        N_("maximum number of commits in a non-base split commit-graph")),
                OPT_INTEGER(0, "size-multiple", &split_opts.size_multiple,
                        N_("maximum ratio between two levels of a split commit-graph")),
                OPT_EXPIRY_DATE(0, "expire-time", &split_opts.expire_time,
-                       N_("maximum number of commits in a non-base split commit-graph")),
+                       N_("only expire files older than a given date-time")),
                OPT_END(),
        };
 
@@ -165,6 +196,9 @@ static int graph_write(int argc, const char **argv)
                flags |= COMMIT_GRAPH_WRITE_SPLIT;
        if (opts.progress)
                flags |= COMMIT_GRAPH_WRITE_PROGRESS;
+       if (opts.enable_changed_paths ||
+           git_env_bool(GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS, 0))
+               flags |= COMMIT_GRAPH_WRITE_BLOOM_FILTERS;
 
        read_replace_refs = 0;
        odb = find_odb(the_repository, opts.obj_dir);
@@ -185,7 +219,20 @@ static int graph_write(int argc, const char **argv)
                if (opts.stdin_packs)
                        pack_indexes = &lines;
                if (opts.stdin_commits) {
-                       commit_hex = &lines;
+                       struct string_list_item *item;
+                       oidset_init(&commits, lines.nr);
+                       for_each_string_list_item(item, &lines) {
+                               struct object_id oid;
+                               const char *end;
+
+                               if (parse_oid_hex(item->string, &oid, &end)) {
+                                       error(_("unexpected non-hex object ID: "
+                                               "%s"), item->string);
+                                       return 1;
+                               }
+
+                               oidset_insert(&commits, &oid);
+                       }
                        flags |= COMMIT_GRAPH_WRITE_CHECK_OIDS;
                }
 
@@ -194,7 +241,7 @@ static int graph_write(int argc, const char **argv)
 
        if (write_commit_graph(odb,
                               pack_indexes,
-                              commit_hex,
+                              opts.stdin_commits ? &commits : NULL,
                               flags,
                               &split_opts))
                result = 1;