[RFC] Use _multi_parts for completing git tree files

[RFC] Use _multi_parts for completing git tree files

[Jörg Sommer]

This makes it possible to use abbreviated paths for tree files like

  git checkout C/U/C/_gi

for

  git checkout Completion/Unix/Command/_git
---
 Completion/Unix/Command/_git |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index c8a1282..c617613 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -2859,7 +2859,7 @@ __git_tree_files () {
   fi
 
   local expl
-  _wanted files expl 'tree file' compadd $multi_parts_opts -f -a tree_files
+  _wanted files expl 'tree file' _multi_parts -f $@ -- / tree_files
 }
 
 # TODO: deal with things that __git_heads and __git_tags has in common (i.e.,
-- 
1.6.0.1

Re: [RFC] Use _multi_parts for completing git tree files

[Clint Adams]

On Tue, Oct 07, 2008 at 10:24:03PM +0200, Jörg Sommer wrote:
> +  _wanted files expl 'tree file' _multi_parts -f $@ -- / tree_files

Seems good.

Index: Completion/Unix/Command/_git
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Unix/Command/_git,v
retrieving revision 1.106
diff -u -r1.106 _git
--- Completion/Unix/Command/_git	9 Oct 2008 21:54:10 -0000	1.106
+++ Completion/Unix/Command/_git	9 Oct 2008 21:56:13 -0000
@@ -2791,9 +2791,6 @@
 (( $+functions[__git_tree_files] )) ||
 __git_tree_files () {
   local multi_parts_opts
-
-  zparseopts -D -E -a multi_parts_opts M: J: V: 1 2 n F: X:
-
   local tree Path
   integer at_least_one_tree_added
   local -a tree_files

Re: [RFC] Use _multi_parts for completing git tree files

[Jörg Sommer]

Hallo Clint,

Clint Adams <clint@zsh.org> wrote:
> On Tue, Oct 07, 2008 at 10:24:03PM +0200, Jörg Sommer wrote:
>> +  _wanted files expl 'tree file' _multi_parts -f $@ -- / tree_files
>
> Seems good.

Thanks for picking it up.

> Index: Completion/Unix/Command/_git
> ===================================================================
> RCS file: /cvsroot/zsh/zsh/Completion/Unix/Command/_git,v
> retrieving revision 1.106
> diff -u -r1.106 _git
> --- Completion/Unix/Command/_git	9 Oct 2008 21:54:10 -0000	1.106
> +++ Completion/Unix/Command/_git	9 Oct 2008 21:56:13 -0000
> @@ -2791,9 +2791,6 @@
>  (( $+functions[__git_tree_files] )) ||
>  __git_tree_files () {
>    local multi_parts_opts
> -
> -  zparseopts -D -E -a multi_parts_opts M: J: V: 1 2 n F: X:
> -

Then you can remove the local line before, too.

Bye, Jörg.
-- 
Macht besitzen und nicht ausüben ist wahre Größe.
                                                   (Friedl Beutelrock)