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