402
353
cur_file = (self.get_file_text(file_id),)
403
354
yield identifier, cur_file
405
def get_symlink_target(self, file_id, path=None):
356
def get_symlink_target(self, file_id):
406
357
"""Get the target for a given file_id.
408
359
It is assumed that the caller already knows that file_id is referencing
410
361
:param file_id: Handle for the symlink entry.
411
:param path: The path of the file.
412
If both file_id and path are supplied, an implementation may use
414
362
:return: The path the symlink points to.
416
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))
418
444
def get_root_id(self):
419
445
"""Return the file_id for the root of this tree."""
420
446
raise NotImplementedError(self.get_root_id)
478
504
except errors.NoSuchRevisionInTree:
479
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()
481
516
def _get_file_revision(self, file_id, vf, tree_revision):
482
517
"""Ensure that file_id, tree_revision is in vf to plan the merge."""
484
519
if getattr(self, '_repository', None) is None:
485
520
last_revision = tree_revision
486
parent_keys = [(file_id, t.get_file_revision(file_id)) for t in
521
parent_keys = [(file_id, self._file_revision(t, file_id)) for t in
487
522
self._iter_parent_trees()]
488
523
vf.add_lines((file_id, last_revision), parent_keys,
489
self.get_file_lines(file_id))
524
self.get_file(file_id).readlines())
490
525
repo = self.branch.repository
491
526
base_vf = repo.texts
493
last_revision = self.get_file_revision(file_id)
528
last_revision = self._file_revision(self, file_id)
494
529
base_vf = self._repository.texts
495
530
if base_vf not in vf.fallback_versionedfiles:
496
531
vf.fallback_versionedfiles.append(base_vf)
497
532
return last_revision
534
inventory = property(_get_inventory,
535
doc="Inventory of this Tree")
499
537
def _check_retrieved(self, ie, f):
500
538
if not __debug__:
502
fp = osutils.fingerprint_file(f)
540
fp = fingerprint_file(f)
505
543
if ie.text_size is not None:
506
544
if ie.text_size != fp['size']:
507
raise errors.BzrError(
508
"mismatched size for file %r in %r" %
509
(ie.file_id, self._store),
545
raise BzrError("mismatched size for file %r in %r" % (ie.file_id, self._store),
510
546
["inventory expects %d bytes" % ie.text_size,
511
547
"file is actually %d bytes" % fp['size'],
512
548
"store is probably damaged/corrupt"])
514
550
if ie.text_sha1 != fp['sha1']:
515
raise errors.BzrError("wrong SHA-1 for file %r in %r" %
516
(ie.file_id, self._store),
551
raise BzrError("wrong SHA-1 for file %r in %r" % (ie.file_id, self._store),
517
552
["inventory expects %s" % ie.text_sha1,
518
553
"file is actually %s" % fp['sha1'],
519
554
"store is probably damaged/corrupt"])
521
557
def path2id(self, path):
522
558
"""Return the id for path in this tree."""
523
raise NotImplementedError(self.path2id)
559
return self._inventory.path2id(path)
525
561
def paths2ids(self, paths, trees=[], require_versioned=True):
526
562
"""Return all the ids that can be reached by walking from paths.
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.
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.
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():
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)
900
789
def find_ids_across_trees(filenames, trees, require_versioned=True):
1359
1246
if old_entry is None:
1360
1247
# Reusing a discarded change.
1361
1248
old_entry = self._get_entry(self.source, file_id)
1362
precise_file_ids.update(
1363
self.source.iter_children(file_id))
1249
for child in old_entry.children.values():
1250
precise_file_ids.add(child.file_id)
1364
1251
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)
1405
1255
class MultiWalker(object):
1406
1256
"""Walk multiple trees simultaneously, getting combined results."""
added
removed
bzrlib/tree.py
