equal
deleted
inserted
replaced
709 a, b = self.rev(a), self.rev(b) |
709 a, b = self.rev(a), self.rev(b) |
710 start, end = sorted((a, b)) |
710 start, end = sorted((a, b)) |
711 if self.descendant(start, end): |
711 if self.descendant(start, end): |
712 return self.node(start) |
712 return self.node(start) |
713 |
713 |
714 def parents(rev): |
714 c = ancestor.ancestor(a, b, self.parentrevs) |
715 return [p for p in self.parentrevs(rev) if p != nullrev] |
|
716 |
|
717 c = ancestor.ancestor(a, b, parents) |
|
718 if c is None: |
715 if c is None: |
719 return nullid |
716 return nullid |
720 |
717 |
721 return self.node(c) |
718 return self.node(c) |
722 |
719 |