← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
21
21
import tempfile
22
22
import time
23
23
 
 
24
# compatability - plugins import compare_trees from diff!!!
 
25
# deprecated as of 0.10
24
26
from bzrlib.delta import compare_trees
25
27
from bzrlib.errors import BzrError
26
28
import bzrlib.errors as errors
332
334
    else:
333
335
        diff_file = internal_diff
334
336
    
335
 
    delta = compare_trees(old_tree, new_tree, want_unchanged=False,
336
 
                          specific_files=specific_files, 
337
 
                          extra_trees=extra_trees, require_versioned=True)
 
337
    delta = new_tree.changes_from(old_tree,
 
338
        specific_files=specific_files,
 
339
        extra_trees=extra_trees, require_versioned=True)
338
340
 
339
341
    has_changes = 0
340
342
    for path, file_id, kind in delta.removed: