/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/store/versioned/__init__.py

  • Committer: Robert Collins
  • Date: 2008-05-02 01:36:11 UTC
  • mto: (3350.4.4 remove-deprecations)
  • mto: This revision was merged to the branch mainline in revision 3424.
  • Revision ID: robertc@robertcollins.net-20080502013611-9i4m7flcksbzc2yh
Remove more uses of versionedfile.join() and fix a bug with weave's insert_record_stream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/store/versioned/__init__.py
178
178
    def _put_weave(self, file_id, weave, transaction):
179
179
        """Preserved here for upgrades-to-weaves to use."""
180
180
        myweave = self._make_new_versionedfile(file_id, transaction)
181
 
        myweave.join(weave)
 
181
        myweave.insert_record_stream(weave.get_record_stream(weave.versions(),
 
182
            'topological', False))
182
183
 
183
184
    def copy(self, source, result_id, transaction):
184
185
        """Copy the source versioned file to result_id in this store."""
239
240
                # joining is fast with knits, and bearable for weaves -
240
241
                # indeed the new case can be optimised if needed.
241
242
                target = self._make_new_versionedfile(f, to_transaction)
242
 
                target.join(from_store.get_weave(f, from_transaction))
 
243
                source = from_store.get_weave(f, from_transaction)
 
244
                target.insert_record_stream(source.get_record_stream(
 
245
                    source.versions(), 'topological', False))
243
246
        finally:
244
247
            pb.finished()
245
248