« back to all changes in this revision
Viewing changes to bzrlib/inventory.py
- browse files at revision 444
- compare with another revision
- download diff
- download tarball
- view history from revision 444
- Committer: Martin Pool
- Date: 2005-05-10 08:22:18 UTC
- Revision ID: mbp@sourcefrog.net-20050510082218-cb22b6d981315883
- cope on platforms with no urandom feature
including win32 python2.3
including win32 python2.3
- files added:
- bzrlib/mdiff.py
- files removed:
- BRANCH.TODO
- bzrlib/export
- bzrlib/plugins
- bzrlib/store
- bzrlib/tests
- bzrlib/tests/blackbox
- bzrlib/transport
- bzrlib/ui
- bzrlib/util
- bzrlib/util/configobj
- bzrlib/util/configobj/docs
- bzrlib/util/effbot
- bzrlib/util/effbot/org
- contrib/emacs
- patches
- tools
- files renamed:
- contrib/newinventory.py => bzrlib/newinventory.py
- bzrlib/store/__init__.py => bzrlib/store.py
- contrib/bash/bzr.simple => contrib/bash/bzr
- bzrlib/util/elementtree/ => elementtree/
- bzrlib/util/urlgrabber/ => urlgrabber/
- files modified:
- .bzrignore
- bzr *
- setup.py *
added
removed
bzrlib/inventory.py
1
1
# (C) 2005 Canonical Ltd
2
#
2
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.
7
#
7
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.
12
#
12
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
16
16
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.
21
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.
25
17
26
18
# This should really be an id randomly assigned when the tree is
27
19
# created, but it's not for now.
28
20
ROOT_ID = "TREE_ROOT"
29
21
30
22
31
import os.path
32
import re
33
import sys
34
import tarfile
35
import types
23
import sys, os.path, types, re
24
from sets import Set
25
26
try:
27
from cElementTree import Element, ElementTree, SubElement
28
except ImportError:
29
from elementtree.ElementTree import Element, ElementTree, SubElement
30
31
from xml import XMLMixin
32
from errors import bailout, BzrError, BzrCheckError
36
33
37
34
import bzrlib
38
from bzrlib.osutils import (pumpfile, quotefn, splitpath, joinpath,
39
pathjoin, sha_strings)
35
from bzrlib.osutils import uuid, quotefn, splitpath, joinpath, appendpath
40
36
from bzrlib.trace import mutter
41
from bzrlib.errors import (NotVersionedError, InvalidEntryName,
42
BzrError, BzrCheckError)
43
44
45
class InventoryEntry(object):
37
38
class InventoryEntry(XMLMixin):
46
39
"""Description of a versioned file.
47
40
48
41
An InventoryEntry has the following fields, which are also
49
42
present in the XML inventory-entry element:
50
43
51
file_id
52
53
name
54
(within the parent directory)
55
56
parent_id
57
file_id of the parent directory, or ROOT_ID
58
59
revision
60
the revision_id in which this variation of this file was
61
introduced.
62
63
executable
64
Indicates that this file should be executable on systems
65
that support it.
66
67
text_sha1
68
sha-1 of the text of the file
69
70
text_size
71
size in bytes of the text of the file
72
73
(reading a version 4 tree created a text_id field.)
44
* *file_id*
45
* *name*: (only the basename within the directory, must not
46
contain slashes)
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
52
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.
57
74
58
75
59
>>> i = Inventory()
76
60
>>> i.path2id('')
77
61
'TREE_ROOT'
78
>>> i.add(InventoryDirectory('123', 'src', ROOT_ID))
79
InventoryDirectory('123', 'src', parent_id='TREE_ROOT')
80
>>> i.add(InventoryFile('2323', 'hello.c', parent_id='123'))
81
InventoryFile('2323', 'hello.c', parent_id='123')
82
>>> shouldbe = {0: 'src', 1: pathjoin('src','hello.c')}
83
>>> for ix, j in enumerate(i.iter_entries()):
84
... print (j[0] == shouldbe[ix], j[1])
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():
65
... print j
85
66
...
86
(True, InventoryDirectory('123', 'src', parent_id='TREE_ROOT'))
87
(True, InventoryFile('2323', 'hello.c', parent_id='123'))
88
>>> i.add(InventoryFile('2323', 'bye.c', '123'))
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'))
89
70
Traceback (most recent call last):
90
71
...
91
BzrError: inventory already contains entry with id {2323}
92
>>> i.add(InventoryFile('2324', 'bye.c', '123'))
93
InventoryFile('2324', 'bye.c', parent_id='123')
94
>>> i.add(InventoryDirectory('2325', 'wibble', '123'))
95
InventoryDirectory('2325', 'wibble', parent_id='123')
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'))
96
75
>>> i.path2id('src/wibble')
97
76
'2325'
98
77
>>> '2325' in i
99
78
True
100
>>> i.add(InventoryFile('2326', 'wibble.c', '2325'))
101
InventoryFile('2326', 'wibble.c', parent_id='2325')
79
>>> i.add(InventoryEntry('2326', 'wibble.c', 'file', '2325'))
102
80
>>> i['2326']
103
InventoryFile('2326', 'wibble.c', parent_id='2325')
104
>>> for path, entry in i.iter_entries():
105
... print path
106
... assert i.path2id(path)
81
InventoryEntry('2326', 'wibble.c', kind='file', parent_id='2325')
82
>>> for j in i.iter_entries():
83
... print j[0]
84
... assert i.path2id(j[0])
107
85
...
108
86
src
109
87
src/bye.c
112
90
src/wibble/wibble.c
113
91
>>> i.id2path('2326')
114
92
'src/wibble/wibble.c'
93
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.
115
97
"""
98
99
# TODO: split InventoryEntry into subclasses for files,
100
# directories, etc etc.
101
102
text_sha1 = None
103
text_size = None
116
104
117
__slots__ = ['text_sha1', 'text_size', 'file_id', 'name', 'kind',
118
'text_id', 'parent_id', 'children', 'executable',
119
'revision']
120
121
def _add_text_to_weave(self, new_lines, parents, weave_store, transaction):
122
weave_store.add_text(self.file_id, self.revision, new_lines, parents,
123
transaction)
124
125
def detect_changes(self, old_entry):
126
"""Return a (text_modified, meta_modified) from this to old_entry.
127
128
_read_tree_state must have been called on self and old_entry prior to
129
calling detect_changes.
130
"""
131
return False, False
132
133
def diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree,
134
output_to, reverse=False):
135
"""Perform a diff from this to to_entry.
136
137
text_diff will be used for textual difference calculation.
138
This is a template method, override _diff in child classes.
139
"""
140
self._read_tree_state(tree.id2path(self.file_id), tree)
141
if to_entry:
142
# cannot diff from one kind to another - you must do a removal
143
# and an addif they do not match.
144
assert self.kind == to_entry.kind
145
to_entry._read_tree_state(to_tree.id2path(to_entry.file_id),
146
to_tree)
147
self._diff(text_diff, from_label, tree, to_label, to_entry, to_tree,
148
output_to, reverse)
149
150
def _diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree,
151
output_to, reverse=False):
152
"""Perform a diff between two entries of the same kind."""
153
154
def find_previous_heads(self, previous_inventories, entry_weave):
155
"""Return the revisions and entries that directly preceed this.
156
157
Returned as a map from revision to inventory entry.
158
159
This is a map containing the file revisions in all parents
160
for which the file exists, and its revision is not a parent of
161
any other. If the file is new, the set will be empty.
162
"""
163
def get_ancestors(weave, entry):
164
return set(map(weave.idx_to_name,
165
weave.inclusions([weave.lookup(entry.revision)])))
166
heads = {}
167
head_ancestors = {}
168
for inv in previous_inventories:
169
if self.file_id in inv:
170
ie = inv[self.file_id]
171
assert ie.file_id == self.file_id
172
if ie.revision in heads:
173
# fixup logic, there was a bug in revision updates.
174
# with x bit support.
175
try:
176
if heads[ie.revision].executable != ie.executable:
177
heads[ie.revision].executable = False
178
ie.executable = False
179
except AttributeError:
180
pass
181
assert heads[ie.revision] == ie
182
else:
183
# may want to add it.
184
# may already be covered:
185
already_present = 0 != len(
186
[head for head in heads
187
if ie.revision in head_ancestors[head]])
188
if already_present:
189
# an ancestor of a known head.
190
continue
191
# definately a head:
192
ancestors = get_ancestors(entry_weave, ie)
193
# may knock something else out:
194
check_heads = list(heads.keys())
195
for head in check_heads:
196
if head in ancestors:
197
# this head is not really a head
198
heads.pop(head)
199
head_ancestors[ie.revision] = ancestors
200
heads[ie.revision] = ie
201
return heads
202
203
def get_tar_item(self, root, dp, now, tree):
204
"""Get a tarfile item and a file stream for its content."""
205
item = tarfile.TarInfo(pathjoin(root, dp))
206
# TODO: would be cool to actually set it to the timestamp of the
207
# revision it was last changed
208
item.mtime = now
209
fileobj = self._put_in_tar(item, tree)
210
return item, fileobj
211
212
def has_text(self):
213
"""Return true if the object this entry represents has textual data.
214
215
Note that textual data includes binary content.
216
217
Also note that all entries get weave files created for them.
218
This attribute is primarily used when upgrading from old trees that
219
did not have the weave index for all inventory entries.
220
"""
221
return False
222
223
def __init__(self, file_id, name, parent_id, text_id=None):
105
def __init__(self, file_id, name, kind, parent_id, text_id=None):
224
106
"""Create an InventoryEntry
225
107
226
108
The filename must be a single component, relative to the
227
109
parent directory; it cannot be a whole path or relative name.
228
110
229
>>> e = InventoryFile('123', 'hello.c', ROOT_ID)
111
>>> e = InventoryEntry('123', 'hello.c', 'file', ROOT_ID)
230
112
>>> e.name
231
113
'hello.c'
232
114
>>> e.file_id
233
115
'123'
234
>>> e = InventoryFile('123', 'src/hello.c', ROOT_ID)
116
>>> e = InventoryEntry('123', 'src/hello.c', 'file', ROOT_ID)
235
117
Traceback (most recent call last):
236
InvalidEntryName: Invalid entry name: src/hello.c
118
BzrCheckError: InventoryEntry name 'src/hello.c' is invalid
237
119
"""
238
assert isinstance(name, basestring), name
239
120
if '/' in name or '\\' in name:
240
raise InvalidEntryName(name=name)
241
self.executable = False
242
self.revision = None
243
self.text_sha1 = None
244
self.text_size = None
121
raise BzrCheckError('InventoryEntry name %r is invalid' % name)
122
245
123
self.file_id = file_id
246
124
self.name = name
125
self.kind = kind
247
126
self.text_id = text_id
248
127
self.parent_id = parent_id
249
self.symlink_target = None
250
251
def kind_character(self):
252
"""Return a short kind indicator useful for appending to names."""
253
raise BzrError('unknown kind %r' % self.kind)
254
255
known_kinds = ('file', 'directory', 'symlink', 'root_directory')
256
257
def _put_in_tar(self, item, tree):
258
"""populate item for stashing in a tar, and return the content stream.
259
260
If no content is available, return None.
261
"""
262
raise BzrError("don't know how to export {%s} of kind %r" %
263
(self.file_id, self.kind))
264
265
def put_on_disk(self, dest, dp, tree):
266
"""Create a representation of self on disk in the prefix dest.
267
268
This is a template method - implement _put_on_disk in subclasses.
269
"""
270
fullpath = pathjoin(dest, dp)
271
self._put_on_disk(fullpath, tree)
272
mutter(" export {%s} kind %s to %s", self.file_id,
273
self.kind, fullpath)
274
275
def _put_on_disk(self, fullpath, tree):
276
"""Put this entry onto disk at fullpath, from tree tree."""
277
raise BzrError("don't know how to export {%s} of kind %r" % (self.file_id, self.kind))
128
if kind == 'directory':
129
self.children = {}
130
elif kind == 'file':
131
pass
132
else:
133
raise BzrError("unhandled entry kind %r" % kind)
134
135
278
136
279
137
def sorted_children(self):
280
138
l = self.children.items()
281
139
l.sort()
282
140
return l
283
141
284
@staticmethod
285
def versionable_kind(kind):
286
return kind in ('file', 'directory', 'symlink')
287
288
def check(self, checker, rev_id, inv, tree):
289
"""Check this inventory entry is intact.
290
291
This is a template method, override _check for kind specific
292
tests.
293
"""
294
if self.parent_id != None:
295
if not inv.has_id(self.parent_id):
296
raise BzrCheckError('missing parent {%s} in inventory for revision {%s}'
297
% (self.parent_id, rev_id))
298
self._check(checker, rev_id, tree)
299
300
def _check(self, checker, rev_id, tree):
301
"""Check this inventory entry for kind specific errors."""
302
raise BzrCheckError('unknown entry kind %r in revision {%s}' %
303
(self.kind, rev_id))
304
305
142
306
143
def copy(self):
307
"""Clone this inventory entry."""
308
raise NotImplementedError
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
148
return other
309
149
310
def _get_snapshot_change(self, previous_entries):
311
if len(previous_entries) > 1:
312
return 'merged'
313
elif len(previous_entries) == 0:
314
return 'added'
315
else:
316
return 'modified/renamed/reparented'
317
150
318
151
def __repr__(self):
319
return ("%s(%r, %r, parent_id=%r)"
152
return ("%s(%r, %r, kind=%r, parent_id=%r)"
320
153
% (self.__class__.__name__,
321
154
self.file_id,
322
155
self.name,
156
self.kind,
323
157
self.parent_id))
324
158
325
def snapshot(self, revision, path, previous_entries,
326
work_tree, weave_store, transaction):
327
"""Make a snapshot of this entry which may or may not have changed.
328
329
This means that all its fields are populated, that it has its
330
text stored in the text store or weave.
331
"""
332
mutter('new parents of %s are %r', path, previous_entries)
333
self._read_tree_state(path, work_tree)
334
if len(previous_entries) == 1:
335
# cannot be unchanged unless there is only one parent file rev.
336
parent_ie = previous_entries.values()[0]
337
if self._unchanged(parent_ie):
338
mutter("found unchanged entry")
339
self.revision = parent_ie.revision
340
return "unchanged"
341
return self.snapshot_revision(revision, previous_entries,
342
work_tree, weave_store, transaction)
343
344
def snapshot_revision(self, revision, previous_entries, work_tree,
345
weave_store, transaction):
346
"""Record this revision unconditionally."""
347
mutter('new revision for {%s}', self.file_id)
348
self.revision = revision
349
change = self._get_snapshot_change(previous_entries)
350
self._snapshot_text(previous_entries, work_tree, weave_store,
351
transaction)
352
return change
353
354
def _snapshot_text(self, file_parents, work_tree, weave_store, transaction):
355
"""Record the 'text' of this entry, whatever form that takes.
356
357
This default implementation simply adds an empty text.
358
"""
359
mutter('storing file {%s} in revision {%s}',
360
self.file_id, self.revision)
361
self._add_text_to_weave([], file_parents, weave_store, transaction)
362
363
def __eq__(self, other):
159
160
def to_element(self):
161
"""Convert to XML element"""
162
e = Element('entry')
163
164
e.set('name', self.name)
165
e.set('file_id', self.file_id)
166
e.set('kind', self.kind)
167
168
if self.text_size != None:
169
e.set('text_size', '%d' % self.text_size)
170
171
for f in ['text_id', 'text_sha1']:
172
v = getattr(self, f)
173
if v != None:
174
e.set(f, v)
175
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)
182
183
e.tail = '\n'
184
185
return e
186
187
188
def from_element(cls, elt):
189
assert elt.tag == 'entry'
190
191
## original format inventories don't have a parent_id for
192
## nodes in the root directory, but it's cleaner to use one
193
## internally.
194
parent_id = elt.get('parent_id')
195
if parent_id == None:
196
parent_id = ROOT_ID
197
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')
201
202
## mutter("read inventoryentry: %r" % (elt.attrib))
203
204
v = elt.get('text_size')
205
self.text_size = v and int(v)
206
207
return self
208
209
210
from_element = classmethod(from_element)
211
212
def __cmp__(self, other):
213
if self is other:
214
return 0
364
215
if not isinstance(other, InventoryEntry):
365
216
return NotImplemented
366
217
367
return ((self.file_id == other.file_id)
368
and (self.name == other.name)
369
and (other.symlink_target == self.symlink_target)
370
and (self.text_sha1 == other.text_sha1)
371
and (self.text_size == other.text_size)
372
and (self.text_id == other.text_id)
373
and (self.parent_id == other.parent_id)
374
and (self.kind == other.kind)
375
and (self.revision == other.revision)
376
and (self.executable == other.executable)
377
)
378
379
def __ne__(self, other):
380
return not (self == other)
381
382
def __hash__(self):
383
raise ValueError('not hashable')
384
385
def _unchanged(self, previous_ie):
386
"""Has this entry changed relative to previous_ie.
387
388
This method should be overriden in child classes.
389
"""
390
compatible = True
391
# different inv parent
392
if previous_ie.parent_id != self.parent_id:
393
compatible = False
394
# renamed
395
elif previous_ie.name != self.name:
396
compatible = False
397
return compatible
398
399
def _read_tree_state(self, path, work_tree):
400
"""Populate fields in the inventory entry from the given tree.
401
402
Note that this should be modified to be a noop on virtual trees
403
as all entries created there are prepopulated.
404
"""
405
# TODO: Rather than running this manually, we should check the
406
# working sha1 and other expensive properties when they're
407
# first requested, or preload them if they're already known
408
pass # nothing to do by default
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)
225
409
226
410
227
411
228
class RootEntry(InventoryEntry):
412
413
def _check(self, checker, rev_id, tree):
414
"""See InventoryEntry._check"""
415
416
229
def __init__(self, file_id):
417
230
self.file_id = file_id
418
231
self.children = {}
419
232
self.kind = 'root_directory'
420
233
self.parent_id = None
421
self.name = u''
234
self.name = ''
422
235
423
def __eq__(self, other):
236
def __cmp__(self, other):
237
if self is other:
238
return 0
424
239
if not isinstance(other, RootEntry):
425
240
return NotImplemented
426
427
return (self.file_id == other.file_id) \
428
and (self.children == other.children)
429
430
431
class InventoryDirectory(InventoryEntry):
432
"""A directory in an inventory."""
433
434
def _check(self, checker, rev_id, tree):
435
"""See InventoryEntry._check"""
436
if self.text_sha1 != None or self.text_size != None or self.text_id != None:
437
raise BzrCheckError('directory {%s} has text in revision {%s}'
438
% (self.file_id, rev_id))
439
440
def copy(self):
441
other = InventoryDirectory(self.file_id, self.name, self.parent_id)
442
other.revision = self.revision
443
# note that children are *not* copied; they're pulled across when
444
# others are added
445
return other
446
447
def __init__(self, file_id, name, parent_id):
448
super(InventoryDirectory, self).__init__(file_id, name, parent_id)
449
self.children = {}
450
self.kind = 'directory'
451
452
def kind_character(self):
453
"""See InventoryEntry.kind_character."""
454
return '/'
455
456
def _put_in_tar(self, item, tree):
457
"""See InventoryEntry._put_in_tar."""
458
item.type = tarfile.DIRTYPE
459
fileobj = None
460
item.name += '/'
461
item.size = 0
462
item.mode = 0755
463
return fileobj
464
465
def _put_on_disk(self, fullpath, tree):
466
"""See InventoryEntry._put_on_disk."""
467
os.mkdir(fullpath)
468
469
470
class InventoryFile(InventoryEntry):
471
"""A file in an inventory."""
472
473
def _check(self, checker, rev_id, tree):
474
"""See InventoryEntry._check"""
475
revision = self.revision
476
t = (self.file_id, revision)
477
if t in checker.checked_texts:
478
prev_sha = checker.checked_texts[t]
479
if prev_sha != self.text_sha1:
480
raise BzrCheckError('mismatched sha1 on {%s} in {%s}' %
481
(self.file_id, rev_id))
482
else:
483
checker.repeated_text_cnt += 1
484
return
485
486
if self.file_id not in checker.checked_weaves:
487
mutter('check weave {%s}', self.file_id)
488
w = tree.get_weave(self.file_id)
489
# Not passing a progress bar, because it creates a new
490
# progress, which overwrites the current progress,
491
# and doesn't look nice
492
w.check()
493
checker.checked_weaves[self.file_id] = True
494
else:
495
w = tree.get_weave_prelude(self.file_id)
496
497
mutter('check version {%s} of {%s}', rev_id, self.file_id)
498
checker.checked_text_cnt += 1
499
# We can't check the length, because Weave doesn't store that
500
# information, and the whole point of looking at the weave's
501
# sha1sum is that we don't have to extract the text.
502
if self.text_sha1 != w.get_sha1(self.revision):
503
raise BzrCheckError('text {%s} version {%s} wrong sha1'
504
% (self.file_id, self.revision))
505
checker.checked_texts[t] = self.text_sha1
506
507
def copy(self):
508
other = InventoryFile(self.file_id, self.name, self.parent_id)
509
other.executable = self.executable
510
other.text_id = self.text_id
511
other.text_sha1 = self.text_sha1
512
other.text_size = self.text_size
513
other.revision = self.revision
514
return other
515
516
def detect_changes(self, old_entry):
517
"""See InventoryEntry.detect_changes."""
518
assert self.text_sha1 != None
519
assert old_entry.text_sha1 != None
520
text_modified = (self.text_sha1 != old_entry.text_sha1)
521
meta_modified = (self.executable != old_entry.executable)
522
return text_modified, meta_modified
523
524
def _diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree,
525
output_to, reverse=False):
526
"""See InventoryEntry._diff."""
527
from_text = tree.get_file(self.file_id).readlines()
528
if to_entry:
529
to_text = to_tree.get_file(to_entry.file_id).readlines()
530
else:
531
to_text = []
532
if not reverse:
533
text_diff(from_label, from_text,
534
to_label, to_text, output_to)
535
else:
536
text_diff(to_label, to_text,
537
from_label, from_text, output_to)
538
539
def has_text(self):
540
"""See InventoryEntry.has_text."""
541
return True
542
543
def __init__(self, file_id, name, parent_id):
544
super(InventoryFile, self).__init__(file_id, name, parent_id)
545
self.kind = 'file'
546
547
def kind_character(self):
548
"""See InventoryEntry.kind_character."""
549
return ''
550
551
def _put_in_tar(self, item, tree):
552
"""See InventoryEntry._put_in_tar."""
553
item.type = tarfile.REGTYPE
554
fileobj = tree.get_file(self.file_id)
555
item.size = self.text_size
556
if tree.is_executable(self.file_id):
557
item.mode = 0755
558
else:
559
item.mode = 0644
560
return fileobj
561
562
def _put_on_disk(self, fullpath, tree):
563
"""See InventoryEntry._put_on_disk."""
564
pumpfile(tree.get_file(self.file_id), file(fullpath, 'wb'))
565
if tree.is_executable(self.file_id):
566
os.chmod(fullpath, 0755)
567
568
def _read_tree_state(self, path, work_tree):
569
"""See InventoryEntry._read_tree_state."""
570
self.text_sha1 = work_tree.get_file_sha1(self.file_id)
571
self.executable = work_tree.is_executable(self.file_id)
572
573
def _snapshot_text(self, file_parents, work_tree, weave_store, transaction):
574
"""See InventoryEntry._snapshot_text."""
575
mutter('storing file {%s} in revision {%s}',
576
self.file_id, self.revision)
577
# special case to avoid diffing on renames or
578
# reparenting
579
if (len(file_parents) == 1
580
and self.text_sha1 == file_parents.values()[0].text_sha1
581
and self.text_size == file_parents.values()[0].text_size):
582
previous_ie = file_parents.values()[0]
583
weave_store.add_identical_text(
584
self.file_id, previous_ie.revision,
585
self.revision, file_parents, transaction)
586
else:
587
new_lines = work_tree.get_file(self.file_id).readlines()
588
self._add_text_to_weave(new_lines, file_parents, weave_store,
589
transaction)
590
self.text_sha1 = sha_strings(new_lines)
591
self.text_size = sum(map(len, new_lines))
592
593
594
def _unchanged(self, previous_ie):
595
"""See InventoryEntry._unchanged."""
596
compatible = super(InventoryFile, self)._unchanged(previous_ie)
597
if self.text_sha1 != previous_ie.text_sha1:
598
compatible = False
599
else:
600
# FIXME: 20050930 probe for the text size when getting sha1
601
# in _read_tree_state
602
self.text_size = previous_ie.text_size
603
if self.executable != previous_ie.executable:
604
compatible = False
605
return compatible
606
607
608
class InventoryLink(InventoryEntry):
609
"""A file in an inventory."""
610
611
__slots__ = ['symlink_target']
612
613
def _check(self, checker, rev_id, tree):
614
"""See InventoryEntry._check"""
615
if self.text_sha1 != None or self.text_size != None or self.text_id != None:
616
raise BzrCheckError('symlink {%s} has text in revision {%s}'
617
% (self.file_id, rev_id))
618
if self.symlink_target == None:
619
raise BzrCheckError('symlink {%s} has no target in revision {%s}'
620
% (self.file_id, rev_id))
621
622
def copy(self):
623
other = InventoryLink(self.file_id, self.name, self.parent_id)
624
other.symlink_target = self.symlink_target
625
other.revision = self.revision
626
return other
627
628
def detect_changes(self, old_entry):
629
"""See InventoryEntry.detect_changes."""
630
# FIXME: which _modified field should we use ? RBC 20051003
631
text_modified = (self.symlink_target != old_entry.symlink_target)
632
if text_modified:
633
mutter(" symlink target changed")
634
meta_modified = False
635
return text_modified, meta_modified
636
637
def _diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree,
638
output_to, reverse=False):
639
"""See InventoryEntry._diff."""
640
from_text = self.symlink_target
641
if to_entry is not None:
642
to_text = to_entry.symlink_target
643
if reverse:
644
temp = from_text
645
from_text = to_text
646
to_text = temp
647
print >>output_to, '=== target changed %r => %r' % (from_text, to_text)
648
else:
649
if not reverse:
650
print >>output_to, '=== target was %r' % self.symlink_target
651
else:
652
print >>output_to, '=== target is %r' % self.symlink_target
653
654
def __init__(self, file_id, name, parent_id):
655
super(InventoryLink, self).__init__(file_id, name, parent_id)
656
self.kind = 'symlink'
657
658
def kind_character(self):
659
"""See InventoryEntry.kind_character."""
660
return ''
661
662
def _put_in_tar(self, item, tree):
663
"""See InventoryEntry._put_in_tar."""
664
item.type = tarfile.SYMTYPE
665
fileobj = None
666
item.size = 0
667
item.mode = 0755
668
item.linkname = self.symlink_target
669
return fileobj
670
671
def _put_on_disk(self, fullpath, tree):
672
"""See InventoryEntry._put_on_disk."""
673
try:
674
os.symlink(self.symlink_target, fullpath)
675
except OSError,e:
676
raise BzrError("Failed to create symlink %r -> %r, error: %s" % (fullpath, self.symlink_target, e))
677
678
def _read_tree_state(self, path, work_tree):
679
"""See InventoryEntry._read_tree_state."""
680
self.symlink_target = work_tree.get_symlink_target(self.file_id)
681
682
def _unchanged(self, previous_ie):
683
"""See InventoryEntry._unchanged."""
684
compatible = super(InventoryLink, self)._unchanged(previous_ie)
685
if self.symlink_target != previous_ie.symlink_target:
686
compatible = False
687
return compatible
688
689
690
class Inventory(object):
241
return cmp(self.file_id, other.file_id) \
242
or cmp(self.children, other.children)
243
244
245
246
class Inventory(XMLMixin):
691
247
"""Inventory of versioned files in a tree.
692
248
693
249
This describes which file_id is present at each point in the tree,
705
261
inserted, other than through the Inventory API.
706
262
707
263
>>> inv = Inventory()
708
>>> inv.add(InventoryFile('123-123', 'hello.c', ROOT_ID))
709
InventoryFile('123-123', 'hello.c', parent_id='TREE_ROOT')
264
>>> inv.write_xml(sys.stdout)
265
<inventory>
266
</inventory>
267
>>> inv.add(InventoryEntry('123-123', 'hello.c', 'file', ROOT_ID))
710
268
>>> inv['123-123'].name
711
269
'hello.c'
712
270
721
279
722
280
>>> [x[0] for x in inv.iter_entries()]
723
281
['hello.c']
724
>>> inv = Inventory('TREE_ROOT-12345678-12345678')
725
>>> inv.add(InventoryFile('123-123', 'hello.c', ROOT_ID))
726
InventoryFile('123-123', 'hello.c', parent_id='TREE_ROOT-12345678-12345678')
282
283
>>> inv.write_xml(sys.stdout)
284
<inventory>
285
<entry file_id="123-123" kind="file" name="hello.c" />
286
</inventory>
287
727
288
"""
728
def __init__(self, root_id=ROOT_ID):
289
def __init__(self):
729
290
"""Create or read an inventory.
730
291
731
292
If a working directory is specified, the inventory is read
735
296
The inventory is created with a default root directory, with
736
297
an id of None.
737
298
"""
738
# We are letting Branch.initialize() create a unique inventory
739
# root id. Rather than generating a random one here.
740
#if root_id is None:
741
# root_id = bzrlib.branch.gen_file_id('TREE_ROOT')
742
self.root = RootEntry(root_id)
299
self.root = RootEntry(ROOT_ID)
743
300
self._byid = {self.root.file_id: self.root}
744
301
745
302
746
def copy(self):
747
other = Inventory(self.root.file_id)
748
# copy recursively so we know directories will be added before
749
# their children. There are more efficient ways than this...
750
for path, entry in self.iter_entries():
751
if entry == self.root:
752
continue
753
other.add(entry.copy())
754
return other
755
756
757
303
def __iter__(self):
758
304
return iter(self._byid)
759
305
777
323
yield name, ie
778
324
if ie.kind == 'directory':
779
325
for cn, cie in self.iter_entries(from_dir=ie.file_id):
780
yield pathjoin(name, cn), cie
781
782
783
def entries(self):
784
"""Return list of (path, ie) for all entries except the root.
785
786
This may be faster than iter_entries.
326
yield os.path.join(name, cn), cie
327
328
329
330
def directories(self):
331
"""Return (path, entry) pairs for all directories.
787
332
"""
788
accum = []
789
def descend(dir_ie, dir_path):
790
kids = dir_ie.children.items()
791
kids.sort()
792
for name, ie in kids:
793
child_path = pathjoin(dir_path, name)
794
accum.append((child_path, ie))
333
def descend(parent_ie):
334
parent_name = parent_ie.name
335
yield parent_name, parent_ie
336
337
# directory children in sorted order
338
dn = []
339
for ie in parent_ie.children.itervalues():
795
340
if ie.kind == 'directory':
796
descend(ie, child_path)
797
798
descend(self.root, u'')
799
return accum
800
801
802
def directories(self):
803
"""Return (path, entry) pairs for all directories, including the root.
804
"""
805
accum = []
806
def descend(parent_ie, parent_path):
807
accum.append((parent_path, parent_ie))
341
dn.append((ie.name, ie))
342
dn.sort()
808
343
809
kids = [(ie.name, ie) for ie in parent_ie.children.itervalues() if ie.kind == 'directory']
810
kids.sort()
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
811
347
812
for name, child_ie in kids:
813
child_path = pathjoin(parent_path, name)
814
descend(child_ie, child_path)
815
descend(self.root, u'')
816
return accum
348
for name, ie in descend(self.root):
349
yield name, ie
817
350
818
351
819
352
821
354
"""True if this entry contains a file with given id.
822
355
823
356
>>> inv = Inventory()
824
>>> inv.add(InventoryFile('123', 'foo.c', ROOT_ID))
825
InventoryFile('123', 'foo.c', parent_id='TREE_ROOT')
357
>>> inv.add(InventoryEntry('123', 'foo.c', 'file', ROOT_ID))
826
358
>>> '123' in inv
827
359
True
828
360
>>> '456' in inv
835
367
"""Return the entry for given file_id.
836
368
837
369
>>> inv = Inventory()
838
>>> inv.add(InventoryFile('123123', 'hello.c', ROOT_ID))
839
InventoryFile('123123', 'hello.c', parent_id='TREE_ROOT')
370
>>> inv.add(InventoryEntry('123123', 'hello.c', 'file', ROOT_ID))
840
371
>>> inv['123123'].name
841
372
'hello.c'
842
373
"""
849
380
raise BzrError("file_id {%s} not in inventory" % file_id)
850
381
851
382
852
def get_file_kind(self, file_id):
853
return self._byid[file_id].kind
854
855
383
def get_child(self, parent_id, filename):
856
384
return self[parent_id].children.get(filename)
857
385
860
388
"""Add entry to inventory.
861
389
862
390
To add a file to a branch ready to be committed, use Branch.add,
863
which calls this.
864
865
Returns the new entry object.
866
"""
391
which calls this."""
867
392
if entry.file_id in self._byid:
868
raise BzrError("inventory already contains entry with id {%s}" % entry.file_id)
869
870
if entry.parent_id == ROOT_ID or entry.parent_id is None:
871
entry.parent_id = self.root.file_id
393
bailout("inventory already contains entry with id {%s}" % entry.file_id)
872
394
873
395
try:
874
396
parent = self._byid[entry.parent_id]
875
397
except KeyError:
876
raise BzrError("parent_id {%s} not in inventory" % entry.parent_id)
398
bailout("parent_id {%s} not in inventory" % entry.parent_id)
877
399
878
400
if parent.children.has_key(entry.name):
879
raise BzrError("%s is already versioned" %
880
pathjoin(self.id2path(parent.file_id), entry.name))
401
bailout("%s is already versioned" %
402
appendpath(self.id2path(parent.file_id), entry.name))
881
403
882
404
self._byid[entry.file_id] = entry
883
405
parent.children[entry.name] = entry
884
return entry
885
406
886
407
887
408
def add_path(self, relpath, kind, file_id=None):
888
409
"""Add entry from a path.
889
410
890
The immediate parent must already be versioned.
891
892
Returns the new entry object."""
893
from bzrlib.workingtree import gen_file_id
894
411
The immediate parent must already be versioned"""
895
412
parts = bzrlib.osutils.splitpath(relpath)
896
413
if len(parts) == 0:
897
raise BzrError("cannot re-add root of inventory")
414
bailout("cannot re-add root of inventory")
898
415
899
416
if file_id == None:
900
file_id = gen_file_id(relpath)
417
file_id = bzrlib.branch.gen_file_id(relpath)
901
418
902
parent_path = parts[:-1]
903
parent_id = self.path2id(parent_path)
904
if parent_id == None:
905
raise NotVersionedError(path=parent_path)
906
if kind == 'directory':
907
ie = InventoryDirectory(file_id, parts[-1], parent_id)
908
elif kind == 'file':
909
ie = InventoryFile(file_id, parts[-1], parent_id)
910
elif kind == 'symlink':
911
ie = InventoryLink(file_id, parts[-1], parent_id)
912
else:
913
raise BzrError("unknown kind %r" % kind)
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)
914
423
return self.add(ie)
915
424
916
425
918
427
"""Remove entry by id.
919
428
920
429
>>> inv = Inventory()
921
>>> inv.add(InventoryFile('123', 'foo.c', ROOT_ID))
922
InventoryFile('123', 'foo.c', parent_id='TREE_ROOT')
430
>>> inv.add(InventoryEntry('123', 'foo.c', 'file', ROOT_ID))
923
431
>>> '123' in inv
924
432
True
925
433
>>> del inv['123']
941
449
del self[ie.parent_id].children[ie.name]
942
450
943
451
944
def __eq__(self, other):
452
def id_set(self):
453
return Set(self._byid)
454
455
456
def to_element(self):
457
"""Convert to XML Element"""
458
e = Element('inventory')
459
e.text = '\n'
460
for path, ie in self.iter_entries():
461
e.append(ie.to_element())
462
return e
463
464
465
def from_element(cls, elt):
466
"""Construct from XML Element
467
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)
472
>>> inv2 == inv
473
True
474
"""
475
assert elt.tag == 'inventory'
476
o = cls()
477
for e in elt:
478
o.add(InventoryEntry.from_element(e))
479
return o
480
481
from_element = classmethod(from_element)
482
483
484
def __cmp__(self, other):
945
485
"""Compare two sets by comparing their contents.
946
486
947
487
>>> i1 = Inventory()
948
488
>>> i2 = Inventory()
949
489
>>> i1 == i2
950
490
True
951
>>> i1.add(InventoryFile('123', 'foo', ROOT_ID))
952
InventoryFile('123', 'foo', parent_id='TREE_ROOT')
491
>>> i1.add(InventoryEntry('123', 'foo', 'file', ROOT_ID))
953
492
>>> i1 == i2
954
493
False
955
>>> i2.add(InventoryFile('123', 'foo', ROOT_ID))
956
InventoryFile('123', 'foo', parent_id='TREE_ROOT')
494
>>> i2.add(InventoryEntry('123', 'foo', 'file', ROOT_ID))
957
495
>>> i1 == i2
958
496
True
959
497
"""
498
if self is other:
499
return 0
500
960
501
if not isinstance(other, Inventory):
961
502
return NotImplemented
962
503
963
if len(self._byid) != len(other._byid):
964
# shortcut: obviously not the same
965
return False
966
967
return self._byid == other._byid
968
969
970
def __ne__(self, other):
971
return not self.__eq__(other)
972
973
974
def __hash__(self):
975
raise ValueError('not hashable')
504
if self.id_set() ^ other.id_set():
505
return 1
506
507
for file_id in self._byid:
508
c = cmp(self[file_id], other[file_id])
509
if c: return c
510
511
return 0
976
512
977
513
978
514
def get_idpath(self, file_id):
988
524
try:
989
525
ie = self._byid[file_id]
990
526
except KeyError:
991
raise BzrError("file_id {%s} not found in inventory" % file_id)
527
bailout("file_id {%s} not found in inventory" % file_id)
992
528
p.insert(0, ie.file_id)
993
529
file_id = ie.parent_id
994
530
return p
995
531
996
532
997
533
def id2path(self, file_id):
998
"""Return as a list the path to file_id.
999
1000
>>> i = Inventory()
1001
>>> e = i.add(InventoryDirectory('src-id', 'src', ROOT_ID))
1002
>>> e = i.add(InventoryFile('foo-id', 'foo.c', parent_id='src-id'))
1003
>>> print i.id2path('foo-id')
1004
src/foo.c
1005
"""
534
"""Return as a list the path to file_id."""
535
1006
536
# get all names, skipping root
1007
p = [self._byid[fid].name for fid in self.get_idpath(file_id)[1:]]
1008
if p:
1009
return pathjoin(*p)
1010
else:
1011
return ''
537
p = [self[fid].name for fid in self.get_idpath(file_id)[1:]]
538
return os.sep.join(p)
1012
539
1013
540
1014
541
1057
584
1058
585
This does not move the working file."""
1059
586
if not is_valid_name(new_name):
1060
raise BzrError("not an acceptable filename: %r" % new_name)
587
bailout("not an acceptable filename: %r" % new_name)
1061
588
1062
589
new_parent = self._byid[new_parent_id]
1063
590
if new_name in new_parent.children:
1064
raise BzrError("%r already exists in %r" % (new_name, self.id2path(new_parent_id)))
591
bailout("%r already exists in %r" % (new_name, self.id2path(new_parent_id)))
1065
592
1066
593
new_parent_idpath = self.get_idpath(new_parent_id)
1067
594
if file_id in new_parent_idpath:
1068
raise BzrError("cannot move directory %r into a subdirectory of itself, %r"
595
bailout("cannot move directory %r into a subdirectory of itself, %r"
1069
596
% (self.id2path(file_id), self.id2path(new_parent_id)))
1070
597
1071
598
file_ie = self._byid[file_id]
1082
609
1083
610
1084
611
1085
_NAME_RE = None
612
_NAME_RE = re.compile(r'^[^/\\]+$')
1086
613
1087
614
def is_valid_name(name):
1088
global _NAME_RE
1089
if _NAME_RE == None:
1090
_NAME_RE = re.compile(r'^[^/\\]+$')
1091
1092
615
return bool(_NAME_RE.match(name))
Loggerhead is a web-based interface for Breezy
Version: 2.0.1