/brz/remove-bazaar

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