← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

merge diff header work from my 2.1 branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
1968
1968
         old_branch, new_branch,
1969
1969
         specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1970
1970
            file_list, revision, old, new, self.add_cleanup, apply_view=True)
 
1971
        # GNU diff on Windows uses ANSI encoding for filenames
 
1972
        path_encoding = osutils.get_diff_header_encoding()
1971
1973
        return show_diff_trees(old_tree, new_tree, sys.stdout,
1972
1974
                               specific_files=specific_files,
1973
1975
                               external_diff_options=diff_options,
1974
1976
                               old_label=old_label, new_label=new_label,
1975
 
                               extra_trees=extra_trees, using=using,
 
1977
                               extra_trees=extra_trees,
 
1978
                               path_encoding=path_encoding,
 
1979
                               using=using,
1976
1980
                               format_cls=format)
1977
1981
 
1978
1982
 
3883
3887
    def _do_preview(self, merger):
3884
3888
        from bzrlib.diff import show_diff_trees
3885
3889
        result_tree = self._get_preview(merger)
 
3890
        path_encoding = osutils.get_diff_header_encoding()
3886
3891
        show_diff_trees(merger.this_tree, result_tree, self.outf,
3887
 
                        old_label='', new_label='')
 
3892
                        old_label='', new_label='',
 
3893
                        path_encoding=path_encoding)
3888
3894
 
3889
3895
    def _do_merge(self, merger, change_reporter, allow_pending, verified):
3890
3896
        merger.change_reporter = change_reporter