[PATCH] Problem in patchutils completion

[PATCH] Problem in patchutils completion

[Ismail Donmez]

[-- Attachment #1: Type: text/plain, Size: 451 bytes --]

Hello,

We've received the following bug report & patch in openSUSE:

<quote>

Zsh ships completions for patchutils. However, there are two bugs
related to the filterdiff command:
1. arguments for "grepdiff|filterdiff" don't combine with subsequent
separate arguments for "grepdiff" and "filterdiff", and
2. grepdiff and filterdiff don't complete file paths, even though they should.

</quote>

Patch by Jan Matejek of SUSE attached.

Regards,
ismail

[-- Attachment #2: patchutils.patch --]
[-- Type: application/octet-stream, Size: 1147 bytes --]

--- zsh-5.3/Completion/Unix/Command/_patchutils	
+++ zsh-5.3/Completion/Unix/Command/_patchutils	
@@ -43,6 +43,7 @@ case $service in
       '(-F --files)'{-F+,--files=}'[only list files within specified range]:range'
       '--strip=[remove specified number of pathname components before displaying]:components'
       '--addprefix=[insert specified path prefix before displaying path names]:prefix:_directories'
+      '*:diff file:_files'
     )
   ;|
   grepdiff|lsdiff)
@@ -58,7 +59,6 @@ case $service in
       \*{-v,--verbose}'[verbose operation]' 
       '(-H --with-filename -h --no-filename)'{-H,--with-filename}'[print the name of the patch file containing each patch]'
       '!--filter' '!--grep'
-      '*:diff file:_files'
     )
   ;;
   grepdiff|filterdiff)
@@ -71,7 +71,7 @@ case $service in
       '--as-numbered-lines=[display lines of selected hunks]:line numbers:(before after)'
       "--remove-timestamps[don't include timestamps in output]"
     )
-  ;;
+  ;|
   filterdiff)
     args+=(
       '(-X --exclude-from-file)'{-X+,--exclude-from-file=}'[exclude files matching any pattern listed in specified file]:file:_files'

Re: [PATCH] Problem in patchutils completion

[Ismail Donmez]

ping? any comments?

On Sat, Jan 28, 2017 at 9:54 AM, Ismail Donmez <ismail@i10z.com> wrote:
> Hello,
>
> We've received the following bug report & patch in openSUSE:
>
> <quote>
>
> Zsh ships completions for patchutils. However, there are two bugs
> related to the filterdiff command:
> 1. arguments for "grepdiff|filterdiff" don't combine with subsequent
> separate arguments for "grepdiff" and "filterdiff", and
> 2. grepdiff and filterdiff don't complete file paths, even though they should.
>
> </quote>
>
> Patch by Jan Matejek of SUSE attached.
>
> Regards,
> ismail

Re: [PATCH] Problem in patchutils completion

[Peter Stephenson]

On Mon, 6 Feb 2017 14:05:24 +0100
Ismail Donmez <ismail@i10z.com> wrote:
> ping? any comments?
> 
> On Sat, Jan 28, 2017 at 9:54 AM, Ismail Donmez <ismail@i10z.com> wrote:
> > Hello,
> >
> > We've received the following bug report & patch in openSUSE:
> >
> > <quote>
> >
> > Zsh ships completions for patchutils. However, there are two bugs
> > related to the filterdiff command:
> > 1. arguments for "grepdiff|filterdiff" don't combine with subsequent
> > separate arguments for "grepdiff" and "filterdiff", and
> > 2. grepdiff and filterdiff don't complete file paths, even though they should.
> >
> > </quote>

I've assumed this is uncontroversial and committed it.

pws