comparison hgext/remotefilelog/contentstore.py @ 47135:1352cc14cce2

revlog: explicitely pass the "indexfile" parameter 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. Differential Revision: https://phab.mercurial-scm.org/D10561
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Mon, 03 May 2021 12:19:05 +0200
parents d55b71393907
children 8d3c2f9d4af7
comparison
equal deleted inserted replaced
47134:1b33e38d4b6d 47135:1352cc14cce2
279 class manifestrevlogstore(object): 279 class manifestrevlogstore(object):
280 def __init__(self, repo): 280 def __init__(self, repo):
281 self._store = repo.store 281 self._store = repo.store
282 self._svfs = repo.svfs 282 self._svfs = repo.svfs
283 self._revlogs = dict() 283 self._revlogs = dict()
284 self._cl = revlog.revlog(self._svfs, b'00changelog.i') 284 self._cl = revlog.revlog(self._svfs, indexfile=b'00changelog.i')
285 self._repackstartlinkrev = 0 285 self._repackstartlinkrev = 0
286 286
287 def get(self, name, node): 287 def get(self, name, node):
288 return self._revlog(name).rawdata(node) 288 return self._revlog(name).rawdata(node)
289 289
342 rl = self._revlogs.get(name) 342 rl = self._revlogs.get(name)
343 if rl is None: 343 if rl is None:
344 revlogname = b'00manifesttree.i' 344 revlogname = b'00manifesttree.i'
345 if name != b'': 345 if name != b'':
346 revlogname = b'meta/%s/00manifest.i' % name 346 revlogname = b'meta/%s/00manifest.i' % name
347 rl = revlog.revlog(self._svfs, revlogname) 347 rl = revlog.revlog(self._svfs, indexfile=revlogname)
348 self._revlogs[name] = rl 348 self._revlogs[name] = rl
349 return rl 349 return rl
350 350
351 def getmissing(self, keys): 351 def getmissing(self, keys):
352 missing = [] 352 missing = []
363 363
364 def markledger(self, ledger, options=None): 364 def markledger(self, ledger, options=None):
365 if options and options.get(constants.OPTION_PACKSONLY): 365 if options and options.get(constants.OPTION_PACKSONLY):
366 return 366 return
367 treename = b'' 367 treename = b''
368 rl = revlog.revlog(self._svfs, b'00manifesttree.i') 368 rl = revlog.revlog(self._svfs, indexfile=b'00manifesttree.i')
369 startlinkrev = self._repackstartlinkrev 369 startlinkrev = self._repackstartlinkrev
370 endlinkrev = self._repackendlinkrev 370 endlinkrev = self._repackendlinkrev
371 for rev in pycompat.xrange(len(rl) - 1, -1, -1): 371 for rev in pycompat.xrange(len(rl) - 1, -1, -1):
372 linkrev = rl.linkrev(rev) 372 linkrev = rl.linkrev(rev)
373 if linkrev < startlinkrev: 373 if linkrev < startlinkrev:
382 if path[:5] != b'meta/' or path[-2:] != b'.i': 382 if path[:5] != b'meta/' or path[-2:] != b'.i':
383 continue 383 continue
384 384
385 treename = path[5 : -len(b'/00manifest.i')] 385 treename = path[5 : -len(b'/00manifest.i')]
386 386
387 rl = revlog.revlog(self._svfs, path) 387 rl = revlog.revlog(self._svfs, indexfile=path)
388 for rev in pycompat.xrange(len(rl) - 1, -1, -1): 388 for rev in pycompat.xrange(len(rl) - 1, -1, -1):
389 linkrev = rl.linkrev(rev) 389 linkrev = rl.linkrev(rev)
390 if linkrev < startlinkrev: 390 if linkrev < startlinkrev:
391 break 391 break
392 if linkrev > endlinkrev: 392 if linkrev > endlinkrev: