Commit 3bef4f1e authored by Pierre-Yves David's avatar Pierre-Yves David 🐙
Browse files

drop indexfile from filelog-not-revlog

parent 26d032f56646
Pipeline #21358 failed with stages
in 30 minutes and 1 second
......@@ -233,7 +233,7 @@ class bundlefilelog(filelog.filelog):
opener,
# XXX should use the unencoded path
target=(revlog_constants.KIND_FILELOG, path),
indexfile=self.indexfile,
indexfile=self._revlog.indexfile,
cgunpacker=cgunpacker,
linkmapper=linkmapper,
)
......
......@@ -228,18 +228,6 @@ class filelog(object):
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.
def clone(self, tr, destrevlog, **kwargs):
if not isinstance(destrevlog, filelog):
......
......@@ -183,7 +183,7 @@ class unionfilelog(filelog.filelog):
filelog.filelog.__init__(self, opener, path)
filelog2 = filelog.filelog(opener2, path)
self._revlog = unionrevlog(
opener, self.indexfile, filelog2._revlog, linkmapper
opener, self._revlog.indexfile, filelog2._revlog, linkmapper
)
self._repo = repo
self.repotiprev = self._revlog.repotiprev
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment