/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

  • Committer: John Arbash Meinel
  • Date: 2009-10-17 00:34:28 UTC
  • mfrom: (4754 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4755.
  • Revision ID: john@arbash-meinel.com-20091017003428-opg71qwkbzr3clko
Merge bzr.dev resolve test conflict.

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