/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-04-05 19:11:34 UTC
  • mto: (7490.7.16 work)
  • mto: This revision was merged to the branch mainline in revision 7501.
  • Revision ID: jelmer@jelmer.uk-20200405191134-0aebh8ikiwygxma5
Populate the .gitignore file.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/shelf.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
 
17
from __future__ import absolute_import
 
18
 
17
19
import errno
18
20
import re
19
21
 
66
68
        :param file_list: The files to make more similar to the target.
67
69
        """
68
70
        self.work_tree = work_tree
69
 
        self.work_transform = work_tree.transform()
 
71
        self.work_transform = work_tree.get_transform()
70
72
        try:
71
73
            self.target_tree = target_tree
72
 
            self.shelf_transform = self.target_tree.preview_transform()
 
74
            self.shelf_transform = transform.TransformPreview(self.target_tree)
73
75
            try:
74
76
                self.renames = {}
75
77
                self.creation = {}
266
268
                        to_transform, s_trans_id, tree,
267
269
                        tree.id2path(file_id))
268
270
        if version:
269
 
            to_transform.version_file(s_trans_id, file_id=file_id)
 
271
            to_transform.version_file(file_id, s_trans_id)
270
272
 
271
273
    def _inverse_lines(self, new_lines, file_id):
272
274
        """Produce a version with only those changes removed from new_lines."""
363
365
            base_tree = tree.revision_tree(base_revision_id)
364
366
        except errors.NoSuchRevisionInTree:
365
367
            base_tree = tree.branch.repository.revision_tree(base_revision_id)
366
 
        tt = base_tree.preview_transform()
 
368
        tt = transform.TransformPreview(base_tree)
367
369
        tt.deserialize(records)
368
370
        return klass(tree, base_tree, tt, metadata.get(b'message'))
369
371