Re: zsh completion broken for file completion

2013-04-02 Thread Manlio Perillo 
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Il 01/04/2013 11:29, Felipe Contreras ha scritto:
 
 
 On Thu, Feb 28, 2013 at 12:59 PM, Manlio Perillo
 manlio.peri...@gmail.com mailto:manlio.peri...@gmail.com wrote:
 
 
 [1] Basically, on my system I need the following change at the end of
 the file:
 
 -_git
 +autoload -U +X compinit  compinit
 +compdef _git git gitk
 
 I don't know the reason, however; and it seems that it is a problem
 only for me
 
 
 Are you sourcing this script? If so, don't; do what is suggested at the
 top: use fpath to load it automatically.
 

I'm using fpath as documented.

However I tested the script again, and now seems to work correctly.
It is possible that in the past I was using an incorrect configuration.


Thanks   Manlio Perillo
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAlFa01IACgkQscQJ24LbaUQOmACghDC30GqXXPIExHOPl9HrrO1y
BYgAn2QPAYvtsSAAiPpgMnmMRI3z0LE8
=kmm0
-END PGP SIGNATURE-
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: zsh completion broken for file completion

2013-04-01 Thread Felipe Contreras 
On Thu, Feb 28, 2013 at 12:59 PM, Manlio Perillo
manlio.peri...@gmail.com wrote:

 [1] Basically, on my system I need the following change at the end of
 the file:

 -_git
 +autoload -U +X compinit  compinit
 +compdef _git git gitk

 I don't know the reason, however; and it seems that it is a problem
 only for me

Are you sourcing this script? If so, don't; do what is suggested at
the top: use fpath to load it automatically.

Cheers.

--
Felipe Contreras
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

zsh completion broken for file completion

2013-02-28 Thread Matthieu Moy 
Hi,

The completion for e.g. git add filetab is broken in master. I get
the following result:

git add fo__gitcomp_file:8: command not found: compgen

The guilty commit is fea16b47b60 (Fri Jan 11 19:48:43 2013, Manlio
Perillo, git-completion.bash: add support for path completion), which
introduces a new __gitcomp_file function that uses the bash builtin
compgen, without redefining the function in git-completion.zsh.

The following proof-of-concept patch seems to fix the problem for me (I
basically copied the __gitcomp_nl function to __gitcomp_file and removed
the '-S ${4- }'). The bash version does compopt -o filenames, I
don't know what zsh equivalent is.

diff --git a/contrib/completion/git-completion.zsh 
b/contrib/completion/git-completion.zsh
index 4577502..0ba1dcf 100644
--- a/contrib/completion/git-completion.zsh
+++ b/contrib/completion/git-completion.zsh
@@ -60,6 +60,15 @@ __gitcomp_nl ()
compadd -Q -S ${4- } -p ${2-} -- ${=1}  _ret=0
 }
 
+__gitcomp_file ()
+{
+   emulate -L zsh
+
+   local IFS=$'\n'
+   compset -P '*[=:]'
+   compadd -Q -p ${2-} -- ${=1}  _ret=0
+}
+
 _git ()
 {
local _ret=1

Felipe, you know ZSH completion much better than me. Could you turn this
into a real patch?

Thanks,

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: zsh completion broken for file completion

2013-02-28 Thread Manlio Perillo 
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Il 28/02/2013 19:43, Matthieu Moy ha scritto:
 Hi,
 
 The completion for e.g. git add filetab is broken in master. I get
 the following result:
 
 git add fo__gitcomp_file:8: command not found: compgen
 
 The guilty commit is fea16b47b60 (Fri Jan 11 19:48:43 2013, Manlio
 Perillo, git-completion.bash: add support for path completion), which
 introduces a new __gitcomp_file function that uses the bash builtin
 compgen, without redefining the function in git-completion.zsh.
 
 [...] 
 diff --git a/contrib/completion/git-completion.zsh 
 b/contrib/completion/git-completion.zsh
 index 4577502..0ba1dcf 100644
 --- a/contrib/completion/git-completion.zsh
 +++ b/contrib/completion/git-completion.zsh
 @@ -60,6 +60,15 @@ __gitcomp_nl ()
 compadd -Q -S ${4- } -p ${2-} -- ${=1}  _ret=0
  }
  
 +__gitcomp_file ()
 +{
 +   emulate -L zsh
 +
 +   local IFS=$'\n'
 +   compset -P '*[=:]'
 +   compadd -Q -p ${2-} -- ${=1}  _ret=0
 +}
 +

This patch is implemented in fea16b47b60, but only for the deprecated
zsh compatibility code inside git-completion.bash.

The reason I did not provided a patch for git-completion.zsh was because
there was a bug in this script [1].

If any changes are made to git-completion.zsh, please update
git-completion.bash, too.


[1] Basically, on my system I need the following change at the end of
the file:

-_git
+autoload -U +X compinit  compinit
+compdef _git git gitk

I don't know the reason, however; and it seems that it is a problem
only for me

 [...]


Regards  Malio
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAlEvqRUACgkQscQJ24LbaURASgCeILUTXAiZA6Ndf2DHByJfv4nT
2bMAn1gPqSdfIBzb0cexwYNoAuD5j2+O
=sKTR
-END PGP SIGNATURE-
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html