← 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: 2006-07-12 12:36:57 UTC
  • mfrom: (1732.3.4 bzr.revnoX)
  • Revision ID: pqm@pqm.ubuntu.com-20060712123657-365eeb32b69308bf
(matthieu) revno:x:url revision spec

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
257
257
    supplies any two trees.
258
258
    """
259
259
    def spec_tree(spec):
260
 
        revision_id = spec.in_store(tree.branch).rev_id
261
 
        return tree.branch.repository.revision_tree(revision_id)
 
260
        if tree:
 
261
            revision = spec.in_store(tree.branch)
 
262
        else:
 
263
            revision = spec.in_store(None)
 
264
        revision_id = revision.rev_id
 
265
        branch = revision.branch
 
266
        return branch.repository.revision_tree(revision_id)
262
267
    if old_revision_spec is None:
263
268
        old_tree = tree.basis_tree()
264
269
    else: