Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
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
authorYuya Nishihara <yuya@tcha.org>
Tue, 10 Jul 2018 23:01:53 +0900
changeset 38704 607e2a2501e6
parent 38703 b93dc48e74ad
child 38705 e4b270a32ba8
revset: clarify heads() order doesn't matter while computing common ancestors Follows up 5460926352ee and 52f19a840543.
mercurial/revset.py file | annotate | diff | comparison | revisions 
--- 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
Mercurial