| indygreg | |
| lothiraldan |
| hg-reviewers |
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/revlog.py (10 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| c.append(self.node(r)) | c.append(self.node(r)) | ||||
| elif p == nullrev: | elif p == nullrev: | ||||
| c.append(self.node(r)) | c.append(self.node(r)) | ||||
| return c | return c | ||||
| def descendant(self, start, end): | def descendant(self, start, end): | ||||
| """True if revision 'end' is an descendant of revision 'start' | """True if revision 'end' is an descendant of revision 'start' | ||||
| A revision is considered as a descendant of itself.""" | A revision is considered as a descendant of itself. | ||||
| The implementation of this is trivial but the use of | |||||
| commonancestorsheads is not.""" | |||||
| if start == nullrev: | if start == nullrev: | ||||
| return True | return True | ||||
| elif start == end: | elif start == end: | ||||
| return True | return True | ||||
| return start in self._commonancestorsheads(start, end) | return start in self._commonancestorsheads(start, end) | ||||
| def commonancestorsheads(self, a, b): | def commonancestorsheads(self, a, b): | ||||
| """calculate all the heads of the common ancestors of nodes a and b""" | """calculate all the heads of the common ancestors of nodes a and b""" | ||||
| a, b = self.rev(a), self.rev(b) | a, b = self.rev(a), self.rev(b) | ||||
| ancs = self._commonancestorsheads(a, b) | ancs = self._commonancestorsheads(a, b) | ||||
| return pycompat.maplist(self.node, ancs) | return pycompat.maplist(self.node, ancs) | ||||
| def _commonancestorsheads(self, *revs): | def _commonancestorsheads(self, *revs): | ||||
| """calculate all the heads of the common ancestors of revs""" | """calculate all the heads of the common ancestors of revs""" | ||||
| try: | try: | ||||
| ancs = self.index.commonancestorsheads(*revs) | ancs = self.index.commonancestorsheads(*revs) | ||||
| except (AttributeError, OverflowError): # C implementation failed | except (AttributeError, OverflowError): # C implementation failed | ||||
| ancs = ancestor.commonancestorsheads(self.parentrevs, *revs) | ancs = ancestor.commonancestorsheads(self.parentrevs, *revs) | ||||
| return ancs | return ancs | ||||
| def isancestor(self, a, b): | def isancestor(self, a, b): | ||||
| """return True if node a is an ancestor of node b | """return True if node a is an ancestor of node b""" | ||||
| The implementation of this is trivial but the use of | |||||
| commonancestorsheads is not.""" | |||||
| a, b = self.rev(a), self.rev(b) | a, b = self.rev(a), self.rev(b) | ||||
| return self.descendant(a, b) | return self.descendant(a, b) | ||||
| def ancestor(self, a, b): | def ancestor(self, a, b): | ||||
| """calculate the "best" common ancestor of nodes a and b""" | """calculate the "best" common ancestor of nodes a and b""" | ||||
| a, b = self.rev(a), self.rev(b) | a, b = self.rev(a), self.rev(b) | ||||
| try: | try: | ||||