mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
index-pack: add --progress-title option
Add a --progress-title option to index-pack, when data is piped into
index-pack its progress is a proxy for whatever's feeding it data.
This option will allow us to set a more relevant progress bar title in
"git bundle unbundle", and is also used in my "bundle-uri" RFC
patches[1] by a new caller in fetch-pack.c.
The code change in cmd_index_pack() won't handle
"--progress-title=xyz", only "--progress-title xyz", and the "(i+1)"
style (as opposed to "i + 1") is a bit odd.
Not using the "--long-option=value" style is inconsistent with
existing long options handled by cmd_index_pack(), but makes the code
that needs to call it better (two strvec_push(), instead of needing a
strvec_pushf()). Since the option is internal-only the inconsistency
shouldn't matter.
I'm copying the pattern to handle it as-is from the handling of the
existing "-o" option in the same function, see 9cf6d3357a
(Add
git-index-pack utility, 2005-10-12) for its addition. That's a short
option, but the code to implement the two is the same in functionality
and style. Eventually we'd like to migrate all of this this to
parse_options(), which would make these differences in behavior go
away.
1. https://lore.kernel.org/git/RFC-cover-00.13-0000000000-20210805T150534Z-avarab@gmail.com/
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
7366096de9
commit
f46c46e4f2
|
@ -82,6 +82,12 @@ OPTIONS
|
|||
--strict::
|
||||
Die, if the pack contains broken objects or links.
|
||||
|
||||
--progress-title::
|
||||
For internal use only.
|
||||
+
|
||||
Set the title of the progress bar. The title is "Receiving objects" by
|
||||
default and "Indexing objects" when `--stdin` is specified.
|
||||
|
||||
--check-self-contained-and-connected::
|
||||
Die if the pack contains broken links. For internal use only.
|
||||
|
||||
|
|
|
@ -122,6 +122,7 @@ static int strict;
|
|||
static int do_fsck_object;
|
||||
static struct fsck_options fsck_options = FSCK_OPTIONS_MISSING_GITMODULES;
|
||||
static int verbose;
|
||||
static const char *progress_title;
|
||||
static int show_resolving_progress;
|
||||
static int show_stat;
|
||||
static int check_self_contained_and_connected;
|
||||
|
@ -1157,6 +1158,7 @@ static void parse_pack_objects(unsigned char *hash)
|
|||
|
||||
if (verbose)
|
||||
progress = start_progress(
|
||||
progress_title ? progress_title :
|
||||
from_stdin ? _("Receiving objects") : _("Indexing objects"),
|
||||
nr_objects);
|
||||
for (i = 0; i < nr_objects; i++) {
|
||||
|
@ -1806,6 +1808,10 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix)
|
|||
input_len = sizeof(*hdr);
|
||||
} else if (!strcmp(arg, "-v")) {
|
||||
verbose = 1;
|
||||
} else if (!strcmp(arg, "--progress-title")) {
|
||||
if (progress_title || (i+1) >= argc)
|
||||
usage(index_pack_usage);
|
||||
progress_title = argv[++i];
|
||||
} else if (!strcmp(arg, "--show-resolving-progress")) {
|
||||
show_resolving_progress = 1;
|
||||
} else if (!strcmp(arg, "--report-end-of-input")) {
|
||||
|
|
Loading…
Reference in a new issue