147
return iter(self.inventory)
149
144
def all_file_ids(self):
150
145
"""Iterate through all file ids, including ids for missing files."""
151
return set(self.inventory)
146
raise NotImplementedError(self.all_file_ids)
153
148
def id2path(self, file_id):
154
149
"""Return the path for a file id.
156
151
:raises NoSuchId:
158
return self.inventory.id2path(file_id)
160
def is_control_filename(self, filename):
161
"""True if filename is the name of a control file in this tree.
163
:param filename: A filename within the tree. This is a relative path
164
from the root of this tree.
166
This is true IF and ONLY IF the filename is part of the meta data
167
that bzr controls in this tree. I.E. a random .bzr directory placed
168
on disk will not be a control file for this tree.
170
return self.bzrdir.is_control_filename(filename)
173
def iter_entries_by_dir(self, specific_file_ids=None):
153
raise NotImplementedError(self.id2path)
155
def iter_entries_by_dir(self, specific_file_ids=None, yield_parents=False):
174
156
"""Walk the tree in 'by_dir' order.
176
158
This will yield each entry in the tree as a (path, entry) tuple.
194
176
The yield order (ignoring root) would be::
195
177
a, f, a/b, a/d, a/b/c, a/d/e, f/g
197
return self.inventory.iter_entries_by_dir(
198
specific_file_ids=specific_file_ids)
179
:param yield_parents: If True, yield the parents from the root leading
180
down to specific_file_ids that have been requested. This has no
181
impact if specific_file_ids is None.
183
raise NotImplementedError(self.iter_entries_by_dir)
185
def list_files(self, include_root=False, from_dir=None, recursive=True):
186
"""List all files in this tree.
188
:param include_root: Whether to include the entry for the tree root
189
:param from_dir: Directory under which to list files
190
:param recursive: Whether to list files recursively
191
:return: iterator over tuples of (path, versioned, kind, file_id,
194
raise NotImplementedError(self.list_files)
200
196
def iter_references(self):
201
197
if self.supports_tree_reference():
344
359
cur_file = (self.get_file_text(file_id),)
345
360
yield identifier, cur_file
347
def get_symlink_target(self, file_id):
362
def get_symlink_target(self, file_id, path=None):
348
363
"""Get the target for a given file_id.
350
365
It is assumed that the caller already knows that file_id is referencing
352
367
:param file_id: Handle for the symlink entry.
368
:param path: The path of the file.
369
If both file_id and path are supplied, an implementation may use
353
371
:return: The path the symlink points to.
355
373
raise NotImplementedError(self.get_symlink_target)
357
def get_canonical_inventory_paths(self, paths):
358
"""Like get_canonical_inventory_path() but works on multiple items.
360
:param paths: A sequence of paths relative to the root of the tree.
361
:return: A list of paths, with each item the corresponding input path
362
adjusted to account for existing elements that match case
365
return list(self._yield_canonical_inventory_paths(paths))
367
def get_canonical_inventory_path(self, path):
368
"""Returns the first inventory item that case-insensitively matches path.
370
If a path matches exactly, it is returned. If no path matches exactly
371
but more than one path matches case-insensitively, it is implementation
372
defined which is returned.
374
If no path matches case-insensitively, the input path is returned, but
375
with as many path entries that do exist changed to their canonical
378
If you need to resolve many names from the same tree, you should
379
use get_canonical_inventory_paths() to avoid O(N) behaviour.
381
:param path: A paths relative to the root of the tree.
382
:return: The input path adjusted to account for existing elements
383
that match case insensitively.
385
return self._yield_canonical_inventory_paths([path]).next()
387
def _yield_canonical_inventory_paths(self, paths):
389
# First, if the path as specified exists exactly, just use it.
390
if self.path2id(path) is not None:
394
cur_id = self.get_root_id()
396
bit_iter = iter(path.split("/"))
399
for child in self.iter_children(cur_id):
401
child_base = os.path.basename(self.id2path(child))
402
if child_base.lower() == lelt:
404
cur_path = osutils.pathjoin(cur_path, child_base)
407
# before a change is committed we can see this error...
410
# got to the end of this directory and no entries matched.
411
# Return what matched so far, plus the rest as specified.
412
cur_path = osutils.pathjoin(cur_path, elt, *list(bit_iter))
417
375
def get_root_id(self):
418
376
"""Return the file_id for the root of this tree."""
419
377
raise NotImplementedError(self.get_root_id)
477
435
except errors.NoSuchRevisionInTree:
478
436
yield self.repository.revision_tree(revision_id)
481
def _file_revision(revision_tree, file_id):
482
"""Determine the revision associated with a file in a given tree."""
483
revision_tree.lock_read()
485
return revision_tree.inventory[file_id].revision
487
revision_tree.unlock()
489
438
def _get_file_revision(self, file_id, vf, tree_revision):
490
439
"""Ensure that file_id, tree_revision is in vf to plan the merge."""
492
441
if getattr(self, '_repository', None) is None:
493
442
last_revision = tree_revision
494
parent_keys = [(file_id, self._file_revision(t, file_id)) for t in
443
parent_keys = [(file_id, t.get_file_revision(file_id)) for t in
495
444
self._iter_parent_trees()]
496
445
vf.add_lines((file_id, last_revision), parent_keys,
497
self.get_file(file_id).readlines())
446
self.get_file_lines(file_id))
498
447
repo = self.branch.repository
499
448
base_vf = repo.texts
501
last_revision = self._file_revision(self, file_id)
450
last_revision = self.get_file_revision(file_id)
502
451
base_vf = self._repository.texts
503
452
if base_vf not in vf.fallback_versionedfiles:
504
453
vf.fallback_versionedfiles.append(base_vf)
505
454
return last_revision
507
inventory = property(_get_inventory,
508
doc="Inventory of this Tree")
510
456
def _check_retrieved(self, ie, f):
511
457
if not __debug__:
513
fp = fingerprint_file(f)
459
fp = osutils.fingerprint_file(f)
516
462
if ie.text_size is not None:
517
463
if ie.text_size != fp['size']:
518
raise BzrError("mismatched size for file %r in %r" % (ie.file_id, self._store),
464
raise errors.BzrError(
465
"mismatched size for file %r in %r" %
466
(ie.file_id, self._store),
519
467
["inventory expects %d bytes" % ie.text_size,
520
468
"file is actually %d bytes" % fp['size'],
521
469
"store is probably damaged/corrupt"])
523
471
if ie.text_sha1 != fp['sha1']:
524
raise BzrError("wrong SHA-1 for file %r in %r" % (ie.file_id, self._store),
472
raise errors.BzrError("wrong SHA-1 for file %r in %r" %
473
(ie.file_id, self._store),
525
474
["inventory expects %s" % ie.text_sha1,
526
475
"file is actually %s" % fp['sha1'],
527
476
"store is probably damaged/corrupt"])
530
478
def path2id(self, path):
531
479
"""Return the id for path in this tree."""
532
return self._inventory.path2id(path)
480
raise NotImplementedError(self.path2id)
534
482
def paths2ids(self, paths, trees=[], require_versioned=True):
535
483
"""Return all the ids that can be reached by walking from paths.
689
637
for path in path_names:
690
638
yield searcher.get_items(path)
693
640
def _get_rules_searcher(self, default_searcher):
694
641
"""Get the RulesSearcher for this tree given the default one."""
695
642
searcher = default_searcher
646
class InventoryTree(Tree):
647
"""A tree that relies on an inventory for its metadata.
649
Trees contain an `Inventory` object, and also know how to retrieve
650
file texts mentioned in the inventory, either from a working
651
directory or from a store.
653
It is possible for trees to contain files that are not described
654
in their inventory or vice versa; for this use `filenames()`.
656
Subclasses should set the _inventory attribute, which is considered
657
private to external API users.
660
def get_canonical_inventory_paths(self, paths):
661
"""Like get_canonical_inventory_path() but works on multiple items.
663
:param paths: A sequence of paths relative to the root of the tree.
664
:return: A list of paths, with each item the corresponding input path
665
adjusted to account for existing elements that match case
668
return list(self._yield_canonical_inventory_paths(paths))
670
def get_canonical_inventory_path(self, path):
671
"""Returns the first inventory item that case-insensitively matches path.
673
If a path matches exactly, it is returned. If no path matches exactly
674
but more than one path matches case-insensitively, it is implementation
675
defined which is returned.
677
If no path matches case-insensitively, the input path is returned, but
678
with as many path entries that do exist changed to their canonical
681
If you need to resolve many names from the same tree, you should
682
use get_canonical_inventory_paths() to avoid O(N) behaviour.
684
:param path: A paths relative to the root of the tree.
685
:return: The input path adjusted to account for existing elements
686
that match case insensitively.
688
return self._yield_canonical_inventory_paths([path]).next()
690
def _yield_canonical_inventory_paths(self, paths):
692
# First, if the path as specified exists exactly, just use it.
693
if self.path2id(path) is not None:
697
cur_id = self.get_root_id()
699
bit_iter = iter(path.split("/"))
703
for child in self.iter_children(cur_id):
705
# XXX: it seem like if the child is known to be in the
706
# tree, we shouldn't need to go from its id back to
707
# its path -- mbp 2010-02-11
709
# XXX: it seems like we could be more efficient
710
# by just directly looking up the original name and
711
# only then searching all children; also by not
712
# chopping paths so much. -- mbp 2010-02-11
713
child_base = os.path.basename(self.id2path(child))
714
if (child_base == elt):
715
# if we found an exact match, we can stop now; if
716
# we found an approximate match we need to keep
717
# searching because there might be an exact match
720
new_path = osutils.pathjoin(cur_path, child_base)
722
elif child_base.lower() == lelt:
724
new_path = osutils.pathjoin(cur_path, child_base)
725
except errors.NoSuchId:
726
# before a change is committed we can see this error...
731
# got to the end of this directory and no entries matched.
732
# Return what matched so far, plus the rest as specified.
733
cur_path = osutils.pathjoin(cur_path, elt, *list(bit_iter))
738
def _get_inventory(self):
739
return self._inventory
741
inventory = property(_get_inventory,
742
doc="Inventory of this Tree")
745
def path2id(self, path):
746
"""Return the id for path in this tree."""
747
return self._inventory.path2id(path)
749
def id2path(self, file_id):
750
"""Return the path for a file id.
754
return self.inventory.id2path(file_id)
756
def has_id(self, file_id):
757
return self.inventory.has_id(file_id)
759
def has_or_had_id(self, file_id):
760
return self.inventory.has_id(file_id)
762
def all_file_ids(self):
763
return set(self.inventory)
765
@deprecated_method(deprecated_in((2, 4, 0)))
767
return iter(self.inventory)
769
def filter_unversioned_files(self, paths):
770
"""Filter out paths that are versioned.
772
:return: set of paths.
774
# NB: we specifically *don't* call self.has_filename, because for
775
# WorkingTrees that can indicate files that exist on disk but that
777
pred = self.inventory.has_filename
778
return set((p for p in paths if not pred(p)))
781
def iter_entries_by_dir(self, specific_file_ids=None, yield_parents=False):
782
"""Walk the tree in 'by_dir' order.
784
This will yield each entry in the tree as a (path, entry) tuple.
785
The order that they are yielded is:
787
See Tree.iter_entries_by_dir for details.
789
:param yield_parents: If True, yield the parents from the root leading
790
down to specific_file_ids that have been requested. This has no
791
impact if specific_file_ids is None.
793
return self.inventory.iter_entries_by_dir(
794
specific_file_ids=specific_file_ids, yield_parents=yield_parents)
796
def get_file_by_path(self, path):
797
return self.get_file(self._inventory.path2id(path), path)
699
800
######################################################################
844
934
will pass through to InterTree as appropriate.
937
# Formats that will be used to test this InterTree. If both are
938
# None, this InterTree will not be tested (e.g. because a complex
940
_matching_from_tree_format = None
941
_matching_to_tree_format = None
946
def is_compatible(kls, source, target):
947
# The default implementation is naive and uses the public API, so
948
# it works for all trees.
951
def _changes_from_entries(self, source_entry, target_entry,
952
source_path=None, target_path=None):
953
"""Generate a iter_changes tuple between source_entry and target_entry.
955
:param source_entry: An inventory entry from self.source, or None.
956
:param target_entry: An inventory entry from self.target, or None.
957
:param source_path: The path of source_entry, if known. If not known
958
it will be looked up.
959
:param target_path: The path of target_entry, if known. If not known
960
it will be looked up.
961
:return: A tuple, item 0 of which is an iter_changes result tuple, and
962
item 1 is True if there are any changes in the result tuple.
964
if source_entry is None:
965
if target_entry is None:
967
file_id = target_entry.file_id
969
file_id = source_entry.file_id
970
if source_entry is not None:
971
source_versioned = True
972
source_name = source_entry.name
973
source_parent = source_entry.parent_id
974
if source_path is None:
975
source_path = self.source.id2path(file_id)
976
source_kind, source_executable, source_stat = \
977
self.source._comparison_data(source_entry, source_path)
979
source_versioned = False
983
source_executable = None
984
if target_entry is not None:
985
target_versioned = True
986
target_name = target_entry.name
987
target_parent = target_entry.parent_id
988
if target_path is None:
989
target_path = self.target.id2path(file_id)
990
target_kind, target_executable, target_stat = \
991
self.target._comparison_data(target_entry, target_path)
993
target_versioned = False
997
target_executable = None
998
versioned = (source_versioned, target_versioned)
999
kind = (source_kind, target_kind)
1000
changed_content = False
1001
if source_kind != target_kind:
1002
changed_content = True
1003
elif source_kind == 'file':
1004
if (self.source.get_file_sha1(file_id, source_path, source_stat) !=
1005
self.target.get_file_sha1(file_id, target_path, target_stat)):
1006
changed_content = True
1007
elif source_kind == 'symlink':
1008
if (self.source.get_symlink_target(file_id) !=
1009
self.target.get_symlink_target(file_id)):
1010
changed_content = True
1011
# XXX: Yes, the indentation below is wrong. But fixing it broke
1012
# test_merge.TestMergerEntriesLCAOnDisk.
1013
# test_nested_tree_subtree_renamed_and_modified. We'll wait for
1014
# the fix from bzr.dev -- vila 2009026
1015
elif source_kind == 'tree-reference':
1016
if (self.source.get_reference_revision(file_id, source_path)
1017
!= self.target.get_reference_revision(file_id, target_path)):
1018
changed_content = True
1019
parent = (source_parent, target_parent)
1020
name = (source_name, target_name)
1021
executable = (source_executable, target_executable)
1022
if (changed_content is not False or versioned[0] != versioned[1]
1023
or parent[0] != parent[1] or name[0] != name[1] or
1024
executable[0] != executable[1]):
1028
return (file_id, (source_path, target_path), changed_content,
1029
versioned, parent, name, kind, executable), changes
849
1031
@needs_read_lock
850
1032
def compare(self, want_unchanged=False, specific_files=None,
851
1033
extra_trees=None, require_versioned=False, include_root=False,
921
1107
lookup_trees = [self.source]
923
1109
lookup_trees.extend(extra_trees)
1110
# The ids of items we need to examine to insure delta consistency.
1111
precise_file_ids = set()
1112
changed_file_ids = []
924
1113
if specific_files == []:
925
1114
specific_file_ids = []
927
1116
specific_file_ids = self.target.paths2ids(specific_files,
928
1117
lookup_trees, require_versioned=require_versioned)
1118
if specific_files is not None:
1119
# reparented or added entries must have their parents included
1120
# so that valid deltas can be created. The seen_parents set
1121
# tracks the parents that we need to have.
1122
# The seen_dirs set tracks directory entries we've yielded.
1123
# After outputting version object in to_entries we set difference
1124
# the two seen sets and start checking parents.
1125
seen_parents = set()
929
1127
if want_unversioned:
930
1128
all_unversioned = sorted([(p.split('/'), p) for p in
931
1129
self.target.extras()
932
1130
if specific_files is None or
933
1131
osutils.is_inside_any(specific_files, p)])
934
all_unversioned = deque(all_unversioned)
1132
all_unversioned = collections.deque(all_unversioned)
936
all_unversioned = deque()
1134
all_unversioned = collections.deque()
938
1136
from_entries_by_dir = list(self.source.iter_entries_by_dir(
939
1137
specific_file_ids=specific_file_ids))
945
1143
# the unversioned path lookup only occurs on real trees - where there
946
1144
# can be extras. So the fake_entry is solely used to look up
947
1145
# executable it values when execute is not supported.
948
fake_entry = InventoryFile('unused', 'unused', 'unused')
949
for to_path, to_entry in to_entries_by_dir:
950
while all_unversioned and all_unversioned[0][0] < to_path.split('/'):
1146
fake_entry = inventory.InventoryFile('unused', 'unused', 'unused')
1147
for target_path, target_entry in to_entries_by_dir:
1148
while (all_unversioned and
1149
all_unversioned[0][0] < target_path.split('/')):
951
1150
unversioned_path = all_unversioned.popleft()
952
to_kind, to_executable, to_stat = \
1151
target_kind, target_executable, target_stat = \
953
1152
self.target._comparison_data(fake_entry, unversioned_path[1])
954
1153
yield (None, (None, unversioned_path[1]), True, (False, False),
956
1155
(None, unversioned_path[0][-1]),
958
(None, to_executable))
959
file_id = to_entry.file_id
960
to_paths[file_id] = to_path
1156
(None, target_kind),
1157
(None, target_executable))
1158
source_path, source_entry = from_data.get(target_entry.file_id,
1160
result, changes = self._changes_from_entries(source_entry,
1161
target_entry, source_path=source_path, target_path=target_path)
1162
to_paths[result[0]] = result[1][1]
961
1163
entry_count += 1
962
changed_content = False
963
from_path, from_entry = from_data.get(file_id, (None, None))
964
from_versioned = (from_entry is not None)
965
if from_entry is not None:
966
from_versioned = True
967
from_name = from_entry.name
968
from_parent = from_entry.parent_id
969
from_kind, from_executable, from_stat = \
970
self.source._comparison_data(from_entry, from_path)
971
1165
entry_count += 1
973
from_versioned = False
977
from_executable = None
978
versioned = (from_versioned, True)
979
to_kind, to_executable, to_stat = \
980
self.target._comparison_data(to_entry, to_path)
981
kind = (from_kind, to_kind)
982
if kind[0] != kind[1]:
983
changed_content = True
984
elif from_kind == 'file':
985
if (self.source.get_file_sha1(file_id, from_path, from_stat) !=
986
self.target.get_file_sha1(file_id, to_path, to_stat)):
987
changed_content = True
988
elif from_kind == 'symlink':
989
if (self.source.get_symlink_target(file_id) !=
990
self.target.get_symlink_target(file_id)):
991
changed_content = True
992
# XXX: Yes, the indentation below is wrong. But fixing it broke
993
# test_merge.TestMergerEntriesLCAOnDisk.
994
# test_nested_tree_subtree_renamed_and_modified. We'll wait for
995
# the fix from bzr.dev -- vila 2009026
996
elif from_kind == 'tree-reference':
997
if (self.source.get_reference_revision(file_id, from_path)
998
!= self.target.get_reference_revision(file_id, to_path)):
999
changed_content = True
1000
parent = (from_parent, to_entry.parent_id)
1001
name = (from_name, to_entry.name)
1002
executable = (from_executable, to_executable)
1003
1166
if pb is not None:
1004
1167
pb.update('comparing files', entry_count, num_entries)
1005
if (changed_content is not False or versioned[0] != versioned[1]
1006
or parent[0] != parent[1] or name[0] != name[1] or
1007
executable[0] != executable[1] or include_unchanged):
1008
yield (file_id, (from_path, to_path), changed_content,
1009
versioned, parent, name, kind, executable)
1168
if changes or include_unchanged:
1169
if specific_file_ids is not None:
1170
new_parent_id = result[4][1]
1171
precise_file_ids.add(new_parent_id)
1172
changed_file_ids.append(result[0])
1174
# Ensure correct behaviour for reparented/added specific files.
1175
if specific_files is not None:
1176
# Record output dirs
1177
if result[6][1] == 'directory':
1178
seen_dirs.add(result[0])
1179
# Record parents of reparented/added entries.
1180
versioned = result[3]
1182
if not versioned[0] or parents[0] != parents[1]:
1183
seen_parents.add(parents[1])
1011
1184
while all_unversioned:
1012
1185
# yield any trailing unversioned paths
1013
1186
unversioned_path = all_unversioned.popleft()
1018
1191
(None, unversioned_path[0][-1]),
1019
1192
(None, to_kind),
1020
1193
(None, to_executable))
1022
def get_to_path(to_entry):
1023
if to_entry.parent_id is None:
1024
to_path = '' # the root
1026
if to_entry.parent_id not in to_paths:
1028
return get_to_path(self.target.inventory[to_entry.parent_id])
1029
to_path = osutils.pathjoin(to_paths[to_entry.parent_id],
1031
to_paths[to_entry.file_id] = to_path
1194
# Yield all remaining source paths
1034
1195
for path, from_entry in from_entries_by_dir:
1035
1196
file_id = from_entry.file_id
1036
1197
if file_id in to_paths:
1037
1198
# already returned
1039
if not file_id in self.target.all_file_ids():
1200
if not self.target.has_id(file_id):
1040
1201
# common case - paths we have not emitted are not present in
1044
to_path = get_to_path(self.target.inventory[file_id])
1205
to_path = self.target.id2path(file_id)
1045
1206
entry_count += 1
1046
1207
if pb is not None:
1047
1208
pb.update('comparing files', entry_count, num_entries)
1054
1215
executable = (from_executable, None)
1055
1216
changed_content = from_kind is not None
1056
1217
# the parent's path is necessarily known at this point.
1218
changed_file_ids.append(file_id)
1057
1219
yield(file_id, (path, to_path), changed_content, versioned, parent,
1058
1220
name, kind, executable)
1221
changed_file_ids = set(changed_file_ids)
1222
if specific_file_ids is not None:
1223
for result in self._handle_precise_ids(precise_file_ids,
1227
def _get_entry(self, tree, file_id):
1228
"""Get an inventory entry from a tree, with missing entries as None.
1230
If the tree raises NotImplementedError on accessing .inventory, then
1231
this is worked around using iter_entries_by_dir on just the file id
1234
:param tree: The tree to lookup the entry in.
1235
:param file_id: The file_id to lookup.
1238
inventory = tree.inventory
1239
except NotImplementedError:
1240
# No inventory available.
1242
iterator = tree.iter_entries_by_dir(specific_file_ids=[file_id])
1243
return iterator.next()[1]
1244
except StopIteration:
1248
return inventory[file_id]
1249
except errors.NoSuchId:
1252
def _handle_precise_ids(self, precise_file_ids, changed_file_ids,
1253
discarded_changes=None):
1254
"""Fill out a partial iter_changes to be consistent.
1256
:param precise_file_ids: The file ids of parents that were seen during
1258
:param changed_file_ids: The file ids of already emitted items.
1259
:param discarded_changes: An optional dict of precalculated
1260
iter_changes items which the partial iter_changes had not output
1262
:return: A generator of iter_changes items to output.
1264
# process parents of things that had changed under the users
1265
# requested paths to prevent incorrect paths or parent ids which
1266
# aren't in the tree.
1267
while precise_file_ids:
1268
precise_file_ids.discard(None)
1269
# Don't emit file_ids twice
1270
precise_file_ids.difference_update(changed_file_ids)
1271
if not precise_file_ids:
1273
# If the there was something at a given output path in source, we
1274
# have to include the entry from source in the delta, or we would
1275
# be putting this entry into a used path.
1277
for parent_id in precise_file_ids:
1279
paths.append(self.target.id2path(parent_id))
1280
except errors.NoSuchId:
1281
# This id has been dragged in from the source by delta
1282
# expansion and isn't present in target at all: we don't
1283
# need to check for path collisions on it.
1286
old_id = self.source.path2id(path)
1287
precise_file_ids.add(old_id)
1288
precise_file_ids.discard(None)
1289
current_ids = precise_file_ids
1290
precise_file_ids = set()
1291
# We have to emit all of precise_file_ids that have been altered.
1292
# We may have to output the children of some of those ids if any
1293
# directories have stopped being directories.
1294
for file_id in current_ids:
1296
if discarded_changes:
1297
result = discarded_changes.get(file_id)
1302
old_entry = self._get_entry(self.source, file_id)
1303
new_entry = self._get_entry(self.target, file_id)
1304
result, changes = self._changes_from_entries(
1305
old_entry, new_entry)
1308
# Get this parents parent to examine.
1309
new_parent_id = result[4][1]
1310
precise_file_ids.add(new_parent_id)
1312
if (result[6][0] == 'directory' and
1313
result[6][1] != 'directory'):
1314
# This stopped being a directory, the old children have
1316
if old_entry is None:
1317
# Reusing a discarded change.
1318
old_entry = self._get_entry(self.source, file_id)
1319
for child in old_entry.children.values():
1320
precise_file_ids.add(child.file_id)
1321
changed_file_ids.add(result[0])
1325
InterTree.register_optimiser(InterTree)
1061
1328
class MultiWalker(object):
added
removed
bzrlib/tree.py
