/brz/remove-bazaar

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