From: Ismail Donmez <ismail@i10z.com>
To: zsh-workers@zsh.org
Subject: [PATCH] Problem in patchutils completion
Date: Sat, 28 Jan 2017 09:54:38 +0100 [thread overview]
Message-ID: <CAFo71_6R2nd5KOCXLmL978aanNV1bo8rVvc0NEYU-e6JvWa1=g@mail.gmail.com> (raw)
[-- 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'
next reply other threads:[~2017-01-28 9:23 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-28 8:54 Ismail Donmez [this message]
2017-02-06 13:05 ` Ismail Donmez
2017-02-06 13:48 ` Peter Stephenson
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='CAFo71_6R2nd5KOCXLmL978aanNV1bo8rVvc0NEYU-e6JvWa1=g@mail.gmail.com' \
--to=ismail@i10z.com \
--cc=zsh-workers@zsh.org \
/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.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
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).