60
36
An InventoryEntry has the following fields, which are also
61
37
present in the XML inventory-entry element:
66
(within the parent directory)
69
file_id of the parent directory, or ROOT_ID
72
the revision_id in which this variation of this file was
76
Indicates that this file should be executable on systems
80
sha-1 of the text of the file
83
size in bytes of the text of the file
85
(reading a version 4 tree created a text_id field.)
40
* *name*: (only the basename within the directory, must not
42
* *kind*: "directory" or "file"
43
* *directory_id*: (if absent/null means the branch root directory)
44
* *text_sha1*: only for files
45
* *text_size*: in bytes, only for files
46
* *text_id*: identifier for the text version, only for files
48
InventoryEntries can also exist inside a WorkingTree
49
inventory, in which case they are not yet bound to a
50
particular revision of the file. In that case the text_sha1,
51
text_size and text_id are absent.
87
54
>>> i = Inventory()
90
>>> i.add(InventoryDirectory('123', 'src', ROOT_ID))
91
InventoryDirectory('123', 'src', parent_id='TREE_ROOT', revision=None)
92
>>> 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'}
95
>>> for ix, j in enumerate(i.iter_entries()):
96
... print (j[0] == shouldbe[ix], j[1])
57
>>> i.add(InventoryEntry('123', 'src', 'directory', ROOT_ID))
58
InventoryEntry('123', 'src', kind='directory', parent_id='TREE_ROOT')
59
>>> i.add(InventoryEntry('2323', 'hello.c', 'file', parent_id='123'))
60
InventoryEntry('2323', 'hello.c', kind='file', parent_id='123')
61
>>> for j in i.iter_entries():
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))
101
>>> i.add(InventoryFile('2324', 'bye.c', '123'))
102
InventoryFile('2324', 'bye.c', parent_id='123', sha1=None, len=None)
103
>>> i.add(InventoryDirectory('2325', 'wibble', '123'))
104
InventoryDirectory('2325', 'wibble', parent_id='123', revision=None)
64
('src', InventoryEntry('123', 'src', kind='directory', parent_id='TREE_ROOT'))
65
('src/hello.c', InventoryEntry('2323', 'hello.c', kind='file', parent_id='123'))
66
>>> i.add(InventoryEntry('2323', 'bye.c', 'file', '123'))
67
Traceback (most recent call last):
69
BzrError: inventory already contains entry with id {2323}
70
>>> i.add(InventoryEntry('2324', 'bye.c', 'file', '123'))
71
InventoryEntry('2324', 'bye.c', kind='file', parent_id='123')
72
>>> i.add(InventoryEntry('2325', 'wibble', 'directory', '123'))
73
InventoryEntry('2325', 'wibble', kind='directory', parent_id='123')
105
74
>>> i.path2id('src/wibble')
109
>>> i.add(InventoryFile('2326', 'wibble.c', '2325'))
110
InventoryFile('2326', 'wibble.c', parent_id='2325', sha1=None, len=None)
78
>>> i.add(InventoryEntry('2326', 'wibble.c', 'file', '2325'))
79
InventoryEntry('2326', 'wibble.c', kind='file', parent_id='2325')
112
InventoryFile('2326', 'wibble.c', parent_id='2325', sha1=None, len=None)
113
>>> for path, entry in i.iter_entries():
81
InventoryEntry('2326', 'wibble.c', kind='file', parent_id='2325')
82
>>> for j in i.iter_entries():
84
... assert i.path2id(j[0])
121
90
src/wibble/wibble.c
122
91
>>> i.id2path('2326')
123
92
'src/wibble/wibble.c'
94
TODO: Maybe also keep the full path of the entry, and the children?
95
But those depend on its position within a particular inventory, and
96
it would be nice not to need to hold the backpointer here.
126
# Constants returned by describe_change()
128
# TODO: These should probably move to some kind of FileChangeDescription
129
# class; that's like what's inside a TreeDelta but we want to be able to
130
# generate them just for one file at a time.
132
MODIFIED_AND_RENAMED = 'modified and renamed'
136
def detect_changes(self, old_entry):
137
"""Return a (text_modified, meta_modified) from this to old_entry.
139
_read_tree_state must have been called on self and old_entry prior to
140
calling detect_changes.
144
def _diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree,
145
output_to, reverse=False):
146
"""Perform a diff between two entries of the same kind."""
148
def parent_candidates(self, previous_inventories):
149
"""Find possible per-file graph parents.
151
This is currently defined by:
152
- Select the last changed revision in the parent inventory.
153
- Do deal with a short lived bug in bzr 0.8's development two entries
154
that have the same last changed but different 'x' bit settings are
157
# revision:ie mapping for each ie found in previous_inventories.
159
# identify candidate head revision ids.
160
for inv in previous_inventories:
161
if self.file_id in inv:
162
ie = inv[self.file_id]
163
if ie.revision in candidates:
164
# same revision value in two different inventories:
165
# correct possible inconsistencies:
166
# * there was a bug in revision updates with 'x' bit
169
if candidates[ie.revision].executable != ie.executable:
170
candidates[ie.revision].executable = False
171
ie.executable = False
172
except AttributeError:
175
# add this revision as a candidate.
176
candidates[ie.revision] = ie
179
@deprecated_method(deprecated_in((1, 6, 0)))
180
def get_tar_item(self, root, dp, now, tree):
181
"""Get a tarfile item and a file stream for its content."""
182
item = tarfile.TarInfo(osutils.pathjoin(root, dp).encode('utf8'))
183
# TODO: would be cool to actually set it to the timestamp of the
184
# revision it was last changed
186
fileobj = self._put_in_tar(item, tree)
190
"""Return true if the object this entry represents has textual data.
192
Note that textual data includes binary content.
194
Also note that all entries get weave files created for them.
195
This attribute is primarily used when upgrading from old trees that
196
did not have the weave index for all inventory entries.
200
def __init__(self, file_id, name, parent_id, text_id=None):
99
# TODO: split InventoryEntry into subclasses for files,
100
# directories, etc etc.
102
__slots__ = ['text_sha1', 'text_size', 'file_id', 'name', 'kind',
103
'text_id', 'parent_id', 'children', ]
105
def __init__(self, file_id, name, kind, parent_id, text_id=None):
201
106
"""Create an InventoryEntry
203
108
The filename must be a single component, relative to the
204
109
parent directory; it cannot be a whole path or relative name.
206
>>> e = InventoryFile('123', 'hello.c', ROOT_ID)
111
>>> e = InventoryEntry('123', 'hello.c', 'file', ROOT_ID)
211
>>> e = InventoryFile('123', 'src/hello.c', ROOT_ID)
116
>>> e = InventoryEntry('123', 'src/hello.c', 'file', ROOT_ID)
212
117
Traceback (most recent call last):
213
InvalidEntryName: Invalid entry name: src/hello.c
118
BzrCheckError: InventoryEntry name 'src/hello.c' is invalid
215
120
if '/' in name or '\\' in name:
216
raise errors.InvalidEntryName(name=name)
217
self.executable = False
121
raise BzrCheckError('InventoryEntry name %r is invalid' % name)
219
123
self.text_sha1 = None
220
124
self.text_size = None
221
126
self.file_id = file_id
223
129
self.text_id = text_id
224
130
self.parent_id = parent_id
225
self.symlink_target = None
226
self.reference_revision = None
228
def kind_character(self):
229
"""Return a short kind indicator useful for appending to names."""
230
raise BzrError('unknown kind %r' % self.kind)
232
known_kinds = ('file', 'directory', 'symlink')
234
def _put_in_tar(self, item, tree):
235
"""populate item for stashing in a tar, and return the content stream.
237
If no content is available, return None.
239
raise BzrError("don't know how to export {%s} of kind %r" %
240
(self.file_id, self.kind))
242
@deprecated_method(deprecated_in((1, 6, 0)))
243
def put_on_disk(self, dest, dp, tree):
244
"""Create a representation of self on disk in the prefix dest.
246
This is a template method - implement _put_on_disk in subclasses.
248
fullpath = osutils.pathjoin(dest, dp)
249
self._put_on_disk(fullpath, tree)
250
# mutter(" export {%s} kind %s to %s", self.file_id,
251
# self.kind, fullpath)
253
def _put_on_disk(self, fullpath, tree):
254
"""Put this entry onto disk at fullpath, from tree tree."""
255
raise BzrError("don't know how to export {%s} of kind %r" % (self.file_id, self.kind))
131
if kind == 'directory':
136
raise BzrError("unhandled entry kind %r" % kind)
257
140
def sorted_children(self):
258
return sorted(self.children.items())
261
def versionable_kind(kind):
262
return (kind in ('file', 'directory', 'symlink', 'tree-reference'))
264
def check(self, checker, rev_id, inv, tree):
265
"""Check this inventory entry is intact.
267
This is a template method, override _check for kind specific
270
:param checker: Check object providing context for the checks;
271
can be used to find out what parts of the repository have already
273
:param rev_id: Revision id from which this InventoryEntry was loaded.
274
Not necessarily the last-changed revision for this file.
275
:param inv: Inventory from which the entry was loaded.
276
:param tree: RevisionTree for this entry.
278
if self.parent_id is not None:
279
if not inv.has_id(self.parent_id):
280
raise BzrCheckError('missing parent {%s} in inventory for revision {%s}'
281
% (self.parent_id, rev_id))
282
self._check(checker, rev_id, tree)
284
def _check(self, checker, rev_id, tree):
285
"""Check this inventory entry for kind specific errors."""
286
raise BzrCheckError('unknown entry kind %r in revision {%s}' %
141
l = self.children.items()
290
"""Clone this inventory entry."""
291
raise NotImplementedError
294
def describe_change(old_entry, new_entry):
295
"""Describe the change between old_entry and this.
297
This smells of being an InterInventoryEntry situation, but as its
298
the first one, we're making it a static method for now.
300
An entry with a different parent, or different name is considered
301
to be renamed. Reparenting is an internal detail.
302
Note that renaming the parent does not trigger a rename for the
305
# TODO: Perhaps return an object rather than just a string
306
if old_entry is new_entry:
307
# also the case of both being None
309
elif old_entry is None:
311
elif new_entry is None:
313
if old_entry.kind != new_entry.kind:
315
text_modified, meta_modified = new_entry.detect_changes(old_entry)
316
if text_modified or meta_modified:
320
# TODO 20060511 (mbp, rbc) factor out 'detect_rename' here.
321
if old_entry.parent_id != new_entry.parent_id:
323
elif old_entry.name != new_entry.name:
327
if renamed and not modified:
328
return InventoryEntry.RENAMED
329
if modified and not renamed:
331
if modified and renamed:
332
return InventoryEntry.MODIFIED_AND_RENAMED
147
other = InventoryEntry(self.file_id, self.name, self.kind,
148
self.parent_id, text_id=self.text_id)
149
other.text_sha1 = self.text_sha1
150
other.text_size = self.text_size
151
# note that children are *not* copied; they're pulled across when
335
156
def __repr__(self):
336
return ("%s(%r, %r, parent_id=%r, revision=%r)"
157
return ("%s(%r, %r, kind=%r, parent_id=%r)"
337
158
% (self.__class__.__name__,
165
def to_element(self):
166
"""Convert to XML element"""
167
from bzrlib.xml import Element
171
e.set('name', self.name)
172
e.set('file_id', self.file_id)
173
e.set('kind', self.kind)
175
if self.text_size != None:
176
e.set('text_size', '%d' % self.text_size)
178
for f in ['text_id', 'text_sha1']:
183
# to be conservative, we don't externalize the root pointers
184
# for now, leaving them as null in the xml form. in a future
185
# version it will be implied by nested elements.
186
if self.parent_id != ROOT_ID:
187
assert isinstance(self.parent_id, basestring)
188
e.set('parent_id', self.parent_id)
195
def from_element(cls, elt):
196
assert elt.tag == 'entry'
198
## original format inventories don't have a parent_id for
199
## nodes in the root directory, but it's cleaner to use one
201
parent_id = elt.get('parent_id')
202
if parent_id == None:
205
self = cls(elt.get('file_id'), elt.get('name'), elt.get('kind'), parent_id)
206
self.text_id = elt.get('text_id')
207
self.text_sha1 = elt.get('text_sha1')
209
## mutter("read inventoryentry: %r" % (elt.attrib))
211
v = elt.get('text_size')
212
self.text_size = v and int(v)
217
from_element = classmethod(from_element)
343
219
def __eq__(self, other):
345
# For the case when objects are cached
347
220
if not isinstance(other, InventoryEntry):
348
221
return NotImplemented
350
return ((self.file_id == other.file_id)
351
and (self.name == other.name)
352
and (other.symlink_target == self.symlink_target)
353
and (self.text_sha1 == other.text_sha1)
354
and (self.text_size == other.text_size)
355
and (self.text_id == other.text_id)
356
and (self.parent_id == other.parent_id)
357
and (self.kind == other.kind)
358
and (self.revision == other.revision)
359
and (self.executable == other.executable)
360
and (self.reference_revision == other.reference_revision)
223
return (self.file_id == other.file_id) \
224
and (self.name == other.name) \
225
and (self.text_sha1 == other.text_sha1) \
226
and (self.text_size == other.text_size) \
227
and (self.text_id == other.text_id) \
228
and (self.parent_id == other.parent_id) \
229
and (self.kind == other.kind)
363
232
def __ne__(self, other):
364
233
return not (self == other)
425
253
and (self.children == other.children)
428
class InventoryDirectory(InventoryEntry):
429
"""A directory in an inventory."""
431
__slots__ = ['text_sha1', 'text_size', 'file_id', 'name', 'kind',
432
'text_id', 'parent_id', 'children', 'executable',
433
'revision', 'symlink_target', 'reference_revision']
435
def _check(self, checker, rev_id, tree):
436
"""See InventoryEntry._check"""
437
if self.text_sha1 is not None or self.text_size is not None or self.text_id is not None:
438
raise BzrCheckError('directory {%s} has text in revision {%s}'
439
% (self.file_id, rev_id))
442
other = InventoryDirectory(self.file_id, self.name, self.parent_id)
443
other.revision = self.revision
444
# note that children are *not* copied; they're pulled across when
448
def __init__(self, file_id, name, parent_id):
449
super(InventoryDirectory, self).__init__(file_id, name, parent_id)
451
self.kind = 'directory'
453
def kind_character(self):
454
"""See InventoryEntry.kind_character."""
457
def _put_in_tar(self, item, tree):
458
"""See InventoryEntry._put_in_tar."""
459
item.type = tarfile.DIRTYPE
466
def _put_on_disk(self, fullpath, tree):
467
"""See InventoryEntry._put_on_disk."""
471
class InventoryFile(InventoryEntry):
472
"""A file in an inventory."""
474
__slots__ = ['text_sha1', 'text_size', 'file_id', 'name', 'kind',
475
'text_id', 'parent_id', 'children', 'executable',
476
'revision', 'symlink_target', 'reference_revision']
478
def _check(self, checker, tree_revision_id, tree):
479
"""See InventoryEntry._check"""
480
key = (self.file_id, self.revision)
481
if key in checker.checked_texts:
482
prev_sha = checker.checked_texts[key]
483
if prev_sha != self.text_sha1:
485
'mismatched sha1 on {%s} in {%s} (%s != %s) %r' %
486
(self.file_id, tree_revision_id, prev_sha, self.text_sha1,
489
checker.repeated_text_cnt += 1
492
mutter('check version {%s} of {%s}', tree_revision_id, self.file_id)
493
checker.checked_text_cnt += 1
494
# We can't check the length, because Weave doesn't store that
495
# information, and the whole point of looking at the weave's
496
# sha1sum is that we don't have to extract the text.
497
if (self.text_sha1 != tree._repository.texts.get_sha1s([key])[key]):
498
raise BzrCheckError('text {%s} version {%s} wrong sha1' % key)
499
checker.checked_texts[key] = self.text_sha1
502
other = InventoryFile(self.file_id, self.name, self.parent_id)
503
other.executable = self.executable
504
other.text_id = self.text_id
505
other.text_sha1 = self.text_sha1
506
other.text_size = self.text_size
507
other.revision = self.revision
510
def detect_changes(self, old_entry):
511
"""See InventoryEntry.detect_changes."""
512
text_modified = (self.text_sha1 != old_entry.text_sha1)
513
meta_modified = (self.executable != old_entry.executable)
514
return text_modified, meta_modified
516
def _diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree,
517
output_to, reverse=False):
518
"""See InventoryEntry._diff."""
519
from bzrlib.diff import DiffText
520
from_file_id = self.file_id
522
to_file_id = to_entry.file_id
526
to_file_id, from_file_id = from_file_id, to_file_id
527
tree, to_tree = to_tree, tree
528
from_label, to_label = to_label, from_label
529
differ = DiffText(tree, to_tree, output_to, 'utf-8', '', '',
531
return differ.diff_text(from_file_id, to_file_id, from_label, to_label)
534
"""See InventoryEntry.has_text."""
537
def __init__(self, file_id, name, parent_id):
538
super(InventoryFile, self).__init__(file_id, name, parent_id)
541
def kind_character(self):
542
"""See InventoryEntry.kind_character."""
545
def _put_in_tar(self, item, tree):
546
"""See InventoryEntry._put_in_tar."""
547
item.type = tarfile.REGTYPE
548
fileobj = tree.get_file(self.file_id)
549
item.size = self.text_size
550
if tree.is_executable(self.file_id):
556
def _put_on_disk(self, fullpath, tree):
557
"""See InventoryEntry._put_on_disk."""
558
osutils.pumpfile(tree.get_file(self.file_id), file(fullpath, 'wb'))
559
if tree.is_executable(self.file_id):
560
os.chmod(fullpath, 0755)
562
def _read_tree_state(self, path, work_tree):
563
"""See InventoryEntry._read_tree_state."""
564
self.text_sha1 = work_tree.get_file_sha1(self.file_id, path=path)
565
# FIXME: 20050930 probe for the text size when getting sha1
566
# in _read_tree_state
567
self.executable = work_tree.is_executable(self.file_id, path=path)
570
return ("%s(%r, %r, parent_id=%r, sha1=%r, len=%s)"
571
% (self.__class__.__name__,
578
def _forget_tree_state(self):
579
self.text_sha1 = None
581
def _unchanged(self, previous_ie):
582
"""See InventoryEntry._unchanged."""
583
compatible = super(InventoryFile, self)._unchanged(previous_ie)
584
if self.text_sha1 != previous_ie.text_sha1:
587
# FIXME: 20050930 probe for the text size when getting sha1
588
# in _read_tree_state
589
self.text_size = previous_ie.text_size
590
if self.executable != previous_ie.executable:
595
class InventoryLink(InventoryEntry):
596
"""A file in an inventory."""
598
__slots__ = ['text_sha1', 'text_size', 'file_id', 'name', 'kind',
599
'text_id', 'parent_id', 'children', 'executable',
600
'revision', 'symlink_target', 'reference_revision']
602
def _check(self, checker, rev_id, tree):
603
"""See InventoryEntry._check"""
604
if self.text_sha1 is not None or self.text_size is not None or self.text_id is not None:
605
raise BzrCheckError('symlink {%s} has text in revision {%s}'
606
% (self.file_id, rev_id))
607
if self.symlink_target is None:
608
raise BzrCheckError('symlink {%s} has no target in revision {%s}'
609
% (self.file_id, rev_id))
612
other = InventoryLink(self.file_id, self.name, self.parent_id)
613
other.symlink_target = self.symlink_target
614
other.revision = self.revision
617
def detect_changes(self, old_entry):
618
"""See InventoryEntry.detect_changes."""
619
# FIXME: which _modified field should we use ? RBC 20051003
620
text_modified = (self.symlink_target != old_entry.symlink_target)
622
mutter(" symlink target changed")
623
meta_modified = False
624
return text_modified, meta_modified
626
def _diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree,
627
output_to, reverse=False):
628
"""See InventoryEntry._diff."""
629
from bzrlib.diff import DiffSymlink
630
old_target = self.symlink_target
631
if to_entry is not None:
632
new_target = to_entry.symlink_target
641
new_target, old_target = old_target, new_target
642
differ = DiffSymlink(old_tree, new_tree, output_to)
643
return differ.diff_symlink(old_target, new_target)
645
def __init__(self, file_id, name, parent_id):
646
super(InventoryLink, self).__init__(file_id, name, parent_id)
647
self.kind = 'symlink'
649
def kind_character(self):
650
"""See InventoryEntry.kind_character."""
653
def _put_in_tar(self, item, tree):
654
"""See InventoryEntry._put_in_tar."""
655
item.type = tarfile.SYMTYPE
659
item.linkname = self.symlink_target
662
def _put_on_disk(self, fullpath, tree):
663
"""See InventoryEntry._put_on_disk."""
665
os.symlink(self.symlink_target, fullpath)
667
raise BzrError("Failed to create symlink %r -> %r, error: %s" % (fullpath, self.symlink_target, e))
669
def _read_tree_state(self, path, work_tree):
670
"""See InventoryEntry._read_tree_state."""
671
self.symlink_target = work_tree.get_symlink_target(self.file_id)
673
def _forget_tree_state(self):
674
self.symlink_target = None
676
def _unchanged(self, previous_ie):
677
"""See InventoryEntry._unchanged."""
678
compatible = super(InventoryLink, self)._unchanged(previous_ie)
679
if self.symlink_target != previous_ie.symlink_target:
684
class TreeReference(InventoryEntry):
686
kind = 'tree-reference'
688
def __init__(self, file_id, name, parent_id, revision=None,
689
reference_revision=None):
690
InventoryEntry.__init__(self, file_id, name, parent_id)
691
self.revision = revision
692
self.reference_revision = reference_revision
695
return TreeReference(self.file_id, self.name, self.parent_id,
696
self.revision, self.reference_revision)
698
def _read_tree_state(self, path, work_tree):
699
"""Populate fields in the inventory entry from the given tree.
701
self.reference_revision = work_tree.get_reference_revision(
704
def _forget_tree_state(self):
705
self.reference_revision = None
707
def _unchanged(self, previous_ie):
708
"""See InventoryEntry._unchanged."""
709
compatible = super(TreeReference, self)._unchanged(previous_ie)
710
if self.reference_revision != previous_ie.reference_revision:
715
257
class Inventory(object):
716
258
"""Inventory of versioned files in a tree.
763
302
The inventory is created with a default root directory, with
766
if root_id is not None:
767
self._set_root(InventoryDirectory(root_id, u'', None))
771
self.revision_id = revision_id
774
return "<Inventory object at %x, contents=%r>" % (id(self), self._byid)
776
def apply_delta(self, delta):
777
"""Apply a delta to this inventory.
779
:param delta: A list of changes to apply. After all the changes are
780
applied the final inventory must be internally consistent, but it
781
is ok to supply changes which, if only half-applied would have an
782
invalid result - such as supplying two changes which rename two
783
files, 'A' and 'B' with each other : [('A', 'B', 'A-id', a_entry),
784
('B', 'A', 'B-id', b_entry)].
786
Each change is a tuple, of the form (old_path, new_path, file_id,
789
When new_path is None, the change indicates the removal of an entry
790
from the inventory and new_entry will be ignored (using None is
791
appropriate). If new_path is not None, then new_entry must be an
792
InventoryEntry instance, which will be incorporated into the
793
inventory (and replace any existing entry with the same file id).
795
When old_path is None, the change indicates the addition of
796
a new entry to the inventory.
798
When neither new_path nor old_path are None, the change is a
799
modification to an entry, such as a rename, reparent, kind change
802
The children attribute of new_entry is ignored. This is because
803
this method preserves children automatically across alterations to
804
the parent of the children, and cases where the parent id of a
805
child is changing require the child to be passed in as a separate
806
change regardless. E.g. in the recursive deletion of a directory -
807
the directory's children must be included in the delta, or the
808
final inventory will be invalid.
811
# Remove all affected items which were in the original inventory,
812
# starting with the longest paths, thus ensuring parents are examined
813
# after their children, which means that everything we examine has no
814
# modified children remaining by the time we examine it.
815
for old_path, file_id in sorted(((op, f) for op, np, f, e in delta
816
if op is not None), reverse=True):
817
if file_id not in self:
820
# Preserve unaltered children of file_id for later reinsertion.
821
file_id_children = getattr(self[file_id], 'children', {})
822
if len(file_id_children):
823
children[file_id] = file_id_children
824
# Remove file_id and the unaltered children. If file_id is not
825
# being deleted it will be reinserted back later.
826
self.remove_recursive_id(file_id)
827
# Insert all affected which should be in the new inventory, reattaching
828
# their children if they had any. This is done from shortest path to
829
# longest, ensuring that items which were modified and whose parents in
830
# the resulting inventory were also modified, are inserted after their
832
for new_path, new_entry in sorted((np, e) for op, np, f, e in
833
delta if np is not None):
834
if new_entry.kind == 'directory':
835
# Pop the child which to allow detection of children whose
836
# parents were deleted and which were not reattached to a new
838
new_entry.children = children.pop(new_entry.file_id, {})
841
# Get the parent id that was deleted
842
parent_id, children = children.popitem()
843
raise errors.InconsistentDelta("<deleted>", parent_id,
844
"The file id was deleted but its children were not deleted.")
846
def _set_root(self, ie):
305
# We are letting Branch(init=True) create a unique inventory
306
# root id. Rather than generating a random one here.
308
# root_id = bzrlib.branch.gen_file_id('TREE_ROOT')
309
self.root = RootEntry(root_id)
848
310
self._byid = {self.root.file_id: self.root}
851
# TODO: jam 20051218 Should copy also copy the revision_id?
852
entries = self.iter_entries()
853
if self.root is None:
854
return Inventory(root_id=None)
855
other = Inventory(entries.next()[1].file_id)
856
other.root.revision = self.root.revision
857
# copy recursively so we know directories will be added before
858
# their children. There are more efficient ways than this...
859
for path, entry in entries:
860
other.add(entry.copy())
863
313
def __iter__(self):
864
314
return iter(self._byid)
866
317
def __len__(self):
867
318
"""Returns number of entries."""
868
319
return len(self._byid)
870
322
def iter_entries(self, from_dir=None):
871
323
"""Return (path, entry) pairs, in order by name."""
873
if self.root is None:
877
elif isinstance(from_dir, basestring):
878
from_dir = self._byid[from_dir]
880
# unrolling the recursive called changed the time from
881
# 440ms/663ms (inline/total) to 116ms/116ms
882
children = from_dir.children.items()
884
children = collections.deque(children)
885
stack = [(u'', children)]
887
from_dir_relpath, children = stack[-1]
890
name, ie = children.popleft()
892
# we know that from_dir_relpath never ends in a slash
893
# and 'f' doesn't begin with one, we can do a string op, rather
894
# than the checks of pathjoin(), though this means that all paths
896
path = from_dir_relpath + '/' + name
900
if ie.kind != 'directory':
903
# But do this child first
904
new_children = ie.children.items()
906
new_children = collections.deque(new_children)
907
stack.append((path, new_children))
908
# Break out of inner loop, so that we start outer loop with child
911
# if we finished all children, pop it off the stack
914
def iter_entries_by_dir(self, from_dir=None, specific_file_ids=None,
915
yield_parents=False):
916
"""Iterate over the entries in a directory first order.
918
This returns all entries for a directory before returning
919
the entries for children of a directory. This is not
920
lexicographically sorted order, and is a hybrid between
921
depth-first and breadth-first.
923
:param yield_parents: If True, yield the parents from the root leading
924
down to specific_file_ids that have been requested. This has no
925
impact if specific_file_ids is None.
926
:return: This yields (path, entry) pairs
928
if specific_file_ids and not isinstance(specific_file_ids, set):
929
specific_file_ids = set(specific_file_ids)
930
# TODO? Perhaps this should return the from_dir so that the root is
931
# yielded? or maybe an option?
933
if self.root is None:
935
# Optimize a common case
936
if (not yield_parents and specific_file_ids is not None and
937
len(specific_file_ids) == 1):
938
file_id = list(specific_file_ids)[0]
940
yield self.id2path(file_id), self[file_id]
943
if (specific_file_ids is None or yield_parents or
944
self.root.file_id in specific_file_ids):
946
elif isinstance(from_dir, basestring):
947
from_dir = self._byid[from_dir]
949
if specific_file_ids is not None:
950
# TODO: jam 20070302 This could really be done as a loop rather
951
# than a bunch of recursive calls.
954
def add_ancestors(file_id):
955
if file_id not in byid:
957
parent_id = byid[file_id].parent_id
958
if parent_id is None:
960
if parent_id not in parents:
961
parents.add(parent_id)
962
add_ancestors(parent_id)
963
for file_id in specific_file_ids:
964
add_ancestors(file_id)
968
stack = [(u'', from_dir)]
970
cur_relpath, cur_dir = stack.pop()
973
for child_name, child_ie in sorted(cur_dir.children.iteritems()):
975
child_relpath = cur_relpath + child_name
977
if (specific_file_ids is None or
978
child_ie.file_id in specific_file_ids or
979
(yield_parents and child_ie.file_id in parents)):
980
yield child_relpath, child_ie
982
if child_ie.kind == 'directory':
983
if parents is None or child_ie.file_id in parents:
984
child_dirs.append((child_relpath+'/', child_ie))
985
stack.extend(reversed(child_dirs))
987
def make_entry(self, kind, name, parent_id, file_id=None):
988
"""Simple thunk to bzrlib.inventory.make_entry."""
989
return make_entry(kind, name, parent_id, file_id)
327
elif isinstance(from_dir, basestring):
328
from_dir = self._byid[from_dir]
330
kids = from_dir.children.items()
332
for name, ie in kids:
334
if ie.kind == 'directory':
335
for cn, cie in self.iter_entries(from_dir=ie.file_id):
336
yield os.path.join(name, cn), cie
991
339
def entries(self):
992
340
"""Return list of (path, ie) for all entries except the root.
1056
411
def get_child(self, parent_id, filename):
1057
412
return self[parent_id].children.get(filename)
1059
def _add_child(self, entry):
1060
"""Add an entry to the inventory, without adding it to its parent"""
1061
if entry.file_id in self._byid:
1062
raise BzrError("inventory already contains entry with id {%s}" %
1064
self._byid[entry.file_id] = entry
1065
for child in getattr(entry, 'children', {}).itervalues():
1066
self._add_child(child)
1069
415
def add(self, entry):
1070
416
"""Add entry to inventory.
1072
418
To add a file to a branch ready to be committed, use Branch.add,
1075
Returns the new entry object.
1077
420
if entry.file_id in self._byid:
1078
raise errors.DuplicateFileId(entry.file_id,
1079
self._byid[entry.file_id])
1081
if entry.parent_id is None:
1085
parent = self._byid[entry.parent_id]
1087
raise BzrError("parent_id {%s} not in inventory" %
1090
if entry.name in parent.children:
1091
raise BzrError("%s is already versioned" %
1092
osutils.pathjoin(self.id2path(parent.file_id),
1093
entry.name).encode('utf-8'))
1094
parent.children[entry.name] = entry
1095
return self._add_child(entry)
1097
def add_path(self, relpath, kind, file_id=None, parent_id=None):
421
raise BzrError("inventory already contains entry with id {%s}" % entry.file_id)
423
if entry.parent_id == ROOT_ID or entry.parent_id is None:
424
entry.parent_id = self.root.file_id
427
parent = self._byid[entry.parent_id]
429
raise BzrError("parent_id {%s} not in inventory" % entry.parent_id)
431
if parent.children.has_key(entry.name):
432
raise BzrError("%s is already versioned" %
433
appendpath(self.id2path(parent.file_id), entry.name))
435
self._byid[entry.file_id] = entry
436
parent.children[entry.name] = entry
440
def add_path(self, relpath, kind, file_id=None):
1098
441
"""Add entry from a path.
1100
The immediate parent must already be versioned.
1102
Returns the new entry object."""
443
The immediate parent must already be versioned"""
444
from bzrlib.branch import gen_file_id
1104
parts = osutils.splitpath(relpath)
446
parts = bzrlib.osutils.splitpath(relpath)
1106
447
if len(parts) == 0:
1108
file_id = generate_ids.gen_root_id()
1109
self.root = InventoryDirectory(file_id, '', None)
1110
self._byid = {self.root.file_id: self.root}
1113
parent_path = parts[:-1]
1114
parent_id = self.path2id(parent_path)
1115
if parent_id is None:
1116
raise errors.NotVersionedError(path=parent_path)
1117
ie = make_entry(kind, parts[-1], parent_id, file_id)
448
raise BzrError("cannot re-add root of inventory")
451
file_id = gen_file_id(relpath)
453
parent_path = parts[:-1]
454
parent_id = self.path2id(parent_path)
455
if parent_id == None:
456
raise NotVersionedError(parent_path)
458
ie = InventoryEntry(file_id, parts[-1],
459
kind=kind, parent_id=parent_id)
1118
460
return self.add(ie)
1120
463
def __delitem__(self, file_id):
1121
464
"""Remove entry by id.
1123
466
>>> inv = Inventory()
1124
>>> inv.add(InventoryFile('123', 'foo.c', ROOT_ID))
1125
InventoryFile('123', 'foo.c', parent_id='TREE_ROOT', sha1=None, len=None)
467
>>> inv.add(InventoryEntry('123', 'foo.c', 'file', ROOT_ID))
468
InventoryEntry('123', 'foo.c', kind='file', parent_id='TREE_ROOT')
1126
469
>>> '123' in inv
1128
471
>>> del inv['123']
1231
618
return parent.file_id
1233
621
def has_filename(self, names):
1234
622
return bool(self.path2id(names))
1236
625
def has_id(self, file_id):
1237
return (file_id in self._byid)
1239
def _make_delta(self, old):
1240
"""Make an inventory delta from two inventories."""
1241
old_getter = getattr(old, '_byid', old)
1242
new_getter = self._byid
1243
old_ids = set(old_getter)
1244
new_ids = set(new_getter)
1245
adds = new_ids - old_ids
1246
deletes = old_ids - new_ids
1247
if not adds and not deletes:
1250
common = old_ids.intersection(new_ids)
1252
for file_id in deletes:
1253
delta.append((old.id2path(file_id), None, file_id, None))
1254
for file_id in adds:
1255
delta.append((None, self.id2path(file_id), file_id, self[file_id]))
1256
for file_id in common:
1257
new_ie = new_getter[file_id]
1258
old_ie = old_getter[file_id]
1259
# If xml_serializer returns the cached InventoryEntries (rather
1260
# than always doing .copy()), inlining the 'is' check saves 2.7M
1261
# calls to __eq__. Under lsprof this saves 20s => 6s.
1262
# It is a minor improvement without lsprof.
1263
if old_ie is new_ie or old_ie == new_ie:
1266
delta.append((old.id2path(file_id), self.id2path(file_id),
1270
def remove_recursive_id(self, file_id):
1271
"""Remove file_id, and children, from the inventory.
1273
:param file_id: A file_id to remove.
1275
to_find_delete = [self._byid[file_id]]
1277
while to_find_delete:
1278
ie = to_find_delete.pop()
1279
to_delete.append(ie.file_id)
1280
if ie.kind == 'directory':
1281
to_find_delete.extend(ie.children.values())
1282
for file_id in reversed(to_delete):
1284
del self._byid[file_id]
1285
if ie.parent_id is not None:
1286
del self[ie.parent_id].children[ie.name]
626
return self._byid.has_key(file_id)
1290
629
def rename(self, file_id, new_parent_id, new_name):
1291
630
"""Move a file within the inventory.
1293
632
This can change either the name, or the parent, or both.
1295
This does not move the working file.
1297
new_name = ensure_normalized_name(new_name)
634
This does not move the working file."""
1298
635
if not is_valid_name(new_name):
1299
636
raise BzrError("not an acceptable filename: %r" % new_name)
added
removed
bzrlib/inventory.py
