← 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: 2005-09-16 14:57:59 UTC
  • mto: (1393.2.1)
  • mto: This revision was merged to the branch mainline in revision 1396.
  • Revision ID: john@arbash-meinel.com-20050916145758-ad06c9ae86840f17
Merged up-to-date against mainline, still broken.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
161
161
        import sys
162
162
        output = sys.stdout
163
163
 
164
 
    if revision == None:
 
164
    if revision is None:
165
165
        old_tree = b.basis_tree()
166
166
    else:
167
 
        old_tree = b.revision_tree(b.lookup_revision(revision))
 
167
        old_tree = b.revision_tree(revision.in_history(b).rev_id)
168
168
 
169
 
    if revision2 == None:
 
169
    if revision2 is None:
170
170
        new_tree = b.working_tree()
171
171
    else:
172
 
        new_tree = b.revision_tree(b.lookup_revision(revision2))
 
172
        new_tree = b.revision_tree(revision2.in_branch(b).rev_id)
173
173
 
174
174
    show_diff_trees(old_tree, new_tree, output, specific_files,
175
175
                    external_diff_options)