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