← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

  • Committer: Lalo Martins
  • Date: 2005-09-09 18:59:17 UTC
  • mto: (1185.1.22)
  • mto: This revision was merged to the branch mainline in revision 1390.
  • Revision ID: lalo@exoweb.net-20050913094215-c9b1ceb71213cf51
polishing up the RevisionSpec api, as per suggestions from Robert

Show diffs side-by-side

added added

removed removed

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