/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
1185.16.72 by Martin Pool
[merge] from robert and fix up tests
17
# FIXME: This refactoring of the workingtree code doesn't seem to keep 
18
# the WorkingTree's copy of the inventory in sync with the branch.  The
19
# branch modifies its working inventory when it does a commit to make
20
# missing files permanently removed.
1 by mbp at sourcefrog
import from baz patch-364
21
1197 by Martin Pool
doc
22
# TODO: Maybe also keep the full path of the entry, and the children?
23
# But those depend on its position within a particular inventory, and
24
# it would be nice not to need to hold the backpointer here.
25
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
26
# This should really be an id randomly assigned when the tree is
27
# created, but it's not for now.
28
ROOT_ID = "TREE_ROOT"
29
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
30
import os
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
31
import re
32
import sys
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
33
34
from bzrlib.lazy_import import lazy_import
35
lazy_import(globals(), """
36
import collections
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
1398 by Robert Collins
integrate in Gustavos x-bit patch
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
82
        
83
    text_size
84
        size in bytes of the text of the file
85
        
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])
1 by mbp at sourcefrog
import from baz patch-364
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
1 by mbp at sourcefrog
import from baz patch-364
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
    #
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 
131
    # generate them just for one file at a time.
132
    RENAMED = 'renamed'
133
    MODIFIED_AND_RENAMED = 'modified and renamed'
1197 by Martin Pool
doc
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.
139
        
140
        _read_tree_state must have been called on self and old_entry prior to 
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."""
2776.3.1 by Robert Collins
* Deprecated method ``find_previous_heads`` on
148
    
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:
167
                    #     * there was a bug in revision updates with 'x' bit 
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
203
        
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.
246
        
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
271
        :param checker: Check object providing context for the checks; 
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."""
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
287
        raise BzrCheckError('unknown entry kind %r in revision {%s}' % 
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.
297
        
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
301
        An entry with a different parent, or different name is considered 
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.
388
        
389
        Note that this should be modified to be a noop on virtual trees
390
        as all entries created there are prepopulated.
391
        """
1185.16.5 by Martin Pool
doc
392
        # TODO: Rather than running this manually, we should check the 
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
424
        
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):
687
    
688
    kind = 'tree-reference'
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):
707
        self.reference_revision = None 
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.
739
        
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(
748
            [parent.name for parent in 
749
             self._iter_file_id_parents(file_id)][:-1]))
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]
760
            
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]
822
                return 
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
848
            
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
858
                if (specific_file_ids is None or 
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.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
886
887
class Inventory(CommonInventory):
1 by mbp at sourcefrog
import from baz patch-364
888
    """Inventory of versioned files in a tree.
889
240 by mbp at sourcefrog
doc
890
    This describes which file_id is present at each point in the tree,
891
    and possibly the SHA-1 or other information about the file.
892
    Entries can be looked up either by path or by file_id.
1 by mbp at sourcefrog
import from baz patch-364
893
894
    The inventory represents a typical unix file tree, with
895
    directories containing files and subdirectories.  We never store
896
    the full path to a file, because renaming a directory implicitly
897
    moves all of its contents.  This class internally maintains a
898
    lookup tree that allows the children under a directory to be
899
    returned quickly.
900
901
    InventoryEntry objects must not be modified after they are
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
902
    inserted, other than through the Inventory API.
1 by mbp at sourcefrog
import from baz patch-364
903
904
    >>> inv = Inventory()
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
905
    >>> inv.add(InventoryFile('123-123', 'hello.c', ROOT_ID))
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
906
    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
907
    >>> inv['123-123'].name
908
    'hello.c'
909
910
    May be treated as an iterator or set to look up file ids:
911
    
912
    >>> bool(inv.path2id('hello.c'))
913
    True
914
    >>> '123-123' in inv
915
    True
916
917
    May also look up by name:
918
919
    >>> [x[0] for x in inv.iter_entries()]
1852.6.6 by Robert Collins
Finish updating iter_entries change to make all tests pass.
920
    ['', u'hello.c']
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
921
    >>> 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
922
    >>> inv.add(InventoryFile('123-123', 'hello.c', ROOT_ID))
1731.1.33 by Aaron Bentley
Revert no-special-root changes
923
    Traceback (most recent call last):
924
    BzrError: parent_id {TREE_ROOT} not in inventory
925
    >>> 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.
926
    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
927
    """
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
928
    def __init__(self, root_id=ROOT_ID, revision_id=None):
1 by mbp at sourcefrog
import from baz patch-364
929
        """Create or read an inventory.
930
931
        If a working directory is specified, the inventory is read
932
        from there.  If the file is specified, read from that. If not,
933
        the inventory is created empty.
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
934
935
        The inventory is created with a default root directory, with
936
        an id of None.
1 by mbp at sourcefrog
import from baz patch-364
937
        """
1731.1.33 by Aaron Bentley
Revert no-special-root changes
938
        if root_id is not None:
2294.1.5 by John Arbash Meinel
Fix Inventory.iter_entries_by_dir to return Unicode paths,
939
            self._set_root(InventoryDirectory(root_id, u'', None))
1731.1.33 by Aaron Bentley
Revert no-special-root changes
940
        else:
941
            self.root = None
942
            self._byid = {}
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
943
        self.revision_id = revision_id
1910.2.3 by Aaron Bentley
All tests pass
944
2865.1.1 by Robert Collins
Create new mutable tree method update_to_one_parent_via_delta for eventual use by commit.
945
    def __repr__(self):
946
        return "<Inventory object at %x, contents=%r>" % (id(self), self._byid)
947
948
    def apply_delta(self, delta):
949
        """Apply a delta to this inventory.
950
951
        :param delta: A list of changes to apply. After all the changes are
952
            applied the final inventory must be internally consistent, but it
953
            is ok to supply changes which, if only half-applied would have an
954
            invalid result - such as supplying two changes which rename two
955
            files, 'A' and 'B' with each other : [('A', 'B', 'A-id', a_entry),
956
            ('B', 'A', 'B-id', b_entry)].
957
958
            Each change is a tuple, of the form (old_path, new_path, file_id,
959
            new_entry).
960
            
961
            When new_path is None, the change indicates the removal of an entry
962
            from the inventory and new_entry will be ignored (using None is
963
            appropriate). If new_path is not None, then new_entry must be an
964
            InventoryEntry instance, which will be incorporated into the
965
            inventory (and replace any existing entry with the same file id).
966
            
967
            When old_path is None, the change indicates the addition of
968
            a new entry to the inventory.
969
            
970
            When neither new_path nor old_path are None, the change is a
971
            modification to an entry, such as a rename, reparent, kind change
3735.2.10 by Robert Collins
Teach CHKInventory how to make a new inventory from an inventory delta.
972
            etc.
2865.1.1 by Robert Collins
Create new mutable tree method update_to_one_parent_via_delta for eventual use by commit.
973
974
            The children attribute of new_entry is ignored. This is because
2865.1.3 by Robert Collins
Review feedback.
975
            this method preserves children automatically across alterations to
976
            the parent of the children, and cases where the parent id of a
977
            child is changing require the child to be passed in as a separate
978
            change regardless. E.g. in the recursive deletion of a directory -
979
            the directory's children must be included in the delta, or the
980
            final inventory will be invalid.
2865.1.1 by Robert Collins
Create new mutable tree method update_to_one_parent_via_delta for eventual use by commit.
981
        """
982
        children = {}
983
        # Remove all affected items which were in the original inventory,
984
        # starting with the longest paths, thus ensuring parents are examined
985
        # after their children, which means that everything we examine has no
986
        # modified children remaining by the time we examine it.
987
        for old_path, file_id in sorted(((op, f) for op, np, f, e in delta
988
                                        if op is not None), reverse=True):
989
            if file_id not in self:
990
                # adds come later
991
                continue
992
            # 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.
993
            file_id_children = getattr(self[file_id], 'children', {})
994
            if len(file_id_children):
995
                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.
996
            # Remove file_id and the unaltered children. If file_id is not
997
            # being deleted it will be reinserted back later.
998
            self.remove_recursive_id(file_id)
999
        # Insert all affected which should be in the new inventory, reattaching
1000
        # their children if they had any. This is done from shortest path to
1001
        # longest, ensuring that items which were modified and whose parents in
1002
        # the resulting inventory were also modified, are inserted after their
1003
        # parents.
1004
        for new_path, new_entry in sorted((np, e) for op, np, f, e in
1005
                                          delta if np is not None):
1006
            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.
1007
                # Pop the child which to allow detection of children whose
1008
                # parents were deleted and which were not reattached to a new
1009
                # parent.
3735.2.46 by Robert Collins
Do not alter InventoryDirectory objects provided to Inventory.apply_delta.
1010
                replacement = InventoryDirectory(new_entry.file_id,
1011
                    new_entry.name, new_entry.parent_id)
1012
                replacement.revision = new_entry.revision
1013
                replacement.children = children.pop(replacement.file_id, {})
1014
                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.
1015
            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.
1016
        if len(children):
1017
            # Get the parent id that was deleted
1018
            parent_id, children = children.popitem()
1019
            raise errors.InconsistentDelta("<deleted>", parent_id,
1020
                "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.
1021
1910.2.3 by Aaron Bentley
All tests pass
1022
    def _set_root(self, ie):
1023
        self.root = ie
1907.1.2 by Aaron Bentley
More removal of unique-root stuff
1024
        self._byid = {self.root.file_id: self.root}
1 by mbp at sourcefrog
import from baz patch-364
1025
1189 by Martin Pool
- BROKEN: partial support for commit into weave
1026
    def copy(self):
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
1027
        # TODO: jam 20051218 Should copy also copy the revision_id?
1852.6.3 by Robert Collins
Make iter(Tree) consistent for all tree types.
1028
        entries = self.iter_entries()
2938.2.1 by Jelmer Vernooij
Handle empty inventories in Inventory.copy().
1029
        if self.root is None:
1030
            return Inventory(root_id=None)
1852.6.3 by Robert Collins
Make iter(Tree) consistent for all tree types.
1031
        other = Inventory(entries.next()[1].file_id)
3616.1.1 by Jelmer Vernooij
Fix copying of root revision in inventory.
1032
        other.root.revision = self.root.revision
1206 by Martin Pool
- fix bug in Inventory.copy()
1033
        # copy recursively so we know directories will be added before
1034
        # their children.  There are more efficient ways than this...
2935.2.1 by Jelmer Vernooij
Fix Inventory.copy() and add a test for it.
1035
        for path, entry in entries:
1189 by Martin Pool
- BROKEN: partial support for commit into weave
1036
            other.add(entry.copy())
1037
        return other
1038
1 by mbp at sourcefrog
import from baz patch-364
1039
    def __iter__(self):
1040
        return iter(self._byid)
1041
1042
    def __len__(self):
1043
        """Returns number of entries."""
1044
        return len(self._byid)
1045
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
1046
    def make_entry(self, kind, name, parent_id, file_id=None):
1047
        """Simple thunk to bzrlib.inventory.make_entry."""
1048
        return make_entry(kind, name, parent_id, file_id)
1049
555 by Martin Pool
- New Inventory.entries() method
1050
    def entries(self):
1051
        """Return list of (path, ie) for all entries except the root.
1052
1053
        This may be faster than iter_entries.
1054
        """
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
1055
        accum = []
1056
        def descend(dir_ie, dir_path):
556 by Martin Pool
- fix up Inventory.entries()
1057
            kids = dir_ie.children.items()
555 by Martin Pool
- New Inventory.entries() method
1058
            kids.sort()
1059
            for name, ie in kids:
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
1060
                child_path = osutils.pathjoin(dir_path, name)
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
1061
                accum.append((child_path, ie))
555 by Martin Pool
- New Inventory.entries() method
1062
                if ie.kind == 'directory':
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
1063
                    descend(ie, child_path)
555 by Martin Pool
- New Inventory.entries() method
1064
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1065
        descend(self.root, u'')
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
1066
        return accum
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
1067
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
1068
    def directories(self):
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
1069
        """Return (path, entry) pairs for all directories, including the root.
1 by mbp at sourcefrog
import from baz patch-364
1070
        """
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
1071
        accum = []
1072
        def descend(parent_ie, parent_path):
1073
            accum.append((parent_path, parent_ie))
156 by mbp at sourcefrog
new "directories" command
1074
            
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
1075
            kids = [(ie.name, ie) for ie in parent_ie.children.itervalues() if ie.kind == 'directory']
1076
            kids.sort()
156 by mbp at sourcefrog
new "directories" command
1077
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
1078
            for name, child_ie in kids:
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
1079
                child_path = osutils.pathjoin(parent_path, name)
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
1080
                descend(child_ie, child_path)
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1081
        descend(self.root, u'')
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
1082
        return accum
1 by mbp at sourcefrog
import from baz patch-364
1083
1084
    def __getitem__(self, file_id):
1085
        """Return the entry for given file_id.
1086
1087
        >>> inv = Inventory()
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
1088
        >>> inv.add(InventoryFile('123123', 'hello.c', ROOT_ID))
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1089
        InventoryFile('123123', 'hello.c', parent_id='TREE_ROOT', sha1=None, len=None, revision=None)
1 by mbp at sourcefrog
import from baz patch-364
1090
        >>> inv['123123'].name
1091
        'hello.c'
1092
        """
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
1093
        try:
1094
            return self._byid[file_id]
1095
        except KeyError:
2067.3.1 by Martin Pool
Clean up BzrNewError, other exception classes and users.
1096
            # really we're passing an inventory, not a tree...
1097
            raise errors.NoSuchId(self, file_id)
1 by mbp at sourcefrog
import from baz patch-364
1098
460 by Martin Pool
- new testing command compare-trees
1099
    def get_file_kind(self, file_id):
1100
        return self._byid[file_id].kind
1101
138 by mbp at sourcefrog
remove parallel tree from inventory;
1102
    def get_child(self, parent_id, filename):
1732.1.18 by John Arbash Meinel
50ms is probably not worth it
1103
        return self[parent_id].children.get(filename)
138 by mbp at sourcefrog
remove parallel tree from inventory;
1104
2100.3.6 by Aaron Bentley
Make add recursive for children of added entries
1105
    def _add_child(self, entry):
1106
        """Add an entry to the inventory, without adding it to its parent"""
1107
        if entry.file_id in self._byid:
1108
            raise BzrError("inventory already contains entry with id {%s}" %
1109
                           entry.file_id)
1110
        self._byid[entry.file_id] = entry
1111
        for child in getattr(entry, 'children', {}).itervalues():
1112
            self._add_child(child)
1113
        return entry
1114
1 by mbp at sourcefrog
import from baz patch-364
1115
    def add(self, entry):
1116
        """Add entry to inventory.
1117
1118
        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
1119
        which calls this.
1120
1121
        Returns the new entry object.
1122
        """
139 by mbp at sourcefrog
simplified/faster Inventory.add
1123
        if entry.file_id in self._byid:
2255.7.16 by John Arbash Meinel
Make sure adding a duplicate file_id raises DuplicateFileId.
1124
            raise errors.DuplicateFileId(entry.file_id,
1125
                                         self._byid[entry.file_id])
1 by mbp at sourcefrog
import from baz patch-364
1126
1731.1.33 by Aaron Bentley
Revert no-special-root changes
1127
        if entry.parent_id is None:
2100.3.6 by Aaron Bentley
Make add recursive for children of added entries
1128
            self.root = entry
1129
        else:
1130
            try:
1131
                parent = self._byid[entry.parent_id]
1132
            except KeyError:
1133
                raise BzrError("parent_id {%s} not in inventory" %
1134
                               entry.parent_id)
1135
1136
            if entry.name in parent.children:
1137
                raise BzrError("%s is already versioned" %
1138
                        osutils.pathjoin(self.id2path(parent.file_id),
1551.13.12 by Aaron Bentley
Fix encoding of 'already versioned' error
1139
                        entry.name).encode('utf-8'))
2100.3.6 by Aaron Bentley
Make add recursive for children of added entries
1140
            parent.children[entry.name] = entry
1141
        return self._add_child(entry)
1 by mbp at sourcefrog
import from baz patch-364
1142
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)
1143
    def add_path(self, relpath, kind, file_id=None, parent_id=None):
70 by mbp at sourcefrog
Prepare for smart recursive add.
1144
        """Add entry from a path.
1145
1180 by Martin Pool
- start splitting code for xml (de)serialization away from objects
1146
        The immediate parent must already be versioned.
1147
1148
        Returns the new entry object."""
1015 by Martin Pool
- fix circular imports
1149
        
1830.3.5 by John Arbash Meinel
make_entry refuses to create non-normalized entries.
1150
        parts = osutils.splitpath(relpath)
70 by mbp at sourcefrog
Prepare for smart recursive add.
1151
1534.7.69 by Aaron Bentley
Got real root moves working
1152
        if len(parts) == 0:
1713.1.6 by Robert Collins
Move file id random data selection out of the inner loop for 'bzr add'.
1153
            if file_id is None:
2116.4.1 by John Arbash Meinel
Update file and revision id generators.
1154
                file_id = generate_ids.gen_root_id()
1731.1.1 by Aaron Bentley
Make root entry an InventoryDirectory, make EmptyTree really empty
1155
            self.root = InventoryDirectory(file_id, '', None)
1534.7.69 by Aaron Bentley
Got real root moves working
1156
            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.
1157
            return self.root
1534.7.69 by Aaron Bentley
Got real root moves working
1158
        else:
1159
            parent_path = parts[:-1]
1160
            parent_id = self.path2id(parent_path)
1753.1.4 by Robert Collins
Fixup '== None' usage in inventory.py.
1161
            if parent_id is None:
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
1162
                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)
1163
        ie = make_entry(kind, parts[-1], parent_id, file_id)
70 by mbp at sourcefrog
Prepare for smart recursive add.
1164
        return self.add(ie)
1165
1 by mbp at sourcefrog
import from baz patch-364
1166
    def __delitem__(self, file_id):
1167
        """Remove entry by id.
1168
1169
        >>> inv = Inventory()
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
1170
        >>> inv.add(InventoryFile('123', 'foo.c', ROOT_ID))
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1171
        InventoryFile('123', 'foo.c', parent_id='TREE_ROOT', sha1=None, len=None, revision=None)
1 by mbp at sourcefrog
import from baz patch-364
1172
        >>> '123' in inv
1173
        True
1174
        >>> del inv['123']
1175
        >>> '123' in inv
1176
        False
1177
        """
1178
        ie = self[file_id]
1179
        del self._byid[file_id]
1534.7.69 by Aaron Bentley
Got real root moves working
1180
        if ie.parent_id is not None:
1181
            del self[ie.parent_id].children[ie.name]
1 by mbp at sourcefrog
import from baz patch-364
1182
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
1183
    def __eq__(self, other):
1 by mbp at sourcefrog
import from baz patch-364
1184
        """Compare two sets by comparing their contents.
1185
1186
        >>> i1 = Inventory()
1187
        >>> i2 = Inventory()
1188
        >>> i1 == i2
1189
        True
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
1190
        >>> i1.add(InventoryFile('123', 'foo', ROOT_ID))
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1191
        InventoryFile('123', 'foo', parent_id='TREE_ROOT', sha1=None, len=None, revision=None)
1 by mbp at sourcefrog
import from baz patch-364
1192
        >>> i1 == i2
1193
        False
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
1194
        >>> i2.add(InventoryFile('123', 'foo', ROOT_ID))
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1195
        InventoryFile('123', 'foo', parent_id='TREE_ROOT', sha1=None, len=None, revision=None)
1 by mbp at sourcefrog
import from baz patch-364
1196
        >>> i1 == i2
1197
        True
1198
        """
1199
        if not isinstance(other, Inventory):
1200
            return NotImplemented
1201
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
1202
        return self._byid == other._byid
1203
1204
    def __ne__(self, other):
1249 by Martin Pool
- improvements to weave commit [broken]
1205
        return not self.__eq__(other)
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
1206
1207
    def __hash__(self):
1208
        raise ValueError('not hashable')
1209
1596.2.19 by Robert Collins
Shave 20% off id2path.
1210
    def _iter_file_id_parents(self, file_id):
1211
        """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.
1212
        while file_id is not None:
1596.2.19 by Robert Collins
Shave 20% off id2path.
1213
            try:
1214
                ie = self._byid[file_id]
1215
            except KeyError:
2255.11.5 by Martin Pool
Tree.id2path should raise NoSuchId, not return None.
1216
                raise errors.NoSuchId(tree=None, file_id=file_id)
1596.2.19 by Robert Collins
Shave 20% off id2path.
1217
            yield ie
1218
            file_id = ie.parent_id
1 by mbp at sourcefrog
import from baz patch-364
1219
172 by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory
1220
    def get_idpath(self, file_id):
1221
        """Return a list of file_ids for the path to an entry.
1222
1223
        The list contains one element for each directory followed by
1224
        the id of the file itself.  So the length of the returned list
1225
        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
1226
        root directory as depth 1.
172 by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory
1227
        """
1228
        p = []
1596.2.19 by Robert Collins
Shave 20% off id2path.
1229
        for parent in self._iter_file_id_parents(file_id):
1230
            p.insert(0, parent.file_id)
172 by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory
1231
        return p
1232
1 by mbp at sourcefrog
import from baz patch-364
1233
    def path2id(self, name):
1234
        """Walk down through directories to return entry of last component.
1235
1236
        names may be either a list of path components, or a single
1237
        string, in which case it is automatically split.
1238
1239
        This returns the entry of the last component in the path,
1240
        which may be either a file or a directory.
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
1241
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)
1242
        Returns None IFF the path is not found.
1 by mbp at sourcefrog
import from baz patch-364
1243
        """
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
1244
        if isinstance(name, basestring):
1245
            name = osutils.splitpath(name)
1 by mbp at sourcefrog
import from baz patch-364
1246
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)
1247
        # mutter("lookup path %r" % name)
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
1248
1249
        parent = self.root
1731.1.33 by Aaron Bentley
Revert no-special-root changes
1250
        if parent is None:
1251
            return None
70 by mbp at sourcefrog
Prepare for smart recursive add.
1252
        for f in name:
1 by mbp at sourcefrog
import from baz patch-364
1253
            try:
2091.3.1 by Aaron Bentley
When 'directory' path element isn't a directory, return None from path2id
1254
                children = getattr(parent, 'children', None)
2091.3.3 by Aaron Bentley
Test 'is None' not '== None'
1255
                if children is None:
2091.3.1 by Aaron Bentley
When 'directory' path element isn't a directory, return None from path2id
1256
                    return None
1257
                cie = children[f]
138 by mbp at sourcefrog
remove parallel tree from inventory;
1258
                parent = cie
1 by mbp at sourcefrog
import from baz patch-364
1259
            except KeyError:
1260
                # or raise an error?
1261
                return None
1262
138 by mbp at sourcefrog
remove parallel tree from inventory;
1263
        return parent.file_id
1 by mbp at sourcefrog
import from baz patch-364
1264
1265
    def has_filename(self, names):
1266
        return bool(self.path2id(names))
1267
1268
    def has_id(self, file_id):
1711.9.11 by John Arbash Meinel
change return foo in bar to return (foo in bar)
1269
        return (file_id in self._byid)
1 by mbp at sourcefrog
import from baz patch-364
1270
3879.2.6 by John Arbash Meinel
Bring in Inventory._make_delta
1271
    def _make_delta(self, old):
1272
        """Make an inventory delta from two inventories."""
3882.6.18 by John Arbash Meinel
Bring in optimizations to Inventory._make_delta.
1273
        old_getter = getattr(old, '_byid', old)
1274
        new_getter = self._byid
1275
        old_ids = set(old_getter)
1276
        new_ids = set(new_getter)
3879.2.6 by John Arbash Meinel
Bring in Inventory._make_delta
1277
        adds = new_ids - old_ids
1278
        deletes = old_ids - new_ids
3882.6.18 by John Arbash Meinel
Bring in optimizations to Inventory._make_delta.
1279
        if not adds and not deletes:
1280
            common = new_ids
1281
        else:
1282
            common = old_ids.intersection(new_ids)
3879.2.6 by John Arbash Meinel
Bring in Inventory._make_delta
1283
        delta = []
1284
        for file_id in deletes:
1285
            delta.append((old.id2path(file_id), None, file_id, None))
1286
        for file_id in adds:
1287
            delta.append((None, self.id2path(file_id), file_id, self[file_id]))
1288
        for file_id in common:
3882.6.18 by John Arbash Meinel
Bring in optimizations to Inventory._make_delta.
1289
            new_ie = new_getter[file_id]
1290
            old_ie = old_getter[file_id]
1291
            # If xml_serializer returns the cached InventoryEntries (rather
1292
            # than always doing .copy()), inlining the 'is' check saves 2.7M
1293
            # calls to __eq__.  Under lsprof this saves 20s => 6s.
1294
            # It is a minor improvement without lsprof.
1295
            if old_ie is new_ie or old_ie == new_ie:
1296
                continue
1297
            else:
3879.2.6 by John Arbash Meinel
Bring in Inventory._make_delta
1298
                delta.append((old.id2path(file_id), self.id2path(file_id),
3882.6.18 by John Arbash Meinel
Bring in optimizations to Inventory._make_delta.
1299
                              file_id, new_ie))
3879.2.6 by John Arbash Meinel
Bring in Inventory._make_delta
1300
        return delta
1301
1988.2.6 by Robert Collins
Review feedback.
1302
    def remove_recursive_id(self, file_id):
1303
        """Remove file_id, and children, from the inventory.
3879.2.6 by John Arbash Meinel
Bring in Inventory._make_delta
1304
1988.2.6 by Robert Collins
Review feedback.
1305
        :param file_id: A file_id to remove.
1306
        """
1988.2.1 by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of
1307
        to_find_delete = [self._byid[file_id]]
1308
        to_delete = []
1988.2.6 by Robert Collins
Review feedback.
1309
        while to_find_delete:
1988.2.1 by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of
1310
            ie = to_find_delete.pop()
1311
            to_delete.append(ie.file_id)
1312
            if ie.kind == 'directory':
1313
                to_find_delete.extend(ie.children.values())
1314
        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.
1315
            ie = self[file_id]
1988.2.1 by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of
1316
            del self._byid[file_id]
1731.2.16 by Aaron Bentley
Get extract working for standalone trees
1317
        if ie.parent_id is not None:
1318
            del self[ie.parent_id].children[ie.name]
2376.2.3 by Aaron Bentley
Fix root replacement for apply_inventory_delta
1319
        else:
1320
            self.root = None
1988.2.1 by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of
1321
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
1322
    def rename(self, file_id, new_parent_id, new_name):
1323
        """Move a file within the inventory.
1324
1325
        This can change either the name, or the parent, or both.
1326
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
1327
        This does not move the working file.
1328
        """
2825.6.1 by Robert Collins
* ``WorkingTree.rename_one`` will now raise an error if normalisation of the
1329
        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
1330
        if not is_valid_name(new_name):
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
1331
            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
1332
1333
        new_parent = self._byid[new_parent_id]
1334
        if new_name in new_parent.children:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
1335
            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
1336
172 by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory
1337
        new_parent_idpath = self.get_idpath(new_parent_id)
1338
        if file_id in new_parent_idpath:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
1339
            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
1340
                    % (self.id2path(file_id), self.id2path(new_parent_id)))
1341
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
1342
        file_ie = self._byid[file_id]
1343
        old_parent = self._byid[file_ie.parent_id]
1344
1345
        # TODO: Don't leave things messed up if this fails
1346
1347
        del old_parent.children[file_ie.name]
1348
        new_parent.children[new_name] = file_ie
1349
        
1350
        file_ie.name = new_name
1351
        file_ie.parent_id = new_parent_id
1352
1731.1.1 by Aaron Bentley
Make root entry an InventoryDirectory, make EmptyTree really empty
1353
    def is_root(self, file_id):
1354
        return self.root is not None and file_id == self.root.file_id
1355
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
1356
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1357
class CHKInventory(CommonInventory):
1358
    """A inventory persisted in a CHK store.
1359
    
1360
    No caching is performed: every method call or item access will perform
1361
    requests to the storage layer. As such, keep references to objects you want
1362
    to reuse.
1363
    """
1364
3735.16.7 by John Arbash Meinel
Start parameterizing CHKInventory and CHKSerializer so that we can
1365
    def __init__(self, search_key_name):
3735.10.1 by Robert Collins
Create an __init__ for CHKInventory to ensure mandatory attributes are set.
1366
        CommonInventory.__init__(self)
1367
        self._entry_cache = {}
3735.16.7 by John Arbash Meinel
Start parameterizing CHKInventory and CHKSerializer so that we can
1368
        self._search_key_name = search_key_name
3735.10.1 by Robert Collins
Create an __init__ for CHKInventory to ensure mandatory attributes are set.
1369
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1370
    def _entry_to_bytes(self, entry):
1371
        """Serialise entry as a single bytestring.
1372
1373
        :param Entry: An inventory entry.
1374
        :return: A bytestring for the entry.
1375
        
1376
        The BNF:
1377
        ENTRY ::= FILE | DIR | SYMLINK | TREE
1378
        FILE ::= "file: " COMMON NULL SHA NULL SIZE NULL EXECUTABLE
1379
        DIR ::= "dir: " COMMON
1380
        SYMLINK ::= "symlink: " COMMON NULL TARGET_UTF8
1381
        TREE ::= "tree: " COMMON REFERENCE_REVISION
1382
        COMMON ::= FILE_ID NULL PARENT_ID NULL NAME_UTF8 NULL REVISION
1383
        """
1384
        if entry.parent_id is not None:
1385
            parent_str = entry.parent_id
1386
        else:
1387
            parent_str = ''
1388
        name_str = entry.name.encode("utf8")
1389
        if entry.kind == 'file':
1390
            if entry.executable:
1391
                exec_str = "Y"
1392
            else:
1393
                exec_str = "N"
3735.17.11 by John Arbash Meinel
Actually format the inventories using line-based separation.
1394
            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.
1395
                entry.file_id, parent_str, name_str, entry.revision,
1396
                entry.text_sha1, entry.text_size, exec_str)
1397
        elif entry.kind == 'directory':
3735.17.11 by John Arbash Meinel
Actually format the inventories using line-based separation.
1398
            return "dir: %s\n%s\n%s\n%s" % (
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1399
                entry.file_id, parent_str, name_str, entry.revision)
1400
        elif entry.kind == 'symlink':
3735.17.11 by John Arbash Meinel
Actually format the inventories using line-based separation.
1401
            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.
1402
                entry.file_id, parent_str, name_str, entry.revision,
1403
                entry.symlink_target.encode("utf8"))
1404
        elif entry.kind == 'tree-reference':
3735.17.11 by John Arbash Meinel
Actually format the inventories using line-based separation.
1405
            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.
1406
                entry.file_id, parent_str, name_str, entry.revision,
1407
                entry.reference_revision)
1408
        else:
1409
            raise ValueError("unknown kind %r" % entry.kind)
1410
1411
    def _bytes_to_entry(self, bytes):
1412
        """Deserialise a serialised entry."""
3735.17.11 by John Arbash Meinel
Actually format the inventories using line-based separation.
1413
        sections = bytes.split('\n')
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1414
        if sections[0].startswith("file: "):
1415
            result = InventoryFile(sections[0][6:],
1416
                sections[2].decode('utf8'),
1417
                sections[1])
1418
            result.text_sha1 = sections[4]
1419
            result.text_size = int(sections[5])
1420
            result.executable = sections[6] == "Y"
1421
        elif sections[0].startswith("dir: "):
1422
            result = CHKInventoryDirectory(sections[0][5:],
1423
                sections[2].decode('utf8'),
1424
                sections[1], self)
1425
        elif sections[0].startswith("symlink: "):
1426
            result = InventoryLink(sections[0][9:],
1427
                sections[2].decode('utf8'),
1428
                sections[1])
1429
            result.symlink_target = sections[4]
1430
        elif sections[0].startswith("tree: "):
1431
            result = TreeReference(sections[0][6:],
1432
                sections[2].decode('utf8'),
1433
                sections[1])
1434
            result.reference_revision = sections[4]
1435
        else:
1436
            raise ValueError("Not a serialised entry %r" % bytes)
1437
        result.revision = sections[3]
1438
        if result.parent_id == '':
1439
            result.parent_id = None
3735.2.51 by Robert Collins
Trivial cache of inventory entries after they are read by a specific inventory.
1440
        self._entry_cache[result.file_id] = result
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1441
        return result
1442
3735.2.10 by Robert Collins
Teach CHKInventory how to make a new inventory from an inventory delta.
1443
    def create_by_apply_delta(self, inventory_delta, new_revision_id):
1444
        """Create a new CHKInventory by applying inventory_delta to this one.
1445
1446
        :param inventory_delta: The inventory delta to apply. See
1447
            Inventory.apply_delta for details.
1448
        :param new_revision_id: The revision id of the resulting CHKInventory.
1449
        :return: The new CHKInventory.
1450
        """
3735.16.7 by John Arbash Meinel
Start parameterizing CHKInventory and CHKSerializer so that we can
1451
        result = CHKInventory(self._search_key_name)
1452
        search_key_func = chk_map.search_key_registry.get(self._search_key_name)
3735.2.10 by Robert Collins
Teach CHKInventory how to make a new inventory from an inventory delta.
1453
        result.revision_id = new_revision_id
3735.2.41 by Robert Collins
Make the parent_id_basename index be updated during CHKInventory.apply_delta.
1454
        result.id_to_entry = chk_map.CHKMap(
1455
            self.id_to_entry._store,
3735.16.7 by John Arbash Meinel
Start parameterizing CHKInventory and CHKSerializer so that we can
1456
            self.id_to_entry._root_node,
1457
            search_key_func=search_key_func)
3735.2.41 by Robert Collins
Make the parent_id_basename index be updated during CHKInventory.apply_delta.
1458
        if self.parent_id_basename_to_file_id is not None:
1459
            result.parent_id_basename_to_file_id = chk_map.CHKMap(
1460
                self.parent_id_basename_to_file_id._store,
3735.16.7 by John Arbash Meinel
Start parameterizing CHKInventory and CHKSerializer so that we can
1461
                self.parent_id_basename_to_file_id._root_node,
1462
                search_key_func=search_key_func)
3735.2.41 by Robert Collins
Make the parent_id_basename index be updated during CHKInventory.apply_delta.
1463
            parent_id_basename_delta = []
1464
        else:
1465
            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.
1466
        result.root_id = self.root_id
1467
        id_to_entry_delta = []
1468
        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.
1469
            # file id changes
3735.2.10 by Robert Collins
Teach CHKInventory how to make a new inventory from an inventory delta.
1470
            if new_path == '':
1471
                result.root_id = file_id
1472
            if new_path is None:
1473
                # Make a delete:
1474
                new_key = None
1475
                new_value = None
1476
            else:
3735.2.25 by Robert Collins
CHKInventory core tests passing.
1477
                new_key = (file_id,)
3735.2.10 by Robert Collins
Teach CHKInventory how to make a new inventory from an inventory delta.
1478
                new_value = result._entry_to_bytes(entry)
1479
            if old_path is None:
1480
                old_key = None
1481
            else:
3735.2.25 by Robert Collins
CHKInventory core tests passing.
1482
                old_key = (file_id,)
3735.2.10 by Robert Collins
Teach CHKInventory how to make a new inventory from an inventory delta.
1483
            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.
1484
            if result.parent_id_basename_to_file_id is not None:
1485
                # parent_id, basename changes
1486
                if old_path is None:
1487
                    old_key = None
1488
                else:
1489
                    old_entry = self[file_id]
1490
                    old_key = self._parent_id_basename_key(old_entry)
1491
                if new_path is None:
1492
                    new_key = None
1493
                    new_value = None
1494
                else:
1495
                    new_key = self._parent_id_basename_key(entry)
1496
                    new_value = file_id
1497
                if old_key != new_key:
1498
                    # If the two keys are the same, the value will be unchanged
1499
                    # as its always the file id.
1500
                    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.
1501
        result.id_to_entry.apply_delta(id_to_entry_delta)
3735.2.41 by Robert Collins
Make the parent_id_basename index be updated during CHKInventory.apply_delta.
1502
        if result.parent_id_basename_to_file_id is not None:
1503
            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.
1504
        return result
1505
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1506
    @classmethod
1507
    def deserialise(klass, chk_store, bytes, expected_revision_id):
1508
        """Deserialise a CHKInventory.
1509
1510
        :param chk_store: A CHK capable VersionedFiles instance.
1511
        :param bytes: The serialised bytes.
1512
        :param expected_revision_id: The revision ID we think this inventory is
1513
            for.
1514
        :return: A CHKInventory
1515
        """
1516
        lines = bytes.splitlines()
1517
        if lines[0] != 'chkinventory:':
1518
            raise ValueError("not a serialised CHKInventory: %r" % bytes)
3735.16.7 by John Arbash Meinel
Start parameterizing CHKInventory and CHKSerializer so that we can
1519
        revision_id = lines[1][13:]
1520
        root_id = lines[2][9:]
1521
        if lines[3].startswith('search_key_name:'):
1522
            search_key_name = lines[3][17:]
3735.2.40 by Robert Collins
Add development4 which has a parent_id to basename index on CHKInventory objects.
1523
            next = 4
1524
        else:
3735.16.7 by John Arbash Meinel
Start parameterizing CHKInventory and CHKSerializer so that we can
1525
            search_key_name = 'plain'
3735.2.40 by Robert Collins
Add development4 which has a parent_id to basename index on CHKInventory objects.
1526
            next = 3
3735.16.7 by John Arbash Meinel
Start parameterizing CHKInventory and CHKSerializer so that we can
1527
        result = CHKInventory(search_key_name)
1528
        result.revision_id = revision_id
1529
        result.root_id = root_id
1530
        search_key_func = chk_map.search_key_registry.get(
1531
                            result._search_key_name)
1532
        if lines[next].startswith('parent_id_basename_to_file_id:'):
1533
            result.parent_id_basename_to_file_id = chk_map.CHKMap(
1534
                chk_store, (lines[next][31:],),
1535
                search_key_func=search_key_func)
1536
            next += 1
1537
        else:
3735.2.41 by Robert Collins
Make the parent_id_basename index be updated during CHKInventory.apply_delta.
1538
            result.parent_id_basename_to_file_id = None
3735.16.7 by John Arbash Meinel
Start parameterizing CHKInventory and CHKSerializer so that we can
1539
1540
        result.id_to_entry = chk_map.CHKMap(chk_store, (lines[next][13:],),
1541
                                            search_key_func=search_key_func)
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1542
        if (result.revision_id,) != expected_revision_id:
1543
            raise ValueError("Mismatched revision id and expected: %r, %r" %
1544
                (result.revision_id, expected_revision_id))
1545
        return result
1546
1547
    @classmethod
3735.2.40 by Robert Collins
Add development4 which has a parent_id to basename index on CHKInventory objects.
1548
    def from_inventory(klass, chk_store, inventory, maximum_size=0,
3735.16.7 by John Arbash Meinel
Start parameterizing CHKInventory and CHKSerializer so that we can
1549
        parent_id_basename_index=False, search_key_name='plain'):
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1550
        """Create a CHKInventory from an existing inventory.
1551
1552
        The content of inventory is copied into the chk_store, and a
1553
        CHKInventory referencing that is returned.
1554
1555
        :param chk_store: A CHK capable VersionedFiles instance.
1556
        :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.
1557
        :param maximum_size: The CHKMap node size limit.
1558
        :param parent_id_basename_index: If True create and use a
1559
            parent_id,basename->file_id index.
3735.16.7 by John Arbash Meinel
Start parameterizing CHKInventory and CHKSerializer so that we can
1560
        :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.
1561
        """
3735.16.7 by John Arbash Meinel
Start parameterizing CHKInventory and CHKSerializer so that we can
1562
        result = CHKInventory(search_key_name)
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1563
        result.revision_id = inventory.revision_id
1564
        result.root_id = inventory.root.file_id
3735.16.7 by John Arbash Meinel
Start parameterizing CHKInventory and CHKSerializer so that we can
1565
        search_key_func = chk_map.search_key_registry.get(search_key_name)
1566
        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.
1567
        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.
1568
        file_id_delta = []
1569
        if parent_id_basename_index:
3735.16.7 by John Arbash Meinel
Start parameterizing CHKInventory and CHKSerializer so that we can
1570
            result.parent_id_basename_to_file_id = chk_map.CHKMap(chk_store,
1571
                None, search_key_func)
3735.2.41 by Robert Collins
Make the parent_id_basename index be updated during CHKInventory.apply_delta.
1572
            result.parent_id_basename_to_file_id._root_node.set_maximum_size(
3735.2.40 by Robert Collins
Add development4 which has a parent_id to basename index on CHKInventory objects.
1573
                maximum_size)
3735.2.41 by Robert Collins
Make the parent_id_basename index be updated during CHKInventory.apply_delta.
1574
            result.parent_id_basename_to_file_id._root_node._key_width = 2
3735.2.40 by Robert Collins
Add development4 which has a parent_id to basename index on CHKInventory objects.
1575
            parent_id_delta = []
3735.4.6 by Andrew Bennetts
Make fetch much much faster. Adds CHKMap.copy_to(other_store)
1576
        else:
3735.2.41 by Robert Collins
Make the parent_id_basename index be updated during CHKInventory.apply_delta.
1577
            result.parent_id_basename_to_file_id = None
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1578
        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.
1579
            file_id_delta.append((None, (entry.file_id,),
1580
                result._entry_to_bytes(entry)))
1581
            if parent_id_basename_index:
3735.2.41 by Robert Collins
Make the parent_id_basename index be updated during CHKInventory.apply_delta.
1582
                parent_id_delta.append(
1583
                    (None, result._parent_id_basename_key(entry),
1584
                     entry.file_id))
3735.2.40 by Robert Collins
Add development4 which has a parent_id to basename index on CHKInventory objects.
1585
        result.id_to_entry.apply_delta(file_id_delta)
1586
        if parent_id_basename_index:
3735.2.41 by Robert Collins
Make the parent_id_basename index be updated during CHKInventory.apply_delta.
1587
            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.
1588
        return result
1589
3735.2.41 by Robert Collins
Make the parent_id_basename index be updated during CHKInventory.apply_delta.
1590
    def _parent_id_basename_key(self, entry):
1591
        """Create a key for a entry in a parent_id_basename_to_file_id index."""
1592
        if entry.parent_id is not None:
1593
            parent_id = entry.parent_id
1594
        else:
1595
            parent_id = ''
1596
        return parent_id, entry.name.encode('utf8')
1597
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1598
    def __getitem__(self, file_id):
1599
        """map a single file_id -> InventoryEntry."""
3735.2.51 by Robert Collins
Trivial cache of inventory entries after they are read by a specific inventory.
1600
        result = self._entry_cache.get(file_id, None)
1601
        if result is not None:
1602
            return result
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1603
        try:
1604
            return self._bytes_to_entry(
3735.2.25 by Robert Collins
CHKInventory core tests passing.
1605
                self.id_to_entry.iteritems([(file_id,)]).next()[1])
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1606
        except StopIteration:
3735.2.53 by Robert Collins
Support Inventory.__getitem__ more consistently.
1607
            # really we're passing an inventory, not a tree...
1608
            raise errors.NoSuchId(self, file_id)
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1609
1610
    def has_id(self, file_id):
1611
        # Perhaps have an explicit 'contains' method on CHKMap ?
3735.2.25 by Robert Collins
CHKInventory core tests passing.
1612
        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.
1613
3735.2.49 by Robert Collins
Support is_root on CHKInventory objects.
1614
    def is_root(self, file_id):
1615
        return file_id == self.root_id
1616
3735.2.12 by Robert Collins
Implement commit-via-deltas for split inventory repositories.
1617
    def _iter_file_id_parents(self, file_id):
1618
        """Yield the parents of file_id up to the root."""
1619
        while file_id is not None:
1620
            try:
1621
                ie = self[file_id]
1622
            except KeyError:
3735.2.34 by Robert Collins
Mega-hack; hook in a nasty iter_changes based on CHKInventory.
1623
                raise errors.NoSuchId(tree=self, file_id=file_id)
3735.2.12 by Robert Collins
Implement commit-via-deltas for split inventory repositories.
1624
            yield ie
1625
            file_id = ie.parent_id
1626
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1627
    def __iter__(self):
1628
        """Iterate over the entire inventory contents; size-of-tree - beware!."""
3735.2.25 by Robert Collins
CHKInventory core tests passing.
1629
        for key, _ in self.id_to_entry.iteritems():
1630
            yield key[-1]
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1631
3735.7.16 by Vincent Ladeuil
Centralize CHK hacks.
1632
    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.
1633
        """Generate a Tree.iter_changes change list between this and basis.
1634
1635
        :param basis: Another CHKInventory.
1636
        :return: An iterator over the changes between self and basis, as per
1637
            tree.iter_changes().
1638
        """
1639
        # We want: (file_id, (path_in_source, path_in_target),
1640
        # changed_content, versioned, parent, name, kind,
1641
        # executable)
1642
        for key, basis_value, self_value in \
1643
            self.id_to_entry.iter_changes(basis.id_to_entry):
1644
            file_id = key[0]
1645
            if basis_value is not None:
1646
                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.
1647
                path_in_source = basis.id2path(file_id)
1648
                basis_parent = basis_entry.parent_id
1649
                basis_name = basis_entry.name
1650
                basis_executable = basis_entry.executable
1651
            else:
1652
                path_in_source = None
1653
                basis_parent = None
1654
                basis_name = None
1655
                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.
1656
            if self_value is not None:
1657
                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.
1658
                path_in_target = self.id2path(file_id)
1659
                self_parent = self_entry.parent_id
1660
                self_name = self_entry.name
1661
                self_executable = self_entry.executable
1662
            else:
1663
                path_in_target = None
1664
                self_parent = None
1665
                self_name = None
1666
                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.
1667
            if basis_value is None:
1668
                # add
1669
                kind = (None, self_entry.kind)
1670
                versioned = (False, True)
3735.2.34 by Robert Collins
Mega-hack; hook in a nasty iter_changes based on CHKInventory.
1671
            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.
1672
                # delete
1673
                kind = (basis_entry.kind, None)
1674
                versioned = (True, False)
1675
            else:
1676
                kind = (basis_entry.kind, self_entry.kind)
1677
                versioned = (True, True)
3735.2.34 by Robert Collins
Mega-hack; hook in a nasty iter_changes based on CHKInventory.
1678
            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.
1679
            if kind[0] != kind[1]:
1680
                changed_content = True
1681
            elif kind[0] == 'file':
1682
                if (self_entry.text_size != basis_entry.text_size or
1683
                    self_entry.text_sha1 != basis_entry.text_sha1):
1684
                    changed_content = True
3735.2.34 by Robert Collins
Mega-hack; hook in a nasty iter_changes based on CHKInventory.
1685
            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.
1686
                if self_entry.symlink_target != basis_entry.symlink_target:
1687
                    changed_content = True
3735.2.34 by Robert Collins
Mega-hack; hook in a nasty iter_changes based on CHKInventory.
1688
            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.
1689
                if (self_entry.reference_revision !=
1690
                    basis_entry.reference_revision):
1691
                    changed_content = True
3735.2.34 by Robert Collins
Mega-hack; hook in a nasty iter_changes based on CHKInventory.
1692
            parent = (basis_parent, self_parent)
1693
            name = (basis_name, self_name)
1694
            executable = (basis_executable, self_executable)
3735.7.5 by Vincent Ladeuil
Fix 19 intertree_implementations.test_compare.TestIterChanges failures.
1695
            if (not changed_content
1696
                and parent[0] == parent[1]
1697
                and name[0] == name[1]
1698
                and executable[0] == executable[1]):
1699
                # Could happen when only the revision changed for a directory
3735.7.6 by Vincent Ladeuil
Fix typo.
1700
                # for instance.
3735.7.5 by Vincent Ladeuil
Fix 19 intertree_implementations.test_compare.TestIterChanges failures.
1701
                continue
3735.2.33 by Robert Collins
Create a smoke-tested CHKInventory.iter_changes(CHKInventory) - incomplete in general but enough to start working with.
1702
            yield (file_id, (path_in_source, path_in_target), changed_content,
1703
                versioned, parent, name, kind, executable)
1704
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1705
    def __len__(self):
1706
        """Return the number of entries in the inventory."""
3735.2.17 by Robert Collins
Cache node length to avoid full iteration on __len__ calls.
1707
        return len(self.id_to_entry)
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1708
3735.2.47 by Robert Collins
Move '_make_inv_delta' onto Inventory (UNTESTED).
1709
    def _make_delta(self, old):
1710
        """Make an inventory delta from two inventories."""
1711
        if type(old) != CHKInventory:
1712
            return CommonInventory._make_delta(self, old)
1713
        delta = []
1714
        for key, old_value, self_value in \
1715
            self.id_to_entry.iter_changes(old.id_to_entry):
1716
            file_id = key[0]
1717
            if old_value is not None:
1718
                old_path = old.id2path(file_id)
1719
            else:
1720
                old_path = None
1721
            if self_value is not None:
1722
                entry = self._bytes_to_entry(self_value)
3735.2.51 by Robert Collins
Trivial cache of inventory entries after they are read by a specific inventory.
1723
                self._entry_cache[file_id] = entry
3735.2.47 by Robert Collins
Move '_make_inv_delta' onto Inventory (UNTESTED).
1724
                new_path = self.id2path(file_id)
1725
            else:
1726
                entry = None
1727
                new_path = None
1728
            delta.append((old_path, new_path, file_id, entry))
1729
        return delta
1730
3735.2.12 by Robert Collins
Implement commit-via-deltas for split inventory repositories.
1731
    def path2id(self, name):
1732
        """Walk down through directories to return entry of last component.
1733
1734
        names may be either a list of path components, or a single
1735
        string, in which case it is automatically split.
1736
1737
        This returns the entry of the last component in the path,
1738
        which may be either a file or a directory.
1739
1740
        Returns None IFF the path is not found.
1741
        """
1742
        if isinstance(name, basestring):
1743
            name = osutils.splitpath(name)
1744
1745
        # mutter("lookup path %r" % name)
1746
1747
        parent = self.root
1748
        if parent is None:
1749
            return None
1750
        for f in name:
1751
            try:
1752
                children = getattr(parent, 'children', None)
1753
                if children is None:
1754
                    return None
1755
                cie = children[f]
1756
                parent = cie
1757
            except KeyError:
1758
                # or raise an error?
1759
                return None
1760
        return parent.file_id
1761
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1762
    def to_lines(self):
1763
        """Serialise the inventory to lines."""
1764
        lines = ["chkinventory:\n"]
1765
        lines.append("revision_id: %s\n" % self.revision_id)
1766
        lines.append("root_id: %s\n" % self.root_id)
3735.16.7 by John Arbash Meinel
Start parameterizing CHKInventory and CHKSerializer so that we can
1767
        if self._search_key_name != 'plain':
1768
            lines.append('search_key_name: %s\n' % (self._search_key_name,))
3735.2.41 by Robert Collins
Make the parent_id_basename index be updated during CHKInventory.apply_delta.
1769
        if self.parent_id_basename_to_file_id is not None:
1770
            lines.append('parent_id_basename_to_file_id: %s\n' %
1771
                self.parent_id_basename_to_file_id.key())
3735.2.12 by Robert Collins
Implement commit-via-deltas for split inventory repositories.
1772
        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.
1773
        return lines
1774
1775
    @property
1776
    def root(self):
1777
        """Get the root entry."""
1778
        return self[self.root_id]
1779
1780
1781
class CHKInventoryDirectory(InventoryDirectory):
1782
    """A directory in an inventory."""
1783
1784
    __slots__ = ['text_sha1', 'text_size', 'file_id', 'name', 'kind',
1785
                 'text_id', 'parent_id', '_children', 'executable',
1786
                 'revision', 'symlink_target', 'reference_revision',
1787
                 '_chk_inventory']
1788
1789
    def __init__(self, file_id, name, parent_id, chk_inventory):
1790
        # Don't call InventoryDirectory.__init__ - it isn't right for this
1791
        # class.
1792
        InventoryEntry.__init__(self, file_id, name, parent_id)
1793
        self._children = None
1794
        self.kind = 'directory'
1795
        self._chk_inventory = chk_inventory
1796
1797
    @property
1798
    def children(self):
1799
        """Access the list of children of this inventory.
1800
3735.2.44 by Robert Collins
Teach CHKInventory with a parent_id_basename index how to load partial index contents.
1801
        With a parent_id_basename_to_file_id index, loads all the children,
1802
        without loads the entire index. Without is bad. A more sophisticated
1803
        proxy object might be nice, to allow partial loading of children as
1804
        well when specific names are accessed. (So path traversal can be
1805
        written in the obvious way but not examine siblings.).
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1806
        """
1807
        if self._children is not None:
1808
            return self._children
3735.2.44 by Robert Collins
Teach CHKInventory with a parent_id_basename index how to load partial index contents.
1809
        if self._chk_inventory.parent_id_basename_to_file_id is None:
1810
            # Slow path - read the entire inventory looking for kids.
1811
            result = {}
1812
            for file_id, bytes in self._chk_inventory.id_to_entry.iteritems():
1813
                entry = self._chk_inventory._bytes_to_entry(bytes)
1814
                if entry.parent_id == self.file_id:
1815
                    result[entry.name] = entry
1816
            self._children = result
1817
            return result
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1818
        result = {}
3735.2.44 by Robert Collins
Teach CHKInventory with a parent_id_basename index how to load partial index contents.
1819
        # XXX: Todo - use proxy objects for the children rather than loading
1820
        # all when the attribute is referenced.
1821
        parent_id_index = self._chk_inventory.parent_id_basename_to_file_id
1822
        child_ids = set()
1823
        for (parent_id, name_utf8), file_id in parent_id_index.iteritems(
1824
            key_filter=[(self.file_id,)]):
1825
            child_ids.add((file_id,))
3735.2.51 by Robert Collins
Trivial cache of inventory entries after they are read by a specific inventory.
1826
        cached = set()
1827
        for file_id in child_ids:
1828
            entry = self._chk_inventory._entry_cache.get(file_id, None)
1829
            if entry is not None:
1830
                result[entry.name] = entry
1831
                cached.add(file_id)
1832
        child_ids.difference_update(cached)
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1833
        # 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.
1834
        id_to_entry = self._chk_inventory.id_to_entry
1835
        for file_id, bytes in id_to_entry.iteritems(child_ids):
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1836
            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.
1837
            result[entry.name] = entry
3735.2.51 by Robert Collins
Trivial cache of inventory entries after they are read by a specific inventory.
1838
            self._chk_inventory._entry_cache[file_id] = entry
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1839
        self._children = result
1840
        return result
1841
1842
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.
1843
entry_factory = {
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
1844
    'directory': InventoryDirectory,
1845
    'file': InventoryFile,
1846
    'symlink': InventoryLink,
2255.6.8 by Aaron Bentley
Merge refactoring of add_reference
1847
    '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.
1848
}
1849
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)
1850
def make_entry(kind, name, parent_id, file_id=None):
1851
    """Create an inventory entry.
1852
1853
    :param kind: the type of inventory entry to create.
1854
    :param name: the basename of the entry.
1855
    :param parent_id: the parent_id of the entry.
1856
    :param file_id: the file_id to use. if None, one will be created.
1857
    """
1858
    if file_id is None:
2116.4.1 by John Arbash Meinel
Update file and revision id generators.
1859
        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
1860
    name = ensure_normalized_name(name)
1861
    try:
1862
        factory = entry_factory[kind]
1863
    except KeyError:
1864
        raise BzrError("unknown kind %r" % kind)
1865
    return factory(file_id, name, parent_id)
1866
1867
1868
def ensure_normalized_name(name):
1869
    """Normalize name.
1870
1871
    :raises InvalidNormalization: When name is not normalized, and cannot be
1872
        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
1873
    :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
1874
    """
2255.2.54 by Robert Collins
Add in non-normalized filename sanity check to dirstate add().
1875
    #------- This has been copied to bzrlib.dirstate.DirState.add, please
1876
    # 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.
1877
    # we dont import normalized_filename directly because we want to be
1878
    # able to change the implementation at runtime for tests.
1830.3.5 by John Arbash Meinel
make_entry refuses to create non-normalized entries.
1879
    norm_name, can_access = osutils.normalized_filename(name)
1880
    if norm_name != name:
1881
        if can_access:
2825.6.1 by Robert Collins
* ``WorkingTree.rename_one`` will now raise an error if normalisation of the
1882
            return norm_name
1830.3.5 by John Arbash Meinel
make_entry refuses to create non-normalized entries.
1883
        else:
1884
            # TODO: jam 20060701 This would probably be more useful
1885
            #       if the error was raised with the full path
1886
            raise errors.InvalidNormalization(name)
2825.6.1 by Robert Collins
* ``WorkingTree.rename_one`` will now raise an error if normalisation of the
1887
    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)
1888
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
1889
1077 by Martin Pool
- avoid compiling REs at module load time
1890
_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
1891
1892
def is_valid_name(name):
1077 by Martin Pool
- avoid compiling REs at module load time
1893
    global _NAME_RE
1753.1.4 by Robert Collins
Fixup '== None' usage in inventory.py.
1894
    if _NAME_RE is None:
1077 by Martin Pool
- avoid compiling REs at module load time
1895
        _NAME_RE = re.compile(r'^[^/\\]+$')
1896
        
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
1897
    return bool(_NAME_RE.match(name))