/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 breezy/shelf.py

  • Committer: Jelmer Vernooij
  • Date: 2020-02-18 01:57:45 UTC
  • mto: This revision was merged to the branch mainline in revision 7493.
  • Revision ID: jelmer@jelmer.uk-20200218015745-q2ss9tsk74h4nh61
drop use of future.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/shelf.py
66
66
        :param file_list: The files to make more similar to the target.
67
67
        """
68
68
        self.work_tree = work_tree
69
 
        self.work_transform = work_tree.transform()
 
69
        self.work_transform = work_tree.get_transform()
70
70
        try:
71
71
            self.target_tree = target_tree
72
 
            self.shelf_transform = self.target_tree.preview_transform()
 
72
            self.shelf_transform = transform.TransformPreview(self.target_tree)
73
73
            try:
74
74
                self.renames = {}
75
75
                self.creation = {}
266
266
                        to_transform, s_trans_id, tree,
267
267
                        tree.id2path(file_id))
268
268
        if version:
269
 
            to_transform.version_file(s_trans_id, file_id=file_id)
 
269
            to_transform.version_file(file_id, s_trans_id)
270
270
 
271
271
    def _inverse_lines(self, new_lines, file_id):
272
272
        """Produce a version with only those changes removed from new_lines."""
363
363
            base_tree = tree.revision_tree(base_revision_id)
364
364
        except errors.NoSuchRevisionInTree:
365
365
            base_tree = tree.branch.repository.revision_tree(base_revision_id)
366
 
        tt = base_tree.preview_transform()
 
366
        tt = transform.TransformPreview(base_tree)
367
367
        tt.deserialize(records)
368
368
        return klass(tree, base_tree, tt, metadata.get(b'message'))
369
369