/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
"""Inventories map files to their name in a revision."""
18
120 by mbp at sourcefrog
more check functions
19
# TODO: Maybe store inventory_id in the file?  Not really needed.
1 by mbp at sourcefrog
import from baz patch-364
20
21
__copyright__ = "Copyright (C) 2005 Canonical Ltd."
22
__author__ = "Martin Pool <mbp@canonical.com>"
23
24
import sys, os.path, types
25
from sets import Set
26
7 by mbp at sourcefrog
depend only on regular ElementTree installation
27
try:
28
    from cElementTree import Element, ElementTree, SubElement
29
except ImportError:
27 by mbp at sourcefrog
- fix up use of ElementTree without cElementTree
30
    from elementtree.ElementTree import Element, ElementTree, SubElement
7 by mbp at sourcefrog
depend only on regular ElementTree installation
31
1 by mbp at sourcefrog
import from baz patch-364
32
from xml import XMLMixin
33
from errors import bailout
70 by mbp at sourcefrog
Prepare for smart recursive add.
34
35
import bzrlib
36
from bzrlib.osutils import uuid, quotefn, splitpath, joinpath, appendpath
37
from bzrlib.trace import mutter
1 by mbp at sourcefrog
import from baz patch-364
38
39
class InventoryEntry(XMLMixin):
40
    """Description of a versioned file.
41
42
    An InventoryEntry has the following fields, which are also
43
    present in the XML inventory-entry element:
44
45
    * *file_id*
46
    * *name*: (only the basename within the directory, must not
47
      contain slashes)
48
    * *kind*: "directory" or "file"
49
    * *directory_id*: (if absent/null means the branch root directory)
50
    * *text_sha1*: only for files
51
    * *text_size*: in bytes, only for files 
52
    * *text_id*: identifier for the text version, only for files
53
54
    InventoryEntries can also exist inside a WorkingTree
55
    inventory, in which case they are not yet bound to a
56
    particular revision of the file.  In that case the text_sha1,
57
    text_size and text_id are absent.
58
59
60
    >>> i = Inventory()
61
    >>> i.path2id('')
62
    >>> i.add(InventoryEntry('123', 'src', kind='directory'))
63
    >>> i.add(InventoryEntry('2323', 'hello.c', parent_id='123'))
64
    >>> for j in i.iter_entries():
65
    ...   print j
66
    ... 
67
    ('src', InventoryEntry('123', 'src', kind='directory', parent_id=None))
68
    ('src/hello.c', InventoryEntry('2323', 'hello.c', kind='file', parent_id='123'))
69
    >>> i.add(InventoryEntry('2323', 'bye.c', parent_id='123'))
70
    Traceback (most recent call last):
71
    ...
72
    BzrError: ('inventory already contains entry with id {2323}', [])
73
    >>> i.add(InventoryEntry('2324', 'bye.c', parent_id='123'))
74
    >>> i.add(InventoryEntry('2325', 'wibble', parent_id='123', kind='directory'))
75
    >>> i.path2id('src/wibble')
76
    '2325'
77
    >>> '2325' in i
78
    True
79
    >>> i.add(InventoryEntry('2326', 'wibble.c', parent_id='2325'))
80
    >>> i['2326']
81
    InventoryEntry('2326', 'wibble.c', kind='file', parent_id='2325')
82
    >>> for j in i.iter_entries():
83
    ...     print j[0]
84
    ...     assert i.path2id(j[0])
85
    ... 
86
    src
87
    src/bye.c
88
    src/hello.c
89
    src/wibble
90
    src/wibble/wibble.c
91
    >>> i.id2path('2326')
92
    'src/wibble/wibble.c'
93
94
    :todo: Maybe also keep the full path of the entry, and the children?
95
           But those depend on its position within a particular inventory, and
96
           it would be nice not to need to hold the backpointer here.
97
    """
98
    def __init__(self, file_id, name, kind='file', text_id=None,
99
                 parent_id=None):
100
        """Create an InventoryEntry
101
        
102
        The filename must be a single component, relative to the
103
        parent directory; it cannot be a whole path or relative name.
104
105
        >>> e = InventoryEntry('123', 'hello.c')
106
        >>> e.name
107
        'hello.c'
108
        >>> e.file_id
109
        '123'
110
        >>> e = InventoryEntry('123', 'src/hello.c')
111
        Traceback (most recent call last):
112
        BzrError: ("InventoryEntry name is not a simple filename: 'src/hello.c'", [])
113
        """
114
        
115
        if len(splitpath(name)) != 1:
116
            bailout('InventoryEntry name is not a simple filename: %r'
117
                    % name)
118
        
119
        self.file_id = file_id
120
        self.name = name
121
        assert kind in ['file', 'directory']
122
        self.kind = kind
123
        self.text_id = text_id
124
        self.parent_id = parent_id
125
        self.text_sha1 = None
126
        self.text_size = None
138 by mbp at sourcefrog
remove parallel tree from inventory;
127
        if kind == 'directory':
128
            self.children = {}
1 by mbp at sourcefrog
import from baz patch-364
129
130
131
    def copy(self):
132
        other = InventoryEntry(self.file_id, self.name, self.kind,
133
                               self.text_id, self.parent_id)
134
        other.text_sha1 = self.text_sha1
135
        other.text_size = self.text_size
136
        return other
137
138
139
    def __repr__(self):
140
        return ("%s(%r, %r, kind=%r, parent_id=%r)"
141
                % (self.__class__.__name__,
142
                   self.file_id,
143
                   self.name,
144
                   self.kind,
145
                   self.parent_id))
146
147
    
148
    def to_element(self):
149
        """Convert to XML element"""
150
        e = Element('entry')
151
152
        e.set('name', self.name)
153
        e.set('file_id', self.file_id)
154
        e.set('kind', self.kind)
155
156
        if self.text_size is not None:
157
            e.set('text_size', '%d' % self.text_size)
158
            
159
        for f in ['text_id', 'text_sha1', 'parent_id']:
160
            v = getattr(self, f)
161
            if v is not None:
162
                e.set(f, v)
163
164
        e.tail = '\n'
165
            
166
        return e
167
168
169
    def from_element(cls, elt):
170
        assert elt.tag == 'entry'
171
        self = cls(elt.get('file_id'), elt.get('name'), elt.get('kind'))
172
        self.text_id = elt.get('text_id')
173
        self.text_sha1 = elt.get('text_sha1')
174
        self.parent_id = elt.get('parent_id')
175
        
176
        ## mutter("read inventoryentry: %r" % (elt.attrib))
177
178
        v = elt.get('text_size')
179
        self.text_size = v and int(v)
180
181
        return self
182
            
183
184
    from_element = classmethod(from_element)
185
186
    def __cmp__(self, other):
187
        if self is other:
188
            return 0
189
        if not isinstance(other, InventoryEntry):
190
            return NotImplemented
191
192
        return cmp(self.file_id, other.file_id) \
193
               or cmp(self.name, other.name) \
194
               or cmp(self.text_sha1, other.text_sha1) \
195
               or cmp(self.text_size, other.text_size) \
196
               or cmp(self.text_id, other.text_id) \
197
               or cmp(self.parent_id, other.parent_id) \
198
               or cmp(self.kind, other.kind)
199
200
201
202
class Inventory(XMLMixin):
203
    """Inventory of versioned files in a tree.
204
205
    An Inventory acts like a set of InventoryEntry items.  You can
206
    also look files up by their file_id or name.
207
    
208
    May be read from and written to a metadata file in a tree.  To
209
    manipulate the inventory (for example to add a file), it is read
210
    in, modified, and then written back out.
211
212
    The inventory represents a typical unix file tree, with
213
    directories containing files and subdirectories.  We never store
214
    the full path to a file, because renaming a directory implicitly
215
    moves all of its contents.  This class internally maintains a
216
    lookup tree that allows the children under a directory to be
217
    returned quickly.
218
219
    InventoryEntry objects must not be modified after they are
220
    inserted.
221
222
    >>> inv = Inventory()
223
    >>> inv.write_xml(sys.stdout)
224
    <inventory>
225
    </inventory>
226
    >>> inv.add(InventoryEntry('123-123', 'hello.c'))
227
    >>> inv['123-123'].name
228
    'hello.c'
229
230
    May be treated as an iterator or set to look up file ids:
231
    
232
    >>> bool(inv.path2id('hello.c'))
233
    True
234
    >>> '123-123' in inv
235
    True
236
237
    May also look up by name:
238
239
    >>> [x[0] for x in inv.iter_entries()]
240
    ['hello.c']
241
    
242
    >>> inv.write_xml(sys.stdout)
243
    <inventory>
244
    <entry file_id="123-123" kind="file" name="hello.c" />
245
    </inventory>
246
247
    """
248
249
    ## TODO: Make sure only canonical filenames are stored.
250
251
    ## TODO: Do something sensible about the possible collisions on
252
    ## case-losing filesystems.  Perhaps we should just always forbid
253
    ## such collisions.
254
138 by mbp at sourcefrog
remove parallel tree from inventory;
255
    ## TODO: No special cases for root, rather just give it a file id
256
    ## like everything else.
257
258
    ## TODO: Probably change XML serialization to use nesting
1 by mbp at sourcefrog
import from baz patch-364
259
260
    def __init__(self):
261
        """Create or read an inventory.
262
263
        If a working directory is specified, the inventory is read
264
        from there.  If the file is specified, read from that. If not,
265
        the inventory is created empty.
266
        """
138 by mbp at sourcefrog
remove parallel tree from inventory;
267
        self._root = InventoryEntry(None, '', kind='directory')
268
        self._byid = {None: self._root}
1 by mbp at sourcefrog
import from baz patch-364
269
270
271
    def __iter__(self):
272
        return iter(self._byid)
273
274
275
    def __len__(self):
276
        """Returns number of entries."""
277
        return len(self._byid)
278
279
280
    def iter_entries(self, parent_id=None):
281
        """Return (path, entry) pairs, in order by name."""
138 by mbp at sourcefrog
remove parallel tree from inventory;
282
        kids = self[parent_id].children.items()
1 by mbp at sourcefrog
import from baz patch-364
283
        kids.sort()
284
        for name, ie in kids:
285
            yield name, ie
286
            if ie.kind == 'directory':
287
                for cn, cie in self.iter_entries(parent_id=ie.file_id):
288
                    yield joinpath([name, cn]), cie
289
290
291
    def directories(self, include_root=True):
292
        """Return (path, entry) pairs for all directories.
293
        """
294
        if include_root:
295
            yield '', None
296
        for path, entry in self.iter_entries():
297
            if entry.kind == 'directory':
298
                yield path, entry
299
        
300
301
302
    def __contains__(self, file_id):
303
        """True if this entry contains a file with given id.
304
305
        >>> inv = Inventory()
306
        >>> inv.add(InventoryEntry('123', 'foo.c'))
307
        >>> '123' in inv
308
        True
309
        >>> '456' in inv
310
        False
311
        """
312
        return file_id in self._byid
313
314
315
    def __getitem__(self, file_id):
316
        """Return the entry for given file_id.
317
318
        >>> inv = Inventory()
319
        >>> inv.add(InventoryEntry('123123', 'hello.c'))
320
        >>> inv['123123'].name
321
        'hello.c'
322
        """
323
        return self._byid[file_id]
324
325
138 by mbp at sourcefrog
remove parallel tree from inventory;
326
    def get_child(self, parent_id, filename):
327
        if parent_id == None:
328
            return self._root.children.get(filename)
329
        else:
330
            return self[parent_id].children.get(filename)
331
332
1 by mbp at sourcefrog
import from baz patch-364
333
    def add(self, entry):
334
        """Add entry to inventory.
335
336
        To add  a file to a branch ready to be committed, use Branch.add,
337
        which calls this."""
139 by mbp at sourcefrog
simplified/faster Inventory.add
338
        if entry.file_id in self._byid:
1 by mbp at sourcefrog
import from baz patch-364
339
            bailout("inventory already contains entry with id {%s}" % entry.file_id)
340
139 by mbp at sourcefrog
simplified/faster Inventory.add
341
        parent = self._byid[entry.parent_id]
342
        if parent.kind != 'directory':
343
            bailout("attempt to add under non-directory {%s}" % parent.file_id)
344
345
        if parent.children.has_key(entry.name):
140 by mbp at sourcefrog
fix error message for repeated add
346
            bailout("%s is already versioned" %
347
                    appendpath(self.id2path(parent.file_id), entry.name))
1 by mbp at sourcefrog
import from baz patch-364
348
349
        self._byid[entry.file_id] = entry
139 by mbp at sourcefrog
simplified/faster Inventory.add
350
        parent.children[entry.name] = entry
1 by mbp at sourcefrog
import from baz patch-364
351
352
70 by mbp at sourcefrog
Prepare for smart recursive add.
353
    def add_path(self, relpath, kind, file_id=None):
354
        """Add entry from a path.
355
356
        The immediate parent must already be versioned"""
357
        parts = bzrlib.osutils.splitpath(relpath)
358
        if len(parts) == 0:
359
            bailout("cannot re-add root of inventory")
360
361
        if file_id is None:
362
            file_id = bzrlib.branch.gen_file_id(relpath)
363
364
        parent_id = self.path2id(parts[:-1])
365
        ie = InventoryEntry(file_id, parts[-1],
366
                            kind=kind, parent_id=parent_id)
367
        return self.add(ie)
368
369
1 by mbp at sourcefrog
import from baz patch-364
370
    def __delitem__(self, file_id):
371
        """Remove entry by id.
372
373
        >>> inv = Inventory()
374
        >>> inv.add(InventoryEntry('123', 'foo.c'))
375
        >>> '123' in inv
376
        True
377
        >>> del inv['123']
378
        >>> '123' in inv
379
        False
380
        """
381
        ie = self[file_id]
382
138 by mbp at sourcefrog
remove parallel tree from inventory;
383
        assert self[ie.parent_id].children[ie.name] == ie
1 by mbp at sourcefrog
import from baz patch-364
384
        
385
        # TODO: Test deleting all children; maybe hoist to a separate
386
        # deltree method?
387
        if ie.kind == 'directory':
138 by mbp at sourcefrog
remove parallel tree from inventory;
388
            for cie in ie.children.values():
1 by mbp at sourcefrog
import from baz patch-364
389
                del self[cie.file_id]
138 by mbp at sourcefrog
remove parallel tree from inventory;
390
            del ie.children
1 by mbp at sourcefrog
import from baz patch-364
391
392
        del self._byid[file_id]
138 by mbp at sourcefrog
remove parallel tree from inventory;
393
        del self[ie.parent_id].children[ie.name]
1 by mbp at sourcefrog
import from baz patch-364
394
395
396
    def id_set(self):
397
        return Set(self._byid)
398
399
400
    def to_element(self):
401
        """Convert to XML Element"""
402
        e = Element('inventory')
403
        e.text = '\n'
404
        for path, ie in self.iter_entries():
405
            e.append(ie.to_element())
406
        return e
407
    
408
409
    def from_element(cls, elt):
410
        """Construct from XML Element
411
412
        >>> inv = Inventory()
413
        >>> inv.add(InventoryEntry('foo.c-123981239', 'foo.c'))
414
        >>> elt = inv.to_element()
415
        >>> inv2 = Inventory.from_element(elt)
416
        >>> inv2 == inv
417
        True
418
        """
419
        assert elt.tag == 'inventory'
420
        o = cls()
421
        for e in elt:
422
            o.add(InventoryEntry.from_element(e))
423
        return o
424
        
425
    from_element = classmethod(from_element)
426
427
428
    def __cmp__(self, other):
429
        """Compare two sets by comparing their contents.
430
431
        >>> i1 = Inventory()
432
        >>> i2 = Inventory()
433
        >>> i1 == i2
434
        True
435
        >>> i1.add(InventoryEntry('123', 'foo'))
436
        >>> i1 == i2
437
        False
438
        >>> i2.add(InventoryEntry('123', 'foo'))
439
        >>> i1 == i2
440
        True
441
        """
442
        if self is other:
443
            return 0
444
        
445
        if not isinstance(other, Inventory):
446
            return NotImplemented
447
448
        if self.id_set() ^ other.id_set():
449
            return 1
450
451
        for file_id in self._byid:
452
            c = cmp(self[file_id], other[file_id])
453
            if c: return c
454
455
        return 0
456
457
458
    def id2path(self, file_id):
459
        """Return as a list the path to file_id."""
460
        p = []
461
        while file_id != None:
462
            ie = self[file_id]
463
            p = [ie.name] + p
464
            file_id = ie.parent_id
465
        return joinpath(p)
466
            
467
468
469
    def path2id(self, name):
470
        """Walk down through directories to return entry of last component.
471
472
        names may be either a list of path components, or a single
473
        string, in which case it is automatically split.
474
475
        This returns the entry of the last component in the path,
476
        which may be either a file or a directory.
477
        """
70 by mbp at sourcefrog
Prepare for smart recursive add.
478
        if isinstance(name, types.StringTypes):
479
            name = splitpath(name)
1 by mbp at sourcefrog
import from baz patch-364
480
138 by mbp at sourcefrog
remove parallel tree from inventory;
481
        parent = self[None]
70 by mbp at sourcefrog
Prepare for smart recursive add.
482
        for f in name:
1 by mbp at sourcefrog
import from baz patch-364
483
            try:
138 by mbp at sourcefrog
remove parallel tree from inventory;
484
                cie = parent.children[f]
1 by mbp at sourcefrog
import from baz patch-364
485
                assert cie.name == f
138 by mbp at sourcefrog
remove parallel tree from inventory;
486
                parent = cie
1 by mbp at sourcefrog
import from baz patch-364
487
            except KeyError:
488
                # or raise an error?
489
                return None
490
138 by mbp at sourcefrog
remove parallel tree from inventory;
491
        return parent.file_id
1 by mbp at sourcefrog
import from baz patch-364
492
493
494
    def has_filename(self, names):
495
        return bool(self.path2id(names))
496
497
498
    def has_id(self, file_id):
499
        assert isinstance(file_id, str)
500
        return self._byid.has_key(file_id)
501
502
503
70 by mbp at sourcefrog
Prepare for smart recursive add.
504
505
1 by mbp at sourcefrog
import from baz patch-364
506
if __name__ == '__main__':
507
    import doctest, inventory
508
    doctest.testmod(inventory)