git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: "Jonathan Nieder" <jrnieder@gmail.com>,
	"SZEDER Gábor" <szeder@ira.uka.de>,
	"Junio C Hamano" <gitster@pobox.com>,
	"Thomas Rast" <trast@student.ethz.ch>,
	"Felipe Contreras" <felipe.contreras@gmail.com>
Subject: [RFC/PATCH v4 6/6] completion: add public _GIT_complete helper
Date: Mon,  7 May 2012 03:23:20 +0200	[thread overview]
Message-ID: <1336353800-17323-7-git-send-email-felipe.contreras@gmail.com> (raw)
In-Reply-To: <1336353800-17323-1-git-send-email-felipe.contreras@gmail.com>

So that users can easily define aliases, such as:

 _GIT_complete gf git_fetch

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 contrib/completion/git-completion.bash |   10 +++++-----
 t/t9902-completion.sh                  |    9 ++++++++-
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 049110e..2b7ef02 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -2678,6 +2678,7 @@ _gitk ()
 
 __git_func_wrap ()
 {
+	local cmd="${1#git_}" cmd_pos=1
 	if [[ -n ${ZSH_VERSION-} ]]; then
 		emulate -L bash
 		setopt KSH_TYPESET
@@ -2695,8 +2696,7 @@ __git_func_wrap ()
 	_$1
 }
 
-# this is NOT a public function; use at your own risk
-__git_complete ()
+_GIT_complete ()
 {
 	local name="${2-$1}"
 	local wrapper="_${name}_wrap"
@@ -2705,13 +2705,13 @@ __git_complete ()
 		|| complete -o default -o nospace -F $wrapper $1
 }
 
-__git_complete git
-__git_complete gitk
+_GIT_complete git
+_GIT_complete gitk
 
 # The following are necessary only for Cygwin, and only are needed
 # when the user has tab-completed the executable name and consequently
 # included the '.exe' suffix.
 #
 if [ Cygwin = "$(uname -o 2>/dev/null)" ]; then
-__git_complete git.exe git
+_GIT_complete git.exe git
 fi
diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh
index 6904594..2037452 100755
--- a/t/t9902-completion.sh
+++ b/t/t9902-completion.sh
@@ -63,7 +63,7 @@ run_completion ()
 	local _cword
 	_words=( $1 )
 	(( _cword = ${#_words[@]} - 1 ))
-	_git_wrap && print_comp
+	${comp_wrap-_git_wrap} && print_comp
 }
 
 test_completion ()
@@ -316,4 +316,11 @@ test_expect_success 'global options extra checks' '
 	test_completion "git --no-pager tag -d v" "v0.1 "
 '
 
+test_expect_success 'aliases' '
+	local comp_wrap=_git_fetch_wrap &&
+	_GIT_complete gf git_fetch &&
+	test_completion "gf o" "origin " &&
+	test_completion "gf origin m" "master:master "
+'
+
 test_done
-- 
1.7.10

  parent reply	other threads:[~2012-05-07  1:23 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-07  1:23 [RFC/PATCH v4 0/6] completion: __git_complete and other stuff Felipe Contreras
2012-05-07  1:23 ` [RFC/PATCH v4 1/6] completion: add new __git_complete helper Felipe Contreras
2012-05-07  9:51   ` SZEDER Gábor
2012-05-07 18:51   ` Junio C Hamano
2012-05-07 20:53     ` Felipe Contreras
2012-05-07  1:23 ` [RFC/PATCH v4 2/6] tests: add more bash completion tests Felipe Contreras
2012-05-07  1:23 ` [RFC/PATCH v4 3/6] completion: simplify _git_bundle Felipe Contreras
2012-05-07  1:23 ` [RFC/PATCH v4 4/6] completion: simplify command stuff Felipe Contreras
2012-05-07 10:08   ` SZEDER Gábor
2012-05-07  1:23 ` [RFC/PATCH v4 5/6] completion: calculate argument position properly Felipe Contreras
2012-05-07  1:27   ` Felipe Contreras
2012-05-07 18:59     ` Junio C Hamano
2012-05-07 21:01       ` Felipe Contreras
2012-05-07 21:52         ` Junio C Hamano
2012-05-08 12:50           ` Felipe Contreras
2012-05-07  1:23 ` Felipe Contreras [this message]
2012-05-07 18:56   ` [RFC/PATCH v4 6/6] completion: add public _GIT_complete helper Junio C Hamano
2012-05-07 20:57     ` Felipe Contreras

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=1336353800-17323-7-git-send-email-felipe.contreras@gmail.com \
    --to=felipe.contreras@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jrnieder@gmail.com \
    --cc=szeder@ira.uka.de \
    --cc=trast@student.ethz.ch \
    /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.
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).