/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
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
31
import os.path
32
import re
33
import sys
34
import types
1 by mbp at sourcefrog
import from baz patch-364
35
800 by Martin Pool
Merge John's import-speedup branch:
36
import bzrlib
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
37
from bzrlib.errors import BzrError, BzrCheckError
70 by mbp at sourcefrog
Prepare for smart recursive add.
38
1092.2.20 by Robert Collins
symlink and weaves, whaddya know
39
from bzrlib.osutils import quotefn, splitpath, joinpath, appendpath, sha_strings
70 by mbp at sourcefrog
Prepare for smart recursive add.
40
from bzrlib.trace import mutter
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
41
from bzrlib.errors import NotVersionedError
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
42
1 by mbp at sourcefrog
import from baz patch-364
43
802 by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions
44
class InventoryEntry(object):
1 by mbp at sourcefrog
import from baz patch-364
45
    """Description of a versioned file.
46
47
    An InventoryEntry has the following fields, which are also
48
    present in the XML inventory-entry element:
49
1197 by Martin Pool
doc
50
    file_id
51
52
    name
53
        (within the parent directory)
54
55
    kind
1398 by Robert Collins
integrate in Gustavos x-bit patch
56
        'directory' or 'file' or 'symlink'
1197 by Martin Pool
doc
57
58
    parent_id
59
        file_id of the parent directory, or ROOT_ID
60
1092.2.21 by Robert Collins
convert name_version to revision in inventory entries
61
    revision
1398 by Robert Collins
integrate in Gustavos x-bit patch
62
        the revision_id in which this variation of this file was 
1092.2.22 by Robert Collins
text_version and name_version unification looking reasonable
63
        introduced.
1197 by Martin Pool
doc
64
1398 by Robert Collins
integrate in Gustavos x-bit patch
65
    executable
66
        Indicates that this file should be executable on systems
67
        that support it.
68
1197 by Martin Pool
doc
69
    text_sha1
70
        sha-1 of the text of the file
71
        
72
    text_size
73
        size in bytes of the text of the file
74
        
75
    (reading a version 4 tree created a text_id field.)
1 by mbp at sourcefrog
import from baz patch-364
76
77
    >>> i = Inventory()
78
    >>> i.path2id('')
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
79
    'TREE_ROOT'
80
    >>> 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
81
    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
82
    >>> 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
83
    InventoryEntry('2323', 'hello.c', kind='file', parent_id='123')
1 by mbp at sourcefrog
import from baz patch-364
84
    >>> for j in i.iter_entries():
85
    ...   print j
86
    ... 
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
87
    ('src', InventoryEntry('123', 'src', kind='directory', parent_id='TREE_ROOT'))
1 by mbp at sourcefrog
import from baz patch-364
88
    ('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
89
    >>> i.add(InventoryEntry('2323', 'bye.c', 'file', '123'))
1 by mbp at sourcefrog
import from baz patch-364
90
    Traceback (most recent call last):
91
    ...
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
92
    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
93
    >>> 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
94
    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
95
    >>> 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
96
    InventoryEntry('2325', 'wibble', kind='directory', parent_id='123')
1 by mbp at sourcefrog
import from baz patch-364
97
    >>> i.path2id('src/wibble')
98
    '2325'
99
    >>> '2325' in i
100
    True
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
101
    >>> 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
102
    InventoryEntry('2326', 'wibble.c', kind='file', parent_id='2325')
1 by mbp at sourcefrog
import from baz patch-364
103
    >>> i['2326']
104
    InventoryEntry('2326', 'wibble.c', kind='file', parent_id='2325')
1185.1.40 by Robert Collins
Merge what applied of Alexander Belchenko's win32 patch.
105
    >>> for path, entry in i.iter_entries():
106
    ...     print path.replace('\\\\', '/')     # for win32 os.sep
107
    ...     assert i.path2id(path)
1 by mbp at sourcefrog
import from baz patch-364
108
    ... 
109
    src
110
    src/bye.c
111
    src/hello.c
112
    src/wibble
113
    src/wibble/wibble.c
1185.1.40 by Robert Collins
Merge what applied of Alexander Belchenko's win32 patch.
114
    >>> i.id2path('2326').replace('\\\\', '/')
1 by mbp at sourcefrog
import from baz patch-364
115
    'src/wibble/wibble.c'
116
    """
1197 by Martin Pool
doc
117
    
955 by Martin Pool
- use __slots__ on InventoryEntry; rather faster
118
    __slots__ = ['text_sha1', 'text_size', 'file_id', 'name', 'kind',
1398 by Robert Collins
integrate in Gustavos x-bit patch
119
                 'text_id', 'parent_id', 'children', 'executable', 
1092.2.22 by Robert Collins
text_version and name_version unification looking reasonable
120
                 'revision', 'symlink_target']
1185 by Martin Pool
- add xml round-trip test for revisions
121
1092.2.23 by Robert Collins
move inventory entry centric snapshot taking logic to inventory.py
122
    def _add_text_to_weave(self, new_lines, parents, weave_store):
123
        weave_store.add_text(self.file_id, self.revision, new_lines, parents)
124
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
125
    def __init__(self, file_id, name, kind, parent_id, text_id=None):
1 by mbp at sourcefrog
import from baz patch-364
126
        """Create an InventoryEntry
127
        
128
        The filename must be a single component, relative to the
129
        parent directory; it cannot be a whole path or relative name.
130
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
131
        >>> e = InventoryEntry('123', 'hello.c', 'file', ROOT_ID)
1 by mbp at sourcefrog
import from baz patch-364
132
        >>> e.name
133
        'hello.c'
134
        >>> e.file_id
135
        '123'
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
136
        >>> e = InventoryEntry('123', 'src/hello.c', 'file', ROOT_ID)
1 by mbp at sourcefrog
import from baz patch-364
137
        Traceback (most recent call last):
395 by Martin Pool
- fix error raised from invalid InventoryEntry name
138
        BzrCheckError: InventoryEntry name 'src/hello.c' is invalid
1 by mbp at sourcefrog
import from baz patch-364
139
        """
1183 by Martin Pool
- implement version 5 xml storage, and tests
140
        assert isinstance(name, basestring), name
376 by Martin Pool
- fix slow invariant check when reading in InventoryEntry objects
141
        if '/' in name or '\\' in name:
142
            raise BzrCheckError('InventoryEntry name %r is invalid' % name)
1 by mbp at sourcefrog
import from baz patch-364
143
        
1398 by Robert Collins
integrate in Gustavos x-bit patch
144
        self.executable = False
1092.2.21 by Robert Collins
convert name_version to revision in inventory entries
145
        self.revision = None
955 by Martin Pool
- use __slots__ on InventoryEntry; rather faster
146
        self.text_sha1 = None
147
        self.text_size = None
1 by mbp at sourcefrog
import from baz patch-364
148
        self.file_id = file_id
149
        self.name = name
150
        self.kind = kind
151
        self.text_id = text_id
152
        self.parent_id = parent_id
1092.2.6 by Robert Collins
symlink support updated to work
153
        self.symlink_target = None
138 by mbp at sourcefrog
remove parallel tree from inventory;
154
        if kind == 'directory':
155
            self.children = {}
237 by mbp at sourcefrog
- Better assertions in InventoryEntry constructor
156
        elif kind == 'file':
157
            pass
1092.2.6 by Robert Collins
symlink support updated to work
158
        elif kind == 'symlink':
159
            pass
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
160
        else:
237 by mbp at sourcefrog
- Better assertions in InventoryEntry constructor
161
            raise BzrError("unhandled entry kind %r" % kind)
162
1092.2.6 by Robert Collins
symlink support updated to work
163
    def read_symlink_target(self, path):
164
        if self.kind == 'symlink':
165
            try:
166
                self.symlink_target = os.readlink(path)
167
            except OSError,e:
168
                raise BzrError("os.readlink error, %s" % e)
1 by mbp at sourcefrog
import from baz patch-364
169
156 by mbp at sourcefrog
new "directories" command
170
    def sorted_children(self):
171
        l = self.children.items()
172
        l.sort()
173
        return l
174
1092.2.20 by Robert Collins
symlink and weaves, whaddya know
175
    def check(self, checker, rev_id, inv, tree):
176
        if self.parent_id != None:
177
            if not inv.has_id(self.parent_id):
178
                raise BzrCheckError('missing parent {%s} in inventory for revision {%s}'
179
                        % (self.parent_id, rev_id))
180
        if self.kind == 'file':
1092.2.22 by Robert Collins
text_version and name_version unification looking reasonable
181
            revision = self.revision
182
            t = (self.file_id, revision)
1092.2.20 by Robert Collins
symlink and weaves, whaddya know
183
            if t in checker.checked_texts:
184
                prev_sha = checker.checked_texts[t] 
185
                if prev_sha != self.text_sha1:
186
                    raise BzrCheckError('mismatched sha1 on {%s} in {%s}' %
187
                                        (self.file_id, rev_id))
188
                else:
189
                    checker.repeated_text_cnt += 1
190
                    return
191
            mutter('check version {%s} of {%s}', rev_id, self.file_id)
192
            file_lines = tree.get_file_lines(self.file_id)
193
            checker.checked_text_cnt += 1 
194
            if self.text_size != sum(map(len, file_lines)):
195
                raise BzrCheckError('text {%s} wrong size' % self.text_id)
196
            if self.text_sha1 != sha_strings(file_lines):
197
                raise BzrCheckError('text {%s} wrong sha1' % self.text_id)
198
            checker.checked_texts[t] = self.text_sha1
199
        elif self.kind == 'directory':
200
            if self.text_sha1 != None or self.text_size != None or self.text_id != None:
201
                raise BzrCheckError('directory {%s} has text in revision {%s}'
202
                        % (self.file_id, rev_id))
203
        elif self.kind == 'root_directory':
204
            pass
205
        elif self.kind == 'symlink':
206
            if self.text_sha1 != None or self.text_size != None or self.text_id != None:
207
                raise BzrCheckError('symlink {%s} has text in revision {%s}'
208
                        % (self.file_id, rev_id))
209
            if self.symlink_target == None:
210
                raise BzrCheckError('symlink {%s} has no target in revision {%s}'
211
                        % (self.file_id, rev_id))
212
        else:
213
            raise BzrCheckError('unknown entry kind %r in revision {%s}' % 
214
                                (self.kind, rev_id))
215
156 by mbp at sourcefrog
new "directories" command
216
1 by mbp at sourcefrog
import from baz patch-364
217
    def copy(self):
218
        other = InventoryEntry(self.file_id, self.name, self.kind,
1189 by Martin Pool
- BROKEN: partial support for commit into weave
219
                               self.parent_id)
1398 by Robert Collins
integrate in Gustavos x-bit patch
220
        other.executable = self.executable
1189 by Martin Pool
- BROKEN: partial support for commit into weave
221
        other.text_id = self.text_id
1 by mbp at sourcefrog
import from baz patch-364
222
        other.text_sha1 = self.text_sha1
223
        other.text_size = self.text_size
1092.2.6 by Robert Collins
symlink support updated to work
224
        other.symlink_target = self.symlink_target
1092.2.21 by Robert Collins
convert name_version to revision in inventory entries
225
        other.revision = self.revision
490 by Martin Pool
doc
226
        # note that children are *not* copied; they're pulled across when
227
        # others are added
1 by mbp at sourcefrog
import from baz patch-364
228
        return other
229
1092.2.23 by Robert Collins
move inventory entry centric snapshot taking logic to inventory.py
230
    def _get_snapshot_change(self, previous_entries):
231
        if len(previous_entries) > 1:
232
            return 'merged'
233
        elif len(previous_entries) == 0:
234
            return 'added'
235
        else:
236
            return 'modified/renamed/reparented'
1 by mbp at sourcefrog
import from baz patch-364
237
238
    def __repr__(self):
239
        return ("%s(%r, %r, kind=%r, parent_id=%r)"
240
                % (self.__class__.__name__,
241
                   self.file_id,
242
                   self.name,
243
                   self.kind,
244
                   self.parent_id))
245
1092.2.23 by Robert Collins
move inventory entry centric snapshot taking logic to inventory.py
246
    def snapshot(self, revision, path, previous_entries, work_tree, 
247
                 weave_store):
248
        """Make a snapshot of this entry.
249
        
250
        This means that all its fields are populated, that it has its
251
        text stored in the text store or weave.
252
        """
253
        mutter('new parents of %s are %r', path, previous_entries)
254
        self._read_tree_state(path, work_tree)
255
        if len(previous_entries) == 1:
256
            # cannot be unchanged unless there is only one parent file rev.
257
            parent_ie = previous_entries.values()[0]
258
            if self._unchanged(path, parent_ie, work_tree):
259
                mutter("found unchanged entry")
260
                self.revision = parent_ie.revision
261
                return "unchanged"
262
        mutter('new revision for {%s}', self.file_id)
263
        self.revision = revision
264
        change = self._get_snapshot_change(previous_entries)
265
        if self.kind != 'file':
266
            return change
267
        self._snapshot_text(previous_entries, work_tree, weave_store)
268
        return change
269
270
    def _snapshot_text(self, file_parents, work_tree, weave_store): 
271
        mutter('storing file {%s} in revision {%s}',
272
               self.file_id, self.revision)
273
        # special case to avoid diffing on renames or 
274
        # reparenting
275
        if (len(file_parents) == 1
276
            and self.text_sha1 == file_parents.values()[0].text_sha1
277
            and self.text_size == file_parents.values()[0].text_size):
278
            previous_ie = file_parents.values()[0]
279
            weave_store.add_identical_text(
280
                self.file_id, previous_ie.revision, 
281
                self.revision, file_parents)
282
        else:
283
            new_lines = work_tree.get_file(self.file_id).readlines()
284
            self._add_text_to_weave(new_lines, file_parents, weave_store)
285
            self.text_sha1 = sha_strings(new_lines)
286
            self.text_size = sum(map(len, new_lines))
287
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
288
    def __eq__(self, other):
1 by mbp at sourcefrog
import from baz patch-364
289
        if not isinstance(other, InventoryEntry):
290
            return NotImplemented
291
1398 by Robert Collins
integrate in Gustavos x-bit patch
292
        return ((self.file_id == other.file_id)
293
                and (self.name == other.name)
294
                and (other.symlink_target == self.symlink_target)
295
                and (self.text_sha1 == other.text_sha1)
296
                and (self.text_size == other.text_size)
297
                and (self.text_id == other.text_id)
298
                and (self.parent_id == other.parent_id)
299
                and (self.kind == other.kind)
300
                and (self.revision == other.revision)
301
                and (self.executable == other.executable)
302
                )
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
303
304
    def __ne__(self, other):
305
        return not (self == other)
306
307
    def __hash__(self):
308
        raise ValueError('not hashable')
1 by mbp at sourcefrog
import from baz patch-364
309
1092.2.23 by Robert Collins
move inventory entry centric snapshot taking logic to inventory.py
310
    def _unchanged(self, path, previous_ie, work_tree):
1092.2.22 by Robert Collins
text_version and name_version unification looking reasonable
311
        compatible = True
312
        # different inv parent
313
        if previous_ie.parent_id != self.parent_id:
314
            compatible = False
315
        # renamed
316
        elif previous_ie.name != self.name:
317
            compatible = False
1092.2.23 by Robert Collins
move inventory entry centric snapshot taking logic to inventory.py
318
        if self.kind == 'symlink':
319
            if self.symlink_target != previous_ie.symlink_target:
320
                compatible = False
321
        if self.kind == 'file':
322
            if self.text_sha1 != previous_ie.text_sha1:
323
                compatible = False
324
            else:
325
                # FIXME: 20050930 probe for the text size when getting sha1
326
                # in _read_tree_state
327
                self.text_size = previous_ie.text_size
1092.2.22 by Robert Collins
text_version and name_version unification looking reasonable
328
        return compatible
329
1092.2.23 by Robert Collins
move inventory entry centric snapshot taking logic to inventory.py
330
    def _read_tree_state(self, path, work_tree):
331
        if self.kind == 'symlink':
332
            self.read_symlink_target(work_tree.abspath(path))
333
        if self.kind == 'file':
334
            self.text_sha1 = work_tree.get_file_sha1(self.file_id)
1398 by Robert Collins
integrate in Gustavos x-bit patch
335
            self.executable = work_tree.is_executable(self.file_id)
1092.2.23 by Robert Collins
move inventory entry centric snapshot taking logic to inventory.py
336
1 by mbp at sourcefrog
import from baz patch-364
337
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
338
class RootEntry(InventoryEntry):
339
    def __init__(self, file_id):
340
        self.file_id = file_id
341
        self.children = {}
342
        self.kind = 'root_directory'
343
        self.parent_id = None
156 by mbp at sourcefrog
new "directories" command
344
        self.name = ''
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
345
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
346
    def __eq__(self, other):
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
347
        if not isinstance(other, RootEntry):
348
            return NotImplemented
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
349
        
350
        return (self.file_id == other.file_id) \
351
               and (self.children == other.children)
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
352
353
354
802 by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions
355
class Inventory(object):
1 by mbp at sourcefrog
import from baz patch-364
356
    """Inventory of versioned files in a tree.
357
240 by mbp at sourcefrog
doc
358
    This describes which file_id is present at each point in the tree,
359
    and possibly the SHA-1 or other information about the file.
360
    Entries can be looked up either by path or by file_id.
1 by mbp at sourcefrog
import from baz patch-364
361
362
    The inventory represents a typical unix file tree, with
363
    directories containing files and subdirectories.  We never store
364
    the full path to a file, because renaming a directory implicitly
365
    moves all of its contents.  This class internally maintains a
366
    lookup tree that allows the children under a directory to be
367
    returned quickly.
368
369
    InventoryEntry objects must not be modified after they are
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
370
    inserted, other than through the Inventory API.
1 by mbp at sourcefrog
import from baz patch-364
371
372
    >>> inv = Inventory()
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
373
    >>> 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
374
    InventoryEntry('123-123', 'hello.c', kind='file', parent_id='TREE_ROOT')
1 by mbp at sourcefrog
import from baz patch-364
375
    >>> inv['123-123'].name
376
    'hello.c'
377
378
    May be treated as an iterator or set to look up file ids:
379
    
380
    >>> bool(inv.path2id('hello.c'))
381
    True
382
    >>> '123-123' in inv
383
    True
384
385
    May also look up by name:
386
387
    >>> [x[0] for x in inv.iter_entries()]
388
    ['hello.c']
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
389
    >>> inv = Inventory('TREE_ROOT-12345678-12345678')
390
    >>> 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
391
    InventoryEntry('123-123', 'hello.c', kind='file', parent_id='TREE_ROOT-12345678-12345678')
1 by mbp at sourcefrog
import from baz patch-364
392
    """
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
393
    def __init__(self, root_id=ROOT_ID):
1 by mbp at sourcefrog
import from baz patch-364
394
        """Create or read an inventory.
395
396
        If a working directory is specified, the inventory is read
397
        from there.  If the file is specified, read from that. If not,
398
        the inventory is created empty.
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
399
400
        The inventory is created with a default root directory, with
401
        an id of None.
1 by mbp at sourcefrog
import from baz patch-364
402
        """
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
403
        # We are letting Branch.initialize() create a unique inventory
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
404
        # root id. Rather than generating a random one here.
405
        #if root_id is None:
406
        #    root_id = bzrlib.branch.gen_file_id('TREE_ROOT')
407
        self.root = RootEntry(root_id)
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
408
        self._byid = {self.root.file_id: self.root}
1 by mbp at sourcefrog
import from baz patch-364
409
410
1189 by Martin Pool
- BROKEN: partial support for commit into weave
411
    def copy(self):
412
        other = Inventory(self.root.file_id)
1206 by Martin Pool
- fix bug in Inventory.copy()
413
        # copy recursively so we know directories will be added before
414
        # their children.  There are more efficient ways than this...
415
        for path, entry in self.iter_entries():
1189 by Martin Pool
- BROKEN: partial support for commit into weave
416
            if entry == self.root:
417
                continue
418
            other.add(entry.copy())
419
        return other
420
421
1 by mbp at sourcefrog
import from baz patch-364
422
    def __iter__(self):
423
        return iter(self._byid)
424
425
426
    def __len__(self):
427
        """Returns number of entries."""
428
        return len(self._byid)
429
430
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
431
    def iter_entries(self, from_dir=None):
1 by mbp at sourcefrog
import from baz patch-364
432
        """Return (path, entry) pairs, in order by name."""
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
433
        if from_dir == None:
434
            assert self.root
435
            from_dir = self.root
436
        elif isinstance(from_dir, basestring):
437
            from_dir = self._byid[from_dir]
438
            
439
        kids = from_dir.children.items()
1 by mbp at sourcefrog
import from baz patch-364
440
        kids.sort()
441
        for name, ie in kids:
442
            yield name, ie
443
            if ie.kind == 'directory':
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
444
                for cn, cie in self.iter_entries(from_dir=ie.file_id):
271 by Martin Pool
- Windows path fixes
445
                    yield os.path.join(name, cn), cie
555 by Martin Pool
- New Inventory.entries() method
446
447
448
    def entries(self):
449
        """Return list of (path, ie) for all entries except the root.
450
451
        This may be faster than iter_entries.
452
        """
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
453
        accum = []
454
        def descend(dir_ie, dir_path):
556 by Martin Pool
- fix up Inventory.entries()
455
            kids = dir_ie.children.items()
555 by Martin Pool
- New Inventory.entries() method
456
            kids.sort()
457
            for name, ie in kids:
458
                child_path = os.path.join(dir_path, name)
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
459
                accum.append((child_path, ie))
555 by Martin Pool
- New Inventory.entries() method
460
                if ie.kind == 'directory':
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
461
                    descend(ie, child_path)
555 by Martin Pool
- New Inventory.entries() method
462
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
463
        descend(self.root, '')
464
        return accum
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
465
466
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
467
    def directories(self):
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
468
        """Return (path, entry) pairs for all directories, including the root.
1 by mbp at sourcefrog
import from baz patch-364
469
        """
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
470
        accum = []
471
        def descend(parent_ie, parent_path):
472
            accum.append((parent_path, parent_ie))
156 by mbp at sourcefrog
new "directories" command
473
            
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
474
            kids = [(ie.name, ie) for ie in parent_ie.children.itervalues() if ie.kind == 'directory']
475
            kids.sort()
156 by mbp at sourcefrog
new "directories" command
476
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
477
            for name, child_ie in kids:
478
                child_path = os.path.join(parent_path, name)
479
                descend(child_ie, child_path)
480
        descend(self.root, '')
481
        return accum
1 by mbp at sourcefrog
import from baz patch-364
482
        
483
484
485
    def __contains__(self, file_id):
486
        """True if this entry contains a file with given id.
487
488
        >>> inv = Inventory()
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
489
        >>> 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
490
        InventoryEntry('123', 'foo.c', kind='file', parent_id='TREE_ROOT')
1 by mbp at sourcefrog
import from baz patch-364
491
        >>> '123' in inv
492
        True
493
        >>> '456' in inv
494
        False
495
        """
496
        return file_id in self._byid
497
498
499
    def __getitem__(self, file_id):
500
        """Return the entry for given file_id.
501
502
        >>> inv = Inventory()
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
503
        >>> 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
504
        InventoryEntry('123123', 'hello.c', kind='file', parent_id='TREE_ROOT')
1 by mbp at sourcefrog
import from baz patch-364
505
        >>> inv['123123'].name
506
        'hello.c'
507
        """
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
508
        try:
509
            return self._byid[file_id]
510
        except KeyError:
380 by Martin Pool
- Slight optimization for Inventory.__getitem__
511
            if file_id == None:
512
                raise BzrError("can't look up file_id None")
513
            else:
514
                raise BzrError("file_id {%s} not in inventory" % file_id)
1 by mbp at sourcefrog
import from baz patch-364
515
516
460 by Martin Pool
- new testing command compare-trees
517
    def get_file_kind(self, file_id):
518
        return self._byid[file_id].kind
519
138 by mbp at sourcefrog
remove parallel tree from inventory;
520
    def get_child(self, parent_id, filename):
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
521
        return self[parent_id].children.get(filename)
138 by mbp at sourcefrog
remove parallel tree from inventory;
522
523
1 by mbp at sourcefrog
import from baz patch-364
524
    def add(self, entry):
525
        """Add entry to inventory.
526
527
        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
528
        which calls this.
529
530
        Returns the new entry object.
531
        """
139 by mbp at sourcefrog
simplified/faster Inventory.add
532
        if entry.file_id in self._byid:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
533
            raise BzrError("inventory already contains entry with id {%s}" % entry.file_id)
1 by mbp at sourcefrog
import from baz patch-364
534
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
535
        if entry.parent_id == ROOT_ID or entry.parent_id is None:
536
            entry.parent_id = self.root.file_id
537
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
538
        try:
539
            parent = self._byid[entry.parent_id]
540
        except KeyError:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
541
            raise BzrError("parent_id {%s} not in inventory" % entry.parent_id)
139 by mbp at sourcefrog
simplified/faster Inventory.add
542
543
        if parent.children.has_key(entry.name):
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
544
            raise BzrError("%s is already versioned" %
140 by mbp at sourcefrog
fix error message for repeated add
545
                    appendpath(self.id2path(parent.file_id), entry.name))
1 by mbp at sourcefrog
import from baz patch-364
546
547
        self._byid[entry.file_id] = entry
139 by mbp at sourcefrog
simplified/faster Inventory.add
548
        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
549
        return entry
1 by mbp at sourcefrog
import from baz patch-364
550
551
70 by mbp at sourcefrog
Prepare for smart recursive add.
552
    def add_path(self, relpath, kind, file_id=None):
553
        """Add entry from a path.
554
1180 by Martin Pool
- start splitting code for xml (de)serialization away from objects
555
        The immediate parent must already be versioned.
556
557
        Returns the new entry object."""
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
558
        from bzrlib.branch import gen_file_id
1015 by Martin Pool
- fix circular imports
559
        
70 by mbp at sourcefrog
Prepare for smart recursive add.
560
        parts = bzrlib.osutils.splitpath(relpath)
561
        if len(parts) == 0:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
562
            raise BzrError("cannot re-add root of inventory")
70 by mbp at sourcefrog
Prepare for smart recursive add.
563
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
564
        if file_id == None:
800 by Martin Pool
Merge John's import-speedup branch:
565
            file_id = gen_file_id(relpath)
70 by mbp at sourcefrog
Prepare for smart recursive add.
566
753 by Martin Pool
- new exception NotVersionedError
567
        parent_path = parts[:-1]
568
        parent_id = self.path2id(parent_path)
569
        if parent_id == None:
570
            raise NotVersionedError(parent_path)
571
70 by mbp at sourcefrog
Prepare for smart recursive add.
572
        ie = InventoryEntry(file_id, parts[-1],
573
                            kind=kind, parent_id=parent_id)
574
        return self.add(ie)
575
576
1 by mbp at sourcefrog
import from baz patch-364
577
    def __delitem__(self, file_id):
578
        """Remove entry by id.
579
580
        >>> inv = Inventory()
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
581
        >>> 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
582
        InventoryEntry('123', 'foo.c', kind='file', parent_id='TREE_ROOT')
1 by mbp at sourcefrog
import from baz patch-364
583
        >>> '123' in inv
584
        True
585
        >>> del inv['123']
586
        >>> '123' in inv
587
        False
588
        """
589
        ie = self[file_id]
590
138 by mbp at sourcefrog
remove parallel tree from inventory;
591
        assert self[ie.parent_id].children[ie.name] == ie
1 by mbp at sourcefrog
import from baz patch-364
592
        
593
        # TODO: Test deleting all children; maybe hoist to a separate
594
        # deltree method?
595
        if ie.kind == 'directory':
138 by mbp at sourcefrog
remove parallel tree from inventory;
596
            for cie in ie.children.values():
1 by mbp at sourcefrog
import from baz patch-364
597
                del self[cie.file_id]
138 by mbp at sourcefrog
remove parallel tree from inventory;
598
            del ie.children
1 by mbp at sourcefrog
import from baz patch-364
599
600
        del self._byid[file_id]
138 by mbp at sourcefrog
remove parallel tree from inventory;
601
        del self[ie.parent_id].children[ie.name]
1 by mbp at sourcefrog
import from baz patch-364
602
603
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
604
    def __eq__(self, other):
1 by mbp at sourcefrog
import from baz patch-364
605
        """Compare two sets by comparing their contents.
606
607
        >>> i1 = Inventory()
608
        >>> i2 = Inventory()
609
        >>> i1 == i2
610
        True
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
611
        >>> 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
612
        InventoryEntry('123', 'foo', kind='file', parent_id='TREE_ROOT')
1 by mbp at sourcefrog
import from baz patch-364
613
        >>> i1 == i2
614
        False
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
615
        >>> 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
616
        InventoryEntry('123', 'foo', kind='file', parent_id='TREE_ROOT')
1 by mbp at sourcefrog
import from baz patch-364
617
        >>> i1 == i2
618
        True
619
        """
620
        if not isinstance(other, Inventory):
621
            return NotImplemented
622
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
623
        if len(self._byid) != len(other._byid):
543 by Martin Pool
- More cleanups for set type
624
            # shortcut: obviously not the same
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
625
            return False
626
627
        return self._byid == other._byid
628
629
630
    def __ne__(self, other):
1249 by Martin Pool
- improvements to weave commit [broken]
631
        return not self.__eq__(other)
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
632
633
634
    def __hash__(self):
635
        raise ValueError('not hashable')
636
1 by mbp at sourcefrog
import from baz patch-364
637
172 by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory
638
    def get_idpath(self, file_id):
639
        """Return a list of file_ids for the path to an entry.
640
641
        The list contains one element for each directory followed by
642
        the id of the file itself.  So the length of the returned list
643
        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
644
        root directory as depth 1.
172 by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory
645
        """
646
        p = []
647
        while file_id != None:
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
648
            try:
649
                ie = self._byid[file_id]
650
            except KeyError:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
651
                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
652
            p.insert(0, ie.file_id)
653
            file_id = ie.parent_id
654
        return p
655
656
1 by mbp at sourcefrog
import from baz patch-364
657
    def id2path(self, file_id):
658
        """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
659
660
        # get all names, skipping root
922 by Martin Pool
- optimization for Inventory.id2path; access byid map directly rather than
661
        p = [self._byid[fid].name for fid in self.get_idpath(file_id)[1:]]
271 by Martin Pool
- Windows path fixes
662
        return os.sep.join(p)
1 by mbp at sourcefrog
import from baz patch-364
663
            
664
665
666
    def path2id(self, name):
667
        """Walk down through directories to return entry of last component.
668
669
        names may be either a list of path components, or a single
670
        string, in which case it is automatically split.
671
672
        This returns the entry of the last component in the path,
673
        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
674
675
        Returns None iff the path is not found.
1 by mbp at sourcefrog
import from baz patch-364
676
        """
70 by mbp at sourcefrog
Prepare for smart recursive add.
677
        if isinstance(name, types.StringTypes):
678
            name = splitpath(name)
1 by mbp at sourcefrog
import from baz patch-364
679
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
680
        mutter("lookup path %r" % name)
681
682
        parent = self.root
70 by mbp at sourcefrog
Prepare for smart recursive add.
683
        for f in name:
1 by mbp at sourcefrog
import from baz patch-364
684
            try:
138 by mbp at sourcefrog
remove parallel tree from inventory;
685
                cie = parent.children[f]
1 by mbp at sourcefrog
import from baz patch-364
686
                assert cie.name == f
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
687
                assert cie.parent_id == parent.file_id
138 by mbp at sourcefrog
remove parallel tree from inventory;
688
                parent = cie
1 by mbp at sourcefrog
import from baz patch-364
689
            except KeyError:
690
                # or raise an error?
691
                return None
692
138 by mbp at sourcefrog
remove parallel tree from inventory;
693
        return parent.file_id
1 by mbp at sourcefrog
import from baz patch-364
694
695
696
    def has_filename(self, names):
697
        return bool(self.path2id(names))
698
699
700
    def has_id(self, file_id):
701
        return self._byid.has_key(file_id)
702
703
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
704
    def rename(self, file_id, new_parent_id, new_name):
705
        """Move a file within the inventory.
706
707
        This can change either the name, or the parent, or both.
708
709
        This does not move the working file."""
710
        if not is_valid_name(new_name):
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
711
            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
712
713
        new_parent = self._byid[new_parent_id]
714
        if new_name in new_parent.children:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
715
            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
716
172 by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory
717
        new_parent_idpath = self.get_idpath(new_parent_id)
718
        if file_id in new_parent_idpath:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
719
            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
720
                    % (self.id2path(file_id), self.id2path(new_parent_id)))
721
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
722
        file_ie = self._byid[file_id]
723
        old_parent = self._byid[file_ie.parent_id]
724
725
        # TODO: Don't leave things messed up if this fails
726
727
        del old_parent.children[file_ie.name]
728
        new_parent.children[new_name] = file_ie
729
        
730
        file_ie.name = new_name
731
        file_ie.parent_id = new_parent_id
732
733
734
735
1077 by Martin Pool
- avoid compiling REs at module load time
736
_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
737
738
def is_valid_name(name):
1077 by Martin Pool
- avoid compiling REs at module load time
739
    global _NAME_RE
740
    if _NAME_RE == None:
741
        _NAME_RE = re.compile(r'^[^/\\]+$')
742
        
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
743
    return bool(_NAME_RE.match(name))