← 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 15:10:24 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-20100514151024-93a2ijloybes93ly
fixing test with external_diff

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
870
870
            extra_factories = []
871
871
        if external_diff_options:
872
872
            opts = external_diff_options.split()
873
 
            def diff_file(olab, olines, nlab, nlines, to_file):
 
873
            def diff_file(olab, olines, nlab, nlines, to_file, path_encoding=None):
 
874
                """:param path_encoding: not used but required
 
875
                        to match the signature of internal_diff.
 
876
                """
874
877
                external_diff(olab, olines, nlab, nlines, to_file, opts)
875
878
        else:
876
879
            diff_file = internal_diff