Web lists-archives.com

Re: [PATCH] Add support for 'git remote rm' in Bash completion script




Hi,

Keith Smiley wrote:
>> On Feb 8, 2019, at 22:27, Todd Zullinger <tmz@xxxxxxxxx> wrote:
>> 
>> Hi Sergey,
>> 
>> There was a previous discussion of this in December 2017,
>> which might be useful:
>> 
>> https://public-inbox.org/git/01020160a0004473-277c3d7c-4e3b-4c50-9d44-4a106f37f1d9-000000@xxxxxxxxxxxxxxxxxxxxxxx/
>> 
>> It didn't end with a patch applied, but it's likely worth
>> reading to help you make a case for a similar patch.
>> 
>> One of the points in that thread is that the rm subcommand
>> is not shown in completion intentionally, as the preferred
>> subcommand is remove.  But it should be possible to offer
>> completion of the remotes after a user types rm, which I
>> imagine is the more helpful part of the completion.
>> 
>> Also, you'll want to add a signoff to the patch if/when you
>> resend it (refer to Documentation/SubmittingPatches, if you
>> haven't already).
>> 
>> Sergey Zolotarev wrote:
>>> ---
>>> contrib/completion/git-completion.bash | 5 ++++-
>>> 1 file changed, 4 insertions(+), 1 deletion(-)
>>> 
>>> diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
>>> index 499e56f83d..fa25d689e2 100644
>>> --- a/contrib/completion/git-completion.bash
>>> +++ b/contrib/completion/git-completion.bash
>>> @@ -2334,7 +2334,7 @@ _git_remote ()
>>> {
>>>    local subcommands="
>>>        add rename remove set-head set-branches
>>> -        get-url set-url show prune update
>>> +        get-url set-url show prune rm update
>>>        "
>>>    local subcommand="$(__git_find_on_cmdline "$subcommands")"
>> 
>> So instead of this change you could adjust the subcommand
>> line, something like:
>> 
>> -    local subcommand="$(__git_find_on_cmdline "$subcommands")"
>> +    # Don't advertise rm by including it in subcommands, but complete
>> +    # remotes if it is used.
>> +    local subcommand="$(__git_find_on_cmdline "$subcommands rm")"
>> 
>> I haven't test that, but the code looks like it hasn't
>> changed since the last time we talked about this -- when I
>> did test the suggestion :).
>> 
>>>    if [ -z "$subcommand" ]; then
>>> @@ -2379,6 +2379,9 @@ _git_remote ()
>>>    prune,--*)
>>>        __gitcomp_builtin remote_prune
>>>        ;;
>>> +    rm,--*)
>>> +        __gitcomp_builtin remote_rm
>>> +        ;;
>>>    *)
>>>        __gitcomp_nl "$(__git_remotes)"
>>>        ;;
>> 
>> I don't think you need this chunk, do you?  I think that's
>> only useful for completing options to the subcommand, which
>> 'git remote rm' lacks.
>> 
>> I believe you can simply skip it and let the case fall
>> through to the last item which simply completes the
>> available remotes, just as 'git remote remove' does.
>> 
>> Hope that helps,
>> 
> It would be great if we could land this. Non of the other
> solutions since I proposed my patch have happened, so in
> the meantime this would be nice to have.

Yeah, it seems like we should either complete the remotes
for 'git remote rm <tab>' or follow up with the removal of
the rm subcommand as Duy and Junio fleshed out in the thread
from July.  If the command were to be removed, doing it
right after the 2.22 cycle begins would be as good a time as
any.

If the command remains, here's a suggestion for how it might
be submitted (perhaps with more details in the commit to
justify why we're completing arguments to a deprecated
subcommand?).

It's really not an itch of mine, so I'm just tossing this
out in case someone that wants it more will push it forward.

---- >8 ----
Subject: [PATCH] completion: complete remotes for 'remote rm'

The remote 'rm' subcommand was removed from the completed subcommands
list in e17dba8fe1 ("remote: prefer subcommand name 'remove' to 'rm'",
2012-09-06).  While we don't advertise it, we can still complete the
list of remotes for users who type 'git remote rm <tab>' as a courtesy.

Reported-by: Keith Smiley <k@xxxxxxxx>
Reported-by: Sergey Zolotarev <szolot4rev@xxxxxxxxx>
Helped-by: Todd Zullinger <tmz@xxxxxxxxx>
Signed-off-by: <whomever polishes as needed>
---
 contrib/completion/git-completion.bash | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 499e56f83d..5d0f8a2077 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -2336,7 +2336,9 @@ _git_remote ()
 		add rename remove set-head set-branches
 		get-url set-url show prune update
 		"
-	local subcommand="$(__git_find_on_cmdline "$subcommands")"
+	# We don't advertise rm by including it in subcommands, but if it is
+	# used we want to complete remotes.
+	local subcommand="$(__git_find_on_cmdline "$subcommands rm")"
 	if [ -z "$subcommand" ]; then
 		case "$cur" in
 		--*)

-- 
Todd