/brz/remove-bazaar

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