1
# (C) 2005 Canonical Ltd
1
# Copyright (C) 2005, 2006, 2007 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
27
from cElementTree import Element, ElementTree, SubElement
29
from elementtree.ElementTree import Element, ElementTree, SubElement
31
from xml import XMLMixin
32
from errors import bailout, BzrError, BzrCheckError
34
from bzrlib.lazy_import import lazy_import
35
lazy_import(globals(), """
35
from bzrlib.osutils import uuid, quotefn, splitpath, joinpath, appendpath
49
from bzrlib.errors import (
36
53
from bzrlib.trace import mutter
38
class InventoryEntry(XMLMixin):
56
class InventoryEntry(object):
39
57
"""Description of a versioned file.
41
59
An InventoryEntry has the following fields, which are also
42
60
present in the XML inventory-entry element:
45
* *name*: (only the basename within the directory, must not
47
* *kind*: "directory" or "file"
48
* *directory_id*: (if absent/null means the branch root directory)
49
* *text_sha1*: only for files
50
* *text_size*: in bytes, only for files
51
* *text_id*: identifier for the text version, only for files
53
InventoryEntries can also exist inside a WorkingTree
54
inventory, in which case they are not yet bound to a
55
particular revision of the file. In that case the text_sha1,
56
text_size and text_id are absent.
65
(within the parent directory)
68
file_id of the parent directory, or ROOT_ID
71
the revision_id in which this variation of this file was
75
Indicates that this file should be executable on systems
79
sha-1 of the text of the file
82
size in bytes of the text of the file
84
(reading a version 4 tree created a text_id field.)
59
86
>>> i = Inventory()
62
>>> i.add(InventoryEntry('123', 'src', 'directory', ROOT_ID))
63
>>> i.add(InventoryEntry('2323', 'hello.c', 'file', parent_id='123'))
64
>>> for j in i.iter_entries():
89
>>> i.add(InventoryDirectory('123', 'src', ROOT_ID))
90
InventoryDirectory('123', 'src', parent_id='TREE_ROOT', revision=None)
91
>>> i.add(InventoryFile('2323', 'hello.c', parent_id='123'))
92
InventoryFile('2323', 'hello.c', parent_id='123', sha1=None, len=None)
93
>>> shouldbe = {0: '', 1: 'src', 2: 'src/hello.c'}
94
>>> for ix, j in enumerate(i.iter_entries()):
95
... print (j[0] == shouldbe[ix], j[1])
67
('src', InventoryEntry('123', 'src', kind='directory', parent_id='TREE_ROOT'))
68
('src/hello.c', InventoryEntry('2323', 'hello.c', kind='file', parent_id='123'))
69
>>> i.add(InventoryEntry('2323', 'bye.c', 'file', '123'))
70
Traceback (most recent call last):
72
BzrError: ('inventory already contains entry with id {2323}', [])
73
>>> i.add(InventoryEntry('2324', 'bye.c', 'file', '123'))
74
>>> i.add(InventoryEntry('2325', 'wibble', 'directory', '123'))
97
(True, InventoryDirectory('TREE_ROOT', u'', parent_id=None, revision=None))
98
(True, InventoryDirectory('123', 'src', parent_id='TREE_ROOT', revision=None))
99
(True, InventoryFile('2323', 'hello.c', parent_id='123', sha1=None, len=None))
100
>>> i.add(InventoryFile('2324', 'bye.c', '123'))
101
InventoryFile('2324', 'bye.c', parent_id='123', sha1=None, len=None)
102
>>> i.add(InventoryDirectory('2325', 'wibble', '123'))
103
InventoryDirectory('2325', 'wibble', parent_id='123', revision=None)
75
104
>>> i.path2id('src/wibble')
79
>>> i.add(InventoryEntry('2326', 'wibble.c', 'file', '2325'))
108
>>> i.add(InventoryFile('2326', 'wibble.c', '2325'))
109
InventoryFile('2326', 'wibble.c', parent_id='2325', sha1=None, len=None)
81
InventoryEntry('2326', 'wibble.c', kind='file', parent_id='2325')
82
>>> for j in i.iter_entries():
84
... assert i.path2id(j[0])
111
InventoryFile('2326', 'wibble.c', parent_id='2325', sha1=None, len=None)
112
>>> for path, entry in i.iter_entries():
114
... assert i.path2id(path)
90
121
src/wibble/wibble.c
91
122
>>> i.id2path('2326')
92
123
'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.
99
# TODO: split InventoryEntry into subclasses for files,
100
# directories, etc etc.
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'
105
def __init__(self, file_id, name, kind, parent_id, text_id=None):
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 from this to to_entry.
148
text_diff will be used for textual difference calculation.
149
This is a template method, override _diff in child classes.
151
self._read_tree_state(tree.id2path(self.file_id), tree)
153
# cannot diff from one kind to another - you must do a removal
154
# and an addif they do not match.
155
assert self.kind == to_entry.kind
156
to_entry._read_tree_state(to_tree.id2path(to_entry.file_id),
158
self._diff(text_diff, from_label, tree, to_label, to_entry, to_tree,
161
def _diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree,
162
output_to, reverse=False):
163
"""Perform a diff between two entries of the same kind."""
165
def find_previous_heads(self, previous_inventories,
166
versioned_file_store,
169
"""Return the revisions and entries that directly precede this.
171
Returned as a map from revision to inventory entry.
173
This is a map containing the file revisions in all parents
174
for which the file exists, and its revision is not a parent of
175
any other. If the file is new, the set will be empty.
177
:param versioned_file_store: A store where ancestry data on this
178
file id can be queried.
179
:param transaction: The transaction that queries to the versioned
180
file store should be completed under.
181
:param entry_vf: The entry versioned file, if its already available.
183
def get_ancestors(weave, entry):
184
return set(weave.get_ancestry(entry.revision))
185
# revision:ie mapping for each ie found in previous_inventories.
187
# revision:ie mapping with one revision for each head.
189
# revision: ancestor list for each head
191
# identify candidate head revision ids.
192
for inv in previous_inventories:
193
if self.file_id in inv:
194
ie = inv[self.file_id]
195
assert ie.file_id == self.file_id
196
if ie.revision in candidates:
197
# same revision value in two different inventories:
198
# correct possible inconsistencies:
199
# * there was a bug in revision updates with 'x' bit
202
if candidates[ie.revision].executable != ie.executable:
203
candidates[ie.revision].executable = False
204
ie.executable = False
205
except AttributeError:
207
# must now be the same.
208
assert candidates[ie.revision] == ie
210
# add this revision as a candidate.
211
candidates[ie.revision] = ie
213
# common case optimisation
214
if len(candidates) == 1:
215
# if there is only one candidate revision found
216
# then we can opening the versioned file to access ancestry:
217
# there cannot be any ancestors to eliminate when there is
218
# only one revision available.
219
heads[ie.revision] = ie
222
# eliminate ancestors amongst the available candidates:
223
# heads are those that are not an ancestor of any other candidate
224
# - this provides convergence at a per-file level.
225
for ie in candidates.values():
226
# may be an ancestor of a known head:
227
already_present = 0 != len(
228
[head for head in heads
229
if ie.revision in head_ancestors[head]])
231
# an ancestor of an analyzed candidate.
233
# not an ancestor of a known head:
234
# load the versioned file for this file id if needed
236
entry_vf = versioned_file_store.get_weave_or_empty(
237
self.file_id, transaction)
238
ancestors = get_ancestors(entry_vf, ie)
239
# may knock something else out:
240
check_heads = list(heads.keys())
241
for head in check_heads:
242
if head in ancestors:
243
# this previously discovered 'head' is not
244
# really a head - its an ancestor of the newly
247
head_ancestors[ie.revision] = ancestors
248
heads[ie.revision] = ie
251
def get_tar_item(self, root, dp, now, tree):
252
"""Get a tarfile item and a file stream for its content."""
253
item = tarfile.TarInfo(osutils.pathjoin(root, dp).encode('utf8'))
254
# TODO: would be cool to actually set it to the timestamp of the
255
# revision it was last changed
257
fileobj = self._put_in_tar(item, tree)
261
"""Return true if the object this entry represents has textual data.
263
Note that textual data includes binary content.
265
Also note that all entries get weave files created for them.
266
This attribute is primarily used when upgrading from old trees that
267
did not have the weave index for all inventory entries.
271
def __init__(self, file_id, name, parent_id, text_id=None):
106
272
"""Create an InventoryEntry
108
274
The filename must be a single component, relative to the
109
275
parent directory; it cannot be a whole path or relative name.
111
>>> e = InventoryEntry('123', 'hello.c', 'file', ROOT_ID)
277
>>> e = InventoryFile('123', 'hello.c', ROOT_ID)
116
>>> e = InventoryEntry('123', 'src/hello.c', 'file', ROOT_ID)
282
>>> e = InventoryFile('123', 'src/hello.c', ROOT_ID)
117
283
Traceback (most recent call last):
118
BzrCheckError: InventoryEntry name 'src/hello.c' is invalid
284
InvalidEntryName: Invalid entry name: src/hello.c
286
assert isinstance(name, basestring), name
120
287
if '/' in name or '\\' in name:
121
raise BzrCheckError('InventoryEntry name %r is invalid' % name)
288
raise errors.InvalidEntryName(name=name)
289
self.executable = False
291
self.text_sha1 = None
292
self.text_size = None
123
293
self.file_id = file_id
294
assert isinstance(file_id, (str, None.__class__)), \
295
'bad type %r for %r' % (type(file_id), file_id)
126
297
self.text_id = text_id
127
298
self.parent_id = parent_id
128
if kind == 'directory':
133
raise BzrError("unhandled entry kind %r" % kind)
299
self.symlink_target = None
301
def kind_character(self):
302
"""Return a short kind indicator useful for appending to names."""
303
raise BzrError('unknown kind %r' % self.kind)
305
known_kinds = ('file', 'directory', 'symlink')
307
def _put_in_tar(self, item, tree):
308
"""populate item for stashing in a tar, and return the content stream.
310
If no content is available, return None.
312
raise BzrError("don't know how to export {%s} of kind %r" %
313
(self.file_id, self.kind))
315
def put_on_disk(self, dest, dp, tree):
316
"""Create a representation of self on disk in the prefix dest.
318
This is a template method - implement _put_on_disk in subclasses.
320
fullpath = osutils.pathjoin(dest, dp)
321
self._put_on_disk(fullpath, tree)
322
# mutter(" export {%s} kind %s to %s", self.file_id,
323
# self.kind, fullpath)
325
def _put_on_disk(self, fullpath, tree):
326
"""Put this entry onto disk at fullpath, from tree tree."""
327
raise BzrError("don't know how to export {%s} of kind %r" % (self.file_id, self.kind))
137
329
def sorted_children(self):
138
l = self.children.items()
330
return sorted(self.children.items())
333
def versionable_kind(kind):
334
return (kind in ('file', 'directory', 'symlink', 'tree-reference'))
336
def check(self, checker, rev_id, inv, tree):
337
"""Check this inventory entry is intact.
339
This is a template method, override _check for kind specific
342
:param checker: Check object providing context for the checks;
343
can be used to find out what parts of the repository have already
345
:param rev_id: Revision id from which this InventoryEntry was loaded.
346
Not necessarily the last-changed revision for this file.
347
:param inv: Inventory from which the entry was loaded.
348
:param tree: RevisionTree for this entry.
350
if self.parent_id is not None:
351
if not inv.has_id(self.parent_id):
352
raise BzrCheckError('missing parent {%s} in inventory for revision {%s}'
353
% (self.parent_id, rev_id))
354
self._check(checker, rev_id, tree)
356
def _check(self, checker, rev_id, tree):
357
"""Check this inventory entry for kind specific errors."""
358
raise BzrCheckError('unknown entry kind %r in revision {%s}' %
144
other = InventoryEntry(self.file_id, self.name, self.kind,
145
self.parent_id, text_id=self.text_id)
146
other.text_sha1 = self.text_sha1
147
other.text_size = self.text_size
362
"""Clone this inventory entry."""
363
raise NotImplementedError
366
def describe_change(old_entry, new_entry):
367
"""Describe the change between old_entry and this.
369
This smells of being an InterInventoryEntry situation, but as its
370
the first one, we're making it a static method for now.
372
An entry with a different parent, or different name is considered
373
to be renamed. Reparenting is an internal detail.
374
Note that renaming the parent does not trigger a rename for the
377
# TODO: Perhaps return an object rather than just a string
378
if old_entry is new_entry:
379
# also the case of both being None
381
elif old_entry is None:
383
elif new_entry is None:
385
if old_entry.kind != new_entry.kind:
387
text_modified, meta_modified = new_entry.detect_changes(old_entry)
388
if text_modified or meta_modified:
392
# TODO 20060511 (mbp, rbc) factor out 'detect_rename' here.
393
if old_entry.parent_id != new_entry.parent_id:
395
elif old_entry.name != new_entry.name:
399
if renamed and not modified:
400
return InventoryEntry.RENAMED
401
if modified and not renamed:
403
if modified and renamed:
404
return InventoryEntry.MODIFIED_AND_RENAMED
151
407
def __repr__(self):
152
return ("%s(%r, %r, kind=%r, parent_id=%r)"
408
return ("%s(%r, %r, parent_id=%r, revision=%r)"
153
409
% (self.__class__.__name__,
160
def to_element(self):
161
"""Convert to XML element"""
164
e.set('name', self.name)
165
e.set('file_id', self.file_id)
166
e.set('kind', self.kind)
168
if self.text_size != None:
169
e.set('text_size', '%d' % self.text_size)
171
for f in ['text_id', 'text_sha1']:
176
# to be conservative, we don't externalize the root pointers
177
# for now, leaving them as null in the xml form. in a future
178
# version it will be implied by nested elements.
179
if self.parent_id != ROOT_ID:
180
assert isinstance(self.parent_id, basestring)
181
e.set('parent_id', self.parent_id)
188
def from_element(cls, elt):
189
assert elt.tag == 'entry'
191
## original format inventories don't have a parent_id for
192
## nodes in the root directory, but it's cleaner to use one
194
parent_id = elt.get('parent_id')
195
if parent_id == None:
198
self = cls(elt.get('file_id'), elt.get('name'), elt.get('kind'), parent_id)
199
self.text_id = elt.get('text_id')
200
self.text_sha1 = elt.get('text_sha1')
202
## mutter("read inventoryentry: %r" % (elt.attrib))
204
v = elt.get('text_size')
205
self.text_size = v and int(v)
210
from_element = classmethod(from_element)
212
def __cmp__(self, other):
415
def snapshot(self, revision, path, previous_entries,
416
work_tree, commit_builder):
417
"""Make a snapshot of this entry which may or may not have changed.
419
This means that all its fields are populated, that it has its
420
text stored in the text store or weave.
422
# mutter('new parents of %s are %r', path, previous_entries)
423
self._read_tree_state(path, work_tree)
424
# TODO: Where should we determine whether to reuse a
425
# previous revision id or create a new revision? 20060606
426
if len(previous_entries) == 1:
427
# cannot be unchanged unless there is only one parent file rev.
428
parent_ie = previous_entries.values()[0]
429
if self._unchanged(parent_ie):
430
# mutter("found unchanged entry")
431
self.revision = parent_ie.revision
433
return self._snapshot_into_revision(revision, previous_entries,
434
work_tree, commit_builder)
436
def _snapshot_into_revision(self, revision, previous_entries, work_tree,
438
"""Record this revision unconditionally into a store.
440
The entry's last-changed revision property (`revision`) is updated to
441
that of the new revision.
443
:param revision: id of the new revision that is being recorded.
445
:returns: String description of the commit (e.g. "merged", "modified"), etc.
447
# mutter('new revision {%s} for {%s}', revision, self.file_id)
448
self.revision = revision
449
self._snapshot_text(previous_entries, work_tree, commit_builder)
451
def _snapshot_text(self, file_parents, work_tree, commit_builder):
452
"""Record the 'text' of this entry, whatever form that takes.
454
This default implementation simply adds an empty text.
456
raise NotImplementedError(self._snapshot_text)
458
def __eq__(self, other):
215
459
if not isinstance(other, InventoryEntry):
216
460
return NotImplemented
218
return cmp(self.file_id, other.file_id) \
219
or cmp(self.name, other.name) \
220
or cmp(self.text_sha1, other.text_sha1) \
221
or cmp(self.text_size, other.text_size) \
222
or cmp(self.text_id, other.text_id) \
223
or cmp(self.parent_id, other.parent_id) \
224
or cmp(self.kind, other.kind)
462
return ((self.file_id == other.file_id)
463
and (self.name == other.name)
464
and (other.symlink_target == self.symlink_target)
465
and (self.text_sha1 == other.text_sha1)
466
and (self.text_size == other.text_size)
467
and (self.text_id == other.text_id)
468
and (self.parent_id == other.parent_id)
469
and (self.kind == other.kind)
470
and (self.revision == other.revision)
471
and (self.executable == other.executable)
474
def __ne__(self, other):
475
return not (self == other)
478
raise ValueError('not hashable')
480
def _unchanged(self, previous_ie):
481
"""Has this entry changed relative to previous_ie.
483
This method should be overridden in child classes.
486
# different inv parent
487
if previous_ie.parent_id != self.parent_id:
490
elif previous_ie.name != self.name:
494
def _read_tree_state(self, path, work_tree):
495
"""Populate fields in the inventory entry from the given tree.
497
Note that this should be modified to be a noop on virtual trees
498
as all entries created there are prepopulated.
500
# TODO: Rather than running this manually, we should check the
501
# working sha1 and other expensive properties when they're
502
# first requested, or preload them if they're already known
503
pass # nothing to do by default
505
def _forget_tree_state(self):
228
509
class RootEntry(InventoryEntry):
511
__slots__ = ['text_sha1', 'text_size', 'file_id', 'name', 'kind',
512
'text_id', 'parent_id', 'children', 'executable',
513
'revision', 'symlink_target']
515
def _check(self, checker, rev_id, tree):
516
"""See InventoryEntry._check"""
229
518
def __init__(self, file_id):
230
519
self.file_id = file_id
231
520
self.children = {}
232
self.kind = 'root_directory'
521
self.kind = 'directory'
233
522
self.parent_id = None
525
symbol_versioning.warn('RootEntry is deprecated as of bzr 0.10.'
526
' Please use InventoryDirectory instead.',
527
DeprecationWarning, stacklevel=2)
236
def __cmp__(self, other):
529
def __eq__(self, other):
239
530
if not isinstance(other, RootEntry):
240
531
return NotImplemented
241
return cmp(self.file_id, other.file_id) \
242
or cmp(self.children, other.children)
246
class Inventory(XMLMixin):
533
return (self.file_id == other.file_id) \
534
and (self.children == other.children)
537
class InventoryDirectory(InventoryEntry):
538
"""A directory in an inventory."""
540
__slots__ = ['text_sha1', 'text_size', 'file_id', 'name', 'kind',
541
'text_id', 'parent_id', 'children', 'executable',
542
'revision', 'symlink_target']
544
def _check(self, checker, rev_id, tree):
545
"""See InventoryEntry._check"""
546
if self.text_sha1 is not None or self.text_size is not None or self.text_id is not None:
547
raise BzrCheckError('directory {%s} has text in revision {%s}'
548
% (self.file_id, rev_id))
551
other = InventoryDirectory(self.file_id, self.name, self.parent_id)
552
other.revision = self.revision
553
# note that children are *not* copied; they're pulled across when
557
def __init__(self, file_id, name, parent_id):
558
super(InventoryDirectory, self).__init__(file_id, name, parent_id)
560
self.kind = 'directory'
562
def kind_character(self):
563
"""See InventoryEntry.kind_character."""
566
def _put_in_tar(self, item, tree):
567
"""See InventoryEntry._put_in_tar."""
568
item.type = tarfile.DIRTYPE
575
def _put_on_disk(self, fullpath, tree):
576
"""See InventoryEntry._put_on_disk."""
579
def _snapshot_text(self, file_parents, work_tree, commit_builder):
580
"""See InventoryEntry._snapshot_text."""
581
commit_builder.modified_directory(self.file_id, file_parents)
584
class InventoryFile(InventoryEntry):
585
"""A file in an inventory."""
587
__slots__ = ['text_sha1', 'text_size', 'file_id', 'name', 'kind',
588
'text_id', 'parent_id', 'children', 'executable',
589
'revision', 'symlink_target']
591
def _check(self, checker, tree_revision_id, tree):
592
"""See InventoryEntry._check"""
593
t = (self.file_id, self.revision)
594
if t in checker.checked_texts:
595
prev_sha = checker.checked_texts[t]
596
if prev_sha != self.text_sha1:
597
raise BzrCheckError('mismatched sha1 on {%s} in {%s}' %
598
(self.file_id, tree_revision_id))
600
checker.repeated_text_cnt += 1
603
if self.file_id not in checker.checked_weaves:
604
mutter('check weave {%s}', self.file_id)
605
w = tree.get_weave(self.file_id)
606
# Not passing a progress bar, because it creates a new
607
# progress, which overwrites the current progress,
608
# and doesn't look nice
610
checker.checked_weaves[self.file_id] = True
612
w = tree.get_weave(self.file_id)
614
mutter('check version {%s} of {%s}', tree_revision_id, self.file_id)
615
checker.checked_text_cnt += 1
616
# We can't check the length, because Weave doesn't store that
617
# information, and the whole point of looking at the weave's
618
# sha1sum is that we don't have to extract the text.
619
if self.text_sha1 != w.get_sha1(self.revision):
620
raise BzrCheckError('text {%s} version {%s} wrong sha1'
621
% (self.file_id, self.revision))
622
checker.checked_texts[t] = self.text_sha1
625
other = InventoryFile(self.file_id, self.name, self.parent_id)
626
other.executable = self.executable
627
other.text_id = self.text_id
628
other.text_sha1 = self.text_sha1
629
other.text_size = self.text_size
630
other.revision = self.revision
633
def detect_changes(self, old_entry):
634
"""See InventoryEntry.detect_changes."""
635
assert self.text_sha1 is not None
636
assert old_entry.text_sha1 is not None
637
text_modified = (self.text_sha1 != old_entry.text_sha1)
638
meta_modified = (self.executable != old_entry.executable)
639
return text_modified, meta_modified
641
def _diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree,
642
output_to, reverse=False):
643
"""See InventoryEntry._diff."""
645
from_text = tree.get_file(self.file_id).readlines()
647
to_text = to_tree.get_file(to_entry.file_id).readlines()
651
text_diff(from_label, from_text,
652
to_label, to_text, output_to)
654
text_diff(to_label, to_text,
655
from_label, from_text, output_to)
656
except errors.BinaryFile:
658
label_pair = (to_label, from_label)
660
label_pair = (from_label, to_label)
661
print >> output_to, "Binary files %s and %s differ" % label_pair
664
"""See InventoryEntry.has_text."""
667
def __init__(self, file_id, name, parent_id):
668
super(InventoryFile, self).__init__(file_id, name, parent_id)
671
def kind_character(self):
672
"""See InventoryEntry.kind_character."""
675
def _put_in_tar(self, item, tree):
676
"""See InventoryEntry._put_in_tar."""
677
item.type = tarfile.REGTYPE
678
fileobj = tree.get_file(self.file_id)
679
item.size = self.text_size
680
if tree.is_executable(self.file_id):
686
def _put_on_disk(self, fullpath, tree):
687
"""See InventoryEntry._put_on_disk."""
688
osutils.pumpfile(tree.get_file(self.file_id), file(fullpath, 'wb'))
689
if tree.is_executable(self.file_id):
690
os.chmod(fullpath, 0755)
692
def _read_tree_state(self, path, work_tree):
693
"""See InventoryEntry._read_tree_state."""
694
self.text_sha1 = work_tree.get_file_sha1(self.file_id, path=path)
695
# FIXME: 20050930 probe for the text size when getting sha1
696
# in _read_tree_state
697
self.executable = work_tree.is_executable(self.file_id, path=path)
700
return ("%s(%r, %r, parent_id=%r, sha1=%r, len=%s)"
701
% (self.__class__.__name__,
708
def _forget_tree_state(self):
709
self.text_sha1 = None
711
def _snapshot_text(self, file_parents, work_tree, commit_builder):
712
"""See InventoryEntry._snapshot_text."""
713
def get_content_byte_lines():
714
return work_tree.get_file(self.file_id).readlines()
715
self.text_sha1, self.text_size = commit_builder.modified_file_text(
716
self.file_id, file_parents, get_content_byte_lines, self.text_sha1, self.text_size)
718
def _unchanged(self, previous_ie):
719
"""See InventoryEntry._unchanged."""
720
compatible = super(InventoryFile, self)._unchanged(previous_ie)
721
if self.text_sha1 != previous_ie.text_sha1:
724
# FIXME: 20050930 probe for the text size when getting sha1
725
# in _read_tree_state
726
self.text_size = previous_ie.text_size
727
if self.executable != previous_ie.executable:
732
class InventoryLink(InventoryEntry):
733
"""A file in an inventory."""
735
__slots__ = ['text_sha1', 'text_size', 'file_id', 'name', 'kind',
736
'text_id', 'parent_id', 'children', 'executable',
737
'revision', 'symlink_target']
739
def _check(self, checker, rev_id, tree):
740
"""See InventoryEntry._check"""
741
if self.text_sha1 is not None or self.text_size is not None or self.text_id is not None:
742
raise BzrCheckError('symlink {%s} has text in revision {%s}'
743
% (self.file_id, rev_id))
744
if self.symlink_target is None:
745
raise BzrCheckError('symlink {%s} has no target in revision {%s}'
746
% (self.file_id, rev_id))
749
other = InventoryLink(self.file_id, self.name, self.parent_id)
750
other.symlink_target = self.symlink_target
751
other.revision = self.revision
754
def detect_changes(self, old_entry):
755
"""See InventoryEntry.detect_changes."""
756
# FIXME: which _modified field should we use ? RBC 20051003
757
text_modified = (self.symlink_target != old_entry.symlink_target)
759
mutter(" symlink target changed")
760
meta_modified = False
761
return text_modified, meta_modified
763
def _diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree,
764
output_to, reverse=False):
765
"""See InventoryEntry._diff."""
766
from_text = self.symlink_target
767
if to_entry is not None:
768
to_text = to_entry.symlink_target
773
print >>output_to, '=== target changed %r => %r' % (from_text, to_text)
776
print >>output_to, '=== target was %r' % self.symlink_target
778
print >>output_to, '=== target is %r' % self.symlink_target
780
def __init__(self, file_id, name, parent_id):
781
super(InventoryLink, self).__init__(file_id, name, parent_id)
782
self.kind = 'symlink'
784
def kind_character(self):
785
"""See InventoryEntry.kind_character."""
788
def _put_in_tar(self, item, tree):
789
"""See InventoryEntry._put_in_tar."""
790
item.type = tarfile.SYMTYPE
794
item.linkname = self.symlink_target
797
def _put_on_disk(self, fullpath, tree):
798
"""See InventoryEntry._put_on_disk."""
800
os.symlink(self.symlink_target, fullpath)
802
raise BzrError("Failed to create symlink %r -> %r, error: %s" % (fullpath, self.symlink_target, e))
804
def _read_tree_state(self, path, work_tree):
805
"""See InventoryEntry._read_tree_state."""
806
self.symlink_target = work_tree.get_symlink_target(self.file_id)
808
def _forget_tree_state(self):
809
self.symlink_target = None
811
def _unchanged(self, previous_ie):
812
"""See InventoryEntry._unchanged."""
813
compatible = super(InventoryLink, self)._unchanged(previous_ie)
814
if self.symlink_target != previous_ie.symlink_target:
818
def _snapshot_text(self, file_parents, work_tree, commit_builder):
819
"""See InventoryEntry._snapshot_text."""
820
commit_builder.modified_link(
821
self.file_id, file_parents, self.symlink_target)
824
class TreeReference(InventoryEntry):
826
kind = 'tree-reference'
828
def __init__(self, file_id, name, parent_id, revision=None,
829
reference_revision=None):
830
InventoryEntry.__init__(self, file_id, name, parent_id)
831
self.revision = revision
832
self.reference_revision = reference_revision
835
return TreeReference(self.file_id, self.name, self.parent_id,
836
self.revision, self.reference_revision)
838
def _snapshot_text(self, file_parents, work_tree, commit_builder):
839
commit_builder.modified_reference(self.file_id, file_parents)
841
def _read_tree_state(self, path, work_tree):
842
"""Populate fields in the inventory entry from the given tree.
844
self.reference_revision = work_tree.get_reference_revision(self, path)
846
def _forget_tree_state(self):
847
self.reference_revision = None
850
class Inventory(object):
247
851
"""Inventory of versioned files in a tree.
249
853
This describes which file_id is present at each point in the tree,
296
898
The inventory is created with a default root directory, with
299
self.root = RootEntry(ROOT_ID)
901
if root_id is not None:
902
assert root_id.__class__ == str
903
self._set_root(InventoryDirectory(root_id, u'', None))
907
self.revision_id = revision_id
909
def _set_root(self, ie):
300
911
self._byid = {self.root.file_id: self.root}
914
# TODO: jam 20051218 Should copy also copy the revision_id?
915
entries = self.iter_entries()
916
other = Inventory(entries.next()[1].file_id)
917
# copy recursively so we know directories will be added before
918
# their children. There are more efficient ways than this...
919
for path, entry in entries():
920
other.add(entry.copy())
303
923
def __iter__(self):
304
924
return iter(self._byid)
307
926
def __len__(self):
308
927
"""Returns number of entries."""
309
928
return len(self._byid)
312
930
def iter_entries(self, from_dir=None):
313
931
"""Return (path, entry) pairs, in order by name."""
317
elif isinstance(from_dir, basestring):
318
from_dir = self._byid[from_dir]
320
kids = from_dir.children.items()
322
for name, ie in kids:
324
if ie.kind == 'directory':
325
for cn, cie in self.iter_entries(from_dir=ie.file_id):
326
yield os.path.join(name, cn), cie
933
if self.root is None:
937
elif isinstance(from_dir, basestring):
938
from_dir = self._byid[from_dir]
940
# unrolling the recursive called changed the time from
941
# 440ms/663ms (inline/total) to 116ms/116ms
942
children = from_dir.children.items()
944
children = collections.deque(children)
945
stack = [(u'', children)]
947
from_dir_relpath, children = stack[-1]
950
name, ie = children.popleft()
952
# we know that from_dir_relpath never ends in a slash
953
# and 'f' doesn't begin with one, we can do a string op, rather
954
# than the checks of pathjoin(), though this means that all paths
956
path = from_dir_relpath + '/' + name
960
if ie.kind != 'directory':
963
# But do this child first
964
new_children = ie.children.items()
966
new_children = collections.deque(new_children)
967
stack.append((path, new_children))
968
# Break out of inner loop, so that we start outer loop with child
971
# if we finished all children, pop it off the stack
974
def iter_entries_by_dir(self, from_dir=None, specific_file_ids=None):
975
"""Iterate over the entries in a directory first order.
977
This returns all entries for a directory before returning
978
the entries for children of a directory. This is not
979
lexicographically sorted order, and is a hybrid between
980
depth-first and breadth-first.
982
:return: This yields (path, entry) pairs
984
if specific_file_ids:
985
safe = osutils.safe_file_id
986
specific_file_ids = set(safe(fid) for fid in specific_file_ids)
987
# TODO? Perhaps this should return the from_dir so that the root is
988
# yielded? or maybe an option?
990
if self.root is None:
992
# Optimize a common case
993
if specific_file_ids is not None and len(specific_file_ids) == 1:
994
file_id = list(specific_file_ids)[0]
996
yield self.id2path(file_id), self[file_id]
999
if (specific_file_ids is None or
1000
self.root.file_id in specific_file_ids):
1001
yield u'', self.root
1002
elif isinstance(from_dir, basestring):
1003
from_dir = self._byid[from_dir]
1005
if specific_file_ids is not None:
1007
def add_ancestors(file_id):
1008
if file_id not in self:
1010
parent_id = self[file_id].parent_id
1011
if parent_id is None:
1013
if parent_id not in parents:
1014
parents.add(parent_id)
1015
add_ancestors(parent_id)
1016
for file_id in specific_file_ids:
1017
add_ancestors(file_id)
1021
stack = [(u'', from_dir)]
1023
cur_relpath, cur_dir = stack.pop()
1026
for child_name, child_ie in sorted(cur_dir.children.iteritems()):
1028
child_relpath = cur_relpath + child_name
1030
if (specific_file_ids is None or
1031
child_ie.file_id in specific_file_ids):
1032
yield child_relpath, child_ie
1034
if child_ie.kind == 'directory':
1035
if parents is None or child_ie.file_id in parents:
1036
child_dirs.append((child_relpath+'/', child_ie))
1037
stack.extend(reversed(child_dirs))
1040
"""Return list of (path, ie) for all entries except the root.
1042
This may be faster than iter_entries.
1045
def descend(dir_ie, dir_path):
1046
kids = dir_ie.children.items()
1048
for name, ie in kids:
1049
child_path = osutils.pathjoin(dir_path, name)
1050
accum.append((child_path, ie))
1051
if ie.kind == 'directory':
1052
descend(ie, child_path)
1054
descend(self.root, u'')
330
1057
def directories(self):
331
"""Return (path, entry) pairs for all directories.
1058
"""Return (path, entry) pairs for all directories, including the root.
333
def descend(parent_ie):
334
parent_name = parent_ie.name
335
yield parent_name, parent_ie
337
# directory children in sorted order
339
for ie in parent_ie.children.itervalues():
340
if ie.kind == 'directory':
341
dn.append((ie.name, ie))
1061
def descend(parent_ie, parent_path):
1062
accum.append((parent_path, parent_ie))
344
for name, child_ie in dn:
345
for sub_name, sub_ie in descend(child_ie):
346
yield appendpath(parent_name, sub_name), sub_ie
1064
kids = [(ie.name, ie) for ie in parent_ie.children.itervalues() if ie.kind == 'directory']
348
for name, ie in descend(self.root):
1067
for name, child_ie in kids:
1068
child_path = osutils.pathjoin(parent_path, name)
1069
descend(child_ie, child_path)
1070
descend(self.root, u'')
353
1073
def __contains__(self, file_id):
354
1074
"""True if this entry contains a file with given id.
356
1076
>>> inv = Inventory()
357
>>> inv.add(InventoryEntry('123', 'foo.c', 'file', ROOT_ID))
1077
>>> inv.add(InventoryFile('123', 'foo.c', ROOT_ID))
1078
InventoryFile('123', 'foo.c', parent_id='TREE_ROOT', sha1=None, len=None)
358
1079
>>> '123' in inv
360
1081
>>> '456' in inv
363
return file_id in self._byid
1084
file_id = osutils.safe_file_id(file_id)
1085
return (file_id in self._byid)
366
1087
def __getitem__(self, file_id):
367
1088
"""Return the entry for given file_id.
369
1090
>>> inv = Inventory()
370
>>> inv.add(InventoryEntry('123123', 'hello.c', 'file', ROOT_ID))
1091
>>> inv.add(InventoryFile('123123', 'hello.c', ROOT_ID))
1092
InventoryFile('123123', 'hello.c', parent_id='TREE_ROOT', sha1=None, len=None)
371
1093
>>> inv['123123'].name
1096
file_id = osutils.safe_file_id(file_id)
375
1098
return self._byid[file_id]
376
1099
except KeyError:
378
raise BzrError("can't look up file_id None")
380
raise BzrError("file_id {%s} not in inventory" % file_id)
1100
# really we're passing an inventory, not a tree...
1101
raise errors.NoSuchId(self, file_id)
1103
def get_file_kind(self, file_id):
1104
file_id = osutils.safe_file_id(file_id)
1105
return self._byid[file_id].kind
383
1107
def get_child(self, parent_id, filename):
1108
parent_id = osutils.safe_file_id(parent_id)
384
1109
return self[parent_id].children.get(filename)
1111
def _add_child(self, entry):
1112
"""Add an entry to the inventory, without adding it to its parent"""
1113
if entry.file_id in self._byid:
1114
raise BzrError("inventory already contains entry with id {%s}" %
1116
self._byid[entry.file_id] = entry
1117
for child in getattr(entry, 'children', {}).itervalues():
1118
self._add_child(child)
387
1121
def add(self, entry):
388
1122
"""Add entry to inventory.
390
1124
To add a file to a branch ready to be committed, use Branch.add,
1127
Returns the new entry object.
392
1129
if entry.file_id in self._byid:
393
bailout("inventory already contains entry with id {%s}" % entry.file_id)
396
parent = self._byid[entry.parent_id]
398
bailout("parent_id {%s} not in inventory" % entry.parent_id)
400
if parent.children.has_key(entry.name):
401
bailout("%s is already versioned" %
402
appendpath(self.id2path(parent.file_id), entry.name))
404
self._byid[entry.file_id] = entry
405
parent.children[entry.name] = entry
408
def add_path(self, relpath, kind, file_id=None):
1130
raise errors.DuplicateFileId(entry.file_id,
1131
self._byid[entry.file_id])
1133
if entry.parent_id is None:
1134
assert self.root is None and len(self._byid) == 0
1138
parent = self._byid[entry.parent_id]
1140
raise BzrError("parent_id {%s} not in inventory" %
1143
if entry.name in parent.children:
1144
raise BzrError("%s is already versioned" %
1145
osutils.pathjoin(self.id2path(parent.file_id),
1147
parent.children[entry.name] = entry
1148
return self._add_child(entry)
1150
def add_path(self, relpath, kind, file_id=None, parent_id=None):
409
1151
"""Add entry from a path.
411
The immediate parent must already be versioned"""
412
parts = bzrlib.osutils.splitpath(relpath)
1153
The immediate parent must already be versioned.
1155
Returns the new entry object."""
1157
parts = osutils.splitpath(relpath)
413
1159
if len(parts) == 0:
414
bailout("cannot re-add root of inventory")
417
file_id = bzrlib.branch.gen_file_id(relpath)
419
parent_id = self.path2id(parts[:-1])
420
assert parent_id != None
421
ie = InventoryEntry(file_id, parts[-1],
422
kind=kind, parent_id=parent_id)
1161
file_id = generate_ids.gen_root_id()
1163
file_id = osutils.safe_file_id(file_id)
1164
self.root = InventoryDirectory(file_id, '', None)
1165
self._byid = {self.root.file_id: self.root}
1168
parent_path = parts[:-1]
1169
parent_id = self.path2id(parent_path)
1170
if parent_id is None:
1171
raise errors.NotVersionedError(path=parent_path)
1172
ie = make_entry(kind, parts[-1], parent_id, file_id)
423
1173
return self.add(ie)
426
1175
def __delitem__(self, file_id):
427
1176
"""Remove entry by id.
429
1178
>>> inv = Inventory()
430
>>> inv.add(InventoryEntry('123', 'foo.c', 'file', ROOT_ID))
1179
>>> inv.add(InventoryFile('123', 'foo.c', ROOT_ID))
1180
InventoryFile('123', 'foo.c', parent_id='TREE_ROOT', sha1=None, len=None)
431
1181
>>> '123' in inv
433
1183
>>> del inv['123']
434
1184
>>> '123' in inv
1187
file_id = osutils.safe_file_id(file_id)
437
1188
ie = self[file_id]
439
assert self[ie.parent_id].children[ie.name] == ie
1190
assert ie.parent_id is None or \
1191
self[ie.parent_id].children[ie.name] == ie
441
# TODO: Test deleting all children; maybe hoist to a separate
443
if ie.kind == 'directory':
444
for cie in ie.children.values():
445
del self[cie.file_id]
448
1193
del self._byid[file_id]
449
del self[ie.parent_id].children[ie.name]
453
return Set(self._byid)
456
def to_element(self):
457
"""Convert to XML Element"""
458
e = Element('inventory')
460
for path, ie in self.iter_entries():
461
e.append(ie.to_element())
465
def from_element(cls, elt):
466
"""Construct from XML Element
468
>>> inv = Inventory()
469
>>> inv.add(InventoryEntry('foo.c-123981239', 'foo.c', 'file', ROOT_ID))
470
>>> elt = inv.to_element()
471
>>> inv2 = Inventory.from_element(elt)
475
assert elt.tag == 'inventory'
478
o.add(InventoryEntry.from_element(e))
481
from_element = classmethod(from_element)
484
def __cmp__(self, other):
1194
if ie.parent_id is not None:
1195
del self[ie.parent_id].children[ie.name]
1197
def __eq__(self, other):
485
1198
"""Compare two sets by comparing their contents.
487
1200
>>> i1 = Inventory()
488
1201
>>> i2 = Inventory()
491
>>> i1.add(InventoryEntry('123', 'foo', 'file', ROOT_ID))
1204
>>> i1.add(InventoryFile('123', 'foo', ROOT_ID))
1205
InventoryFile('123', 'foo', parent_id='TREE_ROOT', sha1=None, len=None)
494
>>> i2.add(InventoryEntry('123', 'foo', 'file', ROOT_ID))
1208
>>> i2.add(InventoryFile('123', 'foo', ROOT_ID))
1209
InventoryFile('123', 'foo', parent_id='TREE_ROOT', sha1=None, len=None)
501
1213
if not isinstance(other, Inventory):
502
1214
return NotImplemented
504
if self.id_set() ^ other.id_set():
507
for file_id in self._byid:
508
c = cmp(self[file_id], other[file_id])
1216
return self._byid == other._byid
1218
def __ne__(self, other):
1219
return not self.__eq__(other)
1222
raise ValueError('not hashable')
1224
def _iter_file_id_parents(self, file_id):
1225
"""Yield the parents of file_id up to the root."""
1226
file_id = osutils.safe_file_id(file_id)
1227
while file_id is not None:
1229
ie = self._byid[file_id]
1231
raise errors.NoSuchId(tree=None, file_id=file_id)
1233
file_id = ie.parent_id
514
1235
def get_idpath(self, file_id):
515
1236
"""Return a list of file_ids for the path to an entry.
added
removed
bzrlib/inventory.py
