← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-05-12 03:07:05 UTC
  • mfrom: (3350.3.22 data_stream_revamp)
  • Revision ID: pqm@pqm.ubuntu.com-20080512030705-nvl2q1tuls904eru
Deprecate bzrlib.versionedfiles.VersionedFile.join.

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."""
238
239
                # joining is fast with knits, and bearable for weaves -
239
240
                # indeed the new case can be optimised if needed.
240
241
                target = self._make_new_versionedfile(f, to_transaction)
241
 
                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))
242
245
        finally:
243
246
            pb.finished()
244
247