| Alphare |
| hg-reviewers |
Since filelog objects 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/filelog.py (12 lines) | |||
| M | mercurial/unionrepo.py (2 lines) |
| class bundlefilelog(filelog.filelog): | class bundlefilelog(filelog.filelog): | ||||
| def __init__(self, opener, path, cgunpacker, linkmapper): | def __init__(self, opener, path, cgunpacker, linkmapper): | ||||
| filelog.filelog.__init__(self, opener, path) | filelog.filelog.__init__(self, opener, path) | ||||
| self._revlog = bundlerevlog( | self._revlog = bundlerevlog( | ||||
| opener, | opener, | ||||
| # XXX should use the unencoded path | # XXX should use the unencoded path | ||||
| target=(revlog_constants.KIND_FILELOG, path), | target=(revlog_constants.KIND_FILELOG, path), | ||||
| indexfile=self.indexfile, | indexfile=self._revlog.indexfile, | ||||
| cgunpacker=cgunpacker, | cgunpacker=cgunpacker, | ||||
| linkmapper=linkmapper, | linkmapper=linkmapper, | ||||
| ) | ) | ||||
| class bundlepeer(localrepo.localpeer): | class bundlepeer(localrepo.localpeer): | ||||
| def canpush(self): | def canpush(self): | ||||
| return False | return False | ||||
| return self._revlog.storageinfo( | return self._revlog.storageinfo( | ||||
| exclusivefiles=exclusivefiles, | exclusivefiles=exclusivefiles, | ||||
| sharedfiles=sharedfiles, | sharedfiles=sharedfiles, | ||||
| revisionscount=revisionscount, | revisionscount=revisionscount, | ||||
| trackedsize=trackedsize, | trackedsize=trackedsize, | ||||
| storedsize=storedsize, | storedsize=storedsize, | ||||
| ) | ) | ||||
| # TODO these aren't part of the interface and aren't internal methods. | |||||
| # Callers should be fixed to not use them. | |||||
| # Used by bundlefilelog, unionfilelog. | |||||
| @property | |||||
| def indexfile(self): | |||||
| return self._revlog.indexfile | |||||
| @indexfile.setter | |||||
| def indexfile(self, value): | |||||
| self._revlog.indexfile = value | |||||
| # Used by repo upgrade. | # Used by repo upgrade. | ||||
| def clone(self, tr, destrevlog, **kwargs): | def clone(self, tr, destrevlog, **kwargs): | ||||
| if not isinstance(destrevlog, filelog): | if not isinstance(destrevlog, filelog): | ||||
| raise error.ProgrammingError(b'expected filelog to clone()') | raise error.ProgrammingError(b'expected filelog to clone()') | ||||
| return self._revlog.clone(tr, destrevlog._revlog, **kwargs) | return self._revlog.clone(tr, destrevlog._revlog, **kwargs) | ||||
| ) | ) | ||||
| 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( | ||||
| opener, self.indexfile, filelog2._revlog, linkmapper | opener, self._revlog.indexfile, filelog2._revlog, linkmapper | ||||
| ) | ) | ||||
| self._repo = repo | self._repo = repo | ||||
| self.repotiprev = self._revlog.repotiprev | self.repotiprev = self._revlog.repotiprev | ||||
| self.revlog2 = self._revlog.revlog2 | self.revlog2 = self._revlog.revlog2 | ||||
| def iscensored(self, rev): | def iscensored(self, rev): | ||||
| """Check if a revision is censored.""" | """Check if a revision is censored.""" | ||||
| if rev <= self.repotiprev: | if rev <= self.repotiprev: | ||||