← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/delta.py

Crufty but existing _iter_changes implementation for WorkingTreeFormat4.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/delta.py
200
200
        include_root=False)
201
201
 
202
202
 
203
 
def _compare_trees(old_tree, new_tree, want_unchanged, specific_file_ids,
204
 
                   include_root):
 
203
def _compare_trees(old_tree, new_tree, want_unchanged, specific_files,
 
204
                   include_root, extra_trees=None):
205
205
    delta = TreeDelta()
206
206
    # mutter('start compare_trees')
207
207
 
208
208
    for (file_id, path, content_change, versioned, parent_id, name, kind,
209
 
         executable) in new_tree._iter_changes(old_tree, want_unchanged, 
210
 
                                               specific_file_ids):
 
209
         executable) in new_tree._iter_changes(old_tree, want_unchanged,
 
210
            specific_files, extra_trees=extra_trees):
211
211
        if not include_root and (None, None) == parent_id:
212
212
            continue
213
213
        fully_present = tuple((versioned[x] and kind[x] is not None) for