← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-10-14 07:53:41 UTC
  • mfrom: (4739.3.1 fix-diff-docstring)
  • Revision ID: pqm@pqm.ubuntu.com-20091014075341-xjtgl5ji20autac6
(jml) Bring docstring of bzrlib.diff.get_trees_and_branches_to_diff
        up to date with recent changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
299
299
        if True and a view is set, apply the view or check that the paths
300
300
        are within it
301
301
    :returns:
302
 
        a tuple of (old_tree, new_tree, specific_files, extra_trees) where
303
 
        extra_trees is a sequence of additional trees to search in for
304
 
        file-ids.
 
302
        a tuple of (old_tree, new_tree, old_branch, new_branch,
 
303
        specific_files, extra_trees) where extra_trees is a sequence of
 
304
        additional trees to search in for file-ids.
305
305
    """
306
306
    # Get the old and new revision specs
307
307
    old_revision_spec = None
382
382
        extra_trees = (working_tree,)
383
383
    return old_tree, new_tree, old_branch, new_branch, specific_files, extra_trees
384
384
 
 
385
 
385
386
def _get_tree_to_diff(spec, tree=None, branch=None, basis_is_default=True):
386
387
    if branch is None and tree is not None:
387
388
        branch = tree.branch