/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: Jelmer Vernooij
  • Date: 2018-11-16 18:40:46 UTC
  • mto: This revision was merged to the branch mainline in revision 7178.
  • Revision ID: jelmer@jelmer.uk-20181116184046-sduc4uk0dnyp13tm
Fix regressions.

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()
2731
2731
        return True
2732
2732
    if entry.kind == "file":
2733
2733
        with open(target_path, 'rb') as f1, \
2734
 
                 tree.get_file(tree_path) as f2:
 
2734
                tree.get_file(tree_path) as f2:
2735
2735
            if osutils.compare_files(f1, f2):
2736
2736
                return True
2737
2737
    elif entry.kind == "symlink":