# HG changeset patch # User Mads Kiilerich # Date 1397757695 -7200 # Node ID 40ace21cb3a1716c8c686874dcbca47a53a84964 # Parent 628c16489d1cec98f0f43a784375ff4fefb0dc52 revlog: introduce commonancestorsheads method Very similar to commonancestors but giving all the common ancestors heads. diff -r 628c16489d1c -r 40ace21cb3a1 mercurial/revlog.py --- a/mercurial/revlog.py Thu Apr 17 19:58:08 2014 +0200 +++ b/mercurial/revlog.py Thu Apr 17 20:01:35 2014 +0200 @@ -734,6 +734,15 @@ break return False + def commonancestorsheads(self, a, b): + """calculate all the heads of the common ancestors of nodes a and b""" + a, b = self.rev(a), self.rev(b) + try: + ancs = self.index.commonancestorsheads(a, b) + except (AttributeError, OverflowError): # C implementation failed + ancs = ancestor.commonancestorsheads(self.parentrevs, a, b) + return map(self.node, ancs) + def commonancestors(self, a, b): """calculate the least common ancestors of nodes a and b""" a, b = self.rev(a), self.rev(b)