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