~bzr-pqm/bzr/bzr.dev

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