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