mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

parse-options: option to let --git-completion-helper show negative form

Browse Source 
When 7fb6aefd2a (Merge branch 'nd/parseopt-completion' - 2018-03-14)
is merged, the completion for negative form is left out because the
series is alread long and it could be done in a follow up series. This
is it.

--git-completion-helper now provides --no-xxx so that git-completion.bash
can drop the extra custom --no-xxx in the script. It adds a lot more
--no-xxx than what's current provided by the git-completion.bash
script. We'll trim that down later.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy
2018-05-27 10:38:26 +02:00
committed by Junio C Hamano
parent e144d126d7
commit 2b1c01d22e
3 changed files with 54 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
parse-options.c
View File

@ -427,15 +427,12 @@ void parse_options_start(struct parse_opt_ctx_t *ctx,
parse_options_check(options);
}
/*
* TODO: we are not completing the --no-XXX form yet because there are
* many options that do not suppress it properly.
*/
static int show_gitcomp(struct parse_opt_ctx_t *ctx,
const struct option *opts)
{
for (; opts->type != OPTION_END; opts++) {
const char *suffix = "";
int has_unset_form = 0;
if (!opts->long_name)
continue;
@ -450,6 +447,8 @@ static int show_gitcomp(struct parse_opt_ctx_t *ctx,
case OPTION_INTEGER:
case OPTION_MAGNITUDE:
case OPTION_CALLBACK:
has_unset_form = 1;
if (opts->flags & PARSE_OPT_NOARG)
break;
if (opts->flags & PARSE_OPT_OPTARG)
@ -458,12 +457,27 @@ static int show_gitcomp(struct parse_opt_ctx_t *ctx,
break;
suffix = "=";
break;
case OPTION_BIT:
case OPTION_NEGBIT:
case OPTION_COUNTUP:
case OPTION_SET_INT:
has_unset_form = 1;
break;
default:
break;
}
if (opts->flags & PARSE_OPT_COMP_ARG)
suffix = "=";
printf(" --%s%s", opts->long_name, suffix);
if (has_unset_form && !(opts->flags & PARSE_OPT_NONEG)) {
const char *name;
if (skip_prefix(opts->long_name, "no-", &name))
printf(" --%s", name);
else
printf(" --no-%s", opts->long_name);
}
}
fputc('\n', stdout);
exit(0);