mercurial-scm/hg: mercurial/revlog.py comparison

comparison mercurial/revlog.py @ 47036:5e64c93d5f94

revlog: remove the revlogio class The class only contains a single `parseindex` method. Lets just make it a function and remove the `revlogio` class. It served us well but became thinner and thinner overtime. Differential Revision: https://phab.mercurial-scm.org/D10509

author	Pierre-Yves David <pierre-yves.david@octobus.net>
date	Sat, 01 May 2021 14:47:39 +0200
parents	0d8ff1f4ab0c
children	d57386e5c80e

comparison

equal deleted inserted replaced

-:4f2b5f9d8cc4
+:5e64c93d5f94
 from .pycompat import getattr
 from .revlogutils.constants import (
 FLAG_GENERALDELTA,
 FLAG_INLINE_DATA,
 INDEX_ENTRY_V0,
-INDEX_ENTRY_V1,
-INDEX_ENTRY_V2,
 INDEX_HEADER,
 REVLOGV0,
 REVLOGV1,
 REVLOGV1_FLAGS,
 REVLOGV2,
 entry[7],
 )
 return INDEX_ENTRY_V0.pack(*e2)
-class revlogoldio(object):
+def parse_index_v0(data, inline):
-def parseindex(self, data, inline):
+s = INDEX_ENTRY_V0.size
-s = INDEX_ENTRY_V0.size
+index = []
-index = []
+nodemap = nodemaputil.NodeMap({sha1nodeconstants.nullid: nullrev})
-nodemap = nodemaputil.NodeMap({sha1nodeconstants.nullid: nullrev})
+n = off = 0
-n = off = 0
+l = len(data)
-l = len(data)
+while off + s <= l:
-while off + s <= l:
+cur = data[off : off + s]
-cur = data[off : off + s]
+off += s
-off += s
+e = INDEX_ENTRY_V0.unpack(cur)
-e = INDEX_ENTRY_V0.unpack(cur)
+# transform to revlogv1 format
-# transform to revlogv1 format
+e2 = (
-e2 = (
+offset_type(e[0], 0),
-offset_type(e[0], 0),
+e[1],
-e[1],
+-1,
--1,
+e[2],
-e[2],
+e[3],
-e[3],
+nodemap.get(e[4], nullrev),
-nodemap.get(e[4], nullrev),
+nodemap.get(e[5], nullrev),
-nodemap.get(e[5], nullrev),
+e[6],
-e[6],
+)
-)
+index.append(e2)
-index.append(e2)
+nodemap[e[6]] = n
-nodemap[e[6]] = n
+n += 1
-n += 1
+index = revlogoldindex(index)
-index = revlogoldindex(index)
+return index, None
-return index, None
+def parse_index_v1(data, inline):
+# call the C implementation to parse the index data
+index, cache = parsers.parse_index2(data, inline)
+return index, cache
+def parse_index_v2(data, inline):
+# call the C implementation to parse the index data
+index, cache = parsers.parse_index2(data, inline, revlogv2=True)
+return index, cache
+if util.safehasattr(parsers, 'parse_index_devel_nodemap'):
+def parse_index_v1_nodemap(data, inline):
+index, cache = parsers.parse_index_devel_nodemap(data, inline)
+return index, cache
+else:
+parse_index_v1_nodemap = None
+def parse_index_v1_mixed(data, inline):
+index, cache = parse_index_v1(data, inline)
+return rustrevlog.MixedIndex(index), cache
 # corresponds to uncompressed length of indexformatng (2 gigs, 4-byte
 # signed integer)
 _maxentrysize = 0x7FFFFFFF
-class revlogio(object):
-def parseindex(self, data, inline):
-# call the C implementation to parse the index data
-index, cache = parsers.parse_index2(data, inline)
-return index, cache
-class revlogv2io(object):
-def parseindex(self, data, inline):
-index, cache = parsers.parse_index2(data, inline, revlogv2=True)
-return index, cache
-NodemapRevlogIO = None
-if util.safehasattr(parsers, 'parse_index_devel_nodemap'):
-class NodemapRevlogIO(revlogio):
-"""A debug oriented IO class that return a PersistentNodeMapIndexObject
-The PersistentNodeMapIndexObject object is meant to test the persistent nodemap feature.
-"""
-def parseindex(self, data, inline):
-index, cache = parsers.parse_index_devel_nodemap(data, inline)
-return index, cache
-class rustrevlogio(revlogio):
-def parseindex(self, data, inline):
-index, cache = super(rustrevlogio, self).parseindex(data, inline)
-return rustrevlog.MixedIndex(index), cache
 class revlog(object):
 """
 the underlying revision storage object
 self._storedeltachains = True
 devel_nodemap = (
 self.nodemap_file
 and opts.get(b'devel-force-nodemap', False)
-and NodemapRevlogIO is not None
+and parse_index_v1_nodemap is not None
 )
 use_rust_index = False
 if rustrevlog is not None:
 if self.nodemap_file is not None:
 use_rust_index = True
 else:
 use_rust_index = self.opener.options.get(b'rust.index')
-self._io = revlogio()
+self._parse_index = parse_index_v1
 if self.version == REVLOGV0:
-self._io = revlogoldio()
+self._parse_index = parse_index_v0
 elif fmt == REVLOGV2:
-self._io = revlogv2io()
+self._parse_index = parse_index_v2
 elif devel_nodemap:
-self._io = NodemapRevlogIO()
+self._parse_index = parse_index_v1_nodemap
 elif use_rust_index:
-self._io = rustrevlogio()
+self._parse_index = parse_index_v1_mixed
 try:
-d = self._io.parseindex(indexdata, self._inline)
+d = self._parse_index(indexdata, self._inline)
 index, _chunkcache = d
 use_nodemap = (
 not self._inline
 and self.nodemap_file is not None
 and util.safehasattr(index, 'update_nodemap_data')
 trindex = r
 with self._indexfp(b'w') as fp:
 self.version &= ~FLAG_INLINE_DATA
 self._inline = False
-io = self._io
 for i in self:
 e = self.index.entry_binary(i, self.version)
 fp.write(e)
 # the temp file replace the real index when we exit the context
 # This is a bit dangerous. We could easily have a mismatch of state.
 newrl = revlog(self.opener, newindexfile, newdatafile, censorable=True)
 newrl.version = self.version
 newrl._generaldelta = self._generaldelta
-newrl._io = self._io
+newrl._parse_index = self._parse_index
 for rev in self.revs():
 node = self.node(rev)
 p1, p2 = self.parents(node)

Mercurial > public > mercurial-scm > hg

comparison mercurial/revlog.py @ 47036:5e64c93d5f94