From: Oliver Kiddle <okiddle@yahoo.co.uk>
To: pseyfert <pseyfert.mathphys@gmail.com>
Cc: zsh-workers@zsh.org
Subject: Re: git remote set-url completion
Date: Fri, 31 Aug 2018 22:54:51 +0200 [thread overview]
Message-ID: <31092-1535748891.186231@QeZo.VfrC.CLU8> (raw)
In-Reply-To: <20180521204513.GA26538@robusta>
On 21 May, pseyfert wrote:
> I was not happy with the completion of
> git remote set-url <some remote> TAB
...
> So I put the below patch together which uses __git_repositories (and _urls) instead of _urls.
The following patch is to be applied after Paul's original patch from
42810. It covers the things I mentioned in my reply to the original
message.
Oliver
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index c9201bea2..2cae4c82f 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -3607,12 +3607,7 @@ _git-remote () {
'(-m --master)'{-m,--master=}'[set HEAD of remote to point to given master branch]: :__git_branch_names' \
'--mirror[do not use separate remotes]::mirror type:(fetch pull)' \
':name:__git_remotes' \
- ':repository:->repository' && ret=0
- case $state in
- (repository)
- __git_repositories_or_url && ret=0
- ;;
- esac
+ ':repository:__git_repositories_or_urls' && ret=0
;;
(get-url)
_arguments -S -s \
@@ -3641,17 +3636,13 @@ _git-remote () {
'*: :__git_branch_names' && ret=0
;;
(set-url)
- # TODO: Old URL does not get completed if --push, --add, or --delete are present
- # TODO: assumes $line[1] is always the remote name
- _message "the line is: $line"
- _arguments -S -s \
- '(3)--push[manipulate push URLs instead of fetch URLs]' \
- '--add[add URL to those already defined]' \
- '(3)--delete[delete all matching URLs]' \
- ': :__git_remotes' \
- ':new url:__git_repositories_or_url' \
- ':old url:__git_current_remote_url $line[1]' \
- && ret=0
+ _arguments -S \
+ '--push[manipulate push URLs instead of fetch URLs]' \
+ '(3)--add[add URL to those already defined]' \
+ '(2)--delete[delete all matching URLs]' \
+ '1: :__git_remotes' \
+ '2:new url:__git_repositories_or_urls' \
+ '3:old url: __git_current_remote_urls ${(k)opt_args[--push]} $line[1]' && ret=0
;;
(show)
_arguments -S \
@@ -6971,19 +6962,19 @@ __git_local_repositories () {
_wanted local-repositories expl 'local repositories' _directories
}
-(( $+functions[__git_repositories_or_url] )) ||
-__git_repositories_or_url () {
+(( $+functions[__git_repositories_or_urls] )) ||
+__git_repositories_or_urls () {
_alternative \
'repositories::__git_repositories' \
- 'url::_urls'
+ 'urls::_urls'
}
-(( $+functions[__git_current_remote_url] )) ||
-__git_current_remote_url () {
- # TODO: is ${(@)*[1,4]} a proper replacement for $* and passing extra arguments?
- # TODO: add --push to the `git remote get-url` command in case `git remote set-url --push origin <new url> <TAB>` is completed
- _wanted remote-urls expl 'current urls' \
- compadd ${(@)*[1,4]} - ${${(0)"$(_call_program remote-urls git remote get-url $5)"}%%$'\n'*}
+(( $+functions[__git_current_remote_urls] )) ||
+__git_current_remote_urls () {
+ local expl
+ _description remote-urls expl 'current url'
+ compadd "$expl[@]" -M 'r:|/=* r:|=*' - ${(f)"$(_call_program remote-urls
+ git remote get-url "$@" --all)"}
}
(( $+functions[__git_any_repositories] )) ||
prev parent reply other threads:[~2018-08-31 20:55 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-21 20:45 pseyfert
2018-05-29 23:46 ` Oliver Kiddle
2018-08-31 20:54 ` Oliver Kiddle [this message]
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=31092-1535748891.186231@QeZo.VfrC.CLU8 \
--to=okiddle@yahoo.co.uk \
--cc=pseyfert.mathphys@gmail.com \
--cc=zsh-workers@zsh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).