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