/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/transform.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-11-16 19:38:57 UTC
  • mfrom: (7143.16.21 even-more-cleanups)
  • Revision ID: breezy.the.bot@gmail.com-20181116193857-bs5oma2655sp55qu
Fix another dozen flake8 errors.

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

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/transform.py
2008
2008
 
2009
2009
    def _get_file_revision(self, path, file_id, vf, tree_revision):
2010
2010
        parent_keys = [
2011
 
                (file_id, t.get_file_revision(t.id2path(file_id)))
2012
 
                for t in self._iter_parent_trees()]
 
2011
            (file_id, t.get_file_revision(t.id2path(file_id)))
 
2012
            for t in self._iter_parent_trees()]
2013
2013
        vf.add_lines((file_id, tree_revision), parent_keys,
2014
2014
                     self.get_file_lines(path))
2015
2015
        repo = self._get_repository()
2614
2614
                        else:
2615
2615
                            divert.add(file_id)
2616
2616
                    if (file_id not in divert
2617
 
                        and _content_match(tree, entry, tree_path, file_id, kind,
2618
 
                                       target_path)):
 
2617
                        and _content_match(
 
2618
                            tree, entry, tree_path, file_id, kind,
 
2619
                            target_path)):
2619
2620
                        tt.delete_contents(tt.trans_id_tree_path(tree_path))
2620
2621
                        if kind == 'directory':
2621
2622
                            reparent = True
2730
2731
        return True
2731
2732
    if entry.kind == "file":
2732
2733
        with open(target_path, 'rb') as f1, \
2733
 
                 tree.get_file(tree_path) as f2:
 
2734
                tree.get_file(tree_path) as f2:
2734
2735
            if osutils.compare_files(f1, f2):
2735
2736
                return True
2736
2737
    elif entry.kind == "symlink":