Rev 4744: (jml) Bring docstring of bzrlib.diff.get_trees_and_branches_to_diff in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 4744 [merge]
revision-id: pqm at pqm.ubuntu.com-20091014075341-xjtgl5ji20autac6
parent: pqm at pqm.ubuntu.com-20091014070846-ucxpjix8sz1q0mo5
parent: jml at canonical.com-20091013130516-xop1dzbasmz1ujrg
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2009-10-14 08:53:41 +0100
message:
  (jml) Bring docstring of bzrlib.diff.get_trees_and_branches_to_diff
  	up to date with recent changes.
modified:
  bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
=== modified file 'bzrlib/diff.py'
--- a/bzrlib/diff.py	2009-10-08 16:32:43 +0000
+++ b/bzrlib/diff.py	2009-10-13 13:05:16 +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