90
78
>>> i.add(InventoryDirectory('123', 'src', ROOT_ID))
91
InventoryDirectory('123', 'src', parent_id='TREE_ROOT', revision=None)
79
InventoryDirectory('123', 'src', parent_id='TREE_ROOT')
92
80
>>> i.add(InventoryFile('2323', 'hello.c', parent_id='123'))
93
InventoryFile('2323', 'hello.c', parent_id='123', sha1=None, len=None)
94
>>> shouldbe = {0: '', 1: 'src', 2: 'src/hello.c'}
81
InventoryFile('2323', 'hello.c', parent_id='123')
82
>>> shouldbe = {0: 'src', 1: pathjoin('src','hello.c')}
95
83
>>> for ix, j in enumerate(i.iter_entries()):
96
84
... print (j[0] == shouldbe[ix], j[1])
98
(True, InventoryDirectory('TREE_ROOT', u'', parent_id=None, revision=None))
99
(True, InventoryDirectory('123', 'src', parent_id='TREE_ROOT', revision=None))
100
(True, InventoryFile('2323', 'hello.c', parent_id='123', sha1=None, len=None))
86
(True, InventoryDirectory('123', 'src', parent_id='TREE_ROOT'))
87
(True, InventoryFile('2323', 'hello.c', parent_id='123'))
88
>>> i.add(InventoryFile('2323', 'bye.c', '123'))
89
Traceback (most recent call last):
91
BzrError: inventory already contains entry with id {2323}
101
92
>>> i.add(InventoryFile('2324', 'bye.c', '123'))
102
InventoryFile('2324', 'bye.c', parent_id='123', sha1=None, len=None)
93
InventoryFile('2324', 'bye.c', parent_id='123')
103
94
>>> i.add(InventoryDirectory('2325', 'wibble', '123'))
104
InventoryDirectory('2325', 'wibble', parent_id='123', revision=None)
95
InventoryDirectory('2325', 'wibble', parent_id='123')
105
96
>>> i.path2id('src/wibble')
109
100
>>> i.add(InventoryFile('2326', 'wibble.c', '2325'))
110
InventoryFile('2326', 'wibble.c', parent_id='2325', sha1=None, len=None)
101
InventoryFile('2326', 'wibble.c', parent_id='2325')
112
InventoryFile('2326', 'wibble.c', parent_id='2325', sha1=None, len=None)
103
InventoryFile('2326', 'wibble.c', parent_id='2325')
113
104
>>> for path, entry in i.iter_entries():
115
106
... assert i.path2id(path)
162
150
def _diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree,
163
151
output_to, reverse=False):
164
152
"""Perform a diff between two entries of the same kind."""
166
def parent_candidates(self, previous_inventories):
167
"""Find possible per-file graph parents.
169
This is currently defined by:
170
- Select the last changed revision in the parent inventory.
171
- Do deal with a short lived bug in bzr 0.8's development two entries
172
that have the same last changed but different 'x' bit settings are
154
def find_previous_heads(self, previous_inventories, entry_weave):
155
"""Return the revisions and entries that directly preceed this.
157
Returned as a map from revision to inventory entry.
159
This is a map containing the file revisions in all parents
160
for which the file exists, and its revision is not a parent of
161
any other. If the file is new, the set will be empty.
175
# revision:ie mapping for each ie found in previous_inventories.
177
# identify candidate head revision ids.
163
def get_ancestors(weave, entry):
164
return set(map(weave.idx_to_name,
165
weave.inclusions([weave.lookup(entry.revision)])))
178
168
for inv in previous_inventories:
179
169
if self.file_id in inv:
180
170
ie = inv[self.file_id]
181
171
assert ie.file_id == self.file_id
182
if ie.revision in candidates:
183
# same revision value in two different inventories:
184
# correct possible inconsistencies:
185
# * there was a bug in revision updates with 'x' bit
172
if ie.revision in heads:
173
# fixup logic, there was a bug in revision updates.
174
# with x bit support.
188
if candidates[ie.revision].executable != ie.executable:
189
candidates[ie.revision].executable = False
176
if heads[ie.revision].executable != ie.executable:
177
heads[ie.revision].executable = False
190
178
ie.executable = False
191
179
except AttributeError:
193
# must now be the same.
194
assert candidates[ie.revision] == ie
181
assert heads[ie.revision] == ie
196
# add this revision as a candidate.
197
candidates[ie.revision] = ie
200
@deprecated_method(zero_ninetyone)
201
def find_previous_heads(self, previous_inventories,
202
versioned_file_store,
205
"""Return the revisions and entries that directly precede this.
207
Returned as a map from revision to inventory entry.
209
This is a map containing the file revisions in all parents
210
for which the file exists, and its revision is not a parent of
211
any other. If the file is new, the set will be empty.
213
:param versioned_file_store: A store where ancestry data on this
214
file id can be queried.
215
:param transaction: The transaction that queries to the versioned
216
file store should be completed under.
217
:param entry_vf: The entry versioned file, if its already available.
219
candidates = self.parent_candidates(previous_inventories)
221
# revision:ie mapping with one revision for each head.
223
# common case optimisation
224
if len(candidates) == 1:
225
# if there is only one candidate revision found
226
# then we can avoid opening the versioned file to access ancestry:
227
# there cannot be any ancestors to eliminate when there is
228
# only one revision available.
231
# --- what follows is now encapsulated in repository.get_graph.heads(),
232
# but that is not accessible from here as we have no repository
233
# pointer. Note that the repository.get_graph.heads() call can return
234
# different results *at the moment* because of the kind-changing check
235
# we have in parent_candidates().
237
# eliminate ancestors amongst the available candidates:
238
# heads are those that are not an ancestor of any other candidate
239
# - this provides convergence at a per-file level.
240
def get_ancestors(weave, entry):
241
return set(weave.get_ancestry(entry.revision, topo_sorted=False))
242
# revision: ancestor list for each head
244
for ie in candidates.values():
245
# may be an ancestor of a known head:
246
already_present = 0 != len(
247
[head for head in heads
248
if ie.revision in head_ancestors[head]])
250
# an ancestor of an analyzed candidate.
252
# not an ancestor of a known head:
253
# load the versioned file for this file id if needed
255
entry_vf = versioned_file_store.get_weave_or_empty(
256
self.file_id, transaction)
257
ancestors = get_ancestors(entry_vf, ie)
258
# may knock something else out:
259
check_heads = list(heads.keys())
260
for head in check_heads:
261
if head in ancestors:
262
# this previously discovered 'head' is not
263
# really a head - its an ancestor of the newly
266
head_ancestors[ie.revision] = ancestors
267
heads[ie.revision] = ie
183
# may want to add it.
184
# may already be covered:
185
already_present = 0 != len(
186
[head for head in heads
187
if ie.revision in head_ancestors[head]])
189
# an ancestor of a known head.
192
ancestors = get_ancestors(entry_weave, ie)
193
# may knock something else out:
194
check_heads = list(heads.keys())
195
for head in check_heads:
196
if head in ancestors:
197
# this head is not really a head
199
head_ancestors[ie.revision] = ancestors
200
heads[ie.revision] = ie
270
203
def get_tar_item(self, root, dp, now, tree):
271
204
"""Get a tarfile item and a file stream for its content."""
272
item = tarfile.TarInfo(osutils.pathjoin(root, dp).encode('utf8'))
205
item = tarfile.TarInfo(pathjoin(root, dp))
273
206
# TODO: would be cool to actually set it to the timestamp of the
274
207
# revision it was last changed
338
268
This is a template method - implement _put_on_disk in subclasses.
340
fullpath = osutils.pathjoin(dest, dp)
270
fullpath = pathjoin(dest, dp)
341
271
self._put_on_disk(fullpath, tree)
342
# mutter(" export {%s} kind %s to %s", self.file_id,
343
# self.kind, fullpath)
272
mutter(" export {%s} kind %s to %s", self.file_id,
345
275
def _put_on_disk(self, fullpath, tree):
346
276
"""Put this entry onto disk at fullpath, from tree tree."""
347
277
raise BzrError("don't know how to export {%s} of kind %r" % (self.file_id, self.kind))
349
279
def sorted_children(self):
350
return sorted(self.children.items())
280
l = self.children.items()
353
285
def versionable_kind(kind):
354
return (kind in ('file', 'directory', 'symlink', 'tree-reference'))
286
return kind in ('file', 'directory', 'symlink')
356
288
def check(self, checker, rev_id, inv, tree):
357
289
"""Check this inventory entry is intact.
359
291
This is a template method, override _check for kind specific
362
:param checker: Check object providing context for the checks;
363
can be used to find out what parts of the repository have already
365
:param rev_id: Revision id from which this InventoryEntry was loaded.
366
Not necessarily the last-changed revision for this file.
367
:param inv: Inventory from which the entry was loaded.
368
:param tree: RevisionTree for this entry.
370
if self.parent_id is not None:
294
if self.parent_id != None:
371
295
if not inv.has_id(self.parent_id):
372
296
raise BzrCheckError('missing parent {%s} in inventory for revision {%s}'
373
297
% (self.parent_id, rev_id))
378
302
raise BzrCheckError('unknown entry kind %r in revision {%s}' %
379
303
(self.kind, rev_id))
382
307
"""Clone this inventory entry."""
383
308
raise NotImplementedError
386
def describe_change(old_entry, new_entry):
387
"""Describe the change between old_entry and this.
389
This smells of being an InterInventoryEntry situation, but as its
390
the first one, we're making it a static method for now.
392
An entry with a different parent, or different name is considered
393
to be renamed. Reparenting is an internal detail.
394
Note that renaming the parent does not trigger a rename for the
397
# TODO: Perhaps return an object rather than just a string
398
if old_entry is new_entry:
399
# also the case of both being None
401
elif old_entry is None:
310
def _get_snapshot_change(self, previous_entries):
311
if len(previous_entries) > 1:
313
elif len(previous_entries) == 0:
403
elif new_entry is None:
405
if old_entry.kind != new_entry.kind:
407
text_modified, meta_modified = new_entry.detect_changes(old_entry)
408
if text_modified or meta_modified:
412
# TODO 20060511 (mbp, rbc) factor out 'detect_rename' here.
413
if old_entry.parent_id != new_entry.parent_id:
415
elif old_entry.name != new_entry.name:
419
if renamed and not modified:
420
return InventoryEntry.RENAMED
421
if modified and not renamed:
423
if modified and renamed:
424
return InventoryEntry.MODIFIED_AND_RENAMED
316
return 'modified/renamed/reparented'
427
318
def __repr__(self):
428
return ("%s(%r, %r, parent_id=%r, revision=%r)"
319
return ("%s(%r, %r, parent_id=%r)"
429
320
% (self.__class__.__name__,
325
def snapshot(self, revision, path, previous_entries,
326
work_tree, weave_store, transaction):
327
"""Make a snapshot of this entry which may or may not have changed.
329
This means that all its fields are populated, that it has its
330
text stored in the text store or weave.
332
mutter('new parents of %s are %r', path, previous_entries)
333
self._read_tree_state(path, work_tree)
334
if len(previous_entries) == 1:
335
# cannot be unchanged unless there is only one parent file rev.
336
parent_ie = previous_entries.values()[0]
337
if self._unchanged(parent_ie):
338
mutter("found unchanged entry")
339
self.revision = parent_ie.revision
341
return self.snapshot_revision(revision, previous_entries,
342
work_tree, weave_store, transaction)
344
def snapshot_revision(self, revision, previous_entries, work_tree,
345
weave_store, transaction):
346
"""Record this revision unconditionally."""
347
mutter('new revision for {%s}', self.file_id)
348
self.revision = revision
349
change = self._get_snapshot_change(previous_entries)
350
self._snapshot_text(previous_entries, work_tree, weave_store,
354
def _snapshot_text(self, file_parents, work_tree, weave_store, transaction):
355
"""Record the 'text' of this entry, whatever form that takes.
357
This default implementation simply adds an empty text.
359
mutter('storing file {%s} in revision {%s}',
360
self.file_id, self.revision)
361
self._add_text_to_weave([], file_parents, weave_store, transaction)
435
363
def __eq__(self, other):
436
364
if not isinstance(other, InventoryEntry):
560
470
class InventoryFile(InventoryEntry):
561
471
"""A file in an inventory."""
563
__slots__ = ['text_sha1', 'text_size', 'file_id', 'name', 'kind',
564
'text_id', 'parent_id', 'children', 'executable',
565
'revision', 'symlink_target', 'reference_revision']
567
def _check(self, checker, tree_revision_id, tree):
473
def _check(self, checker, rev_id, tree):
568
474
"""See InventoryEntry._check"""
569
t = (self.file_id, self.revision)
475
revision = self.revision
476
t = (self.file_id, revision)
570
477
if t in checker.checked_texts:
571
prev_sha = checker.checked_texts[t]
478
prev_sha = checker.checked_texts[t]
572
479
if prev_sha != self.text_sha1:
574
'mismatched sha1 on {%s} in {%s} (%s != %s) %r' %
575
(self.file_id, tree_revision_id, prev_sha, self.text_sha1,
480
raise BzrCheckError('mismatched sha1 on {%s} in {%s}' %
481
(self.file_id, rev_id))
578
483
checker.repeated_text_cnt += 1
581
486
if self.file_id not in checker.checked_weaves:
582
487
mutter('check weave {%s}', self.file_id)
583
w = tree._get_weave(self.file_id)
488
w = tree.get_weave(self.file_id)
584
489
# Not passing a progress bar, because it creates a new
585
490
# progress, which overwrites the current progress,
586
491
# and doesn't look nice
588
493
checker.checked_weaves[self.file_id] = True
590
w = tree._get_weave(self.file_id)
495
w = tree.get_weave_prelude(self.file_id)
592
mutter('check version {%s} of {%s}', tree_revision_id, self.file_id)
593
checker.checked_text_cnt += 1
497
mutter('check version {%s} of {%s}', rev_id, self.file_id)
498
checker.checked_text_cnt += 1
594
499
# We can't check the length, because Weave doesn't store that
595
500
# information, and the whole point of looking at the weave's
596
501
# sha1sum is that we don't have to extract the text.
665
562
def _put_on_disk(self, fullpath, tree):
666
563
"""See InventoryEntry._put_on_disk."""
667
osutils.pumpfile(tree.get_file(self.file_id), file(fullpath, 'wb'))
564
pumpfile(tree.get_file(self.file_id), file(fullpath, 'wb'))
668
565
if tree.is_executable(self.file_id):
669
566
os.chmod(fullpath, 0755)
671
568
def _read_tree_state(self, path, work_tree):
672
569
"""See InventoryEntry._read_tree_state."""
673
self.text_sha1 = work_tree.get_file_sha1(self.file_id, path=path)
674
# FIXME: 20050930 probe for the text size when getting sha1
675
# in _read_tree_state
676
self.executable = work_tree.is_executable(self.file_id, path=path)
679
return ("%s(%r, %r, parent_id=%r, sha1=%r, len=%s)"
680
% (self.__class__.__name__,
687
def _forget_tree_state(self):
688
self.text_sha1 = None
570
self.text_sha1 = work_tree.get_file_sha1(self.file_id)
571
self.executable = work_tree.is_executable(self.file_id)
573
def _snapshot_text(self, file_parents, work_tree, weave_store, transaction):
574
"""See InventoryEntry._snapshot_text."""
575
mutter('storing file {%s} in revision {%s}',
576
self.file_id, self.revision)
577
# special case to avoid diffing on renames or
579
if (len(file_parents) == 1
580
and self.text_sha1 == file_parents.values()[0].text_sha1
581
and self.text_size == file_parents.values()[0].text_size):
582
previous_ie = file_parents.values()[0]
583
weave_store.add_identical_text(
584
self.file_id, previous_ie.revision,
585
self.revision, file_parents, transaction)
587
new_lines = work_tree.get_file(self.file_id).readlines()
588
self._add_text_to_weave(new_lines, file_parents, weave_store,
590
self.text_sha1 = sha_strings(new_lines)
591
self.text_size = sum(map(len, new_lines))
690
594
def _unchanged(self, previous_ie):
691
595
"""See InventoryEntry._unchanged."""
870
735
The inventory is created with a default root directory, with
873
if root_id is not None:
874
assert root_id.__class__ == str
875
self._set_root(InventoryDirectory(root_id, u'', None))
879
self.revision_id = revision_id
882
return "<Inventory object at %x, contents=%r>" % (id(self), self._byid)
884
def apply_delta(self, delta):
885
"""Apply a delta to this inventory.
887
:param delta: A list of changes to apply. After all the changes are
888
applied the final inventory must be internally consistent, but it
889
is ok to supply changes which, if only half-applied would have an
890
invalid result - such as supplying two changes which rename two
891
files, 'A' and 'B' with each other : [('A', 'B', 'A-id', a_entry),
892
('B', 'A', 'B-id', b_entry)].
894
Each change is a tuple, of the form (old_path, new_path, file_id,
897
When new_path is None, the change indicates the removal of an entry
898
from the inventory and new_entry will be ignored (using None is
899
appropriate). If new_path is not None, then new_entry must be an
900
InventoryEntry instance, which will be incorporated into the
901
inventory (and replace any existing entry with the same file id).
903
When old_path is None, the change indicates the addition of
904
a new entry to the inventory.
906
When neither new_path nor old_path are None, the change is a
907
modification to an entry, such as a rename, reparent, kind change
910
The children attribute of new_entry is ignored. This is because
911
this method preserves children automatically across alterations to
912
the parent of the children, and cases where the parent id of a
913
child is changing require the child to be passed in as a separate
914
change regardless. E.g. in the recursive deletion of a directory -
915
the directory's children must be included in the delta, or the
916
final inventory will be invalid.
919
# Remove all affected items which were in the original inventory,
920
# starting with the longest paths, thus ensuring parents are examined
921
# after their children, which means that everything we examine has no
922
# modified children remaining by the time we examine it.
923
for old_path, file_id in sorted(((op, f) for op, np, f, e in delta
924
if op is not None), reverse=True):
925
if file_id not in self:
928
# Preserve unaltered children of file_id for later reinsertion.
929
children[file_id] = getattr(self[file_id], 'children', {})
930
# Remove file_id and the unaltered children. If file_id is not
931
# being deleted it will be reinserted back later.
932
self.remove_recursive_id(file_id)
933
# Insert all affected which should be in the new inventory, reattaching
934
# their children if they had any. This is done from shortest path to
935
# longest, ensuring that items which were modified and whose parents in
936
# the resulting inventory were also modified, are inserted after their
938
for new_path, new_entry in sorted((np, e) for op, np, f, e in
939
delta if np is not None):
940
if new_entry.kind == 'directory':
941
new_entry.children = children.get(new_entry.file_id, {})
944
def _set_root(self, ie):
738
# We are letting Branch.create() create a unique inventory
739
# root id. Rather than generating a random one here.
741
# root_id = bzrlib.branch.gen_file_id('TREE_ROOT')
742
self.root = RootEntry(root_id)
946
743
self._byid = {self.root.file_id: self.root}
949
# TODO: jam 20051218 Should copy also copy the revision_id?
950
entries = self.iter_entries()
951
if self.root is None:
952
return Inventory(root_id=None)
953
other = Inventory(entries.next()[1].file_id)
747
other = Inventory(self.root.file_id)
954
748
# copy recursively so we know directories will be added before
955
749
# their children. There are more efficient ways than this...
956
for path, entry in entries:
750
for path, entry in self.iter_entries():
751
if entry == self.root:
957
753
other.add(entry.copy())
960
757
def __iter__(self):
961
758
return iter(self._byid)
963
761
def __len__(self):
964
762
"""Returns number of entries."""
965
763
return len(self._byid)
967
766
def iter_entries(self, from_dir=None):
968
767
"""Return (path, entry) pairs, in order by name."""
970
if self.root is None:
974
elif isinstance(from_dir, basestring):
975
from_dir = self._byid[from_dir]
977
# unrolling the recursive called changed the time from
978
# 440ms/663ms (inline/total) to 116ms/116ms
979
children = from_dir.children.items()
981
children = collections.deque(children)
982
stack = [(u'', children)]
984
from_dir_relpath, children = stack[-1]
987
name, ie = children.popleft()
989
# we know that from_dir_relpath never ends in a slash
990
# and 'f' doesn't begin with one, we can do a string op, rather
991
# than the checks of pathjoin(), though this means that all paths
993
path = from_dir_relpath + '/' + name
997
if ie.kind != 'directory':
1000
# But do this child first
1001
new_children = ie.children.items()
1003
new_children = collections.deque(new_children)
1004
stack.append((path, new_children))
1005
# Break out of inner loop, so that we start outer loop with child
1008
# if we finished all children, pop it off the stack
1011
def iter_entries_by_dir(self, from_dir=None, specific_file_ids=None,
1012
yield_parents=False):
1013
"""Iterate over the entries in a directory first order.
1015
This returns all entries for a directory before returning
1016
the entries for children of a directory. This is not
1017
lexicographically sorted order, and is a hybrid between
1018
depth-first and breadth-first.
1020
:param yield_parents: If True, yield the parents from the root leading
1021
down to specific_file_ids that have been requested. This has no
1022
impact if specific_file_ids is None.
1023
:return: This yields (path, entry) pairs
1025
if specific_file_ids and not isinstance(specific_file_ids, set):
1026
specific_file_ids = set(specific_file_ids)
1027
# TODO? Perhaps this should return the from_dir so that the root is
1028
# yielded? or maybe an option?
1029
if from_dir is None:
1030
if self.root is None:
1032
# Optimize a common case
1033
if (not yield_parents and specific_file_ids is not None and
1034
len(specific_file_ids) == 1):
1035
file_id = list(specific_file_ids)[0]
1037
yield self.id2path(file_id), self[file_id]
1039
from_dir = self.root
1040
if (specific_file_ids is None or yield_parents or
1041
self.root.file_id in specific_file_ids):
1042
yield u'', self.root
1043
elif isinstance(from_dir, basestring):
1044
from_dir = self._byid[from_dir]
1046
if specific_file_ids is not None:
1047
# TODO: jam 20070302 This could really be done as a loop rather
1048
# than a bunch of recursive calls.
1051
def add_ancestors(file_id):
1052
if file_id not in byid:
1054
parent_id = byid[file_id].parent_id
1055
if parent_id is None:
1057
if parent_id not in parents:
1058
parents.add(parent_id)
1059
add_ancestors(parent_id)
1060
for file_id in specific_file_ids:
1061
add_ancestors(file_id)
1065
stack = [(u'', from_dir)]
1067
cur_relpath, cur_dir = stack.pop()
1070
for child_name, child_ie in sorted(cur_dir.children.iteritems()):
1072
child_relpath = cur_relpath + child_name
1074
if (specific_file_ids is None or
1075
child_ie.file_id in specific_file_ids or
1076
(yield_parents and child_ie.file_id in parents)):
1077
yield child_relpath, child_ie
1079
if child_ie.kind == 'directory':
1080
if parents is None or child_ie.file_id in parents:
1081
child_dirs.append((child_relpath+'/', child_ie))
1082
stack.extend(reversed(child_dirs))
1084
def make_entry(self, kind, name, parent_id, file_id=None):
1085
"""Simple thunk to bzrlib.inventory.make_entry."""
1086
return make_entry(kind, name, parent_id, file_id)
771
elif isinstance(from_dir, basestring):
772
from_dir = self._byid[from_dir]
774
kids = from_dir.children.items()
776
for name, ie in kids:
778
if ie.kind == 'directory':
779
for cn, cie in self.iter_entries(from_dir=ie.file_id):
780
yield pathjoin(name, cn), cie
1088
783
def entries(self):
1089
784
"""Return list of (path, ie) for all entries except the root.
1116
812
for name, child_ie in kids:
1117
child_path = osutils.pathjoin(parent_path, name)
813
child_path = pathjoin(parent_path, name)
1118
814
descend(child_ie, child_path)
1119
815
descend(self.root, u'')
1122
820
def __contains__(self, file_id):
1123
821
"""True if this entry contains a file with given id.
1125
823
>>> inv = Inventory()
1126
824
>>> inv.add(InventoryFile('123', 'foo.c', ROOT_ID))
1127
InventoryFile('123', 'foo.c', parent_id='TREE_ROOT', sha1=None, len=None)
825
InventoryFile('123', 'foo.c', parent_id='TREE_ROOT')
1128
826
>>> '123' in inv
1130
828
>>> '456' in inv
1133
return (file_id in self._byid)
831
return file_id in self._byid
1135
834
def __getitem__(self, file_id):
1136
835
"""Return the entry for given file_id.
1138
837
>>> inv = Inventory()
1139
838
>>> inv.add(InventoryFile('123123', 'hello.c', ROOT_ID))
1140
InventoryFile('123123', 'hello.c', parent_id='TREE_ROOT', sha1=None, len=None)
839
InventoryFile('123123', 'hello.c', parent_id='TREE_ROOT')
1141
840
>>> inv['123123'].name
1145
844
return self._byid[file_id]
1146
845
except KeyError:
1147
# really we're passing an inventory, not a tree...
1148
raise errors.NoSuchId(self, file_id)
847
raise BzrError("can't look up file_id None")
849
raise BzrError("file_id {%s} not in inventory" % file_id)
1150
852
def get_file_kind(self, file_id):
1151
853
return self._byid[file_id].kind
1172
865
Returns the new entry object.
1174
867
if entry.file_id in self._byid:
1175
raise errors.DuplicateFileId(entry.file_id,
1176
self._byid[entry.file_id])
1178
if entry.parent_id is None:
1179
assert self.root is None and len(self._byid) == 0
1183
parent = self._byid[entry.parent_id]
1185
raise BzrError("parent_id {%s} not in inventory" %
1188
if entry.name in parent.children:
1189
raise BzrError("%s is already versioned" %
1190
osutils.pathjoin(self.id2path(parent.file_id),
1191
entry.name).encode('utf-8'))
1192
parent.children[entry.name] = entry
1193
return self._add_child(entry)
1195
def add_path(self, relpath, kind, file_id=None, parent_id=None):
868
raise BzrError("inventory already contains entry with id {%s}" % entry.file_id)
870
if entry.parent_id == ROOT_ID or entry.parent_id is None:
871
entry.parent_id = self.root.file_id
874
parent = self._byid[entry.parent_id]
876
raise BzrError("parent_id {%s} not in inventory" % entry.parent_id)
878
if parent.children.has_key(entry.name):
879
raise BzrError("%s is already versioned" %
880
pathjoin(self.id2path(parent.file_id), entry.name))
882
self._byid[entry.file_id] = entry
883
parent.children[entry.name] = entry
887
def add_path(self, relpath, kind, file_id=None):
1196
888
"""Add entry from a path.
1198
890
The immediate parent must already be versioned.
1200
892
Returns the new entry object."""
893
from bzrlib.workingtree import gen_file_id
1202
parts = osutils.splitpath(relpath)
895
parts = bzrlib.osutils.splitpath(relpath)
1204
896
if len(parts) == 0:
1206
file_id = generate_ids.gen_root_id()
1207
self.root = InventoryDirectory(file_id, '', None)
1208
self._byid = {self.root.file_id: self.root}
897
raise BzrError("cannot re-add root of inventory")
900
file_id = gen_file_id(relpath)
902
parent_path = parts[:-1]
903
parent_id = self.path2id(parent_path)
904
if parent_id == None:
905
raise NotVersionedError(path=parent_path)
906
if kind == 'directory':
907
ie = InventoryDirectory(file_id, parts[-1], parent_id)
909
ie = InventoryFile(file_id, parts[-1], parent_id)
910
elif kind == 'symlink':
911
ie = InventoryLink(file_id, parts[-1], parent_id)
1211
parent_path = parts[:-1]
1212
parent_id = self.path2id(parent_path)
1213
if parent_id is None:
1214
raise errors.NotVersionedError(path=parent_path)
1215
ie = make_entry(kind, parts[-1], parent_id, file_id)
913
raise BzrError("unknown kind %r" % kind)
1216
914
return self.add(ie)
1218
917
def __delitem__(self, file_id):
1219
918
"""Remove entry by id.
1221
920
>>> inv = Inventory()
1222
921
>>> inv.add(InventoryFile('123', 'foo.c', ROOT_ID))
1223
InventoryFile('123', 'foo.c', parent_id='TREE_ROOT', sha1=None, len=None)
922
InventoryFile('123', 'foo.c', parent_id='TREE_ROOT')
1224
923
>>> '123' in inv
1226
925
>>> del inv['123']
1391
1079
file_ie.name = new_name
1392
1080
file_ie.parent_id = new_parent_id
1394
def is_root(self, file_id):
1395
return self.root is not None and file_id == self.root.file_id
1399
'directory': InventoryDirectory,
1400
'file': InventoryFile,
1401
'symlink': InventoryLink,
1402
'tree-reference': TreeReference
1405
def make_entry(kind, name, parent_id, file_id=None):
1406
"""Create an inventory entry.
1408
:param kind: the type of inventory entry to create.
1409
:param name: the basename of the entry.
1410
:param parent_id: the parent_id of the entry.
1411
:param file_id: the file_id to use. if None, one will be created.
1414
file_id = generate_ids.gen_file_id(name)
1415
name = ensure_normalized_name(name)
1417
factory = entry_factory[kind]
1419
raise BzrError("unknown kind %r" % kind)
1420
return factory(file_id, name, parent_id)
1423
def ensure_normalized_name(name):
1426
:raises InvalidNormalization: When name is not normalized, and cannot be
1427
accessed on this platform by the normalized path.
1428
:return: The NFC/NFKC normalised version of name.
1430
#------- This has been copied to bzrlib.dirstate.DirState.add, please
1431
# keep them synchronised.
1432
# we dont import normalized_filename directly because we want to be
1433
# able to change the implementation at runtime for tests.
1434
norm_name, can_access = osutils.normalized_filename(name)
1435
if norm_name != name:
1439
# TODO: jam 20060701 This would probably be more useful
1440
# if the error was raised with the full path
1441
raise errors.InvalidNormalization(name)
1445
1085
_NAME_RE = None
1447
1087
def is_valid_name(name):
1448
1088
global _NAME_RE
1449
if _NAME_RE is None:
1089
if _NAME_RE == None:
1450
1090
_NAME_RE = re.compile(r'^[^/\\]+$')
1452
1092
return bool(_NAME_RE.match(name))
added
removed
bzrlib/inventory.py
