36
60
An InventoryEntry has the following fields, which are also
37
61
present in the XML inventory-entry element:
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.
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.)
54
87
>>> i = Inventory()
57
>>> i.add(InventoryEntry('123', 'src', 'directory', ROOT_ID))
58
>>> i.add(InventoryEntry('2323', 'hello.c', 'file', parent_id='123'))
59
>>> for j in i.iter_entries():
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])
62
('src', InventoryEntry('123', 'src', kind='directory', parent_id='TREE_ROOT'))
63
('src/hello.c', InventoryEntry('2323', 'hello.c', kind='file', parent_id='123'))
64
>>> i.add(InventoryEntry('2323', 'bye.c', 'file', '123'))
65
Traceback (most recent call last):
67
BzrError: inventory already contains entry with id {2323}
68
>>> i.add(InventoryEntry('2324', 'bye.c', 'file', '123'))
69
>>> i.add(InventoryEntry('2325', 'wibble', 'directory', '123'))
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)
70
105
>>> i.path2id('src/wibble')
74
>>> i.add(InventoryEntry('2326', 'wibble.c', 'file', '2325'))
109
>>> i.add(InventoryFile('2326', 'wibble.c', '2325'))
110
InventoryFile('2326', 'wibble.c', parent_id='2325', sha1=None, len=None)
76
InventoryEntry('2326', 'wibble.c', kind='file', parent_id='2325')
77
>>> for j in i.iter_entries():
79
... assert i.path2id(j[0])
112
InventoryFile('2326', 'wibble.c', parent_id='2325', sha1=None, len=None)
113
>>> for path, entry in i.iter_entries():
115
... assert i.path2id(path)
85
122
src/wibble/wibble.c
86
123
>>> i.id2path('2326')
87
124
'src/wibble/wibble.c'
89
TODO: Maybe also keep the full path of the entry, and the children?
90
But those depend on its position within a particular inventory, and
91
it would be nice not to need to hold the backpointer here.
94
# TODO: split InventoryEntry into subclasses for files,
95
# directories, etc etc.
97
__slots__ = ['text_sha1', 'text_size', 'file_id', 'name', 'kind',
98
'text_id', 'parent_id', 'children', ]
100
def __init__(self, file_id, name, kind, parent_id, text_id=None):
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'
137
def detect_changes(self, old_entry):
138
"""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
141
calling detect_changes.
145
def _diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree,
146
output_to, reverse=False):
147
"""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
158
# revision:ie mapping for each ie found in previous_inventories.
160
# identify candidate head revision ids.
161
for inv in previous_inventories:
162
if self.file_id in inv:
163
ie = inv[self.file_id]
164
assert ie.file_id == self.file_id
165
if ie.revision in candidates:
166
# same revision value in two different inventories:
167
# correct possible inconsistencies:
168
# * there was a bug in revision updates with 'x' bit
171
if candidates[ie.revision].executable != ie.executable:
172
candidates[ie.revision].executable = False
173
ie.executable = False
174
except AttributeError:
176
# must now be the same.
177
assert candidates[ie.revision] == ie
179
# add this revision as a candidate.
180
candidates[ie.revision] = ie
183
def get_tar_item(self, root, dp, now, tree):
184
"""Get a tarfile item and a file stream for its content."""
185
item = tarfile.TarInfo(osutils.pathjoin(root, dp).encode('utf8'))
186
# TODO: would be cool to actually set it to the timestamp of the
187
# revision it was last changed
189
fileobj = self._put_in_tar(item, tree)
193
"""Return true if the object this entry represents has textual data.
195
Note that textual data includes binary content.
197
Also note that all entries get weave files created for them.
198
This attribute is primarily used when upgrading from old trees that
199
did not have the weave index for all inventory entries.
203
def __init__(self, file_id, name, parent_id, text_id=None):
101
204
"""Create an InventoryEntry
103
206
The filename must be a single component, relative to the
104
207
parent directory; it cannot be a whole path or relative name.
106
>>> e = InventoryEntry('123', 'hello.c', 'file', ROOT_ID)
209
>>> e = InventoryFile('123', 'hello.c', ROOT_ID)
111
>>> e = InventoryEntry('123', 'src/hello.c', 'file', ROOT_ID)
214
>>> e = InventoryFile('123', 'src/hello.c', ROOT_ID)
112
215
Traceback (most recent call last):
113
BzrCheckError: InventoryEntry name 'src/hello.c' is invalid
216
InvalidEntryName: Invalid entry name: src/hello.c
218
assert isinstance(name, basestring), name
115
219
if '/' in name or '\\' in name:
116
raise BzrCheckError('InventoryEntry name %r is invalid' % name)
220
raise errors.InvalidEntryName(name=name)
221
self.executable = False
118
223
self.text_sha1 = None
119
224
self.text_size = None
121
225
self.file_id = file_id
226
assert isinstance(file_id, (str, None.__class__)), \
227
'bad type %r for %r' % (type(file_id), file_id)
124
229
self.text_id = text_id
125
230
self.parent_id = parent_id
126
if kind == 'directory':
131
raise BzrError("unhandled entry kind %r" % kind)
231
self.symlink_target = None
232
self.reference_revision = None
234
def kind_character(self):
235
"""Return a short kind indicator useful for appending to names."""
236
raise BzrError('unknown kind %r' % self.kind)
238
known_kinds = ('file', 'directory', 'symlink')
240
def _put_in_tar(self, item, tree):
241
"""populate item for stashing in a tar, and return the content stream.
243
If no content is available, return None.
245
raise BzrError("don't know how to export {%s} of kind %r" %
246
(self.file_id, self.kind))
248
def put_on_disk(self, dest, dp, tree):
249
"""Create a representation of self on disk in the prefix dest.
251
This is a template method - implement _put_on_disk in subclasses.
253
fullpath = osutils.pathjoin(dest, dp)
254
self._put_on_disk(fullpath, tree)
255
# mutter(" export {%s} kind %s to %s", self.file_id,
256
# self.kind, fullpath)
258
def _put_on_disk(self, fullpath, tree):
259
"""Put this entry onto disk at fullpath, from tree tree."""
260
raise BzrError("don't know how to export {%s} of kind %r" % (self.file_id, self.kind))
135
262
def sorted_children(self):
136
l = self.children.items()
263
return sorted(self.children.items())
266
def versionable_kind(kind):
267
return (kind in ('file', 'directory', 'symlink', 'tree-reference'))
269
def check(self, checker, rev_id, inv, tree):
270
"""Check this inventory entry is intact.
272
This is a template method, override _check for kind specific
275
:param checker: Check object providing context for the checks;
276
can be used to find out what parts of the repository have already
278
:param rev_id: Revision id from which this InventoryEntry was loaded.
279
Not necessarily the last-changed revision for this file.
280
:param inv: Inventory from which the entry was loaded.
281
:param tree: RevisionTree for this entry.
283
if self.parent_id is not None:
284
if not inv.has_id(self.parent_id):
285
raise BzrCheckError('missing parent {%s} in inventory for revision {%s}'
286
% (self.parent_id, rev_id))
287
self._check(checker, rev_id, tree)
289
def _check(self, checker, rev_id, tree):
290
"""Check this inventory entry for kind specific errors."""
291
raise BzrCheckError('unknown entry kind %r in revision {%s}' %
142
other = InventoryEntry(self.file_id, self.name, self.kind,
143
self.parent_id, text_id=self.text_id)
144
other.text_sha1 = self.text_sha1
145
other.text_size = self.text_size
146
# note that children are *not* copied; they're pulled across when
295
"""Clone this inventory entry."""
296
raise NotImplementedError
299
def describe_change(old_entry, new_entry):
300
"""Describe the change between old_entry and this.
302
This smells of being an InterInventoryEntry situation, but as its
303
the first one, we're making it a static method for now.
305
An entry with a different parent, or different name is considered
306
to be renamed. Reparenting is an internal detail.
307
Note that renaming the parent does not trigger a rename for the
310
# TODO: Perhaps return an object rather than just a string
311
if old_entry is new_entry:
312
# also the case of both being None
314
elif old_entry is None:
316
elif new_entry is None:
318
if old_entry.kind != new_entry.kind:
320
text_modified, meta_modified = new_entry.detect_changes(old_entry)
321
if text_modified or meta_modified:
325
# TODO 20060511 (mbp, rbc) factor out 'detect_rename' here.
326
if old_entry.parent_id != new_entry.parent_id:
328
elif old_entry.name != new_entry.name:
332
if renamed and not modified:
333
return InventoryEntry.RENAMED
334
if modified and not renamed:
336
if modified and renamed:
337
return InventoryEntry.MODIFIED_AND_RENAMED
151
340
def __repr__(self):
152
return ("%s(%r, %r, kind=%r, parent_id=%r)"
341
return ("%s(%r, %r, parent_id=%r, revision=%r)"
153
342
% (self.__class__.__name__,
160
def to_element(self):
161
"""Convert to XML element"""
162
from bzrlib.xml import Element
166
e.set('name', self.name)
167
e.set('file_id', self.file_id)
168
e.set('kind', self.kind)
170
if self.text_size != None:
171
e.set('text_size', '%d' % self.text_size)
173
for f in ['text_id', 'text_sha1']:
178
# to be conservative, we don't externalize the root pointers
179
# for now, leaving them as null in the xml form. in a future
180
# version it will be implied by nested elements.
181
if self.parent_id != ROOT_ID:
182
assert isinstance(self.parent_id, basestring)
183
e.set('parent_id', self.parent_id)
190
def from_element(cls, elt):
191
assert elt.tag == 'entry'
193
## original format inventories don't have a parent_id for
194
## nodes in the root directory, but it's cleaner to use one
196
parent_id = elt.get('parent_id')
197
if parent_id == None:
200
self = cls(elt.get('file_id'), elt.get('name'), elt.get('kind'), parent_id)
201
self.text_id = elt.get('text_id')
202
self.text_sha1 = elt.get('text_sha1')
204
## mutter("read inventoryentry: %r" % (elt.attrib))
206
v = elt.get('text_size')
207
self.text_size = v and int(v)
212
from_element = classmethod(from_element)
214
348
def __eq__(self, other):
215
349
if not isinstance(other, InventoryEntry):
216
350
return NotImplemented
218
return (self.file_id == other.file_id) \
219
and (self.name == other.name) \
220
and (self.text_sha1 == other.text_sha1) \
221
and (self.text_size == other.text_size) \
222
and (self.text_id == other.text_id) \
223
and (self.parent_id == other.parent_id) \
224
and (self.kind == other.kind)
352
return ((self.file_id == other.file_id)
353
and (self.name == other.name)
354
and (other.symlink_target == self.symlink_target)
355
and (self.text_sha1 == other.text_sha1)
356
and (self.text_size == other.text_size)
357
and (self.text_id == other.text_id)
358
and (self.parent_id == other.parent_id)
359
and (self.kind == other.kind)
360
and (self.revision == other.revision)
361
and (self.executable == other.executable)
362
and (self.reference_revision == other.reference_revision)
227
365
def __ne__(self, other):
228
366
return not (self == other)
248
427
and (self.children == other.children)
430
class InventoryDirectory(InventoryEntry):
431
"""A directory in an inventory."""
433
__slots__ = ['text_sha1', 'text_size', 'file_id', 'name', 'kind',
434
'text_id', 'parent_id', 'children', 'executable',
435
'revision', 'symlink_target', 'reference_revision']
437
def _check(self, checker, rev_id, tree):
438
"""See InventoryEntry._check"""
439
if self.text_sha1 is not None or self.text_size is not None or self.text_id is not None:
440
raise BzrCheckError('directory {%s} has text in revision {%s}'
441
% (self.file_id, rev_id))
444
other = InventoryDirectory(self.file_id, self.name, self.parent_id)
445
other.revision = self.revision
446
# note that children are *not* copied; they're pulled across when
450
def __init__(self, file_id, name, parent_id):
451
super(InventoryDirectory, self).__init__(file_id, name, parent_id)
453
self.kind = 'directory'
455
def kind_character(self):
456
"""See InventoryEntry.kind_character."""
459
def _put_in_tar(self, item, tree):
460
"""See InventoryEntry._put_in_tar."""
461
item.type = tarfile.DIRTYPE
468
def _put_on_disk(self, fullpath, tree):
469
"""See InventoryEntry._put_on_disk."""
473
class InventoryFile(InventoryEntry):
474
"""A file in an inventory."""
476
__slots__ = ['text_sha1', 'text_size', 'file_id', 'name', 'kind',
477
'text_id', 'parent_id', 'children', 'executable',
478
'revision', 'symlink_target', 'reference_revision']
480
def _check(self, checker, tree_revision_id, tree):
481
"""See InventoryEntry._check"""
482
t = (self.file_id, self.revision)
483
if t in checker.checked_texts:
484
prev_sha = checker.checked_texts[t]
485
if prev_sha != self.text_sha1:
487
'mismatched sha1 on {%s} in {%s} (%s != %s) %r' %
488
(self.file_id, tree_revision_id, prev_sha, self.text_sha1,
491
checker.repeated_text_cnt += 1
494
if self.file_id not in checker.checked_weaves:
495
mutter('check weave {%s}', self.file_id)
496
w = tree._get_weave(self.file_id)
497
# Not passing a progress bar, because it creates a new
498
# progress, which overwrites the current progress,
499
# and doesn't look nice
501
checker.checked_weaves[self.file_id] = True
503
w = tree._get_weave(self.file_id)
505
mutter('check version {%s} of {%s}', tree_revision_id, self.file_id)
506
checker.checked_text_cnt += 1
507
# We can't check the length, because Weave doesn't store that
508
# information, and the whole point of looking at the weave's
509
# sha1sum is that we don't have to extract the text.
510
if self.text_sha1 != w.get_sha1s([self.revision])[0]:
511
raise BzrCheckError('text {%s} version {%s} wrong sha1'
512
% (self.file_id, self.revision))
513
checker.checked_texts[t] = self.text_sha1
516
other = InventoryFile(self.file_id, self.name, self.parent_id)
517
other.executable = self.executable
518
other.text_id = self.text_id
519
other.text_sha1 = self.text_sha1
520
other.text_size = self.text_size
521
other.revision = self.revision
524
def detect_changes(self, old_entry):
525
"""See InventoryEntry.detect_changes."""
526
assert self.text_sha1 is not None
527
assert old_entry.text_sha1 is not None
528
text_modified = (self.text_sha1 != old_entry.text_sha1)
529
meta_modified = (self.executable != old_entry.executable)
530
return text_modified, meta_modified
532
def _diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree,
533
output_to, reverse=False):
534
"""See InventoryEntry._diff."""
535
from bzrlib.diff import DiffText
536
from_file_id = self.file_id
538
to_file_id = to_entry.file_id
542
to_file_id, from_file_id = from_file_id, to_file_id
543
tree, to_tree = to_tree, tree
544
from_label, to_label = to_label, from_label
545
differ = DiffText(tree, to_tree, output_to, 'utf-8', '', '',
547
return differ.diff_text(from_file_id, to_file_id, from_label, to_label)
550
"""See InventoryEntry.has_text."""
553
def __init__(self, file_id, name, parent_id):
554
super(InventoryFile, self).__init__(file_id, name, parent_id)
557
def kind_character(self):
558
"""See InventoryEntry.kind_character."""
561
def _put_in_tar(self, item, tree):
562
"""See InventoryEntry._put_in_tar."""
563
item.type = tarfile.REGTYPE
564
fileobj = tree.get_file(self.file_id)
565
item.size = self.text_size
566
if tree.is_executable(self.file_id):
572
def _put_on_disk(self, fullpath, tree):
573
"""See InventoryEntry._put_on_disk."""
574
osutils.pumpfile(tree.get_file(self.file_id), file(fullpath, 'wb'))
575
if tree.is_executable(self.file_id):
576
os.chmod(fullpath, 0755)
578
def _read_tree_state(self, path, work_tree):
579
"""See InventoryEntry._read_tree_state."""
580
self.text_sha1 = work_tree.get_file_sha1(self.file_id, path=path)
581
# FIXME: 20050930 probe for the text size when getting sha1
582
# in _read_tree_state
583
self.executable = work_tree.is_executable(self.file_id, path=path)
586
return ("%s(%r, %r, parent_id=%r, sha1=%r, len=%s)"
587
% (self.__class__.__name__,
594
def _forget_tree_state(self):
595
self.text_sha1 = None
597
def _unchanged(self, previous_ie):
598
"""See InventoryEntry._unchanged."""
599
compatible = super(InventoryFile, self)._unchanged(previous_ie)
600
if self.text_sha1 != previous_ie.text_sha1:
603
# FIXME: 20050930 probe for the text size when getting sha1
604
# in _read_tree_state
605
self.text_size = previous_ie.text_size
606
if self.executable != previous_ie.executable:
611
class InventoryLink(InventoryEntry):
612
"""A file in an inventory."""
614
__slots__ = ['text_sha1', 'text_size', 'file_id', 'name', 'kind',
615
'text_id', 'parent_id', 'children', 'executable',
616
'revision', 'symlink_target', 'reference_revision']
618
def _check(self, checker, rev_id, tree):
619
"""See InventoryEntry._check"""
620
if self.text_sha1 is not None or self.text_size is not None or self.text_id is not None:
621
raise BzrCheckError('symlink {%s} has text in revision {%s}'
622
% (self.file_id, rev_id))
623
if self.symlink_target is None:
624
raise BzrCheckError('symlink {%s} has no target in revision {%s}'
625
% (self.file_id, rev_id))
628
other = InventoryLink(self.file_id, self.name, self.parent_id)
629
other.symlink_target = self.symlink_target
630
other.revision = self.revision
633
def detect_changes(self, old_entry):
634
"""See InventoryEntry.detect_changes."""
635
# FIXME: which _modified field should we use ? RBC 20051003
636
text_modified = (self.symlink_target != old_entry.symlink_target)
638
mutter(" symlink target changed")
639
meta_modified = False
640
return text_modified, meta_modified
642
def _diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree,
643
output_to, reverse=False):
644
"""See InventoryEntry._diff."""
645
from bzrlib.diff import DiffSymlink
646
old_target = self.symlink_target
647
if to_entry is not None:
648
new_target = to_entry.symlink_target
657
new_target, old_target = old_target, new_target
658
differ = DiffSymlink(old_tree, new_tree, output_to)
659
return differ.diff_symlink(old_target, new_target)
661
def __init__(self, file_id, name, parent_id):
662
super(InventoryLink, self).__init__(file_id, name, parent_id)
663
self.kind = 'symlink'
665
def kind_character(self):
666
"""See InventoryEntry.kind_character."""
669
def _put_in_tar(self, item, tree):
670
"""See InventoryEntry._put_in_tar."""
671
item.type = tarfile.SYMTYPE
675
item.linkname = self.symlink_target
678
def _put_on_disk(self, fullpath, tree):
679
"""See InventoryEntry._put_on_disk."""
681
os.symlink(self.symlink_target, fullpath)
683
raise BzrError("Failed to create symlink %r -> %r, error: %s" % (fullpath, self.symlink_target, e))
685
def _read_tree_state(self, path, work_tree):
686
"""See InventoryEntry._read_tree_state."""
687
self.symlink_target = work_tree.get_symlink_target(self.file_id)
689
def _forget_tree_state(self):
690
self.symlink_target = None
692
def _unchanged(self, previous_ie):
693
"""See InventoryEntry._unchanged."""
694
compatible = super(InventoryLink, self)._unchanged(previous_ie)
695
if self.symlink_target != previous_ie.symlink_target:
700
class TreeReference(InventoryEntry):
702
kind = 'tree-reference'
704
def __init__(self, file_id, name, parent_id, revision=None,
705
reference_revision=None):
706
InventoryEntry.__init__(self, file_id, name, parent_id)
707
self.revision = revision
708
self.reference_revision = reference_revision
711
return TreeReference(self.file_id, self.name, self.parent_id,
712
self.revision, self.reference_revision)
714
def _read_tree_state(self, path, work_tree):
715
"""Populate fields in the inventory entry from the given tree.
717
self.reference_revision = work_tree.get_reference_revision(
720
def _forget_tree_state(self):
721
self.reference_revision = None
723
def _unchanged(self, previous_ie):
724
"""See InventoryEntry._unchanged."""
725
compatible = super(TreeReference, self)._unchanged(previous_ie)
726
if self.reference_revision != previous_ie.reference_revision:
252
731
class Inventory(object):
253
732
"""Inventory of versioned files in a tree.
295
779
The inventory is created with a default root directory, with
298
# We are letting Branch(init=True) create a unique inventory
299
# root id. Rather than generating a random one here.
301
# root_id = bzrlib.branch.gen_file_id('TREE_ROOT')
302
self.root = RootEntry(root_id)
782
if root_id is not None:
783
assert root_id.__class__ == str
784
self._set_root(InventoryDirectory(root_id, u'', None))
788
self.revision_id = revision_id
791
return "<Inventory object at %x, contents=%r>" % (id(self), self._byid)
793
def apply_delta(self, delta):
794
"""Apply a delta to this inventory.
796
:param delta: A list of changes to apply. After all the changes are
797
applied the final inventory must be internally consistent, but it
798
is ok to supply changes which, if only half-applied would have an
799
invalid result - such as supplying two changes which rename two
800
files, 'A' and 'B' with each other : [('A', 'B', 'A-id', a_entry),
801
('B', 'A', 'B-id', b_entry)].
803
Each change is a tuple, of the form (old_path, new_path, file_id,
806
When new_path is None, the change indicates the removal of an entry
807
from the inventory and new_entry will be ignored (using None is
808
appropriate). If new_path is not None, then new_entry must be an
809
InventoryEntry instance, which will be incorporated into the
810
inventory (and replace any existing entry with the same file id).
812
When old_path is None, the change indicates the addition of
813
a new entry to the inventory.
815
When neither new_path nor old_path are None, the change is a
816
modification to an entry, such as a rename, reparent, kind change
819
The children attribute of new_entry is ignored. This is because
820
this method preserves children automatically across alterations to
821
the parent of the children, and cases where the parent id of a
822
child is changing require the child to be passed in as a separate
823
change regardless. E.g. in the recursive deletion of a directory -
824
the directory's children must be included in the delta, or the
825
final inventory will be invalid.
828
# Remove all affected items which were in the original inventory,
829
# starting with the longest paths, thus ensuring parents are examined
830
# after their children, which means that everything we examine has no
831
# modified children remaining by the time we examine it.
832
for old_path, file_id in sorted(((op, f) for op, np, f, e in delta
833
if op is not None), reverse=True):
834
if file_id not in self:
837
# Preserve unaltered children of file_id for later reinsertion.
838
children[file_id] = getattr(self[file_id], 'children', {})
839
# Remove file_id and the unaltered children. If file_id is not
840
# being deleted it will be reinserted back later.
841
self.remove_recursive_id(file_id)
842
# Insert all affected which should be in the new inventory, reattaching
843
# their children if they had any. This is done from shortest path to
844
# longest, ensuring that items which were modified and whose parents in
845
# the resulting inventory were also modified, are inserted after their
847
for new_path, new_entry in sorted((np, e) for op, np, f, e in
848
delta if np is not None):
849
if new_entry.kind == 'directory':
850
new_entry.children = children.get(new_entry.file_id, {})
853
def _set_root(self, ie):
303
855
self._byid = {self.root.file_id: self.root}
858
# TODO: jam 20051218 Should copy also copy the revision_id?
859
entries = self.iter_entries()
860
if self.root is None:
861
return Inventory(root_id=None)
862
other = Inventory(entries.next()[1].file_id)
863
# copy recursively so we know directories will be added before
864
# their children. There are more efficient ways than this...
865
for path, entry in entries:
866
other.add(entry.copy())
306
869
def __iter__(self):
307
870
return iter(self._byid)
310
872
def __len__(self):
311
873
"""Returns number of entries."""
312
874
return len(self._byid)
315
876
def iter_entries(self, from_dir=None):
316
877
"""Return (path, entry) pairs, in order by name."""
320
elif isinstance(from_dir, basestring):
321
from_dir = self._byid[from_dir]
323
kids = from_dir.children.items()
325
for name, ie in kids:
327
if ie.kind == 'directory':
328
for cn, cie in self.iter_entries(from_dir=ie.file_id):
329
yield os.path.join(name, cn), cie
879
if self.root is None:
883
elif isinstance(from_dir, basestring):
884
from_dir = self._byid[from_dir]
886
# unrolling the recursive called changed the time from
887
# 440ms/663ms (inline/total) to 116ms/116ms
888
children = from_dir.children.items()
890
children = collections.deque(children)
891
stack = [(u'', children)]
893
from_dir_relpath, children = stack[-1]
896
name, ie = children.popleft()
898
# we know that from_dir_relpath never ends in a slash
899
# and 'f' doesn't begin with one, we can do a string op, rather
900
# than the checks of pathjoin(), though this means that all paths
902
path = from_dir_relpath + '/' + name
906
if ie.kind != 'directory':
909
# But do this child first
910
new_children = ie.children.items()
912
new_children = collections.deque(new_children)
913
stack.append((path, new_children))
914
# Break out of inner loop, so that we start outer loop with child
917
# if we finished all children, pop it off the stack
920
def iter_entries_by_dir(self, from_dir=None, specific_file_ids=None,
921
yield_parents=False):
922
"""Iterate over the entries in a directory first order.
924
This returns all entries for a directory before returning
925
the entries for children of a directory. This is not
926
lexicographically sorted order, and is a hybrid between
927
depth-first and breadth-first.
929
:param yield_parents: If True, yield the parents from the root leading
930
down to specific_file_ids that have been requested. This has no
931
impact if specific_file_ids is None.
932
:return: This yields (path, entry) pairs
934
if specific_file_ids and not isinstance(specific_file_ids, set):
935
specific_file_ids = set(specific_file_ids)
936
# TODO? Perhaps this should return the from_dir so that the root is
937
# yielded? or maybe an option?
939
if self.root is None:
941
# Optimize a common case
942
if (not yield_parents and specific_file_ids is not None and
943
len(specific_file_ids) == 1):
944
file_id = list(specific_file_ids)[0]
946
yield self.id2path(file_id), self[file_id]
949
if (specific_file_ids is None or yield_parents or
950
self.root.file_id in specific_file_ids):
952
elif isinstance(from_dir, basestring):
953
from_dir = self._byid[from_dir]
955
if specific_file_ids is not None:
956
# TODO: jam 20070302 This could really be done as a loop rather
957
# than a bunch of recursive calls.
960
def add_ancestors(file_id):
961
if file_id not in byid:
963
parent_id = byid[file_id].parent_id
964
if parent_id is None:
966
if parent_id not in parents:
967
parents.add(parent_id)
968
add_ancestors(parent_id)
969
for file_id in specific_file_ids:
970
add_ancestors(file_id)
974
stack = [(u'', from_dir)]
976
cur_relpath, cur_dir = stack.pop()
979
for child_name, child_ie in sorted(cur_dir.children.iteritems()):
981
child_relpath = cur_relpath + child_name
983
if (specific_file_ids is None or
984
child_ie.file_id in specific_file_ids or
985
(yield_parents and child_ie.file_id in parents)):
986
yield child_relpath, child_ie
988
if child_ie.kind == 'directory':
989
if parents is None or child_ie.file_id in parents:
990
child_dirs.append((child_relpath+'/', child_ie))
991
stack.extend(reversed(child_dirs))
993
def make_entry(self, kind, name, parent_id, file_id=None):
994
"""Simple thunk to bzrlib.inventory.make_entry."""
995
return make_entry(kind, name, parent_id, file_id)
332
997
def entries(self):
333
998
"""Return list of (path, ie) for all entries except the root.
402
1062
def get_child(self, parent_id, filename):
403
1063
return self[parent_id].children.get(filename)
1065
def _add_child(self, entry):
1066
"""Add an entry to the inventory, without adding it to its parent"""
1067
if entry.file_id in self._byid:
1068
raise BzrError("inventory already contains entry with id {%s}" %
1070
self._byid[entry.file_id] = entry
1071
for child in getattr(entry, 'children', {}).itervalues():
1072
self._add_child(child)
406
1075
def add(self, entry):
407
1076
"""Add entry to inventory.
409
1078
To add a file to a branch ready to be committed, use Branch.add,
1081
Returns the new entry object.
411
1083
if entry.file_id in self._byid:
412
raise BzrError("inventory already contains entry with id {%s}" % entry.file_id)
414
if entry.parent_id == ROOT_ID or entry.parent_id is None:
415
entry.parent_id = self.root.file_id
418
parent = self._byid[entry.parent_id]
420
raise BzrError("parent_id {%s} not in inventory" % entry.parent_id)
422
if parent.children.has_key(entry.name):
423
raise BzrError("%s is already versioned" %
424
appendpath(self.id2path(parent.file_id), entry.name))
426
self._byid[entry.file_id] = entry
427
parent.children[entry.name] = entry
430
def add_path(self, relpath, kind, file_id=None):
1084
raise errors.DuplicateFileId(entry.file_id,
1085
self._byid[entry.file_id])
1087
if entry.parent_id is None:
1088
assert self.root is None and len(self._byid) == 0
1092
parent = self._byid[entry.parent_id]
1094
raise BzrError("parent_id {%s} not in inventory" %
1097
if entry.name in parent.children:
1098
raise BzrError("%s is already versioned" %
1099
osutils.pathjoin(self.id2path(parent.file_id),
1100
entry.name).encode('utf-8'))
1101
parent.children[entry.name] = entry
1102
return self._add_child(entry)
1104
def add_path(self, relpath, kind, file_id=None, parent_id=None):
431
1105
"""Add entry from a path.
433
The immediate parent must already be versioned"""
434
from bzrlib.branch import gen_file_id
1107
The immediate parent must already be versioned.
1109
Returns the new entry object."""
436
parts = bzrlib.osutils.splitpath(relpath)
1111
parts = osutils.splitpath(relpath)
437
1113
if len(parts) == 0:
438
raise BzrError("cannot re-add root of inventory")
441
file_id = gen_file_id(relpath)
443
parent_path = parts[:-1]
444
parent_id = self.path2id(parent_path)
445
if parent_id == None:
446
raise NotVersionedError(parent_path)
448
ie = InventoryEntry(file_id, parts[-1],
449
kind=kind, parent_id=parent_id)
1115
file_id = generate_ids.gen_root_id()
1116
self.root = InventoryDirectory(file_id, '', None)
1117
self._byid = {self.root.file_id: self.root}
1120
parent_path = parts[:-1]
1121
parent_id = self.path2id(parent_path)
1122
if parent_id is None:
1123
raise errors.NotVersionedError(path=parent_path)
1124
ie = make_entry(kind, parts[-1], parent_id, file_id)
450
1125
return self.add(ie)
453
1127
def __delitem__(self, file_id):
454
1128
"""Remove entry by id.
456
1130
>>> inv = Inventory()
457
>>> inv.add(InventoryEntry('123', 'foo.c', 'file', ROOT_ID))
1131
>>> inv.add(InventoryFile('123', 'foo.c', ROOT_ID))
1132
InventoryFile('123', 'foo.c', parent_id='TREE_ROOT', sha1=None, len=None)
458
1133
>>> '123' in inv
460
1135
>>> del inv['123']
added
removed
bzrlib/inventory.py
