~bzr-pqm/bzr/bzr.dev

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