Show More
@@ -741,7 +741,6 b' class queue(object):' | |||||
741 | raise util.Abort(_('qdelete requires at least one revision or ' |
|
741 | raise util.Abort(_('qdelete requires at least one revision or ' | |
742 | 'patch name')) |
|
742 | 'patch name')) | |
743 |
|
743 | |||
744 | realpatches = [] |
|
|||
745 | for patch in patches: |
|
744 | for patch in patches: | |
746 | patch = self.lookup(patch, strict=True) |
|
745 | patch = self.lookup(patch, strict=True) | |
747 | info = self.isapplied(patch) |
|
746 | info = self.isapplied(patch) | |
@@ -749,8 +748,8 b' class queue(object):' | |||||
749 | raise util.Abort(_("cannot delete applied patch %s") % patch) |
|
748 | raise util.Abort(_("cannot delete applied patch %s") % patch) | |
750 | if patch not in self.series: |
|
749 | if patch not in self.series: | |
751 | raise util.Abort(_("patch %s not in series file") % patch) |
|
750 | raise util.Abort(_("patch %s not in series file") % patch) | |
752 | realpatches.append(patch) |
|
|||
753 |
|
751 | |||
|
752 | patches = list(patches) | |||
754 | numrevs = 0 |
|
753 | numrevs = 0 | |
755 | if opts.get('rev'): |
|
754 | if opts.get('rev'): | |
756 | if not self.applied: |
|
755 | if not self.applied: | |
@@ -759,10 +758,10 b' class queue(object):' | |||||
759 | if len(revs) > 1 and revs[0] > revs[1]: |
|
758 | if len(revs) > 1 and revs[0] > revs[1]: | |
760 | revs.reverse() |
|
759 | revs.reverse() | |
761 | revpatches = self._revpatches(repo, revs) |
|
760 | revpatches = self._revpatches(repo, revs) | |
762 |
|
|
761 | patches += revpatches | |
763 | numrevs = len(revpatches) |
|
762 | numrevs = len(revpatches) | |
764 |
|
763 | |||
765 |
self._cleanup( |
|
764 | self._cleanup(patches, numrevs, opts.get('keep')) | |
766 |
|
765 | |||
767 | def check_toppatch(self, repo): |
|
766 | def check_toppatch(self, repo): | |
768 | if self.applied: |
|
767 | if self.applied: |
General Comments 0
You need to be logged in to leave comments.
Login now