/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
4244.2.1 by Vincent Ladeuil
inv._get_mutable_inventory() - prepare for CHKInventory
30
from copy import deepcopy
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
31
32
from bzrlib.lazy_import import lazy_import
33
lazy_import(globals(), """
34
import collections
4244.2.1 by Vincent Ladeuil
inv._get_mutable_inventory() - prepare for CHKInventory
35
import os
36
import re
1399.1.6 by Robert Collins
move exporting functionality into inventory.py - uncovers bug in symlink support
37
import tarfile
1 by mbp at sourcefrog
import from baz patch-364
38
800 by Martin Pool
Merge John's import-speedup branch:
39
import bzrlib
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
40
from bzrlib import (
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
41
    chk_map,
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
42
    errors,
2116.4.1 by John Arbash Meinel
Update file and revision id generators.
43
    generate_ids,
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
44
    osutils,
45
    symbol_versioning,
2094.3.5 by John Arbash Meinel
Fix imports to ensure modules are loaded before they are used
46
    workingtree,
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
47
    )
48
""")
49
50
from bzrlib.errors import (
51
    BzrCheckError,
52
    BzrError,
53
    )
3577.2.1 by Ian Clatworthy
deprecate export-related InventoryEntry methods and refactor export code accordingly
54
from bzrlib.symbol_versioning import deprecated_in, deprecated_method
70 by mbp at sourcefrog
Prepare for smart recursive add.
55
from bzrlib.trace import mutter
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
56
1 by mbp at sourcefrog
import from baz patch-364
57
802 by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions
58
class InventoryEntry(object):
1 by mbp at sourcefrog
import from baz patch-364
59
    """Description of a versioned file.
60
61
    An InventoryEntry has the following fields, which are also
62
    present in the XML inventory-entry element:
63
1197 by Martin Pool
doc
64
    file_id
65
66
    name
67
        (within the parent directory)
68
69
    parent_id
70
        file_id of the parent directory, or ROOT_ID
71
1092.2.21 by Robert Collins
convert name_version to revision in inventory entries
72
    revision
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
73
        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
74
        introduced.
1197 by Martin Pool
doc
75
1398 by Robert Collins
integrate in Gustavos x-bit patch
76
    executable
77
        Indicates that this file should be executable on systems
78
        that support it.
79
1197 by Martin Pool
doc
80
    text_sha1
81
        sha-1 of the text of the file
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
82
1197 by Martin Pool
doc
83
    text_size
84
        size in bytes of the text of the file
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
85
1197 by Martin Pool
doc
86
    (reading a version 4 tree created a text_id field.)
1 by mbp at sourcefrog
import from baz patch-364
87
88
    >>> i = Inventory()
89
    >>> i.path2id('')
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
90
    'TREE_ROOT'
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
91
    >>> i.add(InventoryDirectory('123', 'src', ROOT_ID))
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
92
    InventoryDirectory('123', 'src', parent_id='TREE_ROOT', revision=None)
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
93
    >>> i.add(InventoryFile('2323', 'hello.c', parent_id='123'))
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
94
    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
95
    >>> shouldbe = {0: '', 1: 'src', 2: 'src/hello.c'}
1185.16.151 by Martin Pool
[patch] win32 fix for InventoryEntry doctest (Alexander, patch 21)
96
    >>> for ix, j in enumerate(i.iter_entries()):
97
    ...   print (j[0] == shouldbe[ix], j[1])
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
98
    ...
2294.1.8 by John Arbash Meinel
Fix one doc test in Inventory which expected a plain str
99
    (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.
100
    (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.
101
    (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
102
    >>> i.add(InventoryFile('2324', 'bye.c', '123'))
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
103
    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
104
    >>> i.add(InventoryDirectory('2325', 'wibble', '123'))
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
105
    InventoryDirectory('2325', 'wibble', parent_id='123', revision=None)
1 by mbp at sourcefrog
import from baz patch-364
106
    >>> i.path2id('src/wibble')
107
    '2325'
108
    >>> '2325' in i
109
    True
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
110
    >>> i.add(InventoryFile('2326', 'wibble.c', '2325'))
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)
1 by mbp at sourcefrog
import from baz patch-364
112
    >>> i['2326']
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
113
    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.
114
    >>> 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 \
115
    ...     print path
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
116
    ...
1852.6.6 by Robert Collins
Finish updating iter_entries change to make all tests pass.
117
    <BLANKLINE>
1 by mbp at sourcefrog
import from baz patch-364
118
    src
119
    src/bye.c
120
    src/hello.c
121
    src/wibble
122
    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 \
123
    >>> i.id2path('2326')
1 by mbp at sourcefrog
import from baz patch-364
124
    'src/wibble/wibble.c'
125
    """
1668.1.5 by Martin Pool
[broken] fix up display of files changed by a commit
126
127
    # Constants returned by describe_change()
128
    #
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
129
    # TODO: These should probably move to some kind of FileChangeDescription
130
    # 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
131
    # generate them just for one file at a time.
132
    RENAMED = 'renamed'
133
    MODIFIED_AND_RENAMED = 'modified and renamed'
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
134
1757.2.10 by Robert Collins
Give all inventory entries __slots__ that are useful with the current codebase.
135
    __slots__ = []
1092.2.23 by Robert Collins
move inventory entry centric snapshot taking logic to inventory.py
136
1399.1.3 by Robert Collins
move change detection for text and metadata from delta to entry.detect_changes
137
    def detect_changes(self, old_entry):
138
        """Return a (text_modified, meta_modified) from this to old_entry.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
139
140
        _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
141
        calling detect_changes.
142
        """
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
143
        return False, False
1399.1.3 by Robert Collins
move change detection for text and metadata from delta to entry.detect_changes
144
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
145
    def _diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree,
146
             output_to, reverse=False):
147
        """Perform a diff between two entries of the same kind."""
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
148
2776.3.1 by Robert Collins
* Deprecated method ``find_previous_heads`` on
149
    def parent_candidates(self, previous_inventories):
150
        """Find possible per-file graph parents.
151
152
        This is currently defined by:
153
         - Select the last changed revision in the parent inventory.
154
         - Do deal with a short lived bug in bzr 0.8's development two entries
155
           that have the same last changed but different 'x' bit settings are
156
           changed in-place.
1409 by Robert Collins
unify previous inventory entry parent logic in preparation for fixing the revision-thrashing bug
157
        """
1596.2.20 by Robert Collins
optimise commit to only access weaves for merged, or altered files during commit.
158
        # revision:ie mapping for each ie found in previous_inventories.
159
        candidates = {}
160
        # identify candidate head revision ids.
1409 by Robert Collins
unify previous inventory entry parent logic in preparation for fixing the revision-thrashing bug
161
        for inv in previous_inventories:
162
            if self.file_id in inv:
163
                ie = inv[self.file_id]
1596.2.20 by Robert Collins
optimise commit to only access weaves for merged, or altered files during commit.
164
                if ie.revision in candidates:
165
                    # same revision value in two different inventories:
166
                    # correct possible inconsistencies:
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
167
                    #     * 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.
168
                    #       support.
1185.1.51 by Robert Collins
merge in reweave support
169
                    try:
1596.2.20 by Robert Collins
optimise commit to only access weaves for merged, or altered files during commit.
170
                        if candidates[ie.revision].executable != ie.executable:
171
                            candidates[ie.revision].executable = False
1185.1.51 by Robert Collins
merge in reweave support
172
                            ie.executable = False
173
                    except AttributeError:
174
                        pass
1409 by Robert Collins
unify previous inventory entry parent logic in preparation for fixing the revision-thrashing bug
175
                else:
1596.2.20 by Robert Collins
optimise commit to only access weaves for merged, or altered files during commit.
176
                    # add this revision as a candidate.
177
                    candidates[ie.revision] = ie
2776.3.1 by Robert Collins
* Deprecated method ``find_previous_heads`` on
178
        return candidates
179
3577.2.1 by Ian Clatworthy
deprecate export-related InventoryEntry methods and refactor export code accordingly
180
    @deprecated_method(deprecated_in((1, 6, 0)))
1399.1.6 by Robert Collins
move exporting functionality into inventory.py - uncovers bug in symlink support
181
    def get_tar_item(self, root, dp, now, tree):
1399.1.7 by Robert Collins
implement symlink exporting to tarballs
182
        """Get a tarfile item and a file stream for its content."""
1996.3.20 by John Arbash Meinel
[merge] bzr.dev 2063
183
        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
184
        # TODO: would be cool to actually set it to the timestamp of the
185
        # revision it was last changed
186
        item.mtime = now
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
187
        fileobj = self._put_in_tar(item, tree)
1399.1.6 by Robert Collins
move exporting functionality into inventory.py - uncovers bug in symlink support
188
        return item, fileobj
189
1399.1.5 by Robert Collins
move checking whether an entry stores text into inventory.py from fetch,py
190
    def has_text(self):
191
        """Return true if the object this entry represents has textual data.
192
193
        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
194
195
        Also note that all entries get weave files created for them.
196
        This attribute is primarily used when upgrading from old trees that
197
        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
198
        """
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
199
        return False
1399.1.5 by Robert Collins
move checking whether an entry stores text into inventory.py from fetch,py
200
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
201
    def __init__(self, file_id, name, parent_id, text_id=None):
1 by mbp at sourcefrog
import from baz patch-364
202
        """Create an InventoryEntry
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
203
1 by mbp at sourcefrog
import from baz patch-364
204
        The filename must be a single component, relative to the
205
        parent directory; it cannot be a whole path or relative name.
206
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
207
        >>> e = InventoryFile('123', 'hello.c', ROOT_ID)
1 by mbp at sourcefrog
import from baz patch-364
208
        >>> e.name
209
        'hello.c'
210
        >>> e.file_id
211
        '123'
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
212
        >>> e = InventoryFile('123', 'src/hello.c', ROOT_ID)
1 by mbp at sourcefrog
import from baz patch-364
213
        Traceback (most recent call last):
1185.16.63 by Martin Pool
- more error conversion
214
        InvalidEntryName: Invalid entry name: src/hello.c
1 by mbp at sourcefrog
import from baz patch-364
215
        """
376 by Martin Pool
- fix slow invariant check when reading in InventoryEntry objects
216
        if '/' in name or '\\' in name:
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
217
            raise errors.InvalidEntryName(name=name)
1398 by Robert Collins
integrate in Gustavos x-bit patch
218
        self.executable = False
1092.2.21 by Robert Collins
convert name_version to revision in inventory entries
219
        self.revision = None
955 by Martin Pool
- use __slots__ on InventoryEntry; rather faster
220
        self.text_sha1 = None
221
        self.text_size = None
1 by mbp at sourcefrog
import from baz patch-364
222
        self.file_id = file_id
223
        self.name = name
224
        self.text_id = text_id
225
        self.parent_id = parent_id
1092.2.6 by Robert Collins
symlink support updated to work
226
        self.symlink_target = None
2255.2.220 by Robert Collins
Fix failing detection of changes restricted to subtrees causing spurious pointless commit errors.
227
        self.reference_revision = None
237 by mbp at sourcefrog
- Better assertions in InventoryEntry constructor
228
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
229
    def kind_character(self):
230
        """Return a short kind indicator useful for appending to names."""
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
231
        raise BzrError('unknown kind %r' % self.kind)
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
232
1731.1.2 by Aaron Bentley
Removed all remaining uses of root_directory
233
    known_kinds = ('file', 'directory', 'symlink')
1 by mbp at sourcefrog
import from baz patch-364
234
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
235
    def _put_in_tar(self, item, tree):
236
        """populate item for stashing in a tar, and return the content stream.
237
238
        If no content is available, return None.
239
        """
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
240
        raise BzrError("don't know how to export {%s} of kind %r" %
241
                       (self.file_id, self.kind))
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
242
3577.2.1 by Ian Clatworthy
deprecate export-related InventoryEntry methods and refactor export code accordingly
243
    @deprecated_method(deprecated_in((1, 6, 0)))
1399.1.6 by Robert Collins
move exporting functionality into inventory.py - uncovers bug in symlink support
244
    def put_on_disk(self, dest, dp, tree):
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
245
        """Create a representation of self on disk in the prefix dest.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
246
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
247
        This is a template method - implement _put_on_disk in subclasses.
248
        """
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
249
        fullpath = osutils.pathjoin(dest, dp)
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
250
        self._put_on_disk(fullpath, tree)
1711.2.101 by John Arbash Meinel
Clean up some unnecessary mutter() calls
251
        # mutter("  export {%s} kind %s to %s", self.file_id,
252
        #         self.kind, fullpath)
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
253
254
    def _put_on_disk(self, fullpath, tree):
255
        """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
256
        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
257
156 by mbp at sourcefrog
new "directories" command
258
    def sorted_children(self):
1757.2.13 by Robert Collins
Tweak InventoryEntry.sorted_children to be simpler.
259
        return sorted(self.children.items())
156 by mbp at sourcefrog
new "directories" command
260
1399.1.1 by Robert Collins
move checks for versionability of file kinds into InventoryEntry
261
    @staticmethod
262
    def versionable_kind(kind):
2100.3.1 by Aaron Bentley
Start roundtripping tree-reference entries
263
        return (kind in ('file', 'directory', 'symlink', 'tree-reference'))
1399.1.1 by Robert Collins
move checks for versionability of file kinds into InventoryEntry
264
1092.2.20 by Robert Collins
symlink and weaves, whaddya know
265
    def check(self, checker, rev_id, inv, tree):
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
266
        """Check this inventory entry is intact.
267
268
        This is a template method, override _check for kind specific
269
        tests.
1616.1.5 by Martin Pool
Cleanup and document some check code
270
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
271
        :param checker: Check object providing context for the checks;
1616.1.5 by Martin Pool
Cleanup and document some check code
272
             can be used to find out what parts of the repository have already
273
             been checked.
274
        :param rev_id: Revision id from which this InventoryEntry was loaded.
275
             Not necessarily the last-changed revision for this file.
276
        :param inv: Inventory from which the entry was loaded.
277
        :param tree: RevisionTree for this entry.
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
278
        """
1757.2.11 by Robert Collins
Correct bzr diff | less= None clauses in inventory.py to be is not None.
279
        if self.parent_id is not None:
1092.2.20 by Robert Collins
symlink and weaves, whaddya know
280
            if not inv.has_id(self.parent_id):
281
                raise BzrCheckError('missing parent {%s} in inventory for revision {%s}'
282
                        % (self.parent_id, rev_id))
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
283
        self._check(checker, rev_id, tree)
284
285
    def _check(self, checker, rev_id, tree):
286
        """Check this inventory entry for kind specific errors."""
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
287
        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
288
                            (self.kind, rev_id))
1092.2.20 by Robert Collins
symlink and weaves, whaddya know
289
1 by mbp at sourcefrog
import from baz patch-364
290
    def copy(self):
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
291
        """Clone this inventory entry."""
292
        raise NotImplementedError
1 by mbp at sourcefrog
import from baz patch-364
293
1668.1.5 by Martin Pool
[broken] fix up display of files changed by a commit
294
    @staticmethod
295
    def describe_change(old_entry, new_entry):
296
        """Describe the change between old_entry and this.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
297
1668.1.5 by Martin Pool
[broken] fix up display of files changed by a commit
298
        This smells of being an InterInventoryEntry situation, but as its
299
        the first one, we're making it a static method for now.
300
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
301
        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
302
        to be renamed. Reparenting is an internal detail.
303
        Note that renaming the parent does not trigger a rename for the
304
        child entry itself.
1669.2.1 by Martin Pool
verbose commit now specifically identifies modified/renamed/reparented files
305
        """
1668.1.5 by Martin Pool
[broken] fix up display of files changed by a commit
306
        # TODO: Perhaps return an object rather than just a string
307
        if old_entry is new_entry:
308
            # also the case of both being None
309
            return 'unchanged'
310
        elif old_entry is None:
1092.2.23 by Robert Collins
move inventory entry centric snapshot taking logic to inventory.py
311
            return 'added'
1668.1.5 by Martin Pool
[broken] fix up display of files changed by a commit
312
        elif new_entry is None:
313
            return 'removed'
1959.4.1 by Aaron Bentley
Correctly handle all file kind changes
314
        if old_entry.kind != new_entry.kind:
315
            return 'modified'
1668.1.5 by Martin Pool
[broken] fix up display of files changed by a commit
316
        text_modified, meta_modified = new_entry.detect_changes(old_entry)
317
        if text_modified or meta_modified:
318
            modified = True
319
        else:
320
            modified = False
321
        # TODO 20060511 (mbp, rbc) factor out 'detect_rename' here.
322
        if old_entry.parent_id != new_entry.parent_id:
323
            renamed = True
324
        elif old_entry.name != new_entry.name:
325
            renamed = True
326
        else:
327
            renamed = False
328
        if renamed and not modified:
329
            return InventoryEntry.RENAMED
330
        if modified and not renamed:
331
            return 'modified'
332
        if modified and renamed:
333
            return InventoryEntry.MODIFIED_AND_RENAMED
334
        return 'unchanged'
1 by mbp at sourcefrog
import from baz patch-364
335
336
    def __repr__(self):
1733.1.4 by Robert Collins
Cosmetic niceties for debugging, extra comments etc.
337
        return ("%s(%r, %r, parent_id=%r, revision=%r)"
1 by mbp at sourcefrog
import from baz patch-364
338
                % (self.__class__.__name__,
339
                   self.file_id,
340
                   self.name,
1733.1.4 by Robert Collins
Cosmetic niceties for debugging, extra comments etc.
341
                   self.parent_id,
342
                   self.revision))
1 by mbp at sourcefrog
import from baz patch-364
343
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
344
    def __eq__(self, other):
3882.6.16 by John Arbash Meinel
Update InventoryEntry.__eq__ in case we enable caching without .copy()
345
        if other is self:
346
            # For the case when objects are cached
347
            return True
1 by mbp at sourcefrog
import from baz patch-364
348
        if not isinstance(other, InventoryEntry):
349
            return NotImplemented
350
1398 by Robert Collins
integrate in Gustavos x-bit patch
351
        return ((self.file_id == other.file_id)
352
                and (self.name == other.name)
353
                and (other.symlink_target == self.symlink_target)
354
                and (self.text_sha1 == other.text_sha1)
355
                and (self.text_size == other.text_size)
356
                and (self.text_id == other.text_id)
357
                and (self.parent_id == other.parent_id)
358
                and (self.kind == other.kind)
359
                and (self.revision == other.revision)
360
                and (self.executable == other.executable)
2255.2.220 by Robert Collins
Fix failing detection of changes restricted to subtrees causing spurious pointless commit errors.
361
                and (self.reference_revision == other.reference_revision)
1398 by Robert Collins
integrate in Gustavos x-bit patch
362
                )
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
363
364
    def __ne__(self, other):
365
        return not (self == other)
366
367
    def __hash__(self):
368
        raise ValueError('not hashable')
1 by mbp at sourcefrog
import from baz patch-364
369
1405 by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave
370
    def _unchanged(self, previous_ie):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
371
        """Has this entry changed relative to previous_ie.
372
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
373
        This method should be overridden in child classes.
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
374
        """
1092.2.22 by Robert Collins
text_version and name_version unification looking reasonable
375
        compatible = True
376
        # different inv parent
377
        if previous_ie.parent_id != self.parent_id:
378
            compatible = False
379
        # renamed
380
        elif previous_ie.name != self.name:
381
            compatible = False
2374.2.2 by John Arbash Meinel
Fix the small bug that ie.snapshot() didn't think about kind changes.
382
        elif previous_ie.kind != self.kind:
383
            compatible = False
1092.2.22 by Robert Collins
text_version and name_version unification looking reasonable
384
        return compatible
385
1185.12.33 by Aaron Bentley
Fixed symlink reverting
386
    def _read_tree_state(self, path, work_tree):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
387
        """Populate fields in the inventory entry from the given tree.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
388
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
389
        Note that this should be modified to be a noop on virtual trees
390
        as all entries created there are prepopulated.
391
        """
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
392
        # TODO: Rather than running this manually, we should check the
1185.16.5 by Martin Pool
doc
393
        # working sha1 and other expensive properties when they're
394
        # first requested, or preload them if they're already known
395
        pass            # nothing to do by default
1092.2.23 by Robert Collins
move inventory entry centric snapshot taking logic to inventory.py
396
1534.7.175 by Aaron Bentley
Ensured revert writes a normal inventory
397
    def _forget_tree_state(self):
398
        pass
399
1 by mbp at sourcefrog
import from baz patch-364
400
1907.1.4 by Aaron Bentley
Restore RootEntry, but mark it deprecated, restore EmptyTree.kind
401
class RootEntry(InventoryEntry):
402
403
    __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.
404
                 'text_id', 'parent_id', 'children', 'executable',
405
                 'revision', 'symlink_target', 'reference_revision']
1907.1.4 by Aaron Bentley
Restore RootEntry, but mark it deprecated, restore EmptyTree.kind
406
407
    def _check(self, checker, rev_id, tree):
408
        """See InventoryEntry._check"""
409
410
    def __init__(self, file_id):
411
        self.file_id = file_id
412
        self.children = {}
413
        self.kind = 'directory'
414
        self.parent_id = None
415
        self.name = u''
416
        self.revision = None
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
417
        symbol_versioning.warn('RootEntry is deprecated as of bzr 0.10.'
418
                               '  Please use InventoryDirectory instead.',
419
                               DeprecationWarning, stacklevel=2)
1907.1.4 by Aaron Bentley
Restore RootEntry, but mark it deprecated, restore EmptyTree.kind
420
421
    def __eq__(self, other):
422
        if not isinstance(other, RootEntry):
423
            return NotImplemented
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
424
1907.1.4 by Aaron Bentley
Restore RootEntry, but mark it deprecated, restore EmptyTree.kind
425
        return (self.file_id == other.file_id) \
426
               and (self.children == other.children)
427
428
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
429
class InventoryDirectory(InventoryEntry):
430
    """A directory in an inventory."""
431
1757.2.10 by Robert Collins
Give all inventory entries __slots__ that are useful with the current codebase.
432
    __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.
433
                 'text_id', 'parent_id', 'children', 'executable',
434
                 'revision', 'symlink_target', 'reference_revision']
1757.2.10 by Robert Collins
Give all inventory entries __slots__ that are useful with the current codebase.
435
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
436
    def _check(self, checker, rev_id, tree):
437
        """See InventoryEntry._check"""
1757.2.11 by Robert Collins
Correct bzr diff | less= None clauses in inventory.py to be is not None.
438
        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
439
            raise BzrCheckError('directory {%s} has text in revision {%s}'
440
                                % (self.file_id, rev_id))
441
442
    def copy(self):
443
        other = InventoryDirectory(self.file_id, self.name, self.parent_id)
444
        other.revision = self.revision
445
        # note that children are *not* copied; they're pulled across when
446
        # others are added
447
        return other
448
449
    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
450
        super(InventoryDirectory, self).__init__(file_id, name, parent_id)
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
451
        self.children = {}
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
452
        self.kind = 'directory'
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
453
454
    def kind_character(self):
455
        """See InventoryEntry.kind_character."""
456
        return '/'
457
458
    def _put_in_tar(self, item, tree):
459
        """See InventoryEntry._put_in_tar."""
460
        item.type = tarfile.DIRTYPE
461
        fileobj = None
462
        item.name += '/'
463
        item.size = 0
464
        item.mode = 0755
465
        return fileobj
466
467
    def _put_on_disk(self, fullpath, tree):
468
        """See InventoryEntry._put_on_disk."""
469
        os.mkdir(fullpath)
470
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
471
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
472
class InventoryFile(InventoryEntry):
473
    """A file in an inventory."""
474
1757.2.10 by Robert Collins
Give all inventory entries __slots__ that are useful with the current codebase.
475
    __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.
476
                 'text_id', 'parent_id', 'children', 'executable',
477
                 'revision', 'symlink_target', 'reference_revision']
1757.2.10 by Robert Collins
Give all inventory entries __slots__ that are useful with the current codebase.
478
1616.1.5 by Martin Pool
Cleanup and document some check code
479
    def _check(self, checker, tree_revision_id, tree):
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
480
        """See InventoryEntry._check"""
3350.8.3 by Robert Collins
VF.get_sha1s needed changing to be stackable.
481
        key = (self.file_id, self.revision)
482
        if key in checker.checked_texts:
483
            prev_sha = checker.checked_texts[key]
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
484
            if prev_sha != self.text_sha1:
2745.6.41 by Andrew Bennetts
Test repo.check against all_scenarios.
485
                raise BzrCheckError(
486
                    'mismatched sha1 on {%s} in {%s} (%s != %s) %r' %
487
                    (self.file_id, tree_revision_id, prev_sha, self.text_sha1,
488
                     t))
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
489
            else:
490
                checker.repeated_text_cnt += 1
491
                return
1185.50.28 by John Arbash Meinel
Lots of updates for 'bzr check'
492
1616.1.7 by Martin Pool
New developer commands 'weave-list' and 'weave-join'.
493
        checker.checked_text_cnt += 1
1185.50.28 by John Arbash Meinel
Lots of updates for 'bzr check'
494
        # We can't check the length, because Weave doesn't store that
495
        # information, and the whole point of looking at the weave's
496
        # 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.
497
        if (self.text_sha1 != tree._repository.texts.get_sha1s([key])[key]):
498
            raise BzrCheckError('text {%s} version {%s} wrong sha1' % key)
499
        checker.checked_texts[key] = self.text_sha1
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
500
501
    def copy(self):
502
        other = InventoryFile(self.file_id, self.name, self.parent_id)
503
        other.executable = self.executable
504
        other.text_id = self.text_id
505
        other.text_sha1 = self.text_sha1
506
        other.text_size = self.text_size
507
        other.revision = self.revision
508
        return other
509
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
510
    def detect_changes(self, old_entry):
511
        """See InventoryEntry.detect_changes."""
512
        text_modified = (self.text_sha1 != old_entry.text_sha1)
513
        meta_modified = (self.executable != old_entry.executable)
514
        return text_modified, meta_modified
515
516
    def _diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree,
517
             output_to, reverse=False):
518
        """See InventoryEntry._diff."""
3009.2.22 by Aaron Bentley
Update names & docstring
519
        from bzrlib.diff import DiffText
3009.2.5 by Aaron Bentley
Factor symlink and file diffing into differ
520
        from_file_id = self.file_id
521
        if to_entry:
522
            to_file_id = to_entry.file_id
523
        else:
524
            to_file_id = None
525
        if reverse:
526
            to_file_id, from_file_id = from_file_id, to_file_id
527
            tree, to_tree = to_tree, tree
528
            from_label, to_label = to_label, from_label
3009.2.22 by Aaron Bentley
Update names & docstring
529
        differ = DiffText(tree, to_tree, output_to, 'utf-8', '', '',
530
                          text_diff)
3009.2.5 by Aaron Bentley
Factor symlink and file diffing into differ
531
        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
532
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
533
    def has_text(self):
534
        """See InventoryEntry.has_text."""
535
        return True
536
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
537
    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
538
        super(InventoryFile, self).__init__(file_id, name, parent_id)
539
        self.kind = 'file'
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
540
541
    def kind_character(self):
542
        """See InventoryEntry.kind_character."""
543
        return ''
544
545
    def _put_in_tar(self, item, tree):
546
        """See InventoryEntry._put_in_tar."""
547
        item.type = tarfile.REGTYPE
548
        fileobj = tree.get_file(self.file_id)
549
        item.size = self.text_size
550
        if tree.is_executable(self.file_id):
551
            item.mode = 0755
552
        else:
553
            item.mode = 0644
554
        return fileobj
555
556
    def _put_on_disk(self, fullpath, tree):
557
        """See InventoryEntry._put_on_disk."""
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
558
        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
559
        if tree.is_executable(self.file_id):
560
            os.chmod(fullpath, 0755)
561
1185.12.33 by Aaron Bentley
Fixed symlink reverting
562
    def _read_tree_state(self, path, work_tree):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
563
        """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
564
        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.
565
        # FIXME: 20050930 probe for the text size when getting sha1
566
        # in _read_tree_state
1732.1.19 by John Arbash Meinel
If you have the path, use it rather than looking it up again
567
        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
568
1733.1.4 by Robert Collins
Cosmetic niceties for debugging, extra comments etc.
569
    def __repr__(self):
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
570
        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.
571
                % (self.__class__.__name__,
572
                   self.file_id,
573
                   self.name,
574
                   self.parent_id,
575
                   self.text_sha1,
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
576
                   self.text_size,
577
                   self.revision))
1733.1.4 by Robert Collins
Cosmetic niceties for debugging, extra comments etc.
578
1534.7.175 by Aaron Bentley
Ensured revert writes a normal inventory
579
    def _forget_tree_state(self):
580
        self.text_sha1 = None
581
1405 by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave
582
    def _unchanged(self, previous_ie):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
583
        """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
584
        compatible = super(InventoryFile, self)._unchanged(previous_ie)
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
585
        if self.text_sha1 != previous_ie.text_sha1:
586
            compatible = False
587
        else:
588
            # FIXME: 20050930 probe for the text size when getting sha1
589
            # in _read_tree_state
590
            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
591
        if self.executable != previous_ie.executable:
592
            compatible = False
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
593
        return compatible
594
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
595
596
class InventoryLink(InventoryEntry):
597
    """A file in an inventory."""
598
1757.2.10 by Robert Collins
Give all inventory entries __slots__ that are useful with the current codebase.
599
    __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.
600
                 'text_id', 'parent_id', 'children', 'executable',
601
                 'revision', 'symlink_target', 'reference_revision']
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
602
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
603
    def _check(self, checker, rev_id, tree):
604
        """See InventoryEntry._check"""
1757.2.11 by Robert Collins
Correct bzr diff | less= None clauses in inventory.py to be is not None.
605
        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
606
            raise BzrCheckError('symlink {%s} has text in revision {%s}'
607
                    % (self.file_id, rev_id))
1753.1.4 by Robert Collins
Fixup '== None' usage in inventory.py.
608
        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
609
            raise BzrCheckError('symlink {%s} has no target in revision {%s}'
610
                    % (self.file_id, rev_id))
611
612
    def copy(self):
613
        other = InventoryLink(self.file_id, self.name, self.parent_id)
614
        other.symlink_target = self.symlink_target
615
        other.revision = self.revision
616
        return other
617
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
618
    def detect_changes(self, old_entry):
619
        """See InventoryEntry.detect_changes."""
620
        # FIXME: which _modified field should we use ? RBC 20051003
621
        text_modified = (self.symlink_target != old_entry.symlink_target)
622
        if text_modified:
623
            mutter("    symlink target changed")
624
        meta_modified = False
625
        return text_modified, meta_modified
626
627
    def _diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree,
628
             output_to, reverse=False):
629
        """See InventoryEntry._diff."""
3009.2.22 by Aaron Bentley
Update names & docstring
630
        from bzrlib.diff import DiffSymlink
3009.2.5 by Aaron Bentley
Factor symlink and file diffing into differ
631
        old_target = self.symlink_target
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
632
        if to_entry is not None:
3009.2.5 by Aaron Bentley
Factor symlink and file diffing into differ
633
            new_target = to_entry.symlink_target
634
        else:
635
            new_target = None
636
        if not reverse:
637
            old_tree = tree
638
            new_tree = to_tree
639
        else:
640
            old_tree = to_tree
641
            new_tree = tree
642
            new_target, old_target = old_target, new_target
3009.2.22 by Aaron Bentley
Update names & docstring
643
        differ = DiffSymlink(old_tree, new_tree, output_to)
3009.2.5 by Aaron Bentley
Factor symlink and file diffing into differ
644
        return differ.diff_symlink(old_target, new_target)
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
645
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
646
    def __init__(self, file_id, name, parent_id):
647
        super(InventoryLink, self).__init__(file_id, name, parent_id)
648
        self.kind = 'symlink'
649
650
    def kind_character(self):
651
        """See InventoryEntry.kind_character."""
652
        return ''
653
654
    def _put_in_tar(self, item, tree):
655
        """See InventoryEntry._put_in_tar."""
1185.33.3 by Martin Pool
[merge] jelmer
656
        item.type = tarfile.SYMTYPE
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
657
        fileobj = None
658
        item.size = 0
659
        item.mode = 0755
660
        item.linkname = self.symlink_target
661
        return fileobj
662
663
    def _put_on_disk(self, fullpath, tree):
664
        """See InventoryEntry._put_on_disk."""
665
        try:
666
            os.symlink(self.symlink_target, fullpath)
667
        except OSError,e:
668
            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
669
1185.12.33 by Aaron Bentley
Fixed symlink reverting
670
    def _read_tree_state(self, path, work_tree):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
671
        """See InventoryEntry._read_tree_state."""
672
        self.symlink_target = work_tree.get_symlink_target(self.file_id)
673
1534.7.175 by Aaron Bentley
Ensured revert writes a normal inventory
674
    def _forget_tree_state(self):
675
        self.symlink_target = None
676
1405 by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave
677
    def _unchanged(self, previous_ie):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
678
        """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
679
        compatible = super(InventoryLink, self)._unchanged(previous_ie)
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
680
        if self.symlink_target != previous_ie.symlink_target:
681
            compatible = False
682
        return compatible
683
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
684
2100.3.1 by Aaron Bentley
Start roundtripping tree-reference entries
685
class TreeReference(InventoryEntry):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
686
2100.3.1 by Aaron Bentley
Start roundtripping tree-reference entries
687
    kind = 'tree-reference'
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
688
2255.6.8 by Aaron Bentley
Merge refactoring of add_reference
689
    def __init__(self, file_id, name, parent_id, revision=None,
690
                 reference_revision=None):
2100.3.1 by Aaron Bentley
Start roundtripping tree-reference entries
691
        InventoryEntry.__init__(self, file_id, name, parent_id)
692
        self.revision = revision
693
        self.reference_revision = reference_revision
694
2100.3.18 by Aaron Bentley
Get commit working for tree references
695
    def copy(self):
696
        return TreeReference(self.file_id, self.name, self.parent_id,
697
                             self.revision, self.reference_revision)
698
2100.3.19 by Aaron Bentley
Ensure commit preserves reference revision
699
    def _read_tree_state(self, path, work_tree):
700
        """Populate fields in the inventory entry from the given tree.
701
        """
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.
702
        self.reference_revision = work_tree.get_reference_revision(
703
            self.file_id, path)
2100.3.19 by Aaron Bentley
Ensure commit preserves reference revision
704
705
    def _forget_tree_state(self):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
706
        self.reference_revision = None
2100.3.19 by Aaron Bentley
Ensure commit preserves reference revision
707
2825.5.2 by Robert Collins
Review feedback, and fix pointless commits with nested trees to raise PointlessCommit appropriately.
708
    def _unchanged(self, previous_ie):
709
        """See InventoryEntry._unchanged."""
710
        compatible = super(TreeReference, self)._unchanged(previous_ie)
711
        if self.reference_revision != previous_ie.reference_revision:
712
            compatible = False
713
        return compatible
714
2100.3.19 by Aaron Bentley
Ensure commit preserves reference revision
715
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
716
class CommonInventory(object):
717
    """Basic inventory logic, defined in terms of primitives like has_id."""
718
3735.2.61 by Robert Collins
Define __contains__ for all Inventories, as otherwise __iter__ gets used for foo in bar, if __iter__ is defined.
719
    def __contains__(self, file_id):
720
        """True if this entry contains a file with given id.
721
722
        >>> inv = Inventory()
723
        >>> inv.add(InventoryFile('123', 'foo.c', ROOT_ID))
724
        InventoryFile('123', 'foo.c', parent_id='TREE_ROOT', sha1=None, len=None, revision=None)
725
        >>> '123' in inv
726
        True
727
        >>> '456' in inv
728
        False
729
730
        Note that this method along with __iter__ are not encouraged for use as
731
        they are less clear than specific query methods - they may be rmeoved
732
        in the future.
733
        """
734
        return self.has_id(file_id)
735
3735.2.12 by Robert Collins
Implement commit-via-deltas for split inventory repositories.
736
    def id2path(self, file_id):
737
        """Return as a string the path to file_id.
3735.2.99 by John Arbash Meinel
Merge bzr.dev 4034. Whitespace cleanup
738
3735.2.12 by Robert Collins
Implement commit-via-deltas for split inventory repositories.
739
        >>> i = Inventory()
740
        >>> e = i.add(InventoryDirectory('src-id', 'src', ROOT_ID))
741
        >>> e = i.add(InventoryFile('foo-id', 'foo.c', parent_id='src-id'))
742
        >>> print i.id2path('foo-id')
743
        src/foo.c
744
        """
745
        # get all names, skipping root
746
        return '/'.join(reversed(
3735.2.99 by John Arbash Meinel
Merge bzr.dev 4034. Whitespace cleanup
747
            [parent.name for parent in
3735.2.12 by Robert Collins
Implement commit-via-deltas for split inventory repositories.
748
             self._iter_file_id_parents(file_id)][:-1]))
3735.2.99 by John Arbash Meinel
Merge bzr.dev 4034. Whitespace cleanup
749
4370.5.1 by Ian Clatworthy
add recursive parameter to iter_entries()
750
    def iter_entries(self, from_dir=None, recursive=True):
751
        """Return (path, entry) pairs, in order by name.
752
        
753
        :param from_dir: if None, start from the root,
754
          otherwise start from this directory (either file-id or entry)
755
        :param recursive: recurse into directories or not
756
        """
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
757
        if from_dir is None:
758
            if self.root is None:
759
                return
760
            from_dir = self.root
761
            yield '', self.root
762
        elif isinstance(from_dir, basestring):
763
            from_dir = self[from_dir]
3735.2.99 by John Arbash Meinel
Merge bzr.dev 4034. Whitespace cleanup
764
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
765
        # unrolling the recursive called changed the time from
766
        # 440ms/663ms (inline/total) to 116ms/116ms
767
        children = from_dir.children.items()
768
        children.sort()
4370.5.1 by Ian Clatworthy
add recursive parameter to iter_entries()
769
        if not recursive:
770
            for name, ie in children:
771
                yield name, ie
772
            return
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
773
        children = collections.deque(children)
774
        stack = [(u'', children)]
775
        while stack:
776
            from_dir_relpath, children = stack[-1]
777
778
            while children:
779
                name, ie = children.popleft()
780
781
                # we know that from_dir_relpath never ends in a slash
782
                # and 'f' doesn't begin with one, we can do a string op, rather
783
                # than the checks of pathjoin(), though this means that all paths
784
                # start with a slash
785
                path = from_dir_relpath + '/' + name
786
787
                yield path[1:], ie
788
789
                if ie.kind != 'directory':
790
                    continue
791
792
                # But do this child first
793
                new_children = ie.children.items()
794
                new_children.sort()
795
                new_children = collections.deque(new_children)
796
                stack.append((path, new_children))
797
                # Break out of inner loop, so that we start outer loop with child
798
                break
799
            else:
800
                # if we finished all children, pop it off the stack
801
                stack.pop()
802
803
    def iter_entries_by_dir(self, from_dir=None, specific_file_ids=None,
804
        yield_parents=False):
805
        """Iterate over the entries in a directory first order.
806
807
        This returns all entries for a directory before returning
808
        the entries for children of a directory. This is not
809
        lexicographically sorted order, and is a hybrid between
810
        depth-first and breadth-first.
811
812
        :param yield_parents: If True, yield the parents from the root leading
813
            down to specific_file_ids that have been requested. This has no
814
            impact if specific_file_ids is None.
815
        :return: This yields (path, entry) pairs
816
        """
817
        if specific_file_ids and not isinstance(specific_file_ids, set):
818
            specific_file_ids = set(specific_file_ids)
819
        # TODO? Perhaps this should return the from_dir so that the root is
820
        # yielded? or maybe an option?
821
        if from_dir is None:
822
            if self.root is None:
823
                return
824
            # Optimize a common case
825
            if (not yield_parents and specific_file_ids is not None and
826
                len(specific_file_ids) == 1):
827
                file_id = list(specific_file_ids)[0]
828
                if file_id in self:
829
                    yield self.id2path(file_id), self[file_id]
3735.2.99 by John Arbash Meinel
Merge bzr.dev 4034. Whitespace cleanup
830
                return
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
831
            from_dir = self.root
832
            if (specific_file_ids is None or yield_parents or
833
                self.root.file_id in specific_file_ids):
834
                yield u'', self.root
835
        elif isinstance(from_dir, basestring):
836
            from_dir = self[from_dir]
837
838
        if specific_file_ids is not None:
839
            # TODO: jam 20070302 This could really be done as a loop rather
840
            #       than a bunch of recursive calls.
841
            parents = set()
842
            byid = self
843
            def add_ancestors(file_id):
844
                if file_id not in byid:
845
                    return
846
                parent_id = byid[file_id].parent_id
847
                if parent_id is None:
848
                    return
849
                if parent_id not in parents:
850
                    parents.add(parent_id)
851
                    add_ancestors(parent_id)
852
            for file_id in specific_file_ids:
853
                add_ancestors(file_id)
854
        else:
855
            parents = None
3735.2.99 by John Arbash Meinel
Merge bzr.dev 4034. Whitespace cleanup
856
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
857
        stack = [(u'', from_dir)]
858
        while stack:
859
            cur_relpath, cur_dir = stack.pop()
860
861
            child_dirs = []
862
            for child_name, child_ie in sorted(cur_dir.children.iteritems()):
863
864
                child_relpath = cur_relpath + child_name
865
3735.2.99 by John Arbash Meinel
Merge bzr.dev 4034. Whitespace cleanup
866
                if (specific_file_ids is None or
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
867
                    child_ie.file_id in specific_file_ids or
868
                    (yield_parents and child_ie.file_id in parents)):
869
                    yield child_relpath, child_ie
870
871
                if child_ie.kind == 'directory':
872
                    if parents is None or child_ie.file_id in parents:
873
                        child_dirs.append((child_relpath+'/', child_ie))
874
            stack.extend(reversed(child_dirs))
875
3735.2.47 by Robert Collins
Move '_make_inv_delta' onto Inventory (UNTESTED).
876
    def _make_delta(self, old):
877
        """Make an inventory delta from two inventories."""
878
        old_ids = set(old)
879
        new_ids = set(self)
880
        adds = new_ids - old_ids
881
        deletes = old_ids - new_ids
882
        common = old_ids.intersection(new_ids)
883
        delta = []
884
        for file_id in deletes:
885
            delta.append((old.id2path(file_id), None, file_id, None))
886
        for file_id in adds:
887
            delta.append((None, self.id2path(file_id), file_id, self[file_id]))
888
        for file_id in common:
889
            if old[file_id] != self[file_id]:
890
                delta.append((old.id2path(file_id), self.id2path(file_id),
891
                    file_id, self[file_id]))
892
        return delta
893
4241.6.5 by Robert Collins, John Arbash Meinel
CHKInventory support from brisbane-core.
894
    def _get_mutable_inventory(self):
895
        """Returns a mutable copy of the object.
896
897
        Some inventories are immutable, yet working trees, for example, needs
898
        to mutate exisiting inventories instead of creating a new one.
899
        """
900
        raise NotImplementedError(self._get_mutable_inventory)
901
3735.2.110 by Ian Clatworthy
move make_entry(), entries() and directories() up to CommonInventory class
902
    def make_entry(self, kind, name, parent_id, file_id=None):
903
        """Simple thunk to bzrlib.inventory.make_entry."""
904
        return make_entry(kind, name, parent_id, file_id)
905
906
    def entries(self):
907
        """Return list of (path, ie) for all entries except the root.
908
909
        This may be faster than iter_entries.
910
        """
911
        accum = []
912
        def descend(dir_ie, dir_path):
913
            kids = dir_ie.children.items()
914
            kids.sort()
915
            for name, ie in kids:
916
                child_path = osutils.pathjoin(dir_path, name)
917
                accum.append((child_path, ie))
918
                if ie.kind == 'directory':
919
                    descend(ie, child_path)
920
921
        descend(self.root, u'')
922
        return accum
923
924
    def directories(self):
925
        """Return (path, entry) pairs for all directories, including the root.
926
        """
927
        accum = []
928
        def descend(parent_ie, parent_path):
929
            accum.append((parent_path, parent_ie))
930
931
            kids = [(ie.name, ie) for ie in parent_ie.children.itervalues() if ie.kind == 'directory']
932
            kids.sort()
933
934
            for name, child_ie in kids:
935
                child_path = osutils.pathjoin(parent_path, name)
936
                descend(child_ie, child_path)
937
        descend(self.root, u'')
938
        return accum
4241.6.5 by Robert Collins, John Arbash Meinel
CHKInventory support from brisbane-core.
939
3735.2.119 by Ian Clatworthy
add a cache for CHKInventory.path2id()
940
    def path2id(self, name):
941
        """Walk down through directories to return entry of last component.
942
943
        names may be either a list of path components, or a single
944
        string, in which case it is automatically split.
945
946
        This returns the entry of the last component in the path,
947
        which may be either a file or a directory.
948
949
        Returns None IFF the path is not found.
950
        """
951
        if isinstance(name, basestring):
952
            name = osutils.splitpath(name)
953
954
        # mutter("lookup path %r" % name)
955
3735.2.149 by Ian Clatworthy
handle path2id when root not yet known
956
        try:
957
            parent = self.root
958
        except errors.NoSuchId:
959
            # root doesn't exist yet so nothing else can
960
            return None
3735.2.119 by Ian Clatworthy
add a cache for CHKInventory.path2id()
961
        if parent is None:
962
            return None
963
        for f in name:
964
            try:
965
                children = getattr(parent, 'children', None)
966
                if children is None:
967
                    return None
968
                cie = children[f]
969
                parent = cie
970
            except KeyError:
971
                # or raise an error?
972
                return None
973
974
        return parent.file_id
975
3735.36.6 by Ian Clatworthy
get inventory filtering working for CHKInventory
976
    def filter(self, specific_fileids):
977
        """Get an inventory view filtered against a set of file-ids.
978
979
        Children of directories and parents are included.
980
981
        The result may or may not reference the underlying inventory
982
        so it should be treated as immutable.
983
        """
984
        interesting_parents = set()
985
        for fileid in specific_fileids:
986
            try:
987
                interesting_parents.update(self.get_idpath(fileid))
988
            except errors.NoSuchId:
989
                # This fileid is not in the inventory - that's ok
990
                pass
991
        entries = self.iter_entries()
992
        if self.root is None:
993
            return Inventory(root_id=None)
994
        other = Inventory(entries.next()[1].file_id)
995
        other.root.revision = self.root.revision
996
        other.revision_id = self.revision_id
997
        directories_to_expand = set()
998
        for path, entry in entries:
999
            file_id = entry.file_id
1000
            if (file_id in specific_fileids
1001
                or entry.parent_id in directories_to_expand):
1002
                if entry.kind == 'directory':
1003
                    directories_to_expand.add(file_id)
1004
            elif file_id not in interesting_parents:
1005
                continue
1006
            other.add(entry.copy())
1007
        return other
1008
1009
    def get_idpath(self, file_id):
1010
        """Return a list of file_ids for the path to an entry.
1011
1012
        The list contains one element for each directory followed by
1013
        the id of the file itself.  So the length of the returned list
1014
        is equal to the depth of the file in the tree, counting the
1015
        root directory as depth 1.
1016
        """
1017
        p = []
1018
        for parent in self._iter_file_id_parents(file_id):
1019
            p.insert(0, parent.file_id)
1020
        return p
1021
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1022
1023
class Inventory(CommonInventory):
1 by mbp at sourcefrog
import from baz patch-364
1024
    """Inventory of versioned files in a tree.
1025
240 by mbp at sourcefrog
doc
1026
    This describes which file_id is present at each point in the tree,
1027
    and possibly the SHA-1 or other information about the file.
1028
    Entries can be looked up either by path or by file_id.
1 by mbp at sourcefrog
import from baz patch-364
1029
1030
    The inventory represents a typical unix file tree, with
1031
    directories containing files and subdirectories.  We never store
1032
    the full path to a file, because renaming a directory implicitly
1033
    moves all of its contents.  This class internally maintains a
1034
    lookup tree that allows the children under a directory to be
1035
    returned quickly.
1036
1037
    InventoryEntry objects must not be modified after they are
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
1038
    inserted, other than through the Inventory API.
1 by mbp at sourcefrog
import from baz patch-364
1039
1040
    >>> inv = Inventory()
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
1041
    >>> inv.add(InventoryFile('123-123', 'hello.c', ROOT_ID))
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1042
    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
1043
    >>> inv['123-123'].name
1044
    'hello.c'
1045
1046
    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
1047
1 by mbp at sourcefrog
import from baz patch-364
1048
    >>> bool(inv.path2id('hello.c'))
1049
    True
1050
    >>> '123-123' in inv
1051
    True
1052
1053
    May also look up by name:
1054
1055
    >>> [x[0] for x in inv.iter_entries()]
1852.6.6 by Robert Collins
Finish updating iter_entries change to make all tests pass.
1056
    ['', u'hello.c']
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
1057
    >>> 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
1058
    >>> inv.add(InventoryFile('123-123', 'hello.c', ROOT_ID))
1731.1.33 by Aaron Bentley
Revert no-special-root changes
1059
    Traceback (most recent call last):
1060
    BzrError: parent_id {TREE_ROOT} not in inventory
1061
    >>> 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.
1062
    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
1063
    """
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
1064
    def __init__(self, root_id=ROOT_ID, revision_id=None):
1 by mbp at sourcefrog
import from baz patch-364
1065
        """Create or read an inventory.
1066
1067
        If a working directory is specified, the inventory is read
1068
        from there.  If the file is specified, read from that. If not,
1069
        the inventory is created empty.
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
1070
1071
        The inventory is created with a default root directory, with
1072
        an id of None.
1 by mbp at sourcefrog
import from baz patch-364
1073
        """
1731.1.33 by Aaron Bentley
Revert no-special-root changes
1074
        if root_id is not None:
2294.1.5 by John Arbash Meinel
Fix Inventory.iter_entries_by_dir to return Unicode paths,
1075
            self._set_root(InventoryDirectory(root_id, u'', None))
1731.1.33 by Aaron Bentley
Revert no-special-root changes
1076
        else:
1077
            self.root = None
1078
            self._byid = {}
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
1079
        self.revision_id = revision_id
1910.2.3 by Aaron Bentley
All tests pass
1080
2865.1.1 by Robert Collins
Create new mutable tree method update_to_one_parent_via_delta for eventual use by commit.
1081
    def __repr__(self):
4112.1.1 by Vincent Ladeuil
Fallback to old revision id if the current one doesn't exist in
1082
        # More than one page of ouput is not useful anymore to debug
1083
        max_len = 2048
1084
        closing = '...}'
1085
        contents = repr(self._byid)
1086
        if len(contents) > max_len:
1087
            contents = contents[:(max_len-len(closing))] + closing
1088
        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.
1089
1090
    def apply_delta(self, delta):
1091
        """Apply a delta to this inventory.
1092
4501.1.1 by Robert Collins
Add documentation describing how and why we use inventory deltas, and what can go wrong with them.
1093
        See the inventory developers documentation for the theory behind
1094
        inventory deltas.
1095
2865.1.1 by Robert Collins
Create new mutable tree method update_to_one_parent_via_delta for eventual use by commit.
1096
        :param delta: A list of changes to apply. After all the changes are
1097
            applied the final inventory must be internally consistent, but it
1098
            is ok to supply changes which, if only half-applied would have an
1099
            invalid result - such as supplying two changes which rename two
1100
            files, 'A' and 'B' with each other : [('A', 'B', 'A-id', a_entry),
1101
            ('B', 'A', 'B-id', b_entry)].
1102
1103
            Each change is a tuple, of the form (old_path, new_path, file_id,
1104
            new_entry).
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1105
2865.1.1 by Robert Collins
Create new mutable tree method update_to_one_parent_via_delta for eventual use by commit.
1106
            When new_path is None, the change indicates the removal of an entry
1107
            from the inventory and new_entry will be ignored (using None is
1108
            appropriate). If new_path is not None, then new_entry must be an
1109
            InventoryEntry instance, which will be incorporated into the
1110
            inventory (and replace any existing entry with the same file id).
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1111
2865.1.1 by Robert Collins
Create new mutable tree method update_to_one_parent_via_delta for eventual use by commit.
1112
            When old_path is None, the change indicates the addition of
1113
            a new entry to the inventory.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1114
2865.1.1 by Robert Collins
Create new mutable tree method update_to_one_parent_via_delta for eventual use by commit.
1115
            When neither new_path nor old_path are None, the change is a
1116
            modification to an entry, such as a rename, reparent, kind change
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1117
            etc.
2865.1.1 by Robert Collins
Create new mutable tree method update_to_one_parent_via_delta for eventual use by commit.
1118
1119
            The children attribute of new_entry is ignored. This is because
2865.1.3 by Robert Collins
Review feedback.
1120
            this method preserves children automatically across alterations to
1121
            the parent of the children, and cases where the parent id of a
1122
            child is changing require the child to be passed in as a separate
1123
            change regardless. E.g. in the recursive deletion of a directory -
1124
            the directory's children must be included in the delta, or the
1125
            final inventory will be invalid.
4090.3.1 by Ian Clatworthy
check delta is legal in Inventory.apply_delta()
1126
1127
            Note that a file_id must only appear once within a given delta.
1128
            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.
1129
        """
4090.3.2 by Ian Clatworthy
review tweak from jam
1130
        # Check that the delta is legal. It would be nice if this could be
1131
        # done within the loops below but it's safer to validate the delta
1132
        # before starting to mutate the inventory.
1133
        unique_file_ids = set([f for _, _, f, _ in delta])
1134
        if len(unique_file_ids) != len(delta):
1135
            raise AssertionError("a file-id appears multiple times in %r"
1136
                    % (delta,))
1137
        del unique_file_ids
4090.3.1 by Ian Clatworthy
check delta is legal in Inventory.apply_delta()
1138
2865.1.1 by Robert Collins
Create new mutable tree method update_to_one_parent_via_delta for eventual use by commit.
1139
        children = {}
1140
        # Remove all affected items which were in the original inventory,
1141
        # starting with the longest paths, thus ensuring parents are examined
1142
        # after their children, which means that everything we examine has no
1143
        # modified children remaining by the time we examine it.
1144
        for old_path, file_id in sorted(((op, f) for op, np, f, e in delta
1145
                                        if op is not None), reverse=True):
1146
            if file_id not in self:
1147
                # adds come later
1148
                continue
1149
            # 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.
1150
            file_id_children = getattr(self[file_id], 'children', {})
1151
            if len(file_id_children):
1152
                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.
1153
            # Remove file_id and the unaltered children. If file_id is not
1154
            # being deleted it will be reinserted back later.
1155
            self.remove_recursive_id(file_id)
1156
        # Insert all affected which should be in the new inventory, reattaching
1157
        # their children if they had any. This is done from shortest path to
1158
        # longest, ensuring that items which were modified and whose parents in
1159
        # the resulting inventory were also modified, are inserted after their
1160
        # parents.
1161
        for new_path, new_entry in sorted((np, e) for op, np, f, e in
1162
                                          delta if np is not None):
1163
            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.
1164
                # Pop the child which to allow detection of children whose
1165
                # parents were deleted and which were not reattached to a new
1166
                # parent.
3735.2.46 by Robert Collins
Do not alter InventoryDirectory objects provided to Inventory.apply_delta.
1167
                replacement = InventoryDirectory(new_entry.file_id,
1168
                    new_entry.name, new_entry.parent_id)
1169
                replacement.revision = new_entry.revision
1170
                replacement.children = children.pop(replacement.file_id, {})
1171
                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.
1172
            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.
1173
        if len(children):
1174
            # Get the parent id that was deleted
1175
            parent_id, children = children.popitem()
1176
            raise errors.InconsistentDelta("<deleted>", parent_id,
1177
                "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.
1178
1910.2.3 by Aaron Bentley
All tests pass
1179
    def _set_root(self, ie):
1180
        self.root = ie
1907.1.2 by Aaron Bentley
More removal of unique-root stuff
1181
        self._byid = {self.root.file_id: self.root}
1 by mbp at sourcefrog
import from baz patch-364
1182
1189 by Martin Pool
- BROKEN: partial support for commit into weave
1183
    def copy(self):
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
1184
        # TODO: jam 20051218 Should copy also copy the revision_id?
1852.6.3 by Robert Collins
Make iter(Tree) consistent for all tree types.
1185
        entries = self.iter_entries()
2938.2.1 by Jelmer Vernooij
Handle empty inventories in Inventory.copy().
1186
        if self.root is None:
1187
            return Inventory(root_id=None)
1852.6.3 by Robert Collins
Make iter(Tree) consistent for all tree types.
1188
        other = Inventory(entries.next()[1].file_id)
3616.1.1 by Jelmer Vernooij
Fix copying of root revision in inventory.
1189
        other.root.revision = self.root.revision
1206 by Martin Pool
- fix bug in Inventory.copy()
1190
        # copy recursively so we know directories will be added before
1191
        # their children.  There are more efficient ways than this...
2935.2.1 by Jelmer Vernooij
Fix Inventory.copy() and add a test for it.
1192
        for path, entry in entries:
1189 by Martin Pool
- BROKEN: partial support for commit into weave
1193
            other.add(entry.copy())
1194
        return other
1195
4244.2.1 by Vincent Ladeuil
inv._get_mutable_inventory() - prepare for CHKInventory
1196
    def _get_mutable_inventory(self):
4241.6.5 by Robert Collins, John Arbash Meinel
CHKInventory support from brisbane-core.
1197
        """See CommonInventory._get_mutable_inventory."""
1198
        return deepcopy(self)
1199
1 by mbp at sourcefrog
import from baz patch-364
1200
    def __iter__(self):
3735.2.118 by Ian Clatworthy
only apply the parent_id_basename delta if there is one
1201
        """Iterate over all file-ids."""
1 by mbp at sourcefrog
import from baz patch-364
1202
        return iter(self._byid)
1203
3735.2.155 by Ian Clatworthy
Inventory.iter_just_entries() API & test
1204
    def iter_just_entries(self):
1205
        """Iterate over all entries.
1206
        
1207
        Unlike iter_entries(), just the entries are returned (not (path, ie))
1208
        and the order of entries is undefined.
1209
1210
        XXX: We may not want to merge this into bzr.dev.
1211
        """
1212
        if self.root is None:
1213
            return
1214
        for _, ie in self._byid.iteritems():
1215
            yield ie
1216
1 by mbp at sourcefrog
import from baz patch-364
1217
    def __len__(self):
1218
        """Returns number of entries."""
1219
        return len(self._byid)
1220
1221
    def __getitem__(self, file_id):
1222
        """Return the entry for given file_id.
1223
1224
        >>> inv = Inventory()
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
1225
        >>> inv.add(InventoryFile('123123', 'hello.c', ROOT_ID))
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1226
        InventoryFile('123123', 'hello.c', parent_id='TREE_ROOT', sha1=None, len=None, revision=None)
1 by mbp at sourcefrog
import from baz patch-364
1227
        >>> inv['123123'].name
1228
        'hello.c'
1229
        """
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
1230
        try:
1231
            return self._byid[file_id]
1232
        except KeyError:
2067.3.1 by Martin Pool
Clean up BzrNewError, other exception classes and users.
1233
            # really we're passing an inventory, not a tree...
1234
            raise errors.NoSuchId(self, file_id)
1 by mbp at sourcefrog
import from baz patch-364
1235
460 by Martin Pool
- new testing command compare-trees
1236
    def get_file_kind(self, file_id):
1237
        return self._byid[file_id].kind
1238
138 by mbp at sourcefrog
remove parallel tree from inventory;
1239
    def get_child(self, parent_id, filename):
1732.1.18 by John Arbash Meinel
50ms is probably not worth it
1240
        return self[parent_id].children.get(filename)
138 by mbp at sourcefrog
remove parallel tree from inventory;
1241
2100.3.6 by Aaron Bentley
Make add recursive for children of added entries
1242
    def _add_child(self, entry):
1243
        """Add an entry to the inventory, without adding it to its parent"""
1244
        if entry.file_id in self._byid:
1245
            raise BzrError("inventory already contains entry with id {%s}" %
1246
                           entry.file_id)
1247
        self._byid[entry.file_id] = entry
1248
        for child in getattr(entry, 'children', {}).itervalues():
1249
            self._add_child(child)
1250
        return entry
1251
1 by mbp at sourcefrog
import from baz patch-364
1252
    def add(self, entry):
1253
        """Add entry to inventory.
1254
1255
        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
1256
        which calls this.
1257
1258
        Returns the new entry object.
1259
        """
139 by mbp at sourcefrog
simplified/faster Inventory.add
1260
        if entry.file_id in self._byid:
2255.7.16 by John Arbash Meinel
Make sure adding a duplicate file_id raises DuplicateFileId.
1261
            raise errors.DuplicateFileId(entry.file_id,
1262
                                         self._byid[entry.file_id])
1 by mbp at sourcefrog
import from baz patch-364
1263
1731.1.33 by Aaron Bentley
Revert no-special-root changes
1264
        if entry.parent_id is None:
2100.3.6 by Aaron Bentley
Make add recursive for children of added entries
1265
            self.root = entry
1266
        else:
1267
            try:
1268
                parent = self._byid[entry.parent_id]
1269
            except KeyError:
1270
                raise BzrError("parent_id {%s} not in inventory" %
1271
                               entry.parent_id)
1272
1273
            if entry.name in parent.children:
1274
                raise BzrError("%s is already versioned" %
1275
                        osutils.pathjoin(self.id2path(parent.file_id),
1551.13.12 by Aaron Bentley
Fix encoding of 'already versioned' error
1276
                        entry.name).encode('utf-8'))
2100.3.6 by Aaron Bentley
Make add recursive for children of added entries
1277
            parent.children[entry.name] = entry
1278
        return self._add_child(entry)
1 by mbp at sourcefrog
import from baz patch-364
1279
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)
1280
    def add_path(self, relpath, kind, file_id=None, parent_id=None):
70 by mbp at sourcefrog
Prepare for smart recursive add.
1281
        """Add entry from a path.
1282
1180 by Martin Pool
- start splitting code for xml (de)serialization away from objects
1283
        The immediate parent must already be versioned.
1284
1285
        Returns the new entry object."""
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1286
1830.3.5 by John Arbash Meinel
make_entry refuses to create non-normalized entries.
1287
        parts = osutils.splitpath(relpath)
70 by mbp at sourcefrog
Prepare for smart recursive add.
1288
1534.7.69 by Aaron Bentley
Got real root moves working
1289
        if len(parts) == 0:
1713.1.6 by Robert Collins
Move file id random data selection out of the inner loop for 'bzr add'.
1290
            if file_id is None:
2116.4.1 by John Arbash Meinel
Update file and revision id generators.
1291
                file_id = generate_ids.gen_root_id()
1731.1.1 by Aaron Bentley
Make root entry an InventoryDirectory, make EmptyTree really empty
1292
            self.root = InventoryDirectory(file_id, '', None)
1534.7.69 by Aaron Bentley
Got real root moves working
1293
            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.
1294
            return self.root
1534.7.69 by Aaron Bentley
Got real root moves working
1295
        else:
1296
            parent_path = parts[:-1]
1297
            parent_id = self.path2id(parent_path)
1753.1.4 by Robert Collins
Fixup '== None' usage in inventory.py.
1298
            if parent_id is None:
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
1299
                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)
1300
        ie = make_entry(kind, parts[-1], parent_id, file_id)
70 by mbp at sourcefrog
Prepare for smart recursive add.
1301
        return self.add(ie)
1302
1 by mbp at sourcefrog
import from baz patch-364
1303
    def __delitem__(self, file_id):
1304
        """Remove entry by id.
1305
1306
        >>> inv = Inventory()
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
1307
        >>> inv.add(InventoryFile('123', 'foo.c', ROOT_ID))
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1308
        InventoryFile('123', 'foo.c', parent_id='TREE_ROOT', sha1=None, len=None, revision=None)
1 by mbp at sourcefrog
import from baz patch-364
1309
        >>> '123' in inv
1310
        True
1311
        >>> del inv['123']
1312
        >>> '123' in inv
1313
        False
1314
        """
1315
        ie = self[file_id]
1316
        del self._byid[file_id]
1534.7.69 by Aaron Bentley
Got real root moves working
1317
        if ie.parent_id is not None:
1318
            del self[ie.parent_id].children[ie.name]
1 by mbp at sourcefrog
import from baz patch-364
1319
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
1320
    def __eq__(self, other):
1 by mbp at sourcefrog
import from baz patch-364
1321
        """Compare two sets by comparing their contents.
1322
1323
        >>> i1 = Inventory()
1324
        >>> i2 = Inventory()
1325
        >>> i1 == i2
1326
        True
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
1327
        >>> i1.add(InventoryFile('123', 'foo', ROOT_ID))
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1328
        InventoryFile('123', 'foo', parent_id='TREE_ROOT', sha1=None, len=None, revision=None)
1 by mbp at sourcefrog
import from baz patch-364
1329
        >>> i1 == i2
1330
        False
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
1331
        >>> i2.add(InventoryFile('123', 'foo', ROOT_ID))
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1332
        InventoryFile('123', 'foo', parent_id='TREE_ROOT', sha1=None, len=None, revision=None)
1 by mbp at sourcefrog
import from baz patch-364
1333
        >>> i1 == i2
1334
        True
1335
        """
1336
        if not isinstance(other, Inventory):
1337
            return NotImplemented
1338
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
1339
        return self._byid == other._byid
1340
1341
    def __ne__(self, other):
1249 by Martin Pool
- improvements to weave commit [broken]
1342
        return not self.__eq__(other)
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
1343
1344
    def __hash__(self):
1345
        raise ValueError('not hashable')
1346
1596.2.19 by Robert Collins
Shave 20% off id2path.
1347
    def _iter_file_id_parents(self, file_id):
1348
        """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.
1349
        while file_id is not None:
1596.2.19 by Robert Collins
Shave 20% off id2path.
1350
            try:
1351
                ie = self._byid[file_id]
1352
            except KeyError:
2255.11.5 by Martin Pool
Tree.id2path should raise NoSuchId, not return None.
1353
                raise errors.NoSuchId(tree=None, file_id=file_id)
1596.2.19 by Robert Collins
Shave 20% off id2path.
1354
            yield ie
1355
            file_id = ie.parent_id
1 by mbp at sourcefrog
import from baz patch-364
1356
4277.2.1 by Vincent Ladeuil
Fix misleading signature and one typo.
1357
    def has_filename(self, filename):
1358
        return bool(self.path2id(filename))
1 by mbp at sourcefrog
import from baz patch-364
1359
1360
    def has_id(self, file_id):
1711.9.11 by John Arbash Meinel
change return foo in bar to return (foo in bar)
1361
        return (file_id in self._byid)
1 by mbp at sourcefrog
import from baz patch-364
1362
3879.2.6 by John Arbash Meinel
Bring in Inventory._make_delta
1363
    def _make_delta(self, old):
1364
        """Make an inventory delta from two inventories."""
3882.6.18 by John Arbash Meinel
Bring in optimizations to Inventory._make_delta.
1365
        old_getter = getattr(old, '_byid', old)
1366
        new_getter = self._byid
1367
        old_ids = set(old_getter)
1368
        new_ids = set(new_getter)
3879.2.6 by John Arbash Meinel
Bring in Inventory._make_delta
1369
        adds = new_ids - old_ids
1370
        deletes = old_ids - new_ids
3882.6.18 by John Arbash Meinel
Bring in optimizations to Inventory._make_delta.
1371
        if not adds and not deletes:
1372
            common = new_ids
1373
        else:
1374
            common = old_ids.intersection(new_ids)
3879.2.6 by John Arbash Meinel
Bring in Inventory._make_delta
1375
        delta = []
1376
        for file_id in deletes:
1377
            delta.append((old.id2path(file_id), None, file_id, None))
1378
        for file_id in adds:
1379
            delta.append((None, self.id2path(file_id), file_id, self[file_id]))
1380
        for file_id in common:
3882.6.18 by John Arbash Meinel
Bring in optimizations to Inventory._make_delta.
1381
            new_ie = new_getter[file_id]
1382
            old_ie = old_getter[file_id]
1383
            # If xml_serializer returns the cached InventoryEntries (rather
1384
            # than always doing .copy()), inlining the 'is' check saves 2.7M
1385
            # calls to __eq__.  Under lsprof this saves 20s => 6s.
1386
            # It is a minor improvement without lsprof.
1387
            if old_ie is new_ie or old_ie == new_ie:
1388
                continue
1389
            else:
3879.2.6 by John Arbash Meinel
Bring in Inventory._make_delta
1390
                delta.append((old.id2path(file_id), self.id2path(file_id),
3882.6.18 by John Arbash Meinel
Bring in optimizations to Inventory._make_delta.
1391
                              file_id, new_ie))
3879.2.6 by John Arbash Meinel
Bring in Inventory._make_delta
1392
        return delta
1393
1988.2.6 by Robert Collins
Review feedback.
1394
    def remove_recursive_id(self, file_id):
1395
        """Remove file_id, and children, from the inventory.
3879.2.6 by John Arbash Meinel
Bring in Inventory._make_delta
1396
1988.2.6 by Robert Collins
Review feedback.
1397
        :param file_id: A file_id to remove.
1398
        """
1988.2.1 by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of
1399
        to_find_delete = [self._byid[file_id]]
1400
        to_delete = []
1988.2.6 by Robert Collins
Review feedback.
1401
        while to_find_delete:
1988.2.1 by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of
1402
            ie = to_find_delete.pop()
1403
            to_delete.append(ie.file_id)
1404
            if ie.kind == 'directory':
1405
                to_find_delete.extend(ie.children.values())
1406
        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.
1407
            ie = self[file_id]
1988.2.1 by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of
1408
            del self._byid[file_id]
1731.2.16 by Aaron Bentley
Get extract working for standalone trees
1409
        if ie.parent_id is not None:
1410
            del self[ie.parent_id].children[ie.name]
2376.2.3 by Aaron Bentley
Fix root replacement for apply_inventory_delta
1411
        else:
1412
            self.root = None
1988.2.1 by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of
1413
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
1414
    def rename(self, file_id, new_parent_id, new_name):
1415
        """Move a file within the inventory.
1416
1417
        This can change either the name, or the parent, or both.
1418
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
1419
        This does not move the working file.
1420
        """
2825.6.1 by Robert Collins
* ``WorkingTree.rename_one`` will now raise an error if normalisation of the
1421
        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
1422
        if not is_valid_name(new_name):
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
1423
            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
1424
1425
        new_parent = self._byid[new_parent_id]
1426
        if new_name in new_parent.children:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
1427
            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
1428
172 by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory
1429
        new_parent_idpath = self.get_idpath(new_parent_id)
1430
        if file_id in new_parent_idpath:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
1431
            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
1432
                    % (self.id2path(file_id), self.id2path(new_parent_id)))
1433
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
1434
        file_ie = self._byid[file_id]
1435
        old_parent = self._byid[file_ie.parent_id]
1436
1437
        # TODO: Don't leave things messed up if this fails
1438
1439
        del old_parent.children[file_ie.name]
1440
        new_parent.children[new_name] = file_ie
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1441
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
1442
        file_ie.name = new_name
1443
        file_ie.parent_id = new_parent_id
1444
1731.1.1 by Aaron Bentley
Make root entry an InventoryDirectory, make EmptyTree really empty
1445
    def is_root(self, file_id):
1446
        return self.root is not None and file_id == self.root.file_id
1447
4241.6.5 by Robert Collins, John Arbash Meinel
CHKInventory support from brisbane-core.
1448
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1449
class CHKInventory(CommonInventory):
3735.20.3 by Ian Clatworthy
improve CHKInventory docstring
1450
    """An inventory persisted in a CHK store.
1451
1452
    By design, a CHKInventory is immutable so many of the methods
1453
    supported by Inventory - add, rename, apply_delta, etc - are *not*
1454
    supported. To create a new CHKInventory, use create_by_apply_delta()
1455
    or from_inventory(), say.
1456
1457
    Internally, a CHKInventory has one or two CHKMaps:
1458
1459
    * id_to_entry - a map from (file_id,) => InventoryEntry as bytes
1460
    * parent_id_basename_to_file_id - a map from (parent_id, basename_utf8)
1461
        => file_id as bytes
1462
1463
    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
1464
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1465
    No caching is performed: every method call or item access will perform
3735.20.3 by Ian Clatworthy
improve CHKInventory docstring
1466
    requests to the storage layer. As such, keep references to objects you
1467
    want to reuse.
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1468
    """
1469
3735.16.7 by John Arbash Meinel
Start parameterizing CHKInventory and CHKSerializer so that we can
1470
    def __init__(self, search_key_name):
3735.10.1 by Robert Collins
Create an __init__ for CHKInventory to ensure mandatory attributes are set.
1471
        CommonInventory.__init__(self)
3735.2.119 by Ian Clatworthy
add a cache for CHKInventory.path2id()
1472
        self._fileid_to_entry_cache = {}
1473
        self._path_to_fileid_cache = {}
3735.16.7 by John Arbash Meinel
Start parameterizing CHKInventory and CHKSerializer so that we can
1474
        self._search_key_name = search_key_name
3735.10.1 by Robert Collins
Create an __init__ for CHKInventory to ensure mandatory attributes are set.
1475
4413.5.14 by John Arbash Meinel
The new add_inventory_by_delta is returning a CHKInventory when mapping from NULL
1476
    def __eq__(self, other):
1477
        """Compare two sets by comparing their contents."""
1478
        if not isinstance(other, CHKInventory):
1479
            return NotImplemented
1480
1481
        this_key = self.id_to_entry.key()
1482
        other_key = other.id_to_entry.key()
1483
        this_pid_key = self.parent_id_basename_to_file_id.key()
1484
        other_pid_key = other.parent_id_basename_to_file_id.key()
1485
        if None in (this_key, this_pid_key, other_key, other_pid_key):
1486
            return False
1487
        return this_key == other_key and this_pid_key == other_pid_key
1488
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1489
    def _entry_to_bytes(self, entry):
1490
        """Serialise entry as a single bytestring.
1491
1492
        :param Entry: An inventory entry.
1493
        :return: A bytestring for the entry.
3735.2.99 by John Arbash Meinel
Merge bzr.dev 4034. Whitespace cleanup
1494
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1495
        The BNF:
1496
        ENTRY ::= FILE | DIR | SYMLINK | TREE
3735.20.4 by Ian Clatworthy
correct _entry_to_bytes() docstring
1497
        FILE ::= "file: " COMMON SEP SHA SEP SIZE SEP EXECUTABLE
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1498
        DIR ::= "dir: " COMMON
3735.20.4 by Ian Clatworthy
correct _entry_to_bytes() docstring
1499
        SYMLINK ::= "symlink: " COMMON SEP TARGET_UTF8
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1500
        TREE ::= "tree: " COMMON REFERENCE_REVISION
3735.20.4 by Ian Clatworthy
correct _entry_to_bytes() docstring
1501
        COMMON ::= FILE_ID SEP PARENT_ID SEP NAME_UTF8 SEP REVISION
1502
        SEP ::= "\n"
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1503
        """
1504
        if entry.parent_id is not None:
1505
            parent_str = entry.parent_id
1506
        else:
1507
            parent_str = ''
1508
        name_str = entry.name.encode("utf8")
1509
        if entry.kind == 'file':
1510
            if entry.executable:
1511
                exec_str = "Y"
1512
            else:
1513
                exec_str = "N"
3735.17.11 by John Arbash Meinel
Actually format the inventories using line-based separation.
1514
            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.
1515
                entry.file_id, parent_str, name_str, entry.revision,
1516
                entry.text_sha1, entry.text_size, exec_str)
1517
        elif entry.kind == 'directory':
3735.17.11 by John Arbash Meinel
Actually format the inventories using line-based separation.
1518
            return "dir: %s\n%s\n%s\n%s" % (
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1519
                entry.file_id, parent_str, name_str, entry.revision)
1520
        elif entry.kind == 'symlink':
3735.17.11 by John Arbash Meinel
Actually format the inventories using line-based separation.
1521
            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.
1522
                entry.file_id, parent_str, name_str, entry.revision,
1523
                entry.symlink_target.encode("utf8"))
1524
        elif entry.kind == 'tree-reference':
3735.17.11 by John Arbash Meinel
Actually format the inventories using line-based separation.
1525
            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.
1526
                entry.file_id, parent_str, name_str, entry.revision,
1527
                entry.reference_revision)
1528
        else:
1529
            raise ValueError("unknown kind %r" % entry.kind)
1530
3735.36.12 by John Arbash Meinel
Add some direct tests for CHKInventory._entry_to_bytes
1531
    @staticmethod
1532
    def _bytes_to_utf8name_key(bytes):
1533
        """Get the file_id, revision_id key out of bytes."""
1534
        # We don't normally care about name, except for times when we want
1535
        # to filter out empty names because of non rich-root...
1536
        sections = bytes.split('\n')
1537
        kind, file_id = sections[0].split(': ')
1538
        return (sections[2], file_id, sections[3])
1539
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1540
    def _bytes_to_entry(self, bytes):
1541
        """Deserialise a serialised entry."""
3735.17.11 by John Arbash Meinel
Actually format the inventories using line-based separation.
1542
        sections = bytes.split('\n')
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1543
        if sections[0].startswith("file: "):
1544
            result = InventoryFile(sections[0][6:],
1545
                sections[2].decode('utf8'),
1546
                sections[1])
1547
            result.text_sha1 = sections[4]
1548
            result.text_size = int(sections[5])
1549
            result.executable = sections[6] == "Y"
1550
        elif sections[0].startswith("dir: "):
1551
            result = CHKInventoryDirectory(sections[0][5:],
1552
                sections[2].decode('utf8'),
1553
                sections[1], self)
1554
        elif sections[0].startswith("symlink: "):
1555
            result = InventoryLink(sections[0][9:],
1556
                sections[2].decode('utf8'),
1557
                sections[1])
3735.36.12 by John Arbash Meinel
Add some direct tests for CHKInventory._entry_to_bytes
1558
            result.symlink_target = sections[4].decode('utf8')
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1559
        elif sections[0].startswith("tree: "):
1560
            result = TreeReference(sections[0][6:],
1561
                sections[2].decode('utf8'),
1562
                sections[1])
1563
            result.reference_revision = sections[4]
1564
        else:
1565
            raise ValueError("Not a serialised entry %r" % bytes)
1566
        result.revision = sections[3]
1567
        if result.parent_id == '':
1568
            result.parent_id = None
3735.2.119 by Ian Clatworthy
add a cache for CHKInventory.path2id()
1569
        self._fileid_to_entry_cache[result.file_id] = result
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1570
        return result
1571
4241.6.5 by Robert Collins, John Arbash Meinel
CHKInventory support from brisbane-core.
1572
    def _get_mutable_inventory(self):
1573
        """See CommonInventory._get_mutable_inventory."""
1574
        entries = self.iter_entries()
4343.3.23 by John Arbash Meinel
Change RepositoryCHK1.fileids_altered_by to handle ghosts the way XML does.
1575
        inv = Inventory(None, self.revision_id)
3735.20.1 by Ian Clatworthy
fix bug in get_mutable_inventory
1576
        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.
1577
            inv.add(inv_entry.copy())
4241.6.5 by Robert Collins, John Arbash Meinel
CHKInventory support from brisbane-core.
1578
        return inv
1579
3735.2.121 by Ian Clatworthy
add propagate_caches param to create_by_apply_delta, making fast-import 30% faster
1580
    def create_by_apply_delta(self, inventory_delta, new_revision_id,
1581
        propagate_caches=False):
3735.2.10 by Robert Collins
Teach CHKInventory how to make a new inventory from an inventory delta.
1582
        """Create a new CHKInventory by applying inventory_delta to this one.
1583
4501.1.1 by Robert Collins
Add documentation describing how and why we use inventory deltas, and what can go wrong with them.
1584
        See the inventory developers documentation for the theory behind
1585
        inventory deltas.
1586
3735.2.10 by Robert Collins
Teach CHKInventory how to make a new inventory from an inventory delta.
1587
        :param inventory_delta: The inventory delta to apply. See
1588
            Inventory.apply_delta for details.
1589
        :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
1590
        :param propagate_caches: If True, the caches for this inventory are
1591
          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.
1592
        :return: The new CHKInventory.
1593
        """
3735.16.7 by John Arbash Meinel
Start parameterizing CHKInventory and CHKSerializer so that we can
1594
        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
1595
        if propagate_caches:
1596
            # Just propagate the path-to-fileid cache for now
1597
            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
1598
        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()
1599
        self.id_to_entry._ensure_root()
1600
        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.
1601
        result.revision_id = new_revision_id
3735.2.41 by Robert Collins
Make the parent_id_basename index be updated during CHKInventory.apply_delta.
1602
        result.id_to_entry = chk_map.CHKMap(
1603
            self.id_to_entry._store,
3735.20.2 by Ian Clatworthy
fix root key handling in create_by_apply_delta()
1604
            self.id_to_entry.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.id_to_entry._ensure_root()
1607
        result.id_to_entry._root_node.set_maximum_size(maximum_size)
3735.2.129 by Andrew Bennetts
Fix some trivial test failures.
1608
        parent_id_basename_delta = []
3735.2.41 by Robert Collins
Make the parent_id_basename index be updated during CHKInventory.apply_delta.
1609
        if self.parent_id_basename_to_file_id is not None:
1610
            result.parent_id_basename_to_file_id = chk_map.CHKMap(
1611
                self.parent_id_basename_to_file_id._store,
3735.20.2 by Ian Clatworthy
fix root key handling in create_by_apply_delta()
1612
                self.parent_id_basename_to_file_id.key(),
3735.16.7 by John Arbash Meinel
Start parameterizing CHKInventory and CHKSerializer so that we can
1613
                search_key_func=search_key_func)
3735.20.8 by Ian Clatworthy
fix max size & key width propagation in create_by_apply_delta()
1614
            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.
1615
            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
1616
            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.
1617
            p_id_root = self.parent_id_basename_to_file_id._root_node
1618
            result_p_id_root.set_maximum_size(p_id_root.maximum_size)
1619
            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.
1620
        else:
1621
            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.
1622
        result.root_id = self.root_id
1623
        id_to_entry_delta = []
1624
        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.
1625
            # file id changes
3735.2.10 by Robert Collins
Teach CHKInventory how to make a new inventory from an inventory delta.
1626
            if new_path == '':
1627
                result.root_id = file_id
1628
            if new_path is None:
1629
                # Make a delete:
1630
                new_key = None
1631
                new_value = None
3735.2.121 by Ian Clatworthy
add propagate_caches param to create_by_apply_delta, making fast-import 30% faster
1632
                # Update caches
1633
                if propagate_caches:
1634
                    try:
1635
                        del result._path_to_fileid_cache[old_path]
1636
                    except KeyError:
1637
                        pass
3735.2.10 by Robert Collins
Teach CHKInventory how to make a new inventory from an inventory delta.
1638
            else:
3735.2.25 by Robert Collins
CHKInventory core tests passing.
1639
                new_key = (file_id,)
3735.2.10 by Robert Collins
Teach CHKInventory how to make a new inventory from an inventory delta.
1640
                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
1641
                # Update caches. It's worth doing this whether
1642
                # we're propagating the old caches or not.
3735.2.119 by Ian Clatworthy
add a cache for CHKInventory.path2id()
1643
                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.
1644
            if old_path is None:
1645
                old_key = None
1646
            else:
3735.2.25 by Robert Collins
CHKInventory core tests passing.
1647
                old_key = (file_id,)
3735.2.10 by Robert Collins
Teach CHKInventory how to make a new inventory from an inventory delta.
1648
            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.
1649
            if result.parent_id_basename_to_file_id is not None:
1650
                # parent_id, basename changes
1651
                if old_path is None:
1652
                    old_key = None
1653
                else:
1654
                    old_entry = self[file_id]
1655
                    old_key = self._parent_id_basename_key(old_entry)
1656
                if new_path is None:
1657
                    new_key = None
1658
                    new_value = None
1659
                else:
1660
                    new_key = self._parent_id_basename_key(entry)
1661
                    new_value = file_id
1662
                if old_key != new_key:
1663
                    # If the two keys are the same, the value will be unchanged
1664
                    # as its always the file id.
1665
                    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.
1666
        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
1667
        if parent_id_basename_delta:
3735.2.41 by Robert Collins
Make the parent_id_basename index be updated during CHKInventory.apply_delta.
1668
            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.
1669
        return result
1670
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1671
    @classmethod
1672
    def deserialise(klass, chk_store, bytes, expected_revision_id):
1673
        """Deserialise a CHKInventory.
1674
1675
        :param chk_store: A CHK capable VersionedFiles instance.
1676
        :param bytes: The serialised bytes.
1677
        :param expected_revision_id: The revision ID we think this inventory is
1678
            for.
1679
        :return: A CHKInventory
1680
        """
3735.24.1 by John Arbash Meinel
Change how the ordering of the inventory metablock is written.
1681
        lines = bytes.split('\n')
4241.6.5 by Robert Collins, John Arbash Meinel
CHKInventory support from brisbane-core.
1682
        if lines[-1] != '':
1683
            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.
1684
        lines.pop()
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1685
        if lines[0] != 'chkinventory:':
1686
            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.
1687
        info = {}
3735.24.2 by John Arbash Meinel
Add a bit more strictness to the formatting, update the test case.
1688
        allowed_keys = frozenset(['root_id', 'revision_id', 'search_key_name',
1689
                                  'parent_id_basename_to_file_id',
1690
                                  'id_to_entry'])
3735.24.1 by John Arbash Meinel
Change how the ordering of the inventory metablock is written.
1691
        for line in lines[1:]:
1692
            key, value = line.split(': ', 1)
3735.24.2 by John Arbash Meinel
Add a bit more strictness to the formatting, update the test case.
1693
            if key not in allowed_keys:
1694
                raise errors.BzrError('Unknown key in inventory: %r\n%r'
1695
                                      % (key, bytes))
1696
            if key in info:
1697
                raise errors.BzrError('Duplicate key in inventory: %r\n%r'
1698
                                      % (key, bytes))
3735.24.1 by John Arbash Meinel
Change how the ordering of the inventory metablock is written.
1699
            info[key] = value
1700
        revision_id = info['revision_id']
1701
        root_id = info['root_id']
1702
        search_key_name = info.get('search_key_name', 'plain')
1703
        parent_id_basename_to_file_id = info.get(
1704
            'parent_id_basename_to_file_id', None)
1705
        id_to_entry = info['id_to_entry']
1706
3735.16.7 by John Arbash Meinel
Start parameterizing CHKInventory and CHKSerializer so that we can
1707
        result = CHKInventory(search_key_name)
1708
        result.revision_id = revision_id
1709
        result.root_id = root_id
1710
        search_key_func = chk_map.search_key_registry.get(
1711
                            result._search_key_name)
3735.24.1 by John Arbash Meinel
Change how the ordering of the inventory metablock is written.
1712
        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
1713
            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.
1714
                chk_store, (parent_id_basename_to_file_id,),
3735.16.7 by John Arbash Meinel
Start parameterizing CHKInventory and CHKSerializer so that we can
1715
                search_key_func=search_key_func)
1716
        else:
3735.2.41 by Robert Collins
Make the parent_id_basename index be updated during CHKInventory.apply_delta.
1717
            result.parent_id_basename_to_file_id = None
3735.16.7 by John Arbash Meinel
Start parameterizing CHKInventory and CHKSerializer so that we can
1718
3735.24.1 by John Arbash Meinel
Change how the ordering of the inventory metablock is written.
1719
        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
1720
                                            search_key_func=search_key_func)
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1721
        if (result.revision_id,) != expected_revision_id:
1722
            raise ValueError("Mismatched revision id and expected: %r, %r" %
1723
                (result.revision_id, expected_revision_id))
1724
        return result
1725
1726
    @classmethod
3735.2.132 by John Arbash Meinel
Remove references to parent_id_basename_index, now that we know we want it.
1727
    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.
1728
        """Create a CHKInventory from an existing inventory.
1729
1730
        The content of inventory is copied into the chk_store, and a
1731
        CHKInventory referencing that is returned.
1732
1733
        :param chk_store: A CHK capable VersionedFiles instance.
1734
        :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.
1735
        :param maximum_size: The CHKMap node size limit.
3735.16.7 by John Arbash Meinel
Start parameterizing CHKInventory and CHKSerializer so that we can
1736
        :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.
1737
        """
4413.5.11 by John Arbash Meinel
Pull out the common 'populate this CHKInventory' code out into a helper
1738
        result = klass(search_key_name)
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1739
        result.revision_id = inventory.revision_id
1740
        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.
1741
1742
        entry_to_bytes = result._entry_to_bytes
1743
        parent_id_basename_key = result._parent_id_basename_key
1744
        id_to_entry_dict = {}
1745
        parent_id_basename_dict = {}
1746
        for path, entry in inventory.iter_entries():
1747
            id_to_entry_dict[(entry.file_id,)] = entry_to_bytes(entry)
1748
            p_id_key = parent_id_basename_key(entry)
1749
            parent_id_basename_dict[p_id_key] = entry.file_id
1750
4413.5.11 by John Arbash Meinel
Pull out the common 'populate this CHKInventory' code out into a helper
1751
        result._populate_from_dicts(chk_store, id_to_entry_dict,
1752
            parent_id_basename_dict, maximum_size=maximum_size)
1753
        return result
1754
1755
    def _populate_from_dicts(self, chk_store, id_to_entry_dict,
1756
                             parent_id_basename_dict, maximum_size):
1757
        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.
1758
        root_key = chk_map.CHKMap.from_dict(chk_store, id_to_entry_dict,
1759
                   maximum_size=maximum_size, key_width=1,
1760
                   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
1761
        self.id_to_entry = chk_map.CHKMap(chk_store, root_key,
1762
                                          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.
1763
        root_key = chk_map.CHKMap.from_dict(chk_store,
1764
                   parent_id_basename_dict,
1765
                   maximum_size=maximum_size, key_width=2,
1766
                   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
1767
        self.parent_id_basename_to_file_id = chk_map.CHKMap(chk_store,
1768
                                                    root_key, search_key_func)
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1769
3735.2.41 by Robert Collins
Make the parent_id_basename index be updated during CHKInventory.apply_delta.
1770
    def _parent_id_basename_key(self, entry):
1771
        """Create a key for a entry in a parent_id_basename_to_file_id index."""
1772
        if entry.parent_id is not None:
1773
            parent_id = entry.parent_id
1774
        else:
1775
            parent_id = ''
1776
        return parent_id, entry.name.encode('utf8')
1777
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1778
    def __getitem__(self, file_id):
1779
        """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
1780
        if file_id is None:
1781
            raise errors.NoSuchId(self, file_id)
3735.2.119 by Ian Clatworthy
add a cache for CHKInventory.path2id()
1782
        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.
1783
        if result is not None:
1784
            return result
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1785
        try:
1786
            return self._bytes_to_entry(
3735.2.25 by Robert Collins
CHKInventory core tests passing.
1787
                self.id_to_entry.iteritems([(file_id,)]).next()[1])
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1788
        except StopIteration:
3735.2.53 by Robert Collins
Support Inventory.__getitem__ more consistently.
1789
            # really we're passing an inventory, not a tree...
1790
            raise errors.NoSuchId(self, file_id)
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1791
1792
    def has_id(self, file_id):
1793
        # Perhaps have an explicit 'contains' method on CHKMap ?
3735.2.119 by Ian Clatworthy
add a cache for CHKInventory.path2id()
1794
        if self._fileid_to_entry_cache.get(file_id, None) is not None:
3735.20.5 by Ian Clatworthy
more efficient CHKInventory.has_id()
1795
            return True
3735.2.25 by Robert Collins
CHKInventory core tests passing.
1796
        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.
1797
3735.2.49 by Robert Collins
Support is_root on CHKInventory objects.
1798
    def is_root(self, file_id):
1799
        return file_id == self.root_id
1800
3735.2.12 by Robert Collins
Implement commit-via-deltas for split inventory repositories.
1801
    def _iter_file_id_parents(self, file_id):
1802
        """Yield the parents of file_id up to the root."""
1803
        while file_id is not None:
4137.3.1 by Ian Clatworthy
Inventory.filter() API with tests
1804
            try:
3735.2.12 by Robert Collins
Implement commit-via-deltas for split inventory repositories.
1805
                ie = self[file_id]
1806
            except KeyError:
3735.2.34 by Robert Collins
Mega-hack; hook in a nasty iter_changes based on CHKInventory.
1807
                raise errors.NoSuchId(tree=self, file_id=file_id)
3735.2.12 by Robert Collins
Implement commit-via-deltas for split inventory repositories.
1808
            yield ie
1809
            file_id = ie.parent_id
1810
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1811
    def __iter__(self):
3735.2.118 by Ian Clatworthy
only apply the parent_id_basename delta if there is one
1812
        """Iterate over all file-ids."""
3735.2.25 by Robert Collins
CHKInventory core tests passing.
1813
        for key, _ in self.id_to_entry.iteritems():
1814
            yield key[-1]
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1815
3735.2.155 by Ian Clatworthy
Inventory.iter_just_entries() API & test
1816
    def iter_just_entries(self):
1817
        """Iterate over all entries.
1818
        
1819
        Unlike iter_entries(), just the entries are returned (not (path, ie))
1820
        and the order of entries is undefined.
1821
1822
        XXX: We may not want to merge this into bzr.dev.
1823
        """
1824
        for key, entry in self.id_to_entry.iteritems():
1825
            file_id = key[0]
3735.2.165 by Ian Clatworthy
fix iter_just_entries() in CHKInventories
1826
            ie = self._fileid_to_entry_cache.get(file_id, None)
3735.2.155 by Ian Clatworthy
Inventory.iter_just_entries() API & test
1827
            if ie is None:
1828
                ie = self._bytes_to_entry(entry)
3735.2.165 by Ian Clatworthy
fix iter_just_entries() in CHKInventories
1829
                self._fileid_to_entry_cache[file_id] = ie
3735.2.155 by Ian Clatworthy
Inventory.iter_just_entries() API & test
1830
            yield ie
1831
4241.6.5 by Robert Collins, John Arbash Meinel
CHKInventory support from brisbane-core.
1832
    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.
1833
        """Generate a Tree.iter_changes change list between this and basis.
1834
1835
        :param basis: Another CHKInventory.
1836
        :return: An iterator over the changes between self and basis, as per
1837
            tree.iter_changes().
1838
        """
1839
        # We want: (file_id, (path_in_source, path_in_target),
1840
        # changed_content, versioned, parent, name, kind,
1841
        # executable)
1842
        for key, basis_value, self_value in \
1843
            self.id_to_entry.iter_changes(basis.id_to_entry):
1844
            file_id = key[0]
1845
            if basis_value is not None:
1846
                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.
1847
                path_in_source = basis.id2path(file_id)
1848
                basis_parent = basis_entry.parent_id
1849
                basis_name = basis_entry.name
1850
                basis_executable = basis_entry.executable
1851
            else:
1852
                path_in_source = None
1853
                basis_parent = None
1854
                basis_name = None
1855
                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.
1856
            if self_value is not None:
1857
                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.
1858
                path_in_target = self.id2path(file_id)
1859
                self_parent = self_entry.parent_id
1860
                self_name = self_entry.name
1861
                self_executable = self_entry.executable
1862
            else:
1863
                path_in_target = None
1864
                self_parent = None
1865
                self_name = None
1866
                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.
1867
            if basis_value is None:
1868
                # add
1869
                kind = (None, self_entry.kind)
1870
                versioned = (False, True)
3735.2.34 by Robert Collins
Mega-hack; hook in a nasty iter_changes based on CHKInventory.
1871
            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.
1872
                # delete
1873
                kind = (basis_entry.kind, None)
1874
                versioned = (True, False)
1875
            else:
1876
                kind = (basis_entry.kind, self_entry.kind)
1877
                versioned = (True, True)
3735.2.34 by Robert Collins
Mega-hack; hook in a nasty iter_changes based on CHKInventory.
1878
            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.
1879
            if kind[0] != kind[1]:
1880
                changed_content = True
1881
            elif kind[0] == 'file':
1882
                if (self_entry.text_size != basis_entry.text_size or
1883
                    self_entry.text_sha1 != basis_entry.text_sha1):
1884
                    changed_content = True
3735.2.34 by Robert Collins
Mega-hack; hook in a nasty iter_changes based on CHKInventory.
1885
            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.
1886
                if self_entry.symlink_target != basis_entry.symlink_target:
1887
                    changed_content = True
3735.2.34 by Robert Collins
Mega-hack; hook in a nasty iter_changes based on CHKInventory.
1888
            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.
1889
                if (self_entry.reference_revision !=
1890
                    basis_entry.reference_revision):
1891
                    changed_content = True
3735.2.34 by Robert Collins
Mega-hack; hook in a nasty iter_changes based on CHKInventory.
1892
            parent = (basis_parent, self_parent)
1893
            name = (basis_name, self_name)
1894
            executable = (basis_executable, self_executable)
4241.6.5 by Robert Collins, John Arbash Meinel
CHKInventory support from brisbane-core.
1895
            if (not changed_content
1896
                and parent[0] == parent[1]
1897
                and name[0] == name[1]
1898
                and executable[0] == executable[1]):
1899
                # Could happen when only the revision changed for a directory
1900
                # for instance.
4137.3.1 by Ian Clatworthy
Inventory.filter() API with tests
1901
                continue
3735.2.33 by Robert Collins
Create a smoke-tested CHKInventory.iter_changes(CHKInventory) - incomplete in general but enough to start working with.
1902
            yield (file_id, (path_in_source, path_in_target), changed_content,
1903
                versioned, parent, name, kind, executable)
1904
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1905
    def __len__(self):
1906
        """Return the number of entries in the inventory."""
3735.2.17 by Robert Collins
Cache node length to avoid full iteration on __len__ calls.
1907
        return len(self.id_to_entry)
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1908
3735.2.47 by Robert Collins
Move '_make_inv_delta' onto Inventory (UNTESTED).
1909
    def _make_delta(self, old):
1910
        """Make an inventory delta from two inventories."""
1911
        if type(old) != CHKInventory:
1912
            return CommonInventory._make_delta(self, old)
1913
        delta = []
1914
        for key, old_value, self_value in \
1915
            self.id_to_entry.iter_changes(old.id_to_entry):
1916
            file_id = key[0]
1917
            if old_value is not None:
1918
                old_path = old.id2path(file_id)
1919
            else:
1920
                old_path = None
1921
            if self_value is not None:
1922
                entry = self._bytes_to_entry(self_value)
3735.2.119 by Ian Clatworthy
add a cache for CHKInventory.path2id()
1923
                self._fileid_to_entry_cache[file_id] = entry
3735.2.47 by Robert Collins
Move '_make_inv_delta' onto Inventory (UNTESTED).
1924
                new_path = self.id2path(file_id)
1925
            else:
1926
                entry = None
1927
                new_path = None
1928
            delta.append((old_path, new_path, file_id, entry))
1929
        return delta
1930
3735.2.12 by Robert Collins
Implement commit-via-deltas for split inventory repositories.
1931
    def path2id(self, name):
3735.2.119 by Ian Clatworthy
add a cache for CHKInventory.path2id()
1932
        """See CommonInventory.path2id()."""
1933
        result = self._path_to_fileid_cache.get(name, None)
1934
        if result is None:
1935
            result = CommonInventory.path2id(self, name)
1936
            self._path_to_fileid_cache[name] = result
1937
        return result
3735.2.12 by Robert Collins
Implement commit-via-deltas for split inventory repositories.
1938
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1939
    def to_lines(self):
1940
        """Serialise the inventory to lines."""
1941
        lines = ["chkinventory:\n"]
3735.16.7 by John Arbash Meinel
Start parameterizing CHKInventory and CHKSerializer so that we can
1942
        if self._search_key_name != 'plain':
3735.24.1 by John Arbash Meinel
Change how the ordering of the inventory metablock is written.
1943
            # 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
1944
            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.
1945
            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.
1946
            lines.append('parent_id_basename_to_file_id: %s\n' %
1947
                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.
1948
            lines.append("revision_id: %s\n" % self.revision_id)
1949
            lines.append("id_to_entry: %s\n" % self.id_to_entry.key())
1950
        else:
1951
            lines.append("revision_id: %s\n" % self.revision_id)
1952
            lines.append("root_id: %s\n" % self.root_id)
1953
            if self.parent_id_basename_to_file_id is not None:
1954
                lines.append('parent_id_basename_to_file_id: %s\n' %
1955
                    self.parent_id_basename_to_file_id.key())
1956
            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.
1957
        return lines
1958
1959
    @property
1960
    def root(self):
1961
        """Get the root entry."""
1962
        return self[self.root_id]
1963
1964
1965
class CHKInventoryDirectory(InventoryDirectory):
1966
    """A directory in an inventory."""
1967
1968
    __slots__ = ['text_sha1', 'text_size', 'file_id', 'name', 'kind',
1969
                 'text_id', 'parent_id', '_children', 'executable',
1970
                 'revision', 'symlink_target', 'reference_revision',
1971
                 '_chk_inventory']
1972
1973
    def __init__(self, file_id, name, parent_id, chk_inventory):
1974
        # Don't call InventoryDirectory.__init__ - it isn't right for this
1975
        # class.
1976
        InventoryEntry.__init__(self, file_id, name, parent_id)
1977
        self._children = None
1978
        self.kind = 'directory'
1979
        self._chk_inventory = chk_inventory
1980
1981
    @property
1982
    def children(self):
3735.2.118 by Ian Clatworthy
only apply the parent_id_basename delta if there is one
1983
        """Access the list of children of this directory.
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1984
3735.2.44 by Robert Collins
Teach CHKInventory with a parent_id_basename index how to load partial index contents.
1985
        With a parent_id_basename_to_file_id index, loads all the children,
1986
        without loads the entire index. Without is bad. A more sophisticated
1987
        proxy object might be nice, to allow partial loading of children as
1988
        well when specific names are accessed. (So path traversal can be
1989
        written in the obvious way but not examine siblings.).
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1990
        """
1991
        if self._children is not None:
1992
            return self._children
3735.21.1 by John Arbash Meinel
Fix the file_id versus file_id_key confusion in CHKInventoryDirectory.children()
1993
        # No longer supported
3735.2.129 by Andrew Bennetts
Fix some trivial test failures.
1994
        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.
1995
            raise AssertionError("Inventories without"
1996
                " 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.
1997
        result = {}
3735.2.44 by Robert Collins
Teach CHKInventory with a parent_id_basename index how to load partial index contents.
1998
        # XXX: Todo - use proxy objects for the children rather than loading
1999
        # all when the attribute is referenced.
2000
        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()
2001
        child_keys = set()
3735.2.44 by Robert Collins
Teach CHKInventory with a parent_id_basename index how to load partial index contents.
2002
        for (parent_id, name_utf8), file_id in parent_id_index.iteritems(
2003
            key_filter=[(self.file_id,)]):
3735.21.1 by John Arbash Meinel
Fix the file_id versus file_id_key confusion in CHKInventoryDirectory.children()
2004
            child_keys.add((file_id,))
3735.2.51 by Robert Collins
Trivial cache of inventory entries after they are read by a specific inventory.
2005
        cached = set()
3735.21.1 by John Arbash Meinel
Fix the file_id versus file_id_key confusion in CHKInventoryDirectory.children()
2006
        for file_id_key in child_keys:
3735.2.119 by Ian Clatworthy
add a cache for CHKInventory.path2id()
2007
            entry = self._chk_inventory._fileid_to_entry_cache.get(
2008
                file_id_key[0], None)
3735.2.51 by Robert Collins
Trivial cache of inventory entries after they are read by a specific inventory.
2009
            if entry is not None:
2010
                result[entry.name] = entry
3735.21.1 by John Arbash Meinel
Fix the file_id versus file_id_key confusion in CHKInventoryDirectory.children()
2011
                cached.add(file_id_key)
2012
        child_keys.difference_update(cached)
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
2013
        # 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.
2014
        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()
2015
        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.
2016
            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.
2017
            result[entry.name] = entry
3735.2.119 by Ian Clatworthy
add a cache for CHKInventory.path2id()
2018
            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.
2019
        self._children = result
2020
        return result
4137.3.1 by Ian Clatworthy
Inventory.filter() API with tests
2021
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.
2022
entry_factory = {
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
2023
    'directory': InventoryDirectory,
2024
    'file': InventoryFile,
2025
    'symlink': InventoryLink,
2255.6.8 by Aaron Bentley
Merge refactoring of add_reference
2026
    '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.
2027
}
2028
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)
2029
def make_entry(kind, name, parent_id, file_id=None):
2030
    """Create an inventory entry.
2031
2032
    :param kind: the type of inventory entry to create.
2033
    :param name: the basename of the entry.
2034
    :param parent_id: the parent_id of the entry.
2035
    :param file_id: the file_id to use. if None, one will be created.
2036
    """
2037
    if file_id is None:
2116.4.1 by John Arbash Meinel
Update file and revision id generators.
2038
        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
2039
    name = ensure_normalized_name(name)
2040
    try:
2041
        factory = entry_factory[kind]
2042
    except KeyError:
2043
        raise BzrError("unknown kind %r" % kind)
2044
    return factory(file_id, name, parent_id)
2045
2046
2047
def ensure_normalized_name(name):
2048
    """Normalize name.
2049
2050
    :raises InvalidNormalization: When name is not normalized, and cannot be
2051
        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
2052
    :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
2053
    """
2255.2.54 by Robert Collins
Add in non-normalized filename sanity check to dirstate add().
2054
    #------- This has been copied to bzrlib.dirstate.DirState.add, please
2055
    # 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.
2056
    # we dont import normalized_filename directly because we want to be
2057
    # able to change the implementation at runtime for tests.
1830.3.5 by John Arbash Meinel
make_entry refuses to create non-normalized entries.
2058
    norm_name, can_access = osutils.normalized_filename(name)
2059
    if norm_name != name:
2060
        if can_access:
2825.6.1 by Robert Collins
* ``WorkingTree.rename_one`` will now raise an error if normalisation of the
2061
            return norm_name
1830.3.5 by John Arbash Meinel
make_entry refuses to create non-normalized entries.
2062
        else:
2063
            # TODO: jam 20060701 This would probably be more useful
2064
            #       if the error was raised with the full path
2065
            raise errors.InvalidNormalization(name)
2825.6.1 by Robert Collins
* ``WorkingTree.rename_one`` will now raise an error if normalisation of the
2066
    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)
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
1077 by Martin Pool
- avoid compiling REs at module load time
2069
_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
2070
2071
def is_valid_name(name):
1077 by Martin Pool
- avoid compiling REs at module load time
2072
    global _NAME_RE
1753.1.4 by Robert Collins
Fixup '== None' usage in inventory.py.
2073
    if _NAME_RE is None:
1077 by Martin Pool
- avoid compiling REs at module load time
2074
        _NAME_RE = re.compile(r'^[^/\\]+$')
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2075
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
2076
    return bool(_NAME_RE.match(name))