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