~bzr-pqm/bzr/bzr.dev

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
955 by Martin Pool
- use __slots__ on InventoryEntry; rather faster
95
    __slots__ = ['text_sha1', 'text_size', 'file_id', 'name', 'kind',
96
                 'text_id', 'parent_id', 'children', ]
97
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
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
        
955 by Martin Pool
- use __slots__ on InventoryEntry; rather faster
116
        self.text_sha1 = None
117
        self.text_size = None
118
    
1 by mbp at sourcefrog
import from baz patch-364
119
        self.file_id = file_id
120
        self.name = name
121
        self.kind = kind
122
        self.text_id = text_id
123
        self.parent_id = parent_id
138 by mbp at sourcefrog
remove parallel tree from inventory;
124
        if kind == 'directory':
125
            self.children = {}
237 by mbp at sourcefrog
- Better assertions in InventoryEntry constructor
126
        elif kind == 'file':
127
            pass
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
128
        else:
237 by mbp at sourcefrog
- Better assertions in InventoryEntry constructor
129
            raise BzrError("unhandled entry kind %r" % kind)
130
1 by mbp at sourcefrog
import from baz patch-364
131
132
156 by mbp at sourcefrog
new "directories" command
133
    def sorted_children(self):
134
        l = self.children.items()
135
        l.sort()
136
        return l
137
138
1 by mbp at sourcefrog
import from baz patch-364
139
    def copy(self):
140
        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
141
                               self.parent_id, text_id=self.text_id)
1 by mbp at sourcefrog
import from baz patch-364
142
        other.text_sha1 = self.text_sha1
143
        other.text_size = self.text_size
490 by Martin Pool
doc
144
        # note that children are *not* copied; they're pulled across when
145
        # others are added
1 by mbp at sourcefrog
import from baz patch-364
146
        return other
147
148
149
    def __repr__(self):
150
        return ("%s(%r, %r, kind=%r, parent_id=%r)"
151
                % (self.__class__.__name__,
152
                   self.file_id,
153
                   self.name,
154
                   self.kind,
155
                   self.parent_id))
156
157
    
158
    def to_element(self):
159
        """Convert to XML element"""
802 by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions
160
        from bzrlib.xml import Element
161
        
1 by mbp at sourcefrog
import from baz patch-364
162
        e = Element('entry')
163
164
        e.set('name', self.name)
165
        e.set('file_id', self.file_id)
166
        e.set('kind', self.kind)
167
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
168
        if self.text_size != None:
1 by mbp at sourcefrog
import from baz patch-364
169
            e.set('text_size', '%d' % self.text_size)
170
            
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
171
        for f in ['text_id', 'text_sha1']:
1 by mbp at sourcefrog
import from baz patch-364
172
            v = getattr(self, f)
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
173
            if v != None:
1 by mbp at sourcefrog
import from baz patch-364
174
                e.set(f, v)
175
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
176
        # to be conservative, we don't externalize the root pointers
177
        # for now, leaving them as null in the xml form.  in a future
178
        # version it will be implied by nested elements.
179
        if self.parent_id != ROOT_ID:
180
            assert isinstance(self.parent_id, basestring)
181
            e.set('parent_id', self.parent_id)
182
1 by mbp at sourcefrog
import from baz patch-364
183
        e.tail = '\n'
184
            
185
        return e
186
187
188
    def from_element(cls, elt):
189
        assert elt.tag == 'entry'
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
190
191
        ## original format inventories don't have a parent_id for
192
        ## nodes in the root directory, but it's cleaner to use one
193
        ## internally.
194
        parent_id = elt.get('parent_id')
195
        if parent_id == None:
196
            parent_id = ROOT_ID
197
198
        self = cls(elt.get('file_id'), elt.get('name'), elt.get('kind'), parent_id)
1 by mbp at sourcefrog
import from baz patch-364
199
        self.text_id = elt.get('text_id')
200
        self.text_sha1 = elt.get('text_sha1')
201
        
202
        ## mutter("read inventoryentry: %r" % (elt.attrib))
203
204
        v = elt.get('text_size')
205
        self.text_size = v and int(v)
206
207
        return self
208
            
209
210
    from_element = classmethod(from_element)
211
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
212
    def __eq__(self, other):
1 by mbp at sourcefrog
import from baz patch-364
213
        if not isinstance(other, InventoryEntry):
214
            return NotImplemented
215
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
216
        return (self.file_id == other.file_id) \
217
               and (self.name == other.name) \
218
               and (self.text_sha1 == other.text_sha1) \
219
               and (self.text_size == other.text_size) \
220
               and (self.text_id == other.text_id) \
221
               and (self.parent_id == other.parent_id) \
222
               and (self.kind == other.kind)
223
224
225
    def __ne__(self, other):
226
        return not (self == other)
227
228
    def __hash__(self):
229
        raise ValueError('not hashable')
1 by mbp at sourcefrog
import from baz patch-364
230
231
232
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
233
class RootEntry(InventoryEntry):
234
    def __init__(self, file_id):
235
        self.file_id = file_id
236
        self.children = {}
237
        self.kind = 'root_directory'
238
        self.parent_id = None
156 by mbp at sourcefrog
new "directories" command
239
        self.name = ''
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
240
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
241
    def __eq__(self, other):
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
242
        if not isinstance(other, RootEntry):
243
            return NotImplemented
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
244
        
245
        return (self.file_id == other.file_id) \
246
               and (self.children == other.children)
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
247
248
249
802 by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions
250
class Inventory(object):
1 by mbp at sourcefrog
import from baz patch-364
251
    """Inventory of versioned files in a tree.
252
240 by mbp at sourcefrog
doc
253
    This describes which file_id is present at each point in the tree,
254
    and possibly the SHA-1 or other information about the file.
255
    Entries can be looked up either by path or by file_id.
1 by mbp at sourcefrog
import from baz patch-364
256
257
    The inventory represents a typical unix file tree, with
258
    directories containing files and subdirectories.  We never store
259
    the full path to a file, because renaming a directory implicitly
260
    moves all of its contents.  This class internally maintains a
261
    lookup tree that allows the children under a directory to be
262
    returned quickly.
263
264
    InventoryEntry objects must not be modified after they are
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
265
    inserted, other than through the Inventory API.
1 by mbp at sourcefrog
import from baz patch-364
266
267
    >>> inv = Inventory()
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
268
    >>> inv.add(InventoryEntry('123-123', 'hello.c', 'file', ROOT_ID))
1 by mbp at sourcefrog
import from baz patch-364
269
    >>> inv['123-123'].name
270
    'hello.c'
271
272
    May be treated as an iterator or set to look up file ids:
273
    
274
    >>> bool(inv.path2id('hello.c'))
275
    True
276
    >>> '123-123' in inv
277
    True
278
279
    May also look up by name:
280
281
    >>> [x[0] for x in inv.iter_entries()]
282
    ['hello.c']
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
283
    >>> inv = Inventory('TREE_ROOT-12345678-12345678')
284
    >>> inv.add(InventoryEntry('123-123', 'hello.c', 'file', ROOT_ID))
1 by mbp at sourcefrog
import from baz patch-364
285
    """
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
286
    def __init__(self, root_id=ROOT_ID):
1 by mbp at sourcefrog
import from baz patch-364
287
        """Create or read an inventory.
288
289
        If a working directory is specified, the inventory is read
290
        from there.  If the file is specified, read from that. If not,
291
        the inventory is created empty.
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
292
293
        The inventory is created with a default root directory, with
294
        an id of None.
1 by mbp at sourcefrog
import from baz patch-364
295
        """
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
296
        # We are letting Branch(init=True) create a unique inventory
297
        # root id. Rather than generating a random one here.
298
        #if root_id is None:
299
        #    root_id = bzrlib.branch.gen_file_id('TREE_ROOT')
300
        self.root = RootEntry(root_id)
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
301
        self._byid = {self.root.file_id: self.root}
1 by mbp at sourcefrog
import from baz patch-364
302
303
304
    def __iter__(self):
305
        return iter(self._byid)
306
307
308
    def __len__(self):
309
        """Returns number of entries."""
310
        return len(self._byid)
311
312
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
313
    def iter_entries(self, from_dir=None):
1 by mbp at sourcefrog
import from baz patch-364
314
        """Return (path, entry) pairs, in order by name."""
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
315
        if from_dir == None:
316
            assert self.root
317
            from_dir = self.root
318
        elif isinstance(from_dir, basestring):
319
            from_dir = self._byid[from_dir]
320
            
321
        kids = from_dir.children.items()
1 by mbp at sourcefrog
import from baz patch-364
322
        kids.sort()
323
        for name, ie in kids:
324
            yield name, ie
325
            if ie.kind == 'directory':
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
326
                for cn, cie in self.iter_entries(from_dir=ie.file_id):
271 by Martin Pool
- Windows path fixes
327
                    yield os.path.join(name, cn), cie
555 by Martin Pool
- New Inventory.entries() method
328
329
330
    def entries(self):
331
        """Return list of (path, ie) for all entries except the root.
332
333
        This may be faster than iter_entries.
334
        """
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
335
        accum = []
336
        def descend(dir_ie, dir_path):
556 by Martin Pool
- fix up Inventory.entries()
337
            kids = dir_ie.children.items()
555 by Martin Pool
- New Inventory.entries() method
338
            kids.sort()
339
            for name, ie in kids:
340
                child_path = os.path.join(dir_path, name)
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
341
                accum.append((child_path, ie))
555 by Martin Pool
- New Inventory.entries() method
342
                if ie.kind == 'directory':
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
343
                    descend(ie, child_path)
555 by Martin Pool
- New Inventory.entries() method
344
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
345
        descend(self.root, '')
346
        return accum
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
347
348
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
349
    def directories(self):
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
350
        """Return (path, entry) pairs for all directories, including the root.
1 by mbp at sourcefrog
import from baz patch-364
351
        """
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
352
        accum = []
353
        def descend(parent_ie, parent_path):
354
            accum.append((parent_path, parent_ie))
156 by mbp at sourcefrog
new "directories" command
355
            
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
356
            kids = [(ie.name, ie) for ie in parent_ie.children.itervalues() if ie.kind == 'directory']
357
            kids.sort()
156 by mbp at sourcefrog
new "directories" command
358
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
359
            for name, child_ie in kids:
360
                child_path = os.path.join(parent_path, name)
361
                descend(child_ie, child_path)
362
        descend(self.root, '')
363
        return accum
1 by mbp at sourcefrog
import from baz patch-364
364
        
365
366
367
    def __contains__(self, file_id):
368
        """True if this entry contains a file with given id.
369
370
        >>> inv = Inventory()
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
371
        >>> inv.add(InventoryEntry('123', 'foo.c', 'file', ROOT_ID))
1 by mbp at sourcefrog
import from baz patch-364
372
        >>> '123' in inv
373
        True
374
        >>> '456' in inv
375
        False
376
        """
377
        return file_id in self._byid
378
379
380
    def __getitem__(self, file_id):
381
        """Return the entry for given file_id.
382
383
        >>> inv = Inventory()
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
384
        >>> inv.add(InventoryEntry('123123', 'hello.c', 'file', ROOT_ID))
1 by mbp at sourcefrog
import from baz patch-364
385
        >>> inv['123123'].name
386
        'hello.c'
387
        """
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
388
        try:
389
            return self._byid[file_id]
390
        except KeyError:
380 by Martin Pool
- Slight optimization for Inventory.__getitem__
391
            if file_id == None:
392
                raise BzrError("can't look up file_id None")
393
            else:
394
                raise BzrError("file_id {%s} not in inventory" % file_id)
1 by mbp at sourcefrog
import from baz patch-364
395
396
460 by Martin Pool
- new testing command compare-trees
397
    def get_file_kind(self, file_id):
398
        return self._byid[file_id].kind
399
138 by mbp at sourcefrog
remove parallel tree from inventory;
400
    def get_child(self, parent_id, filename):
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
401
        return self[parent_id].children.get(filename)
138 by mbp at sourcefrog
remove parallel tree from inventory;
402
403
1 by mbp at sourcefrog
import from baz patch-364
404
    def add(self, entry):
405
        """Add entry to inventory.
406
407
        To add  a file to a branch ready to be committed, use Branch.add,
408
        which calls this."""
139 by mbp at sourcefrog
simplified/faster Inventory.add
409
        if entry.file_id in self._byid:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
410
            raise BzrError("inventory already contains entry with id {%s}" % entry.file_id)
1 by mbp at sourcefrog
import from baz patch-364
411
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
412
        if entry.parent_id == ROOT_ID or entry.parent_id is None:
413
            entry.parent_id = self.root.file_id
414
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
415
        try:
416
            parent = self._byid[entry.parent_id]
417
        except KeyError:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
418
            raise BzrError("parent_id {%s} not in inventory" % entry.parent_id)
139 by mbp at sourcefrog
simplified/faster Inventory.add
419
420
        if parent.children.has_key(entry.name):
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
421
            raise BzrError("%s is already versioned" %
140 by mbp at sourcefrog
fix error message for repeated add
422
                    appendpath(self.id2path(parent.file_id), entry.name))
1 by mbp at sourcefrog
import from baz patch-364
423
424
        self._byid[entry.file_id] = entry
139 by mbp at sourcefrog
simplified/faster Inventory.add
425
        parent.children[entry.name] = entry
1 by mbp at sourcefrog
import from baz patch-364
426
427
70 by mbp at sourcefrog
Prepare for smart recursive add.
428
    def add_path(self, relpath, kind, file_id=None):
429
        """Add entry from a path.
430
431
        The immediate parent must already be versioned"""
753 by Martin Pool
- new exception NotVersionedError
432
        from bzrlib.errors import NotVersionedError
433
        
70 by mbp at sourcefrog
Prepare for smart recursive add.
434
        parts = bzrlib.osutils.splitpath(relpath)
435
        if len(parts) == 0:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
436
            raise BzrError("cannot re-add root of inventory")
70 by mbp at sourcefrog
Prepare for smart recursive add.
437
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
438
        if file_id == None:
800 by Martin Pool
Merge John's import-speedup branch:
439
            from bzrlib.branch import gen_file_id
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))