From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-30354-mason-zsh=primenet.com.au@zsh.org>
Received: (qmail 13682 invoked by alias); 12 Mar 2012 22:57:06 -0000
Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm
Precedence: bulk
X-No-Archive: yes
List-Id: Zsh Workers List <zsh-workers.zsh.org>
List-Post: <mailto:zsh-workers@zsh.org>
List-Help: <mailto:zsh-workers-help@zsh.org>
X-Seq: 30354
Received: (qmail 2097 invoked from network); 12 Mar 2012 22:57:04 -0000
X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on f.primenet.com.au
X-Spam-Level: 
X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_LOW
	autolearn=ham version=3.3.2
Received-SPF: none (ns1.primenet.com.au: domain at lukaperkov.net does not designate permitted sender hosts)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=google.com; s=20120113;
        h=date:from:to:subject:message-id:mime-version:content-type
         :content-disposition:user-agent:x-gm-message-state;
        bh=eKxCMhpq5CFfII6B9l6y0XJJ6BxQT6Ds53NIfOeijt4=;
        b=jSSSMFmGpqkxJ9sV2gwMRTJUThDlYA3hcA0o2Jf510jmtEJIgONisprx7+0URAYgr8
         UsG4yom9JIuL7bKSQJWMF56A77ZNOFswMY1fCYbsCzFwl/AgH2yAeqfX/DNu3ubDuoig
         nkDDphU1ffMfG1gHQiyvZ+XZ1Ddvk3mUeNfTJfUE0iH5gAWmJqlygbxsYQfLcDKW895m
         YvQSdofFw2WsTcg/0JiPA5QubLxxUuWrk06UyG7QxEwVhTOfA+Vhbga73vx0szGoQAc4
         uwYofEJozakOwoY7pe1eF7//gkz580clvWu8x5aSLFUtX9lS4//ezPlzHuoZ1gG6voLr
         hJ7A==
Date: Mon, 12 Mar 2012 23:49:23 +0100
From: Luka Perkov <lists@lukaperkov.net>
To: zsh-workers@zsh.org
Subject: PATCH: _quilt: update for version 0.60
Message-ID: <20120312224923.GA25171@w500.iskon.local>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.5.21 (2010-09-15)
X-Gm-Message-State: ALoCoQlGCx4arOiJ30/6rnJTapzpwi7guiCBl26btqYMUAj8JChI70OibAX+yibqzlRBwv2if/1E

update quilt completion script for quilt version 0.60.

Signed-off-by: Luka Perkov <lists@lukaperkov.net>
---

diff --git a/Completion/Unix/Command/_quilt b/Completion/Unix/Command/_quilt
index 130f381..2ceb2ff 100644
--- a/Completion/Unix/Command/_quilt
+++ b/Completion/Unix/Command/_quilt
@@ -32,8 +32,8 @@ _arguments \
   '--quiltrc[Use the specified configuration file]:files:_files' \
   '--version[Print the version number and exit]' \
   ':quilt command:(add annotate applied delete diff edit files fold fork graph
-    grep header import mail new next patches pop previous push refresh rename
-    revert series setup shell snapshot top unapplied upgrade)' \
+    grep header import mail new next patches pop previous push refresh remove
+    rename revert series setup snapshot top unapplied upgrade)' \
   '*::subcmd:->subcmd' && return 0
 
 case "$state" in (subcmd)
@@ -109,6 +109,9 @@ case "$state" in (subcmd)
           '-T ps[Directly produce a PostScript output file]' \
           ':quilt series:_quilt_series'
         ;;
+      (grep)
+        _arguments '-h'
+        ;;
       (header)
         _arguments '-h' \
           '-a[Append the exiting patch header]' \
@@ -131,6 +134,7 @@ case "$state" in (subcmd)
       (mail)
         _arguments '-h' \
           '-m[Text to use as the text in the introduction]:quilt select text: ' \
+          '-M[Like the -m option, but read the introduction from file]:files:_files' \
           '--prefix[Use an alternate prefix in the bracketed part of the subjects generated]:quilt select prefix: ' \
           '--mbox[Store all messages in the specified file in mbox format]:files:_files' \
           '--send[Send the messages directly]' \
@@ -145,7 +149,8 @@ case "$state" in (subcmd)
           '*:quilt series:_quilt_series'
         ;;
       (new)
-        _arguments '-h'
+        _arguments '-h' \
+          '-p[Select a patch style]:quilt patch style:(0 1 ab)'
         ;;
       (next)
         _arguments '-h' \
@@ -175,6 +180,8 @@ case "$state" in (subcmd)
           '-q[Quiet operation]' \
           '-f[Force apply, even if the patch has rejects]' \
           '-v[Verbose operation]' \
+          '--fuzz[Set the maximum fuzz factor]' \
+          '--merge=[Merge the patch file into the original files]:quilt select merge:(merge diff3)' \
           '--leave-rejects[Leave around the reject files patch produced]' \
           '--color=[Use syntax coloring]:quilt select color:(always auto never)' \
           ':quilt unapplied:_quilt_unapplied'
@@ -196,6 +203,10 @@ case "$state" in (subcmd)
           '--strip-trailing-whitespace[Strip trailing whitespace at the end of lines]' \
           ':quilt series:_quilt_series'
         ;;
+      (remove)
+        _arguments '-h' \
+          '-P[Patch to remove]:quilt series:_quilt_series'
+        ;;
       (rename)
         _arguments '-h' \
           '-P[Patch to rename]:quilt series:_quilt_series'
@@ -214,12 +225,9 @@ case "$state" in (subcmd)
           '-d[Optional path prefix for the resulting source tree]:quilt select path-prefix: ' \
           '--sourcedir[Directory that contains the package sources]:quilt select package sources directory: ' \
           '-v[Verbose debug output]' \
+          '--fuzz[Set the maximum fuzz factor]' \
           ':files:_files'
         ;;
-      (shell)
-        _arguments '-h' \
-          ':quilt select shell command:_command_names -e'
-        ;;
       (snapshot)
         _arguments '-h' \
           '-d[Remove current snapshot]'