equal
deleted
inserted
replaced
751 The implementation of this is trivial but the use of |
751 The implementation of this is trivial but the use of |
752 commonancestorsheads is not.""" |
752 commonancestorsheads is not.""" |
753 return a in self.commonancestorsheads(a, b) |
753 return a in self.commonancestorsheads(a, b) |
754 |
754 |
755 def ancestor(self, a, b): |
755 def ancestor(self, a, b): |
756 """calculate the least common ancestor of nodes a and b""" |
756 """calculate the "best" common ancestor of nodes a and b""" |
757 |
757 |
758 a, b = self.rev(a), self.rev(b) |
758 a, b = self.rev(a), self.rev(b) |
759 try: |
759 try: |
760 ancs = self.index.ancestors(a, b) |
760 ancs = self.index.ancestors(a, b) |
761 except (AttributeError, OverflowError): |
761 except (AttributeError, OverflowError): |