changeset 47147:8a1a51d31e85

filelog: drop `indexfile` from `filelog` 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. Differential Revision: https://phab.mercurial-scm.org/D10573
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Mon, 03 May 2021 12:22:06 +0200
parents bc7d465ea11e
children a07d5cb03a85
files mercurial/bundlerepo.py mercurial/filelog.py mercurial/unionrepo.py
diffstat 3 files changed, 2 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/bundlerepo.py	Mon May 03 12:21:56 2021 +0200
+++ b/mercurial/bundlerepo.py	Mon May 03 12:22:06 2021 +0200
@@ -233,7 +233,7 @@
             opener,
             # XXX should use the unencoded path
             target=(revlog_constants.KIND_FILELOG, path),
-            indexfile=self.indexfile,
+            indexfile=self._revlog.indexfile,
             cgunpacker=cgunpacker,
             linkmapper=linkmapper,
         )
--- a/mercurial/filelog.py	Mon May 03 12:21:56 2021 +0200
+++ b/mercurial/filelog.py	Mon May 03 12:22:06 2021 +0200
@@ -228,18 +228,6 @@
             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):
--- a/mercurial/unionrepo.py	Mon May 03 12:21:56 2021 +0200
+++ b/mercurial/unionrepo.py	Mon May 03 12:22:06 2021 +0200
@@ -183,7 +183,7 @@
         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