/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: 2018-11-17 00:47:52 UTC
  • mfrom: (7182 work)
  • mto: This revision was merged to the branch mainline in revision 7305.
  • Revision ID: jelmer@jelmer.uk-20181117004752-6ywampe5pfywlby4
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/shelf.py
122
122
                    self.renames[file_id] = (names, parents)
123
123
                    yield ('rename', file_id) + paths
124
124
 
125
 
                if kind[0] != kind [1]:
 
125
                if kind[0] != kind[1]:
126
126
                    yield ('change kind', file_id, kind[0], kind[1], paths[0])
127
127
                elif kind[0] == 'symlink':
128
 
                    t_target = self.target_tree.get_symlink_target(
129
 
                            paths[0], file_id)
130
 
                    w_target = self.work_tree.get_symlink_target(
131
 
                            paths[1], file_id)
 
128
                    t_target = self.target_tree.get_symlink_target(paths[0])
 
129
                    w_target = self.work_tree.get_symlink_target(paths[1])
132
130
                    yield ('modify target', file_id, paths[0], t_target,
133
 
                            w_target)
 
131
                           w_target)
134
132
                elif changed:
135
133
                    yield ('modify text', file_id)
136
134
 
181
179
            to shelving.
182
180
        """
183
181
        new_path = self.target_tree.id2path(file_id)
184
 
        new_target = self.target_tree.get_symlink_target(new_path, file_id)
 
182
        new_target = self.target_tree.get_symlink_target(new_path)
185
183
        w_trans_id = self.work_transform.trans_id_file_id(file_id)
186
184
        self.work_transform.delete_contents(w_trans_id)
187
185
        self.work_transform.create_symlink(new_target, w_trans_id)
188
186
 
189
187
        old_path = self.work_tree.id2path(file_id)
190
 
        old_target = self.work_tree.get_symlink_target(old_path, file_id)
 
188
        old_target = self.work_tree.get_symlink_target(old_path)
191
189
        s_trans_id = self.shelf_transform.trans_id_file_id(file_id)
192
190
        self.shelf_transform.delete_contents(s_trans_id)
193
191
        self.shelf_transform.create_symlink(old_target, s_trans_id)
269
267
                    to_transform.create_file([b''], s_trans_id)
270
268
                else:
271
269
                    transform.create_from_tree(
272
 
                            to_transform, s_trans_id, tree,
273
 
                            tree.id2path(file_id), file_id)
 
270
                        to_transform, s_trans_id, tree,
 
271
                        tree.id2path(file_id), file_id)
274
272
        if version:
275
273
            to_transform.version_file(file_id, s_trans_id)
276
274
 
277
275
    def _inverse_lines(self, new_lines, file_id):
278
276
        """Produce a version with only those changes removed from new_lines."""
279
277
        target_path = self.target_tree.id2path(file_id)
280
 
        target_lines = self.target_tree.get_file_lines(target_path, file_id)
 
278
        target_lines = self.target_tree.get_file_lines(target_path)
281
279
        work_path = self.work_tree.id2path(file_id)
282
 
        work_lines = self.work_tree.get_file_lines(work_path, file_id)
 
280
        work_lines = self.work_tree.get_file_lines(work_path)
283
281
        return merge3.Merge3(new_lines, target_lines, work_lines).merge_lines()
284
282
 
285
283
    def finalize(self):
377
375
        """Return a merger that can unshelve the changes."""
378
376
        target_tree = self.transform.get_preview_tree()
379
377
        merger = merge.Merger.from_uncommitted(self.tree, target_tree,
380
 
            self.base_tree)
 
378
                                               self.base_tree)
381
379
        merger.merge_type = merge.Merge3Merger
382
380
        return merger
383
381