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