~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
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']
280
    """
281
    def __init__(self):
282
        """Create or read an inventory.
283
284
        If a working directory is specified, the inventory is read
285
        from there.  If the file is specified, read from that. If not,
286
        the inventory is created empty.
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
287
288
        The inventory is created with a default root directory, with
289
        an id of None.
1 by mbp at sourcefrog
import from baz patch-364
290
        """
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
291
        self.root = RootEntry(ROOT_ID)
292
        self._byid = {self.root.file_id: self.root}
1 by mbp at sourcefrog
import from baz patch-364
293
294
295
    def __iter__(self):
296
        return iter(self._byid)
297
298
299
    def __len__(self):
300
        """Returns number of entries."""
301
        return len(self._byid)
302
303
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
304
    def iter_entries(self, from_dir=None):
1 by mbp at sourcefrog
import from baz patch-364
305
        """Return (path, entry) pairs, in order by name."""
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
306
        if from_dir == None:
307
            assert self.root
308
            from_dir = self.root
309
        elif isinstance(from_dir, basestring):
310
            from_dir = self._byid[from_dir]
311
            
312
        kids = from_dir.children.items()
1 by mbp at sourcefrog
import from baz patch-364
313
        kids.sort()
314
        for name, ie in kids:
315
            yield name, ie
316
            if ie.kind == 'directory':
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
317
                for cn, cie in self.iter_entries(from_dir=ie.file_id):
271 by Martin Pool
- Windows path fixes
318
                    yield os.path.join(name, cn), cie
555 by Martin Pool
- New Inventory.entries() method
319
320
321
    def entries(self):
322
        """Return list of (path, ie) for all entries except the root.
323
324
        This may be faster than iter_entries.
325
        """
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
326
        accum = []
327
        def descend(dir_ie, dir_path):
556 by Martin Pool
- fix up Inventory.entries()
328
            kids = dir_ie.children.items()
555 by Martin Pool
- New Inventory.entries() method
329
            kids.sort()
330
            for name, ie in kids:
331
                child_path = os.path.join(dir_path, name)
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
332
                accum.append((child_path, ie))
555 by Martin Pool
- New Inventory.entries() method
333
                if ie.kind == 'directory':
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
334
                    descend(ie, child_path)
555 by Martin Pool
- New Inventory.entries() method
335
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
336
        descend(self.root, '')
337
        return accum
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
338
339
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
340
    def directories(self):
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
341
        """Return (path, entry) pairs for all directories, including the root.
1 by mbp at sourcefrog
import from baz patch-364
342
        """
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
343
        accum = []
344
        def descend(parent_ie, parent_path):
345
            accum.append((parent_path, parent_ie))
156 by mbp at sourcefrog
new "directories" command
346
            
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
347
            kids = [(ie.name, ie) for ie in parent_ie.children.itervalues() if ie.kind == 'directory']
348
            kids.sort()
156 by mbp at sourcefrog
new "directories" command
349
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
350
            for name, child_ie in kids:
351
                child_path = os.path.join(parent_path, name)
352
                descend(child_ie, child_path)
353
        descend(self.root, '')
354
        return accum
1 by mbp at sourcefrog
import from baz patch-364
355
        
356
357
358
    def __contains__(self, file_id):
359
        """True if this entry contains a file with given id.
360
361
        >>> inv = Inventory()
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
362
        >>> inv.add(InventoryEntry('123', 'foo.c', 'file', ROOT_ID))
1 by mbp at sourcefrog
import from baz patch-364
363
        >>> '123' in inv
364
        True
365
        >>> '456' in inv
366
        False
367
        """
368
        return file_id in self._byid
369
370
371
    def __getitem__(self, file_id):
372
        """Return the entry for given file_id.
373
374
        >>> inv = Inventory()
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
375
        >>> inv.add(InventoryEntry('123123', 'hello.c', 'file', ROOT_ID))
1 by mbp at sourcefrog
import from baz patch-364
376
        >>> inv['123123'].name
377
        'hello.c'
378
        """
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
379
        try:
380
            return self._byid[file_id]
381
        except KeyError:
380 by Martin Pool
- Slight optimization for Inventory.__getitem__
382
            if file_id == None:
383
                raise BzrError("can't look up file_id None")
384
            else:
385
                raise BzrError("file_id {%s} not in inventory" % file_id)
1 by mbp at sourcefrog
import from baz patch-364
386
387
460 by Martin Pool
- new testing command compare-trees
388
    def get_file_kind(self, file_id):
389
        return self._byid[file_id].kind
390
138 by mbp at sourcefrog
remove parallel tree from inventory;
391
    def get_child(self, parent_id, filename):
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
392
        return self[parent_id].children.get(filename)
138 by mbp at sourcefrog
remove parallel tree from inventory;
393
394
1 by mbp at sourcefrog
import from baz patch-364
395
    def add(self, entry):
396
        """Add entry to inventory.
397
398
        To add  a file to a branch ready to be committed, use Branch.add,
399
        which calls this."""
139 by mbp at sourcefrog
simplified/faster Inventory.add
400
        if entry.file_id in self._byid:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
401
            raise BzrError("inventory already contains entry with id {%s}" % entry.file_id)
1 by mbp at sourcefrog
import from baz patch-364
402
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
403
        try:
404
            parent = self._byid[entry.parent_id]
405
        except KeyError:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
406
            raise BzrError("parent_id {%s} not in inventory" % entry.parent_id)
139 by mbp at sourcefrog
simplified/faster Inventory.add
407
408
        if parent.children.has_key(entry.name):
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
409
            raise BzrError("%s is already versioned" %
140 by mbp at sourcefrog
fix error message for repeated add
410
                    appendpath(self.id2path(parent.file_id), entry.name))
1 by mbp at sourcefrog
import from baz patch-364
411
412
        self._byid[entry.file_id] = entry
139 by mbp at sourcefrog
simplified/faster Inventory.add
413
        parent.children[entry.name] = entry
1 by mbp at sourcefrog
import from baz patch-364
414
415
70 by mbp at sourcefrog
Prepare for smart recursive add.
416
    def add_path(self, relpath, kind, file_id=None):
417
        """Add entry from a path.
418
419
        The immediate parent must already be versioned"""
753 by Martin Pool
- new exception NotVersionedError
420
        from bzrlib.errors import NotVersionedError
421
        
70 by mbp at sourcefrog
Prepare for smart recursive add.
422
        parts = bzrlib.osutils.splitpath(relpath)
423
        if len(parts) == 0:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
424
            raise BzrError("cannot re-add root of inventory")
70 by mbp at sourcefrog
Prepare for smart recursive add.
425
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
426
        if file_id == None:
800 by Martin Pool
Merge John's import-speedup branch:
427
            from bzrlib.branch import gen_file_id
428
            file_id = gen_file_id(relpath)
70 by mbp at sourcefrog
Prepare for smart recursive add.
429
753 by Martin Pool
- new exception NotVersionedError
430
        parent_path = parts[:-1]
431
        parent_id = self.path2id(parent_path)
432
        if parent_id == None:
433
            raise NotVersionedError(parent_path)
434
70 by mbp at sourcefrog
Prepare for smart recursive add.
435
        ie = InventoryEntry(file_id, parts[-1],
436
                            kind=kind, parent_id=parent_id)
437
        return self.add(ie)
438
439
1 by mbp at sourcefrog
import from baz patch-364
440
    def __delitem__(self, file_id):
441
        """Remove entry by id.
442
443
        >>> inv = Inventory()
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
444
        >>> inv.add(InventoryEntry('123', 'foo.c', 'file', ROOT_ID))
1 by mbp at sourcefrog
import from baz patch-364
445
        >>> '123' in inv
446
        True
447
        >>> del inv['123']
448
        >>> '123' in inv
449
        False
450
        """
451
        ie = self[file_id]
452
138 by mbp at sourcefrog
remove parallel tree from inventory;
453
        assert self[ie.parent_id].children[ie.name] == ie
1 by mbp at sourcefrog
import from baz patch-364
454
        
455
        # TODO: Test deleting all children; maybe hoist to a separate
456
        # deltree method?
457
        if ie.kind == 'directory':
138 by mbp at sourcefrog
remove parallel tree from inventory;
458
            for cie in ie.children.values():
1 by mbp at sourcefrog
import from baz patch-364
459
                del self[cie.file_id]
138 by mbp at sourcefrog
remove parallel tree from inventory;
460
            del ie.children
1 by mbp at sourcefrog
import from baz patch-364
461
462
        del self._byid[file_id]
138 by mbp at sourcefrog
remove parallel tree from inventory;
463
        del self[ie.parent_id].children[ie.name]
1 by mbp at sourcefrog
import from baz patch-364
464
465
466
    def to_element(self):
467
        """Convert to XML Element"""
802 by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions
468
        from bzrlib.xml import Element
469
        
1 by mbp at sourcefrog
import from baz patch-364
470
        e = Element('inventory')
471
        e.text = '\n'
472
        for path, ie in self.iter_entries():
473
            e.append(ie.to_element())
474
        return e
475
    
476
477
    def from_element(cls, elt):
478
        """Construct from XML Element
848 by Martin Pool
doc
479
        
1 by mbp at sourcefrog
import from baz patch-364
480
        >>> inv = Inventory()
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
481
        >>> inv.add(InventoryEntry('foo.c-123981239', 'foo.c', 'file', ROOT_ID))
1 by mbp at sourcefrog
import from baz patch-364
482
        >>> elt = inv.to_element()
483
        >>> inv2 = Inventory.from_element(elt)
484
        >>> inv2 == inv
485
        True
486
        """
848 by Martin Pool
doc
487
        # XXXX: doctest doesn't run this properly under python2.3
1 by mbp at sourcefrog
import from baz patch-364
488
        assert elt.tag == 'inventory'
489
        o = cls()
490
        for e in elt:
491
            o.add(InventoryEntry.from_element(e))
492
        return o
493
        
494
    from_element = classmethod(from_element)
495
496
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
497
    def __eq__(self, other):
1 by mbp at sourcefrog
import from baz patch-364
498
        """Compare two sets by comparing their contents.
499
500
        >>> i1 = Inventory()
501
        >>> i2 = Inventory()
502
        >>> i1 == i2
503
        True
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
504
        >>> i1.add(InventoryEntry('123', 'foo', 'file', ROOT_ID))
1 by mbp at sourcefrog
import from baz patch-364
505
        >>> i1 == i2
506
        False
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
507
        >>> i2.add(InventoryEntry('123', 'foo', 'file', ROOT_ID))
1 by mbp at sourcefrog
import from baz patch-364
508
        >>> i1 == i2
509
        True
510
        """
511
        if not isinstance(other, Inventory):
512
            return NotImplemented
513
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
514
        if len(self._byid) != len(other._byid):
543 by Martin Pool
- More cleanups for set type
515
            # shortcut: obviously not the same
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
516
            return False
517
518
        return self._byid == other._byid
519
520
521
    def __ne__(self, other):
522
        return not (self == other)
523
524
525
    def __hash__(self):
526
        raise ValueError('not hashable')
527
1 by mbp at sourcefrog
import from baz patch-364
528
529
172 by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory
530
    def get_idpath(self, file_id):
531
        """Return a list of file_ids for the path to an entry.
532
533
        The list contains one element for each directory followed by
534
        the id of the file itself.  So the length of the returned list
535
        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
536
        root directory as depth 1.
172 by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory
537
        """
538
        p = []
539
        while file_id != None:
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
540
            try:
541
                ie = self._byid[file_id]
542
            except KeyError:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
543
                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
544
            p.insert(0, ie.file_id)
545
            file_id = ie.parent_id
546
        return p
547
548
1 by mbp at sourcefrog
import from baz patch-364
549
    def id2path(self, file_id):
550
        """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
551
552
        # get all names, skipping root
553
        p = [self[fid].name for fid in self.get_idpath(file_id)[1:]]
271 by Martin Pool
- Windows path fixes
554
        return os.sep.join(p)
1 by mbp at sourcefrog
import from baz patch-364
555
            
556
557
558
    def path2id(self, name):
559
        """Walk down through directories to return entry of last component.
560
561
        names may be either a list of path components, or a single
562
        string, in which case it is automatically split.
563
564
        This returns the entry of the last component in the path,
565
        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
566
567
        Returns None iff the path is not found.
1 by mbp at sourcefrog
import from baz patch-364
568
        """
70 by mbp at sourcefrog
Prepare for smart recursive add.
569
        if isinstance(name, types.StringTypes):
570
            name = splitpath(name)
1 by mbp at sourcefrog
import from baz patch-364
571
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
572
        mutter("lookup path %r" % name)
573
574
        parent = self.root
70 by mbp at sourcefrog
Prepare for smart recursive add.
575
        for f in name:
1 by mbp at sourcefrog
import from baz patch-364
576
            try:
138 by mbp at sourcefrog
remove parallel tree from inventory;
577
                cie = parent.children[f]
1 by mbp at sourcefrog
import from baz patch-364
578
                assert cie.name == f
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
579
                assert cie.parent_id == parent.file_id
138 by mbp at sourcefrog
remove parallel tree from inventory;
580
                parent = cie
1 by mbp at sourcefrog
import from baz patch-364
581
            except KeyError:
582
                # or raise an error?
583
                return None
584
138 by mbp at sourcefrog
remove parallel tree from inventory;
585
        return parent.file_id
1 by mbp at sourcefrog
import from baz patch-364
586
587
588
    def has_filename(self, names):
589
        return bool(self.path2id(names))
590
591
592
    def has_id(self, file_id):
593
        return self._byid.has_key(file_id)
594
595
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
596
    def rename(self, file_id, new_parent_id, new_name):
597
        """Move a file within the inventory.
598
599
        This can change either the name, or the parent, or both.
600
601
        This does not move the working file."""
602
        if not is_valid_name(new_name):
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
603
            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
604
605
        new_parent = self._byid[new_parent_id]
606
        if new_name in new_parent.children:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
607
            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
608
172 by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory
609
        new_parent_idpath = self.get_idpath(new_parent_id)
610
        if file_id in new_parent_idpath:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
611
            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
612
                    % (self.id2path(file_id), self.id2path(new_parent_id)))
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
        file_ie = self._byid[file_id]
615
        old_parent = self._byid[file_ie.parent_id]
616
617
        # TODO: Don't leave things messed up if this fails
618
619
        del old_parent.children[file_ie.name]
620
        new_parent.children[new_name] = file_ie
621
        
622
        file_ie.name = new_name
623
        file_ie.parent_id = new_parent_id
624
625
626
627
628
_NAME_RE = re.compile(r'^[^/\\]+$')
629
630
def is_valid_name(name):
631
    return bool(_NAME_RE.match(name))