This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10561

revlog: explicitely pass the "indexfile" parameter
ClosedPublic

Authored by marmoute on May 3 2021, 7:46 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG1352cc14cce2: revlog: explicitely pass the "indexfile" parameter
Summary

Most of this was already done when introducing the target parameter, but some
remained. Having "indexfile" passed explicitely will help us to change the way
we address a revlog later in the stack. With the introduction of more generic
docket, the entry point will not necessarly be xxx.i file, and the actual
index files will have a variable name.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

marmoute created this revision.May 3 2021, 7:46 AM
baymax updated this revision to Diff 27476.May 3 2021, 9:43 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

Alphare accepted this revision.May 7 2021, 8:52 AM
This revision is now accepted and ready to land.May 7 2021, 8:52 AM
marmoute added a commit: rHG1352cc14cce2: revlog: explicitely pass the "indexfile" parameter.May 11 2021, 12:38 PM
Closed by commit rHG1352cc14cce2: revlog: explicitely pass the "indexfile" parameter (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 27807

hgext/remotefilelog/contentstore.py

pass pass
class manifestrevlogstore(object): class manifestrevlogstore(object):
def __init__(self, repo): def __init__(self, repo):
self._store = repo.store self._store = repo.store
self._svfs = repo.svfs self._svfs = repo.svfs
self._revlogs = dict() self._revlogs = dict()
self._cl = revlog.revlog(self._svfs, b'00changelog.i') self._cl = revlog.revlog(self._svfs, indexfile=b'00changelog.i')
self._repackstartlinkrev = 0 self._repackstartlinkrev = 0
def get(self, name, node): def get(self, name, node):
return self._revlog(name).rawdata(node) return self._revlog(name).rawdata(node)
def getdelta(self, name, node): def getdelta(self, name, node):
revision = self.get(name, node) revision = self.get(name, node)
return revision, name, self._cl.nullid, self.getmeta(name, node) return revision, name, self._cl.nullid, self.getmeta(name, node)
raise RuntimeError(b"cannot add to a revlog store") raise RuntimeError(b"cannot add to a revlog store")
def _revlog(self, name): def _revlog(self, name):
rl = self._revlogs.get(name) rl = self._revlogs.get(name)
if rl is None: if rl is None:
revlogname = b'00manifesttree.i' revlogname = b'00manifesttree.i'
if name != b'': if name != b'':
revlogname = b'meta/%s/00manifest.i' % name revlogname = b'meta/%s/00manifest.i' % name
rl = revlog.revlog(self._svfs, revlogname) rl = revlog.revlog(self._svfs, indexfile=revlogname)
self._revlogs[name] = rl self._revlogs[name] = rl
return rl return rl
def getmissing(self, keys): def getmissing(self, keys):
missing = [] missing = []
for name, node in keys: for name, node in keys:
mfrevlog = self._revlog(name) mfrevlog = self._revlog(name)
if node not in mfrevlog.nodemap: if node not in mfrevlog.nodemap:
missing.append((name, node)) missing.append((name, node))
return missing return missing
def setrepacklinkrevrange(self, startrev, endrev): def setrepacklinkrevrange(self, startrev, endrev):
self._repackstartlinkrev = startrev self._repackstartlinkrev = startrev
self._repackendlinkrev = endrev self._repackendlinkrev = endrev
def markledger(self, ledger, options=None): def markledger(self, ledger, options=None):
if options and options.get(constants.OPTION_PACKSONLY): if options and options.get(constants.OPTION_PACKSONLY):
return return
treename = b'' treename = b''
rl = revlog.revlog(self._svfs, b'00manifesttree.i') rl = revlog.revlog(self._svfs, indexfile=b'00manifesttree.i')
startlinkrev = self._repackstartlinkrev startlinkrev = self._repackstartlinkrev
endlinkrev = self._repackendlinkrev endlinkrev = self._repackendlinkrev
for rev in pycompat.xrange(len(rl) - 1, -1, -1): for rev in pycompat.xrange(len(rl) - 1, -1, -1):
linkrev = rl.linkrev(rev) linkrev = rl.linkrev(rev)
if linkrev < startlinkrev: if linkrev < startlinkrev:
break break
if linkrev > endlinkrev: if linkrev > endlinkrev:
continue continue
node = rl.node(rev) node = rl.node(rev)
ledger.markdataentry(self, treename, node) ledger.markdataentry(self, treename, node)
ledger.markhistoryentry(self, treename, node) ledger.markhistoryentry(self, treename, node)
for t, path, encoded, size in self._store.datafiles(): for t, path, encoded, size in self._store.datafiles():
if path[:5] != b'meta/' or path[-2:] != b'.i': if path[:5] != b'meta/' or path[-2:] != b'.i':
continue continue
treename = path[5 : -len(b'/00manifest.i')] treename = path[5 : -len(b'/00manifest.i')]
rl = revlog.revlog(self._svfs, path) rl = revlog.revlog(self._svfs, indexfile=path)
for rev in pycompat.xrange(len(rl) - 1, -1, -1): for rev in pycompat.xrange(len(rl) - 1, -1, -1):
linkrev = rl.linkrev(rev) linkrev = rl.linkrev(rev)
if linkrev < startlinkrev: if linkrev < startlinkrev:
break break
if linkrev > endlinkrev: if linkrev > endlinkrev:
continue continue
node = rl.node(rev) node = rl.node(rev)
ledger.markdataentry(self, treename, node) ledger.markdataentry(self, treename, node)
ledger.markhistoryentry(self, treename, node) ledger.markhistoryentry(self, treename, node)
def cleanup(self, ledger): def cleanup(self, ledger):
pass pass