242
242
lookup_trees = [self.source]
244
244
lookup_trees.extend(extra_trees)
245
# The ids of items we need to examine to insure delta consistency.
246
precise_file_ids = set()
247
discarded_changes = {}
245
248
if specific_files == []:
246
249
specific_file_ids = []
248
251
specific_file_ids = self.target.paths2ids(specific_files,
249
252
lookup_trees, require_versioned=require_versioned)
251
253
# FIXME: It should be possible to delegate include_unchanged handling
252
254
# to CHKInventory.iter_changes and do a better job there -- vila
254
if include_unchanged:
255
changed_file_ids = []
256
changed_file_ids = set()
256
257
for result in self.target.inventory.iter_changes(self.source.inventory):
257
if (specific_file_ids is not None
258
and not result[0] in specific_file_ids):
259
# CHKMap.iter_changes is clean and fast. Better filter out
260
# the specific files *after* it did its job.
258
if specific_file_ids is not None:
260
if file_id not in specific_file_ids:
261
# A change from the whole tree that we don't want to show yet.
262
# We may find that we need to show it for delta consistency, so
264
discarded_changes[result[0]] = result
266
new_parent_id = result[4][1]
267
precise_file_ids.add(new_parent_id)
263
if include_unchanged:
264
# Keep track of yielded results (cheaper than building the
266
changed_file_ids.append(result[0])
269
changed_file_ids.add(result[0])
270
if specific_file_ids is not None:
271
for result in self._handle_precise_ids(precise_file_ids,
272
changed_file_ids, discarded_changes=discarded_changes):
267
274
if include_unchanged:
268
275
# CHKMap avoid being O(tree), so we go to O(tree) only if
added
removed
bzrlib/revisiontree.py
