mirror of
https://github.com/git/git.git
synced 2024-09-29 16:41:53 +02:00
cf1f5389ec
Now that there is a shared 'flags' member in the options structure, there is no need to keep track of whether to force progress or not, since ultimately the decision of whether or not to show a progress meter is controlled by a bit in the flags member. Manipulate that bit directly, and drop the now-unnecessary 'progress' field while we're at it. Signed-off-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
68 lines
1.9 KiB
C
68 lines
1.9 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;
|
|
unsigned flags;
|
|
} opts;
|
|
|
|
int cmd_multi_pack_index(int argc, const char **argv,
|
|
const char *prefix)
|
|
{
|
|
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_BIT(0, "progress", &opts.flags, N_("force progress reporting"), MIDX_PROGRESS),
|
|
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);
|
|
|
|
if (isatty(2))
|
|
opts.flags |= MIDX_PROGRESS;
|
|
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 (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, opts.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, opts.flags);
|
|
if (!strcmp(argv[0], "verify"))
|
|
return verify_midx_file(the_repository, opts.object_dir, opts.flags);
|
|
if (!strcmp(argv[0], "expire"))
|
|
return expire_midx_packs(the_repository, opts.object_dir, opts.flags);
|
|
|
|
die(_("unrecognized subcommand: %s"), argv[0]);
|
|
}
|