Show More
@@ -343,8 +343,7 b' class bundlerepository(localrepo.localre' | |||||
343 | self.manstart = self.bundle.tell() |
|
343 | self.manstart = self.bundle.tell() | |
344 | return c |
|
344 | return c | |
345 |
|
345 | |||
346 | @localrepo.unfilteredpropertycache |
|
346 | def _constructmanifest(self): | |
347 | def manifest(self): |
|
|||
348 | self.bundle.seek(self.manstart) |
|
347 | self.bundle.seek(self.manstart) | |
349 | # consume the header if it exists |
|
348 | # consume the header if it exists | |
350 | self.bundle.manifestheader() |
|
349 | self.bundle.manifestheader() |
@@ -506,6 +506,12 b' class localrepository(object):' | |||||
506 |
|
506 | |||
507 | @storecache('00manifest.i') |
|
507 | @storecache('00manifest.i') | |
508 | def manifest(self): |
|
508 | def manifest(self): | |
|
509 | return self._constructmanifest() | |||
|
510 | ||||
|
511 | def _constructmanifest(self): | |||
|
512 | # This is a temporary function while we migrate from manifest to | |||
|
513 | # manifestlog. It allows bundlerepo and unionrepo to intercept the | |||
|
514 | # manifest creation. | |||
509 | return manifest.manifest(self.svfs) |
|
515 | return manifest.manifest(self.svfs) | |
510 |
|
516 | |||
511 | @property |
|
517 | @property |
@@ -208,8 +208,7 b' class unionrepository(localrepo.localrep' | |||||
208 | node = self.repo2.changelog.node(rev2) |
|
208 | node = self.repo2.changelog.node(rev2) | |
209 | return self.changelog.rev(node) |
|
209 | return self.changelog.rev(node) | |
210 |
|
210 | |||
211 | @localrepo.unfilteredpropertycache |
|
211 | def _constructmanifest(self): | |
212 | def manifest(self): |
|
|||
213 | return unionmanifest(self.svfs, self.repo2.svfs, |
|
212 | return unionmanifest(self.svfs, self.repo2.svfs, | |
214 | self.unfiltered()._clrev) |
|
213 | self.unfiltered()._clrev) | |
215 |
|
214 |
General Comments 0
You need to be logged in to leave comments.
Login now