/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
138 by mbp at sourcefrog
remove parallel tree from inventory;
1
# (C) 2005 Canonical Ltd
1 by mbp at sourcefrog
import from baz patch-364
2
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
17
120 by mbp at sourcefrog
more check functions
18
# TODO: Maybe store inventory_id in the file?  Not really needed.
1 by mbp at sourcefrog
import from baz patch-364
19
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
20
21
# This should really be an id randomly assigned when the tree is
22
# created, but it's not for now.
23
ROOT_ID = "TREE_ROOT"
24
25
160 by mbp at sourcefrog
- basic support for moving files to different directories - have not done support for renaming them yet, but should be straightforward - some tests, but many cases are not handled yet i think
26
import sys, os.path, types, re
1 by mbp at sourcefrog
import from baz patch-364
27
from sets import Set
28
7 by mbp at sourcefrog
depend only on regular ElementTree installation
29
try:
30
    from cElementTree import Element, ElementTree, SubElement
31
except ImportError:
27 by mbp at sourcefrog
- fix up use of ElementTree without cElementTree
32
    from elementtree.ElementTree import Element, ElementTree, SubElement
7 by mbp at sourcefrog
depend only on regular ElementTree installation
33
1 by mbp at sourcefrog
import from baz patch-364
34
from xml import XMLMixin
184 by mbp at sourcefrog
pychecker fixups
35
from errors import bailout, BzrError
70 by mbp at sourcefrog
Prepare for smart recursive add.
36
37
import bzrlib
38
from bzrlib.osutils import uuid, quotefn, splitpath, joinpath, appendpath
39
from bzrlib.trace import mutter
1 by mbp at sourcefrog
import from baz patch-364
40
41
class InventoryEntry(XMLMixin):
42
    """Description of a versioned file.
43
44
    An InventoryEntry has the following fields, which are also
45
    present in the XML inventory-entry element:
46
47
    * *file_id*
48
    * *name*: (only the basename within the directory, must not
49
      contain slashes)
50
    * *kind*: "directory" or "file"
51
    * *directory_id*: (if absent/null means the branch root directory)
52
    * *text_sha1*: only for files
53
    * *text_size*: in bytes, only for files 
54
    * *text_id*: identifier for the text version, only for files
55
56
    InventoryEntries can also exist inside a WorkingTree
57
    inventory, in which case they are not yet bound to a
58
    particular revision of the file.  In that case the text_sha1,
59
    text_size and text_id are absent.
60
61
62
    >>> i = Inventory()
63
    >>> i.path2id('')
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
64
    'TREE_ROOT'
65
    >>> i.add(InventoryEntry('123', 'src', 'directory', ROOT_ID))
66
    >>> i.add(InventoryEntry('2323', 'hello.c', 'file', parent_id='123'))
1 by mbp at sourcefrog
import from baz patch-364
67
    >>> for j in i.iter_entries():
68
    ...   print j
69
    ... 
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
70
    ('src', InventoryEntry('123', 'src', kind='directory', parent_id='TREE_ROOT'))
1 by mbp at sourcefrog
import from baz patch-364
71
    ('src/hello.c', InventoryEntry('2323', 'hello.c', kind='file', parent_id='123'))
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
72
    >>> i.add(InventoryEntry('2323', 'bye.c', 'file', '123'))
1 by mbp at sourcefrog
import from baz patch-364
73
    Traceback (most recent call last):
74
    ...
75
    BzrError: ('inventory already contains entry with id {2323}', [])
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
76
    >>> i.add(InventoryEntry('2324', 'bye.c', 'file', '123'))
77
    >>> i.add(InventoryEntry('2325', 'wibble', 'directory', '123'))
1 by mbp at sourcefrog
import from baz patch-364
78
    >>> i.path2id('src/wibble')
79
    '2325'
80
    >>> '2325' in i
81
    True
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
82
    >>> i.add(InventoryEntry('2326', 'wibble.c', 'file', '2325'))
1 by mbp at sourcefrog
import from baz patch-364
83
    >>> i['2326']
84
    InventoryEntry('2326', 'wibble.c', kind='file', parent_id='2325')
85
    >>> for j in i.iter_entries():
86
    ...     print j[0]
87
    ...     assert i.path2id(j[0])
88
    ... 
89
    src
90
    src/bye.c
91
    src/hello.c
92
    src/wibble
93
    src/wibble/wibble.c
94
    >>> i.id2path('2326')
95
    'src/wibble/wibble.c'
96
254 by Martin Pool
- Doc cleanups from Magnus Therning
97
    TODO: Maybe also keep the full path of the entry, and the children?
1 by mbp at sourcefrog
import from baz patch-364
98
           But those depend on its position within a particular inventory, and
99
           it would be nice not to need to hold the backpointer here.
100
    """
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
101
102
    # TODO: split InventoryEntry into subclasses for files,
103
    # directories, etc etc.
376 by Martin Pool
- fix slow invariant check when reading in InventoryEntry objects
104
105
    text_sha1 = None
106
    text_size = None
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
107
    
108
    def __init__(self, file_id, name, kind, parent_id, text_id=None):
1 by mbp at sourcefrog
import from baz patch-364
109
        """Create an InventoryEntry
110
        
111
        The filename must be a single component, relative to the
112
        parent directory; it cannot be a whole path or relative name.
113
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
114
        >>> e = InventoryEntry('123', 'hello.c', 'file', ROOT_ID)
1 by mbp at sourcefrog
import from baz patch-364
115
        >>> e.name
116
        'hello.c'
117
        >>> e.file_id
118
        '123'
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
119
        >>> e = InventoryEntry('123', 'src/hello.c', 'file', ROOT_ID)
1 by mbp at sourcefrog
import from baz patch-364
120
        Traceback (most recent call last):
121
        BzrError: ("InventoryEntry name is not a simple filename: 'src/hello.c'", [])
122
        """
376 by Martin Pool
- fix slow invariant check when reading in InventoryEntry objects
123
        if '/' in name or '\\' in name:
124
            raise BzrCheckError('InventoryEntry name %r is invalid' % name)
1 by mbp at sourcefrog
import from baz patch-364
125
        
126
        self.file_id = file_id
127
        self.name = name
128
        self.kind = kind
129
        self.text_id = text_id
130
        self.parent_id = parent_id
138 by mbp at sourcefrog
remove parallel tree from inventory;
131
        if kind == 'directory':
132
            self.children = {}
237 by mbp at sourcefrog
- Better assertions in InventoryEntry constructor
133
        elif kind == 'file':
134
            pass
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
135
        else:
237 by mbp at sourcefrog
- Better assertions in InventoryEntry constructor
136
            raise BzrError("unhandled entry kind %r" % kind)
137
1 by mbp at sourcefrog
import from baz patch-364
138
139
156 by mbp at sourcefrog
new "directories" command
140
    def sorted_children(self):
141
        l = self.children.items()
142
        l.sort()
143
        return l
144
145
1 by mbp at sourcefrog
import from baz patch-364
146
    def copy(self):
147
        other = InventoryEntry(self.file_id, self.name, self.kind,
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
148
                               self.parent_id, text_id=self.text_id)
1 by mbp at sourcefrog
import from baz patch-364
149
        other.text_sha1 = self.text_sha1
150
        other.text_size = self.text_size
151
        return other
152
153
154
    def __repr__(self):
155
        return ("%s(%r, %r, kind=%r, parent_id=%r)"
156
                % (self.__class__.__name__,
157
                   self.file_id,
158
                   self.name,
159
                   self.kind,
160
                   self.parent_id))
161
162
    
163
    def to_element(self):
164
        """Convert to XML element"""
165
        e = Element('entry')
166
167
        e.set('name', self.name)
168
        e.set('file_id', self.file_id)
169
        e.set('kind', self.kind)
170
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
171
        if self.text_size != None:
1 by mbp at sourcefrog
import from baz patch-364
172
            e.set('text_size', '%d' % self.text_size)
173
            
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
174
        for f in ['text_id', 'text_sha1']:
1 by mbp at sourcefrog
import from baz patch-364
175
            v = getattr(self, f)
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
176
            if v != None:
1 by mbp at sourcefrog
import from baz patch-364
177
                e.set(f, v)
178
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
179
        # to be conservative, we don't externalize the root pointers
180
        # for now, leaving them as null in the xml form.  in a future
181
        # version it will be implied by nested elements.
182
        if self.parent_id != ROOT_ID:
183
            assert isinstance(self.parent_id, basestring)
184
            e.set('parent_id', self.parent_id)
185
1 by mbp at sourcefrog
import from baz patch-364
186
        e.tail = '\n'
187
            
188
        return e
189
190
191
    def from_element(cls, elt):
192
        assert elt.tag == 'entry'
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
193
194
        ## original format inventories don't have a parent_id for
195
        ## nodes in the root directory, but it's cleaner to use one
196
        ## internally.
197
        parent_id = elt.get('parent_id')
198
        if parent_id == None:
199
            parent_id = ROOT_ID
200
201
        self = cls(elt.get('file_id'), elt.get('name'), elt.get('kind'), parent_id)
1 by mbp at sourcefrog
import from baz patch-364
202
        self.text_id = elt.get('text_id')
203
        self.text_sha1 = elt.get('text_sha1')
204
        
205
        ## mutter("read inventoryentry: %r" % (elt.attrib))
206
207
        v = elt.get('text_size')
208
        self.text_size = v and int(v)
209
210
        return self
211
            
212
213
    from_element = classmethod(from_element)
214
215
    def __cmp__(self, other):
216
        if self is other:
217
            return 0
218
        if not isinstance(other, InventoryEntry):
219
            return NotImplemented
220
221
        return cmp(self.file_id, other.file_id) \
222
               or cmp(self.name, other.name) \
223
               or cmp(self.text_sha1, other.text_sha1) \
224
               or cmp(self.text_size, other.text_size) \
225
               or cmp(self.text_id, other.text_id) \
226
               or cmp(self.parent_id, other.parent_id) \
227
               or cmp(self.kind, other.kind)
228
229
230
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
231
class RootEntry(InventoryEntry):
232
    def __init__(self, file_id):
233
        self.file_id = file_id
234
        self.children = {}
235
        self.kind = 'root_directory'
236
        self.parent_id = None
156 by mbp at sourcefrog
new "directories" command
237
        self.name = ''
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
238
239
    def __cmp__(self, other):
240
        if self is other:
241
            return 0
242
        if not isinstance(other, RootEntry):
243
            return NotImplemented
244
        return cmp(self.file_id, other.file_id) \
245
               or cmp(self.children, other.children)
246
247
248
1 by mbp at sourcefrog
import from baz patch-364
249
class Inventory(XMLMixin):
250
    """Inventory of versioned files in a tree.
251
240 by mbp at sourcefrog
doc
252
    This describes which file_id is present at each point in the tree,
253
    and possibly the SHA-1 or other information about the file.
254
    Entries can be looked up either by path or by file_id.
1 by mbp at sourcefrog
import from baz patch-364
255
256
    The inventory represents a typical unix file tree, with
257
    directories containing files and subdirectories.  We never store
258
    the full path to a file, because renaming a directory implicitly
259
    moves all of its contents.  This class internally maintains a
260
    lookup tree that allows the children under a directory to be
261
    returned quickly.
262
263
    InventoryEntry objects must not be modified after they are
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
264
    inserted, other than through the Inventory API.
1 by mbp at sourcefrog
import from baz patch-364
265
266
    >>> inv = Inventory()
267
    >>> inv.write_xml(sys.stdout)
268
    <inventory>
269
    </inventory>
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
270
    >>> inv.add(InventoryEntry('123-123', 'hello.c', 'file', ROOT_ID))
1 by mbp at sourcefrog
import from baz patch-364
271
    >>> inv['123-123'].name
272
    'hello.c'
273
274
    May be treated as an iterator or set to look up file ids:
275
    
276
    >>> bool(inv.path2id('hello.c'))
277
    True
278
    >>> '123-123' in inv
279
    True
280
281
    May also look up by name:
282
283
    >>> [x[0] for x in inv.iter_entries()]
284
    ['hello.c']
285
    
286
    >>> inv.write_xml(sys.stdout)
287
    <inventory>
288
    <entry file_id="123-123" kind="file" name="hello.c" />
289
    </inventory>
290
291
    """
292
293
    ## TODO: Make sure only canonical filenames are stored.
294
295
    ## TODO: Do something sensible about the possible collisions on
296
    ## case-losing filesystems.  Perhaps we should just always forbid
297
    ## such collisions.
298
138 by mbp at sourcefrog
remove parallel tree from inventory;
299
    ## TODO: No special cases for root, rather just give it a file id
300
    ## like everything else.
301
240 by mbp at sourcefrog
doc
302
    ## TODO: Probably change XML serialization to use nesting rather
303
    ## than parent_id pointers.
304
305
    ## TODO: Perhaps hold the ElementTree in memory and work directly
306
    ## on that rather than converting into Python objects every time?
1 by mbp at sourcefrog
import from baz patch-364
307
308
    def __init__(self):
309
        """Create or read an inventory.
310
311
        If a working directory is specified, the inventory is read
312
        from there.  If the file is specified, read from that. If not,
313
        the inventory is created empty.
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
314
315
        The inventory is created with a default root directory, with
316
        an id of None.
1 by mbp at sourcefrog
import from baz patch-364
317
        """
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
318
        self.root = RootEntry(ROOT_ID)
319
        self._byid = {self.root.file_id: self.root}
1 by mbp at sourcefrog
import from baz patch-364
320
321
322
    def __iter__(self):
323
        return iter(self._byid)
324
325
326
    def __len__(self):
327
        """Returns number of entries."""
328
        return len(self._byid)
329
330
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
331
    def iter_entries(self, from_dir=None):
1 by mbp at sourcefrog
import from baz patch-364
332
        """Return (path, entry) pairs, in order by name."""
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
333
        if from_dir == None:
334
            assert self.root
335
            from_dir = self.root
336
        elif isinstance(from_dir, basestring):
337
            from_dir = self._byid[from_dir]
338
            
339
        kids = from_dir.children.items()
1 by mbp at sourcefrog
import from baz patch-364
340
        kids.sort()
341
        for name, ie in kids:
342
            yield name, ie
343
            if ie.kind == 'directory':
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
344
                for cn, cie in self.iter_entries(from_dir=ie.file_id):
271 by Martin Pool
- Windows path fixes
345
                    yield os.path.join(name, cn), cie
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
346
                    
347
348
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
349
    def directories(self):
1 by mbp at sourcefrog
import from baz patch-364
350
        """Return (path, entry) pairs for all directories.
351
        """
156 by mbp at sourcefrog
new "directories" command
352
        def descend(parent_ie):
353
            parent_name = parent_ie.name
354
            yield parent_name, parent_ie
355
356
            # directory children in sorted order
357
            dn = []
358
            for ie in parent_ie.children.itervalues():
359
                if ie.kind == 'directory':
360
                    dn.append((ie.name, ie))
361
            dn.sort()
362
            
363
            for name, child_ie in dn:
364
                for sub_name, sub_ie in descend(child_ie):
365
                    yield appendpath(parent_name, sub_name), sub_ie
366
367
        for name, ie in descend(self.root):
368
            yield name, ie
1 by mbp at sourcefrog
import from baz patch-364
369
        
370
371
372
    def __contains__(self, file_id):
373
        """True if this entry contains a file with given id.
374
375
        >>> inv = Inventory()
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
376
        >>> inv.add(InventoryEntry('123', 'foo.c', 'file', ROOT_ID))
1 by mbp at sourcefrog
import from baz patch-364
377
        >>> '123' in inv
378
        True
379
        >>> '456' in inv
380
        False
381
        """
382
        return file_id in self._byid
383
384
385
    def __getitem__(self, file_id):
386
        """Return the entry for given file_id.
387
388
        >>> inv = Inventory()
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
389
        >>> inv.add(InventoryEntry('123123', 'hello.c', 'file', ROOT_ID))
1 by mbp at sourcefrog
import from baz patch-364
390
        >>> inv['123123'].name
391
        'hello.c'
392
        """
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
393
        if file_id == None:
184 by mbp at sourcefrog
pychecker fixups
394
            raise BzrError("can't look up file_id None")
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
395
            
396
        try:
397
            return self._byid[file_id]
398
        except KeyError:
184 by mbp at sourcefrog
pychecker fixups
399
            raise BzrError("file_id {%s} not in inventory" % file_id)
1 by mbp at sourcefrog
import from baz patch-364
400
401
138 by mbp at sourcefrog
remove parallel tree from inventory;
402
    def get_child(self, parent_id, filename):
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
403
        return self[parent_id].children.get(filename)
138 by mbp at sourcefrog
remove parallel tree from inventory;
404
405
1 by mbp at sourcefrog
import from baz patch-364
406
    def add(self, entry):
407
        """Add entry to inventory.
408
409
        To add  a file to a branch ready to be committed, use Branch.add,
410
        which calls this."""
139 by mbp at sourcefrog
simplified/faster Inventory.add
411
        if entry.file_id in self._byid:
1 by mbp at sourcefrog
import from baz patch-364
412
            bailout("inventory already contains entry with id {%s}" % entry.file_id)
413
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
414
        try:
415
            parent = self._byid[entry.parent_id]
416
        except KeyError:
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
417
            bailout("parent_id {%s} not in inventory" % entry.parent_id)
139 by mbp at sourcefrog
simplified/faster Inventory.add
418
419
        if parent.children.has_key(entry.name):
140 by mbp at sourcefrog
fix error message for repeated add
420
            bailout("%s is already versioned" %
421
                    appendpath(self.id2path(parent.file_id), entry.name))
1 by mbp at sourcefrog
import from baz patch-364
422
423
        self._byid[entry.file_id] = entry
139 by mbp at sourcefrog
simplified/faster Inventory.add
424
        parent.children[entry.name] = entry
1 by mbp at sourcefrog
import from baz patch-364
425
426
70 by mbp at sourcefrog
Prepare for smart recursive add.
427
    def add_path(self, relpath, kind, file_id=None):
428
        """Add entry from a path.
429
430
        The immediate parent must already be versioned"""
431
        parts = bzrlib.osutils.splitpath(relpath)
432
        if len(parts) == 0:
433
            bailout("cannot re-add root of inventory")
434
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
435
        if file_id == None:
70 by mbp at sourcefrog
Prepare for smart recursive add.
436
            file_id = bzrlib.branch.gen_file_id(relpath)
437
438
        parent_id = self.path2id(parts[:-1])
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
439
        assert parent_id != None
70 by mbp at sourcefrog
Prepare for smart recursive add.
440
        ie = InventoryEntry(file_id, parts[-1],
441
                            kind=kind, parent_id=parent_id)
442
        return self.add(ie)
443
444
1 by mbp at sourcefrog
import from baz patch-364
445
    def __delitem__(self, file_id):
446
        """Remove entry by id.
447
448
        >>> inv = Inventory()
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
449
        >>> inv.add(InventoryEntry('123', 'foo.c', 'file', ROOT_ID))
1 by mbp at sourcefrog
import from baz patch-364
450
        >>> '123' in inv
451
        True
452
        >>> del inv['123']
453
        >>> '123' in inv
454
        False
455
        """
456
        ie = self[file_id]
457
138 by mbp at sourcefrog
remove parallel tree from inventory;
458
        assert self[ie.parent_id].children[ie.name] == ie
1 by mbp at sourcefrog
import from baz patch-364
459
        
460
        # TODO: Test deleting all children; maybe hoist to a separate
461
        # deltree method?
462
        if ie.kind == 'directory':
138 by mbp at sourcefrog
remove parallel tree from inventory;
463
            for cie in ie.children.values():
1 by mbp at sourcefrog
import from baz patch-364
464
                del self[cie.file_id]
138 by mbp at sourcefrog
remove parallel tree from inventory;
465
            del ie.children
1 by mbp at sourcefrog
import from baz patch-364
466
467
        del self._byid[file_id]
138 by mbp at sourcefrog
remove parallel tree from inventory;
468
        del self[ie.parent_id].children[ie.name]
1 by mbp at sourcefrog
import from baz patch-364
469
470
471
    def id_set(self):
472
        return Set(self._byid)
473
474
475
    def to_element(self):
476
        """Convert to XML Element"""
477
        e = Element('inventory')
478
        e.text = '\n'
479
        for path, ie in self.iter_entries():
480
            e.append(ie.to_element())
481
        return e
482
    
483
484
    def from_element(cls, elt):
485
        """Construct from XML Element
486
487
        >>> inv = Inventory()
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
488
        >>> inv.add(InventoryEntry('foo.c-123981239', 'foo.c', 'file', ROOT_ID))
1 by mbp at sourcefrog
import from baz patch-364
489
        >>> elt = inv.to_element()
490
        >>> inv2 = Inventory.from_element(elt)
491
        >>> inv2 == inv
492
        True
493
        """
494
        assert elt.tag == 'inventory'
495
        o = cls()
496
        for e in elt:
497
            o.add(InventoryEntry.from_element(e))
498
        return o
499
        
500
    from_element = classmethod(from_element)
501
502
503
    def __cmp__(self, other):
504
        """Compare two sets by comparing their contents.
505
506
        >>> i1 = Inventory()
507
        >>> i2 = Inventory()
508
        >>> i1 == i2
509
        True
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
510
        >>> i1.add(InventoryEntry('123', 'foo', 'file', ROOT_ID))
1 by mbp at sourcefrog
import from baz patch-364
511
        >>> i1 == i2
512
        False
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
513
        >>> i2.add(InventoryEntry('123', 'foo', 'file', ROOT_ID))
1 by mbp at sourcefrog
import from baz patch-364
514
        >>> i1 == i2
515
        True
516
        """
517
        if self is other:
518
            return 0
519
        
520
        if not isinstance(other, Inventory):
521
            return NotImplemented
522
523
        if self.id_set() ^ other.id_set():
524
            return 1
525
526
        for file_id in self._byid:
527
            c = cmp(self[file_id], other[file_id])
528
            if c: return c
529
530
        return 0
531
532
172 by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory
533
    def get_idpath(self, file_id):
534
        """Return a list of file_ids for the path to an entry.
535
536
        The list contains one element for each directory followed by
537
        the id of the file itself.  So the length of the returned list
538
        is equal to the depth of the file in the tree, counting the
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
539
        root directory as depth 1.
172 by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory
540
        """
541
        p = []
542
        while file_id != None:
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
543
            try:
544
                ie = self._byid[file_id]
545
            except KeyError:
546
                bailout("file_id {%s} not found in inventory" % file_id)
172 by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory
547
            p.insert(0, ie.file_id)
548
            file_id = ie.parent_id
549
        return p
550
551
1 by mbp at sourcefrog
import from baz patch-364
552
    def id2path(self, file_id):
553
        """Return as a list the path to file_id."""
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
554
555
        # get all names, skipping root
556
        p = [self[fid].name for fid in self.get_idpath(file_id)[1:]]
271 by Martin Pool
- Windows path fixes
557
        return os.sep.join(p)
1 by mbp at sourcefrog
import from baz patch-364
558
            
559
560
561
    def path2id(self, name):
562
        """Walk down through directories to return entry of last component.
563
564
        names may be either a list of path components, or a single
565
        string, in which case it is automatically split.
566
567
        This returns the entry of the last component in the path,
568
        which may be either a file or a directory.
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
569
570
        Returns None iff the path is not found.
1 by mbp at sourcefrog
import from baz patch-364
571
        """
70 by mbp at sourcefrog
Prepare for smart recursive add.
572
        if isinstance(name, types.StringTypes):
573
            name = splitpath(name)
1 by mbp at sourcefrog
import from baz patch-364
574
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
575
        mutter("lookup path %r" % name)
576
577
        parent = self.root
70 by mbp at sourcefrog
Prepare for smart recursive add.
578
        for f in name:
1 by mbp at sourcefrog
import from baz patch-364
579
            try:
138 by mbp at sourcefrog
remove parallel tree from inventory;
580
                cie = parent.children[f]
1 by mbp at sourcefrog
import from baz patch-364
581
                assert cie.name == f
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
582
                assert cie.parent_id == parent.file_id
138 by mbp at sourcefrog
remove parallel tree from inventory;
583
                parent = cie
1 by mbp at sourcefrog
import from baz patch-364
584
            except KeyError:
585
                # or raise an error?
586
                return None
587
138 by mbp at sourcefrog
remove parallel tree from inventory;
588
        return parent.file_id
1 by mbp at sourcefrog
import from baz patch-364
589
590
591
    def has_filename(self, names):
592
        return bool(self.path2id(names))
593
594
595
    def has_id(self, file_id):
596
        return self._byid.has_key(file_id)
597
598
160 by mbp at sourcefrog
- basic support for moving files to different directories - have not done support for renaming them yet, but should be straightforward - some tests, but many cases are not handled yet i think
599
    def rename(self, file_id, new_parent_id, new_name):
600
        """Move a file within the inventory.
601
602
        This can change either the name, or the parent, or both.
603
604
        This does not move the working file."""
605
        if not is_valid_name(new_name):
606
            bailout("not an acceptable filename: %r" % new_name)
607
608
        new_parent = self._byid[new_parent_id]
609
        if new_name in new_parent.children:
610
            bailout("%r already exists in %r" % (new_name, self.id2path(new_parent_id)))
611
172 by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory
612
        new_parent_idpath = self.get_idpath(new_parent_id)
613
        if file_id in new_parent_idpath:
614
            bailout("cannot move directory %r into a subdirectory of itself, %r"
615
                    % (self.id2path(file_id), self.id2path(new_parent_id)))
616
160 by mbp at sourcefrog
- basic support for moving files to different directories - have not done support for renaming them yet, but should be straightforward - some tests, but many cases are not handled yet i think
617
        file_ie = self._byid[file_id]
618
        old_parent = self._byid[file_ie.parent_id]
619
620
        # TODO: Don't leave things messed up if this fails
621
622
        del old_parent.children[file_ie.name]
623
        new_parent.children[new_name] = file_ie
624
        
625
        file_ie.name = new_name
626
        file_ie.parent_id = new_parent_id
627
628
629
630
631
_NAME_RE = re.compile(r'^[^/\\]+$')
632
633
def is_valid_name(name):
634
    return bool(_NAME_RE.match(name))