[PATCH] revset: clarify heads() order doesn't matter while computing common ancestors
Yuya Nishihara
yuya at tcha.org
Tue Jul 10 15:04:09 UTC 2018
# HG changeset patch
# User Yuya Nishihara <yuya at tcha.org>
# Date 1531231313 -32400
# Tue Jul 10 23:01:53 2018 +0900
# Node ID cfcd2617ce7319dfda124b20d64dbd9abe7cdf2a
# Parent 24f62ea74586f554c3d7578f00df792e00b55094
revset: clarify heads() order doesn't matter while computing common ancestors
Follows up 5460926352ee and 52f19a840543.
diff --git a/mercurial/revset.py b/mercurial/revset.py
--- a/mercurial/revset.py
+++ b/mercurial/revset.py
@@ -616,7 +616,7 @@ def _commonancestorheads(repo, subset, x
# These greatest common ancestors are the same ones that the consesus bid
# merge will find.
- h = heads(repo, fullreposet(repo), x, defineorder)
+ h = heads(repo, fullreposet(repo), x, anyorder)
ancs = repo.changelog._commonancestorsheads(*list(h))
return subset & baseset(ancs)
@@ -632,7 +632,7 @@ def commonancestors(repo, subset, x):
"""
# only wants the heads of the set passed in
- for r in heads(repo, fullreposet(repo), x, defineorder):
+ for r in heads(repo, fullreposet(repo), x, anyorder):
subset &= dagop.revancestors(repo, baseset([r]))
return subset
More information about the Mercurial-devel
mailing list