# HG changeset patch
# User Greg Ward <greg-hg@gerg.ca>
# Date 2010-06-17 02:00:02
# Node ID c3d7daa0928e0292e4674cd91bda018482e30020
# Parent  0044193a1c45790bb3ab1ad998799244b70df1a2

mq: make 'qdelete <patchidx>' work again.

This just backs out 1abd9442727c (a minor code cleanup that
accidentally broke qdelete) and adds a test.

diff --git a/hgext/mq.py b/hgext/mq.py
--- a/hgext/mq.py
+++ b/hgext/mq.py
@@ -752,6 +752,7 @@ class queue(object):
             raise util.Abort(_('qdelete requires at least one revision or '
                                'patch name'))
 
+        realpatches = []
         for patch in patches:
             patch = self.lookup(patch, strict=True)
             info = self.isapplied(patch)
@@ -759,8 +760,8 @@ class queue(object):
                 raise util.Abort(_("cannot delete applied patch %s") % patch)
             if patch not in self.series:
                 raise util.Abort(_("patch %s not in series file") % patch)
+            realpatches.append(patch)
 
-        patches = list(patches)
         numrevs = 0
         if opts.get('rev'):
             if not self.applied:
@@ -769,10 +770,10 @@ class queue(object):
             if len(revs) > 1 and revs[0] > revs[1]:
                 revs.reverse()
             revpatches = self._revpatches(repo, revs)
-            patches += revpatches
+            realpatches += revpatches
             numrevs = len(revpatches)
 
-        self._cleanup(patches, numrevs, opts.get('keep'))
+        self._cleanup(realpatches, numrevs, opts.get('keep'))
 
     def check_toppatch(self, repo):
         if self.applied:
diff --git a/tests/test-mq-qdelete b/tests/test-mq-qdelete
--- a/tests/test-mq-qdelete
+++ b/tests/test-mq-qdelete
@@ -21,7 +21,7 @@ hg qdel c
 hg qseries
 ls .hg/patches
 hg qpop
-hg qdel -k b
+hg qdel -k 1
 ls .hg/patches
 hg qdel -r a
 hg qapplied