← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/shelf_ui.py

  • Committer: Martin Pool
  • Date: 2010-06-02 05:03:31 UTC
  • mto: This revision was merged to the branch mainline in revision 5279.
  • Revision ID: mbp@canonical.com-20100602050331-n2p1qt8hfsahspnv
Correct more sloppy use of the term 'Linux'

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/shelf_ui.py
175
175
        try:
176
176
            target_tree = builtins._get_one_revision_tree('shelf2', revision,
177
177
                tree.branch, tree)
178
 
            files = tree.safe_relpath_files(file_list)
 
178
            files = builtins.safe_relpath_files(tree, file_list)
179
179
            return klass(tree, target_tree, diff_writer, all, all, files,
180
180
                         message, destroy)
181
181
        finally:
241
241
            new_tree = self.work_tree
242
242
        old_path = old_tree.id2path(file_id)
243
243
        new_path = new_tree.id2path(file_id)
244
 
        text_differ = diff.DiffText(old_tree, new_tree, diff_file,
245
 
            path_encoding=osutils.get_terminal_encoding())
 
244
        text_differ = diff.DiffText(old_tree, new_tree, diff_file)
246
245
        patch = text_differ.diff(file_id, old_path, new_path, 'file', 'file')
247
246
        diff_file.seek(0)
248
247
        return patches.parse_patch(diff_file)
494
493
        new_tree = tt.get_preview_tree()
495
494
        if self.write_diff_to is None:
496
495
            self.write_diff_to = ui.ui_factory.make_output_stream()
497
 
        path_encoding = osutils.get_diff_header_encoding()
498
 
        diff.show_diff_trees(merger.this_tree, new_tree, self.write_diff_to,
499
 
            path_encoding=path_encoding)
 
496
        diff.show_diff_trees(merger.this_tree, new_tree, self.write_diff_to)
500
497
        tt.finalize()
501
498
 
502
499
    def show_changes(self, merger):