Merge lp:~jml/bzr/fix-diff-docstring into lp:bzr

[Jonathan Lange]

[Jonathan Lange (jml)]

The behaviour (and name!) of the function bzrlib.diff.get_trees_and_branches_to_diff has been changed recently without an associated change of docstring. This patch fixes the docstring.

[Robert Collins (lifeless)]

 +1

[Ian Clatworthy (ian-clatworthy)]

review: Approve

=== modified file 'bzrlib/diff.py'
--- bzrlib/diff.py	2009-10-08 16:32:43 +0000
+++ bzrlib/diff.py	2009-10-13 13:10:21 +0000
@@ -299,9 +299,9 @@
         if True and a view is set, apply the view or check that the paths
         are within it
     :returns:
-        a tuple of (old_tree, new_tree, specific_files, extra_trees) where
-        extra_trees is a sequence of additional trees to search in for
-        file-ids.
+        a tuple of (old_tree, new_tree, old_branch, new_branch,
+        specific_files, extra_trees) where extra_trees is a sequence of
+        additional trees to search in for file-ids.
     """
     # Get the old and new revision specs
     old_revision_spec = None
@@ -382,6 +382,7 @@
         extra_trees = (working_tree,)
     return old_tree, new_tree, old_branch, new_branch, specific_files, extra_trees
 
+
 def _get_tree_to_diff(spec, tree=None, branch=None, basis_is_default=True):
     if branch is None and tree is not None:
         branch = tree.branch