/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/repository.py

  • Committer: Robert Collins
  • Date: 2006-03-02 06:23:15 UTC
  • mto: (1594.2.4 integration)
  • mto: This revision was merged to the branch mainline in revision 1596.
  • Revision ID: robertc@robertcollins.net-20060302062315-9c274fa5c8201784
Prepare weave store to delegate copy details to the versioned file.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repository.py
27
27
from bzrlib.lockable_files import LockableFiles
28
28
from bzrlib.osutils import safe_unicode
29
29
from bzrlib.revision import NULL_REVISION
30
 
from bzrlib.store import copy_all
31
30
from bzrlib.store.versioned.weave import WeaveStore
32
31
from bzrlib.store.text import TextStore
33
32
from bzrlib.symbol_versioning import *
1131
1130
            # FIXME do not peek!
1132
1131
            if self.source.control_files._transport.listable():
1133
1132
                pb = bzrlib.ui.ui_factory.progress_bar()
1134
 
                copy_all(self.source.weave_store,
1135
 
                    self.target.weave_store, pb=pb)
 
1133
                self.target.weave_store.copy_all_ids(
 
1134
                    self.source.weave_store,
 
1135
                    pb=pb,
 
1136
                    from_transaction=self.source.get_transaction())
1136
1137
                pb.update('copying inventory', 0, 1)
1137
1138
                self.target.control_weaves.copy_multi(
1138
 
                    self.source.control_weaves, ['inventory'])
1139
 
                copy_all(self.source.revision_store,
1140
 
                    self.target.revision_store, pb=pb)
 
1139
                    self.source.control_weaves, ['inventory'],
 
1140
                    from_transaction=self.source.get_transaction())
 
1141
                self.target.revision_store.copy_all_ids(
 
1142
                    self.source.revision_store,
 
1143
                    pb=pb)
1141
1144
            else:
1142
1145
                self.target.fetch(self.source, revision_id=revision_id)
1143
1146