~bzr-pqm/bzr/bzr.dev

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