Mercurial > hg-stable
comparison hgext/histedit.py @ 18270:48deb483a8f8
clfilter: drop unnecessary explicit filtering on histedit
Hidden changeset filtering is now done at repo level. The orphaned
children computation will not include any (unless you add --hidden).
author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
---|---|
date | Mon, 24 Dec 2012 12:00:08 +0100 |
parents | 0f5a0a2073a8 |
children | 2eae2f9e85ef |
comparison
equal
deleted
inserted
replaced
18269:9454e40e047b | 18270:48deb483a8f8 |
---|---|
592 | 592 |
593 When keep is false, the specified set can't have children.""" | 593 When keep is false, the specified set can't have children.""" |
594 ctxs = list(repo.set('%n::%n', old, new)) | 594 ctxs = list(repo.set('%n::%n', old, new)) |
595 if ctxs and not keep: | 595 if ctxs and not keep: |
596 if (not obsolete._enabled and | 596 if (not obsolete._enabled and |
597 repo.revs('(%ld::) - (%ld + hidden())', ctxs, ctxs)): | 597 repo.revs('(%ld::) - (%ld)', ctxs, ctxs)): |
598 raise util.Abort(_('cannot edit history that would orphan nodes')) | 598 raise util.Abort(_('cannot edit history that would orphan nodes')) |
599 root = ctxs[0] # list is already sorted by repo.set | 599 root = ctxs[0] # list is already sorted by repo.set |
600 if not root.phase(): | 600 if not root.phase(): |
601 raise util.Abort(_('cannot edit immutable changeset: %s') % root) | 601 raise util.Abort(_('cannot edit immutable changeset: %s') % root) |
602 return [c.node() for c in ctxs] | 602 return [c.node() for c in ctxs] |