equal
deleted
inserted
replaced
1532 def ancestor(self, c2): |
1532 def ancestor(self, c2): |
1533 """return the "best" ancestor context of self and c2""" |
1533 """return the "best" ancestor context of self and c2""" |
1534 return self._parents[0].ancestor(c2) # punt on two parents for now |
1534 return self._parents[0].ancestor(c2) # punt on two parents for now |
1535 |
1535 |
1536 def ancestors(self): |
1536 def ancestors(self): |
1537 for p in self._parents: |
1537 yield from self._parents |
1538 yield p |
|
1539 for a in self._repo.changelog.ancestors( |
1538 for a in self._repo.changelog.ancestors( |
1540 [p.rev() for p in self._parents] |
1539 [p.rev() for p in self._parents] |
1541 ): |
1540 ): |
1542 yield self._repo[a] |
1541 yield self._repo[a] |
1543 |
1542 |