Show More
@@ -587,14 +587,14 b' def between(repo, old, new, keep):' | |||||
587 | """select and validate the set of revision to edit |
|
587 | """select and validate the set of revision to edit | |
588 |
|
588 | |||
589 | When keep is false, the specified set can't have children.""" |
|
589 | When keep is false, the specified set can't have children.""" | |
590 |
|
|
590 | ctxs = list(repo.set('%n::%n', old, new)) | |
591 | if not keep: |
|
591 | if not keep: | |
592 |
if repo.revs('(%ld::) - (%ld + hidden())', |
|
592 | if repo.revs('(%ld::) - (%ld + hidden())', ctxs, ctxs): | |
593 | raise util.Abort(_('cannot edit history that would orphan nodes')) |
|
593 | raise util.Abort(_('cannot edit history that would orphan nodes')) | |
594 |
root = min( |
|
594 | root = min(ctxs) | |
595 | if not root.phase(): |
|
595 | if not root.phase(): | |
596 | raise util.Abort(_('cannot edit immutable changeset: %s') % root) |
|
596 | raise util.Abort(_('cannot edit immutable changeset: %s') % root) | |
597 |
return [c.node() for c in |
|
597 | return [c.node() for c in ctxs] | |
598 |
|
598 | |||
599 |
|
599 | |||
600 | def writestate(repo, parentnode, rules, keep, topmost, replacements): |
|
600 | def writestate(repo, parentnode, rules, keep, topmost, replacements): |
General Comments 0
You need to be logged in to leave comments.
Login now