Mercurial > hg-stable
changeset 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 | 9454e40e047b |
| children | 67872e939945 |
| files | hgext/histedit.py |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/histedit.py Tue Dec 04 14:58:19 2012 +0100 +++ b/hgext/histedit.py Mon Dec 24 12:00:08 2012 +0100 @@ -594,7 +594,7 @@ ctxs = list(repo.set('%n::%n', old, new)) if ctxs and not keep: if (not obsolete._enabled and - repo.revs('(%ld::) - (%ld + hidden())', ctxs, ctxs)): + repo.revs('(%ld::) - (%ld)', ctxs, ctxs)): raise util.Abort(_('cannot edit history that would orphan nodes')) root = ctxs[0] # list is already sorted by repo.set if not root.phase():