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