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