##// END OF EJS Templates
revlog: introduce commonancestorsheads method...
Mads Kiilerich -
r21104:40ace21c default
parent child Browse files
Show More
@@ -734,6 +734,15 b' class revlog(object):'
734 break
734 break
735 return False
735 return False
736
736
737 def commonancestorsheads(self, a, b):
738 """calculate all the heads of the common ancestors of nodes a and b"""
739 a, b = self.rev(a), self.rev(b)
740 try:
741 ancs = self.index.commonancestorsheads(a, b)
742 except (AttributeError, OverflowError): # C implementation failed
743 ancs = ancestor.commonancestorsheads(self.parentrevs, a, b)
744 return map(self.node, ancs)
745
737 def commonancestors(self, a, b):
746 def commonancestors(self, a, b):
738 """calculate the least common ancestors of nodes a and b"""
747 """calculate the least common ancestors of nodes a and b"""
739 a, b = self.rev(a), self.rev(b)
748 a, b = self.rev(a), self.rev(b)
General Comments 0
You need to be logged in to leave comments. Login now