From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 14101 invoked from network); 19 Oct 2007 01:45:06 -0000 X-Spam-Checker-Version: SpamAssassin 3.2.3 (2007-08-08) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=AWL,BAYES_00 autolearn=ham version=3.2.3 Received: from news.dotsrc.org (HELO a.mx.sunsite.dk) (130.225.247.88) by ns1.primenet.com.au with SMTP; 19 Oct 2007 01:45:06 -0000 Received-SPF: none (ns1.primenet.com.au: domain at sunsite.dk does not designate permitted sender hosts) Received: (qmail 8316 invoked from network); 19 Oct 2007 01:44:57 -0000 Received: from sunsite.dk (130.225.247.90) by a.mx.sunsite.dk with SMTP; 19 Oct 2007 01:44:57 -0000 Received: (qmail 12099 invoked by alias); 19 Oct 2007 01:44:53 -0000 Mailing-List: contact zsh-workers-help@sunsite.dk; run by ezmlm Precedence: bulk X-No-Archive: yes X-Seq: 23993 Received: (qmail 12077 invoked from network); 19 Oct 2007 01:44:52 -0000 Received: from news.dotsrc.org (HELO a.mx.sunsite.dk) (130.225.247.88) by sunsite.dk with SMTP; 19 Oct 2007 01:44:52 -0000 Received: (qmail 7875 invoked from network); 19 Oct 2007 01:44:52 -0000 Received: from an-out-0708.google.com (209.85.132.249) by a.mx.sunsite.dk with SMTP; 19 Oct 2007 01:44:47 -0000 Received: by an-out-0708.google.com with SMTP id b33so71392ana for ; Thu, 18 Oct 2007 18:44:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=beta; h=domainkey-signature:received:received:message-id:date:from:to:subject:mime-version:content-type:content-transfer-encoding:content-disposition; bh=XXZhrSHbe9gzA+3K7BflJ17+TBSaIB3GlSOTaEAR80Y=; b=KD53TKCBm8h+zBYqwDavvGGcbJxVd9cRAl/8ry2dZp8YLr7B08ni5FXPfxIF2Uus9bJpdGtXf7saGSMnql7wI/0HBDmBnieIn43qRWJ63vulRicooWCUuiZmbaFZO8BJvUxs628Fe4qoX/xoKsiAodjY4IrEqSHO10n0rLygajo= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:message-id:date:from:to:subject:mime-version:content-type:content-transfer-encoding:content-disposition; b=NBDqe7YHqscj4a36oDGHhI9GF1Hfht/+uf1s+9goUJOldmCD0icGVgRoyoVOqUKmKsq9NjNg7G1cdmNyaTpvl2NpeEXEfvzns0VRztTvVNIoi2wmfiP3e2PaxMSfcRSpjeUI/+qMMhz08RC38KSSi+50GDMQ3Pm0ldWqEZN0iJA= Received: by 10.142.194.1 with SMTP id r1mr512882wff.1192758283100; Thu, 18 Oct 2007 18:44:43 -0700 (PDT) Received: by 10.142.86.21 with HTTP; Thu, 18 Oct 2007 18:44:43 -0700 (PDT) Message-ID: <237967ef0710181844o71d08aa0tc2f8158f504e6ed7@mail.gmail.com> Date: Fri, 19 Oct 2007 03:44:43 +0200 From: "Mikael Magnusson" To: zsh-workers Subject: A stab at better git-show completion MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Content-Disposition: inline I decided i want to get very confused, so i decided to try and make git-show completion allow completing of the form commit:path/file where the path/file part depends on what commit you typed. Somehow i succeeded. (the [1,-2] is for removing the trailing colon) http://git.mikachu.ath.cx/?p=zsh-cvs.git;a=commitdiff_plain;h=gitshow --- a/Completion/Unix/Command/_git +++ b/Completion/Unix/Command/_git @@ -1010,11 +1010,25 @@ _git-show-ref () { (( $+functions[_git-show] )) || _git-show () { + local curcontext=$curcontext state line __git_setup_revision_arguments _arguments -S \ $revision_arguments \ - '*:object:__git_revisions' && ret=0 + '*:object:->object' && ret=0 + + case $state in + (object) + compset -P '*:' + if [[ -n $IPREFIX ]]; then + __git_tree_files $IPREFIX[1,-2] + else + _alternative \ + 'revisions:revision:__git_revisions' \ + 'files:file:__git_files' + fi + ;; + esac } (( $+functions[_git-show-index] )) || -- Mikael Magnusson