| indygreg |
| hg-reviewers |
As agreed on by Boris, Yuya, and me on D3929.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/context.py (2 lines) | |||
| M | mercurial/revlog.py (28 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| (short(anc), short(self._node), short(n2))) + | (short(anc), short(self._node), short(n2))) + | ||||
| ''.join(_(" alternatively, use --config " | ''.join(_(" alternatively, use --config " | ||||
| "merge.preferancestor=%s\n") % | "merge.preferancestor=%s\n") % | ||||
| short(n) for n in sorted(cahs) if n != anc)) | short(n) for n in sorted(cahs) if n != anc)) | ||||
| return changectx(self._repo, anc) | return changectx(self._repo, anc) | ||||
| def descendant(self, other): | def descendant(self, other): | ||||
| """True if other is descendant of this changeset""" | """True if other is descendant of this changeset""" | ||||
| return self._repo.changelog.isdescendantrev(other._rev, self._rev) | return self._repo.changelog.isancestorrev(self._rev, other._rev) | ||||
| def walk(self, match): | def walk(self, match): | ||||
| '''Generates matching file names.''' | '''Generates matching file names.''' | ||||
| # Wrap match.bad method to have message with nodeid | # Wrap match.bad method to have message with nodeid | ||||
| def bad(fn, msg): | def bad(fn, msg): | ||||
| # The manifest doesn't know about subrepos, so don't complain about | # The manifest doesn't know about subrepos, so don't complain about | ||||
| # paths into valid subrepos. | # paths into valid subrepos. | ||||
| if prevs: | if prevs: | ||||
| for pr in prevs: | for pr in prevs: | ||||
| if pr == p: | if pr == p: | ||||
| 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 isdescendantrev(self, a, b): | |||||
| """True if revision a is a descendant of revision b | |||||
| A revision is considered a descendant of itself. | |||||
| The implementation of this is trivial but the use of | |||||
| commonancestorsheads is not.""" | |||||
| if b == nullrev: | |||||
| return True | |||||
| elif a == b: | |||||
| return True | |||||
| elif a < b: | |||||
| return False | |||||
| return b in self._commonancestorsheads(a, b) | |||||
| 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 | ||||
| A revision is considered an ancestor of itself.""" | A revision is considered an ancestor of itself.""" | ||||
| a, b = self.rev(a), self.rev(b) | a, b = self.rev(a), self.rev(b) | ||||
| return self.isancestorrev(a, b) | return self.isancestorrev(a, b) | ||||
| def isancestorrev(self, a, b): | def isancestorrev(self, a, b): | ||||
| """return True if revision a is an ancestor of revision b | """return True if revision a is an ancestor of revision b | ||||
| A revision is considered an ancestor of itself.""" | A revision is considered an ancestor of itself. | ||||
| return self.isdescendantrev(b, a) | |||||
| The implementation of this is trivial but the use of | |||||
| commonancestorsheads is not.""" | |||||
| if a == nullrev: | |||||
| return True | |||||
| elif a == b: | |||||
| return True | |||||
| elif a > b: | |||||
| return False | |||||
| return a in self._commonancestorsheads(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: | ||||
| ancs = self.index.ancestors(a, b) | ancs = self.index.ancestors(a, b) | ||||
| except (AttributeError, OverflowError): | except (AttributeError, OverflowError): | ||||