Show More
@@ -374,7 +374,8 b' class bundlerepository(object):' | |||||
374 | rootstore = bundlemanifest(self.svfs, self._cgunpacker, linkmapper) |
|
374 | rootstore = bundlemanifest(self.svfs, self._cgunpacker, linkmapper) | |
375 | self.filestart = self._cgunpacker.tell() |
|
375 | self.filestart = self._cgunpacker.tell() | |
376 |
|
376 | |||
377 |
return manifest.manifestlog(self.svfs, self, rootstore |
|
377 | return manifest.manifestlog(self.svfs, self, rootstore, | |
|
378 | self.narrowmatch()) | |||
378 |
|
379 | |||
379 | def _consumemanifest(self): |
|
380 | def _consumemanifest(self): | |
380 | """Consumes the manifest portion of the bundle, setting filestart so the |
|
381 | """Consumes the manifest portion of the bundle, setting filestart so the |
@@ -1190,7 +1190,8 b' class localrepository(object):' | |||||
1190 | @storecache('00manifest.i') |
|
1190 | @storecache('00manifest.i') | |
1191 | def manifestlog(self): |
|
1191 | def manifestlog(self): | |
1192 | rootstore = manifest.manifestrevlog(self.svfs) |
|
1192 | rootstore = manifest.manifestrevlog(self.svfs) | |
1193 |
return manifest.manifestlog(self.svfs, self, rootstore |
|
1193 | return manifest.manifestlog(self.svfs, self, rootstore, | |
|
1194 | self.narrowmatch()) | |||
1194 |
|
1195 | |||
1195 | @repofilecache('dirstate') |
|
1196 | @repofilecache('dirstate') | |
1196 | def dirstate(self): |
|
1197 | def dirstate(self): |
@@ -1636,7 +1636,7 b' class manifestlog(object):' | |||||
1636 | of the list of files in the given commit. Consumers of the output of this |
|
1636 | of the list of files in the given commit. Consumers of the output of this | |
1637 | class do not care about the implementation details of the actual manifests |
|
1637 | class do not care about the implementation details of the actual manifests | |
1638 | they receive (i.e. tree or flat or lazily loaded, etc).""" |
|
1638 | they receive (i.e. tree or flat or lazily loaded, etc).""" | |
1639 | def __init__(self, opener, repo, rootstore): |
|
1639 | def __init__(self, opener, repo, rootstore, narrowmatch): | |
1640 | usetreemanifest = False |
|
1640 | usetreemanifest = False | |
1641 | cachesize = 4 |
|
1641 | cachesize = 4 | |
1642 |
|
1642 | |||
@@ -1649,7 +1649,7 b' class manifestlog(object):' | |||||
1649 |
|
1649 | |||
1650 | self._rootstore = rootstore |
|
1650 | self._rootstore = rootstore | |
1651 | self._rootstore._setupmanifestcachehooks(repo) |
|
1651 | self._rootstore._setupmanifestcachehooks(repo) | |
1652 |
self._narrowmatch = |
|
1652 | self._narrowmatch = narrowmatch | |
1653 |
|
1653 | |||
1654 | # A cache of the manifestctx or treemanifestctx for each directory |
|
1654 | # A cache of the manifestctx or treemanifestctx for each directory | |
1655 | self._dirmancache = {} |
|
1655 | self._dirmancache = {} |
@@ -187,7 +187,8 b' class statichttprepository(localrepo.loc' | |||||
187 | self.requirements = requirements |
|
187 | self.requirements = requirements | |
188 |
|
188 | |||
189 | rootmanifest = manifest.manifestrevlog(self.svfs) |
|
189 | rootmanifest = manifest.manifestrevlog(self.svfs) | |
190 |
self.manifestlog = manifest.manifestlog(self.svfs, self, rootmanifest |
|
190 | self.manifestlog = manifest.manifestlog(self.svfs, self, rootmanifest, | |
|
191 | self.narrowmatch()) | |||
191 | self.changelog = changelog.changelog(self.svfs) |
|
192 | self.changelog = changelog.changelog(self.svfs) | |
192 | self._tags = None |
|
193 | self._tags = None | |
193 | self.nodetagscache = None |
|
194 | self.nodetagscache = None |
@@ -212,7 +212,8 b' class unionrepository(object):' | |||||
212 | def manifestlog(self): |
|
212 | def manifestlog(self): | |
213 | rootstore = unionmanifest(self.svfs, self.repo2.svfs, |
|
213 | rootstore = unionmanifest(self.svfs, self.repo2.svfs, | |
214 | self.unfiltered()._clrev) |
|
214 | self.unfiltered()._clrev) | |
215 |
return manifest.manifestlog(self.svfs, self, rootstore |
|
215 | return manifest.manifestlog(self.svfs, self, rootstore, | |
|
216 | self.narrowmatch()) | |||
216 |
|
217 | |||
217 | def _clrev(self, rev2): |
|
218 | def _clrev(self, rev2): | |
218 | """map from repo2 changelog rev to temporary rev in self.changelog""" |
|
219 | """map from repo2 changelog rev to temporary rev in self.changelog""" |
@@ -182,7 +182,8 b' def main():' | |||||
182 | checkzobject(fl, allowextra=True) |
|
182 | checkzobject(fl, allowextra=True) | |
183 |
|
183 | |||
184 | # Conforms to imanifestlog. |
|
184 | # Conforms to imanifestlog. | |
185 |
ml = manifest.manifestlog(vfs, repo, manifest.manifestrevlog(repo.svfs) |
|
185 | ml = manifest.manifestlog(vfs, repo, manifest.manifestrevlog(repo.svfs), | |
|
186 | repo.narrowmatch()) | |||
186 | checkzobject(ml) |
|
187 | checkzobject(ml) | |
187 | checkzobject(repo.manifestlog) |
|
188 | checkzobject(repo.manifestlog) | |
188 |
|
189 |
General Comments 0
You need to be logged in to leave comments.
Login now