~bzr-pqm/bzr/bzr.dev

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