| Alphare |
| hg-reviewers |
Since manifestrevlog object are not revlog (no really, they are not…) we drop
the revlog specific attribute. We need to directly access the underlying revlog
in a couple of place that already assume that we have a revlog here.
This is motivated by future change to that revlog attribute.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/bundlerepo.py (2 lines) | |||
| M | mercurial/changegroup.py (8 lines) | |||
| M | mercurial/interfaces/repository.py (7 lines) | |||
| M | mercurial/manifest.py (8 lines) | |||
| M | mercurial/unionrepo.py (2 lines) |
| dirlogstarts=None, | dirlogstarts=None, | ||||
| dir=b'', | dir=b'', | ||||
| ): | ): | ||||
| manifest.manifestrevlog.__init__(self, nodeconstants, opener, tree=dir) | manifest.manifestrevlog.__init__(self, nodeconstants, opener, tree=dir) | ||||
| bundlerevlog.__init__( | bundlerevlog.__init__( | ||||
| self, | self, | ||||
| opener, | opener, | ||||
| (revlog_constants.KIND_MANIFESTLOG, dir), | (revlog_constants.KIND_MANIFESTLOG, dir), | ||||
| self.indexfile, | self._revlog.indexfile, | ||||
| cgunpacker, | cgunpacker, | ||||
| linkmapper, | linkmapper, | ||||
| ) | ) | ||||
| if dirlogstarts is None: | if dirlogstarts is None: | ||||
| dirlogstarts = {} | dirlogstarts = {} | ||||
| if self.bundle.version == b"03": | if self.bundle.version == b"03": | ||||
| dirlogstarts = _getfilestarts(self.bundle) | dirlogstarts = _getfilestarts(self.bundle) | ||||
| self._dirlogstarts = dirlogstarts | self._dirlogstarts = dirlogstarts | ||||
| # somewhat unsurprised to find a case in the wild | # somewhat unsurprised to find a case in the wild | ||||
| # where this breaks down a bit. That said, I don't | # where this breaks down a bit. That said, I don't | ||||
| # know if it would hurt anything. | # know if it would hurt anything. | ||||
| for i in pycompat.xrange(rev, 0, -1): | for i in pycompat.xrange(rev, 0, -1): | ||||
| if store.linkrev(i) == clrev: | if store.linkrev(i) == clrev: | ||||
| return i | return i | ||||
| # We failed to resolve a parent for this node, so | # We failed to resolve a parent for this node, so | ||||
| # we crash the changegroup construction. | # we crash the changegroup construction. | ||||
| if util.safehasattr(store, 'target'): | |||||
| target = store.indexfile | |||||
| else: | |||||
| # some revlog not actually a revlog | |||||
| target = store._revlog.indexfile | |||||
| raise error.Abort( | raise error.Abort( | ||||
| b"unable to resolve parent while packing '%s' %r" | b"unable to resolve parent while packing '%s' %r" | ||||
| b' for changeset %r' % (store.indexfile, rev, clrev) | b' for changeset %r' % (target, rev, clrev) | ||||
| ) | ) | ||||
| return nullrev | return nullrev | ||||
| if not linkparents or (store.parentrevs(rev) == (nullrev, nullrev)): | if not linkparents or (store.parentrevs(rev) == (nullrev, nullrev)): | ||||
| p1, p2 = nullrev, nullrev | p1, p2 = nullrev, nullrev | ||||
| elif len(linkparents) == 1: | elif len(linkparents) == 1: | ||||
| (p1,) = sorted(local(p) for p in linkparents) | (p1,) = sorted(local(p) for p in linkparents) | ||||
| The empty bytestring represents the root manifest. | The empty bytestring represents the root manifest. | ||||
| """ | """ | ||||
| ) | ) | ||||
| index = interfaceutil.Attribute( | index = interfaceutil.Attribute( | ||||
| """An ``ifilerevisionssequence`` instance.""" | """An ``ifilerevisionssequence`` instance.""" | ||||
| ) | ) | ||||
| indexfile = interfaceutil.Attribute( | |||||
| """Path of revlog index file. | |||||
| TODO this is revlog specific and should not be exposed. | |||||
| """ | |||||
| ) | |||||
| opener = interfaceutil.Attribute( | opener = interfaceutil.Attribute( | ||||
| """VFS opener to use to access underlying files used for storage. | """VFS opener to use to access underlying files used for storage. | ||||
| TODO this is revlog specific and should not be exposed. | TODO this is revlog specific and should not be exposed. | ||||
| """ | """ | ||||
| ) | ) | ||||
| _generaldelta = interfaceutil.Attribute( | _generaldelta = interfaceutil.Attribute( | ||||
| exclusivefiles=exclusivefiles, | exclusivefiles=exclusivefiles, | ||||
| sharedfiles=sharedfiles, | sharedfiles=sharedfiles, | ||||
| revisionscount=revisionscount, | revisionscount=revisionscount, | ||||
| trackedsize=trackedsize, | trackedsize=trackedsize, | ||||
| storedsize=storedsize, | storedsize=storedsize, | ||||
| ) | ) | ||||
| @property | @property | ||||
| def indexfile(self): | |||||
| return self._revlog.indexfile | |||||
| @indexfile.setter | |||||
| def indexfile(self, value): | |||||
| self._revlog.indexfile = value | |||||
| @property | |||||
| def opener(self): | def opener(self): | ||||
| return self._revlog.opener | return self._revlog.opener | ||||
| @opener.setter | @opener.setter | ||||
| def opener(self, value): | def opener(self, value): | ||||
| self._revlog.opener = value | self._revlog.opener = value | ||||
| ) | ) | ||||
| class unionmanifest(unionrevlog, manifest.manifestrevlog): | class unionmanifest(unionrevlog, manifest.manifestrevlog): | ||||
| def __init__(self, nodeconstants, opener, opener2, linkmapper): | def __init__(self, nodeconstants, opener, opener2, linkmapper): | ||||
| manifest.manifestrevlog.__init__(self, nodeconstants, opener) | manifest.manifestrevlog.__init__(self, nodeconstants, opener) | ||||
| manifest2 = manifest.manifestrevlog(nodeconstants, opener2) | manifest2 = manifest.manifestrevlog(nodeconstants, opener2) | ||||
| unionrevlog.__init__( | unionrevlog.__init__( | ||||
| self, opener, self.indexfile, manifest2, linkmapper | self, opener, self._revlog.indexfile, manifest2, linkmapper | ||||
| ) | ) | ||||
| class unionfilelog(filelog.filelog): | class unionfilelog(filelog.filelog): | ||||
| def __init__(self, opener, path, opener2, linkmapper, repo): | def __init__(self, opener, path, opener2, linkmapper, repo): | ||||
| filelog.filelog.__init__(self, opener, path) | filelog.filelog.__init__(self, opener, path) | ||||
| filelog2 = filelog.filelog(opener2, path) | filelog2 = filelog.filelog(opener2, path) | ||||
| self._revlog = unionrevlog( | self._revlog = unionrevlog( | ||||