81
68
sha-1 of the text of the file
84
71
size in bytes of the text of the file
86
73
(reading a version 4 tree created a text_id field.)
88
75
>>> i = Inventory()
91
78
>>> i.add(InventoryDirectory('123', 'src', ROOT_ID))
92
InventoryDirectory('123', 'src', parent_id='TREE_ROOT', revision=None)
79
InventoryDirectory('123', 'src', parent_id='TREE_ROOT')
93
80
>>> i.add(InventoryFile('2323', 'hello.c', parent_id='123'))
94
InventoryFile('2323', 'hello.c', parent_id='123', sha1=None, len=None, revision=None)
95
>>> shouldbe = {0: '', 1: 'src', 2: 'src/hello.c'}
96
>>> for ix, j in enumerate(i.iter_entries()):
97
... print (j[0] == shouldbe[ix], j[1])
81
InventoryFile('2323', 'hello.c', parent_id='123')
82
>>> for j in i.iter_entries():
85
('src', InventoryDirectory('123', 'src', parent_id='TREE_ROOT'))
86
('src/hello.c', InventoryFile('2323', 'hello.c', parent_id='123'))
87
>>> i.add(InventoryFile('2323', 'bye.c', '123'))
88
Traceback (most recent call last):
99
(True, InventoryDirectory('TREE_ROOT', u'', parent_id=None, revision=None))
100
(True, InventoryDirectory('123', 'src', parent_id='TREE_ROOT', revision=None))
101
(True, InventoryFile('2323', 'hello.c', parent_id='123', sha1=None, len=None, revision=None))
90
BzrError: inventory already contains entry with id {2323}
102
91
>>> i.add(InventoryFile('2324', 'bye.c', '123'))
103
InventoryFile('2324', 'bye.c', parent_id='123', sha1=None, len=None, revision=None)
92
InventoryFile('2324', 'bye.c', parent_id='123')
104
93
>>> i.add(InventoryDirectory('2325', 'wibble', '123'))
105
InventoryDirectory('2325', 'wibble', parent_id='123', revision=None)
94
InventoryDirectory('2325', 'wibble', parent_id='123')
106
95
>>> i.path2id('src/wibble')
110
99
>>> i.add(InventoryFile('2326', 'wibble.c', '2325'))
111
InventoryFile('2326', 'wibble.c', parent_id='2325', sha1=None, len=None, revision=None)
100
InventoryFile('2326', 'wibble.c', parent_id='2325')
113
InventoryFile('2326', 'wibble.c', parent_id='2325', sha1=None, len=None, revision=None)
102
InventoryFile('2326', 'wibble.c', parent_id='2325')
114
103
>>> for path, entry in i.iter_entries():
104
... print path.replace('\\\\', '/') # for win32 os.sep
105
... assert i.path2id(path)
122
111
src/wibble/wibble.c
123
>>> i.id2path('2326')
112
>>> i.id2path('2326').replace('\\\\', '/')
124
113
'src/wibble/wibble.c'
127
# Constants returned by describe_change()
129
# TODO: These should probably move to some kind of FileChangeDescription
130
# class; that's like what's inside a TreeDelta but we want to be able to
131
# generate them just for one file at a time.
133
MODIFIED_AND_RENAMED = 'modified and renamed'
116
__slots__ = ['text_sha1', 'text_size', 'file_id', 'name', 'kind',
117
'text_id', 'parent_id', 'children', 'executable',
120
def _add_text_to_weave(self, new_lines, parents, weave_store, transaction):
121
weave_store.add_text(self.file_id, self.revision, new_lines, parents,
137
124
def detect_changes(self, old_entry):
138
125
"""Return a (text_modified, meta_modified) from this to old_entry.
140
_read_tree_state must have been called on self and old_entry prior to
127
_read_tree_state must have been called on self and old_entry prior to
141
128
calling detect_changes.
143
130
return False, False
132
def diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree,
133
output_to, reverse=False):
134
"""Perform a diff from this to to_entry.
136
text_diff will be used for textual difference calculation.
137
This is a template method, override _diff in child classes.
139
self._read_tree_state(tree.id2path(self.file_id), tree)
141
# cannot diff from one kind to another - you must do a removal
142
# and an addif they do not match.
143
assert self.kind == to_entry.kind
144
to_entry._read_tree_state(to_tree.id2path(to_entry.file_id),
146
self._diff(text_diff, from_label, tree, to_label, to_entry, to_tree,
145
149
def _diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree,
146
150
output_to, reverse=False):
147
151
"""Perform a diff between two entries of the same kind."""
149
def parent_candidates(self, previous_inventories):
150
"""Find possible per-file graph parents.
152
This is currently defined by:
153
- Select the last changed revision in the parent inventory.
154
- Do deal with a short lived bug in bzr 0.8's development two entries
155
that have the same last changed but different 'x' bit settings are
153
def find_previous_heads(self, previous_inventories, entry_weave):
154
"""Return the revisions and entries that directly preceed this.
156
Returned as a map from revision to inventory entry.
158
This is a map containing the file revisions in all parents
159
for which the file exists, and its revision is not a parent of
160
any other. If the file is new, the set will be empty.
158
# revision:ie mapping for each ie found in previous_inventories.
160
# identify candidate head revision ids.
162
def get_ancestors(weave, entry):
163
return set(map(weave.idx_to_name,
164
weave.inclusions([weave.lookup(entry.revision)])))
161
167
for inv in previous_inventories:
162
168
if self.file_id in inv:
163
169
ie = inv[self.file_id]
164
if ie.revision in candidates:
165
# same revision value in two different inventories:
166
# correct possible inconsistencies:
167
# * there was a bug in revision updates with 'x' bit
170
assert ie.file_id == self.file_id
171
if ie.revision in heads:
172
# fixup logic, there was a bug in revision updates.
173
# with x bit support.
170
if candidates[ie.revision].executable != ie.executable:
171
candidates[ie.revision].executable = False
175
if heads[ie.revision].executable != ie.executable:
176
heads[ie.revision].executable = False
172
177
ie.executable = False
173
178
except AttributeError:
180
assert heads[ie.revision] == ie
176
# add this revision as a candidate.
177
candidates[ie.revision] = ie
182
# may want to add it.
183
# may already be covered:
184
already_present = 0 != len(
185
[head for head in heads
186
if ie.revision in head_ancestors[head]])
188
# an ancestor of a known head.
191
ancestors = get_ancestors(entry_weave, ie)
192
# may knock something else out:
193
check_heads = list(heads.keys())
194
for head in check_heads:
195
if head in ancestors:
196
# this head is not really a head
198
head_ancestors[ie.revision] = ancestors
199
heads[ie.revision] = ie
180
@deprecated_method(deprecated_in((1, 6, 0)))
181
202
def get_tar_item(self, root, dp, now, tree):
182
203
"""Get a tarfile item and a file stream for its content."""
183
item = tarfile.TarInfo(osutils.pathjoin(root, dp).encode('utf8'))
204
item = tarfile.TarInfo(os.path.join(root, dp))
184
205
# TODO: would be cool to actually set it to the timestamp of the
185
206
# revision it was last changed
682
672
return compatible
685
class TreeReference(InventoryEntry):
687
kind = 'tree-reference'
689
def __init__(self, file_id, name, parent_id, revision=None,
690
reference_revision=None):
691
InventoryEntry.__init__(self, file_id, name, parent_id)
692
self.revision = revision
693
self.reference_revision = reference_revision
696
return TreeReference(self.file_id, self.name, self.parent_id,
697
self.revision, self.reference_revision)
699
def _read_tree_state(self, path, work_tree):
700
"""Populate fields in the inventory entry from the given tree.
702
self.reference_revision = work_tree.get_reference_revision(
705
def _forget_tree_state(self):
706
self.reference_revision = None
708
def _unchanged(self, previous_ie):
709
"""See InventoryEntry._unchanged."""
710
compatible = super(TreeReference, self)._unchanged(previous_ie)
711
if self.reference_revision != previous_ie.reference_revision:
716
class CommonInventory(object):
717
"""Basic inventory logic, defined in terms of primitives like has_id."""
719
def __contains__(self, file_id):
720
"""True if this entry contains a file with given id.
722
>>> inv = Inventory()
723
>>> inv.add(InventoryFile('123', 'foo.c', ROOT_ID))
724
InventoryFile('123', 'foo.c', parent_id='TREE_ROOT', sha1=None, len=None, revision=None)
730
Note that this method along with __iter__ are not encouraged for use as
731
they are less clear than specific query methods - they may be rmeoved
734
return self.has_id(file_id)
736
def id2path(self, file_id):
737
"""Return as a string the path to file_id.
740
>>> e = i.add(InventoryDirectory('src-id', 'src', ROOT_ID))
741
>>> e = i.add(InventoryFile('foo-id', 'foo.c', parent_id='src-id'))
742
>>> print i.id2path('foo-id')
745
# get all names, skipping root
746
return '/'.join(reversed(
747
[parent.name for parent in
748
self._iter_file_id_parents(file_id)][:-1]))
750
def iter_entries(self, from_dir=None):
751
"""Return (path, entry) pairs, in order by name."""
753
if self.root is None:
757
elif isinstance(from_dir, basestring):
758
from_dir = self[from_dir]
760
# unrolling the recursive called changed the time from
761
# 440ms/663ms (inline/total) to 116ms/116ms
762
children = from_dir.children.items()
764
children = collections.deque(children)
765
stack = [(u'', children)]
767
from_dir_relpath, children = stack[-1]
770
name, ie = children.popleft()
772
# we know that from_dir_relpath never ends in a slash
773
# and 'f' doesn't begin with one, we can do a string op, rather
774
# than the checks of pathjoin(), though this means that all paths
776
path = from_dir_relpath + '/' + name
780
if ie.kind != 'directory':
783
# But do this child first
784
new_children = ie.children.items()
786
new_children = collections.deque(new_children)
787
stack.append((path, new_children))
788
# Break out of inner loop, so that we start outer loop with child
791
# if we finished all children, pop it off the stack
794
def iter_entries_by_dir(self, from_dir=None, specific_file_ids=None,
795
yield_parents=False):
796
"""Iterate over the entries in a directory first order.
798
This returns all entries for a directory before returning
799
the entries for children of a directory. This is not
800
lexicographically sorted order, and is a hybrid between
801
depth-first and breadth-first.
803
:param yield_parents: If True, yield the parents from the root leading
804
down to specific_file_ids that have been requested. This has no
805
impact if specific_file_ids is None.
806
:return: This yields (path, entry) pairs
808
if specific_file_ids and not isinstance(specific_file_ids, set):
809
specific_file_ids = set(specific_file_ids)
810
# TODO? Perhaps this should return the from_dir so that the root is
811
# yielded? or maybe an option?
813
if self.root is None:
815
# Optimize a common case
816
if (not yield_parents and specific_file_ids is not None and
817
len(specific_file_ids) == 1):
818
file_id = list(specific_file_ids)[0]
820
yield self.id2path(file_id), self[file_id]
823
if (specific_file_ids is None or yield_parents or
824
self.root.file_id in specific_file_ids):
826
elif isinstance(from_dir, basestring):
827
from_dir = self[from_dir]
829
if specific_file_ids is not None:
830
# TODO: jam 20070302 This could really be done as a loop rather
831
# than a bunch of recursive calls.
834
def add_ancestors(file_id):
835
if file_id not in byid:
837
parent_id = byid[file_id].parent_id
838
if parent_id is None:
840
if parent_id not in parents:
841
parents.add(parent_id)
842
add_ancestors(parent_id)
843
for file_id in specific_file_ids:
844
add_ancestors(file_id)
848
stack = [(u'', from_dir)]
850
cur_relpath, cur_dir = stack.pop()
853
for child_name, child_ie in sorted(cur_dir.children.iteritems()):
855
child_relpath = cur_relpath + child_name
857
if (specific_file_ids is None or
858
child_ie.file_id in specific_file_ids or
859
(yield_parents and child_ie.file_id in parents)):
860
yield child_relpath, child_ie
862
if child_ie.kind == 'directory':
863
if parents is None or child_ie.file_id in parents:
864
child_dirs.append((child_relpath+'/', child_ie))
865
stack.extend(reversed(child_dirs))
867
def _make_delta(self, old):
868
"""Make an inventory delta from two inventories."""
871
adds = new_ids - old_ids
872
deletes = old_ids - new_ids
873
common = old_ids.intersection(new_ids)
875
for file_id in deletes:
876
delta.append((old.id2path(file_id), None, file_id, None))
878
delta.append((None, self.id2path(file_id), file_id, self[file_id]))
879
for file_id in common:
880
if old[file_id] != self[file_id]:
881
delta.append((old.id2path(file_id), self.id2path(file_id),
882
file_id, self[file_id]))
885
def _get_mutable_inventory(self):
886
"""Returns a mutable copy of the object.
888
Some inventories are immutable, yet working trees, for example, needs
889
to mutate exisiting inventories instead of creating a new one.
891
raise NotImplementedError(self._get_mutable_inventory)
893
def make_entry(self, kind, name, parent_id, file_id=None):
894
"""Simple thunk to bzrlib.inventory.make_entry."""
895
return make_entry(kind, name, parent_id, file_id)
898
"""Return list of (path, ie) for all entries except the root.
900
This may be faster than iter_entries.
903
def descend(dir_ie, dir_path):
904
kids = dir_ie.children.items()
906
for name, ie in kids:
907
child_path = osutils.pathjoin(dir_path, name)
908
accum.append((child_path, ie))
909
if ie.kind == 'directory':
910
descend(ie, child_path)
912
descend(self.root, u'')
915
def directories(self):
916
"""Return (path, entry) pairs for all directories, including the root.
919
def descend(parent_ie, parent_path):
920
accum.append((parent_path, parent_ie))
922
kids = [(ie.name, ie) for ie in parent_ie.children.itervalues() if ie.kind == 'directory']
925
for name, child_ie in kids:
926
child_path = osutils.pathjoin(parent_path, name)
927
descend(child_ie, child_path)
928
descend(self.root, u'')
931
def path2id(self, name):
932
"""Walk down through directories to return entry of last component.
934
names may be either a list of path components, or a single
935
string, in which case it is automatically split.
937
This returns the entry of the last component in the path,
938
which may be either a file or a directory.
940
Returns None IFF the path is not found.
942
if isinstance(name, basestring):
943
name = osutils.splitpath(name)
945
# mutter("lookup path %r" % name)
949
except errors.NoSuchId:
950
# root doesn't exist yet so nothing else can
956
children = getattr(parent, 'children', None)
965
return parent.file_id
967
def filter(self, specific_fileids):
968
"""Get an inventory view filtered against a set of file-ids.
970
Children of directories and parents are included.
972
The result may or may not reference the underlying inventory
973
so it should be treated as immutable.
975
interesting_parents = set()
976
for fileid in specific_fileids:
978
interesting_parents.update(self.get_idpath(fileid))
979
except errors.NoSuchId:
980
# This fileid is not in the inventory - that's ok
982
entries = self.iter_entries()
983
if self.root is None:
984
return Inventory(root_id=None)
985
other = Inventory(entries.next()[1].file_id)
986
other.root.revision = self.root.revision
987
other.revision_id = self.revision_id
988
directories_to_expand = set()
989
for path, entry in entries:
990
file_id = entry.file_id
991
if (file_id in specific_fileids
992
or entry.parent_id in directories_to_expand):
993
if entry.kind == 'directory':
994
directories_to_expand.add(file_id)
995
elif file_id not in interesting_parents:
997
other.add(entry.copy())
1000
def get_idpath(self, file_id):
1001
"""Return a list of file_ids for the path to an entry.
1003
The list contains one element for each directory followed by
1004
the id of the file itself. So the length of the returned list
1005
is equal to the depth of the file in the tree, counting the
1006
root directory as depth 1.
1009
for parent in self._iter_file_id_parents(file_id):
1010
p.insert(0, parent.file_id)
1014
class Inventory(CommonInventory):
675
class Inventory(object):
1015
676
"""Inventory of versioned files in a tree.
1017
678
This describes which file_id is present at each point in the tree,
1062
720
The inventory is created with a default root directory, with
1065
if root_id is not None:
1066
self._set_root(InventoryDirectory(root_id, u'', None))
1070
self.revision_id = revision_id
1073
# More than one page of ouput is not useful anymore to debug
1076
contents = repr(self._byid)
1077
if len(contents) > max_len:
1078
contents = contents[:(max_len-len(closing))] + closing
1079
return "<Inventory object at %x, contents=%r>" % (id(self), contents)
1081
def apply_delta(self, delta):
1082
"""Apply a delta to this inventory.
1084
:param delta: A list of changes to apply. After all the changes are
1085
applied the final inventory must be internally consistent, but it
1086
is ok to supply changes which, if only half-applied would have an
1087
invalid result - such as supplying two changes which rename two
1088
files, 'A' and 'B' with each other : [('A', 'B', 'A-id', a_entry),
1089
('B', 'A', 'B-id', b_entry)].
1091
Each change is a tuple, of the form (old_path, new_path, file_id,
1094
When new_path is None, the change indicates the removal of an entry
1095
from the inventory and new_entry will be ignored (using None is
1096
appropriate). If new_path is not None, then new_entry must be an
1097
InventoryEntry instance, which will be incorporated into the
1098
inventory (and replace any existing entry with the same file id).
1100
When old_path is None, the change indicates the addition of
1101
a new entry to the inventory.
1103
When neither new_path nor old_path are None, the change is a
1104
modification to an entry, such as a rename, reparent, kind change
1107
The children attribute of new_entry is ignored. This is because
1108
this method preserves children automatically across alterations to
1109
the parent of the children, and cases where the parent id of a
1110
child is changing require the child to be passed in as a separate
1111
change regardless. E.g. in the recursive deletion of a directory -
1112
the directory's children must be included in the delta, or the
1113
final inventory will be invalid.
1115
Note that a file_id must only appear once within a given delta.
1116
An AssertionError is raised otherwise.
1118
# Check that the delta is legal. It would be nice if this could be
1119
# done within the loops below but it's safer to validate the delta
1120
# before starting to mutate the inventory.
1121
unique_file_ids = set([f for _, _, f, _ in delta])
1122
if len(unique_file_ids) != len(delta):
1123
raise AssertionError("a file-id appears multiple times in %r"
1128
# Remove all affected items which were in the original inventory,
1129
# starting with the longest paths, thus ensuring parents are examined
1130
# after their children, which means that everything we examine has no
1131
# modified children remaining by the time we examine it.
1132
for old_path, file_id in sorted(((op, f) for op, np, f, e in delta
1133
if op is not None), reverse=True):
1134
if file_id not in self:
1137
# Preserve unaltered children of file_id for later reinsertion.
1138
file_id_children = getattr(self[file_id], 'children', {})
1139
if len(file_id_children):
1140
children[file_id] = file_id_children
1141
# Remove file_id and the unaltered children. If file_id is not
1142
# being deleted it will be reinserted back later.
1143
self.remove_recursive_id(file_id)
1144
# Insert all affected which should be in the new inventory, reattaching
1145
# their children if they had any. This is done from shortest path to
1146
# longest, ensuring that items which were modified and whose parents in
1147
# the resulting inventory were also modified, are inserted after their
1149
for new_path, new_entry in sorted((np, e) for op, np, f, e in
1150
delta if np is not None):
1151
if new_entry.kind == 'directory':
1152
# Pop the child which to allow detection of children whose
1153
# parents were deleted and which were not reattached to a new
1155
replacement = InventoryDirectory(new_entry.file_id,
1156
new_entry.name, new_entry.parent_id)
1157
replacement.revision = new_entry.revision
1158
replacement.children = children.pop(replacement.file_id, {})
1159
new_entry = replacement
1162
# Get the parent id that was deleted
1163
parent_id, children = children.popitem()
1164
raise errors.InconsistentDelta("<deleted>", parent_id,
1165
"The file id was deleted but its children were not deleted.")
1167
def _set_root(self, ie):
723
# We are letting Branch.initialize() create a unique inventory
724
# root id. Rather than generating a random one here.
726
# root_id = bzrlib.branch.gen_file_id('TREE_ROOT')
727
self.root = RootEntry(root_id)
1169
728
self._byid = {self.root.file_id: self.root}
1172
# TODO: jam 20051218 Should copy also copy the revision_id?
1173
entries = self.iter_entries()
1174
if self.root is None:
1175
return Inventory(root_id=None)
1176
other = Inventory(entries.next()[1].file_id)
1177
other.root.revision = self.root.revision
732
other = Inventory(self.root.file_id)
1178
733
# copy recursively so we know directories will be added before
1179
734
# their children. There are more efficient ways than this...
1180
for path, entry in entries:
735
for path, entry in self.iter_entries():
736
if entry == self.root:
1181
738
other.add(entry.copy())
1184
def _get_mutable_inventory(self):
1185
"""See CommonInventory._get_mutable_inventory."""
1186
return deepcopy(self)
1188
742
def __iter__(self):
1189
"""Iterate over all file-ids."""
1190
743
return iter(self._byid)
1192
def iter_just_entries(self):
1193
"""Iterate over all entries.
1195
Unlike iter_entries(), just the entries are returned (not (path, ie))
1196
and the order of entries is undefined.
1198
XXX: We may not want to merge this into bzr.dev.
1200
if self.root is None:
1202
for _, ie in self._byid.iteritems():
1205
746
def __len__(self):
1206
747
"""Returns number of entries."""
1207
748
return len(self._byid)
751
def iter_entries(self, from_dir=None):
752
"""Return (path, entry) pairs, in order by name."""
756
elif isinstance(from_dir, basestring):
757
from_dir = self._byid[from_dir]
759
kids = from_dir.children.items()
761
for name, ie in kids:
763
if ie.kind == 'directory':
764
for cn, cie in self.iter_entries(from_dir=ie.file_id):
765
yield os.path.join(name, cn), cie
769
"""Return list of (path, ie) for all entries except the root.
771
This may be faster than iter_entries.
774
def descend(dir_ie, dir_path):
775
kids = dir_ie.children.items()
777
for name, ie in kids:
778
child_path = os.path.join(dir_path, name)
779
accum.append((child_path, ie))
780
if ie.kind == 'directory':
781
descend(ie, child_path)
783
descend(self.root, '')
787
def directories(self):
788
"""Return (path, entry) pairs for all directories, including the root.
791
def descend(parent_ie, parent_path):
792
accum.append((parent_path, parent_ie))
794
kids = [(ie.name, ie) for ie in parent_ie.children.itervalues() if ie.kind == 'directory']
797
for name, child_ie in kids:
798
child_path = os.path.join(parent_path, name)
799
descend(child_ie, child_path)
800
descend(self.root, '')
805
def __contains__(self, file_id):
806
"""True if this entry contains a file with given id.
808
>>> inv = Inventory()
809
>>> inv.add(InventoryFile('123', 'foo.c', ROOT_ID))
810
InventoryFile('123', 'foo.c', parent_id='TREE_ROOT')
816
return file_id in self._byid
1209
819
def __getitem__(self, file_id):
1210
820
"""Return the entry for given file_id.
1212
822
>>> inv = Inventory()
1213
823
>>> inv.add(InventoryFile('123123', 'hello.c', ROOT_ID))
1214
InventoryFile('123123', 'hello.c', parent_id='TREE_ROOT', sha1=None, len=None, revision=None)
824
InventoryFile('123123', 'hello.c', parent_id='TREE_ROOT')
1215
825
>>> inv['123123'].name
1219
829
return self._byid[file_id]
1220
830
except KeyError:
1221
# really we're passing an inventory, not a tree...
1222
raise errors.NoSuchId(self, file_id)
832
raise BzrError("can't look up file_id None")
834
raise BzrError("file_id {%s} not in inventory" % file_id)
1224
837
def get_file_kind(self, file_id):
1225
838
return self._byid[file_id].kind
1315
936
>>> i1.add(InventoryFile('123', 'foo', ROOT_ID))
1316
InventoryFile('123', 'foo', parent_id='TREE_ROOT', sha1=None, len=None, revision=None)
937
InventoryFile('123', 'foo', parent_id='TREE_ROOT')
1319
940
>>> i2.add(InventoryFile('123', 'foo', ROOT_ID))
1320
InventoryFile('123', 'foo', parent_id='TREE_ROOT', sha1=None, len=None, revision=None)
941
InventoryFile('123', 'foo', parent_id='TREE_ROOT')
1324
945
if not isinstance(other, Inventory):
1325
946
return NotImplemented
948
if len(self._byid) != len(other._byid):
949
# shortcut: obviously not the same
1327
952
return self._byid == other._byid
1329
955
def __ne__(self, other):
1330
956
return not self.__eq__(other)
1332
959
def __hash__(self):
1333
960
raise ValueError('not hashable')
1335
def _iter_file_id_parents(self, file_id):
1336
"""Yield the parents of file_id up to the root."""
1337
while file_id is not None:
963
def get_idpath(self, file_id):
964
"""Return a list of file_ids for the path to an entry.
966
The list contains one element for each directory followed by
967
the id of the file itself. So the length of the returned list
968
is equal to the depth of the file in the tree, counting the
969
root directory as depth 1.
972
while file_id != None:
1339
974
ie = self._byid[file_id]
1340
975
except KeyError:
1341
raise errors.NoSuchId(tree=None, file_id=file_id)
976
raise BzrError("file_id {%s} not found in inventory" % file_id)
977
p.insert(0, ie.file_id)
1343
978
file_id = ie.parent_id
1345
def has_filename(self, filename):
1346
return bool(self.path2id(filename))
982
def id2path(self, file_id):
983
"""Return as a list the path to file_id.
986
>>> e = i.add(InventoryDirectory('src-id', 'src', ROOT_ID))
987
>>> e = i.add(InventoryFile('foo-id', 'foo.c', parent_id='src-id'))
988
>>> print i.id2path('foo-id').replace(os.sep, '/')
991
# get all names, skipping root
992
p = [self._byid[fid].name for fid in self.get_idpath(file_id)[1:]]
993
return os.sep.join(p)
997
def path2id(self, name):
998
"""Walk down through directories to return entry of last component.
1000
names may be either a list of path components, or a single
1001
string, in which case it is automatically split.
1003
This returns the entry of the last component in the path,
1004
which may be either a file or a directory.
1006
Returns None iff the path is not found.
1008
if isinstance(name, types.StringTypes):
1009
name = splitpath(name)
1011
mutter("lookup path %r" % name)
1016
cie = parent.children[f]
1017
assert cie.name == f
1018
assert cie.parent_id == parent.file_id
1021
# or raise an error?
1024
return parent.file_id
1027
def has_filename(self, names):
1028
return bool(self.path2id(names))
1348
1031
def has_id(self, file_id):
1349
return (file_id in self._byid)
1351
def _make_delta(self, old):
1352
"""Make an inventory delta from two inventories."""
1353
old_getter = getattr(old, '_byid', old)
1354
new_getter = self._byid
1355
old_ids = set(old_getter)
1356
new_ids = set(new_getter)
1357
adds = new_ids - old_ids
1358
deletes = old_ids - new_ids
1359
if not adds and not deletes:
1362
common = old_ids.intersection(new_ids)
1364
for file_id in deletes:
1365
delta.append((old.id2path(file_id), None, file_id, None))
1366
for file_id in adds:
1367
delta.append((None, self.id2path(file_id), file_id, self[file_id]))
1368
for file_id in common:
1369
new_ie = new_getter[file_id]
1370
old_ie = old_getter[file_id]
1371
# If xml_serializer returns the cached InventoryEntries (rather
1372
# than always doing .copy()), inlining the 'is' check saves 2.7M
1373
# calls to __eq__. Under lsprof this saves 20s => 6s.
1374
# It is a minor improvement without lsprof.
1375
if old_ie is new_ie or old_ie == new_ie:
1378
delta.append((old.id2path(file_id), self.id2path(file_id),
1382
def remove_recursive_id(self, file_id):
1383
"""Remove file_id, and children, from the inventory.
1385
:param file_id: A file_id to remove.
1387
to_find_delete = [self._byid[file_id]]
1389
while to_find_delete:
1390
ie = to_find_delete.pop()
1391
to_delete.append(ie.file_id)
1392
if ie.kind == 'directory':
1393
to_find_delete.extend(ie.children.values())
1394
for file_id in reversed(to_delete):
1396
del self._byid[file_id]
1397
if ie.parent_id is not None:
1398
del self[ie.parent_id].children[ie.name]
1032
return self._byid.has_key(file_id)
1402
1035
def rename(self, file_id, new_parent_id, new_name):
1403
1036
"""Move a file within the inventory.
1405
1038
This can change either the name, or the parent, or both.
1407
This does not move the working file.
1409
new_name = ensure_normalized_name(new_name)
1040
This does not move the working file."""
1410
1041
if not is_valid_name(new_name):
1411
1042
raise BzrError("not an acceptable filename: %r" % new_name)
1427
1058
del old_parent.children[file_ie.name]
1428
1059
new_parent.children[new_name] = file_ie
1430
1061
file_ie.name = new_name
1431
1062
file_ie.parent_id = new_parent_id
1433
def is_root(self, file_id):
1434
return self.root is not None and file_id == self.root.file_id
1437
class CHKInventory(CommonInventory):
1438
"""An inventory persisted in a CHK store.
1440
By design, a CHKInventory is immutable so many of the methods
1441
supported by Inventory - add, rename, apply_delta, etc - are *not*
1442
supported. To create a new CHKInventory, use create_by_apply_delta()
1443
or from_inventory(), say.
1445
Internally, a CHKInventory has one or two CHKMaps:
1447
* id_to_entry - a map from (file_id,) => InventoryEntry as bytes
1448
* parent_id_basename_to_file_id - a map from (parent_id, basename_utf8)
1451
The second map is optional and not present in early CHkRepository's.
1453
No caching is performed: every method call or item access will perform
1454
requests to the storage layer. As such, keep references to objects you
1458
def __init__(self, search_key_name):
1459
CommonInventory.__init__(self)
1460
self._fileid_to_entry_cache = {}
1461
self._path_to_fileid_cache = {}
1462
self._search_key_name = search_key_name
1464
def _entry_to_bytes(self, entry):
1465
"""Serialise entry as a single bytestring.
1467
:param Entry: An inventory entry.
1468
:return: A bytestring for the entry.
1471
ENTRY ::= FILE | DIR | SYMLINK | TREE
1472
FILE ::= "file: " COMMON SEP SHA SEP SIZE SEP EXECUTABLE
1473
DIR ::= "dir: " COMMON
1474
SYMLINK ::= "symlink: " COMMON SEP TARGET_UTF8
1475
TREE ::= "tree: " COMMON REFERENCE_REVISION
1476
COMMON ::= FILE_ID SEP PARENT_ID SEP NAME_UTF8 SEP REVISION
1479
if entry.parent_id is not None:
1480
parent_str = entry.parent_id
1483
name_str = entry.name.encode("utf8")
1484
if entry.kind == 'file':
1485
if entry.executable:
1489
return "file: %s\n%s\n%s\n%s\n%s\n%d\n%s" % (
1490
entry.file_id, parent_str, name_str, entry.revision,
1491
entry.text_sha1, entry.text_size, exec_str)
1492
elif entry.kind == 'directory':
1493
return "dir: %s\n%s\n%s\n%s" % (
1494
entry.file_id, parent_str, name_str, entry.revision)
1495
elif entry.kind == 'symlink':
1496
return "symlink: %s\n%s\n%s\n%s\n%s" % (
1497
entry.file_id, parent_str, name_str, entry.revision,
1498
entry.symlink_target.encode("utf8"))
1499
elif entry.kind == 'tree-reference':
1500
return "tree: %s\n%s\n%s\n%s\n%s" % (
1501
entry.file_id, parent_str, name_str, entry.revision,
1502
entry.reference_revision)
1504
raise ValueError("unknown kind %r" % entry.kind)
1507
def _bytes_to_utf8name_key(bytes):
1508
"""Get the file_id, revision_id key out of bytes."""
1509
# We don't normally care about name, except for times when we want
1510
# to filter out empty names because of non rich-root...
1511
sections = bytes.split('\n')
1512
kind, file_id = sections[0].split(': ')
1513
return (sections[2], file_id, sections[3])
1515
def _bytes_to_entry(self, bytes):
1516
"""Deserialise a serialised entry."""
1517
sections = bytes.split('\n')
1518
if sections[0].startswith("file: "):
1519
result = InventoryFile(sections[0][6:],
1520
sections[2].decode('utf8'),
1522
result.text_sha1 = sections[4]
1523
result.text_size = int(sections[5])
1524
result.executable = sections[6] == "Y"
1525
elif sections[0].startswith("dir: "):
1526
result = CHKInventoryDirectory(sections[0][5:],
1527
sections[2].decode('utf8'),
1529
elif sections[0].startswith("symlink: "):
1530
result = InventoryLink(sections[0][9:],
1531
sections[2].decode('utf8'),
1533
result.symlink_target = sections[4].decode('utf8')
1534
elif sections[0].startswith("tree: "):
1535
result = TreeReference(sections[0][6:],
1536
sections[2].decode('utf8'),
1538
result.reference_revision = sections[4]
1540
raise ValueError("Not a serialised entry %r" % bytes)
1541
result.revision = sections[3]
1542
if result.parent_id == '':
1543
result.parent_id = None
1544
self._fileid_to_entry_cache[result.file_id] = result
1547
def _get_mutable_inventory(self):
1548
"""See CommonInventory._get_mutable_inventory."""
1549
entries = self.iter_entries()
1550
inv = Inventory(None, self.revision_id)
1551
for path, inv_entry in entries:
1552
inv.add(inv_entry.copy())
1555
def create_by_apply_delta(self, inventory_delta, new_revision_id,
1556
propagate_caches=False):
1557
"""Create a new CHKInventory by applying inventory_delta to this one.
1559
:param inventory_delta: The inventory delta to apply. See
1560
Inventory.apply_delta for details.
1561
:param new_revision_id: The revision id of the resulting CHKInventory.
1562
:param propagate_caches: If True, the caches for this inventory are
1563
copied to and updated for the result.
1564
:return: The new CHKInventory.
1566
result = CHKInventory(self._search_key_name)
1567
if propagate_caches:
1568
# Just propagate the path-to-fileid cache for now
1569
result._path_to_fileid_cache = dict(self._path_to_fileid_cache.iteritems())
1570
search_key_func = chk_map.search_key_registry.get(self._search_key_name)
1571
self.id_to_entry._ensure_root()
1572
maximum_size = self.id_to_entry._root_node.maximum_size
1573
result.revision_id = new_revision_id
1574
result.id_to_entry = chk_map.CHKMap(
1575
self.id_to_entry._store,
1576
self.id_to_entry.key(),
1577
search_key_func=search_key_func)
1578
result.id_to_entry._ensure_root()
1579
result.id_to_entry._root_node.set_maximum_size(maximum_size)
1580
parent_id_basename_delta = []
1581
if self.parent_id_basename_to_file_id is not None:
1582
result.parent_id_basename_to_file_id = chk_map.CHKMap(
1583
self.parent_id_basename_to_file_id._store,
1584
self.parent_id_basename_to_file_id.key(),
1585
search_key_func=search_key_func)
1586
result.parent_id_basename_to_file_id._ensure_root()
1587
self.parent_id_basename_to_file_id._ensure_root()
1588
result_p_id_root = result.parent_id_basename_to_file_id._root_node
1589
p_id_root = self.parent_id_basename_to_file_id._root_node
1590
result_p_id_root.set_maximum_size(p_id_root.maximum_size)
1591
result_p_id_root._key_width = p_id_root._key_width
1593
result.parent_id_basename_to_file_id = None
1594
result.root_id = self.root_id
1595
id_to_entry_delta = []
1596
for old_path, new_path, file_id, entry in inventory_delta:
1599
result.root_id = file_id
1600
if new_path is None:
1605
if propagate_caches:
1607
del result._path_to_fileid_cache[old_path]
1611
new_key = (file_id,)
1612
new_value = result._entry_to_bytes(entry)
1613
# Update caches. It's worth doing this whether
1614
# we're propagating the old caches or not.
1615
result._path_to_fileid_cache[new_path] = file_id
1616
if old_path is None:
1619
old_key = (file_id,)
1620
id_to_entry_delta.append((old_key, new_key, new_value))
1621
if result.parent_id_basename_to_file_id is not None:
1622
# parent_id, basename changes
1623
if old_path is None:
1626
old_entry = self[file_id]
1627
old_key = self._parent_id_basename_key(old_entry)
1628
if new_path is None:
1632
new_key = self._parent_id_basename_key(entry)
1634
if old_key != new_key:
1635
# If the two keys are the same, the value will be unchanged
1636
# as its always the file id.
1637
parent_id_basename_delta.append((old_key, new_key, new_value))
1638
result.id_to_entry.apply_delta(id_to_entry_delta)
1639
if parent_id_basename_delta:
1640
result.parent_id_basename_to_file_id.apply_delta(parent_id_basename_delta)
1644
def deserialise(klass, chk_store, bytes, expected_revision_id):
1645
"""Deserialise a CHKInventory.
1647
:param chk_store: A CHK capable VersionedFiles instance.
1648
:param bytes: The serialised bytes.
1649
:param expected_revision_id: The revision ID we think this inventory is
1651
:return: A CHKInventory
1653
lines = bytes.split('\n')
1655
raise AssertionError('bytes to deserialize must end with an eol')
1657
if lines[0] != 'chkinventory:':
1658
raise ValueError("not a serialised CHKInventory: %r" % bytes)
1660
allowed_keys = frozenset(['root_id', 'revision_id', 'search_key_name',
1661
'parent_id_basename_to_file_id',
1663
for line in lines[1:]:
1664
key, value = line.split(': ', 1)
1665
if key not in allowed_keys:
1666
raise errors.BzrError('Unknown key in inventory: %r\n%r'
1669
raise errors.BzrError('Duplicate key in inventory: %r\n%r'
1672
revision_id = info['revision_id']
1673
root_id = info['root_id']
1674
search_key_name = info.get('search_key_name', 'plain')
1675
parent_id_basename_to_file_id = info.get(
1676
'parent_id_basename_to_file_id', None)
1677
id_to_entry = info['id_to_entry']
1679
result = CHKInventory(search_key_name)
1680
result.revision_id = revision_id
1681
result.root_id = root_id
1682
search_key_func = chk_map.search_key_registry.get(
1683
result._search_key_name)
1684
if parent_id_basename_to_file_id is not None:
1685
result.parent_id_basename_to_file_id = chk_map.CHKMap(
1686
chk_store, (parent_id_basename_to_file_id,),
1687
search_key_func=search_key_func)
1689
result.parent_id_basename_to_file_id = None
1691
result.id_to_entry = chk_map.CHKMap(chk_store, (id_to_entry,),
1692
search_key_func=search_key_func)
1693
if (result.revision_id,) != expected_revision_id:
1694
raise ValueError("Mismatched revision id and expected: %r, %r" %
1695
(result.revision_id, expected_revision_id))
1699
def from_inventory(klass, chk_store, inventory, maximum_size=0, search_key_name='plain'):
1700
"""Create a CHKInventory from an existing inventory.
1702
The content of inventory is copied into the chk_store, and a
1703
CHKInventory referencing that is returned.
1705
:param chk_store: A CHK capable VersionedFiles instance.
1706
:param inventory: The inventory to copy.
1707
:param maximum_size: The CHKMap node size limit.
1708
:param search_key_name: The identifier for the search key function
1710
result = CHKInventory(search_key_name)
1711
result.revision_id = inventory.revision_id
1712
result.root_id = inventory.root.file_id
1713
search_key_func = chk_map.search_key_registry.get(search_key_name)
1714
result.id_to_entry = chk_map.CHKMap(chk_store, None, search_key_func)
1715
result.id_to_entry._root_node.set_maximum_size(maximum_size)
1717
result.parent_id_basename_to_file_id = chk_map.CHKMap(chk_store,
1718
None, search_key_func)
1719
result.parent_id_basename_to_file_id._root_node.set_maximum_size(
1721
result.parent_id_basename_to_file_id._root_node._key_width = 2
1722
parent_id_delta = []
1723
for path, entry in inventory.iter_entries():
1724
file_id_delta.append((None, (entry.file_id,),
1725
result._entry_to_bytes(entry)))
1726
parent_id_delta.append(
1727
(None, result._parent_id_basename_key(entry),
1729
result.id_to_entry.apply_delta(file_id_delta)
1730
result.parent_id_basename_to_file_id.apply_delta(parent_id_delta)
1733
def _parent_id_basename_key(self, entry):
1734
"""Create a key for a entry in a parent_id_basename_to_file_id index."""
1735
if entry.parent_id is not None:
1736
parent_id = entry.parent_id
1739
return parent_id, entry.name.encode('utf8')
1741
def __getitem__(self, file_id):
1742
"""map a single file_id -> InventoryEntry."""
1744
raise errors.NoSuchId(self, file_id)
1745
result = self._fileid_to_entry_cache.get(file_id, None)
1746
if result is not None:
1749
return self._bytes_to_entry(
1750
self.id_to_entry.iteritems([(file_id,)]).next()[1])
1751
except StopIteration:
1752
# really we're passing an inventory, not a tree...
1753
raise errors.NoSuchId(self, file_id)
1755
def has_id(self, file_id):
1756
# Perhaps have an explicit 'contains' method on CHKMap ?
1757
if self._fileid_to_entry_cache.get(file_id, None) is not None:
1759
return len(list(self.id_to_entry.iteritems([(file_id,)]))) == 1
1761
def is_root(self, file_id):
1762
return file_id == self.root_id
1764
def _iter_file_id_parents(self, file_id):
1765
"""Yield the parents of file_id up to the root."""
1766
while file_id is not None:
1770
raise errors.NoSuchId(tree=self, file_id=file_id)
1772
file_id = ie.parent_id
1775
"""Iterate over all file-ids."""
1776
for key, _ in self.id_to_entry.iteritems():
1779
def iter_just_entries(self):
1780
"""Iterate over all entries.
1782
Unlike iter_entries(), just the entries are returned (not (path, ie))
1783
and the order of entries is undefined.
1785
XXX: We may not want to merge this into bzr.dev.
1787
for key, entry in self.id_to_entry.iteritems():
1789
ie = self._fileid_to_entry_cache.get(file_id, None)
1791
ie = self._bytes_to_entry(entry)
1792
self._fileid_to_entry_cache[file_id] = ie
1795
def iter_changes(self, basis):
1796
"""Generate a Tree.iter_changes change list between this and basis.
1798
:param basis: Another CHKInventory.
1799
:return: An iterator over the changes between self and basis, as per
1800
tree.iter_changes().
1802
# We want: (file_id, (path_in_source, path_in_target),
1803
# changed_content, versioned, parent, name, kind,
1805
for key, basis_value, self_value in \
1806
self.id_to_entry.iter_changes(basis.id_to_entry):
1808
if basis_value is not None:
1809
basis_entry = basis._bytes_to_entry(basis_value)
1810
path_in_source = basis.id2path(file_id)
1811
basis_parent = basis_entry.parent_id
1812
basis_name = basis_entry.name
1813
basis_executable = basis_entry.executable
1815
path_in_source = None
1818
basis_executable = None
1819
if self_value is not None:
1820
self_entry = self._bytes_to_entry(self_value)
1821
path_in_target = self.id2path(file_id)
1822
self_parent = self_entry.parent_id
1823
self_name = self_entry.name
1824
self_executable = self_entry.executable
1826
path_in_target = None
1829
self_executable = None
1830
if basis_value is None:
1832
kind = (None, self_entry.kind)
1833
versioned = (False, True)
1834
elif self_value is None:
1836
kind = (basis_entry.kind, None)
1837
versioned = (True, False)
1839
kind = (basis_entry.kind, self_entry.kind)
1840
versioned = (True, True)
1841
changed_content = False
1842
if kind[0] != kind[1]:
1843
changed_content = True
1844
elif kind[0] == 'file':
1845
if (self_entry.text_size != basis_entry.text_size or
1846
self_entry.text_sha1 != basis_entry.text_sha1):
1847
changed_content = True
1848
elif kind[0] == 'symlink':
1849
if self_entry.symlink_target != basis_entry.symlink_target:
1850
changed_content = True
1851
elif kind[0] == 'tree-reference':
1852
if (self_entry.reference_revision !=
1853
basis_entry.reference_revision):
1854
changed_content = True
1855
parent = (basis_parent, self_parent)
1856
name = (basis_name, self_name)
1857
executable = (basis_executable, self_executable)
1858
if (not changed_content
1859
and parent[0] == parent[1]
1860
and name[0] == name[1]
1861
and executable[0] == executable[1]):
1862
# Could happen when only the revision changed for a directory
1865
yield (file_id, (path_in_source, path_in_target), changed_content,
1866
versioned, parent, name, kind, executable)
1869
"""Return the number of entries in the inventory."""
1870
return len(self.id_to_entry)
1872
def _make_delta(self, old):
1873
"""Make an inventory delta from two inventories."""
1874
if type(old) != CHKInventory:
1875
return CommonInventory._make_delta(self, old)
1877
for key, old_value, self_value in \
1878
self.id_to_entry.iter_changes(old.id_to_entry):
1880
if old_value is not None:
1881
old_path = old.id2path(file_id)
1884
if self_value is not None:
1885
entry = self._bytes_to_entry(self_value)
1886
self._fileid_to_entry_cache[file_id] = entry
1887
new_path = self.id2path(file_id)
1891
delta.append((old_path, new_path, file_id, entry))
1894
def path2id(self, name):
1895
"""See CommonInventory.path2id()."""
1896
result = self._path_to_fileid_cache.get(name, None)
1898
result = CommonInventory.path2id(self, name)
1899
self._path_to_fileid_cache[name] = result
1903
"""Serialise the inventory to lines."""
1904
lines = ["chkinventory:\n"]
1905
if self._search_key_name != 'plain':
1906
# custom ordering grouping things that don't change together
1907
lines.append('search_key_name: %s\n' % (self._search_key_name,))
1908
lines.append("root_id: %s\n" % self.root_id)
1909
lines.append('parent_id_basename_to_file_id: %s\n' %
1910
self.parent_id_basename_to_file_id.key())
1911
lines.append("revision_id: %s\n" % self.revision_id)
1912
lines.append("id_to_entry: %s\n" % self.id_to_entry.key())
1914
lines.append("revision_id: %s\n" % self.revision_id)
1915
lines.append("root_id: %s\n" % self.root_id)
1916
if self.parent_id_basename_to_file_id is not None:
1917
lines.append('parent_id_basename_to_file_id: %s\n' %
1918
self.parent_id_basename_to_file_id.key())
1919
lines.append("id_to_entry: %s\n" % self.id_to_entry.key())
1924
"""Get the root entry."""
1925
return self[self.root_id]
1928
class CHKInventoryDirectory(InventoryDirectory):
1929
"""A directory in an inventory."""
1931
__slots__ = ['text_sha1', 'text_size', 'file_id', 'name', 'kind',
1932
'text_id', 'parent_id', '_children', 'executable',
1933
'revision', 'symlink_target', 'reference_revision',
1936
def __init__(self, file_id, name, parent_id, chk_inventory):
1937
# Don't call InventoryDirectory.__init__ - it isn't right for this
1939
InventoryEntry.__init__(self, file_id, name, parent_id)
1940
self._children = None
1941
self.kind = 'directory'
1942
self._chk_inventory = chk_inventory
1946
"""Access the list of children of this directory.
1948
With a parent_id_basename_to_file_id index, loads all the children,
1949
without loads the entire index. Without is bad. A more sophisticated
1950
proxy object might be nice, to allow partial loading of children as
1951
well when specific names are accessed. (So path traversal can be
1952
written in the obvious way but not examine siblings.).
1954
if self._children is not None:
1955
return self._children
1956
# No longer supported
1957
if self._chk_inventory.parent_id_basename_to_file_id is None:
1958
raise AssertionError("Inventories without"
1959
" parent_id_basename_to_file_id are no longer supported")
1961
# XXX: Todo - use proxy objects for the children rather than loading
1962
# all when the attribute is referenced.
1963
parent_id_index = self._chk_inventory.parent_id_basename_to_file_id
1965
for (parent_id, name_utf8), file_id in parent_id_index.iteritems(
1966
key_filter=[(self.file_id,)]):
1967
child_keys.add((file_id,))
1969
for file_id_key in child_keys:
1970
entry = self._chk_inventory._fileid_to_entry_cache.get(
1971
file_id_key[0], None)
1972
if entry is not None:
1973
result[entry.name] = entry
1974
cached.add(file_id_key)
1975
child_keys.difference_update(cached)
1976
# populate; todo: do by name
1977
id_to_entry = self._chk_inventory.id_to_entry
1978
for file_id_key, bytes in id_to_entry.iteritems(child_keys):
1979
entry = self._chk_inventory._bytes_to_entry(bytes)
1980
result[entry.name] = entry
1981
self._chk_inventory._fileid_to_entry_cache[file_id_key[0]] = entry
1982
self._children = result
1986
'directory': InventoryDirectory,
1987
'file': InventoryFile,
1988
'symlink': InventoryLink,
1989
'tree-reference': TreeReference
1992
def make_entry(kind, name, parent_id, file_id=None):
1993
"""Create an inventory entry.
1995
:param kind: the type of inventory entry to create.
1996
:param name: the basename of the entry.
1997
:param parent_id: the parent_id of the entry.
1998
:param file_id: the file_id to use. if None, one will be created.
2001
file_id = generate_ids.gen_file_id(name)
2002
name = ensure_normalized_name(name)
2004
factory = entry_factory[kind]
2006
raise BzrError("unknown kind %r" % kind)
2007
return factory(file_id, name, parent_id)
2010
def ensure_normalized_name(name):
2013
:raises InvalidNormalization: When name is not normalized, and cannot be
2014
accessed on this platform by the normalized path.
2015
:return: The NFC normalised version of name.
2017
#------- This has been copied to bzrlib.dirstate.DirState.add, please
2018
# keep them synchronised.
2019
# we dont import normalized_filename directly because we want to be
2020
# able to change the implementation at runtime for tests.
2021
norm_name, can_access = osutils.normalized_filename(name)
2022
if norm_name != name:
2026
# TODO: jam 20060701 This would probably be more useful
2027
# if the error was raised with the full path
2028
raise errors.InvalidNormalization(name)
2032
1067
_NAME_RE = None
2034
1069
def is_valid_name(name):
2035
1070
global _NAME_RE
2036
if _NAME_RE is None:
1071
if _NAME_RE == None:
2037
1072
_NAME_RE = re.compile(r'^[^/\\]+$')
2039
1074
return bool(_NAME_RE.match(name))
added
removed
bzrlib/inventory.py
