Mercurial > public > mercurial-scm > hg
diff mercurial/revset.py @ 39805:823f34acfd46 stable
revset: make heads(commonancestors(x + x^)) be x^, not x
Differential Revision: https://phab.mercurial-scm.org/D4742
| author | Valentin Gatien-Baron <vgatien-baron@janestreet.com> |
|---|---|
| date | Tue, 25 Sep 2018 16:32:38 -0400 |
| parents | 0561e69ed9f1 |
| children | 85a474adaf26 |
line wrap: on
line diff
--- a/mercurial/revset.py Tue Sep 25 16:29:39 2018 -0400 +++ b/mercurial/revset.py Tue Sep 25 16:32:38 2018 -0400 @@ -614,11 +614,11 @@ # This is an internal method is for quickly calculating "heads(::x and # ::y)" - # These greatest common ancestors are the same ones that the consesus bid + # These greatest common ancestors are the same ones that the consensus bid # merge will find. - h = heads(repo, fullreposet(repo), x, anyorder) + startrevs = getset(repo, fullreposet(repo), x, order=anyorder) - ancs = repo.changelog._commonancestorsheads(*list(h)) + ancs = repo.changelog._commonancestorsheads(*list(startrevs)) return subset & baseset(ancs) @predicate('commonancestors(set)', safe=True)