~bzr-pqm/bzr/bzr.dev

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