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