kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity
Browse Source

builtin/multi-pack-index.c: disable top-level --[no-]progress 

In a similar spirit as the previous patch, let sub-commands which
support showing or hiding a progress meter handle parsing the
`--progress` or `--no-progress` option, but do not expose it as an
option to the top-level `multi-pack-index` builtin.

Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Taylor Blau 3 years ago committed by Junio C Hamano
parent
d5fdf3073a
commit
0394f8d002
3 changed files with 35 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      Documentation/git-multi-pack-index.txt
  2. 31
      builtin/multi-pack-index.c
  3. 12
      t/t5319-multi-pack-index.sh

6
Documentation/git-multi-pack-index.txt
Unescape View File

@ -9,8 +9,7 @@ git-multi-pack-index - Write and verify multi-pack-indexes
SYNOPSIS SYNOPSIS
-------- --------
[verse] [verse]
'git multi-pack-index' [--object-dir=<dir>] [--[no-]progress] 'git multi-pack-index' [--object-dir=<dir>] <sub-command>
[--preferred-pack=<pack>] <subcommand>


DESCRIPTION DESCRIPTION
----------- -----------
@ -26,7 +25,8 @@ OPTIONS


--[no-]progress:: --[no-]progress::
Turn progress on/off explicitly. If neither is specified, progress is Turn progress on/off explicitly. If neither is specified, progress is
shown if standard error is connected to a terminal. shown if standard error is connected to a terminal. Supported by
sub-commands `write`, `verify`, `expire`, and `repack.


The following subcommands are available: The following subcommands are available:



31
builtin/multi-pack-index.c
Unescape View File

@ -52,7 +52,6 @@ static struct opts_multi_pack_index {
static struct option common_opts[] = { static struct option common_opts[] = {
OPT_FILENAME(0, "object-dir", &opts.object_dir, OPT_FILENAME(0, "object-dir", &opts.object_dir,
N_("object directory containing set of packfile and pack-index pairs")), N_("object directory containing set of packfile and pack-index pairs")),
OPT_BIT(0, "progress", &opts.flags, N_("force progress reporting"), MIDX_PROGRESS),
OPT_END(), OPT_END(),
}; };


@ -68,6 +67,8 @@ static int cmd_multi_pack_index_write(int argc, const char **argv)
OPT_STRING(0, "preferred-pack", &opts.preferred_pack, OPT_STRING(0, "preferred-pack", &opts.preferred_pack,
N_("preferred-pack"), N_("preferred-pack"),
N_("pack for reuse when computing a multi-pack bitmap")), N_("pack for reuse when computing a multi-pack bitmap")),
OPT_BIT(0, "progress", &opts.flags,
N_("force progress reporting"), MIDX_PROGRESS),
OPT_END(), OPT_END(),
}; };


@ -75,6 +76,8 @@ static int cmd_multi_pack_index_write(int argc, const char **argv)


trace2_cmd_mode(argv[0]); trace2_cmd_mode(argv[0]);


if (isatty(2))
opts.flags |= MIDX_PROGRESS;
argc = parse_options(argc, argv, NULL, argc = parse_options(argc, argv, NULL,
options, builtin_multi_pack_index_write_usage, options, builtin_multi_pack_index_write_usage,
PARSE_OPT_KEEP_UNKNOWN); PARSE_OPT_KEEP_UNKNOWN);
@ -90,10 +93,18 @@ static int cmd_multi_pack_index_write(int argc, const char **argv)


static int cmd_multi_pack_index_verify(int argc, const char **argv) static int cmd_multi_pack_index_verify(int argc, const char **argv)
{ {
struct option *options = common_opts; struct option *options;
static struct option builtin_multi_pack_index_verify_options[] = {
OPT_BIT(0, "progress", &opts.flags,
N_("force progress reporting"), MIDX_PROGRESS),
OPT_END(),
};
options = add_common_options(builtin_multi_pack_index_verify_options);


trace2_cmd_mode(argv[0]); trace2_cmd_mode(argv[0]);


if (isatty(2))
opts.flags |= MIDX_PROGRESS;
argc = parse_options(argc, argv, NULL, argc = parse_options(argc, argv, NULL,
options, builtin_multi_pack_index_verify_usage, options, builtin_multi_pack_index_verify_usage,
PARSE_OPT_KEEP_UNKNOWN); PARSE_OPT_KEEP_UNKNOWN);
@ -106,10 +117,18 @@ static int cmd_multi_pack_index_verify(int argc, const char **argv)


static int cmd_multi_pack_index_expire(int argc, const char **argv) static int cmd_multi_pack_index_expire(int argc, const char **argv)
{ {
struct option *options = common_opts; struct option *options;
static struct option builtin_multi_pack_index_expire_options[] = {
OPT_BIT(0, "progress", &opts.flags,
N_("force progress reporting"), MIDX_PROGRESS),
OPT_END(),
};
options = add_common_options(builtin_multi_pack_index_expire_options);


trace2_cmd_mode(argv[0]); trace2_cmd_mode(argv[0]);


if (isatty(2))
opts.flags |= MIDX_PROGRESS;
argc = parse_options(argc, argv, NULL, argc = parse_options(argc, argv, NULL,
options, builtin_multi_pack_index_expire_usage, options, builtin_multi_pack_index_expire_usage,
PARSE_OPT_KEEP_UNKNOWN); PARSE_OPT_KEEP_UNKNOWN);
@ -126,6 +145,8 @@ static int cmd_multi_pack_index_repack(int argc, const char **argv)
static struct option builtin_multi_pack_index_repack_options[] = { static struct option builtin_multi_pack_index_repack_options[] = {
OPT_MAGNITUDE(0, "batch-size", &opts.batch_size, OPT_MAGNITUDE(0, "batch-size", &opts.batch_size,
N_("during repack, collect pack-files of smaller size into a batch that is larger than this size")), N_("during repack, collect pack-files of smaller size into a batch that is larger than this size")),
OPT_BIT(0, "progress", &opts.flags,
N_("force progress reporting"), MIDX_PROGRESS),
OPT_END(), OPT_END(),
}; };


@ -133,6 +154,8 @@ static int cmd_multi_pack_index_repack(int argc, const char **argv)


trace2_cmd_mode(argv[0]); trace2_cmd_mode(argv[0]);


if (isatty(2))
opts.flags |= MIDX_PROGRESS;
argc = parse_options(argc, argv, NULL, argc = parse_options(argc, argv, NULL,
options, options,
builtin_multi_pack_index_repack_usage, builtin_multi_pack_index_repack_usage,
@ -154,8 +177,6 @@ int cmd_multi_pack_index(int argc, const char **argv,


git_config(git_default_config, NULL); git_config(git_default_config, NULL);


if (isatty(2))
opts.flags |= MIDX_PROGRESS;
argc = parse_options(argc, argv, prefix, argc = parse_options(argc, argv, prefix,
builtin_multi_pack_index_options, builtin_multi_pack_index_options,
builtin_multi_pack_index_usage, builtin_multi_pack_index_usage,

12
t/t5319-multi-pack-index.sh
Unescape View File

@ -174,12 +174,12 @@ test_expect_success 'write progress off for redirected stderr' '
' '


test_expect_success 'write force progress on for stderr' ' test_expect_success 'write force progress on for stderr' '
GIT_PROGRESS_DELAY=0 git multi-pack-index --object-dir=$objdir --progress write 2>err && GIT_PROGRESS_DELAY=0 git multi-pack-index --object-dir=$objdir write --progress 2>err &&
test_file_not_empty err test_file_not_empty err
' '


test_expect_success 'write with the --no-progress option' ' test_expect_success 'write with the --no-progress option' '
GIT_PROGRESS_DELAY=0 git multi-pack-index --object-dir=$objdir --no-progress write 2>err && GIT_PROGRESS_DELAY=0 git multi-pack-index --object-dir=$objdir write --no-progress 2>err &&
test_line_count = 0 err test_line_count = 0 err
' '


@ -429,12 +429,12 @@ test_expect_success 'repack progress off for redirected stderr' '
' '


test_expect_success 'repack force progress on for stderr' ' test_expect_success 'repack force progress on for stderr' '
GIT_PROGRESS_DELAY=0 git multi-pack-index --object-dir=$objdir --progress repack 2>err && GIT_PROGRESS_DELAY=0 git multi-pack-index --object-dir=$objdir repack --progress 2>err &&
test_file_not_empty err test_file_not_empty err
' '


test_expect_success 'repack with the --no-progress option' ' test_expect_success 'repack with the --no-progress option' '
GIT_PROGRESS_DELAY=0 git multi-pack-index --object-dir=$objdir --no-progress repack 2>err && GIT_PROGRESS_DELAY=0 git multi-pack-index --object-dir=$objdir repack --no-progress 2>err &&
test_line_count = 0 err test_line_count = 0 err
' '


@ -618,7 +618,7 @@ test_expect_success 'expire progress off for redirected stderr' '
test_expect_success 'expire force progress on for stderr' ' test_expect_success 'expire force progress on for stderr' '
( (
cd dup && cd dup &&
GIT_PROGRESS_DELAY=0 git multi-pack-index --progress expire 2>err && GIT_PROGRESS_DELAY=0 git multi-pack-index expire --progress 2>err &&
test_file_not_empty err test_file_not_empty err
) )
' '
@ -626,7 +626,7 @@ test_expect_success 'expire force progress on for stderr' '
test_expect_success 'expire with the --no-progress option' ' test_expect_success 'expire with the --no-progress option' '
( (
cd dup && cd dup &&
GIT_PROGRESS_DELAY=0 git multi-pack-index --no-progress expire 2>err && GIT_PROGRESS_DELAY=0 git multi-pack-index expire --no-progress 2>err &&
test_line_count = 0 err test_line_count = 0 err
) )
' '

Write Preview
Loading…
Cancel
Save