Merge branch 'gs/commit-graph-trace-with-cmd'

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

diff --git a/builtin/commit-graph.c b/builtin/commit-graph.c
index ef68b26744d9f10eadd7cbc8fc2354482405551f..addc8d4cc0895567b6f09902d3353b0a62a9507c 100644 (file)
--- a/builtin/commit-graph.c
+++ b/builtin/commit-graph.c
@@ -10,13 +10,13 @@
 static char const * const builtin_commit_graph_usage[] = {
        N_("git commit-graph [--object-dir <objdir>]"),
        N_("git commit-graph read [--object-dir <objdir>]"),
-       N_("git commit-graph verify [--object-dir <objdir>] [--shallow]"),
-       N_("git commit-graph write [--object-dir <objdir>] [--append|--split] [--reachable|--stdin-packs|--stdin-commits] <split options>"),
+       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>"),
        NULL
 };
 
 static const char * const builtin_commit_graph_verify_usage[] = {
-       N_("git commit-graph verify [--object-dir <objdir>] [--shallow]"),
+       N_("git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"),
        NULL
 };
 
@@ -26,7 +26,7 @@ static const char * const builtin_commit_graph_read_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] <split options>"),
+       N_("git commit-graph write [--object-dir <objdir>] [--append|--split] [--reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>"),
        NULL
 };
 
@@ -38,6 +38,7 @@ static struct opts_commit_graph {
        int append;
        int split;
        int shallow;
+       int progress;
 } opts;
 
 static int graph_verify(int argc, const char **argv)
@@ -55,11 +56,13 @@ static int graph_verify(int argc, const char **argv)
                           N_("The object directory to store the graph")),
                OPT_BOOL(0, "shallow", &opts.shallow,
                         N_("if the commit-graph is split, only verify the tip file")),
+               OPT_BOOL(0, "progress", &opts.progress, N_("force progress reporting")),
                OPT_END(),
        };
 
        trace2_cmd_mode("verify");
 
+       opts.progress = isatty(2);
        argc = parse_options(argc, argv, NULL,
                             builtin_commit_graph_verify_options,
                             builtin_commit_graph_verify_usage, 0);
@@ -68,6 +71,8 @@ static int graph_verify(int argc, const char **argv)
                opts.obj_dir = get_object_directory();
        if (opts.shallow)
                flags |= COMMIT_GRAPH_VERIFY_SHALLOW;
+       if (opts.progress)
+               flags |= COMMIT_GRAPH_WRITE_PROGRESS;
 
        graph_name = get_commit_graph_filename(opts.obj_dir);
        open_ok = open_commit_graph(graph_name, &fd, &st);
@@ -158,7 +163,7 @@ static int graph_write(int argc, const char **argv)
        struct string_list *commit_hex = NULL;
        struct string_list lines;
        int result = 0;
-       enum commit_graph_write_flags flags = COMMIT_GRAPH_WRITE_PROGRESS;
+       enum commit_graph_write_flags flags = 0;
 
        static struct option builtin_commit_graph_write_options[] = {
                OPT_STRING(0, "object-dir", &opts.obj_dir,
@@ -172,6 +177,7 @@ 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, "progress", &opts.progress, N_("force progress reporting")),
                OPT_BOOL(0, "split", &opts.split,
                        N_("allow writing an incremental commit-graph file")),
                OPT_INTEGER(0, "max-commits", &split_opts.max_commits,
@@ -183,6 +189,7 @@ static int graph_write(int argc, const char **argv)
                OPT_END(),
        };
 
+       opts.progress = isatty(2);
        split_opts.size_multiple = 2;
        split_opts.max_commits = 0;
        split_opts.expire_time = 0;
@@ -201,6 +208,8 @@ static int graph_write(int argc, const char **argv)
                flags |= COMMIT_GRAPH_WRITE_APPEND;
        if (opts.split)
                flags |= COMMIT_GRAPH_WRITE_SPLIT;
+       if (opts.progress)
+               flags |= COMMIT_GRAPH_WRITE_PROGRESS;
 
        read_replace_refs = 0;
 
@@ -257,6 +266,8 @@ int cmd_commit_graph(int argc, const char **argv, const char *prefix)
                             builtin_commit_graph_usage,
                             PARSE_OPT_STOP_AT_NON_OPTION);
 
+       save_commit_buffer = 0;
+
        if (argc > 0) {
                if (!strcmp(argv[0], "read"))
                        return graph_read(argc, argv);