From: Junio C Hamano <gitster@pobox•com>
To: "Rubén Justo" <rjusto@gmail•com>
Cc: Git List <git@vger•kernel.org>
Subject: Re: [PATCH 2/4] completion: introduce __git_find_subcommand
Date: Fri, 26 Jan 2024 09:30:44 -0800 [thread overview]
Message-ID: <xmqqh6j0ngsb.fsf@gitster.g> (raw)
In-Reply-To: <221f88b9-fc91-479f-8d08-f530796e2d13@gmail.com> ("Rubén Justo"'s message of "Fri, 26 Jan 2024 13:51:46 +0100")
Rubén Justo <rjusto@gmail•com> writes:
> Let's have a function to get the current subcommand when completing
> commands that follow the syntax:
>
> git <command> <subcommand>
>
> As a convenience, let's allow an optional "default subcommand" to be
> returned if none is found.
>
> Signed-off-by: Rubén Justo <rjusto@gmail•com>
> ---
> contrib/completion/git-completion.bash | 20 ++++++++++++++++++++
> 1 file changed, 20 insertions(+)
>
> diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
> index 916e137021..5f2e904b56 100644
> --- a/contrib/completion/git-completion.bash
> +++ b/contrib/completion/git-completion.bash
> @@ -575,6 +575,26 @@ __gitcomp_subcommand ()
> fi
> }
>
> +# Find the current subcommand for commands that follow the syntax:
> +#
> +# git <command> <subcommand>
> +#
> +# 1: List of possible subcommands.
> +# 2: Optional subcommand to return when none is found.
> +__git_find_subcommand ()
> +{
> + local subcommand subcommands="$1" default_subcommand="$2"
Are the callers expected to form "$1" by concatenating known tokens
with a space?
I am just wondering if we can avoid looping, e.g.
local nextword=${words[__git_cmd_idx+1]}
case " $subcommands " in
*" $nextword "*)
echo "$nextword"
return
;;
esac
It hopefully should not be a huge deal either way, though.
> +
> + for subcommand in $subcommands; do
> + if [ "$subcommand" = "${words[__git_cmd_idx+1]}" ]; then
> + echo $subcommand
> + return
> + fi
> + done
> +
> + echo $default_subcommand
> +}
> +
> # Execute 'git ls-files', unless the --committable option is specified, in
> # which case it runs 'git diff-index' to find out the files that can be
> # committed. It return paths relative to the directory specified in the first
next prev parent reply other threads:[~2024-01-26 17:30 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-26 12:46 [PATCH 0/4] completion for git-reflog show Rubén Justo
2024-01-26 12:51 ` [PATCH 1/4] completion: introduce __gitcomp_subcommand Rubén Justo
2024-01-26 17:26 ` Junio C Hamano
2024-01-26 20:09 ` Rubén Justo
2024-01-26 20:34 ` Junio C Hamano
2024-01-26 12:51 ` [PATCH 2/4] completion: introduce __git_find_subcommand Rubén Justo
2024-01-26 17:30 ` Junio C Hamano [this message]
2024-01-27 13:20 ` Rubén Justo
2024-01-26 12:53 ` [PATCH 3/4] completion: reflog with implicit "show" Rubén Justo
2024-01-26 17:57 ` Junio C Hamano
2024-01-26 20:20 ` Rubén Justo
2024-02-21 1:46 ` Junio C Hamano
2024-02-21 18:06 ` Rubén Justo
2024-02-29 19:00 ` Rubén Justo
2024-02-29 19:22 ` Junio C Hamano
2024-01-26 12:53 ` [PATCH 4/4] completion: reflog show <log-options> Rubén Justo
2024-03-02 14:30 ` [PATCH v2 0/5] completion for git-reflog show Rubén Justo
2024-03-02 14:37 ` [PATCH v2 1/5] completion: reflog with implicit "show" Rubén Justo
2024-03-02 15:50 ` [PATCH v2 3/5] completion: reflog show <log-options> Rubén Justo
2024-03-02 15:51 ` [PATCH v2 2/5] completion: introduce __git_find_subcommand Rubén Justo
2024-03-02 15:52 ` [PATCH v2 4/5] completion: factor out __git_resolve_builtins Rubén Justo
2024-03-02 15:52 ` [PATCH v2 5/5] completion: reflog subcommands and options Rubén Justo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqh6j0ngsb.fsf@gitster.g \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=rjusto@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox