/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: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-11-16 18:59:44 UTC
  • mfrom: (7143.15.15 more-cleanups)
  • Revision ID: breezy.the.bot@gmail.com-20181116185944-biefv1sub37qfybm
Sprinkle some PEP8iness.

Merged from https://code.launchpad.net/~jelmer/brz/more-cleanups/+merge/358611

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
128
                    t_target = self.target_tree.get_symlink_target(paths[0])
129
129
                    w_target = self.work_tree.get_symlink_target(paths[1])
130
130
                    yield ('modify target', file_id, paths[0], t_target,
131
 
                            w_target)
 
131
                           w_target)
132
132
                elif changed:
133
133
                    yield ('modify text', file_id)
134
134
 
267
267
                    to_transform.create_file([b''], s_trans_id)
268
268
                else:
269
269
                    transform.create_from_tree(
270
 
                            to_transform, s_trans_id, tree,
271
 
                            tree.id2path(file_id), file_id)
 
270
                        to_transform, s_trans_id, tree,
 
271
                        tree.id2path(file_id), file_id)
272
272
        if version:
273
273
            to_transform.version_file(file_id, s_trans_id)
274
274
 
375
375
        """Return a merger that can unshelve the changes."""
376
376
        target_tree = self.transform.get_preview_tree()
377
377
        merger = merge.Merger.from_uncommitted(self.tree, target_tree,
378
 
            self.base_tree)
 
378
                                               self.base_tree)
379
379
        merger.merge_type = merge.Merge3Merger
380
380
        return merger
381
381