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