Mercurial > hg
comparison mercurial/bundlerepo.py @ 39763:5ccd791344f3
localrepo: pass root manifest into manifestlog.__init__
Today, localrepository has a method that can be overloaded which
returns an instance of the root manifest storage object. When a
manifestlog is created, it calls this private method and stores
the root manifest object on it.
This "hook" on localrepository isn't part of the documented interface.
It isn't compatible with our desire to make repo storage determined
before the repo object is constructed.
This commit changes manifestlog.__init__ to accept the root
storage object instead of calling into the repo to construct it.
By doing things this way, the repo instance is responsible for
constructing the manifest storage object directly.
This does mean that other derived repo types need to overload
manifestlog(). But they should have been doing this already,
as manifestlog() is typically decorated in a storage-specific way.
e.g. localrepository.manifestlog() is decorated as
@storecache('00manifest.i'). And this assumes that a 00manifest.i
file exists in the store vfs. This condition may not hold for
repository types using non-revlog storage. So it is important
for special repo types to override manifestlog() to remove this
file association.
The code changed in perf is wrong because it isn't compatible with
older Mercurial versions. But I'm pretty sure the code was broken
on older versions before this commit. It only affects `hg perftags`.
I don't care enough to fix that at this time.
.. api::
``manifest.manifestlog.__init__()`` now receives the root manifest
storage instance instead of calling into a private method on
the repo object to obtain it.
Differential Revision: https://phab.mercurial-scm.org/D4641
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Tue, 18 Sep 2018 15:15:24 -0700 |
parents | 335ae4d0a552 |
children | 24e493ec2229 |
comparison
equal
deleted
inserted
replaced
39762:edaa40dc5fe5 | 39763:5ccd791344f3 |
---|---|
362 self._cgunpacker.changelogheader() | 362 self._cgunpacker.changelogheader() |
363 c = bundlechangelog(self.svfs, self._cgunpacker) | 363 c = bundlechangelog(self.svfs, self._cgunpacker) |
364 self.manstart = self._cgunpacker.tell() | 364 self.manstart = self._cgunpacker.tell() |
365 return c | 365 return c |
366 | 366 |
367 def _constructmanifest(self): | 367 @localrepo.unfilteredpropertycache |
368 def manifestlog(self): | |
368 self._cgunpacker.seek(self.manstart) | 369 self._cgunpacker.seek(self.manstart) |
369 # consume the header if it exists | 370 # consume the header if it exists |
370 self._cgunpacker.manifestheader() | 371 self._cgunpacker.manifestheader() |
371 linkmapper = self.unfiltered().changelog.rev | 372 linkmapper = self.unfiltered().changelog.rev |
372 m = bundlemanifest(self.svfs, self._cgunpacker, linkmapper) | 373 rootstore = bundlemanifest(self.svfs, self._cgunpacker, linkmapper) |
373 self.filestart = self._cgunpacker.tell() | 374 self.filestart = self._cgunpacker.tell() |
374 return m | 375 |
376 return manifest.manifestlog(self.svfs, self, rootstore) | |
375 | 377 |
376 def _consumemanifest(self): | 378 def _consumemanifest(self): |
377 """Consumes the manifest portion of the bundle, setting filestart so the | 379 """Consumes the manifest portion of the bundle, setting filestart so the |
378 file portion can be read.""" | 380 file portion can be read.""" |
379 self._cgunpacker.seek(self.manstart) | 381 self._cgunpacker.seek(self.manstart) |