← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

Always include working tree when calculating file ids for diff

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
269
269
        new_tree = tree
270
270
    else:
271
271
        new_tree = spec_tree(new_revision_spec)
 
272
    if new_tree is not tree:
 
273
        extra_trees = (tree,)
 
274
    else:
 
275
        extra_trees = None
272
276
 
273
277
    return show_diff_trees(old_tree, new_tree, sys.stdout, specific_files,
274
278
                           external_diff_options,
275
 
                           old_label=old_label, new_label=new_label)
 
279
                           old_label=old_label, new_label=new_label,
 
280
                           extra_trees=extra_trees)
276
281
 
277
282
 
278
283
def show_diff_trees(old_tree, new_tree, to_file, specific_files=None,