1
# (C) 2005 Canonical Ltd
1
# Copyright (C) 2005, 2006 Canonical Ltd
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
11
# GNU General Public License for more details.
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17
# FIXME: This refactoring of the workingtree code doesn't seem to keep
18
# the WorkingTree's copy of the inventory in sync with the branch. The
19
# branch modifies its working inventory when it does a commit to make
20
# missing files permanently removed.
22
# TODO: Maybe also keep the full path of the entry, and the children?
23
# But those depend on its position within a particular inventory, and
24
# it would be nice not to need to hold the backpointer here.
18
26
# This should really be an id randomly assigned when the tree is
19
27
# created, but it's not for now.
20
28
ROOT_ID = "TREE_ROOT"
23
import sys, os.path, types, re
26
from cElementTree import Element, ElementTree, SubElement
28
from elementtree.ElementTree import Element, ElementTree, SubElement
30
from xml import XMLMixin
31
from errors import bailout, BzrError, BzrCheckError
37
from warnings import warn
34
from bzrlib.osutils import uuid, quotefn, splitpath, joinpath, appendpath
40
from bzrlib import errors, osutils
41
from bzrlib.osutils import (pumpfile, quotefn, splitpath, joinpath,
42
pathjoin, sha_strings)
43
from bzrlib.errors import (NotVersionedError, InvalidEntryName,
44
BzrError, BzrCheckError, BinaryFile)
35
45
from bzrlib.trace import mutter
37
class InventoryEntry(XMLMixin):
48
class InventoryEntry(object):
38
49
"""Description of a versioned file.
40
51
An InventoryEntry has the following fields, which are also
41
52
present in the XML inventory-entry element:
44
* *name*: (only the basename within the directory, must not
46
* *kind*: "directory" or "file"
47
* *directory_id*: (if absent/null means the branch root directory)
48
* *text_sha1*: only for files
49
* *text_size*: in bytes, only for files
50
* *text_id*: identifier for the text version, only for files
52
InventoryEntries can also exist inside a WorkingTree
53
inventory, in which case they are not yet bound to a
54
particular revision of the file. In that case the text_sha1,
55
text_size and text_id are absent.
57
(within the parent directory)
60
file_id of the parent directory, or ROOT_ID
63
the revision_id in which this variation of this file was
67
Indicates that this file should be executable on systems
71
sha-1 of the text of the file
74
size in bytes of the text of the file
76
(reading a version 4 tree created a text_id field.)
58
78
>>> i = Inventory()
61
>>> i.add(InventoryEntry('123', 'src', 'directory', ROOT_ID))
62
>>> i.add(InventoryEntry('2323', 'hello.c', 'file', parent_id='123'))
63
>>> for j in i.iter_entries():
81
>>> i.add(InventoryDirectory('123', 'src', ROOT_ID))
82
InventoryDirectory('123', 'src', parent_id='TREE_ROOT', revision=None)
83
>>> i.add(InventoryFile('2323', 'hello.c', parent_id='123'))
84
InventoryFile('2323', 'hello.c', parent_id='123', sha1=None, len=None)
85
>>> shouldbe = {0: '', 1: 'src', 2: pathjoin('src','hello.c')}
86
>>> for ix, j in enumerate(i.iter_entries()):
87
... print (j[0] == shouldbe[ix], j[1])
66
('src', InventoryEntry('123', 'src', kind='directory', parent_id='TREE_ROOT'))
67
('src/hello.c', InventoryEntry('2323', 'hello.c', kind='file', parent_id='123'))
68
>>> i.add(InventoryEntry('2323', 'bye.c', 'file', '123'))
89
(True, InventoryDirectory('TREE_ROOT', '', parent_id=None, revision=None))
90
(True, InventoryDirectory('123', 'src', parent_id='TREE_ROOT', revision=None))
91
(True, InventoryFile('2323', 'hello.c', parent_id='123', sha1=None, len=None))
92
>>> i.add(InventoryFile('2323', 'bye.c', '123'))
69
93
Traceback (most recent call last):
71
BzrError: ('inventory already contains entry with id {2323}', [])
72
>>> i.add(InventoryEntry('2324', 'bye.c', 'file', '123'))
73
>>> i.add(InventoryEntry('2325', 'wibble', 'directory', '123'))
95
BzrError: inventory already contains entry with id {2323}
96
>>> i.add(InventoryFile('2324', 'bye.c', '123'))
97
InventoryFile('2324', 'bye.c', parent_id='123', sha1=None, len=None)
98
>>> i.add(InventoryDirectory('2325', 'wibble', '123'))
99
InventoryDirectory('2325', 'wibble', parent_id='123', revision=None)
74
100
>>> i.path2id('src/wibble')
78
>>> i.add(InventoryEntry('2326', 'wibble.c', 'file', '2325'))
104
>>> i.add(InventoryFile('2326', 'wibble.c', '2325'))
105
InventoryFile('2326', 'wibble.c', parent_id='2325', sha1=None, len=None)
80
InventoryEntry('2326', 'wibble.c', kind='file', parent_id='2325')
81
>>> for j in i.iter_entries():
83
... assert i.path2id(j[0])
107
InventoryFile('2326', 'wibble.c', parent_id='2325', sha1=None, len=None)
108
>>> for path, entry in i.iter_entries():
110
... assert i.path2id(path)
89
117
src/wibble/wibble.c
90
118
>>> i.id2path('2326')
91
119
'src/wibble/wibble.c'
93
TODO: Maybe also keep the full path of the entry, and the children?
94
But those depend on its position within a particular inventory, and
95
it would be nice not to need to hold the backpointer here.
98
# TODO: split InventoryEntry into subclasses for files,
99
# directories, etc etc.
122
# Constants returned by describe_change()
124
# TODO: These should probably move to some kind of FileChangeDescription
125
# class; that's like what's inside a TreeDelta but we want to be able to
126
# generate them just for one file at a time.
128
MODIFIED_AND_RENAMED = 'modified and renamed'
104
def __init__(self, file_id, name, kind, parent_id, text_id=None):
132
def detect_changes(self, old_entry):
133
"""Return a (text_modified, meta_modified) from this to old_entry.
135
_read_tree_state must have been called on self and old_entry prior to
136
calling detect_changes.
140
def diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree,
141
output_to, reverse=False):
142
"""Perform a diff from this to to_entry.
144
text_diff will be used for textual difference calculation.
145
This is a template method, override _diff in child classes.
147
self._read_tree_state(tree.id2path(self.file_id), tree)
149
# cannot diff from one kind to another - you must do a removal
150
# and an addif they do not match.
151
assert self.kind == to_entry.kind
152
to_entry._read_tree_state(to_tree.id2path(to_entry.file_id),
154
self._diff(text_diff, from_label, tree, to_label, to_entry, to_tree,
157
def _diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree,
158
output_to, reverse=False):
159
"""Perform a diff between two entries of the same kind."""
161
def find_previous_heads(self, previous_inventories,
162
versioned_file_store,
165
"""Return the revisions and entries that directly precede this.
167
Returned as a map from revision to inventory entry.
169
This is a map containing the file revisions in all parents
170
for which the file exists, and its revision is not a parent of
171
any other. If the file is new, the set will be empty.
173
:param versioned_file_store: A store where ancestry data on this
174
file id can be queried.
175
:param transaction: The transaction that queries to the versioned
176
file store should be completed under.
177
:param entry_vf: The entry versioned file, if its already available.
179
def get_ancestors(weave, entry):
180
return set(weave.get_ancestry(entry.revision))
181
# revision:ie mapping for each ie found in previous_inventories.
183
# revision:ie mapping with one revision for each head.
185
# revision: ancestor list for each head
187
# identify candidate head revision ids.
188
for inv in previous_inventories:
189
if self.file_id in inv:
190
ie = inv[self.file_id]
191
assert ie.file_id == self.file_id
192
if ie.revision in candidates:
193
# same revision value in two different inventories:
194
# correct possible inconsistencies:
195
# * there was a bug in revision updates with 'x' bit
198
if candidates[ie.revision].executable != ie.executable:
199
candidates[ie.revision].executable = False
200
ie.executable = False
201
except AttributeError:
203
# must now be the same.
204
assert candidates[ie.revision] == ie
206
# add this revision as a candidate.
207
candidates[ie.revision] = ie
209
# common case optimisation
210
if len(candidates) == 1:
211
# if there is only one candidate revision found
212
# then we can opening the versioned file to access ancestry:
213
# there cannot be any ancestors to eliminate when there is
214
# only one revision available.
215
heads[ie.revision] = ie
218
# eliminate ancestors amongst the available candidates:
219
# heads are those that are not an ancestor of any other candidate
220
# - this provides convergence at a per-file level.
221
for ie in candidates.values():
222
# may be an ancestor of a known head:
223
already_present = 0 != len(
224
[head for head in heads
225
if ie.revision in head_ancestors[head]])
227
# an ancestor of an analyzed candidate.
229
# not an ancestor of a known head:
230
# load the versioned file for this file id if needed
232
entry_vf = versioned_file_store.get_weave_or_empty(
233
self.file_id, transaction)
234
ancestors = get_ancestors(entry_vf, ie)
235
# may knock something else out:
236
check_heads = list(heads.keys())
237
for head in check_heads:
238
if head in ancestors:
239
# this previously discovered 'head' is not
240
# really a head - its an ancestor of the newly
243
head_ancestors[ie.revision] = ancestors
244
heads[ie.revision] = ie
247
def get_tar_item(self, root, dp, now, tree):
248
"""Get a tarfile item and a file stream for its content."""
249
item = tarfile.TarInfo(pathjoin(root, dp).encode('utf8'))
250
# TODO: would be cool to actually set it to the timestamp of the
251
# revision it was last changed
253
fileobj = self._put_in_tar(item, tree)
257
"""Return true if the object this entry represents has textual data.
259
Note that textual data includes binary content.
261
Also note that all entries get weave files created for them.
262
This attribute is primarily used when upgrading from old trees that
263
did not have the weave index for all inventory entries.
267
def __init__(self, file_id, name, parent_id, text_id=None):
105
268
"""Create an InventoryEntry
107
270
The filename must be a single component, relative to the
108
271
parent directory; it cannot be a whole path or relative name.
110
>>> e = InventoryEntry('123', 'hello.c', 'file', ROOT_ID)
273
>>> e = InventoryFile('123', 'hello.c', ROOT_ID)
115
>>> e = InventoryEntry('123', 'src/hello.c', 'file', ROOT_ID)
278
>>> e = InventoryFile('123', 'src/hello.c', ROOT_ID)
116
279
Traceback (most recent call last):
117
BzrCheckError: InventoryEntry name 'src/hello.c' is invalid
280
InvalidEntryName: Invalid entry name: src/hello.c
282
assert isinstance(name, basestring), name
119
283
if '/' in name or '\\' in name:
120
raise BzrCheckError('InventoryEntry name %r is invalid' % name)
284
raise InvalidEntryName(name=name)
285
self.executable = False
287
self.text_sha1 = None
288
self.text_size = None
122
289
self.file_id = file_id
125
291
self.text_id = text_id
126
292
self.parent_id = parent_id
127
if kind == 'directory':
132
raise BzrError("unhandled entry kind %r" % kind)
293
self.symlink_target = None
295
def kind_character(self):
296
"""Return a short kind indicator useful for appending to names."""
297
raise BzrError('unknown kind %r' % self.kind)
299
known_kinds = ('file', 'directory', 'symlink')
301
def _put_in_tar(self, item, tree):
302
"""populate item for stashing in a tar, and return the content stream.
304
If no content is available, return None.
306
raise BzrError("don't know how to export {%s} of kind %r" %
307
(self.file_id, self.kind))
309
def put_on_disk(self, dest, dp, tree):
310
"""Create a representation of self on disk in the prefix dest.
312
This is a template method - implement _put_on_disk in subclasses.
314
fullpath = pathjoin(dest, dp)
315
self._put_on_disk(fullpath, tree)
316
# mutter(" export {%s} kind %s to %s", self.file_id,
317
# self.kind, fullpath)
319
def _put_on_disk(self, fullpath, tree):
320
"""Put this entry onto disk at fullpath, from tree tree."""
321
raise BzrError("don't know how to export {%s} of kind %r" % (self.file_id, self.kind))
136
323
def sorted_children(self):
137
l = self.children.items()
324
return sorted(self.children.items())
327
def versionable_kind(kind):
328
return (kind in ('file', 'directory', 'symlink'))
330
def check(self, checker, rev_id, inv, tree):
331
"""Check this inventory entry is intact.
333
This is a template method, override _check for kind specific
336
:param checker: Check object providing context for the checks;
337
can be used to find out what parts of the repository have already
339
:param rev_id: Revision id from which this InventoryEntry was loaded.
340
Not necessarily the last-changed revision for this file.
341
:param inv: Inventory from which the entry was loaded.
342
:param tree: RevisionTree for this entry.
344
if self.parent_id is not None:
345
if not inv.has_id(self.parent_id):
346
raise BzrCheckError('missing parent {%s} in inventory for revision {%s}'
347
% (self.parent_id, rev_id))
348
self._check(checker, rev_id, tree)
350
def _check(self, checker, rev_id, tree):
351
"""Check this inventory entry for kind specific errors."""
352
raise BzrCheckError('unknown entry kind %r in revision {%s}' %
143
other = InventoryEntry(self.file_id, self.name, self.kind,
144
self.parent_id, text_id=self.text_id)
145
other.text_sha1 = self.text_sha1
146
other.text_size = self.text_size
147
# note that children are *not* copied; they're pulled across when
356
"""Clone this inventory entry."""
357
raise NotImplementedError
360
def describe_change(old_entry, new_entry):
361
"""Describe the change between old_entry and this.
363
This smells of being an InterInventoryEntry situation, but as its
364
the first one, we're making it a static method for now.
366
An entry with a different parent, or different name is considered
367
to be renamed. Reparenting is an internal detail.
368
Note that renaming the parent does not trigger a rename for the
371
# TODO: Perhaps return an object rather than just a string
372
if old_entry is new_entry:
373
# also the case of both being None
375
elif old_entry is None:
377
elif new_entry is None:
379
text_modified, meta_modified = new_entry.detect_changes(old_entry)
380
if text_modified or meta_modified:
384
# TODO 20060511 (mbp, rbc) factor out 'detect_rename' here.
385
if old_entry.parent_id != new_entry.parent_id:
387
elif old_entry.name != new_entry.name:
391
if renamed and not modified:
392
return InventoryEntry.RENAMED
393
if modified and not renamed:
395
if modified and renamed:
396
return InventoryEntry.MODIFIED_AND_RENAMED
152
399
def __repr__(self):
153
return ("%s(%r, %r, kind=%r, parent_id=%r)"
400
return ("%s(%r, %r, parent_id=%r, revision=%r)"
154
401
% (self.__class__.__name__,
161
def to_element(self):
162
"""Convert to XML element"""
165
e.set('name', self.name)
166
e.set('file_id', self.file_id)
167
e.set('kind', self.kind)
169
if self.text_size != None:
170
e.set('text_size', '%d' % self.text_size)
172
for f in ['text_id', 'text_sha1']:
177
# to be conservative, we don't externalize the root pointers
178
# for now, leaving them as null in the xml form. in a future
179
# version it will be implied by nested elements.
180
if self.parent_id != ROOT_ID:
181
assert isinstance(self.parent_id, basestring)
182
e.set('parent_id', self.parent_id)
189
def from_element(cls, elt):
190
assert elt.tag == 'entry'
192
## original format inventories don't have a parent_id for
193
## nodes in the root directory, but it's cleaner to use one
195
parent_id = elt.get('parent_id')
196
if parent_id == None:
199
self = cls(elt.get('file_id'), elt.get('name'), elt.get('kind'), parent_id)
200
self.text_id = elt.get('text_id')
201
self.text_sha1 = elt.get('text_sha1')
203
## mutter("read inventoryentry: %r" % (elt.attrib))
205
v = elt.get('text_size')
206
self.text_size = v and int(v)
211
from_element = classmethod(from_element)
407
def snapshot(self, revision, path, previous_entries,
408
work_tree, commit_builder):
409
"""Make a snapshot of this entry which may or may not have changed.
411
This means that all its fields are populated, that it has its
412
text stored in the text store or weave.
414
# mutter('new parents of %s are %r', path, previous_entries)
415
self._read_tree_state(path, work_tree)
416
# TODO: Where should we determine whether to reuse a
417
# previous revision id or create a new revision? 20060606
418
if len(previous_entries) == 1:
419
# cannot be unchanged unless there is only one parent file rev.
420
parent_ie = previous_entries.values()[0]
421
if self._unchanged(parent_ie):
422
# mutter("found unchanged entry")
423
self.revision = parent_ie.revision
425
return self._snapshot_into_revision(revision, previous_entries,
426
work_tree, commit_builder)
428
def _snapshot_into_revision(self, revision, previous_entries, work_tree,
430
"""Record this revision unconditionally into a store.
432
The entry's last-changed revision property (`revision`) is updated to
433
that of the new revision.
435
:param revision: id of the new revision that is being recorded.
437
:returns: String description of the commit (e.g. "merged", "modified"), etc.
439
# mutter('new revision {%s} for {%s}', revision, self.file_id)
440
self.revision = revision
441
self._snapshot_text(previous_entries, work_tree, commit_builder)
443
def _snapshot_text(self, file_parents, work_tree, commit_builder):
444
"""Record the 'text' of this entry, whatever form that takes.
446
This default implementation simply adds an empty text.
448
raise NotImplementedError(self._snapshot_text)
213
450
def __eq__(self, other):
214
451
if not isinstance(other, InventoryEntry):
215
452
return NotImplemented
217
return (self.file_id == other.file_id) \
218
and (self.name == other.name) \
219
and (self.text_sha1 == other.text_sha1) \
220
and (self.text_size == other.text_size) \
221
and (self.text_id == other.text_id) \
222
and (self.parent_id == other.parent_id) \
223
and (self.kind == other.kind)
454
return ((self.file_id == other.file_id)
455
and (self.name == other.name)
456
and (other.symlink_target == self.symlink_target)
457
and (self.text_sha1 == other.text_sha1)
458
and (self.text_size == other.text_size)
459
and (self.text_id == other.text_id)
460
and (self.parent_id == other.parent_id)
461
and (self.kind == other.kind)
462
and (self.revision == other.revision)
463
and (self.executable == other.executable)
226
466
def __ne__(self, other):
227
467
return not (self == other)
247
526
and (self.children == other.children)
251
class Inventory(XMLMixin):
529
class InventoryDirectory(InventoryEntry):
530
"""A directory in an inventory."""
532
__slots__ = ['text_sha1', 'text_size', 'file_id', 'name', 'kind',
533
'text_id', 'parent_id', 'children', 'executable',
534
'revision', 'symlink_target']
536
def _check(self, checker, rev_id, tree):
537
"""See InventoryEntry._check"""
538
if self.text_sha1 is not None or self.text_size is not None or self.text_id is not None:
539
raise BzrCheckError('directory {%s} has text in revision {%s}'
540
% (self.file_id, rev_id))
543
other = InventoryDirectory(self.file_id, self.name, self.parent_id)
544
other.revision = self.revision
545
# note that children are *not* copied; they're pulled across when
549
def __init__(self, file_id, name, parent_id):
550
super(InventoryDirectory, self).__init__(file_id, name, parent_id)
552
self.kind = 'directory'
554
def kind_character(self):
555
"""See InventoryEntry.kind_character."""
558
def _put_in_tar(self, item, tree):
559
"""See InventoryEntry._put_in_tar."""
560
item.type = tarfile.DIRTYPE
567
def _put_on_disk(self, fullpath, tree):
568
"""See InventoryEntry._put_on_disk."""
571
def _snapshot_text(self, file_parents, work_tree, commit_builder):
572
"""See InventoryEntry._snapshot_text."""
573
commit_builder.modified_directory(self.file_id, file_parents)
576
class InventoryFile(InventoryEntry):
577
"""A file in an inventory."""
579
__slots__ = ['text_sha1', 'text_size', 'file_id', 'name', 'kind',
580
'text_id', 'parent_id', 'children', 'executable',
581
'revision', 'symlink_target']
583
def _check(self, checker, tree_revision_id, tree):
584
"""See InventoryEntry._check"""
585
t = (self.file_id, self.revision)
586
if t in checker.checked_texts:
587
prev_sha = checker.checked_texts[t]
588
if prev_sha != self.text_sha1:
589
raise BzrCheckError('mismatched sha1 on {%s} in {%s}' %
590
(self.file_id, tree_revision_id))
592
checker.repeated_text_cnt += 1
595
if self.file_id not in checker.checked_weaves:
596
mutter('check weave {%s}', self.file_id)
597
w = tree.get_weave(self.file_id)
598
# Not passing a progress bar, because it creates a new
599
# progress, which overwrites the current progress,
600
# and doesn't look nice
602
checker.checked_weaves[self.file_id] = True
604
w = tree.get_weave(self.file_id)
606
mutter('check version {%s} of {%s}', tree_revision_id, self.file_id)
607
checker.checked_text_cnt += 1
608
# We can't check the length, because Weave doesn't store that
609
# information, and the whole point of looking at the weave's
610
# sha1sum is that we don't have to extract the text.
611
if self.text_sha1 != w.get_sha1(self.revision):
612
raise BzrCheckError('text {%s} version {%s} wrong sha1'
613
% (self.file_id, self.revision))
614
checker.checked_texts[t] = self.text_sha1
617
other = InventoryFile(self.file_id, self.name, self.parent_id)
618
other.executable = self.executable
619
other.text_id = self.text_id
620
other.text_sha1 = self.text_sha1
621
other.text_size = self.text_size
622
other.revision = self.revision
625
def detect_changes(self, old_entry):
626
"""See InventoryEntry.detect_changes."""
627
assert self.text_sha1 is not None
628
assert old_entry.text_sha1 is not None
629
text_modified = (self.text_sha1 != old_entry.text_sha1)
630
meta_modified = (self.executable != old_entry.executable)
631
return text_modified, meta_modified
633
def _diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree,
634
output_to, reverse=False):
635
"""See InventoryEntry._diff."""
637
from_text = tree.get_file(self.file_id).readlines()
639
to_text = to_tree.get_file(to_entry.file_id).readlines()
643
text_diff(from_label, from_text,
644
to_label, to_text, output_to)
646
text_diff(to_label, to_text,
647
from_label, from_text, output_to)
650
label_pair = (to_label, from_label)
652
label_pair = (from_label, to_label)
653
print >> output_to, "Binary files %s and %s differ" % label_pair
656
"""See InventoryEntry.has_text."""
659
def __init__(self, file_id, name, parent_id):
660
super(InventoryFile, self).__init__(file_id, name, parent_id)
663
def kind_character(self):
664
"""See InventoryEntry.kind_character."""
667
def _put_in_tar(self, item, tree):
668
"""See InventoryEntry._put_in_tar."""
669
item.type = tarfile.REGTYPE
670
fileobj = tree.get_file(self.file_id)
671
item.size = self.text_size
672
if tree.is_executable(self.file_id):
678
def _put_on_disk(self, fullpath, tree):
679
"""See InventoryEntry._put_on_disk."""
680
pumpfile(tree.get_file(self.file_id), file(fullpath, 'wb'))
681
if tree.is_executable(self.file_id):
682
os.chmod(fullpath, 0755)
684
def _read_tree_state(self, path, work_tree):
685
"""See InventoryEntry._read_tree_state."""
686
self.text_sha1 = work_tree.get_file_sha1(self.file_id, path=path)
687
# FIXME: 20050930 probe for the text size when getting sha1
688
# in _read_tree_state
689
self.executable = work_tree.is_executable(self.file_id, path=path)
692
return ("%s(%r, %r, parent_id=%r, sha1=%r, len=%s)"
693
% (self.__class__.__name__,
700
def _forget_tree_state(self):
701
self.text_sha1 = None
703
def _snapshot_text(self, file_parents, work_tree, commit_builder):
704
"""See InventoryEntry._snapshot_text."""
705
def get_content_byte_lines():
706
return work_tree.get_file(self.file_id).readlines()
707
self.text_sha1, self.text_size = commit_builder.modified_file_text(
708
self.file_id, file_parents, get_content_byte_lines, self.text_sha1, self.text_size)
710
def _unchanged(self, previous_ie):
711
"""See InventoryEntry._unchanged."""
712
compatible = super(InventoryFile, self)._unchanged(previous_ie)
713
if self.text_sha1 != previous_ie.text_sha1:
716
# FIXME: 20050930 probe for the text size when getting sha1
717
# in _read_tree_state
718
self.text_size = previous_ie.text_size
719
if self.executable != previous_ie.executable:
724
class InventoryLink(InventoryEntry):
725
"""A file in an inventory."""
727
__slots__ = ['text_sha1', 'text_size', 'file_id', 'name', 'kind',
728
'text_id', 'parent_id', 'children', 'executable',
729
'revision', 'symlink_target']
731
def _check(self, checker, rev_id, tree):
732
"""See InventoryEntry._check"""
733
if self.text_sha1 is not None or self.text_size is not None or self.text_id is not None:
734
raise BzrCheckError('symlink {%s} has text in revision {%s}'
735
% (self.file_id, rev_id))
736
if self.symlink_target is None:
737
raise BzrCheckError('symlink {%s} has no target in revision {%s}'
738
% (self.file_id, rev_id))
741
other = InventoryLink(self.file_id, self.name, self.parent_id)
742
other.symlink_target = self.symlink_target
743
other.revision = self.revision
746
def detect_changes(self, old_entry):
747
"""See InventoryEntry.detect_changes."""
748
# FIXME: which _modified field should we use ? RBC 20051003
749
text_modified = (self.symlink_target != old_entry.symlink_target)
751
mutter(" symlink target changed")
752
meta_modified = False
753
return text_modified, meta_modified
755
def _diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree,
756
output_to, reverse=False):
757
"""See InventoryEntry._diff."""
758
from_text = self.symlink_target
759
if to_entry is not None:
760
to_text = to_entry.symlink_target
765
print >>output_to, '=== target changed %r => %r' % (from_text, to_text)
768
print >>output_to, '=== target was %r' % self.symlink_target
770
print >>output_to, '=== target is %r' % self.symlink_target
772
def __init__(self, file_id, name, parent_id):
773
super(InventoryLink, self).__init__(file_id, name, parent_id)
774
self.kind = 'symlink'
776
def kind_character(self):
777
"""See InventoryEntry.kind_character."""
780
def _put_in_tar(self, item, tree):
781
"""See InventoryEntry._put_in_tar."""
782
item.type = tarfile.SYMTYPE
786
item.linkname = self.symlink_target
789
def _put_on_disk(self, fullpath, tree):
790
"""See InventoryEntry._put_on_disk."""
792
os.symlink(self.symlink_target, fullpath)
794
raise BzrError("Failed to create symlink %r -> %r, error: %s" % (fullpath, self.symlink_target, e))
796
def _read_tree_state(self, path, work_tree):
797
"""See InventoryEntry._read_tree_state."""
798
self.symlink_target = work_tree.get_symlink_target(self.file_id)
800
def _forget_tree_state(self):
801
self.symlink_target = None
803
def _unchanged(self, previous_ie):
804
"""See InventoryEntry._unchanged."""
805
compatible = super(InventoryLink, self)._unchanged(previous_ie)
806
if self.symlink_target != previous_ie.symlink_target:
810
def _snapshot_text(self, file_parents, work_tree, commit_builder):
811
"""See InventoryEntry._snapshot_text."""
812
commit_builder.modified_link(
813
self.file_id, file_parents, self.symlink_target)
816
class Inventory(object):
252
817
"""Inventory of versioned files in a tree.
254
819
This describes which file_id is present at each point in the tree,
301
861
The inventory is created with a default root directory, with
304
self.root = RootEntry(ROOT_ID)
864
# We are letting Branch.create() create a unique inventory
865
# root id. Rather than generating a random one here.
867
# root_id = bzrlib.branch.gen_file_id('TREE_ROOT')
868
if root_id is not None:
869
self._set_root(InventoryDirectory(root_id, '', None))
873
# FIXME: this isn't ever used, changing it to self.revision may break
874
# things. TODO make everything use self.revision_id
875
self.revision_id = revision_id
877
def _set_root(self, ie):
305
879
self._byid = {self.root.file_id: self.root}
882
# TODO: jam 20051218 Should copy also copy the revision_id?
883
entries = self.iter_entries()
884
other = Inventory(entries.next()[1].file_id)
885
# copy recursively so we know directories will be added before
886
# their children. There are more efficient ways than this...
887
for path, entry in entries():
888
other.add(entry.copy())
308
891
def __iter__(self):
309
892
return iter(self._byid)
312
894
def __len__(self):
313
895
"""Returns number of entries."""
314
896
return len(self._byid)
317
898
def iter_entries(self, from_dir=None):
318
899
"""Return (path, entry) pairs, in order by name."""
322
elif isinstance(from_dir, basestring):
323
from_dir = self._byid[from_dir]
325
kids = from_dir.children.items()
327
for name, ie in kids:
329
if ie.kind == 'directory':
330
for cn, cie in self.iter_entries(from_dir=ie.file_id):
331
yield os.path.join(name, cn), cie
904
elif isinstance(from_dir, basestring):
905
from_dir = self._byid[from_dir]
907
# unrolling the recursive called changed the time from
908
# 440ms/663ms (inline/total) to 116ms/116ms
909
children = from_dir.children.items()
911
children = collections.deque(children)
912
stack = [(u'', children)]
914
from_dir_relpath, children = stack[-1]
917
name, ie = children.popleft()
919
# we know that from_dir_relpath never ends in a slash
920
# and 'f' doesn't begin with one, we can do a string op, rather
921
# than the checks of pathjoin(), though this means that all paths
923
path = from_dir_relpath + '/' + name
927
if ie.kind != 'directory':
930
# But do this child first
931
new_children = ie.children.items()
933
new_children = collections.deque(new_children)
934
stack.append((path, new_children))
935
# Break out of inner loop, so that we start outer loop with child
938
# if we finished all children, pop it off the stack
941
def iter_entries_by_dir(self, from_dir=None):
942
"""Iterate over the entries in a directory first order.
944
This returns all entries for a directory before returning
945
the entries for children of a directory. This is not
946
lexicographically sorted order, and is a hybrid between
947
depth-first and breadth-first.
949
:return: This yields (path, entry) pairs
951
# TODO? Perhaps this should return the from_dir so that the root is
952
# yielded? or maybe an option?
957
elif isinstance(from_dir, basestring):
958
from_dir = self._byid[from_dir]
960
stack = [(u'', from_dir)]
962
cur_relpath, cur_dir = stack.pop()
965
for child_name, child_ie in sorted(cur_dir.children.iteritems()):
967
child_relpath = cur_relpath + child_name
969
yield child_relpath, child_ie
971
if child_ie.kind == 'directory':
972
child_dirs.append((child_relpath+'/', child_ie))
973
stack.extend(reversed(child_dirs))
334
975
def entries(self):
335
976
"""Return list of (path, ie) for all entries except the root.
363
1003
for name, child_ie in kids:
364
child_path = os.path.join(parent_path, name)
1004
child_path = pathjoin(parent_path, name)
365
1005
descend(child_ie, child_path)
366
descend(self.root, '')
1006
descend(self.root, u'')
371
1009
def __contains__(self, file_id):
372
1010
"""True if this entry contains a file with given id.
374
1012
>>> inv = Inventory()
375
>>> inv.add(InventoryEntry('123', 'foo.c', 'file', ROOT_ID))
1013
>>> inv.add(InventoryFile('123', 'foo.c', ROOT_ID))
1014
InventoryFile('123', 'foo.c', parent_id='TREE_ROOT', sha1=None, len=None)
376
1015
>>> '123' in inv
378
1017
>>> '456' in inv
381
return file_id in self._byid
1020
return (file_id in self._byid)
384
1022
def __getitem__(self, file_id):
385
1023
"""Return the entry for given file_id.
387
1025
>>> inv = Inventory()
388
>>> inv.add(InventoryEntry('123123', 'hello.c', 'file', ROOT_ID))
1026
>>> inv.add(InventoryFile('123123', 'hello.c', ROOT_ID))
1027
InventoryFile('123123', 'hello.c', parent_id='TREE_ROOT', sha1=None, len=None)
389
1028
>>> inv['123123'].name
393
1032
return self._byid[file_id]
394
1033
except KeyError:
396
1035
raise BzrError("can't look up file_id None")
398
1037
raise BzrError("file_id {%s} not in inventory" % file_id)
401
1039
def get_file_kind(self, file_id):
402
1040
return self._byid[file_id].kind
404
1042
def get_child(self, parent_id, filename):
405
1043
return self[parent_id].children.get(filename)
408
1045
def add(self, entry):
409
1046
"""Add entry to inventory.
411
1048
To add a file to a branch ready to be committed, use Branch.add,
1051
Returns the new entry object.
413
1053
if entry.file_id in self._byid:
414
bailout("inventory already contains entry with id {%s}" % entry.file_id)
1054
raise BzrError("inventory already contains entry with id {%s}" % entry.file_id)
1056
if entry.parent_id is None:
1057
assert self.root is None and len(self._byid) == 0
1058
self._set_root(entry)
1060
if entry.parent_id == ROOT_ID:
1061
assert self.root is not None, self
1062
entry.parent_id = self.root.file_id
417
1065
parent = self._byid[entry.parent_id]
418
1066
except KeyError:
419
bailout("parent_id {%s} not in inventory" % entry.parent_id)
1067
raise BzrError("parent_id {%s} not in inventory" % entry.parent_id)
421
if parent.children.has_key(entry.name):
422
bailout("%s is already versioned" %
423
appendpath(self.id2path(parent.file_id), entry.name))
1069
if entry.name in parent.children:
1070
raise BzrError("%s is already versioned" %
1071
pathjoin(self.id2path(parent.file_id), entry.name))
425
1073
self._byid[entry.file_id] = entry
426
1074
parent.children[entry.name] = entry
429
def add_path(self, relpath, kind, file_id=None):
1077
def add_path(self, relpath, kind, file_id=None, parent_id=None):
430
1078
"""Add entry from a path.
432
The immediate parent must already be versioned"""
433
parts = bzrlib.osutils.splitpath(relpath)
1080
The immediate parent must already be versioned.
1082
Returns the new entry object."""
1084
parts = osutils.splitpath(relpath)
434
1086
if len(parts) == 0:
435
bailout("cannot re-add root of inventory")
438
file_id = bzrlib.branch.gen_file_id(relpath)
440
parent_id = self.path2id(parts[:-1])
441
assert parent_id != None
442
ie = InventoryEntry(file_id, parts[-1],
443
kind=kind, parent_id=parent_id)
1088
file_id = bzrlib.workingtree.gen_root_id()
1089
self.root = InventoryDirectory(file_id, '', None)
1090
self._byid = {self.root.file_id: self.root}
1093
parent_path = parts[:-1]
1094
parent_id = self.path2id(parent_path)
1095
if parent_id is None:
1096
raise NotVersionedError(path=parent_path)
1097
ie = make_entry(kind, parts[-1], parent_id, file_id)
444
1098
return self.add(ie)
447
1100
def __delitem__(self, file_id):
448
1101
"""Remove entry by id.
450
1103
>>> inv = Inventory()
451
>>> inv.add(InventoryEntry('123', 'foo.c', 'file', ROOT_ID))
1104
>>> inv.add(InventoryFile('123', 'foo.c', ROOT_ID))
1105
InventoryFile('123', 'foo.c', parent_id='TREE_ROOT', sha1=None, len=None)
452
1106
>>> '123' in inv
454
1108
>>> del inv['123']
added
removed
bzrlib/inventory.py
