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