← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

  • Committer: Alexander Belchenko
  • Date: 2010-05-14 13:22:03 UTC
  • mto: (5258.1.1 diff-header-encoding)
  • mto: This revision was merged to the branch mainline in revision 5305.
  • Revision ID: bialix@ukr.net-20100514132203-6hglzfp9wwu87h8y
pass encoding down the diff layers

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
664
664
            from_text = _get_text(self.old_tree, from_file_id, from_path)
665
665
            to_text = _get_text(self.new_tree, to_file_id, to_path)
666
666
            self.text_differ(from_label, from_text, to_label, to_text,
667
 
                             self.to_file)
 
667
                             self.to_file, path_encoding=self.path_encoding)
668
668
        except errors.BinaryFile:
669
669
            self.to_file.write(
670
670
                  ("Binary files %s and %s differ\n" %