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

parse-options: add --git-completion-helper-all 

--git-completion-helper excludes hidden options, such as --allow-empty
for git commit. This is typically helpful, but occasionally we want
auto-completion for obscure flags. --git-completion-helper-all returns
all options, even if they are marked as hidden or nocomplete.

Signed-off-by: Ryan Zoeller <rtzoeller@rtzoeller.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Ryan Zoeller 2020-08-19 23:06:08 +00:00 committed by Junio C Hamano
parent 675a4aaf3b
commit a0abe5e3b7
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
parse-options.c
View File

@ -525,7 +525,8 @@ void parse_options_start(struct parse_opt_ctx_t *ctx,
parse_options_start_1(ctx, argc, argv, prefix, options, flags); parse_options_start_1(ctx, argc, argv, prefix, options, flags);
} }


static void show_negated_gitcomp(const struct option *opts, int nr_noopts) static void show_negated_gitcomp(const struct option *opts, int show_all,
int nr_noopts)
{ {
int printed_dashdash = 0; int printed_dashdash = 0;


@ -535,7 +536,8 @@ static void show_negated_gitcomp(const struct option *opts, int nr_noopts)


if (!opts->long_name) if (!opts->long_name)
continue; continue;
if (opts->flags & (PARSE_OPT_HIDDEN | PARSE_OPT_NOCOMPLETE)) if (!show_all &&
(opts->flags & (PARSE_OPT_HIDDEN | PARSE_OPT_NOCOMPLETE)))
continue; continue;
if (opts->flags & PARSE_OPT_NONEG) if (opts->flags & PARSE_OPT_NONEG)
continue; continue;
@ -572,7 +574,7 @@ static void show_negated_gitcomp(const struct option *opts, int nr_noopts)
} }
} }


static int show_gitcomp(const struct option *opts) static int show_gitcomp(const struct option *opts, int show_all)
{ {
const struct option *original_opts = opts; const struct option *original_opts = opts;
int nr_noopts = 0; int nr_noopts = 0;
@ -582,7 +584,8 @@ static int show_gitcomp(const struct option *opts)


if (!opts->long_name) if (!opts->long_name)
continue; continue;
if (opts->flags & (PARSE_OPT_HIDDEN | PARSE_OPT_NOCOMPLETE)) if (!show_all &&
(opts->flags & (PARSE_OPT_HIDDEN | PARSE_OPT_NOCOMPLETE)))
continue; continue;


switch (opts->type) { switch (opts->type) {
@ -610,8 +613,8 @@ static int show_gitcomp(const struct option *opts)
nr_noopts++; nr_noopts++;
printf(" --%s%s", opts->long_name, suffix); printf(" --%s%s", opts->long_name, suffix);
} }
show_negated_gitcomp(original_opts, -1); show_negated_gitcomp(original_opts, show_all, -1);
show_negated_gitcomp(original_opts, nr_noopts); show_negated_gitcomp(original_opts, show_all, nr_noopts);
fputc('\n', stdout); fputc('\n', stdout);
return PARSE_OPT_COMPLETE; return PARSE_OPT_COMPLETE;
} }
@ -723,9 +726,14 @@ int parse_options_step(struct parse_opt_ctx_t *ctx,
if (internal_help && ctx->total == 1 && !strcmp(arg + 1, "h")) if (internal_help && ctx->total == 1 && !strcmp(arg + 1, "h"))
goto show_usage; goto show_usage;


/* lone --git-completion-helper is asked by git-completion.bash */ /*
if (ctx->total == 1 && !strcmp(arg + 1, "-git-completion-helper")) * lone --git-completion-helper and --git-completion-helper-all
return show_gitcomp(options); * are asked by git-completion.bash
*/
if (ctx->total == 1 && !strcmp(arg, "--git-completion-helper"))
return show_gitcomp(options, 0);
if (ctx->total == 1 && !strcmp(arg, "--git-completion-helper-all"))
return show_gitcomp(options, 1);


if (arg[1] != '-') { if (arg[1] != '-') {
ctx->opt = arg + 1; ctx->opt = arg + 1;