← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repofmt/groupcompress_repo.py

  • Committer: Jelmer Vernooij
  • Date: 2011-05-04 13:09:19 UTC
  • mfrom: (5820 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5844.
  • Revision ID: jelmer@samba.org-20110504130919-dhvgkeyvw04xsuv3
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repofmt/groupcompress_repo.py
1261
1261
            yield (stream_info[0],
1262
1262
                wrap_and_count(pb, rc, stream_info[1]))
1263
1263
        self._revision_keys = [(rev_id,) for rev_id in revision_ids]
 
1264
        self.from_repository.revisions.clear_cache()
 
1265
        self.from_repository.signatures.clear_cache()
 
1266
        s = self._get_inventory_stream(self._revision_keys)
 
1267
        yield (s[0], wrap_and_count(pb, rc, s[1]))
 
1268
        self.from_repository.inventories.clear_cache()
1264
1269
        # TODO: The keys to exclude might be part of the search recipe
1265
1270
        # For now, exclude all parents that are at the edge of ancestry, for
1266
1271
        # which we have inventories
1267
1272
        from_repo = self.from_repository
1268
1273
        parent_keys = from_repo._find_parent_keys_of_revisions(
1269
1274
                        self._revision_keys)
1270
 
        self.from_repository.revisions.clear_cache()
1271
 
        self.from_repository.signatures.clear_cache()
1272
 
        # Clear the repo's get_parent_map cache too.
1273
 
        self.from_repository._unstacked_provider.disable_cache()
1274
 
        self.from_repository._unstacked_provider.enable_cache()
1275
 
        s = self._get_inventory_stream(self._revision_keys)
1276
 
        yield (s[0], wrap_and_count(pb, rc, s[1]))
1277
 
        self.from_repository.inventories.clear_cache()
1278
1275
        for stream_info in self._get_filtered_chk_streams(parent_keys):
1279
1276
            yield (stream_info[0], wrap_and_count(pb, rc, stream_info[1]))
1280
1277
        self.from_repository.chk_bytes.clear_cache()