← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

Refactored out ControlFiles and RevisionStore from _Branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
160
160
    if from_spec is None:
161
161
        old_tree = b.basis_tree()
162
162
    else:
163
 
        old_tree = b.revision_tree(from_spec.in_history(b).rev_id)
 
163
        old_tree = b.storage.revision_tree(from_spec.in_history(b).rev_id)
164
164
 
165
165
    if revision2 is None:
166
166
        new_tree = b.working_tree()
167
167
    else:
168
 
        new_tree = b.revision_tree(revision2.in_history(b).rev_id)
 
168
        new_tree = b.storage.revision_tree(revision2.in_history(b).rev_id)
169
169
 
170
170
    return show_diff_trees(old_tree, new_tree, output, specific_files,
171
171
                           external_diff_options)