13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
17
"""Tree classes, representing directory at point in time.
20
from __future__ import absolute_import
21
from collections import deque
22
from cStringIO import StringIO
24
from bzrlib.lazy_import import lazy_import
25
lazy_import(globals(), """
25
28
from bzrlib import (
26
29
conflicts as _mod_conflicts,
29
36
revision as _mod_revision,
40
from bzrlib.i18n import gettext
33
43
from bzrlib.decorators import needs_read_lock
34
from bzrlib.errors import BzrError, BzrCheckError
35
from bzrlib import errors
36
from bzrlib.inventory import Inventory, InventoryFile
37
44
from bzrlib.inter import InterObject
38
from bzrlib.osutils import fingerprint_file
39
import bzrlib.revision
40
from bzrlib.trace import mutter, note
45
from bzrlib.symbol_versioning import (
43
51
class Tree(object):
44
52
"""Abstract file tree.
46
54
There are several subclasses:
48
56
* `WorkingTree` exists as files on disk editable by the user.
50
58
* `RevisionTree` is a tree as recorded at some point in the past.
52
Trees contain an `Inventory` object, and also know how to retrieve
53
file texts mentioned in the inventory, either from a working
54
directory or from a store.
56
It is possible for trees to contain files that are not described
57
in their inventory or vice versa; for this use `filenames()`.
59
60
Trees can be compared, etc, regardless of whether they are working
60
61
trees or versioned trees.
64
def has_versioned_directories(self):
65
"""Whether this tree can contain explicitly versioned directories.
67
This defaults to True, but some implementations may want to override
63
72
def changes_from(self, other, want_unchanged=False, specific_files=None,
64
73
extra_trees=None, require_versioned=False, include_root=False,
65
74
want_unversioned=False):
198
188
The yield order (ignoring root) would be::
199
190
a, f, a/b, a/d, a/b/c, a/d/e, f/g
201
return self.inventory.iter_entries_by_dir(
202
specific_file_ids=specific_file_ids)
192
:param yield_parents: If True, yield the parents from the root leading
193
down to specific_file_ids that have been requested. This has no
194
impact if specific_file_ids is None.
196
raise NotImplementedError(self.iter_entries_by_dir)
198
def iter_child_entries(self, file_id, path=None):
199
"""Iterate over the children of a directory or tree reference.
201
:param file_id: File id of the directory/tree-reference
202
:param path: Optional path of the directory
203
:raise NoSuchId: When the file_id does not exist
204
:return: Iterator over entries in the directory
206
raise NotImplementedError(self.iter_child_entries)
208
def list_files(self, include_root=False, from_dir=None, recursive=True):
209
"""List all files in this tree.
211
:param include_root: Whether to include the entry for the tree root
212
:param from_dir: Directory under which to list files
213
:param recursive: Whether to list files recursively
214
:return: iterator over tuples of (path, versioned, kind, file_id,
217
raise NotImplementedError(self.list_files)
204
219
def iter_references(self):
205
for path, entry in self.iter_entries_by_dir():
206
if entry.kind == 'tree-reference':
207
yield path, entry.file_id
220
if self.supports_tree_reference():
221
for path, entry in self.iter_entries_by_dir():
222
if entry.kind == 'tree-reference':
223
yield path, entry.file_id
209
225
def kind(self, file_id):
210
226
raise NotImplementedError("Tree subclass %s must implement kind"
251
271
def _file_size(self, entry, stat_value):
252
272
raise NotImplementedError(self._file_size)
254
def _get_inventory(self):
255
return self._inventory
257
274
def get_file(self, file_id, path=None):
258
275
"""Return a file object for the file file_id in the tree.
260
277
If both file_id and path are defined, it is implementation defined as
261
278
to which one is used.
263
280
raise NotImplementedError(self.get_file)
282
def get_file_with_stat(self, file_id, path=None):
283
"""Get a file handle and stat object for file_id.
285
The default implementation returns (self.get_file, None) for backwards
288
:param file_id: The file id to read.
289
:param path: The path of the file, if it is known.
290
:return: A tuple (file_handle, stat_value_or_None). If the tree has
291
no stat facility, or need for a stat cache feedback during commit,
292
it may return None for the second element of the tuple.
294
return (self.get_file(file_id, path), None)
296
def get_file_text(self, file_id, path=None):
297
"""Return the byte content of a file.
299
:param file_id: The file_id of the file.
300
:param path: The path of the file.
302
If both file_id and path are supplied, an implementation may use
305
:returns: A single byte string for the whole file.
307
my_file = self.get_file(file_id, path)
309
return my_file.read()
313
def get_file_lines(self, file_id, path=None):
314
"""Return the content of a file, as lines.
316
:param file_id: The file_id of the file.
317
:param path: The path of the file.
319
If both file_id and path are supplied, an implementation may use
322
return osutils.split_lines(self.get_file_text(file_id, path))
324
def get_file_verifier(self, file_id, path=None, stat_value=None):
325
"""Return a verifier for a file.
327
The default implementation returns a sha1.
329
:param file_id: The handle for this file.
330
:param path: The path that this file can be found at.
331
These must point to the same object.
332
:param stat_value: Optional stat value for the object
333
:return: Tuple with verifier name and verifier data
335
return ("SHA1", self.get_file_sha1(file_id, path=path,
336
stat_value=stat_value))
338
def get_file_sha1(self, file_id, path=None, stat_value=None):
339
"""Return the SHA1 file for a file.
341
:note: callers should use get_file_verifier instead
342
where possible, as the underlying repository implementation may
343
have quicker access to a non-sha1 verifier.
345
:param file_id: The handle for this file.
346
:param path: The path that this file can be found at.
347
These must point to the same object.
348
:param stat_value: Optional stat value for the object
350
raise NotImplementedError(self.get_file_sha1)
265
352
def get_file_mtime(self, file_id, path=None):
266
353
"""Return the modification time for a file.
382
478
except errors.NoSuchRevisionInTree:
383
479
yield self.repository.revision_tree(revision_id)
386
def _file_revision(revision_tree, file_id):
387
"""Determine the revision associated with a file in a given tree."""
388
revision_tree.lock_read()
390
return revision_tree.inventory[file_id].revision
392
revision_tree.unlock()
394
481
def _get_file_revision(self, file_id, vf, tree_revision):
395
482
"""Ensure that file_id, tree_revision is in vf to plan the merge."""
397
484
if getattr(self, '_repository', None) is None:
398
485
last_revision = tree_revision
399
parent_keys = [(file_id, self._file_revision(t, file_id)) for t in
486
parent_keys = [(file_id, t.get_file_revision(file_id)) for t in
400
487
self._iter_parent_trees()]
401
488
vf.add_lines((file_id, last_revision), parent_keys,
402
self.get_file(file_id).readlines())
489
self.get_file_lines(file_id))
403
490
repo = self.branch.repository
404
491
base_vf = repo.texts
406
last_revision = self._file_revision(self, file_id)
493
last_revision = self.get_file_revision(file_id)
407
494
base_vf = self._repository.texts
408
495
if base_vf not in vf.fallback_versionedfiles:
409
496
vf.fallback_versionedfiles.append(base_vf)
410
497
return last_revision
412
inventory = property(_get_inventory,
413
doc="Inventory of this Tree")
415
499
def _check_retrieved(self, ie, f):
416
500
if not __debug__:
418
fp = fingerprint_file(f)
502
fp = osutils.fingerprint_file(f)
421
505
if ie.text_size is not None:
422
506
if ie.text_size != fp['size']:
423
raise BzrError("mismatched size for file %r in %r" % (ie.file_id, self._store),
507
raise errors.BzrError(
508
"mismatched size for file %r in %r" %
509
(ie.file_id, self._store),
424
510
["inventory expects %d bytes" % ie.text_size,
425
511
"file is actually %d bytes" % fp['size'],
426
512
"store is probably damaged/corrupt"])
428
514
if ie.text_sha1 != fp['sha1']:
429
raise BzrError("wrong SHA-1 for file %r in %r" % (ie.file_id, self._store),
515
raise errors.BzrError("wrong SHA-1 for file %r in %r" %
516
(ie.file_id, self._store),
430
517
["inventory expects %s" % ie.text_sha1,
431
518
"file is actually %s" % fp['sha1'],
432
519
"store is probably damaged/corrupt"])
435
521
def path2id(self, path):
436
522
"""Return the id for path in this tree."""
437
return self._inventory.path2id(path)
523
raise NotImplementedError(self.path2id)
439
525
def paths2ids(self, paths, trees=[], require_versioned=True):
440
526
"""Return all the ids that can be reached by walking from paths.
442
528
Each path is looked up in this tree and any extras provided in
443
529
trees, and this is repeated recursively: the children in an extra tree
444
530
of a directory that has been renamed under a provided path in this tree
553
683
for path in path_names:
554
684
yield searcher.get_items(path)
557
686
def _get_rules_searcher(self, default_searcher):
558
687
"""Get the RulesSearcher for this tree given the default one."""
559
688
searcher = default_searcher
563
class EmptyTree(Tree):
566
self._inventory = Inventory(root_id=None)
567
symbol_versioning.warn('EmptyTree is deprecated as of bzr 0.9 please'
568
' use repository.revision_tree instead.',
569
DeprecationWarning, stacklevel=2)
571
def get_parent_ids(self):
574
def get_symlink_target(self, file_id):
577
def has_filename(self, filename):
580
def kind(self, file_id):
583
def list_files(self, include_root=False):
586
def __contains__(self, file_id):
587
return (file_id in self._inventory)
589
def get_file_sha1(self, file_id, path=None, stat_value=None):
593
######################################################################
596
# TODO: Merge these two functions into a single one that can operate
597
# on either a whole tree or a set of files.
599
# TODO: Return the diff in order by filename, not by category or in
600
# random order. Can probably be done by lock-stepping through the
601
# filenames from both trees.
604
def file_status(filename, old_tree, new_tree):
605
"""Return single-letter status, old and new names for a file.
607
The complexity here is in deciding how to represent renames;
608
many complex cases are possible.
692
class InventoryTree(Tree):
693
"""A tree that relies on an inventory for its metadata.
695
Trees contain an `Inventory` object, and also know how to retrieve
696
file texts mentioned in the inventory, either from a working
697
directory or from a store.
699
It is possible for trees to contain files that are not described
700
in their inventory or vice versa; for this use `filenames()`.
702
Subclasses should set the _inventory attribute, which is considered
703
private to external API users.
610
old_inv = old_tree.inventory
611
new_inv = new_tree.inventory
612
new_id = new_inv.path2id(filename)
613
old_id = old_inv.path2id(filename)
615
if not new_id and not old_id:
616
# easy: doesn't exist in either; not versioned at all
617
if new_tree.is_ignored(filename):
618
return 'I', None, None
620
return '?', None, None
622
# There is now a file of this name, great.
625
# There is no longer a file of this name, but we can describe
626
# what happened to the file that used to have
627
# this name. There are two possibilities: either it was
628
# deleted entirely, or renamed.
629
if new_inv.has_id(old_id):
630
return 'X', old_inv.id2path(old_id), new_inv.id2path(old_id)
632
return 'D', old_inv.id2path(old_id), None
634
# if the file_id is new in this revision, it is added
635
if new_id and not old_inv.has_id(new_id):
638
# if there used to be a file of this name, but that ID has now
639
# disappeared, it is deleted
640
if old_id and not new_inv.has_id(old_id):
647
def find_renames(old_inv, new_inv):
648
for file_id in old_inv:
649
if file_id not in new_inv:
651
old_name = old_inv.id2path(file_id)
652
new_name = new_inv.id2path(file_id)
653
if old_name != new_name:
654
yield (old_name, new_name)
706
def get_canonical_inventory_paths(self, paths):
707
"""Like get_canonical_inventory_path() but works on multiple items.
709
:param paths: A sequence of paths relative to the root of the tree.
710
:return: A list of paths, with each item the corresponding input path
711
adjusted to account for existing elements that match case
714
return list(self._yield_canonical_inventory_paths(paths))
716
def get_canonical_inventory_path(self, path):
717
"""Returns the first inventory item that case-insensitively matches path.
719
If a path matches exactly, it is returned. If no path matches exactly
720
but more than one path matches case-insensitively, it is implementation
721
defined which is returned.
723
If no path matches case-insensitively, the input path is returned, but
724
with as many path entries that do exist changed to their canonical
727
If you need to resolve many names from the same tree, you should
728
use get_canonical_inventory_paths() to avoid O(N) behaviour.
730
:param path: A paths relative to the root of the tree.
731
:return: The input path adjusted to account for existing elements
732
that match case insensitively.
734
return self._yield_canonical_inventory_paths([path]).next()
736
def _yield_canonical_inventory_paths(self, paths):
738
# First, if the path as specified exists exactly, just use it.
739
if self.path2id(path) is not None:
743
cur_id = self.get_root_id()
745
bit_iter = iter(path.split("/"))
749
for child in self.iter_children(cur_id):
751
# XXX: it seem like if the child is known to be in the
752
# tree, we shouldn't need to go from its id back to
753
# its path -- mbp 2010-02-11
755
# XXX: it seems like we could be more efficient
756
# by just directly looking up the original name and
757
# only then searching all children; also by not
758
# chopping paths so much. -- mbp 2010-02-11
759
child_base = os.path.basename(self.id2path(child))
760
if (child_base == elt):
761
# if we found an exact match, we can stop now; if
762
# we found an approximate match we need to keep
763
# searching because there might be an exact match
766
new_path = osutils.pathjoin(cur_path, child_base)
768
elif child_base.lower() == lelt:
770
new_path = osutils.pathjoin(cur_path, child_base)
771
except errors.NoSuchId:
772
# before a change is committed we can see this error...
777
# got to the end of this directory and no entries matched.
778
# Return what matched so far, plus the rest as specified.
779
cur_path = osutils.pathjoin(cur_path, elt, *list(bit_iter))
784
@deprecated_method(deprecated_in((2, 5, 0)))
785
def _get_inventory(self):
786
return self._inventory
788
inventory = property(_get_inventory,
789
doc="Inventory of this Tree")
791
def _get_root_inventory(self):
792
return self._inventory
794
root_inventory = property(_get_root_inventory,
795
doc="Root inventory of this tree")
797
def _unpack_file_id(self, file_id):
798
"""Find the inventory and inventory file id for a tree file id.
800
:param file_id: The tree file id, as bytestring or tuple
801
:return: Inventory and inventory file id
803
if isinstance(file_id, tuple):
804
if len(file_id) != 1:
805
raise ValueError("nested trees not yet supported: %r" % file_id)
807
return self.root_inventory, file_id
810
def path2id(self, path):
811
"""Return the id for path in this tree."""
812
return self._path2inv_file_id(path)[1]
814
def _path2inv_file_id(self, path):
815
"""Lookup a inventory and inventory file id by path.
817
:param path: Path to look up
818
:return: tuple with inventory and inventory file id
820
# FIXME: Support nested trees
821
return self.root_inventory, self.root_inventory.path2id(path)
823
def id2path(self, file_id):
824
"""Return the path for a file id.
828
inventory, file_id = self._unpack_file_id(file_id)
829
return inventory.id2path(file_id)
831
def has_id(self, file_id):
832
inventory, file_id = self._unpack_file_id(file_id)
833
return inventory.has_id(file_id)
835
def has_or_had_id(self, file_id):
836
inventory, file_id = self._unpack_file_id(file_id)
837
return inventory.has_id(file_id)
839
def all_file_ids(self):
841
[entry.file_id for path, entry in self.iter_entries_by_dir()])
843
@deprecated_method(deprecated_in((2, 4, 0)))
845
return iter(self.all_file_ids())
847
def filter_unversioned_files(self, paths):
848
"""Filter out paths that are versioned.
850
:return: set of paths.
852
# NB: we specifically *don't* call self.has_filename, because for
853
# WorkingTrees that can indicate files that exist on disk but that
855
return set((p for p in paths if self.path2id(p) is None))
858
def iter_entries_by_dir(self, specific_file_ids=None, yield_parents=False):
859
"""Walk the tree in 'by_dir' order.
861
This will yield each entry in the tree as a (path, entry) tuple.
862
The order that they are yielded is:
864
See Tree.iter_entries_by_dir for details.
866
:param yield_parents: If True, yield the parents from the root leading
867
down to specific_file_ids that have been requested. This has no
868
impact if specific_file_ids is None.
870
if specific_file_ids is None:
871
inventory_file_ids = None
873
inventory_file_ids = []
874
for tree_file_id in specific_file_ids:
875
inventory, inv_file_id = self._unpack_file_id(tree_file_id)
876
if not inventory is self.root_inventory: # for now
877
raise AssertionError("%r != %r" % (
878
inventory, self.root_inventory))
879
inventory_file_ids.append(inv_file_id)
880
# FIXME: Handle nested trees
881
return self.root_inventory.iter_entries_by_dir(
882
specific_file_ids=inventory_file_ids, yield_parents=yield_parents)
885
def iter_child_entries(self, file_id, path=None):
886
inv, inv_file_id = self._unpack_file_id(file_id)
887
return inv[inv_file_id].children.itervalues()
889
@deprecated_method(deprecated_in((2, 5, 0)))
890
def get_file_by_path(self, path):
891
return self.get_file(self.path2id(path), path)
893
def iter_children(self, file_id, path=None):
894
"""See Tree.iter_children."""
895
entry = self.iter_entries_by_dir([file_id]).next()[1]
896
for child in getattr(entry, 'children', {}).itervalues():
657
900
def find_ids_across_trees(filenames, trees, require_versioned=True):
658
901
"""Find the ids corresponding to specified filenames.
660
903
All matches in all trees will be used, and all children of matched
661
904
directories will be used.
739
981
will pass through to InterTree as appropriate.
984
# Formats that will be used to test this InterTree. If both are
985
# None, this InterTree will not be tested (e.g. because a complex
987
_matching_from_tree_format = None
988
_matching_to_tree_format = None
993
def is_compatible(kls, source, target):
994
# The default implementation is naive and uses the public API, so
995
# it works for all trees.
998
def _changes_from_entries(self, source_entry, target_entry,
999
source_path=None, target_path=None):
1000
"""Generate a iter_changes tuple between source_entry and target_entry.
1002
:param source_entry: An inventory entry from self.source, or None.
1003
:param target_entry: An inventory entry from self.target, or None.
1004
:param source_path: The path of source_entry, if known. If not known
1005
it will be looked up.
1006
:param target_path: The path of target_entry, if known. If not known
1007
it will be looked up.
1008
:return: A tuple, item 0 of which is an iter_changes result tuple, and
1009
item 1 is True if there are any changes in the result tuple.
1011
if source_entry is None:
1012
if target_entry is None:
1014
file_id = target_entry.file_id
1016
file_id = source_entry.file_id
1017
if source_entry is not None:
1018
source_versioned = True
1019
source_name = source_entry.name
1020
source_parent = source_entry.parent_id
1021
if source_path is None:
1022
source_path = self.source.id2path(file_id)
1023
source_kind, source_executable, source_stat = \
1024
self.source._comparison_data(source_entry, source_path)
1026
source_versioned = False
1028
source_parent = None
1030
source_executable = None
1031
if target_entry is not None:
1032
target_versioned = True
1033
target_name = target_entry.name
1034
target_parent = target_entry.parent_id
1035
if target_path is None:
1036
target_path = self.target.id2path(file_id)
1037
target_kind, target_executable, target_stat = \
1038
self.target._comparison_data(target_entry, target_path)
1040
target_versioned = False
1042
target_parent = None
1044
target_executable = None
1045
versioned = (source_versioned, target_versioned)
1046
kind = (source_kind, target_kind)
1047
changed_content = False
1048
if source_kind != target_kind:
1049
changed_content = True
1050
elif source_kind == 'file':
1051
if not self.file_content_matches(file_id, file_id, source_path,
1052
target_path, source_stat, target_stat):
1053
changed_content = True
1054
elif source_kind == 'symlink':
1055
if (self.source.get_symlink_target(file_id) !=
1056
self.target.get_symlink_target(file_id)):
1057
changed_content = True
1058
elif source_kind == 'tree-reference':
1059
if (self.source.get_reference_revision(file_id, source_path)
1060
!= self.target.get_reference_revision(file_id, target_path)):
1061
changed_content = True
1062
parent = (source_parent, target_parent)
1063
name = (source_name, target_name)
1064
executable = (source_executable, target_executable)
1065
if (changed_content is not False or versioned[0] != versioned[1]
1066
or parent[0] != parent[1] or name[0] != name[1] or
1067
executable[0] != executable[1]):
1071
return (file_id, (source_path, target_path), changed_content,
1072
versioned, parent, name, kind, executable), changes
744
1074
@needs_read_lock
745
1075
def compare(self, want_unchanged=False, specific_files=None,
746
1076
extra_trees=None, require_versioned=False, include_root=False,
809
1137
:param require_versioned: Raise errors.PathsNotVersionedError if a
810
1138
path in the specific_files list is not versioned in one of
811
1139
source, target or extra_trees.
1140
:param specific_files: An optional list of file paths to restrict the
1141
comparison to. When mapping filenames to ids, all matches in all
1142
trees (including optional extra_trees) are used, and all children
1143
of matched directories are included. The parents in the target tree
1144
of the specific files up to and including the root of the tree are
1145
always evaluated for changes too.
812
1146
:param want_unversioned: Should unversioned files be returned in the
813
1147
output. An unversioned file is defined as one with (False, False)
814
1148
for the versioned pair.
817
1150
lookup_trees = [self.source]
819
1152
lookup_trees.extend(extra_trees)
1153
# The ids of items we need to examine to insure delta consistency.
1154
precise_file_ids = set()
1155
changed_file_ids = []
820
1156
if specific_files == []:
821
1157
specific_file_ids = []
823
1159
specific_file_ids = self.target.paths2ids(specific_files,
824
1160
lookup_trees, require_versioned=require_versioned)
1161
if specific_files is not None:
1162
# reparented or added entries must have their parents included
1163
# so that valid deltas can be created. The seen_parents set
1164
# tracks the parents that we need to have.
1165
# The seen_dirs set tracks directory entries we've yielded.
1166
# After outputting version object in to_entries we set difference
1167
# the two seen sets and start checking parents.
1168
seen_parents = set()
825
1170
if want_unversioned:
826
1171
all_unversioned = sorted([(p.split('/'), p) for p in
827
1172
self.target.extras()
828
1173
if specific_files is None or
829
1174
osutils.is_inside_any(specific_files, p)])
830
all_unversioned = deque(all_unversioned)
1175
all_unversioned = collections.deque(all_unversioned)
832
all_unversioned = deque()
1177
all_unversioned = collections.deque()
834
from_entries_by_dir = list(self.source.inventory.iter_entries_by_dir(
1179
from_entries_by_dir = list(self.source.iter_entries_by_dir(
835
1180
specific_file_ids=specific_file_ids))
836
1181
from_data = dict((e.file_id, (p, e)) for p, e in from_entries_by_dir)
837
to_entries_by_dir = list(self.target.inventory.iter_entries_by_dir(
1182
to_entries_by_dir = list(self.target.iter_entries_by_dir(
838
1183
specific_file_ids=specific_file_ids))
839
1184
num_entries = len(from_entries_by_dir) + len(to_entries_by_dir)
841
# the unversioned path lookup only occurs on real trees - where there
1186
# the unversioned path lookup only occurs on real trees - where there
842
1187
# can be extras. So the fake_entry is solely used to look up
843
1188
# executable it values when execute is not supported.
844
fake_entry = InventoryFile('unused', 'unused', 'unused')
845
for to_path, to_entry in to_entries_by_dir:
846
while all_unversioned and all_unversioned[0][0] < to_path.split('/'):
1189
fake_entry = inventory.InventoryFile('unused', 'unused', 'unused')
1190
for target_path, target_entry in to_entries_by_dir:
1191
while (all_unversioned and
1192
all_unversioned[0][0] < target_path.split('/')):
847
1193
unversioned_path = all_unversioned.popleft()
848
to_kind, to_executable, to_stat = \
1194
target_kind, target_executable, target_stat = \
849
1195
self.target._comparison_data(fake_entry, unversioned_path[1])
850
1196
yield (None, (None, unversioned_path[1]), True, (False, False),
852
1198
(None, unversioned_path[0][-1]),
854
(None, to_executable))
855
file_id = to_entry.file_id
856
to_paths[file_id] = to_path
1199
(None, target_kind),
1200
(None, target_executable))
1201
source_path, source_entry = from_data.get(target_entry.file_id,
1203
result, changes = self._changes_from_entries(source_entry,
1204
target_entry, source_path=source_path, target_path=target_path)
1205
to_paths[result[0]] = result[1][1]
857
1206
entry_count += 1
858
changed_content = False
859
from_path, from_entry = from_data.get(file_id, (None, None))
860
from_versioned = (from_entry is not None)
861
if from_entry is not None:
862
from_versioned = True
863
from_name = from_entry.name
864
from_parent = from_entry.parent_id
865
from_kind, from_executable, from_stat = \
866
self.source._comparison_data(from_entry, from_path)
867
1208
entry_count += 1
869
from_versioned = False
873
from_executable = None
874
versioned = (from_versioned, True)
875
to_kind, to_executable, to_stat = \
876
self.target._comparison_data(to_entry, to_path)
877
kind = (from_kind, to_kind)
878
if kind[0] != kind[1]:
879
changed_content = True
880
elif from_kind == 'file':
881
from_size = self.source._file_size(from_entry, from_stat)
882
to_size = self.target._file_size(to_entry, to_stat)
883
if from_size != to_size:
884
changed_content = True
885
elif (self.source.get_file_sha1(file_id, from_path, from_stat) !=
886
self.target.get_file_sha1(file_id, to_path, to_stat)):
887
changed_content = True
888
elif from_kind == 'symlink':
889
if (self.source.get_symlink_target(file_id) !=
890
self.target.get_symlink_target(file_id)):
891
changed_content = True
892
elif from_kind == 'tree-reference':
893
if (self.source.get_reference_revision(file_id, from_path)
894
!= self.target.get_reference_revision(file_id, to_path)):
895
changed_content = True
896
parent = (from_parent, to_entry.parent_id)
897
name = (from_name, to_entry.name)
898
executable = (from_executable, to_executable)
899
1209
if pb is not None:
900
1210
pb.update('comparing files', entry_count, num_entries)
901
if (changed_content is not False or versioned[0] != versioned[1]
902
or parent[0] != parent[1] or name[0] != name[1] or
903
executable[0] != executable[1] or include_unchanged):
904
yield (file_id, (from_path, to_path), changed_content,
905
versioned, parent, name, kind, executable)
1211
if changes or include_unchanged:
1212
if specific_file_ids is not None:
1213
new_parent_id = result[4][1]
1214
precise_file_ids.add(new_parent_id)
1215
changed_file_ids.append(result[0])
1217
# Ensure correct behaviour for reparented/added specific files.
1218
if specific_files is not None:
1219
# Record output dirs
1220
if result[6][1] == 'directory':
1221
seen_dirs.add(result[0])
1222
# Record parents of reparented/added entries.
1223
versioned = result[3]
1225
if not versioned[0] or parents[0] != parents[1]:
1226
seen_parents.add(parents[1])
907
1227
while all_unversioned:
908
1228
# yield any trailing unversioned paths
909
1229
unversioned_path = all_unversioned.popleft()
950
1258
executable = (from_executable, None)
951
1259
changed_content = from_kind is not None
952
1260
# the parent's path is necessarily known at this point.
1261
changed_file_ids.append(file_id)
953
1262
yield(file_id, (path, to_path), changed_content, versioned, parent,
954
1263
name, kind, executable)
1264
changed_file_ids = set(changed_file_ids)
1265
if specific_file_ids is not None:
1266
for result in self._handle_precise_ids(precise_file_ids,
1270
def _get_entry(self, tree, file_id):
1271
"""Get an inventory entry from a tree, with missing entries as None.
1273
If the tree raises NotImplementedError on accessing .inventory, then
1274
this is worked around using iter_entries_by_dir on just the file id
1277
:param tree: The tree to lookup the entry in.
1278
:param file_id: The file_id to lookup.
1281
inventory = tree.root_inventory
1282
except NotImplementedError:
1283
# No inventory available.
1285
iterator = tree.iter_entries_by_dir(specific_file_ids=[file_id])
1286
return iterator.next()[1]
1287
except StopIteration:
1291
return inventory[file_id]
1292
except errors.NoSuchId:
1295
def _handle_precise_ids(self, precise_file_ids, changed_file_ids,
1296
discarded_changes=None):
1297
"""Fill out a partial iter_changes to be consistent.
1299
:param precise_file_ids: The file ids of parents that were seen during
1301
:param changed_file_ids: The file ids of already emitted items.
1302
:param discarded_changes: An optional dict of precalculated
1303
iter_changes items which the partial iter_changes had not output
1305
:return: A generator of iter_changes items to output.
1307
# process parents of things that had changed under the users
1308
# requested paths to prevent incorrect paths or parent ids which
1309
# aren't in the tree.
1310
while precise_file_ids:
1311
precise_file_ids.discard(None)
1312
# Don't emit file_ids twice
1313
precise_file_ids.difference_update(changed_file_ids)
1314
if not precise_file_ids:
1316
# If the there was something at a given output path in source, we
1317
# have to include the entry from source in the delta, or we would
1318
# be putting this entry into a used path.
1320
for parent_id in precise_file_ids:
1322
paths.append(self.target.id2path(parent_id))
1323
except errors.NoSuchId:
1324
# This id has been dragged in from the source by delta
1325
# expansion and isn't present in target at all: we don't
1326
# need to check for path collisions on it.
1329
old_id = self.source.path2id(path)
1330
precise_file_ids.add(old_id)
1331
precise_file_ids.discard(None)
1332
current_ids = precise_file_ids
1333
precise_file_ids = set()
1334
# We have to emit all of precise_file_ids that have been altered.
1335
# We may have to output the children of some of those ids if any
1336
# directories have stopped being directories.
1337
for file_id in current_ids:
1339
if discarded_changes:
1340
result = discarded_changes.get(file_id)
1345
old_entry = self._get_entry(self.source, file_id)
1346
new_entry = self._get_entry(self.target, file_id)
1347
result, changes = self._changes_from_entries(
1348
old_entry, new_entry)
1351
# Get this parents parent to examine.
1352
new_parent_id = result[4][1]
1353
precise_file_ids.add(new_parent_id)
1355
if (result[6][0] == 'directory' and
1356
result[6][1] != 'directory'):
1357
# This stopped being a directory, the old children have
1359
if old_entry is None:
1360
# Reusing a discarded change.
1361
old_entry = self._get_entry(self.source, file_id)
1362
precise_file_ids.update(
1363
self.source.iter_children(file_id))
1364
changed_file_ids.add(result[0])
1368
def file_content_matches(self, source_file_id, target_file_id,
1369
source_path=None, target_path=None, source_stat=None, target_stat=None):
1370
"""Check if two files are the same in the source and target trees.
1372
This only checks that the contents of the files are the same,
1373
it does not touch anything else.
1375
:param source_file_id: File id of the file in the source tree
1376
:param target_file_id: File id of the file in the target tree
1377
:param source_path: Path of the file in the source tree
1378
:param target_path: Path of the file in the target tree
1379
:param source_stat: Optional stat value of the file in the source tree
1380
:param target_stat: Optional stat value of the file in the target tree
1381
:return: Boolean indicating whether the files have the same contents
1383
source_verifier_kind, source_verifier_data = self.source.get_file_verifier(
1384
source_file_id, source_path, source_stat)
1385
target_verifier_kind, target_verifier_data = self.target.get_file_verifier(
1386
target_file_id, target_path, target_stat)
1387
if source_verifier_kind == target_verifier_kind:
1388
return (source_verifier_data == target_verifier_data)
1389
# Fall back to SHA1 for now
1390
if source_verifier_kind != "SHA1":
1391
source_sha1 = self.source.get_file_sha1(source_file_id,
1392
source_path, source_stat)
1394
source_sha1 = source_verifier_data
1395
if target_verifier_kind != "SHA1":
1396
target_sha1 = self.target.get_file_sha1(target_file_id,
1397
target_path, target_stat)
1399
target_sha1 = target_verifier_data
1400
return (source_sha1 == target_sha1)
1402
InterTree.register_optimiser(InterTree)
957
1405
class MultiWalker(object):
added
removed
bzrlib/tree.py
