Show More
@@ -614,11 +614,11 b' def _commonancestorheads(repo, subset, x' | |||||
614 | # This is an internal method is for quickly calculating "heads(::x and |
|
614 | # This is an internal method is for quickly calculating "heads(::x and | |
615 | # ::y)" |
|
615 | # ::y)" | |
616 |
|
616 | |||
617 | # These greatest common ancestors are the same ones that the consesus bid |
|
617 | # These greatest common ancestors are the same ones that the consensus bid | |
618 | # merge will find. |
|
618 | # merge will find. | |
619 |
|
|
619 | startrevs = getset(repo, fullreposet(repo), x, order=anyorder) | |
620 |
|
620 | |||
621 |
ancs = repo.changelog._commonancestorsheads(*list( |
|
621 | ancs = repo.changelog._commonancestorsheads(*list(startrevs)) | |
622 | return subset & baseset(ancs) |
|
622 | return subset & baseset(ancs) | |
623 |
|
623 | |||
624 | @predicate('commonancestors(set)', safe=True) |
|
624 | @predicate('commonancestors(set)', safe=True) |
@@ -1080,7 +1080,7 b' test the specialized implementation of h' | |||||
1080 | $ hg log -T '{rev}\n' -r 'heads(commonancestors(9))' |
|
1080 | $ hg log -T '{rev}\n' -r 'heads(commonancestors(9))' | |
1081 | 9 |
|
1081 | 9 | |
1082 | $ hg log -T '{rev}\n' -r 'heads(commonancestors(8 + 9))' |
|
1082 | $ hg log -T '{rev}\n' -r 'heads(commonancestors(8 + 9))' | |
1083 |
|
|
1083 | 8 | |
1084 |
|
1084 | |||
1085 | test ancestor variants of empty revision |
|
1085 | test ancestor variants of empty revision | |
1086 |
|
1086 |
General Comments 0
You need to be logged in to leave comments.
Login now