/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/repofmt/groupcompress_repo.py

  • Committer: INADA Naoki
  • Date: 2011-05-17 00:45:09 UTC
  • mfrom: (5875 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5891.
  • Revision ID: songofacandy@gmail.com-20110517004509-q58negjbdjh7t6u1
merge from lp:bzr

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repofmt/groupcompress_repo.py
53
53
    ResumedPack,
54
54
    Packer,
55
55
    )
56
 
from bzrlib.repository import (
 
56
from bzrlib.vf_repository import (
57
57
    StreamSource,
58
58
    )
59
59
from bzrlib.static_tuple import StaticTuple
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()
1269
1264
        # TODO: The keys to exclude might be part of the search recipe
1270
1265
        # For now, exclude all parents that are at the edge of ancestry, for
1271
1266
        # which we have inventories
1272
1267
        from_repo = self.from_repository
1273
1268
        parent_keys = from_repo._find_parent_keys_of_revisions(
1274
1269
                        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()
1275
1278
        for stream_info in self._get_filtered_chk_streams(parent_keys):
1276
1279
            yield (stream_info[0], wrap_and_count(pb, rc, stream_info[1]))
1277
1280
        self.from_repository.chk_bytes.clear_cache()