← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Vincent Ladeuil
  • Date: 2010-06-23 08:19:28 UTC
  • mfrom: (5317 +trunk)
  • mto: (5247.1.11 first-try)
  • mto: This revision was merged to the branch mainline in revision 5326.
  • Revision ID: v.ladeuil+lp@free.fr-20100623081928-z9q18q30oo5as831
Merge bzr.dev into cleanup

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
1970
1970
         old_branch, new_branch,
1971
1971
         specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1972
1972
            file_list, revision, old, new, self.add_cleanup, apply_view=True)
 
1973
        # GNU diff on Windows uses ANSI encoding for filenames
 
1974
        path_encoding = osutils.get_diff_header_encoding()
1973
1975
        return show_diff_trees(old_tree, new_tree, sys.stdout,
1974
1976
                               specific_files=specific_files,
1975
1977
                               external_diff_options=diff_options,
1976
1978
                               old_label=old_label, new_label=new_label,
1977
 
                               extra_trees=extra_trees, using=using,
 
1979
                               extra_trees=extra_trees,
 
1980
                               path_encoding=path_encoding,
 
1981
                               using=using,
1978
1982
                               format_cls=format)
1979
1983
 
1980
1984
 
3892
3896
    def _do_preview(self, merger):
3893
3897
        from bzrlib.diff import show_diff_trees
3894
3898
        result_tree = self._get_preview(merger)
 
3899
        path_encoding = osutils.get_diff_header_encoding()
3895
3900
        show_diff_trees(merger.this_tree, result_tree, self.outf,
3896
 
                        old_label='', new_label='')
 
3901
                        old_label='', new_label='',
 
3902
                        path_encoding=path_encoding)
3897
3903
 
3898
3904
    def _do_merge(self, merger, change_reporter, allow_pending, verified):
3899
3905
        merger.change_reporter = change_reporter