17
17
"""Tree classes, representing directory at point in time.
20
from __future__ import absolute_import
21
from collections import deque
24
from .lazy_import import lazy_import
25
lazy_import(globals(), """
25
29
conflicts as _mod_conflicts,
30
33
revision as _mod_revision,
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
from bzrlib.symbol_versioning import deprecated_function, deprecated_in
40
from bzrlib.trace import note
37
from breezy.i18n import gettext
45
from .inter import InterObject
51
class FileTimestampUnavailable(errors.BzrError):
53
_fmt = "The filestamp for %(path)s is not available."
57
def __init__(self, path):
61
class TreeEntry(object):
62
"""An entry that implements the minimum interface used by commands.
65
def __eq__(self, other):
66
# yes, this is ugly, TODO: best practice __eq__ style.
67
return (isinstance(other, TreeEntry)
68
and other.__class__ == self.__class__)
70
def kind_character(self):
74
class TreeDirectory(TreeEntry):
75
"""See TreeEntry. This is a directory in a working tree."""
77
def kind_character(self):
81
class TreeFile(TreeEntry):
82
"""See TreeEntry. This is a regular file in a working tree."""
84
def kind_character(self):
88
class TreeLink(TreeEntry):
89
"""See TreeEntry. This is a symlink in a working tree."""
91
def kind_character(self):
95
class TreeReference(TreeEntry):
96
"""See TreeEntry. This is a reference to a nested tree in a working tree."""
98
def kind_character(self):
43
102
class Tree(object):
50
109
* `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
111
Trees can be compared, etc, regardless of whether they are working
60
112
trees or versioned trees.
115
def supports_rename_tracking(self):
116
"""Whether this tree supports rename tracking.
118
This defaults to True, but some implementations may want to override
123
def has_versioned_directories(self):
124
"""Whether this tree can contain explicitly versioned directories.
126
This defaults to True, but some implementations may want to override
63
131
def changes_from(self, other, want_unchanged=False, specific_files=None,
64
132
extra_trees=None, require_versioned=False, include_root=False,
65
133
want_unversioned=False):
147
return iter(self.inventory)
149
205
def all_file_ids(self):
150
206
"""Iterate through all file ids, including ids for missing files."""
151
return set(self.inventory)
207
raise NotImplementedError(self.all_file_ids)
209
def all_versioned_paths(self):
210
"""Iterate through all paths, including paths for missing files."""
211
raise NotImplementedError(self.all_versioned_paths)
153
213
def id2path(self, file_id):
154
214
"""Return the path for a file id.
156
216
: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, yield_parents=False):
218
raise NotImplementedError(self.id2path)
220
def iter_entries_by_dir(self, specific_files=None):
174
221
"""Walk the tree in 'by_dir' order.
176
223
This will yield each entry in the tree as a (path, entry) tuple.
194
241
The yield order (ignoring root) would be::
195
243
a, f, a/b, a/d, a/b/c, a/d/e, f/g
197
:param yield_parents: If True, yield the parents from the root leading
198
down to specific_file_ids that have been requested. This has no
199
impact if specific_file_ids is None.
201
return self.inventory.iter_entries_by_dir(
202
specific_file_ids=specific_file_ids, yield_parents=yield_parents)
245
raise NotImplementedError(self.iter_entries_by_dir)
247
def iter_child_entries(self, path, file_id=None):
248
"""Iterate over the children of a directory or tree reference.
250
:param path: Path of the directory
251
:param file_id: Optional file id of the directory/tree-reference
252
:raise NoSuchId: When the file_id does not exist
253
:return: Iterator over entries in the directory
255
raise NotImplementedError(self.iter_child_entries)
257
def list_files(self, include_root=False, from_dir=None, recursive=True):
258
"""List all files in this tree.
260
:param include_root: Whether to include the entry for the tree root
261
:param from_dir: Directory under which to list files
262
:param recursive: Whether to list files recursively
263
:return: iterator over tuples of (path, versioned, kind, file_id,
266
raise NotImplementedError(self.list_files)
204
268
def iter_references(self):
205
269
if self.supports_tree_reference():
207
271
if entry.kind == 'tree-reference':
208
272
yield path, entry.file_id
210
def kind(self, file_id):
274
def kind(self, path, file_id=None):
211
275
raise NotImplementedError("Tree subclass %s must implement kind"
212
276
% self.__class__.__name__)
214
def stored_kind(self, file_id):
278
def stored_kind(self, path, file_id=None):
215
279
"""File kind stored for this file_id.
217
281
May not match kind on disk for working trees. Always available
218
282
for versioned files, even when the file itself is missing.
220
return self.kind(file_id)
284
return self.kind(path, file_id)
222
286
def path_content_summary(self, path):
223
287
"""Get a summary of the information about path.
268
326
raise NotImplementedError(self.get_file)
270
def get_file_with_stat(self, file_id, path=None):
328
def get_file_with_stat(self, path, file_id=None):
271
329
"""Get a file handle and stat object for file_id.
273
331
The default implementation returns (self.get_file, None) for backwards
276
:param file_id: The file id to read.
277
:param path: The path of the file, if it is known.
334
:param path: The path of the file.
335
:param file_id: The file id to read, if it is known.
278
336
:return: A tuple (file_handle, stat_value_or_None). If the tree has
279
337
no stat facility, or need for a stat cache feedback during commit,
280
338
it may return None for the second element of the tuple.
282
return (self.get_file(file_id, path), None)
340
return (self.get_file(path, file_id), None)
284
def get_file_text(self, file_id, path=None):
342
def get_file_text(self, path, file_id=None):
285
343
"""Return the byte content of a file.
345
:param path: The path of the file.
287
346
:param file_id: The file_id of the file.
288
:param path: The path of the file.
289
348
If both file_id and path are supplied, an implementation may use
351
:returns: A single byte string for the whole file.
292
my_file = self.get_file(file_id, path)
353
my_file = self.get_file(path, file_id)
294
355
return my_file.read()
298
def get_file_lines(self, file_id, path=None):
359
def get_file_lines(self, path, file_id=None):
299
360
"""Return the content of a file, as lines.
362
:param path: The path of the file.
301
363
:param file_id: The file_id of the file.
302
:param path: The path of the file.
303
365
If both file_id and path are supplied, an implementation may use
306
return osutils.split_lines(self.get_file_text(file_id, path))
308
def get_file_mtime(self, file_id, path=None):
368
return osutils.split_lines(self.get_file_text(path, file_id))
370
def get_file_verifier(self, path, file_id=None, stat_value=None):
371
"""Return a verifier for a file.
373
The default implementation returns a sha1.
375
:param file_id: The handle for this file.
376
:param path: The path that this file can be found at.
377
These must point to the same object.
378
:param stat_value: Optional stat value for the object
379
:return: Tuple with verifier name and verifier data
381
return ("SHA1", self.get_file_sha1(path, file_id,
382
stat_value=stat_value))
384
def get_file_sha1(self, path, file_id=None, stat_value=None):
385
"""Return the SHA1 file for a file.
387
:note: callers should use get_file_verifier instead
388
where possible, as the underlying repository implementation may
389
have quicker access to a non-sha1 verifier.
391
:param path: The path that this file can be found at.
392
:param file_id: The handle for this file.
393
These must point to the same object.
394
:param stat_value: Optional stat value for the object
396
raise NotImplementedError(self.get_file_sha1)
398
def get_file_mtime(self, path, file_id=None):
309
399
"""Return the modification time for a file.
401
:param path: The path that this file can be found at.
311
402
:param file_id: The handle for this file.
312
:param path: The path that this file can be found at.
313
403
These must point to the same object.
315
405
raise NotImplementedError(self.get_file_mtime)
317
def get_file_size(self, file_id):
407
def get_file_size(self, path, file_id=None):
318
408
"""Return the size of a file in bytes.
320
410
This applies only to regular files. If invoked on directories or
342
438
this implementation, it is a tuple containing a single bytestring with
343
439
the complete text of the file.
345
:param desired_files: a list of (file_id, identifier) pairs
441
:param desired_files: a list of (path, identifier) pairs
347
for file_id, identifier in desired_files:
443
for path, identifier in desired_files:
348
444
# We wrap the string in a tuple so that we can return an iterable
349
445
# of bytestrings. (Technically, a bytestring is also an iterable
350
446
# of bytestrings, but iterating through each character is not
352
cur_file = (self.get_file_text(file_id),)
448
cur_file = (self.get_file_text(path),)
353
449
yield identifier, cur_file
355
def get_symlink_target(self, file_id):
451
def get_symlink_target(self, path, file_id=None):
356
452
"""Get the target for a given file_id.
358
454
It is assumed that the caller already knows that file_id is referencing
360
456
:param file_id: Handle for the symlink entry.
457
:param path: The path of the file.
458
If both file_id and path are supplied, an implementation may use
361
460
:return: The path the symlink points to.
363
462
raise NotImplementedError(self.get_symlink_target)
365
def get_canonical_inventory_paths(self, paths):
366
"""Like get_canonical_inventory_path() but works on multiple items.
368
:param paths: A sequence of paths relative to the root of the tree.
369
:return: A list of paths, with each item the corresponding input path
370
adjusted to account for existing elements that match case
373
return list(self._yield_canonical_inventory_paths(paths))
375
def get_canonical_inventory_path(self, path):
376
"""Returns the first inventory item that case-insensitively matches path.
378
If a path matches exactly, it is returned. If no path matches exactly
379
but more than one path matches case-insensitively, it is implementation
380
defined which is returned.
382
If no path matches case-insensitively, the input path is returned, but
383
with as many path entries that do exist changed to their canonical
386
If you need to resolve many names from the same tree, you should
387
use get_canonical_inventory_paths() to avoid O(N) behaviour.
389
:param path: A paths relative to the root of the tree.
390
:return: The input path adjusted to account for existing elements
391
that match case insensitively.
393
return self._yield_canonical_inventory_paths([path]).next()
395
def _yield_canonical_inventory_paths(self, paths):
397
# First, if the path as specified exists exactly, just use it.
398
if self.path2id(path) is not None:
402
cur_id = self.get_root_id()
404
bit_iter = iter(path.split("/"))
408
for child in self.iter_children(cur_id):
410
# XXX: it seem like if the child is known to be in the
411
# tree, we shouldn't need to go from its id back to
412
# its path -- mbp 2010-02-11
414
# XXX: it seems like we could be more efficient
415
# by just directly looking up the original name and
416
# only then searching all children; also by not
417
# chopping paths so much. -- mbp 2010-02-11
418
child_base = os.path.basename(self.id2path(child))
419
if (child_base == elt):
420
# if we found an exact match, we can stop now; if
421
# we found an approximate match we need to keep
422
# searching because there might be an exact match
425
new_path = osutils.pathjoin(cur_path, child_base)
427
elif child_base.lower() == lelt:
429
new_path = osutils.pathjoin(cur_path, child_base)
431
# before a change is committed we can see this error...
436
# got to the end of this directory and no entries matched.
437
# Return what matched so far, plus the rest as specified.
438
cur_path = osutils.pathjoin(cur_path, elt, *list(bit_iter))
443
464
def get_root_id(self):
444
465
"""Return the file_id for the root of this tree."""
445
466
raise NotImplementedError(self.get_root_id)
447
def annotate_iter(self, file_id,
468
def annotate_iter(self, path, file_id=None,
448
469
default_revision=_mod_revision.CURRENT_REVISION):
449
470
"""Return an iterator of revision_id, line tuples.
459
480
raise NotImplementedError(self.annotate_iter)
461
def _get_plan_merge_data(self, file_id, other, base):
462
from bzrlib import versionedfile
463
vf = versionedfile._PlanMergeVersionedFile(file_id)
464
last_revision_a = self._get_file_revision(file_id, vf, 'this:')
465
last_revision_b = other._get_file_revision(file_id, vf, 'other:')
467
last_revision_base = None
469
last_revision_base = base._get_file_revision(file_id, vf, 'base:')
470
return vf, last_revision_a, last_revision_b, last_revision_base
472
def plan_file_merge(self, file_id, other, base=None):
473
"""Generate a merge plan based on annotations.
475
If the file contains uncommitted changes in this tree, they will be
476
attributed to the 'current:' pseudo-revision. If the file contains
477
uncommitted changes in the other tree, they will be assigned to the
478
'other:' pseudo-revision.
480
data = self._get_plan_merge_data(file_id, other, base)
481
vf, last_revision_a, last_revision_b, last_revision_base = data
482
return vf.plan_merge(last_revision_a, last_revision_b,
485
def plan_file_lca_merge(self, file_id, other, base=None):
486
"""Generate a merge plan based lca-newness.
488
If the file contains uncommitted changes in this tree, they will be
489
attributed to the 'current:' pseudo-revision. If the file contains
490
uncommitted changes in the other tree, they will be assigned to the
491
'other:' pseudo-revision.
493
data = self._get_plan_merge_data(file_id, other, base)
494
vf, last_revision_a, last_revision_b, last_revision_base = data
495
return vf.plan_lca_merge(last_revision_a, last_revision_b,
498
482
def _iter_parent_trees(self):
499
483
"""Iterate through parent trees, defaulting to Tree.revision_tree."""
500
484
for revision_id in self.get_parent_ids():
503
487
except errors.NoSuchRevisionInTree:
504
488
yield self.repository.revision_tree(revision_id)
507
def _file_revision(revision_tree, file_id):
508
"""Determine the revision associated with a file in a given tree."""
509
revision_tree.lock_read()
511
return revision_tree.inventory[file_id].revision
513
revision_tree.unlock()
515
def _get_file_revision(self, file_id, vf, tree_revision):
516
"""Ensure that file_id, tree_revision is in vf to plan the merge."""
518
if getattr(self, '_repository', None) is None:
519
last_revision = tree_revision
520
parent_keys = [(file_id, self._file_revision(t, file_id)) for t in
521
self._iter_parent_trees()]
522
vf.add_lines((file_id, last_revision), parent_keys,
523
self.get_file(file_id).readlines())
524
repo = self.branch.repository
527
last_revision = self._file_revision(self, file_id)
528
base_vf = self._repository.texts
529
if base_vf not in vf.fallback_versionedfiles:
530
vf.fallback_versionedfiles.append(base_vf)
533
inventory = property(_get_inventory,
534
doc="Inventory of this Tree")
536
def _check_retrieved(self, ie, f):
539
fp = fingerprint_file(f)
542
if ie.text_size is not None:
543
if ie.text_size != fp['size']:
544
raise BzrError("mismatched size for file %r in %r" % (ie.file_id, self._store),
545
["inventory expects %d bytes" % ie.text_size,
546
"file is actually %d bytes" % fp['size'],
547
"store is probably damaged/corrupt"])
549
if ie.text_sha1 != fp['sha1']:
550
raise BzrError("wrong SHA-1 for file %r in %r" % (ie.file_id, self._store),
551
["inventory expects %s" % ie.text_sha1,
552
"file is actually %s" % fp['sha1'],
553
"store is probably damaged/corrupt"])
556
490
def path2id(self, path):
557
491
"""Return the id for path in this tree."""
558
return self._inventory.path2id(path)
560
def paths2ids(self, paths, trees=[], require_versioned=True):
561
"""Return all the ids that can be reached by walking from paths.
563
Each path is looked up in this tree and any extras provided in
564
trees, and this is repeated recursively: the children in an extra tree
565
of a directory that has been renamed under a provided path in this tree
566
are all returned, even if none exist under a provided path in this
567
tree, and vice versa.
569
:param paths: An iterable of paths to start converting to ids from.
570
Alternatively, if paths is None, no ids should be calculated and None
571
will be returned. This is offered to make calling the api unconditional
572
for code that *might* take a list of files.
573
:param trees: Additional trees to consider.
574
:param require_versioned: If False, do not raise NotVersionedError if
575
an element of paths is not versioned in this tree and all of trees.
577
return find_ids_across_trees(paths, [self] + list(trees), require_versioned)
579
def iter_children(self, file_id):
580
entry = self.iter_entries_by_dir([file_id]).next()[1]
581
for child in getattr(entry, 'children', {}).itervalues():
492
raise NotImplementedError(self.path2id)
494
def is_versioned(self, path):
495
"""Check whether path is versioned.
497
:param path: Path to check
500
return self.path2id(path) is not None
502
def find_related_paths_across_trees(self, paths, trees=[],
503
require_versioned=True):
504
"""Find related paths in tree corresponding to specified filenames in any
507
All matches in all trees will be used, and all children of matched
508
directories will be used.
510
:param paths: The filenames to find related paths for (if None, returns
512
:param trees: The trees to find file_ids within
513
:param require_versioned: if true, all specified filenames must occur in
515
:return: a set of paths for the specified filenames and their children
518
raise NotImplementedError(self.find_related_paths_across_trees)
584
520
def lock_read(self):
521
"""Lock this tree for multiple read only operations.
523
:return: A breezy.lock.LogicalLockResult.
525
return lock.LogicalLockResult(self.unlock)
587
527
def revision_tree(self, revision_id):
588
528
"""Obtain a revision tree for the revision revision_id.
666
602
:param path: path relative to the root of the tree
667
603
or None if unknown
668
:param file_id: file_id or None if unknown
669
604
:return: the list of filters - [] if there are none
671
606
filter_pref_names = filters._get_registered_names()
672
607
if len(filter_pref_names) == 0:
675
path = self.id2path(file_id)
676
prefs = self.iter_search_rules([path], filter_pref_names).next()
609
prefs = next(self.iter_search_rules([path], filter_pref_names))
677
610
stk = filters._get_filter_stack_for(prefs)
678
611
if 'filters' in debug.debug_flags:
679
note("*** %s content-filter: %s => %r" % (path,prefs,stk))
612
trace.note(gettext("*** {0} content-filter: {1} => {2!r}").format(path, prefs, stk))
682
615
def _content_filter_stack_provider(self):
720
653
searcher = default_searcher
724
######################################################################
727
# TODO: Merge these two functions into a single one that can operate
728
# on either a whole tree or a set of files.
730
# TODO: Return the diff in order by filename, not by category or in
731
# random order. Can probably be done by lock-stepping through the
732
# filenames from both trees.
735
def file_status(filename, old_tree, new_tree):
736
"""Return single-letter status, old and new names for a file.
738
The complexity here is in deciding how to represent renames;
739
many complex cases are possible.
741
old_inv = old_tree.inventory
742
new_inv = new_tree.inventory
743
new_id = new_inv.path2id(filename)
744
old_id = old_inv.path2id(filename)
746
if not new_id and not old_id:
747
# easy: doesn't exist in either; not versioned at all
748
if new_tree.is_ignored(filename):
749
return 'I', None, None
751
return '?', None, None
753
# There is now a file of this name, great.
756
# There is no longer a file of this name, but we can describe
757
# what happened to the file that used to have
758
# this name. There are two possibilities: either it was
759
# deleted entirely, or renamed.
760
if new_inv.has_id(old_id):
761
return 'X', old_inv.id2path(old_id), new_inv.id2path(old_id)
763
return 'D', old_inv.id2path(old_id), None
765
# if the file_id is new in this revision, it is added
766
if new_id and not old_inv.has_id(new_id):
769
# if there used to be a file of this name, but that ID has now
770
# disappeared, it is deleted
771
if old_id and not new_inv.has_id(old_id):
777
@deprecated_function(deprecated_in((1, 9, 0)))
778
def find_renames(old_inv, new_inv):
779
for file_id in old_inv:
780
if file_id not in new_inv:
782
old_name = old_inv.id2path(file_id)
783
new_name = new_inv.id2path(file_id)
784
if old_name != new_name:
785
yield (old_name, new_name)
788
def find_ids_across_trees(filenames, trees, require_versioned=True):
789
"""Find the ids corresponding to specified filenames.
791
All matches in all trees will be used, and all children of matched
792
directories will be used.
794
:param filenames: The filenames to find file_ids for (if None, returns
796
:param trees: The trees to find file_ids within
797
:param require_versioned: if true, all specified filenames must occur in
799
:return: a set of file ids for the specified filenames and their children.
803
specified_path_ids = _find_ids_across_trees(filenames, trees,
805
return _find_children_across_trees(specified_path_ids, trees)
808
def _find_ids_across_trees(filenames, trees, require_versioned):
809
"""Find the ids corresponding to specified filenames.
811
All matches in all trees will be used, but subdirectories are not scanned.
813
:param filenames: The filenames to find file_ids for
814
:param trees: The trees to find file_ids within
815
:param require_versioned: if true, all specified filenames must occur in
817
:return: a set of file ids for the specified filenames
820
interesting_ids = set()
821
for tree_path in filenames:
824
file_id = tree.path2id(tree_path)
825
if file_id is not None:
826
interesting_ids.add(file_id)
829
not_versioned.append(tree_path)
830
if len(not_versioned) > 0 and require_versioned:
831
raise errors.PathsNotVersionedError(not_versioned)
832
return interesting_ids
835
def _find_children_across_trees(specified_ids, trees):
836
"""Return a set including specified ids and their children.
838
All matches in all trees will be used.
840
:param trees: The trees to find file_ids within
841
:return: a set containing all specified ids and their children
843
interesting_ids = set(specified_ids)
844
pending = interesting_ids
845
# now handle children of interesting ids
846
# we loop so that we handle all children of each id in both trees
847
while len(pending) > 0:
849
for file_id in pending:
851
if not tree.has_or_had_id(file_id):
853
for child_id in tree.iter_children(file_id):
854
if child_id not in interesting_ids:
855
new_pending.add(child_id)
856
interesting_ids.update(new_pending)
857
pending = new_pending
858
return interesting_ids
657
def versionable_kind(cls, kind):
658
"""Check if this tree support versioning a specific file kind."""
659
return (kind in ('file', 'directory', 'symlink', 'tree-reference'))
861
662
class InterTree(InterObject):
880
def _changes_from_entries(self, source_entry, target_entry,
881
source_path=None, target_path=None):
682
def is_compatible(kls, source, target):
683
# The default implementation is naive and uses the public API, so
684
# it works for all trees.
687
def _changes_from_entries(self, source_entry, target_entry, source_path,
882
689
"""Generate a iter_changes tuple between source_entry and target_entry.
884
691
:param source_entry: An inventory entry from self.source, or None.
885
692
:param target_entry: An inventory entry from self.target, or None.
886
:param source_path: The path of source_entry, if known. If not known
887
it will be looked up.
888
:param target_path: The path of target_entry, if known. If not known
889
it will be looked up.
693
:param source_path: The path of source_entry.
694
:param target_path: The path of target_entry.
890
695
:return: A tuple, item 0 of which is an iter_changes result tuple, and
891
696
item 1 is True if there are any changes in the result tuple.
930
731
if source_kind != target_kind:
931
732
changed_content = True
932
733
elif source_kind == 'file':
933
if (self.source.get_file_sha1(file_id, source_path, source_stat) !=
934
self.target.get_file_sha1(file_id, target_path, target_stat)):
734
if not self.file_content_matches(
735
source_path, target_path,
736
file_id, file_id, source_stat, target_stat):
935
737
changed_content = True
936
738
elif source_kind == 'symlink':
937
if (self.source.get_symlink_target(file_id) !=
938
self.target.get_symlink_target(file_id)):
739
if (self.source.get_symlink_target(source_path, file_id) !=
740
self.target.get_symlink_target(target_path, file_id)):
939
741
changed_content = True
940
# XXX: Yes, the indentation below is wrong. But fixing it broke
941
# test_merge.TestMergerEntriesLCAOnDisk.
942
# test_nested_tree_subtree_renamed_and_modified. We'll wait for
943
# the fix from bzr.dev -- vila 2009026
944
elif source_kind == 'tree-reference':
945
if (self.source.get_reference_revision(file_id, source_path)
946
!= self.target.get_reference_revision(file_id, target_path)):
742
elif source_kind == 'tree-reference':
743
if (self.source.get_reference_revision(source_path, file_id)
744
!= self.target.get_reference_revision(target_path, file_id)):
947
745
changed_content = True
948
746
parent = (source_parent, target_parent)
949
747
name = (source_name, target_name)
980
777
trees = (self.source,)
981
778
if extra_trees is not None:
982
779
trees = trees + tuple(extra_trees)
983
# target is usually the newer tree:
984
specific_file_ids = self.target.paths2ids(specific_files, trees,
985
require_versioned=require_versioned)
986
if specific_files and not specific_file_ids:
987
# All files are unversioned, so just return an empty delta
988
# _compare_trees would think we want a complete delta
989
result = delta.TreeDelta()
990
fake_entry = InventoryFile('unused', 'unused', 'unused')
991
result.unversioned = [(path, None,
992
self.target._comparison_data(fake_entry, path)[0]) for path in
995
return delta._compare_trees(self.source, self.target, want_unchanged,
996
specific_files, include_root, extra_trees=extra_trees,
997
require_versioned=require_versioned,
998
want_unversioned=want_unversioned)
780
with self.lock_read():
781
return delta._compare_trees(self.source, self.target, want_unchanged,
782
specific_files, include_root, extra_trees=extra_trees,
783
require_versioned=require_versioned,
784
want_unversioned=want_unversioned)
1000
786
def iter_changes(self, include_unchanged=False,
1001
787
specific_files=None, pb=None, extra_trees=[],
1033
819
output. An unversioned file is defined as one with (False, False)
1034
820
for the versioned pair.
1036
lookup_trees = [self.source]
1038
lookup_trees.extend(extra_trees)
825
extra_trees = list(extra_trees)
1039
826
# The ids of items we need to examine to insure delta consistency.
1040
827
precise_file_ids = set()
1041
828
changed_file_ids = []
1042
829
if specific_files == []:
1043
specific_file_ids = []
830
target_specific_files = []
831
source_specific_files = []
1045
specific_file_ids = self.target.paths2ids(specific_files,
1046
lookup_trees, require_versioned=require_versioned)
833
target_specific_files = self.target.find_related_paths_across_trees(
834
specific_files, [self.source] + extra_trees,
835
require_versioned=require_versioned)
836
source_specific_files = self.source.find_related_paths_across_trees(
837
specific_files, [self.target] + extra_trees,
838
require_versioned=require_versioned)
1047
839
if specific_files is not None:
1048
840
# reparented or added entries must have their parents included
1049
841
# so that valid deltas can be created. The seen_parents set
1058
850
self.target.extras()
1059
851
if specific_files is None or
1060
852
osutils.is_inside_any(specific_files, p)])
1061
all_unversioned = deque(all_unversioned)
853
all_unversioned = collections.deque(all_unversioned)
1063
all_unversioned = deque()
855
all_unversioned = collections.deque()
1065
857
from_entries_by_dir = list(self.source.iter_entries_by_dir(
1066
specific_file_ids=specific_file_ids))
858
specific_files=source_specific_files))
1067
859
from_data = dict((e.file_id, (p, e)) for p, e in from_entries_by_dir)
1068
860
to_entries_by_dir = list(self.target.iter_entries_by_dir(
1069
specific_file_ids=specific_file_ids))
861
specific_files=target_specific_files))
1070
862
num_entries = len(from_entries_by_dir) + len(to_entries_by_dir)
1072
864
# the unversioned path lookup only occurs on real trees - where there
1073
865
# can be extras. So the fake_entry is solely used to look up
1074
866
# executable it values when execute is not supported.
1075
fake_entry = InventoryFile('unused', 'unused', 'unused')
867
fake_entry = TreeFile()
1076
868
for target_path, target_entry in to_entries_by_dir:
1077
869
while (all_unversioned and
1078
870
all_unversioned[0][0] < target_path.split('/')):
1239
1030
precise_file_ids.add(new_parent_id)
1241
1032
if (result[6][0] == 'directory' and
1242
result[6][1] != 'directory'):
1033
result[6][1] != 'directory'):
1243
1034
# This stopped being a directory, the old children have
1244
1035
# to be included.
1245
if old_entry is None:
1036
if source_entry is None:
1246
1037
# Reusing a discarded change.
1247
old_entry = self._get_entry(self.source, file_id)
1248
for child in old_entry.children.values():
1249
precise_file_ids.add(child.file_id)
1038
source_entry = self._get_entry(self.source, result[1][0])
1039
precise_file_ids.update(
1041
for child in self.source.iter_child_entries(result[1][0]))
1250
1042
changed_file_ids.add(result[0])
1045
def file_content_matches(
1046
self, source_path, target_path,
1047
source_file_id=None, target_file_id=None,
1048
source_stat=None, target_stat=None):
1049
"""Check if two files are the same in the source and target trees.
1051
This only checks that the contents of the files are the same,
1052
it does not touch anything else.
1054
:param source_path: Path of the file in the source tree
1055
:param target_path: Path of the file in the target tree
1056
:param source_file_id: Optional file id of the file in the source tree
1057
:param target_file_id: Optional file id of the file in the target tree
1058
:param source_stat: Optional stat value of the file in the source tree
1059
:param target_stat: Optional stat value of the file in the target tree
1060
:return: Boolean indicating whether the files have the same contents
1062
with self.lock_read():
1063
source_verifier_kind, source_verifier_data = (
1064
self.source.get_file_verifier(
1065
source_path, source_file_id, source_stat))
1066
target_verifier_kind, target_verifier_data = (
1067
self.target.get_file_verifier(
1068
target_path, target_file_id, target_stat))
1069
if source_verifier_kind == target_verifier_kind:
1070
return (source_verifier_data == target_verifier_data)
1071
# Fall back to SHA1 for now
1072
if source_verifier_kind != "SHA1":
1073
source_sha1 = self.source.get_file_sha1(
1074
source_path, source_file_id, source_stat)
1076
source_sha1 = source_verifier_data
1077
if target_verifier_kind != "SHA1":
1078
target_sha1 = self.target.get_file_sha1(
1079
target_path, target_file_id, target_stat)
1081
target_sha1 = target_verifier_data
1082
return (source_sha1 == target_sha1)
1084
InterTree.register_optimiser(InterTree)
1254
1087
class MultiWalker(object):
1255
1088
"""Walk multiple trees simultaneously, getting combined results."""
1482
1315
other_values.append(self._lookup_by_file_id(
1483
1316
alt_extra, alt_tree, file_id))
1484
1317
yield other_path, file_id, None, other_values
1320
def find_previous_paths(from_tree, to_tree, paths):
1321
"""Find previous tree paths.
1323
:param from_tree: From tree
1324
:param to_tree: To tree
1325
:param paths: Iterable over paths to search for
1326
:return: Dictionary mapping from from_tree paths to paths in to_tree, or
1327
None if there is no equivalent path.
1331
ret[path] = find_previous_path(from_tree, to_tree, path)
1335
def find_previous_path(from_tree, to_tree, path, file_id=None):
1336
"""Find previous tree path.
1338
:param from_tree: From tree
1339
:param to_tree: To tree
1340
:param path: Path to search for
1341
:return: path in to_tree, or None if there is no equivalent path.
1344
file_id = from_tree.path2id(path)
1346
raise errors.NoSuchFile(path)
1348
return to_tree.id2path(file_id)
1349
except errors.NoSuchId:
added
removed
breezy/tree.py
