← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

 * The internal storage of history, and logical branch identity have now
   been split into Branch, and Repository. The common locking and file 
   management routines are now in bzrlib.lockablefiles. 
   (Aaron Bentley, Robert Collins, Martin Pool)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
164
164
        else:
165
165
            old_tree = b.working_tree()
166
166
    else:
167
 
        old_tree = b.revision_tree(from_spec.in_history(b).rev_id)
 
167
        old_tree = b.repository.revision_tree(from_spec.in_history(b).rev_id)
168
168
 
169
169
    if revision2 is None:
170
170
        if b2 is None:
172
172
        else:
173
173
            new_tree = b2.working_tree()
174
174
    else:
175
 
        new_tree = b.revision_tree(revision2.in_history(b).rev_id)
 
175
        new_tree = b.repository.revision_tree(revision2.in_history(b).rev_id)
176
176
 
177
177
    return show_diff_trees(old_tree, new_tree, output, specific_files,
178
178
                           external_diff_options)