← 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: 2006-07-13 12:24:32 UTC
  • mfrom: (1861 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1863.
  • Revision ID: john@arbash-meinel.com-20060713122432-f66fd0000dabb58e
[merge] bzr.dev 1861

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
256
256
    The more general form is show_diff_trees(), where the caller
257
257
    supplies any two trees.
258
258
    """
259
 
    output = sys.stdout
260
259
    def spec_tree(spec):
261
 
        revision_id = spec.in_store(tree.branch).rev_id
262
 
        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)
263
267
    if old_revision_spec is None:
264
268
        old_tree = tree.basis_tree()
265
269
    else: