← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/shelf_ui.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-10-01 07:40:20 UTC
  • mfrom: (5433.2.4 BUG_FIX_518916__NEW)
  • Revision ID: pqm@pqm.ubuntu.com-20101001074020-arbz6k0sl3w7nlrm
(gz) Allow arbitrary bytes for unshelve diffs rather than throwing
 UnicodeDecodeError on non-ascii contents (Andrej A Antonov)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/shelf_ui.py
493
493
        tt = tree_merger.make_preview_transform()
494
494
        new_tree = tt.get_preview_tree()
495
495
        if self.write_diff_to is None:
496
 
            self.write_diff_to = ui.ui_factory.make_output_stream()
 
496
            self.write_diff_to = ui.ui_factory.make_output_stream(encoding_type='exact')
497
497
        path_encoding = osutils.get_diff_header_encoding()
498
498
        diff.show_diff_trees(merger.this_tree, new_tree, self.write_diff_to,
499
499
            path_encoding=path_encoding)