From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
SZEDER Gabor <szeder@ira.uka.de>,
Matthieu Moy <matthieu.moy@grenoble-inp.fr>,
Felipe Contreras <felipe.contreras@gmail.com>
Subject: [PATCH v5 3/3] completion: add new zsh completion
Date: Sun, 14 Oct 2012 17:52:51 +0200 [thread overview]
Message-ID: <1350229971-9343-4-git-send-email-felipe.contreras@gmail.com> (raw)
In-Reply-To: <1350229971-9343-1-git-send-email-felipe.contreras@gmail.com>
It seems there's always issues with zsh's bash completion emulation.
I've tried to fix as many as I could and most of the fixes are already
in the latest version of zsh, but still, there are issues.
There is no point in going through all that pain; the emulation is easy
to achieve, and this patch works better than zsh's emulation.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
v5:
* Even more simplification by using __gitcompadd
v4:
* Simplification updates for the latest bash completion
v3:
* Simplification
* Avoid COMPREPLY; call compadd directly
* Fix _get_comp_words_by_ref
contrib/completion/git-completion.zsh | 48 +++++++++++++++++++++++++++++++++++
1 file changed, 48 insertions(+)
create mode 100644 contrib/completion/git-completion.zsh
diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh
new file mode 100644
index 0000000..dbb5261
--- /dev/null
+++ b/contrib/completion/git-completion.zsh
@@ -0,0 +1,48 @@
+#compdef git gitk
+
+# zsh completion wrapper for git
+#
+# You need git's bash completion script installed somewhere, by default on the
+# same directory as this script.
+#
+# If your script is on ~/.git-completion.sh instead, you can configure it on
+# your ~/.zshrc:
+#
+# zstyle ':completion:*:*:git:*' script ~/.git-completion.sh
+#
+# The recommended way to install this script is to copy to
+# '~/.zsh/completion/_git', and then add the following to your ~/.zshrc file:
+#
+# fpath=(~/.zsh/completion $fpath)
+
+complete ()
+{
+ # do nothing
+ return 0
+}
+
+zstyle -s ":completion:*:*:git:*" script script
+test -z "$script" && script="$(dirname ${funcsourcetrace[1]%:*})"/git-completion.bash
+ZSH_VERSION='' . "$script"
+
+__gitcompadd ()
+{
+ compadd -Q -S "$4" -P "$2" -p "${(M)cur#*[=:]}" -- ${=1} && _ret=0
+}
+
+_git ()
+{
+ local _ret=1
+ () {
+ emulate -L ksh
+ local cur cword prev
+ cur=${words[CURRENT-1]}
+ prev=${words[CURRENT-2]}
+ let cword=CURRENT-1
+ __${service}_main
+ }
+ let _ret && _default -S '' && _ret=0
+ return _ret
+}
+
+_git
--
1.7.12.1
next prev parent reply other threads:[~2012-10-14 15:53 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-14 15:52 [PATCH v5 0/3] completion: refactor and zsh wrapper Felipe Contreras
2012-10-14 15:52 ` [PATCH v5 1/3] completion: add new __gitcompadd helper Felipe Contreras
2012-10-17 17:28 ` SZEDER Gábor
2012-10-22 0:41 ` Felipe Contreras
2012-10-30 23:18 ` SZEDER Gábor
2012-10-14 15:52 ` [PATCH v5 2/3] tests: use __gitcompadd to simplify completion tests Felipe Contreras
2012-10-16 0:24 ` Felipe Contreras
2012-10-17 17:50 ` SZEDER Gábor
2012-10-17 17:54 ` [PATCH] completion: clean up __gitcomp() tests SZEDER Gábor
2012-10-17 18:21 ` Felipe Contreras
2012-10-17 18:26 ` [PATCH v5 2/3] tests: use __gitcompadd to simplify completion tests Felipe Contreras
2012-10-14 15:52 ` Felipe Contreras [this message]
2012-10-15 6:38 ` [PATCH v5 3/3] completion: add new zsh completion Felipe Contreras
2012-10-15 16:45 ` [PATCH v5 0/3] completion: refactor and zsh wrapper Matthieu Moy
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1350229971-9343-4-git-send-email-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=matthieu.moy@grenoble-inp.fr \
--cc=szeder@ira.uka.de \
/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://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).