580
803
compatible = False
581
804
return compatible
584
class TreeReference(InventoryEntry):
586
__slots__ = ['reference_revision']
588
kind = 'tree-reference'
590
def __init__(self, file_id, name, parent_id, revision=None,
591
reference_revision=None):
592
InventoryEntry.__init__(self, file_id, name, parent_id)
593
self.revision = revision
594
self.reference_revision = reference_revision
597
return TreeReference(self.file_id, self.name, self.parent_id,
598
self.revision, self.reference_revision)
600
def _read_tree_state(self, path, work_tree):
601
"""Populate fields in the inventory entry from the given tree.
603
self.reference_revision = work_tree.get_reference_revision(
606
def _forget_tree_state(self):
607
self.reference_revision = None
609
def _unchanged(self, previous_ie):
610
"""See InventoryEntry._unchanged."""
611
compatible = super(TreeReference, self)._unchanged(previous_ie)
612
if self.reference_revision != previous_ie.reference_revision:
617
class CommonInventory(object):
618
"""Basic inventory logic, defined in terms of primitives like has_id.
620
An inventory is the metadata about the contents of a tree.
622
This is broadly a map from file_id to entries such as directories, files,
623
symlinks and tree references. Each entry maintains its own metadata like
624
SHA1 and length for files, or children for a directory.
806
def _snapshot_text(self, file_parents, work_tree, commit_builder):
807
"""See InventoryEntry._snapshot_text."""
808
commit_builder.modified_link(
809
self.file_id, file_parents, self.symlink_target)
812
class Inventory(object):
813
"""Inventory of versioned files in a tree.
815
This describes which file_id is present at each point in the tree,
816
and possibly the SHA-1 or other information about the file.
626
817
Entries can be looked up either by path or by file_id.
819
The inventory represents a typical unix file tree, with
820
directories containing files and subdirectories. We never store
821
the full path to a file, because renaming a directory implicitly
822
moves all of its contents. This class internally maintains a
823
lookup tree that allows the children under a directory to be
628
826
InventoryEntry objects must not be modified after they are
629
827
inserted, other than through the Inventory API.
829
>>> inv = Inventory()
830
>>> inv.add(InventoryFile('123-123', 'hello.c', ROOT_ID))
831
InventoryFile('123-123', 'hello.c', parent_id='TREE_ROOT', sha1=None, len=None)
832
>>> inv['123-123'].name
835
May be treated as an iterator or set to look up file ids:
837
>>> bool(inv.path2id('hello.c'))
842
May also look up by name:
844
>>> [x[0] for x in inv.iter_entries()]
846
>>> inv = Inventory('TREE_ROOT-12345678-12345678')
847
>>> inv.add(InventoryFile('123-123', 'hello.c', ROOT_ID))
848
InventoryFile('123-123', 'hello.c', parent_id='TREE_ROOT-12345678-12345678', sha1=None, len=None)
632
def __contains__(self, file_id):
633
"""True if this entry contains a file with given id.
635
>>> inv = Inventory()
636
>>> inv.add(InventoryFile('123', 'foo.c', ROOT_ID))
637
InventoryFile('123', 'foo.c', parent_id='TREE_ROOT', sha1=None, len=None, revision=None)
643
Note that this method along with __iter__ are not encouraged for use as
644
they are less clear than specific query methods - they may be rmeoved
647
return self.has_id(file_id)
649
def has_filename(self, filename):
650
return bool(self.path2id(filename))
652
def id2path(self, file_id):
653
"""Return as a string the path to file_id.
656
>>> e = i.add(InventoryDirectory('src-id', 'src', ROOT_ID))
657
>>> e = i.add(InventoryFile('foo-id', 'foo.c', parent_id='src-id'))
658
>>> print i.id2path('foo-id')
661
:raises NoSuchId: If file_id is not present in the inventory.
663
# get all names, skipping root
664
return '/'.join(reversed(
665
[parent.name for parent in
666
self._iter_file_id_parents(file_id)][:-1]))
668
def iter_entries(self, from_dir=None, recursive=True):
669
"""Return (path, entry) pairs, in order by name.
671
:param from_dir: if None, start from the root,
672
otherwise start from this directory (either file-id or entry)
673
:param recursive: recurse into directories or not
850
def __init__(self, root_id=ROOT_ID, revision_id=None):
851
"""Create or read an inventory.
853
If a working directory is specified, the inventory is read
854
from there. If the file is specified, read from that. If not,
855
the inventory is created empty.
857
The inventory is created with a default root directory, with
860
# We are letting Branch.create() create a unique inventory
861
# root id. Rather than generating a random one here.
863
# root_id = bzrlib.branch.gen_file_id('TREE_ROOT')
864
self.root = RootEntry(root_id)
865
# FIXME: this isn't ever used, changing it to self.revision may break
866
# things. TODO make everything use self.revision_id
867
self.revision_id = revision_id
868
self._byid = {self.root.file_id: self.root}
871
# TODO: jam 20051218 Should copy also copy the revision_id?
872
entries = self.iter_entries()
873
other = Inventory(entries.next()[1].file_id)
874
# copy recursively so we know directories will be added before
875
# their children. There are more efficient ways than this...
876
for path, entry in entries():
877
other.add(entry.copy())
881
return iter(self._byid)
884
"""Returns number of entries."""
885
return len(self._byid)
887
def iter_entries(self, from_dir=None):
888
"""Return (path, entry) pairs, in order by name."""
675
889
if from_dir is None:
676
if self.root is None:
678
891
from_dir = self.root
679
892
yield '', self.root
680
893
elif isinstance(from_dir, basestring):
681
from_dir = self[from_dir]
894
from_dir = self._byid[from_dir]
683
896
# unrolling the recursive called changed the time from
684
897
# 440ms/663ms (inline/total) to 116ms/116ms
685
898
children = from_dir.children.items()
688
for name, ie in children:
691
900
children = collections.deque(children)
692
901
stack = [(u'', children)]
846
986
def descend(parent_ie, parent_path):
847
987
accum.append((parent_path, parent_ie))
849
989
kids = [(ie.name, ie) for ie in parent_ie.children.itervalues() if ie.kind == 'directory']
852
992
for name, child_ie in kids:
853
child_path = osutils.pathjoin(parent_path, name)
993
child_path = pathjoin(parent_path, name)
854
994
descend(child_ie, child_path)
855
995
descend(self.root, u'')
858
def path2id(self, relpath):
859
"""Walk down through directories to return entry of last component.
861
:param relpath: may be either a list of path components, or a single
862
string, in which case it is automatically split.
864
This returns the entry of the last component in the path,
865
which may be either a file or a directory.
867
Returns None IFF the path is not found.
869
if isinstance(relpath, basestring):
870
names = osutils.splitpath(relpath)
876
except errors.NoSuchId:
877
# root doesn't exist yet so nothing else can
883
children = getattr(parent, 'children', None)
892
return parent.file_id
894
def filter(self, specific_fileids):
895
"""Get an inventory view filtered against a set of file-ids.
897
Children of directories and parents are included.
899
The result may or may not reference the underlying inventory
900
so it should be treated as immutable.
902
interesting_parents = set()
903
for fileid in specific_fileids:
905
interesting_parents.update(self.get_idpath(fileid))
906
except errors.NoSuchId:
907
# This fileid is not in the inventory - that's ok
909
entries = self.iter_entries()
910
if self.root is None:
911
return Inventory(root_id=None)
912
other = Inventory(entries.next()[1].file_id)
913
other.root.revision = self.root.revision
914
other.revision_id = self.revision_id
915
directories_to_expand = set()
916
for path, entry in entries:
917
file_id = entry.file_id
918
if (file_id in specific_fileids
919
or entry.parent_id in directories_to_expand):
920
if entry.kind == 'directory':
921
directories_to_expand.add(file_id)
922
elif file_id not in interesting_parents:
924
other.add(entry.copy())
927
def get_idpath(self, file_id):
928
"""Return a list of file_ids for the path to an entry.
930
The list contains one element for each directory followed by
931
the id of the file itself. So the length of the returned list
932
is equal to the depth of the file in the tree, counting the
933
root directory as depth 1.
936
for parent in self._iter_file_id_parents(file_id):
937
p.insert(0, parent.file_id)
941
class Inventory(CommonInventory):
942
"""Mutable dict based in-memory inventory.
944
We never store the full path to a file, because renaming a directory
945
implicitly moves all of its contents. This class internally maintains a
946
lookup tree that allows the children under a directory to be
949
>>> inv = Inventory()
950
>>> inv.add(InventoryFile('123-123', 'hello.c', ROOT_ID))
951
InventoryFile('123-123', 'hello.c', parent_id='TREE_ROOT', sha1=None, len=None, revision=None)
952
>>> inv['123-123'].name
955
Id's may be looked up from paths:
957
>>> inv.path2id('hello.c')
962
There are iterators over the contents:
964
>>> [entry[0] for entry in inv.iter_entries()]
968
def __init__(self, root_id=ROOT_ID, revision_id=None):
969
"""Create or read an inventory.
971
If a working directory is specified, the inventory is read
972
from there. If the file is specified, read from that. If not,
973
the inventory is created empty.
975
The inventory is created with a default root directory, with
978
if root_id is not None:
979
self._set_root(InventoryDirectory(root_id, u'', None))
983
self.revision_id = revision_id
986
# More than one page of ouput is not useful anymore to debug
989
contents = repr(self._byid)
990
if len(contents) > max_len:
991
contents = contents[:(max_len-len(closing))] + closing
992
return "<Inventory object at %x, contents=%r>" % (id(self), contents)
994
def apply_delta(self, delta):
995
"""Apply a delta to this inventory.
997
See the inventory developers documentation for the theory behind
1000
If delta application fails the inventory is left in an indeterminate
1001
state and must not be used.
1003
:param delta: A list of changes to apply. After all the changes are
1004
applied the final inventory must be internally consistent, but it
1005
is ok to supply changes which, if only half-applied would have an
1006
invalid result - such as supplying two changes which rename two
1007
files, 'A' and 'B' with each other : [('A', 'B', 'A-id', a_entry),
1008
('B', 'A', 'B-id', b_entry)].
1010
Each change is a tuple, of the form (old_path, new_path, file_id,
1013
When new_path is None, the change indicates the removal of an entry
1014
from the inventory and new_entry will be ignored (using None is
1015
appropriate). If new_path is not None, then new_entry must be an
1016
InventoryEntry instance, which will be incorporated into the
1017
inventory (and replace any existing entry with the same file id).
1019
When old_path is None, the change indicates the addition of
1020
a new entry to the inventory.
1022
When neither new_path nor old_path are None, the change is a
1023
modification to an entry, such as a rename, reparent, kind change
1026
The children attribute of new_entry is ignored. This is because
1027
this method preserves children automatically across alterations to
1028
the parent of the children, and cases where the parent id of a
1029
child is changing require the child to be passed in as a separate
1030
change regardless. E.g. in the recursive deletion of a directory -
1031
the directory's children must be included in the delta, or the
1032
final inventory will be invalid.
1034
Note that a file_id must only appear once within a given delta.
1035
An AssertionError is raised otherwise.
1037
# Check that the delta is legal. It would be nice if this could be
1038
# done within the loops below but it's safer to validate the delta
1039
# before starting to mutate the inventory, as there isn't a rollback
1041
list(_check_delta_unique_ids(_check_delta_unique_new_paths(
1042
_check_delta_unique_old_paths(_check_delta_ids_match_entry(
1043
_check_delta_ids_are_valid(
1044
_check_delta_new_path_entry_both_or_None(
1048
# Remove all affected items which were in the original inventory,
1049
# starting with the longest paths, thus ensuring parents are examined
1050
# after their children, which means that everything we examine has no
1051
# modified children remaining by the time we examine it.
1052
for old_path, file_id in sorted(((op, f) for op, np, f, e in delta
1053
if op is not None), reverse=True):
1054
# Preserve unaltered children of file_id for later reinsertion.
1055
file_id_children = getattr(self[file_id], 'children', {})
1056
if len(file_id_children):
1057
children[file_id] = file_id_children
1058
if self.id2path(file_id) != old_path:
1059
raise errors.InconsistentDelta(old_path, file_id,
1060
"Entry was at wrong other path %r." % self.id2path(file_id))
1061
# Remove file_id and the unaltered children. If file_id is not
1062
# being deleted it will be reinserted back later.
1063
self.remove_recursive_id(file_id)
1064
# Insert all affected which should be in the new inventory, reattaching
1065
# their children if they had any. This is done from shortest path to
1066
# longest, ensuring that items which were modified and whose parents in
1067
# the resulting inventory were also modified, are inserted after their
1069
for new_path, f, new_entry in sorted((np, f, e) for op, np, f, e in
1070
delta if np is not None):
1071
if new_entry.kind == 'directory':
1072
# Pop the child which to allow detection of children whose
1073
# parents were deleted and which were not reattached to a new
1075
replacement = InventoryDirectory(new_entry.file_id,
1076
new_entry.name, new_entry.parent_id)
1077
replacement.revision = new_entry.revision
1078
replacement.children = children.pop(replacement.file_id, {})
1079
new_entry = replacement
1082
except errors.DuplicateFileId:
1083
raise errors.InconsistentDelta(new_path, new_entry.file_id,
1084
"New id is already present in target.")
1085
except AttributeError:
1086
raise errors.InconsistentDelta(new_path, new_entry.file_id,
1087
"Parent is not a directory.")
1088
if self.id2path(new_entry.file_id) != new_path:
1089
raise errors.InconsistentDelta(new_path, new_entry.file_id,
1090
"New path is not consistent with parent path.")
1092
# Get the parent id that was deleted
1093
parent_id, children = children.popitem()
1094
raise errors.InconsistentDelta("<deleted>", parent_id,
1095
"The file id was deleted but its children were not deleted.")
1097
def create_by_apply_delta(self, inventory_delta, new_revision_id,
1098
propagate_caches=False):
1099
"""See CHKInventory.create_by_apply_delta()"""
1100
new_inv = self.copy()
1101
new_inv.apply_delta(inventory_delta)
1102
new_inv.revision_id = new_revision_id
1105
def _set_root(self, ie):
1107
self._byid = {self.root.file_id: self.root}
1110
# TODO: jam 20051218 Should copy also copy the revision_id?
1111
entries = self.iter_entries()
1112
if self.root is None:
1113
return Inventory(root_id=None)
1114
other = Inventory(entries.next()[1].file_id)
1115
other.root.revision = self.root.revision
1116
# copy recursively so we know directories will be added before
1117
# their children. There are more efficient ways than this...
1118
for path, entry in entries:
1119
other.add(entry.copy())
1122
def _get_mutable_inventory(self):
1123
"""See CommonInventory._get_mutable_inventory."""
1124
return copy.deepcopy(self)
1127
"""Iterate over all file-ids."""
1128
return iter(self._byid)
1130
def iter_just_entries(self):
1131
"""Iterate over all entries.
1133
Unlike iter_entries(), just the entries are returned (not (path, ie))
1134
and the order of entries is undefined.
998
def __contains__(self, file_id):
999
"""True if this entry contains a file with given id.
1136
XXX: We may not want to merge this into bzr.dev.
1001
>>> inv = Inventory()
1002
>>> inv.add(InventoryFile('123', 'foo.c', ROOT_ID))
1003
InventoryFile('123', 'foo.c', parent_id='TREE_ROOT', sha1=None, len=None)
1138
if self.root is None:
1140
for _, ie in self._byid.iteritems():
1144
"""Returns number of entries."""
1145
return len(self._byid)
1009
return file_id in self._byid
1147
1011
def __getitem__(self, file_id):
1148
1012
"""Return the entry for given file_id.
1150
1014
>>> inv = Inventory()
1151
1015
>>> inv.add(InventoryFile('123123', 'hello.c', ROOT_ID))
1152
InventoryFile('123123', 'hello.c', parent_id='TREE_ROOT', sha1=None, len=None, revision=None)
1016
InventoryFile('123123', 'hello.c', parent_id='TREE_ROOT', sha1=None, len=None)
1153
1017
>>> inv['123123'].name
1157
1021
return self._byid[file_id]
1158
1022
except KeyError:
1159
# really we're passing an inventory, not a tree...
1160
raise errors.NoSuchId(self, file_id)
1024
raise BzrError("can't look up file_id None")
1026
raise BzrError("file_id {%s} not in inventory" % file_id)
1162
1028
def get_file_kind(self, file_id):
1163
1029
return self._byid[file_id].kind
1358
1227
del old_parent.children[file_ie.name]
1359
1228
new_parent.children[new_name] = file_ie
1361
1230
file_ie.name = new_name
1362
1231
file_ie.parent_id = new_parent_id
1364
def is_root(self, file_id):
1365
return self.root is not None and file_id == self.root.file_id
1368
class CHKInventory(CommonInventory):
1369
"""An inventory persisted in a CHK store.
1371
By design, a CHKInventory is immutable so many of the methods
1372
supported by Inventory - add, rename, apply_delta, etc - are *not*
1373
supported. To create a new CHKInventory, use create_by_apply_delta()
1374
or from_inventory(), say.
1376
Internally, a CHKInventory has one or two CHKMaps:
1378
* id_to_entry - a map from (file_id,) => InventoryEntry as bytes
1379
* parent_id_basename_to_file_id - a map from (parent_id, basename_utf8)
1382
The second map is optional and not present in early CHkRepository's.
1384
No caching is performed: every method call or item access will perform
1385
requests to the storage layer. As such, keep references to objects you
1389
def __init__(self, search_key_name):
1390
CommonInventory.__init__(self)
1391
self._fileid_to_entry_cache = {}
1392
self._path_to_fileid_cache = {}
1393
self._search_key_name = search_key_name
1396
def __eq__(self, other):
1397
"""Compare two sets by comparing their contents."""
1398
if not isinstance(other, CHKInventory):
1399
return NotImplemented
1401
this_key = self.id_to_entry.key()
1402
other_key = other.id_to_entry.key()
1403
this_pid_key = self.parent_id_basename_to_file_id.key()
1404
other_pid_key = other.parent_id_basename_to_file_id.key()
1405
if None in (this_key, this_pid_key, other_key, other_pid_key):
1407
return this_key == other_key and this_pid_key == other_pid_key
1409
def _entry_to_bytes(self, entry):
1410
"""Serialise entry as a single bytestring.
1412
:param Entry: An inventory entry.
1413
:return: A bytestring for the entry.
1416
ENTRY ::= FILE | DIR | SYMLINK | TREE
1417
FILE ::= "file: " COMMON SEP SHA SEP SIZE SEP EXECUTABLE
1418
DIR ::= "dir: " COMMON
1419
SYMLINK ::= "symlink: " COMMON SEP TARGET_UTF8
1420
TREE ::= "tree: " COMMON REFERENCE_REVISION
1421
COMMON ::= FILE_ID SEP PARENT_ID SEP NAME_UTF8 SEP REVISION
1424
if entry.parent_id is not None:
1425
parent_str = entry.parent_id
1428
name_str = entry.name.encode("utf8")
1429
if entry.kind == 'file':
1430
if entry.executable:
1434
return "file: %s\n%s\n%s\n%s\n%s\n%d\n%s" % (
1435
entry.file_id, parent_str, name_str, entry.revision,
1436
entry.text_sha1, entry.text_size, exec_str)
1437
elif entry.kind == 'directory':
1438
return "dir: %s\n%s\n%s\n%s" % (
1439
entry.file_id, parent_str, name_str, entry.revision)
1440
elif entry.kind == 'symlink':
1441
return "symlink: %s\n%s\n%s\n%s\n%s" % (
1442
entry.file_id, parent_str, name_str, entry.revision,
1443
entry.symlink_target.encode("utf8"))
1444
elif entry.kind == 'tree-reference':
1445
return "tree: %s\n%s\n%s\n%s\n%s" % (
1446
entry.file_id, parent_str, name_str, entry.revision,
1447
entry.reference_revision)
1449
raise ValueError("unknown kind %r" % entry.kind)
1451
def _expand_fileids_to_parents_and_children(self, file_ids):
1452
"""Give a more wholistic view starting with the given file_ids.
1454
For any file_id which maps to a directory, we will include all children
1455
of that directory. We will also include all directories which are
1456
parents of the given file_ids, but we will not include their children.
1463
fringle # fringle-id
1467
if given [foo-id] we will include
1468
TREE_ROOT as interesting parents
1470
foo-id, baz-id, frob-id, fringle-id
1474
# TODO: Pre-pass over the list of fileids to see if anything is already
1475
# deserialized in self._fileid_to_entry_cache
1477
directories_to_expand = set()
1478
children_of_parent_id = {}
1479
# It is okay if some of the fileids are missing
1480
for entry in self._getitems(file_ids):
1481
if entry.kind == 'directory':
1482
directories_to_expand.add(entry.file_id)
1483
interesting.add(entry.parent_id)
1484
children_of_parent_id.setdefault(entry.parent_id, []
1485
).append(entry.file_id)
1487
# Now, interesting has all of the direct parents, but not the
1488
# parents of those parents. It also may have some duplicates with
1490
remaining_parents = interesting.difference(file_ids)
1491
# When we hit the TREE_ROOT, we'll get an interesting parent of None,
1492
# but we don't actually want to recurse into that
1493
interesting.add(None) # this will auto-filter it in the loop
1494
remaining_parents.discard(None)
1495
while remaining_parents:
1496
next_parents = set()
1497
for entry in self._getitems(remaining_parents):
1498
next_parents.add(entry.parent_id)
1499
children_of_parent_id.setdefault(entry.parent_id, []
1500
).append(entry.file_id)
1501
# Remove any search tips we've already processed
1502
remaining_parents = next_parents.difference(interesting)
1503
interesting.update(remaining_parents)
1504
# We should probably also .difference(directories_to_expand)
1505
interesting.update(file_ids)
1506
interesting.discard(None)
1507
while directories_to_expand:
1508
# Expand directories by looking in the
1509
# parent_id_basename_to_file_id map
1510
keys = [StaticTuple(f,).intern() for f in directories_to_expand]
1511
directories_to_expand = set()
1512
items = self.parent_id_basename_to_file_id.iteritems(keys)
1513
next_file_ids = set([item[1] for item in items])
1514
next_file_ids = next_file_ids.difference(interesting)
1515
interesting.update(next_file_ids)
1516
for entry in self._getitems(next_file_ids):
1517
if entry.kind == 'directory':
1518
directories_to_expand.add(entry.file_id)
1519
children_of_parent_id.setdefault(entry.parent_id, []
1520
).append(entry.file_id)
1521
return interesting, children_of_parent_id
1523
def filter(self, specific_fileids):
1524
"""Get an inventory view filtered against a set of file-ids.
1526
Children of directories and parents are included.
1528
The result may or may not reference the underlying inventory
1529
so it should be treated as immutable.
1532
parent_to_children) = self._expand_fileids_to_parents_and_children(
1534
# There is some overlap here, but we assume that all interesting items
1535
# are in the _fileid_to_entry_cache because we had to read them to
1536
# determine if they were a dir we wanted to recurse, or just a file
1537
# This should give us all the entries we'll want to add, so start
1539
other = Inventory(self.root_id)
1540
other.root.revision = self.root.revision
1541
other.revision_id = self.revision_id
1542
if not interesting or not parent_to_children:
1543
# empty filter, or filtering entrys that don't exist
1544
# (if even 1 existed, then we would have populated
1545
# parent_to_children with at least the tree root.)
1547
cache = self._fileid_to_entry_cache
1548
remaining_children = collections.deque(parent_to_children[self.root_id])
1549
while remaining_children:
1550
file_id = remaining_children.popleft()
1552
if ie.kind == 'directory':
1553
ie = ie.copy() # We create a copy to depopulate the .children attribute
1554
# TODO: depending on the uses of 'other' we should probably alwyas
1555
# '.copy()' to prevent someone from mutating other and
1556
# invaliding our internal cache
1558
if file_id in parent_to_children:
1559
remaining_children.extend(parent_to_children[file_id])
1563
def _bytes_to_utf8name_key(bytes):
1564
"""Get the file_id, revision_id key out of bytes."""
1565
# We don't normally care about name, except for times when we want
1566
# to filter out empty names because of non rich-root...
1567
sections = bytes.split('\n')
1568
kind, file_id = sections[0].split(': ')
1569
return (sections[2], intern(file_id), intern(sections[3]))
1571
def _bytes_to_entry(self, bytes):
1572
"""Deserialise a serialised entry."""
1573
sections = bytes.split('\n')
1574
if sections[0].startswith("file: "):
1575
result = InventoryFile(sections[0][6:],
1576
sections[2].decode('utf8'),
1578
result.text_sha1 = sections[4]
1579
result.text_size = int(sections[5])
1580
result.executable = sections[6] == "Y"
1581
elif sections[0].startswith("dir: "):
1582
result = CHKInventoryDirectory(sections[0][5:],
1583
sections[2].decode('utf8'),
1585
elif sections[0].startswith("symlink: "):
1586
result = InventoryLink(sections[0][9:],
1587
sections[2].decode('utf8'),
1589
result.symlink_target = sections[4].decode('utf8')
1590
elif sections[0].startswith("tree: "):
1591
result = TreeReference(sections[0][6:],
1592
sections[2].decode('utf8'),
1594
result.reference_revision = sections[4]
1596
raise ValueError("Not a serialised entry %r" % bytes)
1597
result.file_id = intern(result.file_id)
1598
result.revision = intern(sections[3])
1599
if result.parent_id == '':
1600
result.parent_id = None
1601
self._fileid_to_entry_cache[result.file_id] = result
1604
def _get_mutable_inventory(self):
1605
"""See CommonInventory._get_mutable_inventory."""
1606
entries = self.iter_entries()
1607
inv = Inventory(None, self.revision_id)
1608
for path, inv_entry in entries:
1609
inv.add(inv_entry.copy())
1612
def create_by_apply_delta(self, inventory_delta, new_revision_id,
1613
propagate_caches=False):
1614
"""Create a new CHKInventory by applying inventory_delta to this one.
1616
See the inventory developers documentation for the theory behind
1619
:param inventory_delta: The inventory delta to apply. See
1620
Inventory.apply_delta for details.
1621
:param new_revision_id: The revision id of the resulting CHKInventory.
1622
:param propagate_caches: If True, the caches for this inventory are
1623
copied to and updated for the result.
1624
:return: The new CHKInventory.
1626
split = osutils.split
1627
result = CHKInventory(self._search_key_name)
1628
if propagate_caches:
1629
# Just propagate the path-to-fileid cache for now
1630
result._path_to_fileid_cache = dict(self._path_to_fileid_cache.iteritems())
1631
search_key_func = chk_map.search_key_registry.get(self._search_key_name)
1632
self.id_to_entry._ensure_root()
1633
maximum_size = self.id_to_entry._root_node.maximum_size
1634
result.revision_id = new_revision_id
1635
result.id_to_entry = chk_map.CHKMap(
1636
self.id_to_entry._store,
1637
self.id_to_entry.key(),
1638
search_key_func=search_key_func)
1639
result.id_to_entry._ensure_root()
1640
result.id_to_entry._root_node.set_maximum_size(maximum_size)
1641
# Change to apply to the parent_id_basename delta. The dict maps
1642
# (parent_id, basename) -> (old_key, new_value). We use a dict because
1643
# when a path has its id replaced (e.g. the root is changed, or someone
1644
# does bzr mv a b, bzr mv c a, we should output a single change to this
1645
# map rather than two.
1646
parent_id_basename_delta = {}
1647
if self.parent_id_basename_to_file_id is not None:
1648
result.parent_id_basename_to_file_id = chk_map.CHKMap(
1649
self.parent_id_basename_to_file_id._store,
1650
self.parent_id_basename_to_file_id.key(),
1651
search_key_func=search_key_func)
1652
result.parent_id_basename_to_file_id._ensure_root()
1653
self.parent_id_basename_to_file_id._ensure_root()
1654
result_p_id_root = result.parent_id_basename_to_file_id._root_node
1655
p_id_root = self.parent_id_basename_to_file_id._root_node
1656
result_p_id_root.set_maximum_size(p_id_root.maximum_size)
1657
result_p_id_root._key_width = p_id_root._key_width
1659
result.parent_id_basename_to_file_id = None
1660
result.root_id = self.root_id
1661
id_to_entry_delta = []
1662
# inventory_delta is only traversed once, so we just update the
1664
# Check for repeated file ids
1665
inventory_delta = _check_delta_unique_ids(inventory_delta)
1666
# Repeated old paths
1667
inventory_delta = _check_delta_unique_old_paths(inventory_delta)
1668
# Check for repeated new paths
1669
inventory_delta = _check_delta_unique_new_paths(inventory_delta)
1670
# Check for entries that don't match the fileid
1671
inventory_delta = _check_delta_ids_match_entry(inventory_delta)
1672
# Check for nonsense fileids
1673
inventory_delta = _check_delta_ids_are_valid(inventory_delta)
1674
# Check for new_path <-> entry consistency
1675
inventory_delta = _check_delta_new_path_entry_both_or_None(
1677
# All changed entries need to have their parents be directories and be
1678
# at the right path. This set contains (path, id) tuples.
1680
# When we delete an item, all the children of it must be either deleted
1681
# or altered in their own right. As we batch process the change via
1682
# CHKMap.apply_delta, we build a set of things to use to validate the
1686
for old_path, new_path, file_id, entry in inventory_delta:
1689
result.root_id = file_id
1690
if new_path is None:
1695
if propagate_caches:
1697
del result._path_to_fileid_cache[old_path]
1700
deletes.add(file_id)
1702
new_key = StaticTuple(file_id,)
1703
new_value = result._entry_to_bytes(entry)
1704
# Update caches. It's worth doing this whether
1705
# we're propagating the old caches or not.
1706
result._path_to_fileid_cache[new_path] = file_id
1707
parents.add((split(new_path)[0], entry.parent_id))
1708
if old_path is None:
1711
old_key = StaticTuple(file_id,)
1712
if self.id2path(file_id) != old_path:
1713
raise errors.InconsistentDelta(old_path, file_id,
1714
"Entry was at wrong other path %r." %
1715
self.id2path(file_id))
1716
altered.add(file_id)
1717
id_to_entry_delta.append(StaticTuple(old_key, new_key, new_value))
1718
if result.parent_id_basename_to_file_id is not None:
1719
# parent_id, basename changes
1720
if old_path is None:
1723
old_entry = self[file_id]
1724
old_key = self._parent_id_basename_key(old_entry)
1725
if new_path is None:
1729
new_key = self._parent_id_basename_key(entry)
1731
# If the two keys are the same, the value will be unchanged
1732
# as its always the file id for this entry.
1733
if old_key != new_key:
1734
# Transform a change into explicit delete/add preserving
1735
# a possible match on the key from a different file id.
1736
if old_key is not None:
1737
parent_id_basename_delta.setdefault(
1738
old_key, [None, None])[0] = old_key
1739
if new_key is not None:
1740
parent_id_basename_delta.setdefault(
1741
new_key, [None, None])[1] = new_value
1742
# validate that deletes are complete.
1743
for file_id in deletes:
1744
entry = self[file_id]
1745
if entry.kind != 'directory':
1747
# This loop could potentially be better by using the id_basename
1748
# map to just get the child file ids.
1749
for child in entry.children.values():
1750
if child.file_id not in altered:
1751
raise errors.InconsistentDelta(self.id2path(child.file_id),
1752
child.file_id, "Child not deleted or reparented when "
1754
result.id_to_entry.apply_delta(id_to_entry_delta)
1755
if parent_id_basename_delta:
1756
# Transform the parent_id_basename delta data into a linear delta
1757
# with only one record for a given key. Optimally this would allow
1758
# re-keying, but its simpler to just output that as a delete+add
1759
# to spend less time calculating the delta.
1761
for key, (old_key, value) in parent_id_basename_delta.iteritems():
1762
if value is not None:
1763
delta_list.append((old_key, key, value))
1765
delta_list.append((old_key, None, None))
1766
result.parent_id_basename_to_file_id.apply_delta(delta_list)
1767
parents.discard(('', None))
1768
for parent_path, parent in parents:
1770
if result[parent].kind != 'directory':
1771
raise errors.InconsistentDelta(result.id2path(parent), parent,
1772
'Not a directory, but given children')
1773
except errors.NoSuchId:
1774
raise errors.InconsistentDelta("<unknown>", parent,
1775
"Parent is not present in resulting inventory.")
1776
if result.path2id(parent_path) != parent:
1777
raise errors.InconsistentDelta(parent_path, parent,
1778
"Parent has wrong path %r." % result.path2id(parent_path))
1782
def deserialise(klass, chk_store, bytes, expected_revision_id):
1783
"""Deserialise a CHKInventory.
1785
:param chk_store: A CHK capable VersionedFiles instance.
1786
:param bytes: The serialised bytes.
1787
:param expected_revision_id: The revision ID we think this inventory is
1789
:return: A CHKInventory
1791
lines = bytes.split('\n')
1793
raise AssertionError('bytes to deserialize must end with an eol')
1795
if lines[0] != 'chkinventory:':
1796
raise ValueError("not a serialised CHKInventory: %r" % bytes)
1798
allowed_keys = frozenset(['root_id', 'revision_id', 'search_key_name',
1799
'parent_id_basename_to_file_id',
1801
for line in lines[1:]:
1802
key, value = line.split(': ', 1)
1803
if key not in allowed_keys:
1804
raise errors.BzrError('Unknown key in inventory: %r\n%r'
1807
raise errors.BzrError('Duplicate key in inventory: %r\n%r'
1810
revision_id = intern(info['revision_id'])
1811
root_id = intern(info['root_id'])
1812
search_key_name = intern(info.get('search_key_name', 'plain'))
1813
parent_id_basename_to_file_id = intern(info.get(
1814
'parent_id_basename_to_file_id', None))
1815
if not parent_id_basename_to_file_id.startswith('sha1:'):
1816
raise ValueError('parent_id_basename_to_file_id should be a sha1'
1817
' key not %r' % (parent_id_basename_to_file_id,))
1818
id_to_entry = info['id_to_entry']
1819
if not id_to_entry.startswith('sha1:'):
1820
raise ValueError('id_to_entry should be a sha1'
1821
' key not %r' % (id_to_entry,))
1823
result = CHKInventory(search_key_name)
1824
result.revision_id = revision_id
1825
result.root_id = root_id
1826
search_key_func = chk_map.search_key_registry.get(
1827
result._search_key_name)
1828
if parent_id_basename_to_file_id is not None:
1829
result.parent_id_basename_to_file_id = chk_map.CHKMap(
1830
chk_store, StaticTuple(parent_id_basename_to_file_id,),
1831
search_key_func=search_key_func)
1833
result.parent_id_basename_to_file_id = None
1835
result.id_to_entry = chk_map.CHKMap(chk_store,
1836
StaticTuple(id_to_entry,),
1837
search_key_func=search_key_func)
1838
if (result.revision_id,) != expected_revision_id:
1839
raise ValueError("Mismatched revision id and expected: %r, %r" %
1840
(result.revision_id, expected_revision_id))
1844
def from_inventory(klass, chk_store, inventory, maximum_size=0, search_key_name='plain'):
1845
"""Create a CHKInventory from an existing inventory.
1847
The content of inventory is copied into the chk_store, and a
1848
CHKInventory referencing that is returned.
1850
:param chk_store: A CHK capable VersionedFiles instance.
1851
:param inventory: The inventory to copy.
1852
:param maximum_size: The CHKMap node size limit.
1853
:param search_key_name: The identifier for the search key function
1855
result = klass(search_key_name)
1856
result.revision_id = inventory.revision_id
1857
result.root_id = inventory.root.file_id
1859
entry_to_bytes = result._entry_to_bytes
1860
parent_id_basename_key = result._parent_id_basename_key
1861
id_to_entry_dict = {}
1862
parent_id_basename_dict = {}
1863
for path, entry in inventory.iter_entries():
1864
key = StaticTuple(entry.file_id,).intern()
1865
id_to_entry_dict[key] = entry_to_bytes(entry)
1866
p_id_key = parent_id_basename_key(entry)
1867
parent_id_basename_dict[p_id_key] = entry.file_id
1869
result._populate_from_dicts(chk_store, id_to_entry_dict,
1870
parent_id_basename_dict, maximum_size=maximum_size)
1873
def _populate_from_dicts(self, chk_store, id_to_entry_dict,
1874
parent_id_basename_dict, maximum_size):
1875
search_key_func = chk_map.search_key_registry.get(self._search_key_name)
1876
root_key = chk_map.CHKMap.from_dict(chk_store, id_to_entry_dict,
1877
maximum_size=maximum_size, key_width=1,
1878
search_key_func=search_key_func)
1879
self.id_to_entry = chk_map.CHKMap(chk_store, root_key,
1881
root_key = chk_map.CHKMap.from_dict(chk_store,
1882
parent_id_basename_dict,
1883
maximum_size=maximum_size, key_width=2,
1884
search_key_func=search_key_func)
1885
self.parent_id_basename_to_file_id = chk_map.CHKMap(chk_store,
1886
root_key, search_key_func)
1888
def _parent_id_basename_key(self, entry):
1889
"""Create a key for a entry in a parent_id_basename_to_file_id index."""
1890
if entry.parent_id is not None:
1891
parent_id = entry.parent_id
1894
return StaticTuple(parent_id, entry.name.encode('utf8')).intern()
1896
def __getitem__(self, file_id):
1897
"""map a single file_id -> InventoryEntry."""
1899
raise errors.NoSuchId(self, file_id)
1900
result = self._fileid_to_entry_cache.get(file_id, None)
1901
if result is not None:
1904
return self._bytes_to_entry(
1905
self.id_to_entry.iteritems([StaticTuple(file_id,)]).next()[1])
1906
except StopIteration:
1907
# really we're passing an inventory, not a tree...
1908
raise errors.NoSuchId(self, file_id)
1910
def _getitems(self, file_ids):
1911
"""Similar to __getitem__, but lets you query for multiple.
1913
The returned order is undefined. And currently if an item doesn't
1914
exist, it isn't included in the output.
1918
for file_id in file_ids:
1919
entry = self._fileid_to_entry_cache.get(file_id, None)
1921
remaining.append(file_id)
1923
result.append(entry)
1924
file_keys = [StaticTuple(f,).intern() for f in remaining]
1925
for file_key, value in self.id_to_entry.iteritems(file_keys):
1926
entry = self._bytes_to_entry(value)
1927
result.append(entry)
1928
self._fileid_to_entry_cache[entry.file_id] = entry
1931
def has_id(self, file_id):
1932
# Perhaps have an explicit 'contains' method on CHKMap ?
1933
if self._fileid_to_entry_cache.get(file_id, None) is not None:
1936
self.id_to_entry.iteritems([StaticTuple(file_id,)]))) == 1
1938
def is_root(self, file_id):
1939
return file_id == self.root_id
1941
def _iter_file_id_parents(self, file_id):
1942
"""Yield the parents of file_id up to the root."""
1943
while file_id is not None:
1947
raise errors.NoSuchId(tree=self, file_id=file_id)
1949
file_id = ie.parent_id
1952
"""Iterate over all file-ids."""
1953
for key, _ in self.id_to_entry.iteritems():
1956
def iter_just_entries(self):
1957
"""Iterate over all entries.
1959
Unlike iter_entries(), just the entries are returned (not (path, ie))
1960
and the order of entries is undefined.
1962
XXX: We may not want to merge this into bzr.dev.
1964
for key, entry in self.id_to_entry.iteritems():
1966
ie = self._fileid_to_entry_cache.get(file_id, None)
1968
ie = self._bytes_to_entry(entry)
1969
self._fileid_to_entry_cache[file_id] = ie
1972
def iter_changes(self, basis):
1973
"""Generate a Tree.iter_changes change list between this and basis.
1975
:param basis: Another CHKInventory.
1976
:return: An iterator over the changes between self and basis, as per
1977
tree.iter_changes().
1979
# We want: (file_id, (path_in_source, path_in_target),
1980
# changed_content, versioned, parent, name, kind,
1982
for key, basis_value, self_value in \
1983
self.id_to_entry.iter_changes(basis.id_to_entry):
1985
if basis_value is not None:
1986
basis_entry = basis._bytes_to_entry(basis_value)
1987
path_in_source = basis.id2path(file_id)
1988
basis_parent = basis_entry.parent_id
1989
basis_name = basis_entry.name
1990
basis_executable = basis_entry.executable
1992
path_in_source = None
1995
basis_executable = None
1996
if self_value is not None:
1997
self_entry = self._bytes_to_entry(self_value)
1998
path_in_target = self.id2path(file_id)
1999
self_parent = self_entry.parent_id
2000
self_name = self_entry.name
2001
self_executable = self_entry.executable
2003
path_in_target = None
2006
self_executable = None
2007
if basis_value is None:
2009
kind = (None, self_entry.kind)
2010
versioned = (False, True)
2011
elif self_value is None:
2013
kind = (basis_entry.kind, None)
2014
versioned = (True, False)
2016
kind = (basis_entry.kind, self_entry.kind)
2017
versioned = (True, True)
2018
changed_content = False
2019
if kind[0] != kind[1]:
2020
changed_content = True
2021
elif kind[0] == 'file':
2022
if (self_entry.text_size != basis_entry.text_size or
2023
self_entry.text_sha1 != basis_entry.text_sha1):
2024
changed_content = True
2025
elif kind[0] == 'symlink':
2026
if self_entry.symlink_target != basis_entry.symlink_target:
2027
changed_content = True
2028
elif kind[0] == 'tree-reference':
2029
if (self_entry.reference_revision !=
2030
basis_entry.reference_revision):
2031
changed_content = True
2032
parent = (basis_parent, self_parent)
2033
name = (basis_name, self_name)
2034
executable = (basis_executable, self_executable)
2035
if (not changed_content
2036
and parent[0] == parent[1]
2037
and name[0] == name[1]
2038
and executable[0] == executable[1]):
2039
# Could happen when only the revision changed for a directory
2042
yield (file_id, (path_in_source, path_in_target), changed_content,
2043
versioned, parent, name, kind, executable)
2046
"""Return the number of entries in the inventory."""
2047
return len(self.id_to_entry)
2049
def _make_delta(self, old):
2050
"""Make an inventory delta from two inventories."""
2051
if type(old) != CHKInventory:
2052
return CommonInventory._make_delta(self, old)
2054
for key, old_value, self_value in \
2055
self.id_to_entry.iter_changes(old.id_to_entry):
2057
if old_value is not None:
2058
old_path = old.id2path(file_id)
2061
if self_value is not None:
2062
entry = self._bytes_to_entry(self_value)
2063
self._fileid_to_entry_cache[file_id] = entry
2064
new_path = self.id2path(file_id)
2068
delta.append((old_path, new_path, file_id, entry))
2071
def path2id(self, relpath):
2072
"""See CommonInventory.path2id()."""
2073
# TODO: perhaps support negative hits?
2074
result = self._path_to_fileid_cache.get(relpath, None)
2075
if result is not None:
2077
if isinstance(relpath, basestring):
2078
names = osutils.splitpath(relpath)
2081
current_id = self.root_id
2082
if current_id is None:
2084
parent_id_index = self.parent_id_basename_to_file_id
2086
for basename in names:
2087
if cur_path is None:
2090
cur_path = cur_path + '/' + basename
2091
basename_utf8 = basename.encode('utf8')
2092
file_id = self._path_to_fileid_cache.get(cur_path, None)
2094
key_filter = [StaticTuple(current_id, basename_utf8)]
2095
items = parent_id_index.iteritems(key_filter)
2096
for (parent_id, name_utf8), file_id in items:
2097
if parent_id != current_id or name_utf8 != basename_utf8:
2098
raise errors.BzrError("corrupt inventory lookup! "
2099
"%r %r %r %r" % (parent_id, current_id, name_utf8,
2104
self._path_to_fileid_cache[cur_path] = file_id
2105
current_id = file_id
2109
"""Serialise the inventory to lines."""
2110
lines = ["chkinventory:\n"]
2111
if self._search_key_name != 'plain':
2112
# custom ordering grouping things that don't change together
2113
lines.append('search_key_name: %s\n' % (self._search_key_name,))
2114
lines.append("root_id: %s\n" % self.root_id)
2115
lines.append('parent_id_basename_to_file_id: %s\n' %
2116
(self.parent_id_basename_to_file_id.key()[0],))
2117
lines.append("revision_id: %s\n" % self.revision_id)
2118
lines.append("id_to_entry: %s\n" % (self.id_to_entry.key()[0],))
2120
lines.append("revision_id: %s\n" % self.revision_id)
2121
lines.append("root_id: %s\n" % self.root_id)
2122
if self.parent_id_basename_to_file_id is not None:
2123
lines.append('parent_id_basename_to_file_id: %s\n' %
2124
(self.parent_id_basename_to_file_id.key()[0],))
2125
lines.append("id_to_entry: %s\n" % (self.id_to_entry.key()[0],))
2130
"""Get the root entry."""
2131
return self[self.root_id]
2134
class CHKInventoryDirectory(InventoryDirectory):
2135
"""A directory in an inventory."""
2137
__slots__ = ['_children', '_chk_inventory']
2139
def __init__(self, file_id, name, parent_id, chk_inventory):
2140
# Don't call InventoryDirectory.__init__ - it isn't right for this
2142
InventoryEntry.__init__(self, file_id, name, parent_id)
2143
self._children = None
2144
self._chk_inventory = chk_inventory
2148
"""Access the list of children of this directory.
2150
With a parent_id_basename_to_file_id index, loads all the children,
2151
without loads the entire index. Without is bad. A more sophisticated
2152
proxy object might be nice, to allow partial loading of children as
2153
well when specific names are accessed. (So path traversal can be
2154
written in the obvious way but not examine siblings.).
2156
if self._children is not None:
2157
return self._children
2158
# No longer supported
2159
if self._chk_inventory.parent_id_basename_to_file_id is None:
2160
raise AssertionError("Inventories without"
2161
" parent_id_basename_to_file_id are no longer supported")
2163
# XXX: Todo - use proxy objects for the children rather than loading
2164
# all when the attribute is referenced.
2165
parent_id_index = self._chk_inventory.parent_id_basename_to_file_id
2167
for (parent_id, name_utf8), file_id in parent_id_index.iteritems(
2168
key_filter=[StaticTuple(self.file_id,)]):
2169
child_keys.add(StaticTuple(file_id,))
2171
for file_id_key in child_keys:
2172
entry = self._chk_inventory._fileid_to_entry_cache.get(
2173
file_id_key[0], None)
2174
if entry is not None:
2175
result[entry.name] = entry
2176
cached.add(file_id_key)
2177
child_keys.difference_update(cached)
2178
# populate; todo: do by name
2179
id_to_entry = self._chk_inventory.id_to_entry
2180
for file_id_key, bytes in id_to_entry.iteritems(child_keys):
2181
entry = self._chk_inventory._bytes_to_entry(bytes)
2182
result[entry.name] = entry
2183
self._chk_inventory._fileid_to_entry_cache[file_id_key[0]] = entry
2184
self._children = result
2188
'directory': InventoryDirectory,
2189
'file': InventoryFile,
2190
'symlink': InventoryLink,
2191
'tree-reference': TreeReference
2194
1234
def make_entry(kind, name, parent_id, file_id=None):
2195
1235
"""Create an inventory entry.
added
removed
bzrlib/inventory.py
