← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/store/versioned/__init__.py

Merge up bzr.dev.

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."""
214
215
        :param from_transaction: required current transaction in from_store.
215
216
        """
216
217
        from bzrlib.transactions import PassThroughTransaction
217
 
        assert isinstance(from_store, WeaveStore)
218
218
        if from_transaction is None:
219
219
            warn("WeaveStore.copy_multi without a from_transaction parameter "
220
220
                 "is deprecated. Please provide a from_transaction.",
239
239
                # joining is fast with knits, and bearable for weaves -
240
240
                # indeed the new case can be optimised if needed.
241
241
                target = self._make_new_versionedfile(f, to_transaction)
242
 
                target.join(from_store.get_weave(f, from_transaction))
 
242
                source = from_store.get_weave(f, from_transaction)
 
243
                target.insert_record_stream(source.get_record_stream(
 
244
                    source.versions(), 'topological', False))
243
245
        finally:
244
246
            pb.finished()
245
247