270
181
"""Return the id for path in this tree."""
271
182
return self._inventory.path2id(path)
273
def paths2ids(self, paths, trees=[], require_versioned=True):
274
"""Return all the ids that can be reached by walking from paths.
276
Each path is looked up in each this tree and any extras provided in
277
trees, and this is repeated recursively: the children in an extra tree
278
of a directory that has been renamed under a provided path in this tree
279
are all returned, even if none exist until a provided path in this
280
tree, and vice versa.
282
:param paths: An iterable of paths to start converting to ids from.
283
Alternatively, if paths is None, no ids should be calculated and None
284
will be returned. This is offered to make calling the api unconditional
285
for code that *might* take a list of files.
286
:param trees: Additional trees to consider.
287
:param require_versioned: If False, do not raise NotVersionedError if
288
an element of paths is not versioned in this tree and all of trees.
290
return find_ids_across_trees(paths, [self] + list(trees), require_versioned)
292
184
def print_file(self, file_id):
293
185
"""Print file with id `file_id` to stdout."""
294
file_id = osutils.safe_file_id(file_id)
296
187
sys.stdout.write(self.get_file_text(file_id))
298
189
def lock_read(self):
301
def revision_tree(self, revision_id):
302
"""Obtain a revision tree for the revision revision_id.
304
The intention of this method is to allow access to possibly cached
305
tree data. Implementors of this method should raise NoSuchRevision if
306
the tree is not locally available, even if they could obtain the
307
tree via a repository or some other means. Callers are responsible
308
for finding the ultimate source for a revision tree.
310
:param revision_id: The revision_id of the requested tree.
312
:raises: NoSuchRevision if the tree cannot be obtained.
314
raise errors.NoSuchRevisionInTree(self, revision_id)
316
192
def unknowns(self):
317
193
"""What files are present in this tree and unknown.
334
210
pred = self.inventory.has_filename
335
211
return set((p for p in paths if not pred(p)))
337
def walkdirs(self, prefix=""):
338
"""Walk the contents of this tree from path down.
340
This yields all the data about the contents of a directory at a time.
341
After each directory has been yielded, if the caller has mutated the
342
list to exclude some directories, they are then not descended into.
344
The data yielded is of the form:
345
((directory-relpath, directory-path-from-root, directory-fileid),
346
[(relpath, basename, kind, lstat, path_from_tree_root, file_id,
347
versioned_kind), ...]),
348
- directory-relpath is the containing dirs relpath from prefix
349
- directory-path-from-root is the containing dirs path from /
350
- directory-fileid is the id of the directory if it is versioned.
351
- relpath is the relative path within the subtree being walked.
352
- basename is the basename
353
- kind is the kind of the file now. If unknonwn then the file is not
354
present within the tree - but it may be recorded as versioned. See
356
- lstat is the stat data *if* the file was statted.
357
- path_from_tree_root is the path from the root of the tree.
358
- file_id is the file_id is the entry is versioned.
359
- versioned_kind is the kind of the file as last recorded in the
360
versioning system. If 'unknown' the file is not versioned.
361
One of 'kind' and 'versioned_kind' must not be 'unknown'.
363
:param prefix: Start walking from prefix within the tree rather than
364
at the root. This allows one to walk a subtree but get paths that are
365
relative to a tree rooted higher up.
366
:return: an iterator over the directory data.
368
raise NotImplementedError(self.walkdirs)
215
from bzrlib.revisiontree import RevisionTree
371
218
class EmptyTree(Tree):
373
220
def __init__(self):
374
self._inventory = Inventory(root_id=None)
375
symbol_versioning.warn('EmptyTree is deprecated as of bzr 0.9 please'
376
' use repository.revision_tree instead.',
377
DeprecationWarning, stacklevel=2)
221
self._inventory = Inventory()
222
warn('EmptyTree is deprecated as of bzr 0.9 please use '
223
'repository.revision_tree instead.',
224
DeprecationWarning, stacklevel=2)
379
226
def get_parent_ids(self):
571
414
:param require_versioned: An optional boolean (defaults to False). When
572
415
supplied and True all the 'specific_files' must be versioned, or
573
416
a PathsNotVersionedError will be thrown.
574
:param want_unversioned: Scan for unversioned paths.
576
# NB: show_status depends on being able to pass in non-versioned files
577
# and report them as unknown
578
trees = (self.source,)
418
# NB: show_status depends on being able to pass in non-versioned files and
419
# report them as unknown
420
trees = (self.source, self.target)
579
421
if extra_trees is not None:
580
422
trees = trees + tuple(extra_trees)
581
# target is usually the newer tree:
582
specific_file_ids = self.target.paths2ids(specific_files, trees,
583
require_versioned=require_versioned)
423
specific_file_ids = find_ids_across_trees(specific_files,
424
trees, require_versioned=require_versioned)
584
425
if specific_files and not specific_file_ids:
585
426
# All files are unversioned, so just return an empty delta
586
427
# _compare_trees would think we want a complete delta
587
result = delta.TreeDelta()
588
fake_entry = InventoryFile('unused', 'unused', 'unused')
589
result.unversioned = [(path, None,
590
self.target._comparison_data(fake_entry, path)[0]) for path in
428
return delta.TreeDelta()
593
429
return delta._compare_trees(self.source, self.target, want_unchanged,
594
specific_files, include_root, extra_trees=extra_trees,
595
want_unversioned=want_unversioned)
597
def _iter_changes(self, include_unchanged=False,
598
specific_files=None, pb=None, extra_trees=[],
599
require_versioned=True, want_unversioned=False):
600
"""Generate an iterator of changes between trees.
603
(file_id, (path_in_source, path_in_target),
604
changed_content, versioned, parent, name, kind,
607
Changed_content is True if the file's content has changed. This
608
includes changes to its kind, and to a symlink's target.
610
versioned, parent, name, kind, executable are tuples of (from, to).
611
If a file is missing in a tree, its kind is None.
613
Iteration is done in parent-to-child order, relative to the target
616
There is no guarantee that all paths are in sorted order: the
617
requirement to expand the search due to renames may result in children
618
that should be found early being found late in the search, after
619
lexically later results have been returned.
620
:param require_versioned: Raise errors.PathsNotVersionedError if a
621
path in the specific_files list is not versioned in one of
622
source, target or extra_trees.
623
:param want_unversioned: Should unversioned files be returned in the
624
output. An unversioned file is defined as one with (False, False)
625
for the versioned pair.
628
lookup_trees = [self.source]
630
lookup_trees.extend(extra_trees)
631
specific_file_ids = self.target.paths2ids(specific_files,
632
lookup_trees, require_versioned=require_versioned)
634
all_unversioned = sorted([(p.split('/'), p) for p in self.target.extras()
635
if not specific_files or
636
osutils.is_inside_any(specific_files, p)])
637
all_unversioned = deque(all_unversioned)
639
all_unversioned = deque()
641
from_entries_by_dir = list(self.source.inventory.iter_entries_by_dir(
642
specific_file_ids=specific_file_ids))
643
from_data = dict((e.file_id, (p, e)) for p, e in from_entries_by_dir)
644
to_entries_by_dir = list(self.target.inventory.iter_entries_by_dir(
645
specific_file_ids=specific_file_ids))
646
num_entries = len(from_entries_by_dir) + len(to_entries_by_dir)
648
# the unversioned path lookup only occurs on real trees - where there
649
# can be extras. So the fake_entry is solely used to look up
650
# executable it values when execute is not supported.
651
fake_entry = InventoryFile('unused', 'unused', 'unused')
652
for to_path, to_entry in to_entries_by_dir:
653
while all_unversioned and all_unversioned[0][0] < to_path.split('/'):
654
unversioned_path = all_unversioned.popleft()
655
to_kind, to_executable, to_stat = \
656
self.target._comparison_data(fake_entry, unversioned_path[1])
657
yield (None, (None, unversioned_path[1]), True, (False, False),
659
(None, unversioned_path[0][-1]),
661
(None, to_executable))
662
file_id = to_entry.file_id
663
to_paths[file_id] = to_path
665
changed_content = False
666
from_path, from_entry = from_data.get(file_id, (None, None))
667
from_versioned = (from_entry is not None)
668
if from_entry is not None:
669
from_versioned = True
670
from_name = from_entry.name
671
from_parent = from_entry.parent_id
672
from_kind, from_executable, from_stat = \
673
self.source._comparison_data(from_entry, from_path)
676
from_versioned = False
680
from_executable = None
681
versioned = (from_versioned, True)
682
to_kind, to_executable, to_stat = \
683
self.target._comparison_data(to_entry, to_path)
684
kind = (from_kind, to_kind)
685
if kind[0] != kind[1]:
686
changed_content = True
687
elif from_kind == 'file':
688
from_size = self.source._file_size(from_entry, from_stat)
689
to_size = self.target._file_size(to_entry, to_stat)
690
if from_size != to_size:
691
changed_content = True
692
elif (self.source.get_file_sha1(file_id, from_path, from_stat) !=
693
self.target.get_file_sha1(file_id, to_path, to_stat)):
694
changed_content = True
695
elif from_kind == 'symlink':
696
if (self.source.get_symlink_target(file_id) !=
697
self.target.get_symlink_target(file_id)):
698
changed_content = True
699
elif from_kind == 'tree-reference':
700
if (self.source.get_reference_revision(file_id, from_path)
701
!= self.target.get_reference_revision(file_id, to_path)):
702
changed_content = True
703
parent = (from_parent, to_entry.parent_id)
704
name = (from_name, to_entry.name)
705
executable = (from_executable, to_executable)
707
pb.update('comparing files', entry_count, num_entries)
708
if (changed_content is not False or versioned[0] != versioned[1]
709
or parent[0] != parent[1] or name[0] != name[1] or
710
executable[0] != executable[1] or include_unchanged):
711
yield (file_id, (from_path, to_path), changed_content,
712
versioned, parent, name, kind, executable)
714
while all_unversioned:
715
# yield any trailing unversioned paths
716
unversioned_path = all_unversioned.popleft()
717
to_kind, to_executable, to_stat = \
718
self.target._comparison_data(fake_entry, unversioned_path[1])
719
yield (None, (None, unversioned_path[1]), True, (False, False),
721
(None, unversioned_path[0][-1]),
723
(None, to_executable))
725
def get_to_path(to_entry):
726
if to_entry.parent_id is None:
727
to_path = '' # the root
729
if to_entry.parent_id not in to_paths:
731
return get_to_path(self.target.inventory[to_entry.parent_id])
732
to_path = osutils.pathjoin(to_paths[to_entry.parent_id],
734
to_paths[to_entry.file_id] = to_path
737
for path, from_entry in from_entries_by_dir:
738
file_id = from_entry.file_id
739
if file_id in to_paths:
742
if not file_id in self.target.inventory:
743
# common case - paths we have not emitted are not present in
747
to_path = get_to_path(self.target.inventory[file_id])
750
pb.update('comparing files', entry_count, num_entries)
751
versioned = (True, False)
752
parent = (from_entry.parent_id, None)
753
name = (from_entry.name, None)
754
from_kind, from_executable, stat_value = \
755
self.source._comparison_data(from_entry, path)
756
kind = (from_kind, None)
757
executable = (from_executable, None)
758
changed_content = True
759
# the parent's path is necessarily known at this point.
760
yield(file_id, (path, to_path), changed_content, versioned, parent,
761
name, kind, executable)
764
# This was deprecated before 0.12, but did not have an official warning
765
@symbol_versioning.deprecated_function(symbol_versioning.zero_twelve)
766
def RevisionTree(*args, **kwargs):
767
"""RevisionTree has moved to bzrlib.revisiontree.RevisionTree()
769
Accessing it as bzrlib.tree.RevisionTree has been deprecated as of
772
from bzrlib.revisiontree import RevisionTree as _RevisionTree
773
return _RevisionTree(*args, **kwargs)
430
specific_file_ids, include_root)
added
removed
bzrlib/tree.py
