mirror of
https://github.com/git/git
synced 2024-08-29 20:49:20 +00:00
commit-graph: add --[no-]progress to write and verify
Add --[no-]progress to git commit-graph write and verify.
The progress feature was introduced in 7b0f229
("commit-graph write: add progress output", 2018-09-17) but
the ability to opt-out was overlooked.
Signed-off-by: Garima Singh <garima.singh@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
f1d4a28250
commit
7371612255
|
@ -10,8 +10,8 @@ SYNOPSIS
|
||||||
--------
|
--------
|
||||||
[verse]
|
[verse]
|
||||||
'git commit-graph read' [--object-dir <dir>]
|
'git commit-graph read' [--object-dir <dir>]
|
||||||
'git commit-graph verify' [--object-dir <dir>] [--shallow]
|
'git commit-graph verify' [--object-dir <dir>] [--shallow] [--[no-]progress]
|
||||||
'git commit-graph write' <options> [--object-dir <dir>]
|
'git commit-graph write' <options> [--object-dir <dir>] [--[no-]progress]
|
||||||
|
|
||||||
|
|
||||||
DESCRIPTION
|
DESCRIPTION
|
||||||
|
@ -29,6 +29,9 @@ OPTIONS
|
||||||
commit-graph file is expected to be in the `<dir>/info` directory and
|
commit-graph file is expected to be in the `<dir>/info` directory and
|
||||||
the packfiles are expected to be in `<dir>/pack`.
|
the packfiles are expected to be in `<dir>/pack`.
|
||||||
|
|
||||||
|
--[no-]progress::
|
||||||
|
Turn progress on/off explicitly. If neither is specified, progress is
|
||||||
|
shown if standard error is connected to a terminal.
|
||||||
|
|
||||||
COMMANDS
|
COMMANDS
|
||||||
--------
|
--------
|
||||||
|
|
|
@ -10,13 +10,13 @@
|
||||||
static char const * const builtin_commit_graph_usage[] = {
|
static char const * const builtin_commit_graph_usage[] = {
|
||||||
N_("git commit-graph [--object-dir <objdir>]"),
|
N_("git commit-graph [--object-dir <objdir>]"),
|
||||||
N_("git commit-graph read [--object-dir <objdir>]"),
|
N_("git commit-graph read [--object-dir <objdir>]"),
|
||||||
N_("git commit-graph verify [--object-dir <objdir>] [--shallow]"),
|
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] <split options>"),
|
N_("git commit-graph write [--object-dir <objdir>] [--append|--split] [--reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>"),
|
||||||
NULL
|
NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
static const char * const builtin_commit_graph_verify_usage[] = {
|
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
|
NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -26,7 +26,7 @@ static const char * const builtin_commit_graph_read_usage[] = {
|
||||||
};
|
};
|
||||||
|
|
||||||
static const char * const builtin_commit_graph_write_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
|
NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -38,6 +38,7 @@ static struct opts_commit_graph {
|
||||||
int append;
|
int append;
|
||||||
int split;
|
int split;
|
||||||
int shallow;
|
int shallow;
|
||||||
|
int progress;
|
||||||
} opts;
|
} opts;
|
||||||
|
|
||||||
static int graph_verify(int argc, const char **argv)
|
static int graph_verify(int argc, const char **argv)
|
||||||
|
@ -55,9 +56,11 @@ static int graph_verify(int argc, const char **argv)
|
||||||
N_("The object directory to store the graph")),
|
N_("The object directory to store the graph")),
|
||||||
OPT_BOOL(0, "shallow", &opts.shallow,
|
OPT_BOOL(0, "shallow", &opts.shallow,
|
||||||
N_("if the commit-graph is split, only verify the tip file")),
|
N_("if the commit-graph is split, only verify the tip file")),
|
||||||
|
OPT_BOOL(0, "progress", &opts.progress, N_("force progress reporting")),
|
||||||
OPT_END(),
|
OPT_END(),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
opts.progress = isatty(2);
|
||||||
argc = parse_options(argc, argv, NULL,
|
argc = parse_options(argc, argv, NULL,
|
||||||
builtin_commit_graph_verify_options,
|
builtin_commit_graph_verify_options,
|
||||||
builtin_commit_graph_verify_usage, 0);
|
builtin_commit_graph_verify_usage, 0);
|
||||||
|
@ -66,6 +69,8 @@ static int graph_verify(int argc, const char **argv)
|
||||||
opts.obj_dir = get_object_directory();
|
opts.obj_dir = get_object_directory();
|
||||||
if (opts.shallow)
|
if (opts.shallow)
|
||||||
flags |= COMMIT_GRAPH_VERIFY_SHALLOW;
|
flags |= COMMIT_GRAPH_VERIFY_SHALLOW;
|
||||||
|
if (opts.progress)
|
||||||
|
flags |= COMMIT_GRAPH_WRITE_PROGRESS;
|
||||||
|
|
||||||
graph_name = get_commit_graph_filename(opts.obj_dir);
|
graph_name = get_commit_graph_filename(opts.obj_dir);
|
||||||
open_ok = open_commit_graph(graph_name, &fd, &st);
|
open_ok = open_commit_graph(graph_name, &fd, &st);
|
||||||
|
@ -154,7 +159,7 @@ static int graph_write(int argc, const char **argv)
|
||||||
struct string_list *commit_hex = NULL;
|
struct string_list *commit_hex = NULL;
|
||||||
struct string_list lines;
|
struct string_list lines;
|
||||||
int result = 0;
|
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[] = {
|
static struct option builtin_commit_graph_write_options[] = {
|
||||||
OPT_STRING(0, "object-dir", &opts.obj_dir,
|
OPT_STRING(0, "object-dir", &opts.obj_dir,
|
||||||
|
@ -168,6 +173,7 @@ static int graph_write(int argc, const char **argv)
|
||||||
N_("start walk at commits listed by stdin")),
|
N_("start walk at commits listed by stdin")),
|
||||||
OPT_BOOL(0, "append", &opts.append,
|
OPT_BOOL(0, "append", &opts.append,
|
||||||
N_("include all commits already in the commit-graph file")),
|
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,
|
OPT_BOOL(0, "split", &opts.split,
|
||||||
N_("allow writing an incremental commit-graph file")),
|
N_("allow writing an incremental commit-graph file")),
|
||||||
OPT_INTEGER(0, "max-commits", &split_opts.max_commits,
|
OPT_INTEGER(0, "max-commits", &split_opts.max_commits,
|
||||||
|
@ -179,6 +185,7 @@ static int graph_write(int argc, const char **argv)
|
||||||
OPT_END(),
|
OPT_END(),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
opts.progress = isatty(2);
|
||||||
split_opts.size_multiple = 2;
|
split_opts.size_multiple = 2;
|
||||||
split_opts.max_commits = 0;
|
split_opts.max_commits = 0;
|
||||||
split_opts.expire_time = 0;
|
split_opts.expire_time = 0;
|
||||||
|
@ -195,6 +202,8 @@ static int graph_write(int argc, const char **argv)
|
||||||
flags |= COMMIT_GRAPH_WRITE_APPEND;
|
flags |= COMMIT_GRAPH_WRITE_APPEND;
|
||||||
if (opts.split)
|
if (opts.split)
|
||||||
flags |= COMMIT_GRAPH_WRITE_SPLIT;
|
flags |= COMMIT_GRAPH_WRITE_SPLIT;
|
||||||
|
if (opts.progress)
|
||||||
|
flags |= COMMIT_GRAPH_WRITE_PROGRESS;
|
||||||
|
|
||||||
read_replace_refs = 0;
|
read_replace_refs = 0;
|
||||||
|
|
||||||
|
|
|
@ -1992,8 +1992,10 @@ int verify_commit_graph(struct repository *r, struct commit_graph *g, int flags)
|
||||||
if (verify_commit_graph_error & ~VERIFY_COMMIT_GRAPH_ERROR_HASH)
|
if (verify_commit_graph_error & ~VERIFY_COMMIT_GRAPH_ERROR_HASH)
|
||||||
return verify_commit_graph_error;
|
return verify_commit_graph_error;
|
||||||
|
|
||||||
|
if (flags & COMMIT_GRAPH_WRITE_PROGRESS)
|
||||||
progress = start_progress(_("Verifying commits in commit graph"),
|
progress = start_progress(_("Verifying commits in commit graph"),
|
||||||
g->num_commits);
|
g->num_commits);
|
||||||
|
|
||||||
for (i = 0; i < g->num_commits; i++) {
|
for (i = 0; i < g->num_commits; i++) {
|
||||||
struct commit *graph_commit, *odb_commit;
|
struct commit *graph_commit, *odb_commit;
|
||||||
struct commit_list *graph_parents, *odb_parents;
|
struct commit_list *graph_parents, *odb_parents;
|
||||||
|
|
|
@ -124,6 +124,42 @@ test_expect_success 'Add more commits' '
|
||||||
git repack
|
git repack
|
||||||
'
|
'
|
||||||
|
|
||||||
|
test_expect_success 'commit-graph write progress off for redirected stderr' '
|
||||||
|
cd "$TRASH_DIRECTORY/full" &&
|
||||||
|
git commit-graph write 2>err &&
|
||||||
|
test_line_count = 0 err
|
||||||
|
'
|
||||||
|
|
||||||
|
test_expect_success 'commit-graph write force progress on for stderr' '
|
||||||
|
cd "$TRASH_DIRECTORY/full" &&
|
||||||
|
git commit-graph write --progress 2>err &&
|
||||||
|
test_file_not_empty err
|
||||||
|
'
|
||||||
|
|
||||||
|
test_expect_success 'commit-graph write with the --no-progress option' '
|
||||||
|
cd "$TRASH_DIRECTORY/full" &&
|
||||||
|
git commit-graph write --no-progress 2>err &&
|
||||||
|
test_line_count = 0 err
|
||||||
|
'
|
||||||
|
|
||||||
|
test_expect_success 'commit-graph verify progress off for redirected stderr' '
|
||||||
|
cd "$TRASH_DIRECTORY/full" &&
|
||||||
|
git commit-graph verify 2>err &&
|
||||||
|
test_line_count = 0 err
|
||||||
|
'
|
||||||
|
|
||||||
|
test_expect_success 'commit-graph verify force progress on for stderr' '
|
||||||
|
cd "$TRASH_DIRECTORY/full" &&
|
||||||
|
git commit-graph verify --progress 2>err &&
|
||||||
|
test_file_not_empty err
|
||||||
|
'
|
||||||
|
|
||||||
|
test_expect_success 'commit-graph verify with the --no-progress option' '
|
||||||
|
cd "$TRASH_DIRECTORY/full" &&
|
||||||
|
git commit-graph verify --no-progress 2>err &&
|
||||||
|
test_line_count = 0 err
|
||||||
|
'
|
||||||
|
|
||||||
# Current graph structure:
|
# Current graph structure:
|
||||||
#
|
#
|
||||||
# __M3___
|
# __M3___
|
||||||
|
|
|
@ -320,7 +320,7 @@ test_expect_success 'add octopus merge' '
|
||||||
git merge commits/3 commits/4 &&
|
git merge commits/3 commits/4 &&
|
||||||
git branch merge/octopus &&
|
git branch merge/octopus &&
|
||||||
git commit-graph write --reachable --split &&
|
git commit-graph write --reachable --split &&
|
||||||
git commit-graph verify 2>err &&
|
git commit-graph verify --progress 2>err &&
|
||||||
test_line_count = 3 err &&
|
test_line_count = 3 err &&
|
||||||
test_i18ngrep ! warning err &&
|
test_i18ngrep ! warning err &&
|
||||||
test_line_count = 3 $graphdir/commit-graph-chain
|
test_line_count = 3 $graphdir/commit-graph-chain
|
||||||
|
|
Loading…
Reference in a new issue