← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Gary van der Merwe
  • Date: 2009-09-18 15:27:38 UTC
  • mto: (4732.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4733.
  • Revision ID: garyvdm@gmail.com-20090918152738-2kaj6tt1x9b5y7jp
Change _get_trees_to_diff to get_trees_and_branches_to_diff.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
1887
1887
    @display_command
1888
1888
    def run(self, revision=None, file_list=None, diff_options=None,
1889
1889
            prefix=None, old=None, new=None, using=None):
1890
 
        from bzrlib.diff import _get_trees_to_diff, show_diff_trees
 
1890
        from bzrlib.diff import get_trees_and_branches_to_diff, show_diff_trees
1891
1891
 
1892
1892
        if (prefix is None) or (prefix == '0'):
1893
1893
            # diff -p0 format
1907
1907
            raise errors.BzrCommandError('bzr diff --revision takes exactly'
1908
1908
                                         ' one or two revision specifiers')
1909
1909
 
1910
 
        old_tree, new_tree, specific_files, extra_trees = \
1911
 
                _get_trees_to_diff(file_list, revision, old, new,
 
1910
        old_tree, new_tree, old_branch, new_branch, specific_files, extra_trees = \
 
1911
                get_trees_and_branches_to_diff(file_list, revision, old, new,
1912
1912
                apply_view=True)
1913
1913
        return show_diff_trees(old_tree, new_tree, sys.stdout,
1914
1914
                               specific_files=specific_files,