/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

Merge up bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/store/versioned/__init__.py
179
179
    def _put_weave(self, file_id, weave, transaction):
180
180
        """Preserved here for upgrades-to-weaves to use."""
181
181
        myweave = self._make_new_versionedfile(file_id, transaction)
182
 
        myweave.join(weave)
 
182
        myweave.insert_record_stream(weave.get_record_stream(weave.versions(),
 
183
            'topological', False))
183
184
 
184
185
    def copy(self, source, result_id, transaction):
185
186
        """Copy the source versioned file to result_id in this store."""
215
216
        :param from_transaction: required current transaction in from_store.
216
217
        """
217
218
        from bzrlib.transactions import PassThroughTransaction
218
 
        assert isinstance(from_store, WeaveStore)
219
219
        if from_transaction is None:
220
220
            warn("WeaveStore.copy_multi without a from_transaction parameter "
221
221
                 "is deprecated. Please provide a from_transaction.",
240
240
                # joining is fast with knits, and bearable for weaves -
241
241
                # indeed the new case can be optimised if needed.
242
242
                target = self._make_new_versionedfile(f, to_transaction)
243
 
                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))
244
246
        finally:
245
247
            pb.finished()
246
248