23
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
26
from bzrlib.errors import BzrError, BzrCheckError
28
35
from bzrlib.osutils import uuid, quotefn, splitpath, joinpath, appendpath
29
36
from bzrlib.trace import mutter
31
class InventoryEntry(object):
38
class InventoryEntry(XMLMixin):
32
39
"""Description of a versioned file.
34
41
An InventoryEntry has the following fields, which are also
62
69
>>> i.add(InventoryEntry('2323', 'bye.c', 'file', '123'))
63
70
Traceback (most recent call last):
65
BzrError: inventory already contains entry with id {2323}
72
BzrError: ('inventory already contains entry with id {2323}', [])
66
73
>>> i.add(InventoryEntry('2324', 'bye.c', 'file', '123'))
67
74
>>> i.add(InventoryEntry('2325', 'wibble', 'directory', '123'))
68
75
>>> i.path2id('src/wibble')
207
212
from_element = classmethod(from_element)
209
def __eq__(self, other):
214
def __cmp__(self, other):
210
217
if not isinstance(other, InventoryEntry):
211
218
return NotImplemented
213
return (self.file_id == other.file_id) \
214
and (self.name == other.name) \
215
and (self.text_sha1 == other.text_sha1) \
216
and (self.text_size == other.text_size) \
217
and (self.text_id == other.text_id) \
218
and (self.parent_id == other.parent_id) \
219
and (self.kind == other.kind)
222
def __ne__(self, other):
223
return not (self == other)
226
raise ValueError('not hashable')
220
return cmp(self.file_id, other.file_id) \
221
or cmp(self.name, other.name) \
222
or cmp(self.text_sha1, other.text_sha1) \
223
or cmp(self.text_size, other.text_size) \
224
or cmp(self.text_id, other.text_id) \
225
or cmp(self.parent_id, other.parent_id) \
226
or cmp(self.kind, other.kind)
235
235
self.parent_id = None
238
def __eq__(self, other):
238
def __cmp__(self, other):
239
241
if not isinstance(other, RootEntry):
240
242
return NotImplemented
242
return (self.file_id == other.file_id) \
243
and (self.children == other.children)
247
class Inventory(object):
243
return cmp(self.file_id, other.file_id) \
244
or cmp(self.children, other.children)
248
class Inventory(XMLMixin):
248
249
"""Inventory of versioned files in a tree.
250
251
This describes which file_id is present at each point in the tree,
262
263
inserted, other than through the Inventory API.
264
265
>>> inv = Inventory()
266
>>> inv.write_xml(sys.stdout)
265
269
>>> inv.add(InventoryEntry('123-123', 'hello.c', 'file', ROOT_ID))
266
270
>>> inv['123-123'].name
316
326
if ie.kind == 'directory':
317
327
for cn, cie in self.iter_entries(from_dir=ie.file_id):
318
328
yield os.path.join(name, cn), cie
322
"""Return list of (path, ie) for all entries except the root.
324
This may be faster than iter_entries.
332
def directories(self):
333
"""Return (path, entry) pairs for all directories.
327
def descend(dir_ie, dir_path):
328
kids = dir_ie.children.items()
330
for name, ie in kids:
331
child_path = os.path.join(dir_path, name)
332
accum.append((child_path, ie))
335
def descend(parent_ie):
336
parent_name = parent_ie.name
337
yield parent_name, parent_ie
339
# directory children in sorted order
341
for ie in parent_ie.children.itervalues():
333
342
if ie.kind == 'directory':
334
descend(ie, child_path)
336
descend(self.root, '')
340
def directories(self):
341
"""Return (path, entry) pairs for all directories, including the root.
344
def descend(parent_ie, parent_path):
345
accum.append((parent_path, parent_ie))
343
dn.append((ie.name, ie))
347
kids = [(ie.name, ie) for ie in parent_ie.children.itervalues() if ie.kind == 'directory']
346
for name, child_ie in dn:
347
for sub_name, sub_ie in descend(child_ie):
348
yield appendpath(parent_name, sub_name), sub_ie
350
for name, child_ie in kids:
351
child_path = os.path.join(parent_path, name)
352
descend(child_ie, child_path)
353
descend(self.root, '')
350
for name, ie in descend(self.root):
398
395
To add a file to a branch ready to be committed, use Branch.add,
399
396
which calls this."""
400
397
if entry.file_id in self._byid:
401
raise BzrError("inventory already contains entry with id {%s}" % entry.file_id)
398
bailout("inventory already contains entry with id {%s}" % entry.file_id)
404
401
parent = self._byid[entry.parent_id]
406
raise BzrError("parent_id {%s} not in inventory" % entry.parent_id)
403
bailout("parent_id {%s} not in inventory" % entry.parent_id)
408
405
if parent.children.has_key(entry.name):
409
raise BzrError("%s is already versioned" %
406
bailout("%s is already versioned" %
410
407
appendpath(self.id2path(parent.file_id), entry.name))
412
409
self._byid[entry.file_id] = entry
417
414
"""Add entry from a path.
419
416
The immediate parent must already be versioned"""
420
from bzrlib.errors import NotVersionedError
422
417
parts = bzrlib.osutils.splitpath(relpath)
423
418
if len(parts) == 0:
424
raise BzrError("cannot re-add root of inventory")
419
bailout("cannot re-add root of inventory")
426
421
if file_id == None:
427
from bzrlib.branch import gen_file_id
428
file_id = gen_file_id(relpath)
430
parent_path = parts[:-1]
431
parent_id = self.path2id(parent_path)
432
if parent_id == None:
433
raise NotVersionedError(parent_path)
422
file_id = bzrlib.branch.gen_file_id(relpath)
424
parent_id = self.path2id(parts[:-1])
425
assert parent_id != None
435
426
ie = InventoryEntry(file_id, parts[-1],
436
427
kind=kind, parent_id=parent_id)
437
428
return self.add(ie)
463
454
del self[ie.parent_id].children[ie.name]
458
return Set(self._byid)
466
461
def to_element(self):
467
462
"""Convert to XML Element"""
468
from bzrlib.xml import Element
470
463
e = Element('inventory')
472
465
for path, ie in self.iter_entries():
510
506
if not isinstance(other, Inventory):
511
507
return NotImplemented
513
if len(self._byid) != len(other._byid):
514
# shortcut: obviously not the same
517
return self._byid == other._byid
520
def __ne__(self, other):
521
return not (self == other)
525
raise ValueError('not hashable')
509
if self.id_set() ^ other.id_set():
512
for file_id in self._byid:
513
c = cmp(self[file_id], other[file_id])
529
519
def get_idpath(self, file_id):
600
590
This does not move the working file."""
601
591
if not is_valid_name(new_name):
602
raise BzrError("not an acceptable filename: %r" % new_name)
592
bailout("not an acceptable filename: %r" % new_name)
604
594
new_parent = self._byid[new_parent_id]
605
595
if new_name in new_parent.children:
606
raise BzrError("%r already exists in %r" % (new_name, self.id2path(new_parent_id)))
596
bailout("%r already exists in %r" % (new_name, self.id2path(new_parent_id)))
608
598
new_parent_idpath = self.get_idpath(new_parent_id)
609
599
if file_id in new_parent_idpath:
610
raise BzrError("cannot move directory %r into a subdirectory of itself, %r"
600
bailout("cannot move directory %r into a subdirectory of itself, %r"
611
601
% (self.id2path(file_id), self.id2path(new_parent_id)))
613
603
file_ie = self._byid[file_id]
added
removed
bzrlib/inventory.py
