[PATCH 4 of 4 Series-B] clfilter: drop unnecessary explicit filtering on histedit
pierre-yves.david at logilab.fr
pierre-yves.david at logilab.fr
Tue Jan 8 13:04:28 UTC 2013
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david at logilab.fr>
# Date 1356346808 -3600
# Node ID 0d814a2cbe47ec999289bb7d7bf7d8b2fcaeee29
# Parent a15e5b03cc461fcdfeecd0d360ee747772079b88
clfilter: drop unnecessary explicit filtering on histedit
Hidden changeset filtered is now done a repo level. The orphaned children
computation will not include any (unless you add --hidden of course).
diff --git a/hgext/histedit.py b/hgext/histedit.py
--- a/hgext/histedit.py
+++ b/hgext/histedit.py
@@ -592,11 +592,11 @@ def between(repo, old, new, keep):
When keep is false, the specified set can't have children."""
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():
raise util.Abort(_('cannot edit immutable changeset: %s') % root)
return [c.node() for c in ctxs]
More information about the Mercurial-devel
mailing list