← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

  • Committer: John Arbash Meinel
  • Date: 2008-05-05 20:42:38 UTC
  • mfrom: (3406 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3407.
  • Revision ID: john@arbash-meinel.com-20080505204238-598hf62krc3wwcin
merge bzr.dev, resolve NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
28
28
import time
29
29
 
30
30
from bzrlib import (
 
31
    branch as _mod_branch,
31
32
    bzrdir,
32
33
    commands,
33
34
    errors,
447
448
                return branch.basis_tree()
448
449
        else:
449
450
            return tree
450
 
    revision = spec.in_store(branch)
451
 
    revision_id = revision.rev_id
452
 
    rev_branch = revision.branch
453
 
    return rev_branch.repository.revision_tree(revision_id)
 
451
    if not spec.needs_branch():
 
452
        branch = _mod_branch.Branch.open(spec.get_branch())
 
453
    revision_id = spec.as_revision_id(branch)
 
454
    return branch.repository.revision_tree(revision_id)
454
455
 
455
456
 
456
457
def _relative_paths_in_tree(tree, paths):