← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/delta.py

Merge in test support work for Tree.compare().

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/delta.py
184
184
                trees = trees + tuple(extra_trees)
185
185
            specific_file_ids = tree.find_ids_across_trees(specific_files, 
186
186
                trees, require_versioned=require_versioned)
 
187
            if specific_files and not specific_file_ids:
 
188
                # All files are unversioned, so just return an empty delta
 
189
                # _compare_trees would think we want a complete delta
 
190
                return TreeDelta()
187
191
            return _compare_trees(old_tree, new_tree, want_unchanged,
188
192
                                  specific_file_ids)
189
193
        finally:
230
234
            return
231
235
 
232
236
        if specific_file_ids:
233
 
            if (old_file_id not in specific_file_ids and 
234
 
                new_file_id not in specific_file_ids):
 
237
            if (old_entry.file_id not in specific_file_ids and 
 
238
                new_entry.file_id not in specific_file_ids):
235
239
                return
236
240
 
237
241
        # temporary hack until all entries are populated before clients