Bazaar

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

  1. fix-diff-docstring
  2. Merge into bzr.dev
Proposed by Jonathan Lange
Status: Merged
Approved by: Ian Clatworthy
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp:~jml/bzr/fix-diff-docstring
Merge into: lp:bzr
Diff against target: 24 lines
1 file modified
bzrlib/diff.py (+4/-3)
To merge this branch: bzr merge lp:~jml/bzr/fix-diff-docstring
Reviewer Review Type Date Requested Status
Ian Clatworthy Approve
Review via email: mp+13280@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Jonathan Lange (jml) wrote :

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.

Revision history for this message
Robert Collins (lifeless) wrote :

 +1

Revision history for this message
Ian Clatworthy (ian-clatworthy) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bzrlib/diff.py'
2--- bzrlib/diff.py 2009-10-08 16:32:43 +0000
3+++ bzrlib/diff.py 2009-10-13 13:10:21 +0000
4@@ -299,9 +299,9 @@
5 if True and a view is set, apply the view or check that the paths
6 are within it
7 :returns:
8- a tuple of (old_tree, new_tree, specific_files, extra_trees) where
9- extra_trees is a sequence of additional trees to search in for
10- file-ids.
11+ a tuple of (old_tree, new_tree, old_branch, new_branch,
12+ specific_files, extra_trees) where extra_trees is a sequence of
13+ additional trees to search in for file-ids.
14 """
15 # Get the old and new revision specs
16 old_revision_spec = None
17@@ -382,6 +382,7 @@
18 extra_trees = (working_tree,)
19 return old_tree, new_tree, old_branch, new_branch, specific_files, extra_trees
20
21+
22 def _get_tree_to_diff(spec, tree=None, branch=None, basis_is_default=True):
23 if branch is None and tree is not None:
24 branch = tree.branch