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