← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

  • Committer: Andrew Bennetts
  • Date: 2010-08-05 04:21:03 UTC
  • mto: This revision was merged to the branch mainline in revision 5367.
  • Revision ID: andrew.bennetts@canonical.com-20100805042103-pdc01ltvca2nu7bl
Fix test failures for bundles and upgrades.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
736
736
                     path_encoding)
737
737
 
738
738
    @classmethod
739
 
    def make_from_diff_tree(klass, command_string, external_diff_options=None):
 
739
    def make_from_diff_tree(klass, command_string):
740
740
        def from_diff_tree(diff_tree):
741
 
            full_command_string = [command_string]
742
 
            if external_diff_options is not None:
743
 
                full_command_string += ' ' + external_diff_options
744
 
            return klass.from_string(full_command_string, diff_tree.old_tree,
 
741
            return klass.from_string(command_string, diff_tree.old_tree,
745
742
                                     diff_tree.new_tree, diff_tree.to_file)
746
743
        return from_diff_tree
747
744
 
915
912
        :param using: Commandline to use to invoke an external diff tool
916
913
        """
917
914
        if using is not None:
918
 
            extra_factories = [DiffFromTool.make_from_diff_tree(using, external_diff_options)]
 
915
            extra_factories = [DiffFromTool.make_from_diff_tree(using)]
919
916
        else:
920
917
            extra_factories = []
921
918
        if external_diff_options: