~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

  • Committer: Aaron Bentley
  • Date: 2008-04-24 20:10:25 UTC
  • mto: This revision was merged to the branch mainline in revision 3381.
  • Revision ID: aaron@aaronbentley.com-20080424201025-ows0yk4ecf8o5zcf
Use as_revision_id for diff

Show diffs side-by-side

added added

removed removed

Lines of Context:
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):