##// END OF EJS Templates
manifest: drop the `indexfile` from `manifestrevlog`...
marmoute -
r47917:bc7d465e default
parent child Browse files
Show More
@@ -201,7 +201,7 b' class bundlemanifest(bundlerevlog, manif'
201 self,
201 self,
202 opener,
202 opener,
203 (revlog_constants.KIND_MANIFESTLOG, dir),
203 (revlog_constants.KIND_MANIFESTLOG, dir),
204 self.indexfile,
204 self._revlog.indexfile,
205 cgunpacker,
205 cgunpacker,
206 linkmapper,
206 linkmapper,
207 )
207 )
@@ -803,9 +803,15 b' def _resolvenarrowrevisioninfo('
803 return i
803 return i
804 # We failed to resolve a parent for this node, so
804 # We failed to resolve a parent for this node, so
805 # we crash the changegroup construction.
805 # we crash the changegroup construction.
806 if util.safehasattr(store, 'target'):
807 target = store.indexfile
808 else:
809 # some revlog not actually a revlog
810 target = store._revlog.indexfile
811
806 raise error.Abort(
812 raise error.Abort(
807 b"unable to resolve parent while packing '%s' %r"
813 b"unable to resolve parent while packing '%s' %r"
808 b' for changeset %r' % (store.indexfile, rev, clrev)
814 b' for changeset %r' % (target, rev, clrev)
809 )
815 )
810
816
811 return nullrev
817 return nullrev
@@ -1167,13 +1167,6 b' class imanifeststorage(interfaceutil.Int'
1167 """An ``ifilerevisionssequence`` instance."""
1167 """An ``ifilerevisionssequence`` instance."""
1168 )
1168 )
1169
1169
1170 indexfile = interfaceutil.Attribute(
1171 """Path of revlog index file.
1172
1173 TODO this is revlog specific and should not be exposed.
1174 """
1175 )
1176
1177 opener = interfaceutil.Attribute(
1170 opener = interfaceutil.Attribute(
1178 """VFS opener to use to access underlying files used for storage.
1171 """VFS opener to use to access underlying files used for storage.
1179
1172
@@ -1907,14 +1907,6 b' class manifestrevlog(object):'
1907 )
1907 )
1908
1908
1909 @property
1909 @property
1910 def indexfile(self):
1911 return self._revlog.indexfile
1912
1913 @indexfile.setter
1914 def indexfile(self, value):
1915 self._revlog.indexfile = value
1916
1917 @property
1918 def opener(self):
1910 def opener(self):
1919 return self._revlog.opener
1911 return self._revlog.opener
1920
1912
@@ -174,7 +174,7 b' class unionmanifest(unionrevlog, manifes'
174 manifest.manifestrevlog.__init__(self, nodeconstants, opener)
174 manifest.manifestrevlog.__init__(self, nodeconstants, opener)
175 manifest2 = manifest.manifestrevlog(nodeconstants, opener2)
175 manifest2 = manifest.manifestrevlog(nodeconstants, opener2)
176 unionrevlog.__init__(
176 unionrevlog.__init__(
177 self, opener, self.indexfile, manifest2, linkmapper
177 self, opener, self._revlog.indexfile, manifest2, linkmapper
178 )
178 )
179
179
180
180
General Comments 0
You need to be logged in to leave comments. Login now