/brz/remove-bazaar

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