/brz/remove-bazaar

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