mirror of
https://github.com/git/git.git
synced 2024-05-24 22:26:26 +02:00
680cba2c2b
Add the --[no-]progress option to git multi-pack-index.
Pass the MIDX_PROGRESS flag to the subcommand functions
when progress should be displayed by multi-pack-index.
The progress feature was added to 'verify' in 144d703
("multi-pack-index: report progress during 'verify'", 2018-09-13)
but some subcommands were not updated to display progress, and
the ability to opt-out was overlooked.
Signed-off-by: William Baker <William.Baker@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
71 lines
2.0 KiB
C
71 lines
2.0 KiB
C
#include "builtin.h"
|
|
#include "cache.h"
|
|
#include "config.h"
|
|
#include "parse-options.h"
|
|
#include "midx.h"
|
|
#include "trace2.h"
|
|
|
|
static char const * const builtin_multi_pack_index_usage[] = {
|
|
N_("git multi-pack-index [<options>] (write|verify|expire|repack --batch-size=<size>)"),
|
|
NULL
|
|
};
|
|
|
|
static struct opts_multi_pack_index {
|
|
const char *object_dir;
|
|
unsigned long batch_size;
|
|
int progress;
|
|
} opts;
|
|
|
|
int cmd_multi_pack_index(int argc, const char **argv,
|
|
const char *prefix)
|
|
{
|
|
unsigned flags = 0;
|
|
|
|
static struct option builtin_multi_pack_index_options[] = {
|
|
OPT_FILENAME(0, "object-dir", &opts.object_dir,
|
|
N_("object directory containing set of packfile and pack-index pairs")),
|
|
OPT_BOOL(0, "progress", &opts.progress, N_("force progress reporting")),
|
|
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")),
|
|
OPT_END(),
|
|
};
|
|
|
|
git_config(git_default_config, NULL);
|
|
|
|
opts.progress = isatty(2);
|
|
argc = parse_options(argc, argv, prefix,
|
|
builtin_multi_pack_index_options,
|
|
builtin_multi_pack_index_usage, 0);
|
|
|
|
if (!opts.object_dir)
|
|
opts.object_dir = get_object_directory();
|
|
if (opts.progress)
|
|
flags |= MIDX_PROGRESS;
|
|
|
|
if (argc == 0)
|
|
usage_with_options(builtin_multi_pack_index_usage,
|
|
builtin_multi_pack_index_options);
|
|
|
|
if (argc > 1) {
|
|
die(_("too many arguments"));
|
|
return 1;
|
|
}
|
|
|
|
trace2_cmd_mode(argv[0]);
|
|
|
|
if (!strcmp(argv[0], "repack"))
|
|
return midx_repack(the_repository, opts.object_dir,
|
|
(size_t)opts.batch_size, flags);
|
|
if (opts.batch_size)
|
|
die(_("--batch-size option is only for 'repack' subcommand"));
|
|
|
|
if (!strcmp(argv[0], "write"))
|
|
return write_midx_file(opts.object_dir, flags);
|
|
if (!strcmp(argv[0], "verify"))
|
|
return verify_midx_file(the_repository, opts.object_dir, flags);
|
|
if (!strcmp(argv[0], "expire"))
|
|
return expire_midx_packs(the_repository, opts.object_dir, flags);
|
|
|
|
die(_("unrecognized subcommand: %s"), argv[0]);
|
|
}
|