Show More
@@ -627,13 +627,23 b' class queue(object):' | |||
|
627 | 627 | appliedbase = 0 |
|
628 | 628 | patches = [] |
|
629 | 629 | for rev in sorted(revs): |
|
630 | ||
|
630 | 631 | if rev < firstrev: |
|
631 | 632 | raise util.Abort(_('revision %d is not managed') % rev) |
|
632 | 633 | base = bin(self.applied[appliedbase].rev) |
|
633 | node = repo.changelog.node(rev) | |
|
634 | if node != base: | |
|
635 | raise util.Abort(_('cannot delete revision %d above ' | |
|
636 | 'applied patches') % rev) | |
|
634 | ||
|
635 | ctx = repo[rev] | |
|
636 | if ctx.node() != base: | |
|
637 | msg = _('cannot delete revision %d above applied patches') | |
|
638 | raise util.Abort(msg % rev) | |
|
639 | ||
|
640 | patch = self.applied[appliedbase].name | |
|
641 | for fmt in ('[mq]: %s', 'imported patch %s'): | |
|
642 | if ctx.description() == fmt % patch: | |
|
643 | msg = _('patch %s finalized without changeset message\n') | |
|
644 | repo.ui.status(msg % patch) | |
|
645 | break | |
|
646 | ||
|
637 | 647 | patches.append(self.applied[appliedbase].name) |
|
638 | 648 | appliedbase += 1 |
|
639 | 649 |
@@ -32,11 +32,14 b" abort: unknown revision 'c'!" | |||
|
32 | 32 | applying c |
|
33 | 33 | patch c is empty |
|
34 | 34 | now at: c |
|
35 | patch a finalized without changeset message | |
|
36 | patch b finalized without changeset message | |
|
35 | 37 | c |
|
36 | 38 | 3 imported patch c |
|
37 | 39 | 2 [mq]: b |
|
38 | 40 | 1 [mq]: a |
|
39 | 41 | 0 base |
|
42 | patch c finalized without changeset message | |
|
40 | 43 | 3 imported patch c |
|
41 | 44 | 2 [mq]: b |
|
42 | 45 | 1 [mq]: a |
General Comments 0
You need to be logged in to leave comments.
Login now