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