Mercurial > public > mercurial-scm > hg

diff mercurial/revset.py @ 38704:607e2a2501e6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revset: clarify heads() order doesn't matter while computing common ancestors Follows up 5460926352ee and 52f19a840543.
author Yuya Nishihara <yuya@tcha.org>
date Tue, 10 Jul 2018 23:01:53 +0900
parents 52f19a840543
children e4b270a32ba8
line wrap: on
line diff
--- a/mercurial/revset.py	Sat Jul 14 10:51:52 2018 +0900
+++ b/mercurial/revset.py	Tue Jul 10 23:01:53 2018 +0900
@@ -616,7 +616,7 @@
 
     # 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 @@
 
     """
     # 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