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
35
28
from bzrlib.osutils import uuid, quotefn, splitpath, joinpath, appendpath
36
29
from bzrlib.trace import mutter
38
class InventoryEntry(XMLMixin):
31
class InventoryEntry(object):
39
32
"""Description of a versioned file.
41
34
An InventoryEntry has the following fields, which are also
69
62
>>> i.add(InventoryEntry('2323', 'bye.c', 'file', '123'))
70
63
Traceback (most recent call last):
72
BzrError: ('inventory already contains entry with id {2323}', [])
65
BzrError: inventory already contains entry with id {2323}
73
66
>>> i.add(InventoryEntry('2324', 'bye.c', 'file', '123'))
74
67
>>> i.add(InventoryEntry('2325', 'wibble', 'directory', '123'))
75
68
>>> i.path2id('src/wibble')
145
138
self.parent_id, text_id=self.text_id)
146
139
other.text_sha1 = self.text_sha1
147
140
other.text_size = self.text_size
141
# note that children are *not* copied; they're pulled across when
210
207
from_element = classmethod(from_element)
212
def __cmp__(self, other):
209
def __eq__(self, other):
215
210
if not isinstance(other, InventoryEntry):
216
211
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)
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')
233
235
self.parent_id = None
236
def __cmp__(self, other):
238
def __eq__(self, other):
239
239
if not isinstance(other, RootEntry):
240
240
return NotImplemented
241
return cmp(self.file_id, other.file_id) \
242
or cmp(self.children, other.children)
246
class Inventory(XMLMixin):
242
return (self.file_id == other.file_id) \
243
and (self.children == other.children)
247
class Inventory(object):
247
248
"""Inventory of versioned files in a tree.
249
250
This describes which file_id is present at each point in the tree,
261
262
inserted, other than through the Inventory API.
263
264
>>> inv = Inventory()
264
>>> inv.write_xml(sys.stdout)
267
265
>>> inv.add(InventoryEntry('123-123', 'hello.c', 'file', ROOT_ID))
268
266
>>> inv['123-123'].name
324
316
if ie.kind == 'directory':
325
317
for cn, cie in self.iter_entries(from_dir=ie.file_id):
326
318
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.
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))
333
if ie.kind == 'directory':
334
descend(ie, child_path)
336
descend(self.root, '')
330
340
def directories(self):
331
"""Return (path, entry) pairs for all directories.
341
"""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))
344
def descend(parent_ie, parent_path):
345
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
347
kids = [(ie.name, ie) for ie in parent_ie.children.itervalues() if ie.kind == 'directory']
348
for name, ie in descend(self.root):
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, '')
393
398
To add a file to a branch ready to be committed, use Branch.add,
394
399
which calls this."""
395
400
if entry.file_id in self._byid:
396
bailout("inventory already contains entry with id {%s}" % entry.file_id)
401
raise BzrError("inventory already contains entry with id {%s}" % entry.file_id)
399
404
parent = self._byid[entry.parent_id]
401
bailout("parent_id {%s} not in inventory" % entry.parent_id)
406
raise BzrError("parent_id {%s} not in inventory" % entry.parent_id)
403
408
if parent.children.has_key(entry.name):
404
bailout("%s is already versioned" %
409
raise BzrError("%s is already versioned" %
405
410
appendpath(self.id2path(parent.file_id), entry.name))
407
412
self._byid[entry.file_id] = entry
412
417
"""Add entry from a path.
414
419
The immediate parent must already be versioned"""
420
from bzrlib.errors import NotVersionedError
415
422
parts = bzrlib.osutils.splitpath(relpath)
416
423
if len(parts) == 0:
417
bailout("cannot re-add root of inventory")
424
raise BzrError("cannot re-add root of inventory")
419
426
if file_id == None:
420
file_id = bzrlib.branch.gen_file_id(relpath)
422
parent_id = self.path2id(parts[:-1])
423
assert parent_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)
424
435
ie = InventoryEntry(file_id, parts[-1],
425
436
kind=kind, parent_id=parent_id)
426
437
return self.add(ie)
452
463
del self[ie.parent_id].children[ie.name]
456
return Set(self._byid)
459
466
def to_element(self):
460
467
"""Convert to XML Element"""
468
from bzrlib.xml import Element
461
470
e = Element('inventory')
463
472
for path, ie in self.iter_entries():
504
510
if not isinstance(other, Inventory):
505
511
return NotImplemented
507
if self.id_set() ^ other.id_set():
510
for file_id in self._byid:
511
c = cmp(self[file_id], other[file_id])
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')
517
529
def get_idpath(self, file_id):
588
600
This does not move the working file."""
589
601
if not is_valid_name(new_name):
590
bailout("not an acceptable filename: %r" % new_name)
602
raise BzrError("not an acceptable filename: %r" % new_name)
592
604
new_parent = self._byid[new_parent_id]
593
605
if new_name in new_parent.children:
594
bailout("%r already exists in %r" % (new_name, self.id2path(new_parent_id)))
606
raise BzrError("%r already exists in %r" % (new_name, self.id2path(new_parent_id)))
596
608
new_parent_idpath = self.get_idpath(new_parent_id)
597
609
if file_id in new_parent_idpath:
598
bailout("cannot move directory %r into a subdirectory of itself, %r"
610
raise BzrError("cannot move directory %r into a subdirectory of itself, %r"
599
611
% (self.id2path(file_id), self.id2path(new_parent_id)))
601
613
file_ie = self._byid[file_id]
added
removed
bzrlib/inventory.py
