17
17
"""Tree classes, representing directory at point in time.
20
from __future__ import absolute_import
24
from .lazy_import import lazy_import
25
lazy_import(globals(), """
21
from collections import deque
29
25
conflicts as _mod_conflicts,
33
30
revision as _mod_revision,
37
from breezy.i18n import gettext
45
from .inter import InterObject
52
class FileTimestampUnavailable(errors.BzrError):
54
_fmt = "The filestamp for %(path)s is not available."
58
def __init__(self, path):
62
class TreeEntry(object):
63
"""An entry that implements the minimum interface used by commands.
66
def __eq__(self, other):
67
# yes, this is ugly, TODO: best practice __eq__ style.
68
return (isinstance(other, TreeEntry)
69
and other.__class__ == self.__class__)
71
def kind_character(self):
75
class TreeDirectory(TreeEntry):
76
"""See TreeEntry. This is a directory in a working tree."""
78
def kind_character(self):
82
class TreeFile(TreeEntry):
83
"""See TreeEntry. This is a regular file in a working tree."""
85
def kind_character(self):
89
class TreeLink(TreeEntry):
90
"""See TreeEntry. This is a symlink in a working tree."""
92
def kind_character(self):
96
class TreeReference(TreeEntry):
97
"""See TreeEntry. This is a reference to a nested tree in a working tree."""
99
def kind_character(self):
33
from bzrlib.decorators import needs_read_lock
34
from bzrlib.errors import BzrError, NoSuchId
35
from bzrlib import errors
36
from bzrlib.inventory import InventoryFile
37
from bzrlib.inter import InterObject
38
from bzrlib.osutils import fingerprint_file
39
import bzrlib.revision
40
from bzrlib.symbol_versioning import deprecated_function, deprecated_in
41
from bzrlib.trace import note
103
44
class Tree(object):
110
51
* `RevisionTree` is a tree as recorded at some point in the past.
53
Trees contain an `Inventory` object, and also know how to retrieve
54
file texts mentioned in the inventory, either from a working
55
directory or from a store.
57
It is possible for trees to contain files that are not described
58
in their inventory or vice versa; for this use `filenames()`.
112
60
Trees can be compared, etc, regardless of whether they are working
113
61
trees or versioned trees.
116
def supports_rename_tracking(self):
117
"""Whether this tree supports rename tracking.
119
This defaults to True, but some implementations may want to override
124
def has_versioned_directories(self):
125
"""Whether this tree can contain explicitly versioned directories.
127
This defaults to True, but some implementations may want to override
132
64
def changes_from(self, other, want_unchanged=False, specific_files=None,
133
65
extra_trees=None, require_versioned=False, include_root=False,
134
66
want_unversioned=False):
148
return iter(self.inventory)
206
150
def all_file_ids(self):
207
151
"""Iterate through all file ids, including ids for missing files."""
208
raise NotImplementedError(self.all_file_ids)
210
def all_versioned_paths(self):
211
"""Iterate through all paths, including paths for missing files."""
212
raise NotImplementedError(self.all_versioned_paths)
152
return set(self.inventory)
214
154
def id2path(self, file_id):
215
155
"""Return the path for a file id.
217
157
:raises NoSuchId:
219
raise NotImplementedError(self.id2path)
221
def iter_entries_by_dir(self, specific_files=None):
159
return self.inventory.id2path(file_id)
161
def is_control_filename(self, filename):
162
"""True if filename is the name of a control file in this tree.
164
:param filename: A filename within the tree. This is a relative path
165
from the root of this tree.
167
This is true IF and ONLY IF the filename is part of the meta data
168
that bzr controls in this tree. I.E. a random .bzr directory placed
169
on disk will not be a control file for this tree.
171
return self.bzrdir.is_control_filename(filename)
174
def iter_entries_by_dir(self, specific_file_ids=None, yield_parents=False):
222
175
"""Walk the tree in 'by_dir' order.
224
177
This will yield each entry in the tree as a (path, entry) tuple.
242
195
The yield order (ignoring root) would be::
244
196
a, f, a/b, a/d, a/b/c, a/d/e, f/g
246
raise NotImplementedError(self.iter_entries_by_dir)
248
def iter_child_entries(self, path, file_id=None):
249
"""Iterate over the children of a directory or tree reference.
251
:param path: Path of the directory
252
:param file_id: Optional file id of the directory/tree-reference
253
:raise NoSuchId: When the file_id does not exist
254
:return: Iterator over entries in the directory
256
raise NotImplementedError(self.iter_child_entries)
258
def list_files(self, include_root=False, from_dir=None, recursive=True):
259
"""List all files in this tree.
261
:param include_root: Whether to include the entry for the tree root
262
:param from_dir: Directory under which to list files
263
:param recursive: Whether to list files recursively
264
:return: iterator over tuples of (path, versioned, kind, file_id,
267
raise NotImplementedError(self.list_files)
198
:param yield_parents: If True, yield the parents from the root leading
199
down to specific_file_ids that have been requested. This has no
200
impact if specific_file_ids is None.
202
return self.inventory.iter_entries_by_dir(
203
specific_file_ids=specific_file_ids, yield_parents=yield_parents)
269
205
def iter_references(self):
270
206
if self.supports_tree_reference():
327
269
raise NotImplementedError(self.get_file)
329
def get_file_with_stat(self, path, file_id=None):
271
def get_file_with_stat(self, file_id, path=None):
330
272
"""Get a file handle and stat object for file_id.
332
274
The default implementation returns (self.get_file, None) for backwards
335
:param path: The path of the file.
336
:param file_id: The file id to read, if it is known.
277
:param file_id: The file id to read.
278
:param path: The path of the file, if it is known.
337
279
:return: A tuple (file_handle, stat_value_or_None). If the tree has
338
280
no stat facility, or need for a stat cache feedback during commit,
339
281
it may return None for the second element of the tuple.
341
return (self.get_file(path, file_id), None)
283
return (self.get_file(file_id, path), None)
343
def get_file_text(self, path, file_id=None):
285
def get_file_text(self, file_id, path=None):
344
286
"""Return the byte content of a file.
288
:param file_id: The file_id of the file.
346
289
:param path: The path of the file.
347
:param file_id: The file_id of the file.
349
290
If both file_id and path are supplied, an implementation may use
352
:returns: A single byte string for the whole file.
354
with self.get_file(path, file_id) as my_file:
293
my_file = self.get_file(file_id, path)
355
295
return my_file.read()
357
def get_file_lines(self, path, file_id=None):
299
def get_file_lines(self, file_id, path=None):
358
300
"""Return the content of a file, as lines.
302
:param file_id: The file_id of the file.
360
303
:param path: The path of the file.
361
:param file_id: The file_id of the file.
363
304
If both file_id and path are supplied, an implementation may use
366
return osutils.split_lines(self.get_file_text(path, file_id))
368
def get_file_verifier(self, path, file_id=None, stat_value=None):
369
"""Return a verifier for a file.
371
The default implementation returns a sha1.
373
:param file_id: The handle for this file.
374
:param path: The path that this file can be found at.
375
These must point to the same object.
376
:param stat_value: Optional stat value for the object
377
:return: Tuple with verifier name and verifier data
379
return ("SHA1", self.get_file_sha1(path, file_id,
380
stat_value=stat_value))
382
def get_file_sha1(self, path, file_id=None, stat_value=None):
383
"""Return the SHA1 file for a file.
385
:note: callers should use get_file_verifier instead
386
where possible, as the underlying repository implementation may
387
have quicker access to a non-sha1 verifier.
389
:param path: The path that this file can be found at.
390
:param file_id: The handle for this file.
391
These must point to the same object.
392
:param stat_value: Optional stat value for the object
394
raise NotImplementedError(self.get_file_sha1)
396
def get_file_mtime(self, path, file_id=None):
307
return osutils.split_lines(self.get_file_text(file_id, path))
309
def get_file_mtime(self, file_id, path=None):
397
310
"""Return the modification time for a file.
312
:param file_id: The handle for this file.
399
313
:param path: The path that this file can be found at.
400
:param file_id: The handle for this file.
401
314
These must point to the same object.
403
316
raise NotImplementedError(self.get_file_mtime)
405
def get_file_size(self, path, file_id=None):
318
def get_file_size(self, file_id):
406
319
"""Return the size of a file in bytes.
408
321
This applies only to regular files. If invoked on directories or
436
343
this implementation, it is a tuple containing a single bytestring with
437
344
the complete text of the file.
439
:param desired_files: a list of (path, identifier) pairs
346
:param desired_files: a list of (file_id, identifier) pairs
441
for path, identifier in desired_files:
348
for file_id, identifier in desired_files:
442
349
# We wrap the string in a tuple so that we can return an iterable
443
350
# of bytestrings. (Technically, a bytestring is also an iterable
444
351
# of bytestrings, but iterating through each character is not
446
cur_file = (self.get_file_text(path),)
353
cur_file = (self.get_file_text(file_id),)
447
354
yield identifier, cur_file
449
def get_symlink_target(self, path, file_id=None):
356
def get_symlink_target(self, file_id):
450
357
"""Get the target for a given file_id.
452
359
It is assumed that the caller already knows that file_id is referencing
454
361
:param file_id: Handle for the symlink entry.
455
:param path: The path of the file.
456
If both file_id and path are supplied, an implementation may use
458
362
:return: The path the symlink points to.
460
364
raise NotImplementedError(self.get_symlink_target)
366
def get_canonical_inventory_paths(self, paths):
367
"""Like get_canonical_inventory_path() but works on multiple items.
369
:param paths: A sequence of paths relative to the root of the tree.
370
:return: A list of paths, with each item the corresponding input path
371
adjusted to account for existing elements that match case
374
return list(self._yield_canonical_inventory_paths(paths))
376
def get_canonical_inventory_path(self, path):
377
"""Returns the first inventory item that case-insensitively matches path.
379
If a path matches exactly, it is returned. If no path matches exactly
380
but more than one path matches case-insensitively, it is implementation
381
defined which is returned.
383
If no path matches case-insensitively, the input path is returned, but
384
with as many path entries that do exist changed to their canonical
387
If you need to resolve many names from the same tree, you should
388
use get_canonical_inventory_paths() to avoid O(N) behaviour.
390
:param path: A paths relative to the root of the tree.
391
:return: The input path adjusted to account for existing elements
392
that match case insensitively.
394
return self._yield_canonical_inventory_paths([path]).next()
396
def _yield_canonical_inventory_paths(self, paths):
398
# First, if the path as specified exists exactly, just use it.
399
if self.path2id(path) is not None:
403
cur_id = self.get_root_id()
405
bit_iter = iter(path.split("/"))
409
for child in self.iter_children(cur_id):
411
# XXX: it seem like if the child is known to be in the
412
# tree, we shouldn't need to go from its id back to
413
# its path -- mbp 2010-02-11
415
# XXX: it seems like we could be more efficient
416
# by just directly looking up the original name and
417
# only then searching all children; also by not
418
# chopping paths so much. -- mbp 2010-02-11
419
child_base = os.path.basename(self.id2path(child))
420
if (child_base == elt):
421
# if we found an exact match, we can stop now; if
422
# we found an approximate match we need to keep
423
# searching because there might be an exact match
426
new_path = osutils.pathjoin(cur_path, child_base)
428
elif child_base.lower() == lelt:
430
new_path = osutils.pathjoin(cur_path, child_base)
432
# before a change is committed we can see this error...
437
# got to the end of this directory and no entries matched.
438
# Return what matched so far, plus the rest as specified.
439
cur_path = osutils.pathjoin(cur_path, elt, *list(bit_iter))
462
444
def get_root_id(self):
463
445
"""Return the file_id for the root of this tree."""
464
446
raise NotImplementedError(self.get_root_id)
466
def annotate_iter(self, path, file_id=None,
448
def annotate_iter(self, file_id,
467
449
default_revision=_mod_revision.CURRENT_REVISION):
468
450
"""Return an iterator of revision_id, line tuples.
478
460
raise NotImplementedError(self.annotate_iter)
462
def _get_plan_merge_data(self, file_id, other, base):
463
from bzrlib import versionedfile
464
vf = versionedfile._PlanMergeVersionedFile(file_id)
465
last_revision_a = self._get_file_revision(file_id, vf, 'this:')
466
last_revision_b = other._get_file_revision(file_id, vf, 'other:')
468
last_revision_base = None
470
last_revision_base = base._get_file_revision(file_id, vf, 'base:')
471
return vf, last_revision_a, last_revision_b, last_revision_base
473
def plan_file_merge(self, file_id, other, base=None):
474
"""Generate a merge plan based on annotations.
476
If the file contains uncommitted changes in this tree, they will be
477
attributed to the 'current:' pseudo-revision. If the file contains
478
uncommitted changes in the other tree, they will be assigned to the
479
'other:' pseudo-revision.
481
data = self._get_plan_merge_data(file_id, other, base)
482
vf, last_revision_a, last_revision_b, last_revision_base = data
483
return vf.plan_merge(last_revision_a, last_revision_b,
486
def plan_file_lca_merge(self, file_id, other, base=None):
487
"""Generate a merge plan based lca-newness.
489
If the file contains uncommitted changes in this tree, they will be
490
attributed to the 'current:' pseudo-revision. If the file contains
491
uncommitted changes in the other tree, they will be assigned to the
492
'other:' pseudo-revision.
494
data = self._get_plan_merge_data(file_id, other, base)
495
vf, last_revision_a, last_revision_b, last_revision_base = data
496
return vf.plan_lca_merge(last_revision_a, last_revision_b,
480
499
def _iter_parent_trees(self):
481
500
"""Iterate through parent trees, defaulting to Tree.revision_tree."""
482
501
for revision_id in self.get_parent_ids():
485
504
except errors.NoSuchRevisionInTree:
486
505
yield self.repository.revision_tree(revision_id)
508
def _file_revision(revision_tree, file_id):
509
"""Determine the revision associated with a file in a given tree."""
510
revision_tree.lock_read()
512
return revision_tree.inventory[file_id].revision
514
revision_tree.unlock()
516
def _get_file_revision(self, file_id, vf, tree_revision):
517
"""Ensure that file_id, tree_revision is in vf to plan the merge."""
519
if getattr(self, '_repository', None) is None:
520
last_revision = tree_revision
521
parent_keys = [(file_id, self._file_revision(t, file_id)) for t in
522
self._iter_parent_trees()]
523
vf.add_lines((file_id, last_revision), parent_keys,
524
self.get_file(file_id).readlines())
525
repo = self.branch.repository
528
last_revision = self._file_revision(self, file_id)
529
base_vf = self._repository.texts
530
if base_vf not in vf.fallback_versionedfiles:
531
vf.fallback_versionedfiles.append(base_vf)
534
inventory = property(_get_inventory,
535
doc="Inventory of this Tree")
537
def _check_retrieved(self, ie, f):
540
fp = fingerprint_file(f)
543
if ie.text_size is not None:
544
if ie.text_size != fp['size']:
545
raise BzrError("mismatched size for file %r in %r" % (ie.file_id, self._store),
546
["inventory expects %d bytes" % ie.text_size,
547
"file is actually %d bytes" % fp['size'],
548
"store is probably damaged/corrupt"])
550
if ie.text_sha1 != fp['sha1']:
551
raise BzrError("wrong SHA-1 for file %r in %r" % (ie.file_id, self._store),
552
["inventory expects %s" % ie.text_sha1,
553
"file is actually %s" % fp['sha1'],
554
"store is probably damaged/corrupt"])
488
557
def path2id(self, path):
489
558
"""Return the id for path in this tree."""
490
raise NotImplementedError(self.path2id)
492
def is_versioned(self, path):
493
"""Check whether path is versioned.
495
:param path: Path to check
498
return self.path2id(path) is not None
500
def find_related_paths_across_trees(self, paths, trees=[],
501
require_versioned=True):
502
"""Find related paths in tree corresponding to specified filenames in any
505
All matches in all trees will be used, and all children of matched
506
directories will be used.
508
:param paths: The filenames to find related paths for (if None, returns
510
:param trees: The trees to find file_ids within
511
:param require_versioned: if true, all specified filenames must occur in
513
:return: a set of paths for the specified filenames and their children
516
raise NotImplementedError(self.find_related_paths_across_trees)
559
return self._inventory.path2id(path)
561
def paths2ids(self, paths, trees=[], require_versioned=True):
562
"""Return all the ids that can be reached by walking from paths.
564
Each path is looked up in this tree and any extras provided in
565
trees, and this is repeated recursively: the children in an extra tree
566
of a directory that has been renamed under a provided path in this tree
567
are all returned, even if none exist under a provided path in this
568
tree, and vice versa.
570
:param paths: An iterable of paths to start converting to ids from.
571
Alternatively, if paths is None, no ids should be calculated and None
572
will be returned. This is offered to make calling the api unconditional
573
for code that *might* take a list of files.
574
:param trees: Additional trees to consider.
575
:param require_versioned: If False, do not raise NotVersionedError if
576
an element of paths is not versioned in this tree and all of trees.
578
return find_ids_across_trees(paths, [self] + list(trees), require_versioned)
580
def iter_children(self, file_id):
581
entry = self.iter_entries_by_dir([file_id]).next()[1]
582
for child in getattr(entry, 'children', {}).itervalues():
518
585
def lock_read(self):
519
"""Lock this tree for multiple read only operations.
521
:return: A breezy.lock.LogicalLockResult.
523
return lock.LogicalLockResult(self.unlock)
525
588
def revision_tree(self, revision_id):
526
589
"""Obtain a revision tree for the revision revision_id.
654
721
searcher = default_searcher
657
def archive(self, format, name, root='', subdir=None,
659
"""Create an archive of this tree.
661
:param format: Format name (e.g. 'tar')
662
:param name: target file name
663
:param root: Root directory name (or None)
664
:param subdir: Subdirectory to export (or None)
665
:return: Iterator over archive chunks
667
from .archive import create_archive
668
with self.lock_read():
669
return create_archive(format, self, name, root,
670
subdir, force_mtime=force_mtime)
673
def versionable_kind(cls, kind):
674
"""Check if this tree support versioning a specific file kind."""
675
return (kind in ('file', 'directory', 'symlink', 'tree-reference'))
725
######################################################################
728
# TODO: Merge these two functions into a single one that can operate
729
# on either a whole tree or a set of files.
731
# TODO: Return the diff in order by filename, not by category or in
732
# random order. Can probably be done by lock-stepping through the
733
# filenames from both trees.
736
def file_status(filename, old_tree, new_tree):
737
"""Return single-letter status, old and new names for a file.
739
The complexity here is in deciding how to represent renames;
740
many complex cases are possible.
742
old_inv = old_tree.inventory
743
new_inv = new_tree.inventory
744
new_id = new_inv.path2id(filename)
745
old_id = old_inv.path2id(filename)
747
if not new_id and not old_id:
748
# easy: doesn't exist in either; not versioned at all
749
if new_tree.is_ignored(filename):
750
return 'I', None, None
752
return '?', None, None
754
# There is now a file of this name, great.
757
# There is no longer a file of this name, but we can describe
758
# what happened to the file that used to have
759
# this name. There are two possibilities: either it was
760
# deleted entirely, or renamed.
761
if new_inv.has_id(old_id):
762
return 'X', old_inv.id2path(old_id), new_inv.id2path(old_id)
764
return 'D', old_inv.id2path(old_id), None
766
# if the file_id is new in this revision, it is added
767
if new_id and not old_inv.has_id(new_id):
770
# if there used to be a file of this name, but that ID has now
771
# disappeared, it is deleted
772
if old_id and not new_inv.has_id(old_id):
778
@deprecated_function(deprecated_in((1, 9, 0)))
779
def find_renames(old_inv, new_inv):
780
for file_id in old_inv:
781
if file_id not in new_inv:
783
old_name = old_inv.id2path(file_id)
784
new_name = new_inv.id2path(file_id)
785
if old_name != new_name:
786
yield (old_name, new_name)
789
def find_ids_across_trees(filenames, trees, require_versioned=True):
790
"""Find the ids corresponding to specified filenames.
792
All matches in all trees will be used, and all children of matched
793
directories will be used.
795
:param filenames: The filenames to find file_ids for (if None, returns
797
:param trees: The trees to find file_ids within
798
:param require_versioned: if true, all specified filenames must occur in
800
:return: a set of file ids for the specified filenames and their children.
804
specified_path_ids = _find_ids_across_trees(filenames, trees,
806
return _find_children_across_trees(specified_path_ids, trees)
809
def _find_ids_across_trees(filenames, trees, require_versioned):
810
"""Find the ids corresponding to specified filenames.
812
All matches in all trees will be used, but subdirectories are not scanned.
814
:param filenames: The filenames to find file_ids for
815
:param trees: The trees to find file_ids within
816
:param require_versioned: if true, all specified filenames must occur in
818
:return: a set of file ids for the specified filenames
821
interesting_ids = set()
822
for tree_path in filenames:
825
file_id = tree.path2id(tree_path)
826
if file_id is not None:
827
interesting_ids.add(file_id)
830
not_versioned.append(tree_path)
831
if len(not_versioned) > 0 and require_versioned:
832
raise errors.PathsNotVersionedError(not_versioned)
833
return interesting_ids
836
def _find_children_across_trees(specified_ids, trees):
837
"""Return a set including specified ids and their children.
839
All matches in all trees will be used.
841
:param trees: The trees to find file_ids within
842
:return: a set containing all specified ids and their children
844
interesting_ids = set(specified_ids)
845
pending = interesting_ids
846
# now handle children of interesting ids
847
# we loop so that we handle all children of each id in both trees
848
while len(pending) > 0:
850
for file_id in pending:
852
if not tree.has_or_had_id(file_id):
854
for child_id in tree.iter_children(file_id):
855
if child_id not in interesting_ids:
856
new_pending.add(child_id)
857
interesting_ids.update(new_pending)
858
pending = new_pending
859
return interesting_ids
678
862
class InterTree(InterObject):
698
def is_compatible(kls, source, target):
699
# The default implementation is naive and uses the public API, so
700
# it works for all trees.
703
def _changes_from_entries(self, source_entry, target_entry, source_path,
881
def _changes_from_entries(self, source_entry, target_entry,
882
source_path=None, target_path=None):
705
883
"""Generate a iter_changes tuple between source_entry and target_entry.
707
885
:param source_entry: An inventory entry from self.source, or None.
708
886
:param target_entry: An inventory entry from self.target, or None.
709
:param source_path: The path of source_entry.
710
:param target_path: The path of target_entry.
887
:param source_path: The path of source_entry, if known. If not known
888
it will be looked up.
889
:param target_path: The path of target_entry, if known. If not known
890
it will be looked up.
711
891
:return: A tuple, item 0 of which is an iter_changes result tuple, and
712
892
item 1 is True if there are any changes in the result tuple.
747
931
if source_kind != target_kind:
748
932
changed_content = True
749
933
elif source_kind == 'file':
750
if not self.file_content_matches(
751
source_path, target_path,
752
file_id, file_id, source_stat, target_stat):
934
if (self.source.get_file_sha1(file_id, source_path, source_stat) !=
935
self.target.get_file_sha1(file_id, target_path, target_stat)):
753
936
changed_content = True
754
937
elif source_kind == 'symlink':
755
if (self.source.get_symlink_target(source_path, file_id) !=
756
self.target.get_symlink_target(target_path, file_id)):
938
if (self.source.get_symlink_target(file_id) !=
939
self.target.get_symlink_target(file_id)):
757
940
changed_content = True
758
elif source_kind == 'tree-reference':
759
if (self.source.get_reference_revision(source_path, file_id)
760
!= self.target.get_reference_revision(target_path, file_id)):
941
# XXX: Yes, the indentation below is wrong. But fixing it broke
942
# test_merge.TestMergerEntriesLCAOnDisk.
943
# test_nested_tree_subtree_renamed_and_modified. We'll wait for
944
# the fix from bzr.dev -- vila 2009026
945
elif source_kind == 'tree-reference':
946
if (self.source.get_reference_revision(file_id, source_path)
947
!= self.target.get_reference_revision(file_id, target_path)):
761
948
changed_content = True
762
949
parent = (source_parent, target_parent)
763
950
name = (source_name, target_name)
793
981
trees = (self.source,)
794
982
if extra_trees is not None:
795
983
trees = trees + tuple(extra_trees)
796
with self.lock_read():
797
return delta._compare_trees(self.source, self.target, want_unchanged,
798
specific_files, include_root, extra_trees=extra_trees,
799
require_versioned=require_versioned,
800
want_unversioned=want_unversioned)
984
# target is usually the newer tree:
985
specific_file_ids = self.target.paths2ids(specific_files, trees,
986
require_versioned=require_versioned)
987
if specific_files and not specific_file_ids:
988
# All files are unversioned, so just return an empty delta
989
# _compare_trees would think we want a complete delta
990
result = delta.TreeDelta()
991
fake_entry = InventoryFile('unused', 'unused', 'unused')
992
result.unversioned = [(path, None,
993
self.target._comparison_data(fake_entry, path)[0]) for path in
996
return delta._compare_trees(self.source, self.target, want_unchanged,
997
specific_files, include_root, extra_trees=extra_trees,
998
require_versioned=require_versioned,
999
want_unversioned=want_unversioned)
802
1001
def iter_changes(self, include_unchanged=False,
803
1002
specific_files=None, pb=None, extra_trees=[],
835
1034
output. An unversioned file is defined as one with (False, False)
836
1035
for the versioned pair.
841
extra_trees = list(extra_trees)
1037
lookup_trees = [self.source]
1039
lookup_trees.extend(extra_trees)
842
1040
# The ids of items we need to examine to insure delta consistency.
843
1041
precise_file_ids = set()
844
1042
changed_file_ids = []
845
1043
if specific_files == []:
846
target_specific_files = []
847
source_specific_files = []
1044
specific_file_ids = []
849
target_specific_files = self.target.find_related_paths_across_trees(
850
specific_files, [self.source] + extra_trees,
851
require_versioned=require_versioned)
852
source_specific_files = self.source.find_related_paths_across_trees(
853
specific_files, [self.target] + extra_trees,
854
require_versioned=require_versioned)
1046
specific_file_ids = self.target.paths2ids(specific_files,
1047
lookup_trees, require_versioned=require_versioned)
855
1048
if specific_files is not None:
856
1049
# reparented or added entries must have their parents included
857
1050
# so that valid deltas can be created. The seen_parents set
866
1059
self.target.extras()
867
1060
if specific_files is None or
868
1061
osutils.is_inside_any(specific_files, p)])
869
all_unversioned = collections.deque(all_unversioned)
1062
all_unversioned = deque(all_unversioned)
871
all_unversioned = collections.deque()
1064
all_unversioned = deque()
873
1066
from_entries_by_dir = list(self.source.iter_entries_by_dir(
874
specific_files=source_specific_files))
1067
specific_file_ids=specific_file_ids))
875
1068
from_data = dict((e.file_id, (p, e)) for p, e in from_entries_by_dir)
876
1069
to_entries_by_dir = list(self.target.iter_entries_by_dir(
877
specific_files=target_specific_files))
1070
specific_file_ids=specific_file_ids))
878
1071
num_entries = len(from_entries_by_dir) + len(to_entries_by_dir)
880
1073
# the unversioned path lookup only occurs on real trees - where there
881
1074
# can be extras. So the fake_entry is solely used to look up
882
1075
# executable it values when execute is not supported.
883
fake_entry = TreeFile()
1076
fake_entry = InventoryFile('unused', 'unused', 'unused')
884
1077
for target_path, target_entry in to_entries_by_dir:
885
1078
while (all_unversioned and
886
1079
all_unversioned[0][0] < target_path.split('/')):
1046
1240
precise_file_ids.add(new_parent_id)
1048
1242
if (result[6][0] == 'directory' and
1049
result[6][1] != 'directory'):
1243
result[6][1] != 'directory'):
1050
1244
# This stopped being a directory, the old children have
1051
1245
# to be included.
1052
if source_entry is None:
1246
if old_entry is None:
1053
1247
# Reusing a discarded change.
1054
source_entry = self._get_entry(self.source, result[1][0])
1055
precise_file_ids.update(
1057
for child in self.source.iter_child_entries(result[1][0]))
1248
old_entry = self._get_entry(self.source, file_id)
1249
for child in old_entry.children.values():
1250
precise_file_ids.add(child.file_id)
1058
1251
changed_file_ids.add(result[0])
1061
def file_content_matches(
1062
self, source_path, target_path,
1063
source_file_id=None, target_file_id=None,
1064
source_stat=None, target_stat=None):
1065
"""Check if two files are the same in the source and target trees.
1067
This only checks that the contents of the files are the same,
1068
it does not touch anything else.
1070
:param source_path: Path of the file in the source tree
1071
:param target_path: Path of the file in the target tree
1072
:param source_file_id: Optional file id of the file in the source tree
1073
:param target_file_id: Optional file id of the file in the target tree
1074
:param source_stat: Optional stat value of the file in the source tree
1075
:param target_stat: Optional stat value of the file in the target tree
1076
:return: Boolean indicating whether the files have the same contents
1078
with self.lock_read():
1079
source_verifier_kind, source_verifier_data = (
1080
self.source.get_file_verifier(
1081
source_path, source_file_id, source_stat))
1082
target_verifier_kind, target_verifier_data = (
1083
self.target.get_file_verifier(
1084
target_path, target_file_id, target_stat))
1085
if source_verifier_kind == target_verifier_kind:
1086
return (source_verifier_data == target_verifier_data)
1087
# Fall back to SHA1 for now
1088
if source_verifier_kind != "SHA1":
1089
source_sha1 = self.source.get_file_sha1(
1090
source_path, source_file_id, source_stat)
1092
source_sha1 = source_verifier_data
1093
if target_verifier_kind != "SHA1":
1094
target_sha1 = self.target.get_file_sha1(
1095
target_path, target_file_id, target_stat)
1097
target_sha1 = target_verifier_data
1098
return (source_sha1 == target_sha1)
1100
InterTree.register_optimiser(InterTree)
1103
1255
class MultiWalker(object):
1104
1256
"""Walk multiple trees simultaneously, getting combined results."""
1331
1483
other_values.append(self._lookup_by_file_id(
1332
1484
alt_extra, alt_tree, file_id))
1333
1485
yield other_path, file_id, None, other_values
1336
def find_previous_paths(from_tree, to_tree, paths):
1337
"""Find previous tree paths.
1339
:param from_tree: From tree
1340
:param to_tree: To tree
1341
:param paths: Iterable over paths to search for
1342
:return: Dictionary mapping from from_tree paths to paths in to_tree, or
1343
None if there is no equivalent path.
1347
ret[path] = find_previous_path(from_tree, to_tree, path)
1351
def find_previous_path(from_tree, to_tree, path, file_id=None):
1352
"""Find previous tree path.
1354
:param from_tree: From tree
1355
:param to_tree: To tree
1356
:param path: Path to search for
1357
:return: path in to_tree, or None if there is no equivalent path.
1360
file_id = from_tree.path2id(path)
1362
raise errors.NoSuchFile(path)
1364
return to_tree.id2path(file_id)
1365
except errors.NoSuchId:
added
removed
bzrlib/tree.py
