15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18
# TODO: Maybe store inventory_id in the file? Not really needed.
21
18
# This should really be an id randomly assigned when the tree is
22
19
# created, but it's not for now.
23
20
ROOT_ID = "TREE_ROOT"
26
23
import sys, os.path, types, re
30
26
from cElementTree import Element, ElementTree, SubElement
32
28
from elementtree.ElementTree import Element, ElementTree, SubElement
34
30
from xml import XMLMixin
35
from errors import bailout, BzrError
31
from errors import bailout, BzrError, BzrCheckError
38
34
from bzrlib.osutils import uuid, quotefn, splitpath, joinpath, appendpath
102
98
# TODO: split InventoryEntry into subclasses for files,
103
99
# directories, etc etc.
105
104
def __init__(self, file_id, name, kind, parent_id, text_id=None):
106
105
"""Create an InventoryEntry
116
115
>>> e = InventoryEntry('123', 'src/hello.c', 'file', ROOT_ID)
117
116
Traceback (most recent call last):
118
BzrError: ("InventoryEntry name is not a simple filename: 'src/hello.c'", [])
117
BzrCheckError: InventoryEntry name 'src/hello.c' is invalid
121
if len(splitpath(name)) != 1:
122
bailout('InventoryEntry name is not a simple filename: %r'
119
if '/' in name or '\\' in name:
120
raise BzrCheckError('InventoryEntry name %r is invalid' % name)
125
122
self.file_id = file_id
128
125
self.text_id = text_id
129
126
self.parent_id = parent_id
130
self.text_sha1 = None
131
self.text_size = None
132
127
if kind == 'directory':
133
128
self.children = {}
134
129
elif kind == 'file':
149
144
self.parent_id, text_id=self.text_id)
150
145
other.text_sha1 = self.text_sha1
151
146
other.text_size = self.text_size
147
# note that children are *not* copied; they're pulled across when
214
211
from_element = classmethod(from_element)
216
def __cmp__(self, other):
213
def __eq__(self, other):
219
214
if not isinstance(other, InventoryEntry):
220
215
return NotImplemented
222
return cmp(self.file_id, other.file_id) \
223
or cmp(self.name, other.name) \
224
or cmp(self.text_sha1, other.text_sha1) \
225
or cmp(self.text_size, other.text_size) \
226
or cmp(self.text_id, other.text_id) \
227
or cmp(self.parent_id, other.parent_id) \
228
or cmp(self.kind, other.kind)
217
return (self.file_id == other.file_id) \
218
and (self.name == other.name) \
219
and (self.text_sha1 == other.text_sha1) \
220
and (self.text_size == other.text_size) \
221
and (self.text_id == other.text_id) \
222
and (self.parent_id == other.parent_id) \
223
and (self.kind == other.kind)
226
def __ne__(self, other):
227
return not (self == other)
230
raise ValueError('not hashable')
237
239
self.parent_id = None
240
def __cmp__(self, other):
242
def __eq__(self, other):
243
243
if not isinstance(other, RootEntry):
244
244
return NotImplemented
245
return cmp(self.file_id, other.file_id) \
246
or cmp(self.children, other.children)
246
return (self.file_id == other.file_id) \
247
and (self.children == other.children)
294
## TODO: Make sure only canonical filenames are stored.
296
## TODO: Do something sensible about the possible collisions on
297
## case-losing filesystems. Perhaps we should just always forbid
300
## TODO: No special cases for root, rather just give it a file id
301
## like everything else.
303
## TODO: Probably change XML serialization to use nesting rather
304
## than parent_id pointers.
306
## TODO: Perhaps hold the ElementTree in memory and work directly
307
## on that rather than converting into Python objects every time?
309
294
def __init__(self):
310
295
"""Create or read an inventory.
344
329
if ie.kind == 'directory':
345
330
for cn, cie in self.iter_entries(from_dir=ie.file_id):
346
331
yield os.path.join(name, cn), cie
335
"""Return list of (path, ie) for all entries except the root.
337
This may be faster than iter_entries.
340
def descend(dir_ie, dir_path):
341
kids = dir_ie.children.items()
343
for name, ie in kids:
344
child_path = os.path.join(dir_path, name)
345
accum.append((child_path, ie))
346
if ie.kind == 'directory':
347
descend(ie, child_path)
349
descend(self.root, '')
350
353
def directories(self):
351
"""Return (path, entry) pairs for all directories.
354
"""Return (path, entry) pairs for all directories, including the root.
353
def descend(parent_ie):
354
parent_name = parent_ie.name
355
yield parent_name, parent_ie
357
# directory children in sorted order
359
for ie in parent_ie.children.itervalues():
360
if ie.kind == 'directory':
361
dn.append((ie.name, ie))
357
def descend(parent_ie, parent_path):
358
accum.append((parent_path, parent_ie))
364
for name, child_ie in dn:
365
for sub_name, sub_ie in descend(child_ie):
366
yield appendpath(parent_name, sub_name), sub_ie
360
kids = [(ie.name, ie) for ie in parent_ie.children.itervalues() if ie.kind == 'directory']
368
for name, ie in descend(self.root):
363
for name, child_ie in kids:
364
child_path = os.path.join(parent_path, name)
365
descend(child_ie, child_path)
366
descend(self.root, '')
391
389
>>> inv['123123'].name
395
raise BzrError("can't look up file_id None")
398
393
return self._byid[file_id]
400
raise BzrError("file_id {%s} not in inventory" % file_id)
396
raise BzrError("can't look up file_id None")
398
raise BzrError("file_id {%s} not in inventory" % file_id)
401
def get_file_kind(self, file_id):
402
return self._byid[file_id].kind
403
404
def get_child(self, parent_id, filename):
404
405
return self[parent_id].children.get(filename)
521
515
if not isinstance(other, Inventory):
522
516
return NotImplemented
524
if self.id_set() ^ other.id_set():
527
for file_id in self._byid:
528
c = cmp(self[file_id], other[file_id])
518
if len(self._byid) != len(other._byid):
519
# shortcut: obviously not the same
522
return self._byid == other._byid
525
def __ne__(self, other):
526
return not (self == other)
530
raise ValueError('not hashable')
534
534
def get_idpath(self, file_id):
added
removed
bzrlib/inventory.py
