/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
4763.2.4 by John Arbash Meinel
merge bzr.2.1 in preparation for NEWS entry.
1
# Copyright (C) 2005-2010 Canonical Ltd
1448 by Robert Collins
revert symlinks correctly
2
#
1 by mbp at sourcefrog
import from baz patch-364
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.
1448 by Robert Collins
revert symlinks correctly
7
#
1 by mbp at sourcefrog
import from baz patch-364
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.
1448 by Robert Collins
revert symlinks correctly
12
#
1 by mbp at sourcefrog
import from baz patch-364
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
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1 by mbp at sourcefrog
import from baz patch-364
16
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
17
# FIXME: This refactoring of the workingtree code doesn't seem to keep
1185.16.72 by Martin Pool
[merge] from robert and fix up tests
18
# the WorkingTree's copy of the inventory in sync with the branch.  The
19
# branch modifies its working inventory when it does a commit to make
20
# missing files permanently removed.
1 by mbp at sourcefrog
import from baz patch-364
21
1197 by Martin Pool
doc
22
# TODO: Maybe also keep the full path of the entry, and the children?
23
# But those depend on its position within a particular inventory, and
24
# it would be nice not to need to hold the backpointer here.
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
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
30
from bzrlib.lazy_import import lazy_import
31
lazy_import(globals(), """
32
import collections
4496.3.10 by Andrew Bennetts
Tidy import nits in inventory.py.
33
import copy
4244.2.1 by Vincent Ladeuil
inv._get_mutable_inventory() - prepare for CHKInventory
34
import os
35
import re
1399.1.6 by Robert Collins
move exporting functionality into inventory.py - uncovers bug in symlink support
36
import tarfile
1 by mbp at sourcefrog
import from baz patch-364
37
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
38
from bzrlib import (
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
39
    chk_map,
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
40
    errors,
2116.4.1 by John Arbash Meinel
Update file and revision id generators.
41
    generate_ids,
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
42
    osutils,
43
    )
44
""")
45
46
from bzrlib.errors import (
47
    BzrCheckError,
48
    BzrError,
49
    )
70 by mbp at sourcefrog
Prepare for smart recursive add.
50
from bzrlib.trace import mutter
4679.9.4 by John Arbash Meinel
A bit broken, but getting there.
51
from bzrlib.static_tuple import StaticTuple
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
52
1 by mbp at sourcefrog
import from baz patch-364
53
802 by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions
54
class InventoryEntry(object):
1 by mbp at sourcefrog
import from baz patch-364
55
    """Description of a versioned file.
56
57
    An InventoryEntry has the following fields, which are also
58
    present in the XML inventory-entry element:
59
1197 by Martin Pool
doc
60
    file_id
61
62
    name
63
        (within the parent directory)
64
65
    parent_id
66
        file_id of the parent directory, or ROOT_ID
67
1092.2.21 by Robert Collins
convert name_version to revision in inventory entries
68
    revision
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
69
        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
70
        introduced.
1197 by Martin Pool
doc
71
1398 by Robert Collins
integrate in Gustavos x-bit patch
72
    executable
73
        Indicates that this file should be executable on systems
74
        that support it.
75
1197 by Martin Pool
doc
76
    text_sha1
77
        sha-1 of the text of the file
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
78
1197 by Martin Pool
doc
79
    text_size
80
        size in bytes of the text of the file
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
81
1197 by Martin Pool
doc
82
    (reading a version 4 tree created a text_id field.)
1 by mbp at sourcefrog
import from baz patch-364
83
84
    >>> i = Inventory()
85
    >>> i.path2id('')
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
86
    'TREE_ROOT'
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
87
    >>> i.add(InventoryDirectory('123', 'src', ROOT_ID))
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
88
    InventoryDirectory('123', 'src', parent_id='TREE_ROOT', revision=None)
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
89
    >>> i.add(InventoryFile('2323', 'hello.c', parent_id='123'))
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
90
    InventoryFile('2323', 'hello.c', parent_id='123', sha1=None, len=None, revision=None)
1996.3.13 by John Arbash Meinel
Fix the inventory doc tests
91
    >>> shouldbe = {0: '', 1: 'src', 2: 'src/hello.c'}
1185.16.151 by Martin Pool
[patch] win32 fix for InventoryEntry doctest (Alexander, patch 21)
92
    >>> for ix, j in enumerate(i.iter_entries()):
93
    ...   print (j[0] == shouldbe[ix], j[1])
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
94
    ...
2294.1.8 by John Arbash Meinel
Fix one doc test in Inventory which expected a plain str
95
    (True, InventoryDirectory('TREE_ROOT', u'', parent_id=None, revision=None))
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
96
    (True, InventoryDirectory('123', 'src', parent_id='TREE_ROOT', revision=None))
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
97
    (True, InventoryFile('2323', 'hello.c', parent_id='123', sha1=None, len=None, revision=None))
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
98
    >>> i.add(InventoryFile('2324', 'bye.c', '123'))
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
99
    InventoryFile('2324', 'bye.c', parent_id='123', sha1=None, len=None, revision=None)
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
100
    >>> i.add(InventoryDirectory('2325', 'wibble', '123'))
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
101
    InventoryDirectory('2325', 'wibble', parent_id='123', revision=None)
1 by mbp at sourcefrog
import from baz patch-364
102
    >>> i.path2id('src/wibble')
103
    '2325'
104
    >>> '2325' in i
105
    True
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
106
    >>> i.add(InventoryFile('2326', 'wibble.c', '2325'))
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
107
    InventoryFile('2326', 'wibble.c', parent_id='2325', sha1=None, len=None, revision=None)
1 by mbp at sourcefrog
import from baz patch-364
108
    >>> i['2326']
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
109
    InventoryFile('2326', 'wibble.c', parent_id='2325', sha1=None, len=None, revision=None)
1185.1.40 by Robert Collins
Merge what applied of Alexander Belchenko's win32 patch.
110
    >>> for path, entry in i.iter_entries():
1185.31.32 by John Arbash Meinel
Updated the bzr sourcecode to use bzrlib.osutils.pathjoin rather than os.path.join to enforce internal use of / instead of \
111
    ...     print path
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
112
    ...
1852.6.6 by Robert Collins
Finish updating iter_entries change to make all tests pass.
113
    <BLANKLINE>
1 by mbp at sourcefrog
import from baz patch-364
114
    src
115
    src/bye.c
116
    src/hello.c
117
    src/wibble
118
    src/wibble/wibble.c
1185.31.32 by John Arbash Meinel
Updated the bzr sourcecode to use bzrlib.osutils.pathjoin rather than os.path.join to enforce internal use of / instead of \
119
    >>> i.id2path('2326')
1 by mbp at sourcefrog
import from baz patch-364
120
    'src/wibble/wibble.c'
121
    """
1668.1.5 by Martin Pool
[broken] fix up display of files changed by a commit
122
123
    # Constants returned by describe_change()
124
    #
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
125
    # TODO: These should probably move to some kind of FileChangeDescription
126
    # class; that's like what's inside a TreeDelta but we want to be able to
1668.1.5 by Martin Pool
[broken] fix up display of files changed by a commit
127
    # generate them just for one file at a time.
128
    RENAMED = 'renamed'
129
    MODIFIED_AND_RENAMED = 'modified and renamed'
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
130
5365.2.1 by Andrew Bennetts
Reduce memory consumption of InventoryEntries by removing __slots__ entries for attributes that should never be set, e.g. symlink_target on files.
131
    __slots__ = ['file_id', 'revision', 'parent_id', 'name']
132
133
    # Attributes that all InventoryEntry instances are expected to have, but
134
    # that don't vary for all kinds of entry.  (e.g. symlink_target is only
135
    # relevant to InventoryLink, so there's no reason to make every
136
    # InventoryFile instance allocate space to hold a value for it.)
137
    # Attributes that only vary for files: executable, text_sha1, text_size,
138
    # text_id
139
    executable = False
140
    text_sha1 = None
141
    text_size = None
142
    text_id = None
143
    # Attributes that only vary for symlinks: symlink_target
144
    symlink_target = None
145
    # Attributes that only vary for tree-references: reference_revision
146
    reference_revision = None
147
1092.2.23 by Robert Collins
move inventory entry centric snapshot taking logic to inventory.py
148
1399.1.3 by Robert Collins
move change detection for text and metadata from delta to entry.detect_changes
149
    def detect_changes(self, old_entry):
150
        """Return a (text_modified, meta_modified) from this to old_entry.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
151
152
        _read_tree_state must have been called on self and old_entry prior to
1399.1.3 by Robert Collins
move change detection for text and metadata from delta to entry.detect_changes
153
        calling detect_changes.
154
        """
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
155
        return False, False
1399.1.3 by Robert Collins
move change detection for text and metadata from delta to entry.detect_changes
156
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
157
    def _diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree,
158
             output_to, reverse=False):
159
        """Perform a diff between two entries of the same kind."""
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
160
2776.3.1 by Robert Collins
* Deprecated method ``find_previous_heads`` on
161
    def parent_candidates(self, previous_inventories):
162
        """Find possible per-file graph parents.
163
164
        This is currently defined by:
165
         - Select the last changed revision in the parent inventory.
166
         - Do deal with a short lived bug in bzr 0.8's development two entries
167
           that have the same last changed but different 'x' bit settings are
168
           changed in-place.
1409 by Robert Collins
unify previous inventory entry parent logic in preparation for fixing the revision-thrashing bug
169
        """
1596.2.20 by Robert Collins
optimise commit to only access weaves for merged, or altered files during commit.
170
        # revision:ie mapping for each ie found in previous_inventories.
171
        candidates = {}
172
        # identify candidate head revision ids.
1409 by Robert Collins
unify previous inventory entry parent logic in preparation for fixing the revision-thrashing bug
173
        for inv in previous_inventories:
174
            if self.file_id in inv:
175
                ie = inv[self.file_id]
1596.2.20 by Robert Collins
optimise commit to only access weaves for merged, or altered files during commit.
176
                if ie.revision in candidates:
177
                    # same revision value in two different inventories:
178
                    # correct possible inconsistencies:
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
179
                    #     * there was a bug in revision updates with 'x' bit
1596.2.20 by Robert Collins
optimise commit to only access weaves for merged, or altered files during commit.
180
                    #       support.
1185.1.51 by Robert Collins
merge in reweave support
181
                    try:
1596.2.20 by Robert Collins
optimise commit to only access weaves for merged, or altered files during commit.
182
                        if candidates[ie.revision].executable != ie.executable:
183
                            candidates[ie.revision].executable = False
1185.1.51 by Robert Collins
merge in reweave support
184
                            ie.executable = False
185
                    except AttributeError:
186
                        pass
1409 by Robert Collins
unify previous inventory entry parent logic in preparation for fixing the revision-thrashing bug
187
                else:
1596.2.20 by Robert Collins
optimise commit to only access weaves for merged, or altered files during commit.
188
                    # add this revision as a candidate.
189
                    candidates[ie.revision] = ie
2776.3.1 by Robert Collins
* Deprecated method ``find_previous_heads`` on
190
        return candidates
191
1399.1.5 by Robert Collins
move checking whether an entry stores text into inventory.py from fetch,py
192
    def has_text(self):
193
        """Return true if the object this entry represents has textual data.
194
195
        Note that textual data includes binary content.
1405 by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave
196
197
        Also note that all entries get weave files created for them.
198
        This attribute is primarily used when upgrading from old trees that
199
        did not have the weave index for all inventory entries.
1399.1.5 by Robert Collins
move checking whether an entry stores text into inventory.py from fetch,py
200
        """
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
201
        return False
1399.1.5 by Robert Collins
move checking whether an entry stores text into inventory.py from fetch,py
202
5365.2.1 by Andrew Bennetts
Reduce memory consumption of InventoryEntries by removing __slots__ entries for attributes that should never be set, e.g. symlink_target on files.
203
    def __init__(self, file_id, name, parent_id):
1 by mbp at sourcefrog
import from baz patch-364
204
        """Create an InventoryEntry
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
205
1 by mbp at sourcefrog
import from baz patch-364
206
        The filename must be a single component, relative to the
207
        parent directory; it cannot be a whole path or relative name.
208
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
209
        >>> e = InventoryFile('123', 'hello.c', ROOT_ID)
1 by mbp at sourcefrog
import from baz patch-364
210
        >>> e.name
211
        'hello.c'
212
        >>> e.file_id
213
        '123'
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
214
        >>> e = InventoryFile('123', 'src/hello.c', ROOT_ID)
1 by mbp at sourcefrog
import from baz patch-364
215
        Traceback (most recent call last):
1185.16.63 by Martin Pool
- more error conversion
216
        InvalidEntryName: Invalid entry name: src/hello.c
1 by mbp at sourcefrog
import from baz patch-364
217
        """
376 by Martin Pool
- fix slow invariant check when reading in InventoryEntry objects
218
        if '/' in name or '\\' in name:
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
219
            raise errors.InvalidEntryName(name=name)
5365.2.1 by Andrew Bennetts
Reduce memory consumption of InventoryEntries by removing __slots__ entries for attributes that should never be set, e.g. symlink_target on files.
220
        self.file_id = file_id
1092.2.21 by Robert Collins
convert name_version to revision in inventory entries
221
        self.revision = None
1 by mbp at sourcefrog
import from baz patch-364
222
        self.name = name
223
        self.parent_id = parent_id
237 by mbp at sourcefrog
- Better assertions in InventoryEntry constructor
224
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
225
    def kind_character(self):
226
        """Return a short kind indicator useful for appending to names."""
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
227
        raise BzrError('unknown kind %r' % self.kind)
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
228
1731.1.2 by Aaron Bentley
Removed all remaining uses of root_directory
229
    known_kinds = ('file', 'directory', 'symlink')
1 by mbp at sourcefrog
import from baz patch-364
230
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
231
    def _put_in_tar(self, item, tree):
232
        """populate item for stashing in a tar, and return the content stream.
233
234
        If no content is available, return None.
235
        """
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
236
        raise BzrError("don't know how to export {%s} of kind %r" %
237
                       (self.file_id, self.kind))
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
238
239
    def _put_on_disk(self, fullpath, tree):
240
        """Put this entry onto disk at fullpath, from tree tree."""
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
241
        raise BzrError("don't know how to export {%s} of kind %r" % (self.file_id, self.kind))
1399.1.6 by Robert Collins
move exporting functionality into inventory.py - uncovers bug in symlink support
242
156 by mbp at sourcefrog
new "directories" command
243
    def sorted_children(self):
1757.2.13 by Robert Collins
Tweak InventoryEntry.sorted_children to be simpler.
244
        return sorted(self.children.items())
156 by mbp at sourcefrog
new "directories" command
245
1399.1.1 by Robert Collins
move checks for versionability of file kinds into InventoryEntry
246
    @staticmethod
247
    def versionable_kind(kind):
2100.3.1 by Aaron Bentley
Start roundtripping tree-reference entries
248
        return (kind in ('file', 'directory', 'symlink', 'tree-reference'))
1399.1.1 by Robert Collins
move checks for versionability of file kinds into InventoryEntry
249
4332.3.28 by Robert Collins
Start checking file texts in a single pass.
250
    def check(self, checker, rev_id, inv):
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
251
        """Check this inventory entry is intact.
252
253
        This is a template method, override _check for kind specific
254
        tests.
1616.1.5 by Martin Pool
Cleanup and document some check code
255
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
256
        :param checker: Check object providing context for the checks;
1616.1.5 by Martin Pool
Cleanup and document some check code
257
             can be used to find out what parts of the repository have already
258
             been checked.
259
        :param rev_id: Revision id from which this InventoryEntry was loaded.
260
             Not necessarily the last-changed revision for this file.
261
        :param inv: Inventory from which the entry was loaded.
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
262
        """
1757.2.11 by Robert Collins
Correct bzr diff | less= None clauses in inventory.py to be is not None.
263
        if self.parent_id is not None:
1092.2.20 by Robert Collins
symlink and weaves, whaddya know
264
            if not inv.has_id(self.parent_id):
265
                raise BzrCheckError('missing parent {%s} in inventory for revision {%s}'
266
                        % (self.parent_id, rev_id))
4332.3.28 by Robert Collins
Start checking file texts in a single pass.
267
        checker._add_entry_to_text_key_references(inv, self)
268
        self._check(checker, rev_id)
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
269
4332.3.28 by Robert Collins
Start checking file texts in a single pass.
270
    def _check(self, checker, rev_id):
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
271
        """Check this inventory entry for kind specific errors."""
4332.3.28 by Robert Collins
Start checking file texts in a single pass.
272
        checker._report_items.append(
273
            'unknown entry kind %r in revision {%s}' % (self.kind, rev_id))
1092.2.20 by Robert Collins
symlink and weaves, whaddya know
274
1 by mbp at sourcefrog
import from baz patch-364
275
    def copy(self):
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
276
        """Clone this inventory entry."""
277
        raise NotImplementedError
1 by mbp at sourcefrog
import from baz patch-364
278
1668.1.5 by Martin Pool
[broken] fix up display of files changed by a commit
279
    @staticmethod
280
    def describe_change(old_entry, new_entry):
281
        """Describe the change between old_entry and this.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
282
1668.1.5 by Martin Pool
[broken] fix up display of files changed by a commit
283
        This smells of being an InterInventoryEntry situation, but as its
284
        the first one, we're making it a static method for now.
285
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
286
        An entry with a different parent, or different name is considered
1668.1.5 by Martin Pool
[broken] fix up display of files changed by a commit
287
        to be renamed. Reparenting is an internal detail.
288
        Note that renaming the parent does not trigger a rename for the
289
        child entry itself.
1669.2.1 by Martin Pool
verbose commit now specifically identifies modified/renamed/reparented files
290
        """
1668.1.5 by Martin Pool
[broken] fix up display of files changed by a commit
291
        # TODO: Perhaps return an object rather than just a string
292
        if old_entry is new_entry:
293
            # also the case of both being None
294
            return 'unchanged'
295
        elif old_entry is None:
1092.2.23 by Robert Collins
move inventory entry centric snapshot taking logic to inventory.py
296
            return 'added'
1668.1.5 by Martin Pool
[broken] fix up display of files changed by a commit
297
        elif new_entry is None:
298
            return 'removed'
1959.4.1 by Aaron Bentley
Correctly handle all file kind changes
299
        if old_entry.kind != new_entry.kind:
300
            return 'modified'
1668.1.5 by Martin Pool
[broken] fix up display of files changed by a commit
301
        text_modified, meta_modified = new_entry.detect_changes(old_entry)
302
        if text_modified or meta_modified:
303
            modified = True
304
        else:
305
            modified = False
306
        # TODO 20060511 (mbp, rbc) factor out 'detect_rename' here.
307
        if old_entry.parent_id != new_entry.parent_id:
308
            renamed = True
309
        elif old_entry.name != new_entry.name:
310
            renamed = True
311
        else:
312
            renamed = False
313
        if renamed and not modified:
314
            return InventoryEntry.RENAMED
315
        if modified and not renamed:
316
            return 'modified'
317
        if modified and renamed:
318
            return InventoryEntry.MODIFIED_AND_RENAMED
319
        return 'unchanged'
1 by mbp at sourcefrog
import from baz patch-364
320
321
    def __repr__(self):
1733.1.4 by Robert Collins
Cosmetic niceties for debugging, extra comments etc.
322
        return ("%s(%r, %r, parent_id=%r, revision=%r)"
1 by mbp at sourcefrog
import from baz patch-364
323
                % (self.__class__.__name__,
324
                   self.file_id,
325
                   self.name,
1733.1.4 by Robert Collins
Cosmetic niceties for debugging, extra comments etc.
326
                   self.parent_id,
327
                   self.revision))
1 by mbp at sourcefrog
import from baz patch-364
328
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
329
    def __eq__(self, other):
3882.6.16 by John Arbash Meinel
Update InventoryEntry.__eq__ in case we enable caching without .copy()
330
        if other is self:
331
            # For the case when objects are cached
332
            return True
1 by mbp at sourcefrog
import from baz patch-364
333
        if not isinstance(other, InventoryEntry):
334
            return NotImplemented
335
1398 by Robert Collins
integrate in Gustavos x-bit patch
336
        return ((self.file_id == other.file_id)
337
                and (self.name == other.name)
338
                and (other.symlink_target == self.symlink_target)
339
                and (self.text_sha1 == other.text_sha1)
340
                and (self.text_size == other.text_size)
341
                and (self.text_id == other.text_id)
342
                and (self.parent_id == other.parent_id)
343
                and (self.kind == other.kind)
344
                and (self.revision == other.revision)
345
                and (self.executable == other.executable)
2255.2.220 by Robert Collins
Fix failing detection of changes restricted to subtrees causing spurious pointless commit errors.
346
                and (self.reference_revision == other.reference_revision)
1398 by Robert Collins
integrate in Gustavos x-bit patch
347
                )
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
348
349
    def __ne__(self, other):
350
        return not (self == other)
351
352
    def __hash__(self):
353
        raise ValueError('not hashable')
1 by mbp at sourcefrog
import from baz patch-364
354
1405 by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave
355
    def _unchanged(self, previous_ie):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
356
        """Has this entry changed relative to previous_ie.
357
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
358
        This method should be overridden in child classes.
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
359
        """
1092.2.22 by Robert Collins
text_version and name_version unification looking reasonable
360
        compatible = True
361
        # different inv parent
362
        if previous_ie.parent_id != self.parent_id:
363
            compatible = False
364
        # renamed
365
        elif previous_ie.name != self.name:
366
            compatible = False
2374.2.2 by John Arbash Meinel
Fix the small bug that ie.snapshot() didn't think about kind changes.
367
        elif previous_ie.kind != self.kind:
368
            compatible = False
1092.2.22 by Robert Collins
text_version and name_version unification looking reasonable
369
        return compatible
370
1185.12.33 by Aaron Bentley
Fixed symlink reverting
371
    def _read_tree_state(self, path, work_tree):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
372
        """Populate fields in the inventory entry from the given tree.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
373
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
374
        Note that this should be modified to be a noop on virtual trees
375
        as all entries created there are prepopulated.
376
        """
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
377
        # TODO: Rather than running this manually, we should check the
1185.16.5 by Martin Pool
doc
378
        # working sha1 and other expensive properties when they're
379
        # first requested, or preload them if they're already known
380
        pass            # nothing to do by default
1092.2.23 by Robert Collins
move inventory entry centric snapshot taking logic to inventory.py
381
1534.7.175 by Aaron Bentley
Ensured revert writes a normal inventory
382
    def _forget_tree_state(self):
383
        pass
384
1 by mbp at sourcefrog
import from baz patch-364
385
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
386
class InventoryDirectory(InventoryEntry):
387
    """A directory in an inventory."""
388
5365.2.1 by Andrew Bennetts
Reduce memory consumption of InventoryEntries by removing __slots__ entries for attributes that should never be set, e.g. symlink_target on files.
389
    __slots__ = ['children']
390
391
    kind = 'directory'
1757.2.10 by Robert Collins
Give all inventory entries __slots__ that are useful with the current codebase.
392
4332.3.28 by Robert Collins
Start checking file texts in a single pass.
393
    def _check(self, checker, rev_id):
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
394
        """See InventoryEntry._check"""
4657.1.1 by Robert Collins
Do not add the root directory entry to the list of expected keys during check in non rich-root repositories. (#416732)
395
        # In non rich root repositories we do not expect a file graph for the
396
        # root.
397
        if self.name == '' and not checker.rich_roots:
398
            return
399
        # Directories are stored as an empty file, but the file should exist
400
        # to provide a per-fileid log. The hash of every directory content is
4657.1.3 by Robert Collins
Tweak InventoryDirectory _check comment to avoid confusion.
401
        # "da..." below (the sha1sum of '').
4332.3.28 by Robert Collins
Start checking file texts in a single pass.
402
        checker.add_pending_item(rev_id,
403
            ('texts', self.file_id, self.revision), 'text',
404
             'da39a3ee5e6b4b0d3255bfef95601890afd80709')
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
405
406
    def copy(self):
407
        other = InventoryDirectory(self.file_id, self.name, self.parent_id)
408
        other.revision = self.revision
409
        # note that children are *not* copied; they're pulled across when
410
        # others are added
411
        return other
412
413
    def __init__(self, file_id, name, parent_id):
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
414
        super(InventoryDirectory, self).__init__(file_id, name, parent_id)
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
415
        self.children = {}
416
417
    def kind_character(self):
418
        """See InventoryEntry.kind_character."""
419
        return '/'
420
421
    def _put_in_tar(self, item, tree):
422
        """See InventoryEntry._put_in_tar."""
423
        item.type = tarfile.DIRTYPE
424
        fileobj = None
425
        item.name += '/'
426
        item.size = 0
427
        item.mode = 0755
428
        return fileobj
429
430
    def _put_on_disk(self, fullpath, tree):
431
        """See InventoryEntry._put_on_disk."""
432
        os.mkdir(fullpath)
433
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
434
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
435
class InventoryFile(InventoryEntry):
436
    """A file in an inventory."""
437
5365.2.1 by Andrew Bennetts
Reduce memory consumption of InventoryEntries by removing __slots__ entries for attributes that should never be set, e.g. symlink_target on files.
438
    __slots__ = ['text_sha1', 'text_size', 'text_id', 'executable']
439
440
    kind = 'file'
441
442
    def __init__(self, file_id, name, parent_id):
443
        super(InventoryFile, self).__init__(file_id, name, parent_id)
444
        self.text_sha1 = None
445
        self.text_size = None
446
        self.text_id = None
447
        self.executable = False
1757.2.10 by Robert Collins
Give all inventory entries __slots__ that are useful with the current codebase.
448
4332.3.28 by Robert Collins
Start checking file texts in a single pass.
449
    def _check(self, checker, tree_revision_id):
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
450
        """See InventoryEntry._check"""
4332.3.28 by Robert Collins
Start checking file texts in a single pass.
451
        # TODO: check size too.
452
        checker.add_pending_item(tree_revision_id,
453
            ('texts', self.file_id, self.revision), 'text',
454
             self.text_sha1)
455
        if self.text_size is None:
456
            checker._report_items.append(
457
                'fileid {%s} in {%s} has None for text_size' % (self.file_id,
458
                tree_revision_id))
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
459
460
    def copy(self):
461
        other = InventoryFile(self.file_id, self.name, self.parent_id)
462
        other.executable = self.executable
463
        other.text_id = self.text_id
464
        other.text_sha1 = self.text_sha1
465
        other.text_size = self.text_size
466
        other.revision = self.revision
467
        return other
468
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
469
    def detect_changes(self, old_entry):
470
        """See InventoryEntry.detect_changes."""
471
        text_modified = (self.text_sha1 != old_entry.text_sha1)
472
        meta_modified = (self.executable != old_entry.executable)
473
        return text_modified, meta_modified
474
475
    def _diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree,
476
             output_to, reverse=False):
477
        """See InventoryEntry._diff."""
3009.2.22 by Aaron Bentley
Update names & docstring
478
        from bzrlib.diff import DiffText
3009.2.5 by Aaron Bentley
Factor symlink and file diffing into differ
479
        from_file_id = self.file_id
480
        if to_entry:
481
            to_file_id = to_entry.file_id
482
        else:
483
            to_file_id = None
484
        if reverse:
485
            to_file_id, from_file_id = from_file_id, to_file_id
486
            tree, to_tree = to_tree, tree
487
            from_label, to_label = to_label, from_label
3009.2.22 by Aaron Bentley
Update names & docstring
488
        differ = DiffText(tree, to_tree, output_to, 'utf-8', '', '',
489
                          text_diff)
3009.2.5 by Aaron Bentley
Factor symlink and file diffing into differ
490
        return differ.diff_text(from_file_id, to_file_id, from_label, to_label)
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
491
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
492
    def has_text(self):
493
        """See InventoryEntry.has_text."""
494
        return True
495
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
496
    def kind_character(self):
497
        """See InventoryEntry.kind_character."""
498
        return ''
499
500
    def _put_in_tar(self, item, tree):
501
        """See InventoryEntry._put_in_tar."""
502
        item.type = tarfile.REGTYPE
503
        fileobj = tree.get_file(self.file_id)
504
        item.size = self.text_size
505
        if tree.is_executable(self.file_id):
506
            item.mode = 0755
507
        else:
508
            item.mode = 0644
509
        return fileobj
510
511
    def _put_on_disk(self, fullpath, tree):
512
        """See InventoryEntry._put_on_disk."""
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
513
        osutils.pumpfile(tree.get_file(self.file_id), file(fullpath, 'wb'))
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
514
        if tree.is_executable(self.file_id):
515
            os.chmod(fullpath, 0755)
516
1185.12.33 by Aaron Bentley
Fixed symlink reverting
517
    def _read_tree_state(self, path, work_tree):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
518
        """See InventoryEntry._read_tree_state."""
1732.1.19 by John Arbash Meinel
If you have the path, use it rather than looking it up again
519
        self.text_sha1 = work_tree.get_file_sha1(self.file_id, path=path)
1740.3.2 by Jelmer Vernooij
Move storing file texts to commit builder.
520
        # FIXME: 20050930 probe for the text size when getting sha1
521
        # in _read_tree_state
1732.1.19 by John Arbash Meinel
If you have the path, use it rather than looking it up again
522
        self.executable = work_tree.is_executable(self.file_id, path=path)
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
523
1733.1.4 by Robert Collins
Cosmetic niceties for debugging, extra comments etc.
524
    def __repr__(self):
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
525
        return ("%s(%r, %r, parent_id=%r, sha1=%r, len=%s, revision=%s)"
1733.1.4 by Robert Collins
Cosmetic niceties for debugging, extra comments etc.
526
                % (self.__class__.__name__,
527
                   self.file_id,
528
                   self.name,
529
                   self.parent_id,
530
                   self.text_sha1,
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
531
                   self.text_size,
532
                   self.revision))
1733.1.4 by Robert Collins
Cosmetic niceties for debugging, extra comments etc.
533
1534.7.175 by Aaron Bentley
Ensured revert writes a normal inventory
534
    def _forget_tree_state(self):
535
        self.text_sha1 = None
536
1405 by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave
537
    def _unchanged(self, previous_ie):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
538
        """See InventoryEntry._unchanged."""
1405 by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave
539
        compatible = super(InventoryFile, self)._unchanged(previous_ie)
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
540
        if self.text_sha1 != previous_ie.text_sha1:
541
            compatible = False
542
        else:
543
            # FIXME: 20050930 probe for the text size when getting sha1
544
            # in _read_tree_state
545
            self.text_size = previous_ie.text_size
1185.1.52 by Robert Collins
fix detection of changes in inventory entries when the x bit is toggled
546
        if self.executable != previous_ie.executable:
547
            compatible = False
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
548
        return compatible
549
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
550
551
class InventoryLink(InventoryEntry):
552
    """A file in an inventory."""
553
5365.2.1 by Andrew Bennetts
Reduce memory consumption of InventoryEntries by removing __slots__ entries for attributes that should never be set, e.g. symlink_target on files.
554
    __slots__ = ['symlink_target']
555
556
    kind = 'symlink'
557
558
    def __init__(self, file_id, name, parent_id):
559
        super(InventoryLink, self).__init__(file_id, name, parent_id)
560
        self.symlink_target = None
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
561
4332.3.35 by Robert Collins
Fix failing tests.
562
    def _check(self, checker, tree_revision_id):
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
563
        """See InventoryEntry._check"""
1753.1.4 by Robert Collins
Fixup '== None' usage in inventory.py.
564
        if self.symlink_target is None:
4332.3.28 by Robert Collins
Start checking file texts in a single pass.
565
            checker._report_items.append(
566
                'symlink {%s} has no target in revision {%s}'
4332.3.35 by Robert Collins
Fix failing tests.
567
                    % (self.file_id, tree_revision_id))
4332.3.28 by Robert Collins
Start checking file texts in a single pass.
568
        # Symlinks are stored as ''
569
        checker.add_pending_item(tree_revision_id,
570
            ('texts', self.file_id, self.revision), 'text',
571
             'da39a3ee5e6b4b0d3255bfef95601890afd80709')
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
572
573
    def copy(self):
574
        other = InventoryLink(self.file_id, self.name, self.parent_id)
575
        other.symlink_target = self.symlink_target
576
        other.revision = self.revision
577
        return other
578
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
579
    def detect_changes(self, old_entry):
580
        """See InventoryEntry.detect_changes."""
581
        # FIXME: which _modified field should we use ? RBC 20051003
582
        text_modified = (self.symlink_target != old_entry.symlink_target)
583
        if text_modified:
584
            mutter("    symlink target changed")
585
        meta_modified = False
586
        return text_modified, meta_modified
587
588
    def _diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree,
589
             output_to, reverse=False):
590
        """See InventoryEntry._diff."""
3009.2.22 by Aaron Bentley
Update names & docstring
591
        from bzrlib.diff import DiffSymlink
3009.2.5 by Aaron Bentley
Factor symlink and file diffing into differ
592
        old_target = self.symlink_target
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
593
        if to_entry is not None:
3009.2.5 by Aaron Bentley
Factor symlink and file diffing into differ
594
            new_target = to_entry.symlink_target
595
        else:
596
            new_target = None
597
        if not reverse:
598
            old_tree = tree
599
            new_tree = to_tree
600
        else:
601
            old_tree = to_tree
602
            new_tree = tree
603
            new_target, old_target = old_target, new_target
3009.2.22 by Aaron Bentley
Update names & docstring
604
        differ = DiffSymlink(old_tree, new_tree, output_to)
3009.2.5 by Aaron Bentley
Factor symlink and file diffing into differ
605
        return differ.diff_symlink(old_target, new_target)
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
606
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
607
    def kind_character(self):
608
        """See InventoryEntry.kind_character."""
609
        return ''
610
611
    def _put_in_tar(self, item, tree):
612
        """See InventoryEntry._put_in_tar."""
1185.33.3 by Martin Pool
[merge] jelmer
613
        item.type = tarfile.SYMTYPE
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
614
        fileobj = None
615
        item.size = 0
616
        item.mode = 0755
617
        item.linkname = self.symlink_target
618
        return fileobj
619
620
    def _put_on_disk(self, fullpath, tree):
621
        """See InventoryEntry._put_on_disk."""
622
        try:
623
            os.symlink(self.symlink_target, fullpath)
624
        except OSError,e:
625
            raise BzrError("Failed to create symlink %r -> %r, error: %s" % (fullpath, self.symlink_target, e))
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
626
1185.12.33 by Aaron Bentley
Fixed symlink reverting
627
    def _read_tree_state(self, path, work_tree):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
628
        """See InventoryEntry._read_tree_state."""
629
        self.symlink_target = work_tree.get_symlink_target(self.file_id)
630
1534.7.175 by Aaron Bentley
Ensured revert writes a normal inventory
631
    def _forget_tree_state(self):
632
        self.symlink_target = None
633
1405 by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave
634
    def _unchanged(self, previous_ie):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
635
        """See InventoryEntry._unchanged."""
1405 by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave
636
        compatible = super(InventoryLink, self)._unchanged(previous_ie)
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
637
        if self.symlink_target != previous_ie.symlink_target:
638
            compatible = False
639
        return compatible
640
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
641
2100.3.1 by Aaron Bentley
Start roundtripping tree-reference entries
642
class TreeReference(InventoryEntry):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
643
5365.2.1 by Andrew Bennetts
Reduce memory consumption of InventoryEntries by removing __slots__ entries for attributes that should never be set, e.g. symlink_target on files.
644
    __slots__ = ['reference_revision']
645
2100.3.1 by Aaron Bentley
Start roundtripping tree-reference entries
646
    kind = 'tree-reference'
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
647
2255.6.8 by Aaron Bentley
Merge refactoring of add_reference
648
    def __init__(self, file_id, name, parent_id, revision=None,
649
                 reference_revision=None):
2100.3.1 by Aaron Bentley
Start roundtripping tree-reference entries
650
        InventoryEntry.__init__(self, file_id, name, parent_id)
651
        self.revision = revision
652
        self.reference_revision = reference_revision
653
2100.3.18 by Aaron Bentley
Get commit working for tree references
654
    def copy(self):
655
        return TreeReference(self.file_id, self.name, self.parent_id,
656
                             self.revision, self.reference_revision)
657
2100.3.19 by Aaron Bentley
Ensure commit preserves reference revision
658
    def _read_tree_state(self, path, work_tree):
659
        """Populate fields in the inventory entry from the given tree.
660
        """
2255.2.226 by Robert Collins
Get merge_nested finally working: change nested tree iterators to take file_ids, and ensure the right branch is connected to in the merge logic. May not be suitable for shared repositories yet.
661
        self.reference_revision = work_tree.get_reference_revision(
662
            self.file_id, path)
2100.3.19 by Aaron Bentley
Ensure commit preserves reference revision
663
664
    def _forget_tree_state(self):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
665
        self.reference_revision = None
2100.3.19 by Aaron Bentley
Ensure commit preserves reference revision
666
2825.5.2 by Robert Collins
Review feedback, and fix pointless commits with nested trees to raise PointlessCommit appropriately.
667
    def _unchanged(self, previous_ie):
668
        """See InventoryEntry._unchanged."""
669
        compatible = super(TreeReference, self)._unchanged(previous_ie)
670
        if self.reference_revision != previous_ie.reference_revision:
671
            compatible = False
672
        return compatible
673
2100.3.19 by Aaron Bentley
Ensure commit preserves reference revision
674
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
675
class CommonInventory(object):
4505.5.8 by Robert Collins
Fix fallout from the delta checking work, don't error on deltas containing the root inventory item in CHK delta application, and clean up Inventory docs.
676
    """Basic inventory logic, defined in terms of primitives like has_id.
677
678
    An inventory is the metadata about the contents of a tree.
679
680
    This is broadly a map from file_id to entries such as directories, files,
681
    symlinks and tree references. Each entry maintains its own metadata like
682
    SHA1 and length for files, or children for a directory.
683
684
    Entries can be looked up either by path or by file_id.
685
686
    InventoryEntry objects must not be modified after they are
687
    inserted, other than through the Inventory API.
688
    """
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
689
3735.2.61 by Robert Collins
Define __contains__ for all Inventories, as otherwise __iter__ gets used for foo in bar, if __iter__ is defined.
690
    def __contains__(self, file_id):
691
        """True if this entry contains a file with given id.
692
693
        >>> inv = Inventory()
694
        >>> inv.add(InventoryFile('123', 'foo.c', ROOT_ID))
695
        InventoryFile('123', 'foo.c', parent_id='TREE_ROOT', sha1=None, len=None, revision=None)
696
        >>> '123' in inv
697
        True
698
        >>> '456' in inv
699
        False
700
701
        Note that this method along with __iter__ are not encouraged for use as
702
        they are less clear than specific query methods - they may be rmeoved
703
        in the future.
704
        """
705
        return self.has_id(file_id)
706
4593.3.2 by Martin Pool
has_filename should be in CommonInventory and CHKInventory
707
    def has_filename(self, filename):
708
        return bool(self.path2id(filename))
709
3735.2.12 by Robert Collins
Implement commit-via-deltas for split inventory repositories.
710
    def id2path(self, file_id):
711
        """Return as a string the path to file_id.
3735.2.99 by John Arbash Meinel
Merge bzr.dev 4034. Whitespace cleanup
712
3735.2.12 by Robert Collins
Implement commit-via-deltas for split inventory repositories.
713
        >>> i = Inventory()
714
        >>> e = i.add(InventoryDirectory('src-id', 'src', ROOT_ID))
715
        >>> e = i.add(InventoryFile('foo-id', 'foo.c', parent_id='src-id'))
716
        >>> print i.id2path('foo-id')
717
        src/foo.c
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
718
719
        :raises NoSuchId: If file_id is not present in the inventory.
3735.2.12 by Robert Collins
Implement commit-via-deltas for split inventory repositories.
720
        """
721
        # get all names, skipping root
722
        return '/'.join(reversed(
3735.2.99 by John Arbash Meinel
Merge bzr.dev 4034. Whitespace cleanup
723
            [parent.name for parent in
3735.2.12 by Robert Collins
Implement commit-via-deltas for split inventory repositories.
724
             self._iter_file_id_parents(file_id)][:-1]))
3735.2.99 by John Arbash Meinel
Merge bzr.dev 4034. Whitespace cleanup
725
4370.5.1 by Ian Clatworthy
add recursive parameter to iter_entries()
726
    def iter_entries(self, from_dir=None, recursive=True):
727
        """Return (path, entry) pairs, in order by name.
728
        
729
        :param from_dir: if None, start from the root,
730
          otherwise start from this directory (either file-id or entry)
731
        :param recursive: recurse into directories or not
732
        """
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
733
        if from_dir is None:
734
            if self.root is None:
735
                return
736
            from_dir = self.root
737
            yield '', self.root
738
        elif isinstance(from_dir, basestring):
739
            from_dir = self[from_dir]
3735.2.99 by John Arbash Meinel
Merge bzr.dev 4034. Whitespace cleanup
740
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
741
        # unrolling the recursive called changed the time from
742
        # 440ms/663ms (inline/total) to 116ms/116ms
743
        children = from_dir.children.items()
744
        children.sort()
4370.5.1 by Ian Clatworthy
add recursive parameter to iter_entries()
745
        if not recursive:
746
            for name, ie in children:
747
                yield name, ie
748
            return
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
749
        children = collections.deque(children)
750
        stack = [(u'', children)]
751
        while stack:
752
            from_dir_relpath, children = stack[-1]
753
754
            while children:
755
                name, ie = children.popleft()
756
757
                # we know that from_dir_relpath never ends in a slash
758
                # and 'f' doesn't begin with one, we can do a string op, rather
759
                # than the checks of pathjoin(), though this means that all paths
760
                # start with a slash
761
                path = from_dir_relpath + '/' + name
762
763
                yield path[1:], ie
764
765
                if ie.kind != 'directory':
766
                    continue
767
768
                # But do this child first
769
                new_children = ie.children.items()
770
                new_children.sort()
771
                new_children = collections.deque(new_children)
772
                stack.append((path, new_children))
773
                # Break out of inner loop, so that we start outer loop with child
774
                break
775
            else:
776
                # if we finished all children, pop it off the stack
777
                stack.pop()
778
779
    def iter_entries_by_dir(self, from_dir=None, specific_file_ids=None,
780
        yield_parents=False):
781
        """Iterate over the entries in a directory first order.
782
783
        This returns all entries for a directory before returning
784
        the entries for children of a directory. This is not
785
        lexicographically sorted order, and is a hybrid between
786
        depth-first and breadth-first.
787
788
        :param yield_parents: If True, yield the parents from the root leading
789
            down to specific_file_ids that have been requested. This has no
790
            impact if specific_file_ids is None.
791
        :return: This yields (path, entry) pairs
792
        """
793
        if specific_file_ids and not isinstance(specific_file_ids, set):
794
            specific_file_ids = set(specific_file_ids)
795
        # TODO? Perhaps this should return the from_dir so that the root is
796
        # yielded? or maybe an option?
797
        if from_dir is None:
798
            if self.root is None:
799
                return
800
            # Optimize a common case
801
            if (not yield_parents and specific_file_ids is not None and
802
                len(specific_file_ids) == 1):
803
                file_id = list(specific_file_ids)[0]
804
                if file_id in self:
805
                    yield self.id2path(file_id), self[file_id]
3735.2.99 by John Arbash Meinel
Merge bzr.dev 4034. Whitespace cleanup
806
                return
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
807
            from_dir = self.root
808
            if (specific_file_ids is None or yield_parents or
809
                self.root.file_id in specific_file_ids):
810
                yield u'', self.root
811
        elif isinstance(from_dir, basestring):
812
            from_dir = self[from_dir]
813
814
        if specific_file_ids is not None:
815
            # TODO: jam 20070302 This could really be done as a loop rather
816
            #       than a bunch of recursive calls.
817
            parents = set()
818
            byid = self
819
            def add_ancestors(file_id):
820
                if file_id not in byid:
821
                    return
822
                parent_id = byid[file_id].parent_id
823
                if parent_id is None:
824
                    return
825
                if parent_id not in parents:
826
                    parents.add(parent_id)
827
                    add_ancestors(parent_id)
828
            for file_id in specific_file_ids:
829
                add_ancestors(file_id)
830
        else:
831
            parents = None
3735.2.99 by John Arbash Meinel
Merge bzr.dev 4034. Whitespace cleanup
832
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
833
        stack = [(u'', from_dir)]
834
        while stack:
835
            cur_relpath, cur_dir = stack.pop()
836
837
            child_dirs = []
838
            for child_name, child_ie in sorted(cur_dir.children.iteritems()):
839
840
                child_relpath = cur_relpath + child_name
841
3735.2.99 by John Arbash Meinel
Merge bzr.dev 4034. Whitespace cleanup
842
                if (specific_file_ids is None or
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
843
                    child_ie.file_id in specific_file_ids or
844
                    (yield_parents and child_ie.file_id in parents)):
845
                    yield child_relpath, child_ie
846
847
                if child_ie.kind == 'directory':
848
                    if parents is None or child_ie.file_id in parents:
849
                        child_dirs.append((child_relpath+'/', child_ie))
850
            stack.extend(reversed(child_dirs))
851
3735.2.47 by Robert Collins
Move '_make_inv_delta' onto Inventory (UNTESTED).
852
    def _make_delta(self, old):
853
        """Make an inventory delta from two inventories."""
854
        old_ids = set(old)
855
        new_ids = set(self)
856
        adds = new_ids - old_ids
857
        deletes = old_ids - new_ids
858
        common = old_ids.intersection(new_ids)
859
        delta = []
860
        for file_id in deletes:
861
            delta.append((old.id2path(file_id), None, file_id, None))
862
        for file_id in adds:
863
            delta.append((None, self.id2path(file_id), file_id, self[file_id]))
864
        for file_id in common:
865
            if old[file_id] != self[file_id]:
866
                delta.append((old.id2path(file_id), self.id2path(file_id),
867
                    file_id, self[file_id]))
868
        return delta
869
4241.6.5 by Robert Collins, John Arbash Meinel
CHKInventory support from brisbane-core.
870
    def _get_mutable_inventory(self):
871
        """Returns a mutable copy of the object.
872
873
        Some inventories are immutable, yet working trees, for example, needs
874
        to mutate exisiting inventories instead of creating a new one.
875
        """
876
        raise NotImplementedError(self._get_mutable_inventory)
877
3735.2.110 by Ian Clatworthy
move make_entry(), entries() and directories() up to CommonInventory class
878
    def make_entry(self, kind, name, parent_id, file_id=None):
879
        """Simple thunk to bzrlib.inventory.make_entry."""
880
        return make_entry(kind, name, parent_id, file_id)
881
882
    def entries(self):
883
        """Return list of (path, ie) for all entries except the root.
884
885
        This may be faster than iter_entries.
886
        """
887
        accum = []
888
        def descend(dir_ie, dir_path):
889
            kids = dir_ie.children.items()
890
            kids.sort()
891
            for name, ie in kids:
892
                child_path = osutils.pathjoin(dir_path, name)
893
                accum.append((child_path, ie))
894
                if ie.kind == 'directory':
895
                    descend(ie, child_path)
896
897
        descend(self.root, u'')
898
        return accum
899
900
    def directories(self):
901
        """Return (path, entry) pairs for all directories, including the root.
902
        """
903
        accum = []
904
        def descend(parent_ie, parent_path):
905
            accum.append((parent_path, parent_ie))
906
907
            kids = [(ie.name, ie) for ie in parent_ie.children.itervalues() if ie.kind == 'directory']
908
            kids.sort()
909
910
            for name, child_ie in kids:
911
                child_path = osutils.pathjoin(parent_path, name)
912
                descend(child_ie, child_path)
913
        descend(self.root, u'')
914
        return accum
4241.6.5 by Robert Collins, John Arbash Meinel
CHKInventory support from brisbane-core.
915
4733.1.1 by John Arbash Meinel
Minor tweak to Inventory.path2id
916
    def path2id(self, relpath):
3735.2.119 by Ian Clatworthy
add a cache for CHKInventory.path2id()
917
        """Walk down through directories to return entry of last component.
918
4733.1.2 by John Arbash Meinel
Update the docs as Ian suggested.
919
        :param relpath: may be either a list of path components, or a single
920
            string, in which case it is automatically split.
3735.2.119 by Ian Clatworthy
add a cache for CHKInventory.path2id()
921
922
        This returns the entry of the last component in the path,
923
        which may be either a file or a directory.
924
925
        Returns None IFF the path is not found.
926
        """
4733.1.1 by John Arbash Meinel
Minor tweak to Inventory.path2id
927
        if isinstance(relpath, basestring):
928
            names = osutils.splitpath(relpath)
929
        else:
930
            names = relpath
3735.2.119 by Ian Clatworthy
add a cache for CHKInventory.path2id()
931
3735.2.149 by Ian Clatworthy
handle path2id when root not yet known
932
        try:
933
            parent = self.root
934
        except errors.NoSuchId:
935
            # root doesn't exist yet so nothing else can
936
            return None
3735.2.119 by Ian Clatworthy
add a cache for CHKInventory.path2id()
937
        if parent is None:
938
            return None
4733.1.1 by John Arbash Meinel
Minor tweak to Inventory.path2id
939
        for f in names:
3735.2.119 by Ian Clatworthy
add a cache for CHKInventory.path2id()
940
            try:
941
                children = getattr(parent, 'children', None)
942
                if children is None:
943
                    return None
944
                cie = children[f]
945
                parent = cie
946
            except KeyError:
947
                # or raise an error?
948
                return None
949
950
        return parent.file_id
951
3735.36.6 by Ian Clatworthy
get inventory filtering working for CHKInventory
952
    def filter(self, specific_fileids):
953
        """Get an inventory view filtered against a set of file-ids.
954
955
        Children of directories and parents are included.
956
957
        The result may or may not reference the underlying inventory
958
        so it should be treated as immutable.
959
        """
960
        interesting_parents = set()
961
        for fileid in specific_fileids:
962
            try:
963
                interesting_parents.update(self.get_idpath(fileid))
964
            except errors.NoSuchId:
965
                # This fileid is not in the inventory - that's ok
966
                pass
967
        entries = self.iter_entries()
968
        if self.root is None:
969
            return Inventory(root_id=None)
970
        other = Inventory(entries.next()[1].file_id)
971
        other.root.revision = self.root.revision
972
        other.revision_id = self.revision_id
973
        directories_to_expand = set()
974
        for path, entry in entries:
975
            file_id = entry.file_id
976
            if (file_id in specific_fileids
977
                or entry.parent_id in directories_to_expand):
978
                if entry.kind == 'directory':
979
                    directories_to_expand.add(file_id)
980
            elif file_id not in interesting_parents:
981
                continue
982
            other.add(entry.copy())
983
        return other
984
985
    def get_idpath(self, file_id):
986
        """Return a list of file_ids for the path to an entry.
987
988
        The list contains one element for each directory followed by
989
        the id of the file itself.  So the length of the returned list
990
        is equal to the depth of the file in the tree, counting the
991
        root directory as depth 1.
992
        """
993
        p = []
994
        for parent in self._iter_file_id_parents(file_id):
995
            p.insert(0, parent.file_id)
996
        return p
997
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
998
999
class Inventory(CommonInventory):
4505.5.8 by Robert Collins
Fix fallout from the delta checking work, don't error on deltas containing the root inventory item in CHK delta application, and clean up Inventory docs.
1000
    """Mutable dict based in-memory inventory.
1001
1002
    We never store the full path to a file, because renaming a directory
1003
    implicitly moves all of its contents.  This class internally maintains a
1 by mbp at sourcefrog
import from baz patch-364
1004
    lookup tree that allows the children under a directory to be
1005
    returned quickly.
1006
1007
    >>> inv = Inventory()
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
1008
    >>> inv.add(InventoryFile('123-123', 'hello.c', ROOT_ID))
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1009
    InventoryFile('123-123', 'hello.c', parent_id='TREE_ROOT', sha1=None, len=None, revision=None)
1 by mbp at sourcefrog
import from baz patch-364
1010
    >>> inv['123-123'].name
1011
    'hello.c'
1012
4505.5.8 by Robert Collins
Fix fallout from the delta checking work, don't error on deltas containing the root inventory item in CHK delta application, and clean up Inventory docs.
1013
    Id's may be looked up from paths:
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1014
4505.5.8 by Robert Collins
Fix fallout from the delta checking work, don't error on deltas containing the root inventory item in CHK delta application, and clean up Inventory docs.
1015
    >>> inv.path2id('hello.c')
1016
    '123-123'
1 by mbp at sourcefrog
import from baz patch-364
1017
    >>> '123-123' in inv
1018
    True
1019
4505.5.8 by Robert Collins
Fix fallout from the delta checking work, don't error on deltas containing the root inventory item in CHK delta application, and clean up Inventory docs.
1020
    There are iterators over the contents:
1 by mbp at sourcefrog
import from baz patch-364
1021
4505.5.8 by Robert Collins
Fix fallout from the delta checking work, don't error on deltas containing the root inventory item in CHK delta application, and clean up Inventory docs.
1022
    >>> [entry[0] for entry in inv.iter_entries()]
1852.6.6 by Robert Collins
Finish updating iter_entries change to make all tests pass.
1023
    ['', u'hello.c']
1 by mbp at sourcefrog
import from baz patch-364
1024
    """
4505.5.8 by Robert Collins
Fix fallout from the delta checking work, don't error on deltas containing the root inventory item in CHK delta application, and clean up Inventory docs.
1025
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
1026
    def __init__(self, root_id=ROOT_ID, revision_id=None):
1 by mbp at sourcefrog
import from baz patch-364
1027
        """Create or read an inventory.
1028
1029
        If a working directory is specified, the inventory is read
1030
        from there.  If the file is specified, read from that. If not,
1031
        the inventory is created empty.
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
1032
1033
        The inventory is created with a default root directory, with
1034
        an id of None.
1 by mbp at sourcefrog
import from baz patch-364
1035
        """
1731.1.33 by Aaron Bentley
Revert no-special-root changes
1036
        if root_id is not None:
2294.1.5 by John Arbash Meinel
Fix Inventory.iter_entries_by_dir to return Unicode paths,
1037
            self._set_root(InventoryDirectory(root_id, u'', None))
1731.1.33 by Aaron Bentley
Revert no-special-root changes
1038
        else:
1039
            self.root = None
1040
            self._byid = {}
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
1041
        self.revision_id = revision_id
1910.2.3 by Aaron Bentley
All tests pass
1042
2865.1.1 by Robert Collins
Create new mutable tree method update_to_one_parent_via_delta for eventual use by commit.
1043
    def __repr__(self):
4112.1.1 by Vincent Ladeuil
Fallback to old revision id if the current one doesn't exist in
1044
        # More than one page of ouput is not useful anymore to debug
1045
        max_len = 2048
1046
        closing = '...}'
1047
        contents = repr(self._byid)
1048
        if len(contents) > max_len:
1049
            contents = contents[:(max_len-len(closing))] + closing
1050
        return "<Inventory object at %x, contents=%r>" % (id(self), contents)
2865.1.1 by Robert Collins
Create new mutable tree method update_to_one_parent_via_delta for eventual use by commit.
1051
1052
    def apply_delta(self, delta):
1053
        """Apply a delta to this inventory.
1054
4501.1.1 by Robert Collins
Add documentation describing how and why we use inventory deltas, and what can go wrong with them.
1055
        See the inventory developers documentation for the theory behind
1056
        inventory deltas.
1057
4526.9.3 by Robert Collins
Handle mismatches between inventory delta paths and actual paths found by traversing parent pointers.
1058
        If delta application fails the inventory is left in an indeterminate
1059
        state and must not be used.
1060
2865.1.1 by Robert Collins
Create new mutable tree method update_to_one_parent_via_delta for eventual use by commit.
1061
        :param delta: A list of changes to apply. After all the changes are
1062
            applied the final inventory must be internally consistent, but it
1063
            is ok to supply changes which, if only half-applied would have an
1064
            invalid result - such as supplying two changes which rename two
1065
            files, 'A' and 'B' with each other : [('A', 'B', 'A-id', a_entry),
1066
            ('B', 'A', 'B-id', b_entry)].
1067
1068
            Each change is a tuple, of the form (old_path, new_path, file_id,
1069
            new_entry).
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1070
2865.1.1 by Robert Collins
Create new mutable tree method update_to_one_parent_via_delta for eventual use by commit.
1071
            When new_path is None, the change indicates the removal of an entry
1072
            from the inventory and new_entry will be ignored (using None is
1073
            appropriate). If new_path is not None, then new_entry must be an
1074
            InventoryEntry instance, which will be incorporated into the
1075
            inventory (and replace any existing entry with the same file id).
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1076
2865.1.1 by Robert Collins
Create new mutable tree method update_to_one_parent_via_delta for eventual use by commit.
1077
            When old_path is None, the change indicates the addition of
1078
            a new entry to the inventory.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1079
2865.1.1 by Robert Collins
Create new mutable tree method update_to_one_parent_via_delta for eventual use by commit.
1080
            When neither new_path nor old_path are None, the change is a
1081
            modification to an entry, such as a rename, reparent, kind change
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1082
            etc.
2865.1.1 by Robert Collins
Create new mutable tree method update_to_one_parent_via_delta for eventual use by commit.
1083
1084
            The children attribute of new_entry is ignored. This is because
2865.1.3 by Robert Collins
Review feedback.
1085
            this method preserves children automatically across alterations to
1086
            the parent of the children, and cases where the parent id of a
1087
            child is changing require the child to be passed in as a separate
1088
            change regardless. E.g. in the recursive deletion of a directory -
1089
            the directory's children must be included in the delta, or the
1090
            final inventory will be invalid.
4090.3.1 by Ian Clatworthy
check delta is legal in Inventory.apply_delta()
1091
1092
            Note that a file_id must only appear once within a given delta.
1093
            An AssertionError is raised otherwise.
2865.1.1 by Robert Collins
Create new mutable tree method update_to_one_parent_via_delta for eventual use by commit.
1094
        """
4090.3.2 by Ian Clatworthy
review tweak from jam
1095
        # Check that the delta is legal. It would be nice if this could be
1096
        # done within the loops below but it's safer to validate the delta
4505.5.4 by Robert Collins
Repeated path/id corruption detected.
1097
        # before starting to mutate the inventory, as there isn't a rollback
1098
        # facility.
1099
        list(_check_delta_unique_ids(_check_delta_unique_new_paths(
1100
            _check_delta_unique_old_paths(_check_delta_ids_match_entry(
4526.9.22 by Robert Collins
Check fileids in inventory deltas are not None and are strings.
1101
            _check_delta_ids_are_valid(
4526.9.4 by Robert Collins
Look for trivial issues with new_path and entry being out of sync in deltas.
1102
            _check_delta_new_path_entry_both_or_None(
4526.9.22 by Robert Collins
Check fileids in inventory deltas are not None and are strings.
1103
            delta)))))))
4090.3.1 by Ian Clatworthy
check delta is legal in Inventory.apply_delta()
1104
2865.1.1 by Robert Collins
Create new mutable tree method update_to_one_parent_via_delta for eventual use by commit.
1105
        children = {}
1106
        # Remove all affected items which were in the original inventory,
1107
        # starting with the longest paths, thus ensuring parents are examined
1108
        # after their children, which means that everything we examine has no
1109
        # modified children remaining by the time we examine it.
1110
        for old_path, file_id in sorted(((op, f) for op, np, f, e in delta
1111
                                        if op is not None), reverse=True):
1112
            # Preserve unaltered children of file_id for later reinsertion.
3585.2.2 by Robert Collins
Cause apply_inventory_delta on Inventory objects to fail with deltas that leave dangling children.
1113
            file_id_children = getattr(self[file_id], 'children', {})
1114
            if len(file_id_children):
1115
                children[file_id] = file_id_children
4526.9.3 by Robert Collins
Handle mismatches between inventory delta paths and actual paths found by traversing parent pointers.
1116
            if self.id2path(file_id) != old_path:
1117
                raise errors.InconsistentDelta(old_path, file_id,
1118
                    "Entry was at wrong other path %r." % self.id2path(file_id))
2865.1.1 by Robert Collins
Create new mutable tree method update_to_one_parent_via_delta for eventual use by commit.
1119
            # Remove file_id and the unaltered children. If file_id is not
1120
            # being deleted it will be reinserted back later.
1121
            self.remove_recursive_id(file_id)
1122
        # Insert all affected which should be in the new inventory, reattaching
1123
        # their children if they had any. This is done from shortest path to
1124
        # longest, ensuring that items which were modified and whose parents in
1125
        # the resulting inventory were also modified, are inserted after their
1126
        # parents.
4526.9.4 by Robert Collins
Look for trivial issues with new_path and entry being out of sync in deltas.
1127
        for new_path, f, new_entry in sorted((np, f, e) for op, np, f, e in
2865.1.1 by Robert Collins
Create new mutable tree method update_to_one_parent_via_delta for eventual use by commit.
1128
                                          delta if np is not None):
1129
            if new_entry.kind == 'directory':
3585.2.2 by Robert Collins
Cause apply_inventory_delta on Inventory objects to fail with deltas that leave dangling children.
1130
                # Pop the child which to allow detection of children whose
1131
                # parents were deleted and which were not reattached to a new
1132
                # parent.
3735.2.46 by Robert Collins
Do not alter InventoryDirectory objects provided to Inventory.apply_delta.
1133
                replacement = InventoryDirectory(new_entry.file_id,
1134
                    new_entry.name, new_entry.parent_id)
1135
                replacement.revision = new_entry.revision
1136
                replacement.children = children.pop(replacement.file_id, {})
1137
                new_entry = replacement
4505.5.5 by Robert Collins
Parents used in a delta must be directories.
1138
            try:
1139
                self.add(new_entry)
4526.9.5 by Robert Collins
Require that added ids in inventory deltas be new.
1140
            except errors.DuplicateFileId:
1141
                raise errors.InconsistentDelta(new_path, new_entry.file_id,
1142
                    "New id is already present in target.")
4505.5.5 by Robert Collins
Parents used in a delta must be directories.
1143
            except AttributeError:
1144
                raise errors.InconsistentDelta(new_path, new_entry.file_id,
1145
                    "Parent is not a directory.")
4526.9.2 by Robert Collins
Handle deltas with new paths not matching the actual path.
1146
            if self.id2path(new_entry.file_id) != new_path:
1147
                raise errors.InconsistentDelta(new_path, new_entry.file_id,
1148
                    "New path is not consistent with parent path.")
3585.2.2 by Robert Collins
Cause apply_inventory_delta on Inventory objects to fail with deltas that leave dangling children.
1149
        if len(children):
1150
            # Get the parent id that was deleted
1151
            parent_id, children = children.popitem()
1152
            raise errors.InconsistentDelta("<deleted>", parent_id,
1153
                "The file id was deleted but its children were not deleted.")
2865.1.1 by Robert Collins
Create new mutable tree method update_to_one_parent_via_delta for eventual use by commit.
1154
4634.51.7 by John Arbash Meinel
Finish adding CHKInventory as a permutation in per_inventory.
1155
    def create_by_apply_delta(self, inventory_delta, new_revision_id,
1156
                              propagate_caches=False):
1157
        """See CHKInventory.create_by_apply_delta()"""
1158
        new_inv = self.copy()
1159
        new_inv.apply_delta(inventory_delta)
1160
        new_inv.revision_id = new_revision_id
1161
        return new_inv
1162
1910.2.3 by Aaron Bentley
All tests pass
1163
    def _set_root(self, ie):
1164
        self.root = ie
1907.1.2 by Aaron Bentley
More removal of unique-root stuff
1165
        self._byid = {self.root.file_id: self.root}
1 by mbp at sourcefrog
import from baz patch-364
1166
1189 by Martin Pool
- BROKEN: partial support for commit into weave
1167
    def copy(self):
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
1168
        # TODO: jam 20051218 Should copy also copy the revision_id?
1852.6.3 by Robert Collins
Make iter(Tree) consistent for all tree types.
1169
        entries = self.iter_entries()
2938.2.1 by Jelmer Vernooij
Handle empty inventories in Inventory.copy().
1170
        if self.root is None:
1171
            return Inventory(root_id=None)
1852.6.3 by Robert Collins
Make iter(Tree) consistent for all tree types.
1172
        other = Inventory(entries.next()[1].file_id)
3616.1.1 by Jelmer Vernooij
Fix copying of root revision in inventory.
1173
        other.root.revision = self.root.revision
1206 by Martin Pool
- fix bug in Inventory.copy()
1174
        # copy recursively so we know directories will be added before
1175
        # their children.  There are more efficient ways than this...
2935.2.1 by Jelmer Vernooij
Fix Inventory.copy() and add a test for it.
1176
        for path, entry in entries:
1189 by Martin Pool
- BROKEN: partial support for commit into weave
1177
            other.add(entry.copy())
1178
        return other
1179
4244.2.1 by Vincent Ladeuil
inv._get_mutable_inventory() - prepare for CHKInventory
1180
    def _get_mutable_inventory(self):
4241.6.5 by Robert Collins, John Arbash Meinel
CHKInventory support from brisbane-core.
1181
        """See CommonInventory._get_mutable_inventory."""
4496.3.10 by Andrew Bennetts
Tidy import nits in inventory.py.
1182
        return copy.deepcopy(self)
4241.6.5 by Robert Collins, John Arbash Meinel
CHKInventory support from brisbane-core.
1183
1 by mbp at sourcefrog
import from baz patch-364
1184
    def __iter__(self):
3735.2.118 by Ian Clatworthy
only apply the parent_id_basename delta if there is one
1185
        """Iterate over all file-ids."""
1 by mbp at sourcefrog
import from baz patch-364
1186
        return iter(self._byid)
1187
3735.2.155 by Ian Clatworthy
Inventory.iter_just_entries() API & test
1188
    def iter_just_entries(self):
1189
        """Iterate over all entries.
1190
        
1191
        Unlike iter_entries(), just the entries are returned (not (path, ie))
1192
        and the order of entries is undefined.
1193
1194
        XXX: We may not want to merge this into bzr.dev.
1195
        """
1196
        if self.root is None:
1197
            return
1198
        for _, ie in self._byid.iteritems():
1199
            yield ie
1200
1 by mbp at sourcefrog
import from baz patch-364
1201
    def __len__(self):
1202
        """Returns number of entries."""
1203
        return len(self._byid)
1204
1205
    def __getitem__(self, file_id):
1206
        """Return the entry for given file_id.
1207
1208
        >>> inv = Inventory()
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
1209
        >>> inv.add(InventoryFile('123123', 'hello.c', ROOT_ID))
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1210
        InventoryFile('123123', 'hello.c', parent_id='TREE_ROOT', sha1=None, len=None, revision=None)
1 by mbp at sourcefrog
import from baz patch-364
1211
        >>> inv['123123'].name
1212
        'hello.c'
1213
        """
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
1214
        try:
1215
            return self._byid[file_id]
1216
        except KeyError:
2067.3.1 by Martin Pool
Clean up BzrNewError, other exception classes and users.
1217
            # really we're passing an inventory, not a tree...
1218
            raise errors.NoSuchId(self, file_id)
1 by mbp at sourcefrog
import from baz patch-364
1219
460 by Martin Pool
- new testing command compare-trees
1220
    def get_file_kind(self, file_id):
1221
        return self._byid[file_id].kind
1222
138 by mbp at sourcefrog
remove parallel tree from inventory;
1223
    def get_child(self, parent_id, filename):
1732.1.18 by John Arbash Meinel
50ms is probably not worth it
1224
        return self[parent_id].children.get(filename)
138 by mbp at sourcefrog
remove parallel tree from inventory;
1225
2100.3.6 by Aaron Bentley
Make add recursive for children of added entries
1226
    def _add_child(self, entry):
1227
        """Add an entry to the inventory, without adding it to its parent"""
1228
        if entry.file_id in self._byid:
1229
            raise BzrError("inventory already contains entry with id {%s}" %
1230
                           entry.file_id)
1231
        self._byid[entry.file_id] = entry
1232
        for child in getattr(entry, 'children', {}).itervalues():
1233
            self._add_child(child)
1234
        return entry
1235
1 by mbp at sourcefrog
import from baz patch-364
1236
    def add(self, entry):
1237
        """Add entry to inventory.
1238
1239
        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
1240
        which calls this.
1241
4526.9.2 by Robert Collins
Handle deltas with new paths not matching the actual path.
1242
        :return: entry
1180 by Martin Pool
- start splitting code for xml (de)serialization away from objects
1243
        """
139 by mbp at sourcefrog
simplified/faster Inventory.add
1244
        if entry.file_id in self._byid:
2255.7.16 by John Arbash Meinel
Make sure adding a duplicate file_id raises DuplicateFileId.
1245
            raise errors.DuplicateFileId(entry.file_id,
1246
                                         self._byid[entry.file_id])
1731.1.33 by Aaron Bentley
Revert no-special-root changes
1247
        if entry.parent_id is None:
2100.3.6 by Aaron Bentley
Make add recursive for children of added entries
1248
            self.root = entry
1249
        else:
1250
            try:
1251
                parent = self._byid[entry.parent_id]
1252
            except KeyError:
4505.5.6 by Robert Collins
Check for missing parents in deltas.
1253
                raise errors.InconsistentDelta("<unknown>", entry.parent_id,
1254
                    "Parent not in inventory.")
2100.3.6 by Aaron Bentley
Make add recursive for children of added entries
1255
            if entry.name in parent.children:
4505.5.4 by Robert Collins
Repeated path/id corruption detected.
1256
                raise errors.InconsistentDelta(
1257
                    self.id2path(parent.children[entry.name].file_id),
1258
                    entry.file_id,
1259
                    "Path already versioned")
2100.3.6 by Aaron Bentley
Make add recursive for children of added entries
1260
            parent.children[entry.name] = entry
1261
        return self._add_child(entry)
1 by mbp at sourcefrog
import from baz patch-364
1262
1713.1.11 by Robert Collins
refactor smart_add to pass around the parent inventory entry and use that, resulting in another 100bzrlib/inventory.py performance improvement, and making inventory writing the dominating factory in add. (Robert Collins)
1263
    def add_path(self, relpath, kind, file_id=None, parent_id=None):
70 by mbp at sourcefrog
Prepare for smart recursive add.
1264
        """Add entry from a path.
1265
1180 by Martin Pool
- start splitting code for xml (de)serialization away from objects
1266
        The immediate parent must already be versioned.
1267
1268
        Returns the new entry object."""
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1269
1830.3.5 by John Arbash Meinel
make_entry refuses to create non-normalized entries.
1270
        parts = osutils.splitpath(relpath)
70 by mbp at sourcefrog
Prepare for smart recursive add.
1271
1534.7.69 by Aaron Bentley
Got real root moves working
1272
        if len(parts) == 0:
1713.1.6 by Robert Collins
Move file id random data selection out of the inner loop for 'bzr add'.
1273
            if file_id is None:
2116.4.1 by John Arbash Meinel
Update file and revision id generators.
1274
                file_id = generate_ids.gen_root_id()
1731.1.1 by Aaron Bentley
Make root entry an InventoryDirectory, make EmptyTree really empty
1275
            self.root = InventoryDirectory(file_id, '', None)
1534.7.69 by Aaron Bentley
Got real root moves working
1276
            self._byid = {self.root.file_id: self.root}
2178.2.2 by Jelmer Vernooij
Make add_path() return inventory entry for root just like it does for other entries.
1277
            return self.root
1534.7.69 by Aaron Bentley
Got real root moves working
1278
        else:
1279
            parent_path = parts[:-1]
1280
            parent_id = self.path2id(parent_path)
1753.1.4 by Robert Collins
Fixup '== None' usage in inventory.py.
1281
            if parent_id is None:
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
1282
                raise errors.NotVersionedError(path=parent_path)
1713.1.11 by Robert Collins
refactor smart_add to pass around the parent inventory entry and use that, resulting in another 100bzrlib/inventory.py performance improvement, and making inventory writing the dominating factory in add. (Robert Collins)
1283
        ie = make_entry(kind, parts[-1], parent_id, file_id)
70 by mbp at sourcefrog
Prepare for smart recursive add.
1284
        return self.add(ie)
1285
1 by mbp at sourcefrog
import from baz patch-364
1286
    def __delitem__(self, file_id):
1287
        """Remove entry by id.
1288
1289
        >>> inv = Inventory()
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
1290
        >>> inv.add(InventoryFile('123', 'foo.c', ROOT_ID))
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1291
        InventoryFile('123', 'foo.c', parent_id='TREE_ROOT', sha1=None, len=None, revision=None)
1 by mbp at sourcefrog
import from baz patch-364
1292
        >>> '123' in inv
1293
        True
1294
        >>> del inv['123']
1295
        >>> '123' in inv
1296
        False
1297
        """
1298
        ie = self[file_id]
1299
        del self._byid[file_id]
1534.7.69 by Aaron Bentley
Got real root moves working
1300
        if ie.parent_id is not None:
1301
            del self[ie.parent_id].children[ie.name]
1 by mbp at sourcefrog
import from baz patch-364
1302
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
1303
    def __eq__(self, other):
1 by mbp at sourcefrog
import from baz patch-364
1304
        """Compare two sets by comparing their contents.
1305
1306
        >>> i1 = Inventory()
1307
        >>> i2 = Inventory()
1308
        >>> i1 == i2
1309
        True
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
1310
        >>> i1.add(InventoryFile('123', 'foo', ROOT_ID))
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1311
        InventoryFile('123', 'foo', parent_id='TREE_ROOT', sha1=None, len=None, revision=None)
1 by mbp at sourcefrog
import from baz patch-364
1312
        >>> i1 == i2
1313
        False
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
1314
        >>> i2.add(InventoryFile('123', 'foo', ROOT_ID))
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1315
        InventoryFile('123', 'foo', parent_id='TREE_ROOT', sha1=None, len=None, revision=None)
1 by mbp at sourcefrog
import from baz patch-364
1316
        >>> i1 == i2
1317
        True
1318
        """
1319
        if not isinstance(other, Inventory):
1320
            return NotImplemented
1321
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
1322
        return self._byid == other._byid
1323
1324
    def __ne__(self, other):
1249 by Martin Pool
- improvements to weave commit [broken]
1325
        return not self.__eq__(other)
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
1326
1327
    def __hash__(self):
1328
        raise ValueError('not hashable')
1329
1596.2.19 by Robert Collins
Shave 20% off id2path.
1330
    def _iter_file_id_parents(self, file_id):
1331
        """Yield the parents of file_id up to the root."""
1757.2.11 by Robert Collins
Correct bzr diff | less= None clauses in inventory.py to be is not None.
1332
        while file_id is not None:
1596.2.19 by Robert Collins
Shave 20% off id2path.
1333
            try:
1334
                ie = self._byid[file_id]
1335
            except KeyError:
2255.11.5 by Martin Pool
Tree.id2path should raise NoSuchId, not return None.
1336
                raise errors.NoSuchId(tree=None, file_id=file_id)
1596.2.19 by Robert Collins
Shave 20% off id2path.
1337
            yield ie
1338
            file_id = ie.parent_id
1 by mbp at sourcefrog
import from baz patch-364
1339
1340
    def has_id(self, file_id):
1711.9.11 by John Arbash Meinel
change return foo in bar to return (foo in bar)
1341
        return (file_id in self._byid)
1 by mbp at sourcefrog
import from baz patch-364
1342
3879.2.6 by John Arbash Meinel
Bring in Inventory._make_delta
1343
    def _make_delta(self, old):
1344
        """Make an inventory delta from two inventories."""
3882.6.18 by John Arbash Meinel
Bring in optimizations to Inventory._make_delta.
1345
        old_getter = getattr(old, '_byid', old)
1346
        new_getter = self._byid
1347
        old_ids = set(old_getter)
1348
        new_ids = set(new_getter)
3879.2.6 by John Arbash Meinel
Bring in Inventory._make_delta
1349
        adds = new_ids - old_ids
1350
        deletes = old_ids - new_ids
3882.6.18 by John Arbash Meinel
Bring in optimizations to Inventory._make_delta.
1351
        if not adds and not deletes:
1352
            common = new_ids
1353
        else:
1354
            common = old_ids.intersection(new_ids)
3879.2.6 by John Arbash Meinel
Bring in Inventory._make_delta
1355
        delta = []
1356
        for file_id in deletes:
1357
            delta.append((old.id2path(file_id), None, file_id, None))
1358
        for file_id in adds:
1359
            delta.append((None, self.id2path(file_id), file_id, self[file_id]))
1360
        for file_id in common:
3882.6.18 by John Arbash Meinel
Bring in optimizations to Inventory._make_delta.
1361
            new_ie = new_getter[file_id]
1362
            old_ie = old_getter[file_id]
1363
            # If xml_serializer returns the cached InventoryEntries (rather
1364
            # than always doing .copy()), inlining the 'is' check saves 2.7M
1365
            # calls to __eq__.  Under lsprof this saves 20s => 6s.
1366
            # It is a minor improvement without lsprof.
1367
            if old_ie is new_ie or old_ie == new_ie:
1368
                continue
1369
            else:
3879.2.6 by John Arbash Meinel
Bring in Inventory._make_delta
1370
                delta.append((old.id2path(file_id), self.id2path(file_id),
3882.6.18 by John Arbash Meinel
Bring in optimizations to Inventory._make_delta.
1371
                              file_id, new_ie))
3879.2.6 by John Arbash Meinel
Bring in Inventory._make_delta
1372
        return delta
1373
1988.2.6 by Robert Collins
Review feedback.
1374
    def remove_recursive_id(self, file_id):
1375
        """Remove file_id, and children, from the inventory.
3879.2.6 by John Arbash Meinel
Bring in Inventory._make_delta
1376
1988.2.6 by Robert Collins
Review feedback.
1377
        :param file_id: A file_id to remove.
1378
        """
1988.2.1 by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of
1379
        to_find_delete = [self._byid[file_id]]
1380
        to_delete = []
1988.2.6 by Robert Collins
Review feedback.
1381
        while to_find_delete:
1988.2.1 by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of
1382
            ie = to_find_delete.pop()
1383
            to_delete.append(ie.file_id)
1384
            if ie.kind == 'directory':
1385
                to_find_delete.extend(ie.children.values())
1386
        for file_id in reversed(to_delete):
1988.2.4 by Robert Collins
Bugfix the unversion implementation - it had a faulty inventory.remove included in it, which the initial test was not rigourous enough to detect.
1387
            ie = self[file_id]
1988.2.1 by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of
1388
            del self._byid[file_id]
1731.2.16 by Aaron Bentley
Get extract working for standalone trees
1389
        if ie.parent_id is not None:
1390
            del self[ie.parent_id].children[ie.name]
2376.2.3 by Aaron Bentley
Fix root replacement for apply_inventory_delta
1391
        else:
1392
            self.root = None
1988.2.1 by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of
1393
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
1394
    def rename(self, file_id, new_parent_id, new_name):
1395
        """Move a file within the inventory.
1396
1397
        This can change either the name, or the parent, or both.
1398
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
1399
        This does not move the working file.
1400
        """
2825.6.1 by Robert Collins
* ``WorkingTree.rename_one`` will now raise an error if normalisation of the
1401
        new_name = ensure_normalized_name(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
1402
        if not is_valid_name(new_name):
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
1403
            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
1404
1405
        new_parent = self._byid[new_parent_id]
1406
        if new_name in new_parent.children:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
1407
            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
1408
172 by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory
1409
        new_parent_idpath = self.get_idpath(new_parent_id)
1410
        if file_id in new_parent_idpath:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
1411
            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
1412
                    % (self.id2path(file_id), self.id2path(new_parent_id)))
1413
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
1414
        file_ie = self._byid[file_id]
1415
        old_parent = self._byid[file_ie.parent_id]
1416
1417
        # TODO: Don't leave things messed up if this fails
1418
1419
        del old_parent.children[file_ie.name]
1420
        new_parent.children[new_name] = file_ie
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1421
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
1422
        file_ie.name = new_name
1423
        file_ie.parent_id = new_parent_id
1424
1731.1.1 by Aaron Bentley
Make root entry an InventoryDirectory, make EmptyTree really empty
1425
    def is_root(self, file_id):
1426
        return self.root is not None and file_id == self.root.file_id
1427
4241.6.5 by Robert Collins, John Arbash Meinel
CHKInventory support from brisbane-core.
1428
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1429
class CHKInventory(CommonInventory):
3735.20.3 by Ian Clatworthy
improve CHKInventory docstring
1430
    """An inventory persisted in a CHK store.
1431
1432
    By design, a CHKInventory is immutable so many of the methods
1433
    supported by Inventory - add, rename, apply_delta, etc - are *not*
1434
    supported. To create a new CHKInventory, use create_by_apply_delta()
1435
    or from_inventory(), say.
1436
1437
    Internally, a CHKInventory has one or two CHKMaps:
1438
1439
    * id_to_entry - a map from (file_id,) => InventoryEntry as bytes
1440
    * parent_id_basename_to_file_id - a map from (parent_id, basename_utf8)
1441
        => file_id as bytes
1442
1443
    The second map is optional and not present in early CHkRepository's.
3735.2.99 by John Arbash Meinel
Merge bzr.dev 4034. Whitespace cleanup
1444
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1445
    No caching is performed: every method call or item access will perform
3735.20.3 by Ian Clatworthy
improve CHKInventory docstring
1446
    requests to the storage layer. As such, keep references to objects you
1447
    want to reuse.
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1448
    """
1449
3735.16.7 by John Arbash Meinel
Start parameterizing CHKInventory and CHKSerializer so that we can
1450
    def __init__(self, search_key_name):
3735.10.1 by Robert Collins
Create an __init__ for CHKInventory to ensure mandatory attributes are set.
1451
        CommonInventory.__init__(self)
3735.2.119 by Ian Clatworthy
add a cache for CHKInventory.path2id()
1452
        self._fileid_to_entry_cache = {}
1453
        self._path_to_fileid_cache = {}
3735.16.7 by John Arbash Meinel
Start parameterizing CHKInventory and CHKSerializer so that we can
1454
        self._search_key_name = search_key_name
4526.9.17 by Robert Collins
Teach CHKInventory.path2id to avoid loading inventory entries.
1455
        self.root_id = None
3735.10.1 by Robert Collins
Create an __init__ for CHKInventory to ensure mandatory attributes are set.
1456
4413.5.14 by John Arbash Meinel
The new add_inventory_by_delta is returning a CHKInventory when mapping from NULL
1457
    def __eq__(self, other):
1458
        """Compare two sets by comparing their contents."""
1459
        if not isinstance(other, CHKInventory):
1460
            return NotImplemented
1461
1462
        this_key = self.id_to_entry.key()
1463
        other_key = other.id_to_entry.key()
1464
        this_pid_key = self.parent_id_basename_to_file_id.key()
1465
        other_pid_key = other.parent_id_basename_to_file_id.key()
1466
        if None in (this_key, this_pid_key, other_key, other_pid_key):
1467
            return False
1468
        return this_key == other_key and this_pid_key == other_pid_key
1469
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1470
    def _entry_to_bytes(self, entry):
1471
        """Serialise entry as a single bytestring.
1472
1473
        :param Entry: An inventory entry.
1474
        :return: A bytestring for the entry.
3735.2.99 by John Arbash Meinel
Merge bzr.dev 4034. Whitespace cleanup
1475
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1476
        The BNF:
1477
        ENTRY ::= FILE | DIR | SYMLINK | TREE
3735.20.4 by Ian Clatworthy
correct _entry_to_bytes() docstring
1478
        FILE ::= "file: " COMMON SEP SHA SEP SIZE SEP EXECUTABLE
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1479
        DIR ::= "dir: " COMMON
3735.20.4 by Ian Clatworthy
correct _entry_to_bytes() docstring
1480
        SYMLINK ::= "symlink: " COMMON SEP TARGET_UTF8
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1481
        TREE ::= "tree: " COMMON REFERENCE_REVISION
3735.20.4 by Ian Clatworthy
correct _entry_to_bytes() docstring
1482
        COMMON ::= FILE_ID SEP PARENT_ID SEP NAME_UTF8 SEP REVISION
1483
        SEP ::= "\n"
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1484
        """
1485
        if entry.parent_id is not None:
1486
            parent_str = entry.parent_id
1487
        else:
1488
            parent_str = ''
1489
        name_str = entry.name.encode("utf8")
1490
        if entry.kind == 'file':
1491
            if entry.executable:
1492
                exec_str = "Y"
1493
            else:
1494
                exec_str = "N"
3735.17.11 by John Arbash Meinel
Actually format the inventories using line-based separation.
1495
            return "file: %s\n%s\n%s\n%s\n%s\n%d\n%s" % (
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1496
                entry.file_id, parent_str, name_str, entry.revision,
1497
                entry.text_sha1, entry.text_size, exec_str)
1498
        elif entry.kind == 'directory':
3735.17.11 by John Arbash Meinel
Actually format the inventories using line-based separation.
1499
            return "dir: %s\n%s\n%s\n%s" % (
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1500
                entry.file_id, parent_str, name_str, entry.revision)
1501
        elif entry.kind == 'symlink':
3735.17.11 by John Arbash Meinel
Actually format the inventories using line-based separation.
1502
            return "symlink: %s\n%s\n%s\n%s\n%s" % (
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1503
                entry.file_id, parent_str, name_str, entry.revision,
1504
                entry.symlink_target.encode("utf8"))
1505
        elif entry.kind == 'tree-reference':
3735.17.11 by John Arbash Meinel
Actually format the inventories using line-based separation.
1506
            return "tree: %s\n%s\n%s\n%s\n%s" % (
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1507
                entry.file_id, parent_str, name_str, entry.revision,
1508
                entry.reference_revision)
1509
        else:
1510
            raise ValueError("unknown kind %r" % entry.kind)
1511
4634.51.3 by John Arbash Meinel
We have iteration to parents working, need to find children now.
1512
    def _expand_fileids_to_parents_and_children(self, file_ids):
1513
        """Give a more wholistic view starting with the given file_ids.
1514
1515
        For any file_id which maps to a directory, we will include all children
1516
        of that directory. We will also include all directories which are
1517
        parents of the given file_ids, but we will not include their children.
1518
1519
        eg:
1520
          /     # TREE_ROOT
1521
          foo/  # foo-id
1522
            baz # baz-id
1523
            frob/ # frob-id
1524
              fringle # fringle-id
1525
          bar/  # bar-id
1526
            bing # bing-id
1527
1528
        if given [foo-id] we will include
1529
            TREE_ROOT as interesting parents
1530
        and 
1531
            foo-id, baz-id, frob-id, fringle-id
1532
        As interesting ids.
1533
        """
4634.51.8 by John Arbash Meinel
Catch a corner case that we were missing.
1534
        interesting = set()
4634.51.3 by John Arbash Meinel
We have iteration to parents working, need to find children now.
1535
        # TODO: Pre-pass over the list of fileids to see if anything is already
1536
        #       deserialized in self._fileid_to_entry_cache
1537
1538
        directories_to_expand = set()
4634.51.5 by John Arbash Meinel
Change the api a bit.
1539
        children_of_parent_id = {}
4634.51.3 by John Arbash Meinel
We have iteration to parents working, need to find children now.
1540
        # It is okay if some of the fileids are missing
1541
        for entry in self._getitems(file_ids):
1542
            if entry.kind == 'directory':
1543
                directories_to_expand.add(entry.file_id)
4634.51.5 by John Arbash Meinel
Change the api a bit.
1544
            interesting.add(entry.parent_id)
1545
            children_of_parent_id.setdefault(entry.parent_id, []
1546
                                             ).append(entry.file_id)
4634.51.3 by John Arbash Meinel
We have iteration to parents working, need to find children now.
1547
4634.51.5 by John Arbash Meinel
Change the api a bit.
1548
        # Now, interesting has all of the direct parents, but not the
4634.51.3 by John Arbash Meinel
We have iteration to parents working, need to find children now.
1549
        # parents of those parents. It also may have some duplicates with
1550
        # specific_fileids
4634.51.5 by John Arbash Meinel
Change the api a bit.
1551
        remaining_parents = interesting.difference(file_ids)
4634.51.8 by John Arbash Meinel
Catch a corner case that we were missing.
1552
        # When we hit the TREE_ROOT, we'll get an interesting parent of None,
1553
        # but we don't actually want to recurse into that
1554
        interesting.add(None) # this will auto-filter it in the loop
1555
        remaining_parents.discard(None) 
4634.51.3 by John Arbash Meinel
We have iteration to parents working, need to find children now.
1556
        while remaining_parents:
1557
            next_parents = set()
1558
            for entry in self._getitems(remaining_parents):
1559
                next_parents.add(entry.parent_id)
4634.51.5 by John Arbash Meinel
Change the api a bit.
1560
                children_of_parent_id.setdefault(entry.parent_id, []
1561
                                                 ).append(entry.file_id)
4634.51.3 by John Arbash Meinel
We have iteration to parents working, need to find children now.
1562
            # Remove any search tips we've already processed
4634.51.5 by John Arbash Meinel
Change the api a bit.
1563
            remaining_parents = next_parents.difference(interesting)
1564
            interesting.update(remaining_parents)
4634.51.3 by John Arbash Meinel
We have iteration to parents working, need to find children now.
1565
            # We should probably also .difference(directories_to_expand)
4634.51.8 by John Arbash Meinel
Catch a corner case that we were missing.
1566
        interesting.update(file_ids)
4634.51.5 by John Arbash Meinel
Change the api a bit.
1567
        interesting.discard(None)
4634.51.4 by John Arbash Meinel
Implement an expansion function that works directly on the chk maps.
1568
        while directories_to_expand:
1569
            # Expand directories by looking in the
1570
            # parent_id_basename_to_file_id map
4679.9.15 by John Arbash Meinel
Cleanup some code paths. Make _check_key a helper that can be used
1571
            keys = [StaticTuple(f,).intern() for f in directories_to_expand]
4634.51.4 by John Arbash Meinel
Implement an expansion function that works directly on the chk maps.
1572
            directories_to_expand = set()
1573
            items = self.parent_id_basename_to_file_id.iteritems(keys)
1574
            next_file_ids = set([item[1] for item in items])
4634.51.5 by John Arbash Meinel
Change the api a bit.
1575
            next_file_ids = next_file_ids.difference(interesting)
1576
            interesting.update(next_file_ids)
4634.51.4 by John Arbash Meinel
Implement an expansion function that works directly on the chk maps.
1577
            for entry in self._getitems(next_file_ids):
1578
                if entry.kind == 'directory':
1579
                    directories_to_expand.add(entry.file_id)
4634.51.5 by John Arbash Meinel
Change the api a bit.
1580
                children_of_parent_id.setdefault(entry.parent_id, []
1581
                                                 ).append(entry.file_id)
1582
        return interesting, children_of_parent_id
4634.51.3 by John Arbash Meinel
We have iteration to parents working, need to find children now.
1583
1584
    def filter(self, specific_fileids):
1585
        """Get an inventory view filtered against a set of file-ids.
1586
1587
        Children of directories and parents are included.
1588
1589
        The result may or may not reference the underlying inventory
1590
        so it should be treated as immutable.
1591
        """
4634.51.6 by John Arbash Meinel
(broken) Start working on actually writing a permutation for per_inventory.
1592
        (interesting,
1593
         parent_to_children) = self._expand_fileids_to_parents_and_children(
1594
                                specific_fileids)
4634.51.9 by John Arbash Meinel
Implement CHKInventory.filter() on the new subset.
1595
        # There is some overlap here, but we assume that all interesting items
1596
        # are in the _fileid_to_entry_cache because we had to read them to
1597
        # determine if they were a dir we wanted to recurse, or just a file
1598
        # This should give us all the entries we'll want to add, so start
1599
        # adding
1600
        other = Inventory(self.root_id)
4634.51.3 by John Arbash Meinel
We have iteration to parents working, need to find children now.
1601
        other.root.revision = self.root.revision
1602
        other.revision_id = self.revision_id
4634.51.11 by John Arbash Meinel
Handle the case when the specific_fileids don't exist in this revision.
1603
        if not interesting or not parent_to_children:
1604
            # empty filter, or filtering entrys that don't exist
1605
            # (if even 1 existed, then we would have populated
1606
            # parent_to_children with at least the tree root.)
4634.51.9 by John Arbash Meinel
Implement CHKInventory.filter() on the new subset.
1607
            return other
1608
        cache = self._fileid_to_entry_cache
5221.1.1 by Andrew Bennetts
Remove pdb.set_trace() call in inventory.py.
1609
        remaining_children = collections.deque(parent_to_children[self.root_id])
4634.51.9 by John Arbash Meinel
Implement CHKInventory.filter() on the new subset.
1610
        while remaining_children:
1611
            file_id = remaining_children.popleft()
1612
            ie = cache[file_id]
1613
            if ie.kind == 'directory':
1614
                ie = ie.copy() # We create a copy to depopulate the .children attribute
1615
            # TODO: depending on the uses of 'other' we should probably alwyas
1616
            #       '.copy()' to prevent someone from mutating other and
1617
            #       invaliding our internal cache
1618
            other.add(ie)
1619
            if file_id in parent_to_children:
1620
                remaining_children.extend(parent_to_children[file_id])
4634.51.3 by John Arbash Meinel
We have iteration to parents working, need to find children now.
1621
        return other
1622
3735.36.12 by John Arbash Meinel
Add some direct tests for CHKInventory._entry_to_bytes
1623
    @staticmethod
1624
    def _bytes_to_utf8name_key(bytes):
1625
        """Get the file_id, revision_id key out of bytes."""
1626
        # We don't normally care about name, except for times when we want
1627
        # to filter out empty names because of non rich-root...
1628
        sections = bytes.split('\n')
1629
        kind, file_id = sections[0].split(': ')
4789.4.1 by John Arbash Meinel
Intern the various strings that are part of the CHKInventory deserialization.
1630
        return (sections[2], intern(file_id), intern(sections[3]))
3735.36.12 by John Arbash Meinel
Add some direct tests for CHKInventory._entry_to_bytes
1631
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1632
    def _bytes_to_entry(self, bytes):
1633
        """Deserialise a serialised entry."""
3735.17.11 by John Arbash Meinel
Actually format the inventories using line-based separation.
1634
        sections = bytes.split('\n')
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1635
        if sections[0].startswith("file: "):
1636
            result = InventoryFile(sections[0][6:],
1637
                sections[2].decode('utf8'),
1638
                sections[1])
1639
            result.text_sha1 = sections[4]
1640
            result.text_size = int(sections[5])
1641
            result.executable = sections[6] == "Y"
1642
        elif sections[0].startswith("dir: "):
1643
            result = CHKInventoryDirectory(sections[0][5:],
1644
                sections[2].decode('utf8'),
1645
                sections[1], self)
1646
        elif sections[0].startswith("symlink: "):
1647
            result = InventoryLink(sections[0][9:],
1648
                sections[2].decode('utf8'),
1649
                sections[1])
3735.36.12 by John Arbash Meinel
Add some direct tests for CHKInventory._entry_to_bytes
1650
            result.symlink_target = sections[4].decode('utf8')
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1651
        elif sections[0].startswith("tree: "):
1652
            result = TreeReference(sections[0][6:],
1653
                sections[2].decode('utf8'),
1654
                sections[1])
1655
            result.reference_revision = sections[4]
1656
        else:
1657
            raise ValueError("Not a serialised entry %r" % bytes)
4789.4.1 by John Arbash Meinel
Intern the various strings that are part of the CHKInventory deserialization.
1658
        result.file_id = intern(result.file_id)
1659
        result.revision = intern(sections[3])
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1660
        if result.parent_id == '':
1661
            result.parent_id = None
3735.2.119 by Ian Clatworthy
add a cache for CHKInventory.path2id()
1662
        self._fileid_to_entry_cache[result.file_id] = result
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1663
        return result
1664
4241.6.5 by Robert Collins, John Arbash Meinel
CHKInventory support from brisbane-core.
1665
    def _get_mutable_inventory(self):
1666
        """See CommonInventory._get_mutable_inventory."""
1667
        entries = self.iter_entries()
4343.3.23 by John Arbash Meinel
Change RepositoryCHK1.fileids_altered_by to handle ghosts the way XML does.
1668
        inv = Inventory(None, self.revision_id)
3735.20.1 by Ian Clatworthy
fix bug in get_mutable_inventory
1669
        for path, inv_entry in entries:
4343.3.23 by John Arbash Meinel
Change RepositoryCHK1.fileids_altered_by to handle ghosts the way XML does.
1670
            inv.add(inv_entry.copy())
4241.6.5 by Robert Collins, John Arbash Meinel
CHKInventory support from brisbane-core.
1671
        return inv
1672
3735.2.121 by Ian Clatworthy
add propagate_caches param to create_by_apply_delta, making fast-import 30% faster
1673
    def create_by_apply_delta(self, inventory_delta, new_revision_id,
1674
        propagate_caches=False):
3735.2.10 by Robert Collins
Teach CHKInventory how to make a new inventory from an inventory delta.
1675
        """Create a new CHKInventory by applying inventory_delta to this one.
1676
4501.1.1 by Robert Collins
Add documentation describing how and why we use inventory deltas, and what can go wrong with them.
1677
        See the inventory developers documentation for the theory behind
1678
        inventory deltas.
1679
3735.2.10 by Robert Collins
Teach CHKInventory how to make a new inventory from an inventory delta.
1680
        :param inventory_delta: The inventory delta to apply. See
1681
            Inventory.apply_delta for details.
1682
        :param new_revision_id: The revision id of the resulting CHKInventory.
3735.2.121 by Ian Clatworthy
add propagate_caches param to create_by_apply_delta, making fast-import 30% faster
1683
        :param propagate_caches: If True, the caches for this inventory are
1684
          copied to and updated for the result.
3735.2.10 by Robert Collins
Teach CHKInventory how to make a new inventory from an inventory delta.
1685
        :return: The new CHKInventory.
1686
        """
4526.9.2 by Robert Collins
Handle deltas with new paths not matching the actual path.
1687
        split = osutils.split
3735.16.7 by John Arbash Meinel
Start parameterizing CHKInventory and CHKSerializer so that we can
1688
        result = CHKInventory(self._search_key_name)
3735.2.121 by Ian Clatworthy
add propagate_caches param to create_by_apply_delta, making fast-import 30% faster
1689
        if propagate_caches:
1690
            # Just propagate the path-to-fileid cache for now
1691
            result._path_to_fileid_cache = dict(self._path_to_fileid_cache.iteritems())
3735.16.7 by John Arbash Meinel
Start parameterizing CHKInventory and CHKSerializer so that we can
1692
        search_key_func = chk_map.search_key_registry.get(self._search_key_name)
3735.20.8 by Ian Clatworthy
fix max size & key width propagation in create_by_apply_delta()
1693
        self.id_to_entry._ensure_root()
1694
        maximum_size = self.id_to_entry._root_node.maximum_size
3735.2.10 by Robert Collins
Teach CHKInventory how to make a new inventory from an inventory delta.
1695
        result.revision_id = new_revision_id
3735.2.41 by Robert Collins
Make the parent_id_basename index be updated during CHKInventory.apply_delta.
1696
        result.id_to_entry = chk_map.CHKMap(
1697
            self.id_to_entry._store,
3735.20.2 by Ian Clatworthy
fix root key handling in create_by_apply_delta()
1698
            self.id_to_entry.key(),
3735.16.7 by John Arbash Meinel
Start parameterizing CHKInventory and CHKSerializer so that we can
1699
            search_key_func=search_key_func)
3735.20.8 by Ian Clatworthy
fix max size & key width propagation in create_by_apply_delta()
1700
        result.id_to_entry._ensure_root()
1701
        result.id_to_entry._root_node.set_maximum_size(maximum_size)
4526.9.12 by Robert Collins
Make CHKInventory generate safer parent_id_basename deltas.
1702
        # Change to apply to the parent_id_basename delta. The dict maps
1703
        # (parent_id, basename) -> (old_key, new_value). We use a dict because
1704
        # when a path has its id replaced (e.g. the root is changed, or someone
1705
        # does bzr mv a b, bzr mv c a, we should output a single change to this
1706
        # map rather than two.
1707
        parent_id_basename_delta = {}
3735.2.41 by Robert Collins
Make the parent_id_basename index be updated during CHKInventory.apply_delta.
1708
        if self.parent_id_basename_to_file_id is not None:
1709
            result.parent_id_basename_to_file_id = chk_map.CHKMap(
1710
                self.parent_id_basename_to_file_id._store,
3735.20.2 by Ian Clatworthy
fix root key handling in create_by_apply_delta()
1711
                self.parent_id_basename_to_file_id.key(),
3735.16.7 by John Arbash Meinel
Start parameterizing CHKInventory and CHKSerializer so that we can
1712
                search_key_func=search_key_func)
3735.20.8 by Ian Clatworthy
fix max size & key width propagation in create_by_apply_delta()
1713
            result.parent_id_basename_to_file_id._ensure_root()
3735.2.111 by John Arbash Meinel
Merge Ian's updates to chk_map and chk_inventory.create_by_apply_delta.
1714
            self.parent_id_basename_to_file_id._ensure_root()
3735.2.113 by Ian Clatworthy
fix bug in jam's tweaks to create_by_apply_delta
1715
            result_p_id_root = result.parent_id_basename_to_file_id._root_node
3735.2.111 by John Arbash Meinel
Merge Ian's updates to chk_map and chk_inventory.create_by_apply_delta.
1716
            p_id_root = self.parent_id_basename_to_file_id._root_node
1717
            result_p_id_root.set_maximum_size(p_id_root.maximum_size)
1718
            result_p_id_root._key_width = p_id_root._key_width
3735.2.41 by Robert Collins
Make the parent_id_basename index be updated during CHKInventory.apply_delta.
1719
        else:
1720
            result.parent_id_basename_to_file_id = None
3735.2.10 by Robert Collins
Teach CHKInventory how to make a new inventory from an inventory delta.
1721
        result.root_id = self.root_id
1722
        id_to_entry_delta = []
4505.5.4 by Robert Collins
Repeated path/id corruption detected.
1723
        # inventory_delta is only traversed once, so we just update the
1724
        # variable.
1725
        # Check for repeated file ids
1726
        inventory_delta = _check_delta_unique_ids(inventory_delta)
1727
        # Repeated old paths
1728
        inventory_delta = _check_delta_unique_old_paths(inventory_delta)
1729
        # Check for repeated new paths
1730
        inventory_delta = _check_delta_unique_new_paths(inventory_delta)
1731
        # Check for entries that don't match the fileid
1732
        inventory_delta = _check_delta_ids_match_entry(inventory_delta)
4526.9.22 by Robert Collins
Check fileids in inventory deltas are not None and are strings.
1733
        # Check for nonsense fileids
1734
        inventory_delta = _check_delta_ids_are_valid(inventory_delta)
4526.9.4 by Robert Collins
Look for trivial issues with new_path and entry being out of sync in deltas.
1735
        # Check for new_path <-> entry consistency
1736
        inventory_delta = _check_delta_new_path_entry_both_or_None(
1737
            inventory_delta)
4526.9.2 by Robert Collins
Handle deltas with new paths not matching the actual path.
1738
        # All changed entries need to have their parents be directories and be
1739
        # at the right path. This set contains (path, id) tuples.
4505.5.5 by Robert Collins
Parents used in a delta must be directories.
1740
        parents = set()
4526.9.9 by Robert Collins
Add interface tests for dangling children in inventory deltas.
1741
        # When we delete an item, all the children of it must be either deleted
1742
        # or altered in their own right. As we batch process the change via
1743
        # CHKMap.apply_delta, we build a set of things to use to validate the
1744
        # delta.
1745
        deletes = set()
1746
        altered = set()
3735.2.10 by Robert Collins
Teach CHKInventory how to make a new inventory from an inventory delta.
1747
        for old_path, new_path, file_id, entry in inventory_delta:
3735.2.41 by Robert Collins
Make the parent_id_basename index be updated during CHKInventory.apply_delta.
1748
            # file id changes
3735.2.10 by Robert Collins
Teach CHKInventory how to make a new inventory from an inventory delta.
1749
            if new_path == '':
1750
                result.root_id = file_id
1751
            if new_path is None:
1752
                # Make a delete:
1753
                new_key = None
1754
                new_value = None
3735.2.121 by Ian Clatworthy
add propagate_caches param to create_by_apply_delta, making fast-import 30% faster
1755
                # Update caches
1756
                if propagate_caches:
1757
                    try:
1758
                        del result._path_to_fileid_cache[old_path]
1759
                    except KeyError:
1760
                        pass
4526.9.9 by Robert Collins
Add interface tests for dangling children in inventory deltas.
1761
                deletes.add(file_id)
3735.2.10 by Robert Collins
Teach CHKInventory how to make a new inventory from an inventory delta.
1762
            else:
4679.9.4 by John Arbash Meinel
A bit broken, but getting there.
1763
                new_key = StaticTuple(file_id,)
3735.2.10 by Robert Collins
Teach CHKInventory how to make a new inventory from an inventory delta.
1764
                new_value = result._entry_to_bytes(entry)
3735.2.121 by Ian Clatworthy
add propagate_caches param to create_by_apply_delta, making fast-import 30% faster
1765
                # Update caches. It's worth doing this whether
1766
                # we're propagating the old caches or not.
3735.2.119 by Ian Clatworthy
add a cache for CHKInventory.path2id()
1767
                result._path_to_fileid_cache[new_path] = file_id
4679.9.15 by John Arbash Meinel
Cleanup some code paths. Make _check_key a helper that can be used
1768
                parents.add((split(new_path)[0], entry.parent_id))
3735.2.10 by Robert Collins
Teach CHKInventory how to make a new inventory from an inventory delta.
1769
            if old_path is None:
1770
                old_key = None
1771
            else:
4679.9.4 by John Arbash Meinel
A bit broken, but getting there.
1772
                old_key = StaticTuple(file_id,)
4526.9.3 by Robert Collins
Handle mismatches between inventory delta paths and actual paths found by traversing parent pointers.
1773
                if self.id2path(file_id) != old_path:
1774
                    raise errors.InconsistentDelta(old_path, file_id,
1775
                        "Entry was at wrong other path %r." %
1776
                        self.id2path(file_id))
4526.9.9 by Robert Collins
Add interface tests for dangling children in inventory deltas.
1777
                altered.add(file_id)
4679.9.15 by John Arbash Meinel
Cleanup some code paths. Make _check_key a helper that can be used
1778
            id_to_entry_delta.append(StaticTuple(old_key, new_key, new_value))
3735.2.41 by Robert Collins
Make the parent_id_basename index be updated during CHKInventory.apply_delta.
1779
            if result.parent_id_basename_to_file_id is not None:
1780
                # parent_id, basename changes
1781
                if old_path is None:
1782
                    old_key = None
1783
                else:
1784
                    old_entry = self[file_id]
1785
                    old_key = self._parent_id_basename_key(old_entry)
1786
                if new_path is None:
1787
                    new_key = None
1788
                    new_value = None
1789
                else:
1790
                    new_key = self._parent_id_basename_key(entry)
1791
                    new_value = file_id
4526.9.12 by Robert Collins
Make CHKInventory generate safer parent_id_basename deltas.
1792
                # If the two keys are the same, the value will be unchanged
1793
                # as its always the file id for this entry.
3735.2.41 by Robert Collins
Make the parent_id_basename index be updated during CHKInventory.apply_delta.
1794
                if old_key != new_key:
4526.9.12 by Robert Collins
Make CHKInventory generate safer parent_id_basename deltas.
1795
                    # Transform a change into explicit delete/add preserving
1796
                    # a possible match on the key from a different file id.
1797
                    if old_key is not None:
1798
                        parent_id_basename_delta.setdefault(
1799
                            old_key, [None, None])[0] = old_key
1800
                    if new_key is not None:
1801
                        parent_id_basename_delta.setdefault(
1802
                            new_key, [None, None])[1] = new_value
4526.9.9 by Robert Collins
Add interface tests for dangling children in inventory deltas.
1803
        # validate that deletes are complete.
1804
        for file_id in deletes:
1805
            entry = self[file_id]
1806
            if entry.kind != 'directory':
1807
                continue
1808
            # This loop could potentially be better by using the id_basename
1809
            # map to just get the child file ids.
1810
            for child in entry.children.values():
1811
                if child.file_id not in altered:
1812
                    raise errors.InconsistentDelta(self.id2path(child.file_id),
1813
                        child.file_id, "Child not deleted or reparented when "
1814
                        "parent deleted.")
3735.2.10 by Robert Collins
Teach CHKInventory how to make a new inventory from an inventory delta.
1815
        result.id_to_entry.apply_delta(id_to_entry_delta)
3735.2.118 by Ian Clatworthy
only apply the parent_id_basename delta if there is one
1816
        if parent_id_basename_delta:
4526.9.12 by Robert Collins
Make CHKInventory generate safer parent_id_basename deltas.
1817
            # Transform the parent_id_basename delta data into a linear delta
1818
            # with only one record for a given key. Optimally this would allow
1819
            # re-keying, but its simpler to just output that as a delete+add
1820
            # to spend less time calculating the delta.
1821
            delta_list = []
1822
            for key, (old_key, value) in parent_id_basename_delta.iteritems():
4526.9.19 by Robert Collins
Review feedback.
1823
                if value is not None:
4526.9.16 by Robert Collins
Fix parent_id_basename map update in CHKInventory more.
1824
                    delta_list.append((old_key, key, value))
1825
                else:
1826
                    delta_list.append((old_key, None, None))
4526.9.12 by Robert Collins
Make CHKInventory generate safer parent_id_basename deltas.
1827
            result.parent_id_basename_to_file_id.apply_delta(delta_list)
4526.9.2 by Robert Collins
Handle deltas with new paths not matching the actual path.
1828
        parents.discard(('', None))
1829
        for parent_path, parent in parents:
4505.5.6 by Robert Collins
Check for missing parents in deltas.
1830
            try:
1831
                if result[parent].kind != 'directory':
1832
                    raise errors.InconsistentDelta(result.id2path(parent), parent,
1833
                        'Not a directory, but given children')
1834
            except errors.NoSuchId:
1835
                raise errors.InconsistentDelta("<unknown>", parent,
1836
                    "Parent is not present in resulting inventory.")
4526.9.2 by Robert Collins
Handle deltas with new paths not matching the actual path.
1837
            if result.path2id(parent_path) != parent:
1838
                raise errors.InconsistentDelta(parent_path, parent,
1839
                    "Parent has wrong path %r." % result.path2id(parent_path))
3735.2.10 by Robert Collins
Teach CHKInventory how to make a new inventory from an inventory delta.
1840
        return result
1841
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1842
    @classmethod
1843
    def deserialise(klass, chk_store, bytes, expected_revision_id):
1844
        """Deserialise a CHKInventory.
1845
1846
        :param chk_store: A CHK capable VersionedFiles instance.
1847
        :param bytes: The serialised bytes.
1848
        :param expected_revision_id: The revision ID we think this inventory is
1849
            for.
1850
        :return: A CHKInventory
1851
        """
3735.24.1 by John Arbash Meinel
Change how the ordering of the inventory metablock is written.
1852
        lines = bytes.split('\n')
4241.6.5 by Robert Collins, John Arbash Meinel
CHKInventory support from brisbane-core.
1853
        if lines[-1] != '':
1854
            raise AssertionError('bytes to deserialize must end with an eol')
3735.24.1 by John Arbash Meinel
Change how the ordering of the inventory metablock is written.
1855
        lines.pop()
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1856
        if lines[0] != 'chkinventory:':
1857
            raise ValueError("not a serialised CHKInventory: %r" % bytes)
3735.24.1 by John Arbash Meinel
Change how the ordering of the inventory metablock is written.
1858
        info = {}
3735.24.2 by John Arbash Meinel
Add a bit more strictness to the formatting, update the test case.
1859
        allowed_keys = frozenset(['root_id', 'revision_id', 'search_key_name',
1860
                                  'parent_id_basename_to_file_id',
1861
                                  'id_to_entry'])
3735.24.1 by John Arbash Meinel
Change how the ordering of the inventory metablock is written.
1862
        for line in lines[1:]:
1863
            key, value = line.split(': ', 1)
3735.24.2 by John Arbash Meinel
Add a bit more strictness to the formatting, update the test case.
1864
            if key not in allowed_keys:
1865
                raise errors.BzrError('Unknown key in inventory: %r\n%r'
1866
                                      % (key, bytes))
1867
            if key in info:
1868
                raise errors.BzrError('Duplicate key in inventory: %r\n%r'
1869
                                      % (key, bytes))
3735.24.1 by John Arbash Meinel
Change how the ordering of the inventory metablock is written.
1870
            info[key] = value
4759.1.1 by John Arbash Meinel
interning key values in the CHKInventory.deserialize()
1871
        revision_id = intern(info['revision_id'])
1872
        root_id = intern(info['root_id'])
1873
        search_key_name = intern(info.get('search_key_name', 'plain'))
1874
        parent_id_basename_to_file_id = intern(info.get(
1875
            'parent_id_basename_to_file_id', None))
4679.9.4 by John Arbash Meinel
A bit broken, but getting there.
1876
        if not parent_id_basename_to_file_id.startswith('sha1:'):
1877
            raise ValueError('parent_id_basename_to_file_id should be a sha1'
1878
                             ' key not %r' % (parent_id_basename_to_file_id,))
3735.24.1 by John Arbash Meinel
Change how the ordering of the inventory metablock is written.
1879
        id_to_entry = info['id_to_entry']
4679.9.4 by John Arbash Meinel
A bit broken, but getting there.
1880
        if not id_to_entry.startswith('sha1:'):
1881
            raise ValueError('id_to_entry should be a sha1'
1882
                             ' key not %r' % (id_to_entry,))
3735.24.1 by John Arbash Meinel
Change how the ordering of the inventory metablock is written.
1883
3735.16.7 by John Arbash Meinel
Start parameterizing CHKInventory and CHKSerializer so that we can
1884
        result = CHKInventory(search_key_name)
1885
        result.revision_id = revision_id
1886
        result.root_id = root_id
1887
        search_key_func = chk_map.search_key_registry.get(
1888
                            result._search_key_name)
3735.24.1 by John Arbash Meinel
Change how the ordering of the inventory metablock is written.
1889
        if parent_id_basename_to_file_id is not None:
3735.16.7 by John Arbash Meinel
Start parameterizing CHKInventory and CHKSerializer so that we can
1890
            result.parent_id_basename_to_file_id = chk_map.CHKMap(
4679.9.4 by John Arbash Meinel
A bit broken, but getting there.
1891
                chk_store, StaticTuple(parent_id_basename_to_file_id,),
3735.16.7 by John Arbash Meinel
Start parameterizing CHKInventory and CHKSerializer so that we can
1892
                search_key_func=search_key_func)
1893
        else:
3735.2.41 by Robert Collins
Make the parent_id_basename index be updated during CHKInventory.apply_delta.
1894
            result.parent_id_basename_to_file_id = None
3735.16.7 by John Arbash Meinel
Start parameterizing CHKInventory and CHKSerializer so that we can
1895
4679.9.4 by John Arbash Meinel
A bit broken, but getting there.
1896
        result.id_to_entry = chk_map.CHKMap(chk_store,
1897
                                            StaticTuple(id_to_entry,),
3735.16.7 by John Arbash Meinel
Start parameterizing CHKInventory and CHKSerializer so that we can
1898
                                            search_key_func=search_key_func)
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1899
        if (result.revision_id,) != expected_revision_id:
1900
            raise ValueError("Mismatched revision id and expected: %r, %r" %
1901
                (result.revision_id, expected_revision_id))
1902
        return result
1903
1904
    @classmethod
3735.2.132 by John Arbash Meinel
Remove references to parent_id_basename_index, now that we know we want it.
1905
    def from_inventory(klass, chk_store, inventory, maximum_size=0, search_key_name='plain'):
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1906
        """Create a CHKInventory from an existing inventory.
1907
1908
        The content of inventory is copied into the chk_store, and a
1909
        CHKInventory referencing that is returned.
1910
1911
        :param chk_store: A CHK capable VersionedFiles instance.
1912
        :param inventory: The inventory to copy.
3735.2.40 by Robert Collins
Add development4 which has a parent_id to basename index on CHKInventory objects.
1913
        :param maximum_size: The CHKMap node size limit.
3735.16.7 by John Arbash Meinel
Start parameterizing CHKInventory and CHKSerializer so that we can
1914
        :param search_key_name: The identifier for the search key function
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1915
        """
4413.5.11 by John Arbash Meinel
Pull out the common 'populate this CHKInventory' code out into a helper
1916
        result = klass(search_key_name)
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1917
        result.revision_id = inventory.revision_id
1918
        result.root_id = inventory.root.file_id
4413.5.10 by John Arbash Meinel
Clean upt the test_inv tests that assumed _root_node was real and not just a key.
1919
1920
        entry_to_bytes = result._entry_to_bytes
1921
        parent_id_basename_key = result._parent_id_basename_key
1922
        id_to_entry_dict = {}
1923
        parent_id_basename_dict = {}
1924
        for path, entry in inventory.iter_entries():
4679.9.4 by John Arbash Meinel
A bit broken, but getting there.
1925
            key = StaticTuple(entry.file_id,).intern()
1926
            id_to_entry_dict[key] = entry_to_bytes(entry)
4413.5.10 by John Arbash Meinel
Clean upt the test_inv tests that assumed _root_node was real and not just a key.
1927
            p_id_key = parent_id_basename_key(entry)
1928
            parent_id_basename_dict[p_id_key] = entry.file_id
1929
4413.5.11 by John Arbash Meinel
Pull out the common 'populate this CHKInventory' code out into a helper
1930
        result._populate_from_dicts(chk_store, id_to_entry_dict,
1931
            parent_id_basename_dict, maximum_size=maximum_size)
1932
        return result
1933
1934
    def _populate_from_dicts(self, chk_store, id_to_entry_dict,
1935
                             parent_id_basename_dict, maximum_size):
1936
        search_key_func = chk_map.search_key_registry.get(self._search_key_name)
4413.5.10 by John Arbash Meinel
Clean upt the test_inv tests that assumed _root_node was real and not just a key.
1937
        root_key = chk_map.CHKMap.from_dict(chk_store, id_to_entry_dict,
1938
                   maximum_size=maximum_size, key_width=1,
1939
                   search_key_func=search_key_func)
4413.5.11 by John Arbash Meinel
Pull out the common 'populate this CHKInventory' code out into a helper
1940
        self.id_to_entry = chk_map.CHKMap(chk_store, root_key,
1941
                                          search_key_func)
4413.5.10 by John Arbash Meinel
Clean upt the test_inv tests that assumed _root_node was real and not just a key.
1942
        root_key = chk_map.CHKMap.from_dict(chk_store,
1943
                   parent_id_basename_dict,
1944
                   maximum_size=maximum_size, key_width=2,
1945
                   search_key_func=search_key_func)
4413.5.11 by John Arbash Meinel
Pull out the common 'populate this CHKInventory' code out into a helper
1946
        self.parent_id_basename_to_file_id = chk_map.CHKMap(chk_store,
1947
                                                    root_key, search_key_func)
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1948
3735.2.41 by Robert Collins
Make the parent_id_basename index be updated during CHKInventory.apply_delta.
1949
    def _parent_id_basename_key(self, entry):
1950
        """Create a key for a entry in a parent_id_basename_to_file_id index."""
1951
        if entry.parent_id is not None:
1952
            parent_id = entry.parent_id
1953
        else:
1954
            parent_id = ''
4679.9.4 by John Arbash Meinel
A bit broken, but getting there.
1955
        return StaticTuple(parent_id, entry.name.encode('utf8')).intern()
3735.2.41 by Robert Collins
Make the parent_id_basename index be updated during CHKInventory.apply_delta.
1956
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1957
    def __getitem__(self, file_id):
1958
        """map a single file_id -> InventoryEntry."""
3735.2.125 by Ian Clatworthy
looking up an inventory with file_id=None should throw NoSuchId, not some low level error in crc32
1959
        if file_id is None:
1960
            raise errors.NoSuchId(self, file_id)
3735.2.119 by Ian Clatworthy
add a cache for CHKInventory.path2id()
1961
        result = self._fileid_to_entry_cache.get(file_id, None)
3735.2.51 by Robert Collins
Trivial cache of inventory entries after they are read by a specific inventory.
1962
        if result is not None:
1963
            return result
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1964
        try:
1965
            return self._bytes_to_entry(
4679.9.8 by John Arbash Meinel
Track down a bunch of places in the 'inventory' code that was
1966
                self.id_to_entry.iteritems([StaticTuple(file_id,)]).next()[1])
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1967
        except StopIteration:
3735.2.53 by Robert Collins
Support Inventory.__getitem__ more consistently.
1968
            # really we're passing an inventory, not a tree...
1969
            raise errors.NoSuchId(self, file_id)
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1970
4634.51.3 by John Arbash Meinel
We have iteration to parents working, need to find children now.
1971
    def _getitems(self, file_ids):
1972
        """Similar to __getitem__, but lets you query for multiple.
1973
        
1974
        The returned order is undefined. And currently if an item doesn't
1975
        exist, it isn't included in the output.
1976
        """
1977
        result = []
1978
        remaining = []
1979
        for file_id in file_ids:
1980
            entry = self._fileid_to_entry_cache.get(file_id, None)
1981
            if entry is None:
1982
                remaining.append(file_id)
1983
            else:
1984
                result.append(entry)
4679.9.15 by John Arbash Meinel
Cleanup some code paths. Make _check_key a helper that can be used
1985
        file_keys = [StaticTuple(f,).intern() for f in remaining]
4634.51.3 by John Arbash Meinel
We have iteration to parents working, need to find children now.
1986
        for file_key, value in self.id_to_entry.iteritems(file_keys):
1987
            entry = self._bytes_to_entry(value)
1988
            result.append(entry)
1989
            self._fileid_to_entry_cache[entry.file_id] = entry
1990
        return result
1991
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1992
    def has_id(self, file_id):
1993
        # Perhaps have an explicit 'contains' method on CHKMap ?
3735.2.119 by Ian Clatworthy
add a cache for CHKInventory.path2id()
1994
        if self._fileid_to_entry_cache.get(file_id, None) is not None:
3735.20.5 by Ian Clatworthy
more efficient CHKInventory.has_id()
1995
            return True
4679.9.8 by John Arbash Meinel
Track down a bunch of places in the 'inventory' code that was
1996
        return len(list(
1997
            self.id_to_entry.iteritems([StaticTuple(file_id,)]))) == 1
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1998
3735.2.49 by Robert Collins
Support is_root on CHKInventory objects.
1999
    def is_root(self, file_id):
2000
        return file_id == self.root_id
2001
3735.2.12 by Robert Collins
Implement commit-via-deltas for split inventory repositories.
2002
    def _iter_file_id_parents(self, file_id):
2003
        """Yield the parents of file_id up to the root."""
2004
        while file_id is not None:
4137.3.1 by Ian Clatworthy
Inventory.filter() API with tests
2005
            try:
3735.2.12 by Robert Collins
Implement commit-via-deltas for split inventory repositories.
2006
                ie = self[file_id]
2007
            except KeyError:
3735.2.34 by Robert Collins
Mega-hack; hook in a nasty iter_changes based on CHKInventory.
2008
                raise errors.NoSuchId(tree=self, file_id=file_id)
3735.2.12 by Robert Collins
Implement commit-via-deltas for split inventory repositories.
2009
            yield ie
2010
            file_id = ie.parent_id
2011
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
2012
    def __iter__(self):
3735.2.118 by Ian Clatworthy
only apply the parent_id_basename delta if there is one
2013
        """Iterate over all file-ids."""
3735.2.25 by Robert Collins
CHKInventory core tests passing.
2014
        for key, _ in self.id_to_entry.iteritems():
2015
            yield key[-1]
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
2016
3735.2.155 by Ian Clatworthy
Inventory.iter_just_entries() API & test
2017
    def iter_just_entries(self):
2018
        """Iterate over all entries.
2019
        
2020
        Unlike iter_entries(), just the entries are returned (not (path, ie))
2021
        and the order of entries is undefined.
2022
2023
        XXX: We may not want to merge this into bzr.dev.
2024
        """
2025
        for key, entry in self.id_to_entry.iteritems():
2026
            file_id = key[0]
3735.2.165 by Ian Clatworthy
fix iter_just_entries() in CHKInventories
2027
            ie = self._fileid_to_entry_cache.get(file_id, None)
3735.2.155 by Ian Clatworthy
Inventory.iter_just_entries() API & test
2028
            if ie is None:
2029
                ie = self._bytes_to_entry(entry)
3735.2.165 by Ian Clatworthy
fix iter_just_entries() in CHKInventories
2030
                self._fileid_to_entry_cache[file_id] = ie
3735.2.155 by Ian Clatworthy
Inventory.iter_just_entries() API & test
2031
            yield ie
2032
4241.6.5 by Robert Collins, John Arbash Meinel
CHKInventory support from brisbane-core.
2033
    def iter_changes(self, basis):
3735.2.33 by Robert Collins
Create a smoke-tested CHKInventory.iter_changes(CHKInventory) - incomplete in general but enough to start working with.
2034
        """Generate a Tree.iter_changes change list between this and basis.
2035
2036
        :param basis: Another CHKInventory.
2037
        :return: An iterator over the changes between self and basis, as per
2038
            tree.iter_changes().
2039
        """
2040
        # We want: (file_id, (path_in_source, path_in_target),
2041
        # changed_content, versioned, parent, name, kind,
2042
        # executable)
2043
        for key, basis_value, self_value in \
2044
            self.id_to_entry.iter_changes(basis.id_to_entry):
2045
            file_id = key[0]
2046
            if basis_value is not None:
2047
                basis_entry = basis._bytes_to_entry(basis_value)
3735.2.34 by Robert Collins
Mega-hack; hook in a nasty iter_changes based on CHKInventory.
2048
                path_in_source = basis.id2path(file_id)
2049
                basis_parent = basis_entry.parent_id
2050
                basis_name = basis_entry.name
2051
                basis_executable = basis_entry.executable
2052
            else:
2053
                path_in_source = None
2054
                basis_parent = None
2055
                basis_name = None
2056
                basis_executable = None
3735.2.33 by Robert Collins
Create a smoke-tested CHKInventory.iter_changes(CHKInventory) - incomplete in general but enough to start working with.
2057
            if self_value is not None:
2058
                self_entry = self._bytes_to_entry(self_value)
3735.2.34 by Robert Collins
Mega-hack; hook in a nasty iter_changes based on CHKInventory.
2059
                path_in_target = self.id2path(file_id)
2060
                self_parent = self_entry.parent_id
2061
                self_name = self_entry.name
2062
                self_executable = self_entry.executable
2063
            else:
2064
                path_in_target = None
2065
                self_parent = None
2066
                self_name = None
2067
                self_executable = None
3735.2.33 by Robert Collins
Create a smoke-tested CHKInventory.iter_changes(CHKInventory) - incomplete in general but enough to start working with.
2068
            if basis_value is None:
2069
                # add
2070
                kind = (None, self_entry.kind)
2071
                versioned = (False, True)
3735.2.34 by Robert Collins
Mega-hack; hook in a nasty iter_changes based on CHKInventory.
2072
            elif self_value is None:
3735.2.33 by Robert Collins
Create a smoke-tested CHKInventory.iter_changes(CHKInventory) - incomplete in general but enough to start working with.
2073
                # delete
2074
                kind = (basis_entry.kind, None)
2075
                versioned = (True, False)
2076
            else:
2077
                kind = (basis_entry.kind, self_entry.kind)
2078
                versioned = (True, True)
3735.2.34 by Robert Collins
Mega-hack; hook in a nasty iter_changes based on CHKInventory.
2079
            changed_content = False
3735.2.33 by Robert Collins
Create a smoke-tested CHKInventory.iter_changes(CHKInventory) - incomplete in general but enough to start working with.
2080
            if kind[0] != kind[1]:
2081
                changed_content = True
2082
            elif kind[0] == 'file':
2083
                if (self_entry.text_size != basis_entry.text_size or
2084
                    self_entry.text_sha1 != basis_entry.text_sha1):
2085
                    changed_content = True
3735.2.34 by Robert Collins
Mega-hack; hook in a nasty iter_changes based on CHKInventory.
2086
            elif kind[0] == 'symlink':
3735.2.33 by Robert Collins
Create a smoke-tested CHKInventory.iter_changes(CHKInventory) - incomplete in general but enough to start working with.
2087
                if self_entry.symlink_target != basis_entry.symlink_target:
2088
                    changed_content = True
3735.2.34 by Robert Collins
Mega-hack; hook in a nasty iter_changes based on CHKInventory.
2089
            elif kind[0] == 'tree-reference':
3735.2.33 by Robert Collins
Create a smoke-tested CHKInventory.iter_changes(CHKInventory) - incomplete in general but enough to start working with.
2090
                if (self_entry.reference_revision !=
2091
                    basis_entry.reference_revision):
2092
                    changed_content = True
3735.2.34 by Robert Collins
Mega-hack; hook in a nasty iter_changes based on CHKInventory.
2093
            parent = (basis_parent, self_parent)
2094
            name = (basis_name, self_name)
2095
            executable = (basis_executable, self_executable)
4241.6.5 by Robert Collins, John Arbash Meinel
CHKInventory support from brisbane-core.
2096
            if (not changed_content
2097
                and parent[0] == parent[1]
2098
                and name[0] == name[1]
2099
                and executable[0] == executable[1]):
2100
                # Could happen when only the revision changed for a directory
2101
                # for instance.
4137.3.1 by Ian Clatworthy
Inventory.filter() API with tests
2102
                continue
3735.2.33 by Robert Collins
Create a smoke-tested CHKInventory.iter_changes(CHKInventory) - incomplete in general but enough to start working with.
2103
            yield (file_id, (path_in_source, path_in_target), changed_content,
2104
                versioned, parent, name, kind, executable)
2105
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
2106
    def __len__(self):
2107
        """Return the number of entries in the inventory."""
3735.2.17 by Robert Collins
Cache node length to avoid full iteration on __len__ calls.
2108
        return len(self.id_to_entry)
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
2109
3735.2.47 by Robert Collins
Move '_make_inv_delta' onto Inventory (UNTESTED).
2110
    def _make_delta(self, old):
2111
        """Make an inventory delta from two inventories."""
2112
        if type(old) != CHKInventory:
2113
            return CommonInventory._make_delta(self, old)
2114
        delta = []
2115
        for key, old_value, self_value in \
2116
            self.id_to_entry.iter_changes(old.id_to_entry):
2117
            file_id = key[0]
2118
            if old_value is not None:
2119
                old_path = old.id2path(file_id)
2120
            else:
2121
                old_path = None
2122
            if self_value is not None:
2123
                entry = self._bytes_to_entry(self_value)
3735.2.119 by Ian Clatworthy
add a cache for CHKInventory.path2id()
2124
                self._fileid_to_entry_cache[file_id] = entry
3735.2.47 by Robert Collins
Move '_make_inv_delta' onto Inventory (UNTESTED).
2125
                new_path = self.id2path(file_id)
2126
            else:
2127
                entry = None
2128
                new_path = None
2129
            delta.append((old_path, new_path, file_id, entry))
2130
        return delta
2131
4733.1.1 by John Arbash Meinel
Minor tweak to Inventory.path2id
2132
    def path2id(self, relpath):
3735.2.119 by Ian Clatworthy
add a cache for CHKInventory.path2id()
2133
        """See CommonInventory.path2id()."""
4526.9.17 by Robert Collins
Teach CHKInventory.path2id to avoid loading inventory entries.
2134
        # TODO: perhaps support negative hits?
4733.1.1 by John Arbash Meinel
Minor tweak to Inventory.path2id
2135
        result = self._path_to_fileid_cache.get(relpath, None)
4526.9.17 by Robert Collins
Teach CHKInventory.path2id to avoid loading inventory entries.
2136
        if result is not None:
2137
            return result
4733.1.1 by John Arbash Meinel
Minor tweak to Inventory.path2id
2138
        if isinstance(relpath, basestring):
2139
            names = osutils.splitpath(relpath)
4526.9.17 by Robert Collins
Teach CHKInventory.path2id to avoid loading inventory entries.
2140
        else:
4733.1.1 by John Arbash Meinel
Minor tweak to Inventory.path2id
2141
            names = relpath
4526.9.17 by Robert Collins
Teach CHKInventory.path2id to avoid loading inventory entries.
2142
        current_id = self.root_id
2143
        if current_id is None:
2144
            return None
2145
        parent_id_index = self.parent_id_basename_to_file_id
4733.1.1 by John Arbash Meinel
Minor tweak to Inventory.path2id
2146
        cur_path = None
4526.9.17 by Robert Collins
Teach CHKInventory.path2id to avoid loading inventory entries.
2147
        for basename in names:
4733.1.1 by John Arbash Meinel
Minor tweak to Inventory.path2id
2148
            if cur_path is None:
2149
                cur_path = basename
2150
            else:
2151
                cur_path = cur_path + '/' + basename
4526.9.17 by Robert Collins
Teach CHKInventory.path2id to avoid loading inventory entries.
2152
            basename_utf8 = basename.encode('utf8')
4733.1.1 by John Arbash Meinel
Minor tweak to Inventory.path2id
2153
            file_id = self._path_to_fileid_cache.get(cur_path, None)
4526.9.17 by Robert Collins
Teach CHKInventory.path2id to avoid loading inventory entries.
2154
            if file_id is None:
4679.9.8 by John Arbash Meinel
Track down a bunch of places in the 'inventory' code that was
2155
                key_filter = [StaticTuple(current_id, basename_utf8)]
4733.1.1 by John Arbash Meinel
Minor tweak to Inventory.path2id
2156
                items = parent_id_index.iteritems(key_filter)
2157
                for (parent_id, name_utf8), file_id in items:
2158
                    if parent_id != current_id or name_utf8 != basename_utf8:
2159
                        raise errors.BzrError("corrupt inventory lookup! "
2160
                            "%r %r %r %r" % (parent_id, current_id, name_utf8,
2161
                            basename_utf8))
2162
                if file_id is None:
2163
                    return None
2164
                else:
2165
                    self._path_to_fileid_cache[cur_path] = file_id
4526.9.17 by Robert Collins
Teach CHKInventory.path2id to avoid loading inventory entries.
2166
            current_id = file_id
2167
        return current_id
3735.2.12 by Robert Collins
Implement commit-via-deltas for split inventory repositories.
2168
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
2169
    def to_lines(self):
2170
        """Serialise the inventory to lines."""
2171
        lines = ["chkinventory:\n"]
3735.16.7 by John Arbash Meinel
Start parameterizing CHKInventory and CHKSerializer so that we can
2172
        if self._search_key_name != 'plain':
3735.24.1 by John Arbash Meinel
Change how the ordering of the inventory metablock is written.
2173
            # custom ordering grouping things that don't change together
3735.16.7 by John Arbash Meinel
Start parameterizing CHKInventory and CHKSerializer so that we can
2174
            lines.append('search_key_name: %s\n' % (self._search_key_name,))
3735.24.1 by John Arbash Meinel
Change how the ordering of the inventory metablock is written.
2175
            lines.append("root_id: %s\n" % self.root_id)
3735.2.41 by Robert Collins
Make the parent_id_basename index be updated during CHKInventory.apply_delta.
2176
            lines.append('parent_id_basename_to_file_id: %s\n' %
4679.9.4 by John Arbash Meinel
A bit broken, but getting there.
2177
                (self.parent_id_basename_to_file_id.key()[0],))
3735.24.1 by John Arbash Meinel
Change how the ordering of the inventory metablock is written.
2178
            lines.append("revision_id: %s\n" % self.revision_id)
4679.9.4 by John Arbash Meinel
A bit broken, but getting there.
2179
            lines.append("id_to_entry: %s\n" % (self.id_to_entry.key()[0],))
3735.24.1 by John Arbash Meinel
Change how the ordering of the inventory metablock is written.
2180
        else:
2181
            lines.append("revision_id: %s\n" % self.revision_id)
2182
            lines.append("root_id: %s\n" % self.root_id)
2183
            if self.parent_id_basename_to_file_id is not None:
2184
                lines.append('parent_id_basename_to_file_id: %s\n' %
4679.9.8 by John Arbash Meinel
Track down a bunch of places in the 'inventory' code that was
2185
                    (self.parent_id_basename_to_file_id.key()[0],))
2186
            lines.append("id_to_entry: %s\n" % (self.id_to_entry.key()[0],))
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
2187
        return lines
2188
2189
    @property
2190
    def root(self):
2191
        """Get the root entry."""
2192
        return self[self.root_id]
2193
2194
2195
class CHKInventoryDirectory(InventoryDirectory):
2196
    """A directory in an inventory."""
2197
5365.2.1 by Andrew Bennetts
Reduce memory consumption of InventoryEntries by removing __slots__ entries for attributes that should never be set, e.g. symlink_target on files.
2198
    __slots__ = ['_children', '_chk_inventory']
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
2199
2200
    def __init__(self, file_id, name, parent_id, chk_inventory):
2201
        # Don't call InventoryDirectory.__init__ - it isn't right for this
2202
        # class.
2203
        InventoryEntry.__init__(self, file_id, name, parent_id)
2204
        self._children = None
2205
        self._chk_inventory = chk_inventory
2206
2207
    @property
2208
    def children(self):
3735.2.118 by Ian Clatworthy
only apply the parent_id_basename delta if there is one
2209
        """Access the list of children of this directory.
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
2210
3735.2.44 by Robert Collins
Teach CHKInventory with a parent_id_basename index how to load partial index contents.
2211
        With a parent_id_basename_to_file_id index, loads all the children,
2212
        without loads the entire index. Without is bad. A more sophisticated
2213
        proxy object might be nice, to allow partial loading of children as
2214
        well when specific names are accessed. (So path traversal can be
2215
        written in the obvious way but not examine siblings.).
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
2216
        """
2217
        if self._children is not None:
2218
            return self._children
3735.21.1 by John Arbash Meinel
Fix the file_id versus file_id_key confusion in CHKInventoryDirectory.children()
2219
        # No longer supported
3735.2.129 by Andrew Bennetts
Fix some trivial test failures.
2220
        if self._chk_inventory.parent_id_basename_to_file_id is None:
3735.2.132 by John Arbash Meinel
Remove references to parent_id_basename_index, now that we know we want it.
2221
            raise AssertionError("Inventories without"
2222
                " parent_id_basename_to_file_id are no longer supported")
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
2223
        result = {}
3735.2.44 by Robert Collins
Teach CHKInventory with a parent_id_basename index how to load partial index contents.
2224
        # XXX: Todo - use proxy objects for the children rather than loading
2225
        # all when the attribute is referenced.
2226
        parent_id_index = self._chk_inventory.parent_id_basename_to_file_id
3735.21.1 by John Arbash Meinel
Fix the file_id versus file_id_key confusion in CHKInventoryDirectory.children()
2227
        child_keys = set()
3735.2.44 by Robert Collins
Teach CHKInventory with a parent_id_basename index how to load partial index contents.
2228
        for (parent_id, name_utf8), file_id in parent_id_index.iteritems(
4679.9.8 by John Arbash Meinel
Track down a bunch of places in the 'inventory' code that was
2229
            key_filter=[StaticTuple(self.file_id,)]):
2230
            child_keys.add(StaticTuple(file_id,))
3735.2.51 by Robert Collins
Trivial cache of inventory entries after they are read by a specific inventory.
2231
        cached = set()
3735.21.1 by John Arbash Meinel
Fix the file_id versus file_id_key confusion in CHKInventoryDirectory.children()
2232
        for file_id_key in child_keys:
3735.2.119 by Ian Clatworthy
add a cache for CHKInventory.path2id()
2233
            entry = self._chk_inventory._fileid_to_entry_cache.get(
2234
                file_id_key[0], None)
3735.2.51 by Robert Collins
Trivial cache of inventory entries after they are read by a specific inventory.
2235
            if entry is not None:
2236
                result[entry.name] = entry
3735.21.1 by John Arbash Meinel
Fix the file_id versus file_id_key confusion in CHKInventoryDirectory.children()
2237
                cached.add(file_id_key)
2238
        child_keys.difference_update(cached)
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
2239
        # populate; todo: do by name
3735.2.44 by Robert Collins
Teach CHKInventory with a parent_id_basename index how to load partial index contents.
2240
        id_to_entry = self._chk_inventory.id_to_entry
3735.21.1 by John Arbash Meinel
Fix the file_id versus file_id_key confusion in CHKInventoryDirectory.children()
2241
        for file_id_key, bytes in id_to_entry.iteritems(child_keys):
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
2242
            entry = self._chk_inventory._bytes_to_entry(bytes)
3735.2.44 by Robert Collins
Teach CHKInventory with a parent_id_basename index how to load partial index contents.
2243
            result[entry.name] = entry
3735.2.119 by Ian Clatworthy
add a cache for CHKInventory.path2id()
2244
            self._chk_inventory._fileid_to_entry_cache[file_id_key[0]] = entry
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
2245
        self._children = result
2246
        return result
4137.3.1 by Ian Clatworthy
Inventory.filter() API with tests
2247
2255.2.74 by Robert Collins
Minor performance optimisation in _generate_inventory by avoiding normalisation checks and just using a factory to create the inventory entries.
2248
entry_factory = {
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
2249
    'directory': InventoryDirectory,
2250
    'file': InventoryFile,
2251
    'symlink': InventoryLink,
2255.6.8 by Aaron Bentley
Merge refactoring of add_reference
2252
    'tree-reference': TreeReference
2255.2.74 by Robert Collins
Minor performance optimisation in _generate_inventory by avoiding normalisation checks and just using a factory to create the inventory entries.
2253
}
2254
1713.1.11 by Robert Collins
refactor smart_add to pass around the parent inventory entry and use that, resulting in another 100bzrlib/inventory.py performance improvement, and making inventory writing the dominating factory in add. (Robert Collins)
2255
def make_entry(kind, name, parent_id, file_id=None):
2256
    """Create an inventory entry.
2257
2258
    :param kind: the type of inventory entry to create.
2259
    :param name: the basename of the entry.
2260
    :param parent_id: the parent_id of the entry.
2261
    :param file_id: the file_id to use. if None, one will be created.
2262
    """
2263
    if file_id is None:
2116.4.1 by John Arbash Meinel
Update file and revision id generators.
2264
        file_id = generate_ids.gen_file_id(name)
2825.6.1 by Robert Collins
* ``WorkingTree.rename_one`` will now raise an error if normalisation of the
2265
    name = ensure_normalized_name(name)
2266
    try:
2267
        factory = entry_factory[kind]
2268
    except KeyError:
4634.58.1 by Robert Collins
Show a sensible error when a previously versionable path becomes a FIFO or other unversionable file.
2269
        raise errors.BadFileKindError(name, kind)
2825.6.1 by Robert Collins
* ``WorkingTree.rename_one`` will now raise an error if normalisation of the
2270
    return factory(file_id, name, parent_id)
2271
2272
2273
def ensure_normalized_name(name):
2274
    """Normalize name.
2275
2276
    :raises InvalidNormalization: When name is not normalized, and cannot be
2277
        accessed on this platform by the normalized path.
3201.1.1 by jameinel
Fix bug #185458, switch from NFKC to NFC and add tests for filenames that would be broken under NFKC
2278
    :return: The NFC normalised version of name.
2825.6.1 by Robert Collins
* ``WorkingTree.rename_one`` will now raise an error if normalisation of the
2279
    """
2255.2.54 by Robert Collins
Add in non-normalized filename sanity check to dirstate add().
2280
    #------- This has been copied to bzrlib.dirstate.DirState.add, please
2281
    # keep them synchronised.
2255.2.58 by Robert Collins
Fix the way we used osutils.normalized_filename in dirstate to support overriding in tests - and document this in the original location it was used.
2282
    # we dont import normalized_filename directly because we want to be
2283
    # able to change the implementation at runtime for tests.
1830.3.5 by John Arbash Meinel
make_entry refuses to create non-normalized entries.
2284
    norm_name, can_access = osutils.normalized_filename(name)
2285
    if norm_name != name:
2286
        if can_access:
2825.6.1 by Robert Collins
* ``WorkingTree.rename_one`` will now raise an error if normalisation of the
2287
            return norm_name
1830.3.5 by John Arbash Meinel
make_entry refuses to create non-normalized entries.
2288
        else:
2289
            # TODO: jam 20060701 This would probably be more useful
2290
            #       if the error was raised with the full path
2291
            raise errors.InvalidNormalization(name)
2825.6.1 by Robert Collins
* ``WorkingTree.rename_one`` will now raise an error if normalisation of the
2292
    return name
1713.1.11 by Robert Collins
refactor smart_add to pass around the parent inventory entry and use that, resulting in another 100bzrlib/inventory.py performance improvement, and making inventory writing the dominating factory in add. (Robert Collins)
2293
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
2294
1077 by Martin Pool
- avoid compiling REs at module load time
2295
_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
2296
2297
def is_valid_name(name):
1077 by Martin Pool
- avoid compiling REs at module load time
2298
    global _NAME_RE
1753.1.4 by Robert Collins
Fixup '== None' usage in inventory.py.
2299
    if _NAME_RE is None:
1077 by Martin Pool
- avoid compiling REs at module load time
2300
        _NAME_RE = re.compile(r'^[^/\\]+$')
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2301
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
2302
    return bool(_NAME_RE.match(name))
4505.5.4 by Robert Collins
Repeated path/id corruption detected.
2303
2304
2305
def _check_delta_unique_ids(delta):
2306
    """Decorate a delta and check that the file ids in it are unique.
2307
2308
    :return: A generator over delta.
2309
    """
2310
    ids = set()
2311
    for item in delta:
2312
        length = len(ids) + 1
2313
        ids.add(item[2])
2314
        if len(ids) != length:
2315
            raise errors.InconsistentDelta(item[0] or item[1], item[2],
2316
                "repeated file_id")
2317
        yield item
2318
2319
2320
def _check_delta_unique_new_paths(delta):
2321
    """Decorate a delta and check that the new paths in it are unique.
2322
2323
    :return: A generator over delta.
2324
    """
2325
    paths = set()
2326
    for item in delta:
2327
        length = len(paths) + 1
2328
        path = item[1]
2329
        if path is not None:
2330
            paths.add(path)
2331
            if len(paths) != length:
2332
                raise errors.InconsistentDelta(path, item[2], "repeated path")
2333
        yield item
2334
2335
2336
def _check_delta_unique_old_paths(delta):
2337
    """Decorate a delta and check that the old paths in it are unique.
2338
2339
    :return: A generator over delta.
2340
    """
2341
    paths = set()
2342
    for item in delta:
2343
        length = len(paths) + 1
2344
        path = item[0]
2345
        if path is not None:
2346
            paths.add(path)
2347
            if len(paths) != length:
2348
                raise errors.InconsistentDelta(path, item[2], "repeated path")
2349
        yield item
2350
2351
4526.9.22 by Robert Collins
Check fileids in inventory deltas are not None and are strings.
2352
def _check_delta_ids_are_valid(delta):
2353
    """Decorate a delta and check that the ids in it are valid.
2354
2355
    :return: A generator over delta.
2356
    """
2357
    for item in delta:
2358
        entry = item[3]
2359
        if item[2] is None:
2360
            raise errors.InconsistentDelta(item[0] or item[1], item[2],
2361
                "entry with file_id None %r" % entry)
2362
        if type(item[2]) != str:
2363
            raise errors.InconsistentDelta(item[0] or item[1], item[2],
2364
                "entry with non bytes file_id %r" % entry)
2365
        yield item
2366
2367
4505.5.4 by Robert Collins
Repeated path/id corruption detected.
2368
def _check_delta_ids_match_entry(delta):
2369
    """Decorate a delta and check that the ids in it match the entry.file_id.
2370
2371
    :return: A generator over delta.
2372
    """
2373
    for item in delta:
2374
        entry = item[3]
2375
        if entry is not None:
2376
            if entry.file_id != item[2]:
2377
                raise errors.InconsistentDelta(item[0] or item[1], item[2],
2378
                    "mismatched id with %r" % entry)
2379
        yield item
4526.9.4 by Robert Collins
Look for trivial issues with new_path and entry being out of sync in deltas.
2380
2381
2382
def _check_delta_new_path_entry_both_or_None(delta):
2383
    """Decorate a delta and check that the new_path and entry are paired.
2384
2385
    :return: A generator over delta.
2386
    """
2387
    for item in delta:
2388
        new_path = item[1]
2389
        entry = item[3]
2390
        if new_path is None and entry is not None:
2391
            raise errors.InconsistentDelta(item[0], item[1],
2392
                "Entry with no new_path")
2393
        if new_path is not None and entry is None:
2394
            raise errors.InconsistentDelta(new_path, item[1],
2395
                "new_path with no entry")
2396
        yield item