~bzr-pqm/bzr/bzr.dev

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
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
30
import os
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
31
import re
32
import sys
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
33
34
from bzrlib.lazy_import import lazy_import
35
lazy_import(globals(), """
36
import collections
1399.1.6 by Robert Collins
move exporting functionality into inventory.py - uncovers bug in symlink support
37
import tarfile
1 by mbp at sourcefrog
import from baz patch-364
38
800 by Martin Pool
Merge John's import-speedup branch:
39
import bzrlib
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
40
from bzrlib import (
41
    errors,
2116.4.1 by John Arbash Meinel
Update file and revision id generators.
42
    generate_ids,
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
43
    osutils,
44
    symbol_versioning,
2094.3.5 by John Arbash Meinel
Fix imports to ensure modules are loaded before they are used
45
    workingtree,
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
46
    )
47
""")
48
49
from bzrlib.errors import (
50
    BzrCheckError,
51
    BzrError,
52
    )
3577.2.1 by Ian Clatworthy
deprecate export-related InventoryEntry methods and refactor export code accordingly
53
from bzrlib.symbol_versioning import deprecated_in, deprecated_method
70 by mbp at sourcefrog
Prepare for smart recursive add.
54
from bzrlib.trace import mutter
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
55
1 by mbp at sourcefrog
import from baz patch-364
56
802 by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions
57
class InventoryEntry(object):
1 by mbp at sourcefrog
import from baz patch-364
58
    """Description of a versioned file.
59
60
    An InventoryEntry has the following fields, which are also
61
    present in the XML inventory-entry element:
62
1197 by Martin Pool
doc
63
    file_id
64
65
    name
66
        (within the parent directory)
67
68
    parent_id
69
        file_id of the parent directory, or ROOT_ID
70
1092.2.21 by Robert Collins
convert name_version to revision in inventory entries
71
    revision
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
72
        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
73
        introduced.
1197 by Martin Pool
doc
74
1398 by Robert Collins
integrate in Gustavos x-bit patch
75
    executable
76
        Indicates that this file should be executable on systems
77
        that support it.
78
1197 by Martin Pool
doc
79
    text_sha1
80
        sha-1 of the text of the file
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
81
1197 by Martin Pool
doc
82
    text_size
83
        size in bytes of the text of the file
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
84
1197 by Martin Pool
doc
85
    (reading a version 4 tree created a text_id field.)
1 by mbp at sourcefrog
import from baz patch-364
86
87
    >>> i = Inventory()
88
    >>> i.path2id('')
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
89
    'TREE_ROOT'
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
90
    >>> i.add(InventoryDirectory('123', 'src', ROOT_ID))
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
91
    InventoryDirectory('123', 'src', parent_id='TREE_ROOT', revision=None)
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
92
    >>> i.add(InventoryFile('2323', 'hello.c', parent_id='123'))
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
93
    InventoryFile('2323', 'hello.c', parent_id='123', sha1=None, len=None)
1996.3.13 by John Arbash Meinel
Fix the inventory doc tests
94
    >>> shouldbe = {0: '', 1: 'src', 2: 'src/hello.c'}
1185.16.151 by Martin Pool
[patch] win32 fix for InventoryEntry doctest (Alexander, patch 21)
95
    >>> for ix, j in enumerate(i.iter_entries()):
96
    ...   print (j[0] == shouldbe[ix], j[1])
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
97
    ...
2294.1.8 by John Arbash Meinel
Fix one doc test in Inventory which expected a plain str
98
    (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.
99
    (True, InventoryDirectory('123', 'src', parent_id='TREE_ROOT', revision=None))
100
    (True, InventoryFile('2323', 'hello.c', parent_id='123', sha1=None, len=None))
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
101
    >>> i.add(InventoryFile('2324', 'bye.c', '123'))
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
102
    InventoryFile('2324', 'bye.c', parent_id='123', sha1=None, len=None)
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
103
    >>> i.add(InventoryDirectory('2325', 'wibble', '123'))
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
104
    InventoryDirectory('2325', 'wibble', parent_id='123', revision=None)
1 by mbp at sourcefrog
import from baz patch-364
105
    >>> i.path2id('src/wibble')
106
    '2325'
107
    >>> '2325' in i
108
    True
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
109
    >>> i.add(InventoryFile('2326', 'wibble.c', '2325'))
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
110
    InventoryFile('2326', 'wibble.c', parent_id='2325', sha1=None, len=None)
1 by mbp at sourcefrog
import from baz patch-364
111
    >>> i['2326']
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
112
    InventoryFile('2326', 'wibble.c', parent_id='2325', sha1=None, len=None)
1185.1.40 by Robert Collins
Merge what applied of Alexander Belchenko's win32 patch.
113
    >>> 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 \
114
    ...     print path
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
115
    ...
1852.6.6 by Robert Collins
Finish updating iter_entries change to make all tests pass.
116
    <BLANKLINE>
1 by mbp at sourcefrog
import from baz patch-364
117
    src
118
    src/bye.c
119
    src/hello.c
120
    src/wibble
121
    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 \
122
    >>> i.id2path('2326')
1 by mbp at sourcefrog
import from baz patch-364
123
    'src/wibble/wibble.c'
124
    """
1668.1.5 by Martin Pool
[broken] fix up display of files changed by a commit
125
126
    # Constants returned by describe_change()
127
    #
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
128
    # TODO: These should probably move to some kind of FileChangeDescription
129
    # 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
130
    # generate them just for one file at a time.
131
    RENAMED = 'renamed'
132
    MODIFIED_AND_RENAMED = 'modified and renamed'
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
133
1757.2.10 by Robert Collins
Give all inventory entries __slots__ that are useful with the current codebase.
134
    __slots__ = []
1092.2.23 by Robert Collins
move inventory entry centric snapshot taking logic to inventory.py
135
1399.1.3 by Robert Collins
move change detection for text and metadata from delta to entry.detect_changes
136
    def detect_changes(self, old_entry):
137
        """Return a (text_modified, meta_modified) from this to old_entry.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
138
139
        _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
140
        calling detect_changes.
141
        """
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
142
        return False, False
1399.1.3 by Robert Collins
move change detection for text and metadata from delta to entry.detect_changes
143
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
144
    def _diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree,
145
             output_to, reverse=False):
146
        """Perform a diff between two entries of the same kind."""
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
147
2776.3.1 by Robert Collins
* Deprecated method ``find_previous_heads`` on
148
    def parent_candidates(self, previous_inventories):
149
        """Find possible per-file graph parents.
150
151
        This is currently defined by:
152
         - Select the last changed revision in the parent inventory.
153
         - Do deal with a short lived bug in bzr 0.8's development two entries
154
           that have the same last changed but different 'x' bit settings are
155
           changed in-place.
1409 by Robert Collins
unify previous inventory entry parent logic in preparation for fixing the revision-thrashing bug
156
        """
1596.2.20 by Robert Collins
optimise commit to only access weaves for merged, or altered files during commit.
157
        # revision:ie mapping for each ie found in previous_inventories.
158
        candidates = {}
159
        # identify candidate head revision ids.
1409 by Robert Collins
unify previous inventory entry parent logic in preparation for fixing the revision-thrashing bug
160
        for inv in previous_inventories:
161
            if self.file_id in inv:
162
                ie = inv[self.file_id]
1596.2.20 by Robert Collins
optimise commit to only access weaves for merged, or altered files during commit.
163
                if ie.revision in candidates:
164
                    # same revision value in two different inventories:
165
                    # correct possible inconsistencies:
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
166
                    #     * 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.
167
                    #       support.
1185.1.51 by Robert Collins
merge in reweave support
168
                    try:
1596.2.20 by Robert Collins
optimise commit to only access weaves for merged, or altered files during commit.
169
                        if candidates[ie.revision].executable != ie.executable:
170
                            candidates[ie.revision].executable = False
1185.1.51 by Robert Collins
merge in reweave support
171
                            ie.executable = False
172
                    except AttributeError:
173
                        pass
1409 by Robert Collins
unify previous inventory entry parent logic in preparation for fixing the revision-thrashing bug
174
                else:
1596.2.20 by Robert Collins
optimise commit to only access weaves for merged, or altered files during commit.
175
                    # add this revision as a candidate.
176
                    candidates[ie.revision] = ie
2776.3.1 by Robert Collins
* Deprecated method ``find_previous_heads`` on
177
        return candidates
178
3577.2.1 by Ian Clatworthy
deprecate export-related InventoryEntry methods and refactor export code accordingly
179
    @deprecated_method(deprecated_in((1, 6, 0)))
1399.1.6 by Robert Collins
move exporting functionality into inventory.py - uncovers bug in symlink support
180
    def get_tar_item(self, root, dp, now, tree):
1399.1.7 by Robert Collins
implement symlink exporting to tarballs
181
        """Get a tarfile item and a file stream for its content."""
1996.3.20 by John Arbash Meinel
[merge] bzr.dev 2063
182
        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
183
        # TODO: would be cool to actually set it to the timestamp of the
184
        # revision it was last changed
185
        item.mtime = now
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
186
        fileobj = self._put_in_tar(item, tree)
1399.1.6 by Robert Collins
move exporting functionality into inventory.py - uncovers bug in symlink support
187
        return item, fileobj
188
1399.1.5 by Robert Collins
move checking whether an entry stores text into inventory.py from fetch,py
189
    def has_text(self):
190
        """Return true if the object this entry represents has textual data.
191
192
        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
193
194
        Also note that all entries get weave files created for them.
195
        This attribute is primarily used when upgrading from old trees that
196
        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
197
        """
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
198
        return False
1399.1.5 by Robert Collins
move checking whether an entry stores text into inventory.py from fetch,py
199
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
200
    def __init__(self, file_id, name, parent_id, text_id=None):
1 by mbp at sourcefrog
import from baz patch-364
201
        """Create an InventoryEntry
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
202
1 by mbp at sourcefrog
import from baz patch-364
203
        The filename must be a single component, relative to the
204
        parent directory; it cannot be a whole path or relative name.
205
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
206
        >>> e = InventoryFile('123', 'hello.c', ROOT_ID)
1 by mbp at sourcefrog
import from baz patch-364
207
        >>> e.name
208
        'hello.c'
209
        >>> e.file_id
210
        '123'
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
211
        >>> e = InventoryFile('123', 'src/hello.c', ROOT_ID)
1 by mbp at sourcefrog
import from baz patch-364
212
        Traceback (most recent call last):
1185.16.63 by Martin Pool
- more error conversion
213
        InvalidEntryName: Invalid entry name: src/hello.c
1 by mbp at sourcefrog
import from baz patch-364
214
        """
376 by Martin Pool
- fix slow invariant check when reading in InventoryEntry objects
215
        if '/' in name or '\\' in name:
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
216
            raise errors.InvalidEntryName(name=name)
1398 by Robert Collins
integrate in Gustavos x-bit patch
217
        self.executable = False
1092.2.21 by Robert Collins
convert name_version to revision in inventory entries
218
        self.revision = None
955 by Martin Pool
- use __slots__ on InventoryEntry; rather faster
219
        self.text_sha1 = None
220
        self.text_size = None
1 by mbp at sourcefrog
import from baz patch-364
221
        self.file_id = file_id
222
        self.name = name
223
        self.text_id = text_id
224
        self.parent_id = parent_id
1092.2.6 by Robert Collins
symlink support updated to work
225
        self.symlink_target = None
2255.2.220 by Robert Collins
Fix failing detection of changes restricted to subtrees causing spurious pointless commit errors.
226
        self.reference_revision = None
237 by mbp at sourcefrog
- Better assertions in InventoryEntry constructor
227
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
228
    def kind_character(self):
229
        """Return a short kind indicator useful for appending to names."""
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
230
        raise BzrError('unknown kind %r' % self.kind)
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
231
1731.1.2 by Aaron Bentley
Removed all remaining uses of root_directory
232
    known_kinds = ('file', 'directory', 'symlink')
1 by mbp at sourcefrog
import from baz patch-364
233
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
234
    def _put_in_tar(self, item, tree):
235
        """populate item for stashing in a tar, and return the content stream.
236
237
        If no content is available, return None.
238
        """
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
239
        raise BzrError("don't know how to export {%s} of kind %r" %
240
                       (self.file_id, self.kind))
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
241
3577.2.1 by Ian Clatworthy
deprecate export-related InventoryEntry methods and refactor export code accordingly
242
    @deprecated_method(deprecated_in((1, 6, 0)))
1399.1.6 by Robert Collins
move exporting functionality into inventory.py - uncovers bug in symlink support
243
    def put_on_disk(self, dest, dp, tree):
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
244
        """Create a representation of self on disk in the prefix dest.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
245
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
246
        This is a template method - implement _put_on_disk in subclasses.
247
        """
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
248
        fullpath = osutils.pathjoin(dest, dp)
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
249
        self._put_on_disk(fullpath, tree)
1711.2.101 by John Arbash Meinel
Clean up some unnecessary mutter() calls
250
        # mutter("  export {%s} kind %s to %s", self.file_id,
251
        #         self.kind, fullpath)
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
252
253
    def _put_on_disk(self, fullpath, tree):
254
        """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
255
        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
256
156 by mbp at sourcefrog
new "directories" command
257
    def sorted_children(self):
1757.2.13 by Robert Collins
Tweak InventoryEntry.sorted_children to be simpler.
258
        return sorted(self.children.items())
156 by mbp at sourcefrog
new "directories" command
259
1399.1.1 by Robert Collins
move checks for versionability of file kinds into InventoryEntry
260
    @staticmethod
261
    def versionable_kind(kind):
2100.3.1 by Aaron Bentley
Start roundtripping tree-reference entries
262
        return (kind in ('file', 'directory', 'symlink', 'tree-reference'))
1399.1.1 by Robert Collins
move checks for versionability of file kinds into InventoryEntry
263
1092.2.20 by Robert Collins
symlink and weaves, whaddya know
264
    def check(self, checker, rev_id, inv, tree):
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
265
        """Check this inventory entry is intact.
266
267
        This is a template method, override _check for kind specific
268
        tests.
1616.1.5 by Martin Pool
Cleanup and document some check code
269
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
270
        :param checker: Check object providing context for the checks;
1616.1.5 by Martin Pool
Cleanup and document some check code
271
             can be used to find out what parts of the repository have already
272
             been checked.
273
        :param rev_id: Revision id from which this InventoryEntry was loaded.
274
             Not necessarily the last-changed revision for this file.
275
        :param inv: Inventory from which the entry was loaded.
276
        :param tree: RevisionTree for this entry.
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
277
        """
1757.2.11 by Robert Collins
Correct bzr diff | less= None clauses in inventory.py to be is not None.
278
        if self.parent_id is not None:
1092.2.20 by Robert Collins
symlink and weaves, whaddya know
279
            if not inv.has_id(self.parent_id):
280
                raise BzrCheckError('missing parent {%s} in inventory for revision {%s}'
281
                        % (self.parent_id, rev_id))
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
282
        self._check(checker, rev_id, tree)
283
284
    def _check(self, checker, rev_id, tree):
285
        """Check this inventory entry for kind specific errors."""
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
286
        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
287
                            (self.kind, rev_id))
1092.2.20 by Robert Collins
symlink and weaves, whaddya know
288
1 by mbp at sourcefrog
import from baz patch-364
289
    def copy(self):
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
290
        """Clone this inventory entry."""
291
        raise NotImplementedError
1 by mbp at sourcefrog
import from baz patch-364
292
1668.1.5 by Martin Pool
[broken] fix up display of files changed by a commit
293
    @staticmethod
294
    def describe_change(old_entry, new_entry):
295
        """Describe the change between old_entry and this.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
296
1668.1.5 by Martin Pool
[broken] fix up display of files changed by a commit
297
        This smells of being an InterInventoryEntry situation, but as its
298
        the first one, we're making it a static method for now.
299
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
300
        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
301
        to be renamed. Reparenting is an internal detail.
302
        Note that renaming the parent does not trigger a rename for the
303
        child entry itself.
1669.2.1 by Martin Pool
verbose commit now specifically identifies modified/renamed/reparented files
304
        """
1668.1.5 by Martin Pool
[broken] fix up display of files changed by a commit
305
        # TODO: Perhaps return an object rather than just a string
306
        if old_entry is new_entry:
307
            # also the case of both being None
308
            return 'unchanged'
309
        elif old_entry is None:
1092.2.23 by Robert Collins
move inventory entry centric snapshot taking logic to inventory.py
310
            return 'added'
1668.1.5 by Martin Pool
[broken] fix up display of files changed by a commit
311
        elif new_entry is None:
312
            return 'removed'
1959.4.1 by Aaron Bentley
Correctly handle all file kind changes
313
        if old_entry.kind != new_entry.kind:
314
            return 'modified'
1668.1.5 by Martin Pool
[broken] fix up display of files changed by a commit
315
        text_modified, meta_modified = new_entry.detect_changes(old_entry)
316
        if text_modified or meta_modified:
317
            modified = True
318
        else:
319
            modified = False
320
        # TODO 20060511 (mbp, rbc) factor out 'detect_rename' here.
321
        if old_entry.parent_id != new_entry.parent_id:
322
            renamed = True
323
        elif old_entry.name != new_entry.name:
324
            renamed = True
325
        else:
326
            renamed = False
327
        if renamed and not modified:
328
            return InventoryEntry.RENAMED
329
        if modified and not renamed:
330
            return 'modified'
331
        if modified and renamed:
332
            return InventoryEntry.MODIFIED_AND_RENAMED
333
        return 'unchanged'
1 by mbp at sourcefrog
import from baz patch-364
334
335
    def __repr__(self):
1733.1.4 by Robert Collins
Cosmetic niceties for debugging, extra comments etc.
336
        return ("%s(%r, %r, parent_id=%r, revision=%r)"
1 by mbp at sourcefrog
import from baz patch-364
337
                % (self.__class__.__name__,
338
                   self.file_id,
339
                   self.name,
1733.1.4 by Robert Collins
Cosmetic niceties for debugging, extra comments etc.
340
                   self.parent_id,
341
                   self.revision))
1 by mbp at sourcefrog
import from baz patch-364
342
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
343
    def __eq__(self, other):
3882.6.16 by John Arbash Meinel
Update InventoryEntry.__eq__ in case we enable caching without .copy()
344
        if other is self:
345
            # For the case when objects are cached
346
            return True
1 by mbp at sourcefrog
import from baz patch-364
347
        if not isinstance(other, InventoryEntry):
348
            return NotImplemented
349
1398 by Robert Collins
integrate in Gustavos x-bit patch
350
        return ((self.file_id == other.file_id)
351
                and (self.name == other.name)
352
                and (other.symlink_target == self.symlink_target)
353
                and (self.text_sha1 == other.text_sha1)
354
                and (self.text_size == other.text_size)
355
                and (self.text_id == other.text_id)
356
                and (self.parent_id == other.parent_id)
357
                and (self.kind == other.kind)
358
                and (self.revision == other.revision)
359
                and (self.executable == other.executable)
2255.2.220 by Robert Collins
Fix failing detection of changes restricted to subtrees causing spurious pointless commit errors.
360
                and (self.reference_revision == other.reference_revision)
1398 by Robert Collins
integrate in Gustavos x-bit patch
361
                )
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
362
363
    def __ne__(self, other):
364
        return not (self == other)
365
366
    def __hash__(self):
367
        raise ValueError('not hashable')
1 by mbp at sourcefrog
import from baz patch-364
368
1405 by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave
369
    def _unchanged(self, previous_ie):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
370
        """Has this entry changed relative to previous_ie.
371
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
372
        This method should be overridden in child classes.
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
373
        """
1092.2.22 by Robert Collins
text_version and name_version unification looking reasonable
374
        compatible = True
375
        # different inv parent
376
        if previous_ie.parent_id != self.parent_id:
377
            compatible = False
378
        # renamed
379
        elif previous_ie.name != self.name:
380
            compatible = False
2374.2.2 by John Arbash Meinel
Fix the small bug that ie.snapshot() didn't think about kind changes.
381
        elif previous_ie.kind != self.kind:
382
            compatible = False
1092.2.22 by Robert Collins
text_version and name_version unification looking reasonable
383
        return compatible
384
1185.12.33 by Aaron Bentley
Fixed symlink reverting
385
    def _read_tree_state(self, path, work_tree):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
386
        """Populate fields in the inventory entry from the given tree.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
387
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
388
        Note that this should be modified to be a noop on virtual trees
389
        as all entries created there are prepopulated.
390
        """
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
391
        # TODO: Rather than running this manually, we should check the
1185.16.5 by Martin Pool
doc
392
        # working sha1 and other expensive properties when they're
393
        # first requested, or preload them if they're already known
394
        pass            # nothing to do by default
1092.2.23 by Robert Collins
move inventory entry centric snapshot taking logic to inventory.py
395
1534.7.175 by Aaron Bentley
Ensured revert writes a normal inventory
396
    def _forget_tree_state(self):
397
        pass
398
1 by mbp at sourcefrog
import from baz patch-364
399
1907.1.4 by Aaron Bentley
Restore RootEntry, but mark it deprecated, restore EmptyTree.kind
400
class RootEntry(InventoryEntry):
401
402
    __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.
403
                 'text_id', 'parent_id', 'children', 'executable',
404
                 'revision', 'symlink_target', 'reference_revision']
1907.1.4 by Aaron Bentley
Restore RootEntry, but mark it deprecated, restore EmptyTree.kind
405
406
    def _check(self, checker, rev_id, tree):
407
        """See InventoryEntry._check"""
408
409
    def __init__(self, file_id):
410
        self.file_id = file_id
411
        self.children = {}
412
        self.kind = 'directory'
413
        self.parent_id = None
414
        self.name = u''
415
        self.revision = None
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
416
        symbol_versioning.warn('RootEntry is deprecated as of bzr 0.10.'
417
                               '  Please use InventoryDirectory instead.',
418
                               DeprecationWarning, stacklevel=2)
1907.1.4 by Aaron Bentley
Restore RootEntry, but mark it deprecated, restore EmptyTree.kind
419
420
    def __eq__(self, other):
421
        if not isinstance(other, RootEntry):
422
            return NotImplemented
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
423
1907.1.4 by Aaron Bentley
Restore RootEntry, but mark it deprecated, restore EmptyTree.kind
424
        return (self.file_id == other.file_id) \
425
               and (self.children == other.children)
426
427
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
428
class InventoryDirectory(InventoryEntry):
429
    """A directory in an inventory."""
430
1757.2.10 by Robert Collins
Give all inventory entries __slots__ that are useful with the current codebase.
431
    __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.
432
                 'text_id', 'parent_id', 'children', 'executable',
433
                 'revision', 'symlink_target', 'reference_revision']
1757.2.10 by Robert Collins
Give all inventory entries __slots__ that are useful with the current codebase.
434
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
435
    def _check(self, checker, rev_id, tree):
436
        """See InventoryEntry._check"""
1757.2.11 by Robert Collins
Correct bzr diff | less= None clauses in inventory.py to be is not None.
437
        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
438
            raise BzrCheckError('directory {%s} has text in revision {%s}'
439
                                % (self.file_id, rev_id))
440
441
    def copy(self):
442
        other = InventoryDirectory(self.file_id, self.name, self.parent_id)
443
        other.revision = self.revision
444
        # note that children are *not* copied; they're pulled across when
445
        # others are added
446
        return other
447
448
    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
449
        super(InventoryDirectory, self).__init__(file_id, name, parent_id)
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
450
        self.children = {}
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
451
        self.kind = 'directory'
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
452
453
    def kind_character(self):
454
        """See InventoryEntry.kind_character."""
455
        return '/'
456
457
    def _put_in_tar(self, item, tree):
458
        """See InventoryEntry._put_in_tar."""
459
        item.type = tarfile.DIRTYPE
460
        fileobj = None
461
        item.name += '/'
462
        item.size = 0
463
        item.mode = 0755
464
        return fileobj
465
466
    def _put_on_disk(self, fullpath, tree):
467
        """See InventoryEntry._put_on_disk."""
468
        os.mkdir(fullpath)
469
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
470
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
471
class InventoryFile(InventoryEntry):
472
    """A file in an inventory."""
473
1757.2.10 by Robert Collins
Give all inventory entries __slots__ that are useful with the current codebase.
474
    __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.
475
                 'text_id', 'parent_id', 'children', 'executable',
476
                 'revision', 'symlink_target', 'reference_revision']
1757.2.10 by Robert Collins
Give all inventory entries __slots__ that are useful with the current codebase.
477
1616.1.5 by Martin Pool
Cleanup and document some check code
478
    def _check(self, checker, tree_revision_id, tree):
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
479
        """See InventoryEntry._check"""
3350.8.3 by Robert Collins
VF.get_sha1s needed changing to be stackable.
480
        key = (self.file_id, self.revision)
481
        if key in checker.checked_texts:
482
            prev_sha = checker.checked_texts[key]
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
483
            if prev_sha != self.text_sha1:
2745.6.41 by Andrew Bennetts
Test repo.check against all_scenarios.
484
                raise BzrCheckError(
485
                    'mismatched sha1 on {%s} in {%s} (%s != %s) %r' %
486
                    (self.file_id, tree_revision_id, prev_sha, self.text_sha1,
487
                     t))
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
488
            else:
489
                checker.repeated_text_cnt += 1
490
                return
1185.50.28 by John Arbash Meinel
Lots of updates for 'bzr check'
491
1616.1.7 by Martin Pool
New developer commands 'weave-list' and 'weave-join'.
492
        checker.checked_text_cnt += 1
1185.50.28 by John Arbash Meinel
Lots of updates for 'bzr check'
493
        # We can't check the length, because Weave doesn't store that
494
        # information, and the whole point of looking at the weave's
495
        # 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.
496
        if (self.text_sha1 != tree._repository.texts.get_sha1s([key])[key]):
497
            raise BzrCheckError('text {%s} version {%s} wrong sha1' % key)
498
        checker.checked_texts[key] = self.text_sha1
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
499
500
    def copy(self):
501
        other = InventoryFile(self.file_id, self.name, self.parent_id)
502
        other.executable = self.executable
503
        other.text_id = self.text_id
504
        other.text_sha1 = self.text_sha1
505
        other.text_size = self.text_size
506
        other.revision = self.revision
507
        return other
508
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
509
    def detect_changes(self, old_entry):
510
        """See InventoryEntry.detect_changes."""
511
        text_modified = (self.text_sha1 != old_entry.text_sha1)
512
        meta_modified = (self.executable != old_entry.executable)
513
        return text_modified, meta_modified
514
515
    def _diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree,
516
             output_to, reverse=False):
517
        """See InventoryEntry._diff."""
3009.2.22 by Aaron Bentley
Update names & docstring
518
        from bzrlib.diff import DiffText
3009.2.5 by Aaron Bentley
Factor symlink and file diffing into differ
519
        from_file_id = self.file_id
520
        if to_entry:
521
            to_file_id = to_entry.file_id
522
        else:
523
            to_file_id = None
524
        if reverse:
525
            to_file_id, from_file_id = from_file_id, to_file_id
526
            tree, to_tree = to_tree, tree
527
            from_label, to_label = to_label, from_label
3009.2.22 by Aaron Bentley
Update names & docstring
528
        differ = DiffText(tree, to_tree, output_to, 'utf-8', '', '',
529
                          text_diff)
3009.2.5 by Aaron Bentley
Factor symlink and file diffing into differ
530
        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
531
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
532
    def has_text(self):
533
        """See InventoryEntry.has_text."""
534
        return True
535
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
536
    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
537
        super(InventoryFile, self).__init__(file_id, name, parent_id)
538
        self.kind = 'file'
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
539
540
    def kind_character(self):
541
        """See InventoryEntry.kind_character."""
542
        return ''
543
544
    def _put_in_tar(self, item, tree):
545
        """See InventoryEntry._put_in_tar."""
546
        item.type = tarfile.REGTYPE
547
        fileobj = tree.get_file(self.file_id)
548
        item.size = self.text_size
549
        if tree.is_executable(self.file_id):
550
            item.mode = 0755
551
        else:
552
            item.mode = 0644
553
        return fileobj
554
555
    def _put_on_disk(self, fullpath, tree):
556
        """See InventoryEntry._put_on_disk."""
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
557
        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
558
        if tree.is_executable(self.file_id):
559
            os.chmod(fullpath, 0755)
560
1185.12.33 by Aaron Bentley
Fixed symlink reverting
561
    def _read_tree_state(self, path, work_tree):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
562
        """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
563
        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.
564
        # FIXME: 20050930 probe for the text size when getting sha1
565
        # in _read_tree_state
1732.1.19 by John Arbash Meinel
If you have the path, use it rather than looking it up again
566
        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
567
1733.1.4 by Robert Collins
Cosmetic niceties for debugging, extra comments etc.
568
    def __repr__(self):
569
        return ("%s(%r, %r, parent_id=%r, sha1=%r, len=%s)"
570
                % (self.__class__.__name__,
571
                   self.file_id,
572
                   self.name,
573
                   self.parent_id,
574
                   self.text_sha1,
575
                   self.text_size))
576
1534.7.175 by Aaron Bentley
Ensured revert writes a normal inventory
577
    def _forget_tree_state(self):
578
        self.text_sha1 = None
579
1405 by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave
580
    def _unchanged(self, previous_ie):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
581
        """See InventoryEntry._unchanged."""
1405 by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave
582
        compatible = super(InventoryFile, self)._unchanged(previous_ie)
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
583
        if self.text_sha1 != previous_ie.text_sha1:
584
            compatible = False
585
        else:
586
            # FIXME: 20050930 probe for the text size when getting sha1
587
            # in _read_tree_state
588
            self.text_size = previous_ie.text_size
1185.1.52 by Robert Collins
fix detection of changes in inventory entries when the x bit is toggled
589
        if self.executable != previous_ie.executable:
590
            compatible = False
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
591
        return compatible
592
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
593
594
class InventoryLink(InventoryEntry):
595
    """A file in an inventory."""
596
1757.2.10 by Robert Collins
Give all inventory entries __slots__ that are useful with the current codebase.
597
    __slots__ = ['text_sha1', 'text_size', 'file_id', 'name', 'kind',
2255.2.220 by Robert Collins
Fix failing detection of changes restricted to subtrees causing spurious pointless commit errors.
598
                 'text_id', 'parent_id', 'children', 'executable',
599
                 'revision', 'symlink_target', 'reference_revision']
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
600
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
601
    def _check(self, checker, rev_id, tree):
602
        """See InventoryEntry._check"""
1757.2.11 by Robert Collins
Correct bzr diff | less= None clauses in inventory.py to be is not None.
603
        if self.text_sha1 is not None or self.text_size is not None or self.text_id is not None:
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
604
            raise BzrCheckError('symlink {%s} has text in revision {%s}'
605
                    % (self.file_id, rev_id))
1753.1.4 by Robert Collins
Fixup '== None' usage in inventory.py.
606
        if self.symlink_target is None:
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
607
            raise BzrCheckError('symlink {%s} has no target in revision {%s}'
608
                    % (self.file_id, rev_id))
609
610
    def copy(self):
611
        other = InventoryLink(self.file_id, self.name, self.parent_id)
612
        other.symlink_target = self.symlink_target
613
        other.revision = self.revision
614
        return other
615
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
616
    def detect_changes(self, old_entry):
617
        """See InventoryEntry.detect_changes."""
618
        # FIXME: which _modified field should we use ? RBC 20051003
619
        text_modified = (self.symlink_target != old_entry.symlink_target)
620
        if text_modified:
621
            mutter("    symlink target changed")
622
        meta_modified = False
623
        return text_modified, meta_modified
624
625
    def _diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree,
626
             output_to, reverse=False):
627
        """See InventoryEntry._diff."""
3009.2.22 by Aaron Bentley
Update names & docstring
628
        from bzrlib.diff import DiffSymlink
3009.2.5 by Aaron Bentley
Factor symlink and file diffing into differ
629
        old_target = self.symlink_target
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
630
        if to_entry is not None:
3009.2.5 by Aaron Bentley
Factor symlink and file diffing into differ
631
            new_target = to_entry.symlink_target
632
        else:
633
            new_target = None
634
        if not reverse:
635
            old_tree = tree
636
            new_tree = to_tree
637
        else:
638
            old_tree = to_tree
639
            new_tree = tree
640
            new_target, old_target = old_target, new_target
3009.2.22 by Aaron Bentley
Update names & docstring
641
        differ = DiffSymlink(old_tree, new_tree, output_to)
3009.2.5 by Aaron Bentley
Factor symlink and file diffing into differ
642
        return differ.diff_symlink(old_target, new_target)
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
643
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
644
    def __init__(self, file_id, name, parent_id):
645
        super(InventoryLink, self).__init__(file_id, name, parent_id)
646
        self.kind = 'symlink'
647
648
    def kind_character(self):
649
        """See InventoryEntry.kind_character."""
650
        return ''
651
652
    def _put_in_tar(self, item, tree):
653
        """See InventoryEntry._put_in_tar."""
1185.33.3 by Martin Pool
[merge] jelmer
654
        item.type = tarfile.SYMTYPE
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
655
        fileobj = None
656
        item.size = 0
657
        item.mode = 0755
658
        item.linkname = self.symlink_target
659
        return fileobj
660
661
    def _put_on_disk(self, fullpath, tree):
662
        """See InventoryEntry._put_on_disk."""
663
        try:
664
            os.symlink(self.symlink_target, fullpath)
665
        except OSError,e:
666
            raise BzrError("Failed to create symlink %r -> %r, error: %s" % (fullpath, self.symlink_target, e))
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
667
1185.12.33 by Aaron Bentley
Fixed symlink reverting
668
    def _read_tree_state(self, path, work_tree):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
669
        """See InventoryEntry._read_tree_state."""
670
        self.symlink_target = work_tree.get_symlink_target(self.file_id)
671
1534.7.175 by Aaron Bentley
Ensured revert writes a normal inventory
672
    def _forget_tree_state(self):
673
        self.symlink_target = None
674
1405 by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave
675
    def _unchanged(self, previous_ie):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
676
        """See InventoryEntry._unchanged."""
1405 by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave
677
        compatible = super(InventoryLink, self)._unchanged(previous_ie)
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
678
        if self.symlink_target != previous_ie.symlink_target:
679
            compatible = False
680
        return compatible
681
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
682
2100.3.1 by Aaron Bentley
Start roundtripping tree-reference entries
683
class TreeReference(InventoryEntry):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
684
2100.3.1 by Aaron Bentley
Start roundtripping tree-reference entries
685
    kind = 'tree-reference'
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
686
2255.6.8 by Aaron Bentley
Merge refactoring of add_reference
687
    def __init__(self, file_id, name, parent_id, revision=None,
688
                 reference_revision=None):
2100.3.1 by Aaron Bentley
Start roundtripping tree-reference entries
689
        InventoryEntry.__init__(self, file_id, name, parent_id)
690
        self.revision = revision
691
        self.reference_revision = reference_revision
692
2100.3.18 by Aaron Bentley
Get commit working for tree references
693
    def copy(self):
694
        return TreeReference(self.file_id, self.name, self.parent_id,
695
                             self.revision, self.reference_revision)
696
2100.3.19 by Aaron Bentley
Ensure commit preserves reference revision
697
    def _read_tree_state(self, path, work_tree):
698
        """Populate fields in the inventory entry from the given tree.
699
        """
2255.2.226 by Robert Collins
Get merge_nested finally working: change nested tree iterators to take file_ids, and ensure the right branch is connected to in the merge logic. May not be suitable for shared repositories yet.
700
        self.reference_revision = work_tree.get_reference_revision(
701
            self.file_id, path)
2100.3.19 by Aaron Bentley
Ensure commit preserves reference revision
702
703
    def _forget_tree_state(self):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
704
        self.reference_revision = None
2100.3.19 by Aaron Bentley
Ensure commit preserves reference revision
705
2825.5.2 by Robert Collins
Review feedback, and fix pointless commits with nested trees to raise PointlessCommit appropriately.
706
    def _unchanged(self, previous_ie):
707
        """See InventoryEntry._unchanged."""
708
        compatible = super(TreeReference, self)._unchanged(previous_ie)
709
        if self.reference_revision != previous_ie.reference_revision:
710
            compatible = False
711
        return compatible
712
2100.3.19 by Aaron Bentley
Ensure commit preserves reference revision
713
802 by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions
714
class Inventory(object):
1 by mbp at sourcefrog
import from baz patch-364
715
    """Inventory of versioned files in a tree.
716
240 by mbp at sourcefrog
doc
717
    This describes which file_id is present at each point in the tree,
718
    and possibly the SHA-1 or other information about the file.
719
    Entries can be looked up either by path or by file_id.
1 by mbp at sourcefrog
import from baz patch-364
720
721
    The inventory represents a typical unix file tree, with
722
    directories containing files and subdirectories.  We never store
723
    the full path to a file, because renaming a directory implicitly
724
    moves all of its contents.  This class internally maintains a
725
    lookup tree that allows the children under a directory to be
726
    returned quickly.
727
728
    InventoryEntry objects must not be modified after they are
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
729
    inserted, other than through the Inventory API.
1 by mbp at sourcefrog
import from baz patch-364
730
731
    >>> inv = Inventory()
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
732
    >>> inv.add(InventoryFile('123-123', 'hello.c', ROOT_ID))
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
733
    InventoryFile('123-123', 'hello.c', parent_id='TREE_ROOT', sha1=None, len=None)
1 by mbp at sourcefrog
import from baz patch-364
734
    >>> inv['123-123'].name
735
    'hello.c'
736
737
    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
738
1 by mbp at sourcefrog
import from baz patch-364
739
    >>> bool(inv.path2id('hello.c'))
740
    True
741
    >>> '123-123' in inv
742
    True
743
744
    May also look up by name:
745
746
    >>> [x[0] for x in inv.iter_entries()]
1852.6.6 by Robert Collins
Finish updating iter_entries change to make all tests pass.
747
    ['', u'hello.c']
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
748
    >>> 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
749
    >>> inv.add(InventoryFile('123-123', 'hello.c', ROOT_ID))
1731.1.33 by Aaron Bentley
Revert no-special-root changes
750
    Traceback (most recent call last):
751
    BzrError: parent_id {TREE_ROOT} not in inventory
752
    >>> inv.add(InventoryFile('123-123', 'hello.c', 'TREE_ROOT-12345678-12345678'))
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
753
    InventoryFile('123-123', 'hello.c', parent_id='TREE_ROOT-12345678-12345678', sha1=None, len=None)
1 by mbp at sourcefrog
import from baz patch-364
754
    """
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
755
    def __init__(self, root_id=ROOT_ID, revision_id=None):
1 by mbp at sourcefrog
import from baz patch-364
756
        """Create or read an inventory.
757
758
        If a working directory is specified, the inventory is read
759
        from there.  If the file is specified, read from that. If not,
760
        the inventory is created empty.
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
761
762
        The inventory is created with a default root directory, with
763
        an id of None.
1 by mbp at sourcefrog
import from baz patch-364
764
        """
1731.1.33 by Aaron Bentley
Revert no-special-root changes
765
        if root_id is not None:
2294.1.5 by John Arbash Meinel
Fix Inventory.iter_entries_by_dir to return Unicode paths,
766
            self._set_root(InventoryDirectory(root_id, u'', None))
1731.1.33 by Aaron Bentley
Revert no-special-root changes
767
        else:
768
            self.root = None
769
            self._byid = {}
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
770
        self.revision_id = revision_id
1910.2.3 by Aaron Bentley
All tests pass
771
2865.1.1 by Robert Collins
Create new mutable tree method update_to_one_parent_via_delta for eventual use by commit.
772
    def __repr__(self):
4112.1.1 by Vincent Ladeuil
Fallback to old revision id if the current one doesn't exist in
773
        # More than one page of ouput is not useful anymore to debug
774
        max_len = 2048
775
        closing = '...}'
776
        contents = repr(self._byid)
777
        if len(contents) > max_len:
778
            contents = contents[:(max_len-len(closing))] + closing
779
        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.
780
781
    def apply_delta(self, delta):
782
        """Apply a delta to this inventory.
783
784
        :param delta: A list of changes to apply. After all the changes are
785
            applied the final inventory must be internally consistent, but it
786
            is ok to supply changes which, if only half-applied would have an
787
            invalid result - such as supplying two changes which rename two
788
            files, 'A' and 'B' with each other : [('A', 'B', 'A-id', a_entry),
789
            ('B', 'A', 'B-id', b_entry)].
790
791
            Each change is a tuple, of the form (old_path, new_path, file_id,
792
            new_entry).
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
793
2865.1.1 by Robert Collins
Create new mutable tree method update_to_one_parent_via_delta for eventual use by commit.
794
            When new_path is None, the change indicates the removal of an entry
795
            from the inventory and new_entry will be ignored (using None is
796
            appropriate). If new_path is not None, then new_entry must be an
797
            InventoryEntry instance, which will be incorporated into the
798
            inventory (and replace any existing entry with the same file id).
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
799
2865.1.1 by Robert Collins
Create new mutable tree method update_to_one_parent_via_delta for eventual use by commit.
800
            When old_path is None, the change indicates the addition of
801
            a new entry to the inventory.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
802
2865.1.1 by Robert Collins
Create new mutable tree method update_to_one_parent_via_delta for eventual use by commit.
803
            When neither new_path nor old_path are None, the change is a
804
            modification to an entry, such as a rename, reparent, kind change
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
805
            etc.
2865.1.1 by Robert Collins
Create new mutable tree method update_to_one_parent_via_delta for eventual use by commit.
806
807
            The children attribute of new_entry is ignored. This is because
2865.1.3 by Robert Collins
Review feedback.
808
            this method preserves children automatically across alterations to
809
            the parent of the children, and cases where the parent id of a
810
            child is changing require the child to be passed in as a separate
811
            change regardless. E.g. in the recursive deletion of a directory -
812
            the directory's children must be included in the delta, or the
813
            final inventory will be invalid.
4090.3.1 by Ian Clatworthy
check delta is legal in Inventory.apply_delta()
814
815
            Note that a file_id must only appear once within a given delta.
816
            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.
817
        """
4090.3.2 by Ian Clatworthy
review tweak from jam
818
        # Check that the delta is legal. It would be nice if this could be
819
        # done within the loops below but it's safer to validate the delta
820
        # before starting to mutate the inventory.
821
        unique_file_ids = set([f for _, _, f, _ in delta])
822
        if len(unique_file_ids) != len(delta):
823
            raise AssertionError("a file-id appears multiple times in %r"
824
                    % (delta,))
825
        del unique_file_ids
4090.3.1 by Ian Clatworthy
check delta is legal in Inventory.apply_delta()
826
2865.1.1 by Robert Collins
Create new mutable tree method update_to_one_parent_via_delta for eventual use by commit.
827
        children = {}
828
        # Remove all affected items which were in the original inventory,
829
        # starting with the longest paths, thus ensuring parents are examined
830
        # after their children, which means that everything we examine has no
831
        # modified children remaining by the time we examine it.
832
        for old_path, file_id in sorted(((op, f) for op, np, f, e in delta
833
                                        if op is not None), reverse=True):
834
            if file_id not in self:
835
                # adds come later
836
                continue
837
            # 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.
838
            file_id_children = getattr(self[file_id], 'children', {})
839
            if len(file_id_children):
840
                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.
841
            # Remove file_id and the unaltered children. If file_id is not
842
            # being deleted it will be reinserted back later.
843
            self.remove_recursive_id(file_id)
844
        # Insert all affected which should be in the new inventory, reattaching
845
        # their children if they had any. This is done from shortest path to
846
        # longest, ensuring that items which were modified and whose parents in
847
        # the resulting inventory were also modified, are inserted after their
848
        # parents.
849
        for new_path, new_entry in sorted((np, e) for op, np, f, e in
850
                                          delta if np is not None):
851
            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.
852
                # Pop the child which to allow detection of children whose
853
                # parents were deleted and which were not reattached to a new
854
                # parent.
855
                new_entry.children = children.pop(new_entry.file_id, {})
2865.1.1 by Robert Collins
Create new mutable tree method update_to_one_parent_via_delta for eventual use by commit.
856
            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.
857
        if len(children):
858
            # Get the parent id that was deleted
859
            parent_id, children = children.popitem()
860
            raise errors.InconsistentDelta("<deleted>", parent_id,
861
                "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.
862
1910.2.3 by Aaron Bentley
All tests pass
863
    def _set_root(self, ie):
864
        self.root = ie
1907.1.2 by Aaron Bentley
More removal of unique-root stuff
865
        self._byid = {self.root.file_id: self.root}
1 by mbp at sourcefrog
import from baz patch-364
866
1189 by Martin Pool
- BROKEN: partial support for commit into weave
867
    def copy(self):
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
868
        # TODO: jam 20051218 Should copy also copy the revision_id?
1852.6.3 by Robert Collins
Make iter(Tree) consistent for all tree types.
869
        entries = self.iter_entries()
2938.2.1 by Jelmer Vernooij
Handle empty inventories in Inventory.copy().
870
        if self.root is None:
871
            return Inventory(root_id=None)
1852.6.3 by Robert Collins
Make iter(Tree) consistent for all tree types.
872
        other = Inventory(entries.next()[1].file_id)
3616.1.1 by Jelmer Vernooij
Fix copying of root revision in inventory.
873
        other.root.revision = self.root.revision
1206 by Martin Pool
- fix bug in Inventory.copy()
874
        # copy recursively so we know directories will be added before
875
        # their children.  There are more efficient ways than this...
2935.2.1 by Jelmer Vernooij
Fix Inventory.copy() and add a test for it.
876
        for path, entry in entries:
1189 by Martin Pool
- BROKEN: partial support for commit into weave
877
            other.add(entry.copy())
878
        return other
879
1 by mbp at sourcefrog
import from baz patch-364
880
    def __iter__(self):
881
        return iter(self._byid)
882
883
    def __len__(self):
884
        """Returns number of entries."""
885
        return len(self._byid)
886
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
887
    def iter_entries(self, from_dir=None):
1 by mbp at sourcefrog
import from baz patch-364
888
        """Return (path, entry) pairs, in order by name."""
1753.1.4 by Robert Collins
Fixup '== None' usage in inventory.py.
889
        if from_dir is None:
1731.1.33 by Aaron Bentley
Revert no-special-root changes
890
            if self.root is None:
891
                return
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
892
            from_dir = self.root
1852.6.3 by Robert Collins
Make iter(Tree) consistent for all tree types.
893
            yield '', self.root
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
894
        elif isinstance(from_dir, basestring):
895
            from_dir = self._byid[from_dir]
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
896
1732.1.24 by John Arbash Meinel
iter_entries time drops to 1/6th time
897
        # unrolling the recursive called changed the time from
898
        # 440ms/663ms (inline/total) to 116ms/116ms
1732.1.23 by John Arbash Meinel
Switch iter_entries from being a recursive function and using pathjoin
899
        children = from_dir.children.items()
900
        children.sort()
901
        children = collections.deque(children)
902
        stack = [(u'', children)]
903
        while stack:
904
            from_dir_relpath, children = stack[-1]
905
906
            while children:
907
                name, ie = children.popleft()
908
909
                # we know that from_dir_relpath never ends in a slash
910
                # and 'f' doesn't begin with one, we can do a string op, rather
911
                # than the checks of pathjoin(), though this means that all paths
912
                # start with a slash
913
                path = from_dir_relpath + '/' + name
914
915
                yield path[1:], ie
916
917
                if ie.kind != 'directory':
918
                    continue
919
920
                # But do this child first
921
                new_children = ie.children.items()
922
                new_children.sort()
923
                new_children = collections.deque(new_children)
924
                stack.append((path, new_children))
925
                # Break out of inner loop, so that we start outer loop with child
926
                break
927
            else:
928
                # if we finished all children, pop it off the stack
1732.1.25 by John Arbash Meinel
Fix list_files test, we don't need to check if children are empty if we fall off the loop.
929
                stack.pop()
555 by Martin Pool
- New Inventory.entries() method
930
2825.7.1 by Robert Collins
* Partial commits are now approximately 40% faster by walking over the
931
    def iter_entries_by_dir(self, from_dir=None, specific_file_ids=None,
932
        yield_parents=False):
1711.2.36 by John Arbash Meinel
Add an iter_entries_by_dir which returns directory children before their children.
933
        """Iterate over the entries in a directory first order.
934
935
        This returns all entries for a directory before returning
936
        the entries for children of a directory. This is not
937
        lexicographically sorted order, and is a hybrid between
938
        depth-first and breadth-first.
939
2825.7.1 by Robert Collins
* Partial commits are now approximately 40% faster by walking over the
940
        :param yield_parents: If True, yield the parents from the root leading
941
            down to specific_file_ids that have been requested. This has no
942
            impact if specific_file_ids is None.
1711.2.36 by John Arbash Meinel
Add an iter_entries_by_dir which returns directory children before their children.
943
        :return: This yields (path, entry) pairs
944
        """
2858.2.1 by Martin Pool
Remove most calls to safe_file_id and safe_revision_id.
945
        if specific_file_ids and not isinstance(specific_file_ids, set):
946
            specific_file_ids = set(specific_file_ids)
1755.1.1 by Robert Collins
(jam, robertc, ab)Merge new iter_entries_by_dirs routine which matches the order walkdirs provides.
947
        # TODO? Perhaps this should return the from_dir so that the root is
948
        # yielded? or maybe an option?
1753.1.4 by Robert Collins
Fixup '== None' usage in inventory.py.
949
        if from_dir is None:
1731.1.47 by Aaron Bentley
Merge bzr.dev
950
            if self.root is None:
951
                return
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
952
            # Optimize a common case
2825.7.1 by Robert Collins
* Partial commits are now approximately 40% faster by walking over the
953
            if (not yield_parents and specific_file_ids is not None and
954
                len(specific_file_ids) == 1):
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
955
                file_id = list(specific_file_ids)[0]
956
                if file_id in self:
957
                    yield self.id2path(file_id), self[file_id]
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
958
                return
1711.2.36 by John Arbash Meinel
Add an iter_entries_by_dir which returns directory children before their children.
959
            from_dir = self.root
2825.7.1 by Robert Collins
* Partial commits are now approximately 40% faster by walking over the
960
            if (specific_file_ids is None or yield_parents or
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
961
                self.root.file_id in specific_file_ids):
2294.1.5 by John Arbash Meinel
Fix Inventory.iter_entries_by_dir to return Unicode paths,
962
                yield u'', self.root
1711.2.36 by John Arbash Meinel
Add an iter_entries_by_dir which returns directory children before their children.
963
        elif isinstance(from_dir, basestring):
964
            from_dir = self._byid[from_dir]
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
965
966
        if specific_file_ids is not None:
2309.4.2 by John Arbash Meinel
Change iter_entries_by_dir to avoid extra file id safety checks.
967
            # TODO: jam 20070302 This could really be done as a loop rather
968
            #       than a bunch of recursive calls.
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
969
            parents = set()
2309.4.2 by John Arbash Meinel
Change iter_entries_by_dir to avoid extra file id safety checks.
970
            byid = self._byid
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
971
            def add_ancestors(file_id):
2309.4.2 by John Arbash Meinel
Change iter_entries_by_dir to avoid extra file id safety checks.
972
                if file_id not in byid:
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
973
                    return
2309.4.2 by John Arbash Meinel
Change iter_entries_by_dir to avoid extra file id safety checks.
974
                parent_id = byid[file_id].parent_id
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
975
                if parent_id is None:
976
                    return
977
                if parent_id not in parents:
978
                    parents.add(parent_id)
979
                    add_ancestors(parent_id)
980
            for file_id in specific_file_ids:
981
                add_ancestors(file_id)
982
        else:
983
            parents = None
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
984
1711.2.36 by John Arbash Meinel
Add an iter_entries_by_dir which returns directory children before their children.
985
        stack = [(u'', from_dir)]
986
        while stack:
987
            cur_relpath, cur_dir = stack.pop()
988
989
            child_dirs = []
990
            for child_name, child_ie in sorted(cur_dir.children.iteritems()):
991
992
                child_relpath = cur_relpath + child_name
993
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
994
                if (specific_file_ids is None or
2825.7.1 by Robert Collins
* Partial commits are now approximately 40% faster by walking over the
995
                    child_ie.file_id in specific_file_ids or
996
                    (yield_parents and child_ie.file_id in parents)):
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
997
                    yield child_relpath, child_ie
1711.2.36 by John Arbash Meinel
Add an iter_entries_by_dir which returns directory children before their children.
998
999
                if child_ie.kind == 'directory':
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
1000
                    if parents is None or child_ie.file_id in parents:
1001
                        child_dirs.append((child_relpath+'/', child_ie))
1711.2.36 by John Arbash Meinel
Add an iter_entries_by_dir which returns directory children before their children.
1002
            stack.extend(reversed(child_dirs))
1003
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
1004
    def make_entry(self, kind, name, parent_id, file_id=None):
1005
        """Simple thunk to bzrlib.inventory.make_entry."""
1006
        return make_entry(kind, name, parent_id, file_id)
1007
555 by Martin Pool
- New Inventory.entries() method
1008
    def entries(self):
1009
        """Return list of (path, ie) for all entries except the root.
1010
1011
        This may be faster than iter_entries.
1012
        """
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
1013
        accum = []
1014
        def descend(dir_ie, dir_path):
556 by Martin Pool
- fix up Inventory.entries()
1015
            kids = dir_ie.children.items()
555 by Martin Pool
- New Inventory.entries() method
1016
            kids.sort()
1017
            for name, ie in kids:
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
1018
                child_path = osutils.pathjoin(dir_path, name)
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
1019
                accum.append((child_path, ie))
555 by Martin Pool
- New Inventory.entries() method
1020
                if ie.kind == 'directory':
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
1021
                    descend(ie, child_path)
555 by Martin Pool
- New Inventory.entries() method
1022
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1023
        descend(self.root, u'')
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
1024
        return accum
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
1025
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
1026
    def directories(self):
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
1027
        """Return (path, entry) pairs for all directories, including the root.
1 by mbp at sourcefrog
import from baz patch-364
1028
        """
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
1029
        accum = []
1030
        def descend(parent_ie, parent_path):
1031
            accum.append((parent_path, parent_ie))
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1032
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
1033
            kids = [(ie.name, ie) for ie in parent_ie.children.itervalues() if ie.kind == 'directory']
1034
            kids.sort()
156 by mbp at sourcefrog
new "directories" command
1035
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
1036
            for name, child_ie in kids:
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
1037
                child_path = osutils.pathjoin(parent_path, name)
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
1038
                descend(child_ie, child_path)
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1039
        descend(self.root, u'')
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
1040
        return accum
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1041
1 by mbp at sourcefrog
import from baz patch-364
1042
    def __contains__(self, file_id):
1043
        """True if this entry contains a file with given id.
1044
1045
        >>> inv = Inventory()
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
1046
        >>> inv.add(InventoryFile('123', 'foo.c', ROOT_ID))
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
1047
        InventoryFile('123', 'foo.c', parent_id='TREE_ROOT', sha1=None, len=None)
1 by mbp at sourcefrog
import from baz patch-364
1048
        >>> '123' in inv
1049
        True
1050
        >>> '456' in inv
1051
        False
1052
        """
1711.9.11 by John Arbash Meinel
change return foo in bar to return (foo in bar)
1053
        return (file_id in self._byid)
1 by mbp at sourcefrog
import from baz patch-364
1054
1055
    def __getitem__(self, file_id):
1056
        """Return the entry for given file_id.
1057
1058
        >>> inv = Inventory()
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
1059
        >>> inv.add(InventoryFile('123123', 'hello.c', ROOT_ID))
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
1060
        InventoryFile('123123', 'hello.c', parent_id='TREE_ROOT', sha1=None, len=None)
1 by mbp at sourcefrog
import from baz patch-364
1061
        >>> inv['123123'].name
1062
        'hello.c'
1063
        """
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
1064
        try:
1065
            return self._byid[file_id]
1066
        except KeyError:
2067.3.1 by Martin Pool
Clean up BzrNewError, other exception classes and users.
1067
            # really we're passing an inventory, not a tree...
1068
            raise errors.NoSuchId(self, file_id)
1 by mbp at sourcefrog
import from baz patch-364
1069
460 by Martin Pool
- new testing command compare-trees
1070
    def get_file_kind(self, file_id):
1071
        return self._byid[file_id].kind
1072
138 by mbp at sourcefrog
remove parallel tree from inventory;
1073
    def get_child(self, parent_id, filename):
1732.1.18 by John Arbash Meinel
50ms is probably not worth it
1074
        return self[parent_id].children.get(filename)
138 by mbp at sourcefrog
remove parallel tree from inventory;
1075
2100.3.6 by Aaron Bentley
Make add recursive for children of added entries
1076
    def _add_child(self, entry):
1077
        """Add an entry to the inventory, without adding it to its parent"""
1078
        if entry.file_id in self._byid:
1079
            raise BzrError("inventory already contains entry with id {%s}" %
1080
                           entry.file_id)
1081
        self._byid[entry.file_id] = entry
1082
        for child in getattr(entry, 'children', {}).itervalues():
1083
            self._add_child(child)
1084
        return entry
1085
1 by mbp at sourcefrog
import from baz patch-364
1086
    def add(self, entry):
1087
        """Add entry to inventory.
1088
1089
        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
1090
        which calls this.
1091
1092
        Returns the new entry object.
1093
        """
139 by mbp at sourcefrog
simplified/faster Inventory.add
1094
        if entry.file_id in self._byid:
2255.7.16 by John Arbash Meinel
Make sure adding a duplicate file_id raises DuplicateFileId.
1095
            raise errors.DuplicateFileId(entry.file_id,
1096
                                         self._byid[entry.file_id])
1 by mbp at sourcefrog
import from baz patch-364
1097
1731.1.33 by Aaron Bentley
Revert no-special-root changes
1098
        if entry.parent_id is None:
2100.3.6 by Aaron Bentley
Make add recursive for children of added entries
1099
            self.root = entry
1100
        else:
1101
            try:
1102
                parent = self._byid[entry.parent_id]
1103
            except KeyError:
1104
                raise BzrError("parent_id {%s} not in inventory" %
1105
                               entry.parent_id)
1106
1107
            if entry.name in parent.children:
1108
                raise BzrError("%s is already versioned" %
1109
                        osutils.pathjoin(self.id2path(parent.file_id),
1551.13.12 by Aaron Bentley
Fix encoding of 'already versioned' error
1110
                        entry.name).encode('utf-8'))
2100.3.6 by Aaron Bentley
Make add recursive for children of added entries
1111
            parent.children[entry.name] = entry
1112
        return self._add_child(entry)
1 by mbp at sourcefrog
import from baz patch-364
1113
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)
1114
    def add_path(self, relpath, kind, file_id=None, parent_id=None):
70 by mbp at sourcefrog
Prepare for smart recursive add.
1115
        """Add entry from a path.
1116
1180 by Martin Pool
- start splitting code for xml (de)serialization away from objects
1117
        The immediate parent must already be versioned.
1118
1119
        Returns the new entry object."""
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1120
1830.3.5 by John Arbash Meinel
make_entry refuses to create non-normalized entries.
1121
        parts = osutils.splitpath(relpath)
70 by mbp at sourcefrog
Prepare for smart recursive add.
1122
1534.7.69 by Aaron Bentley
Got real root moves working
1123
        if len(parts) == 0:
1713.1.6 by Robert Collins
Move file id random data selection out of the inner loop for 'bzr add'.
1124
            if file_id is None:
2116.4.1 by John Arbash Meinel
Update file and revision id generators.
1125
                file_id = generate_ids.gen_root_id()
1731.1.1 by Aaron Bentley
Make root entry an InventoryDirectory, make EmptyTree really empty
1126
            self.root = InventoryDirectory(file_id, '', None)
1534.7.69 by Aaron Bentley
Got real root moves working
1127
            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.
1128
            return self.root
1534.7.69 by Aaron Bentley
Got real root moves working
1129
        else:
1130
            parent_path = parts[:-1]
1131
            parent_id = self.path2id(parent_path)
1753.1.4 by Robert Collins
Fixup '== None' usage in inventory.py.
1132
            if parent_id is None:
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
1133
                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)
1134
        ie = make_entry(kind, parts[-1], parent_id, file_id)
70 by mbp at sourcefrog
Prepare for smart recursive add.
1135
        return self.add(ie)
1136
1 by mbp at sourcefrog
import from baz patch-364
1137
    def __delitem__(self, file_id):
1138
        """Remove entry by id.
1139
1140
        >>> inv = Inventory()
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
1141
        >>> inv.add(InventoryFile('123', 'foo.c', ROOT_ID))
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
1142
        InventoryFile('123', 'foo.c', parent_id='TREE_ROOT', sha1=None, len=None)
1 by mbp at sourcefrog
import from baz patch-364
1143
        >>> '123' in inv
1144
        True
1145
        >>> del inv['123']
1146
        >>> '123' in inv
1147
        False
1148
        """
1149
        ie = self[file_id]
1150
        del self._byid[file_id]
1534.7.69 by Aaron Bentley
Got real root moves working
1151
        if ie.parent_id is not None:
1152
            del self[ie.parent_id].children[ie.name]
1 by mbp at sourcefrog
import from baz patch-364
1153
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
1154
    def __eq__(self, other):
1 by mbp at sourcefrog
import from baz patch-364
1155
        """Compare two sets by comparing their contents.
1156
1157
        >>> i1 = Inventory()
1158
        >>> i2 = Inventory()
1159
        >>> i1 == i2
1160
        True
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
1161
        >>> i1.add(InventoryFile('123', 'foo', ROOT_ID))
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
1162
        InventoryFile('123', 'foo', parent_id='TREE_ROOT', sha1=None, len=None)
1 by mbp at sourcefrog
import from baz patch-364
1163
        >>> i1 == i2
1164
        False
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
1165
        >>> i2.add(InventoryFile('123', 'foo', ROOT_ID))
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
1166
        InventoryFile('123', 'foo', parent_id='TREE_ROOT', sha1=None, len=None)
1 by mbp at sourcefrog
import from baz patch-364
1167
        >>> i1 == i2
1168
        True
1169
        """
1170
        if not isinstance(other, Inventory):
1171
            return NotImplemented
1172
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
1173
        return self._byid == other._byid
1174
1175
    def __ne__(self, other):
1249 by Martin Pool
- improvements to weave commit [broken]
1176
        return not self.__eq__(other)
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
1177
1178
    def __hash__(self):
1179
        raise ValueError('not hashable')
1180
1596.2.19 by Robert Collins
Shave 20% off id2path.
1181
    def _iter_file_id_parents(self, file_id):
1182
        """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.
1183
        while file_id is not None:
1596.2.19 by Robert Collins
Shave 20% off id2path.
1184
            try:
1185
                ie = self._byid[file_id]
1186
            except KeyError:
2255.11.5 by Martin Pool
Tree.id2path should raise NoSuchId, not return None.
1187
                raise errors.NoSuchId(tree=None, file_id=file_id)
1596.2.19 by Robert Collins
Shave 20% off id2path.
1188
            yield ie
1189
            file_id = ie.parent_id
1 by mbp at sourcefrog
import from baz patch-364
1190
172 by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory
1191
    def get_idpath(self, file_id):
1192
        """Return a list of file_ids for the path to an entry.
1193
1194
        The list contains one element for each directory followed by
1195
        the id of the file itself.  So the length of the returned list
1196
        is equal to the depth of the file in the tree, counting the
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
1197
        root directory as depth 1.
172 by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory
1198
        """
1199
        p = []
1596.2.19 by Robert Collins
Shave 20% off id2path.
1200
        for parent in self._iter_file_id_parents(file_id):
1201
            p.insert(0, parent.file_id)
172 by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory
1202
        return p
1203
1 by mbp at sourcefrog
import from baz patch-364
1204
    def id2path(self, file_id):
1596.2.19 by Robert Collins
Shave 20% off id2path.
1205
        """Return as a string the path to file_id.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1206
1393.1.32 by Martin Pool
- add docstring demonstrating use of Inventory.id2path
1207
        >>> i = Inventory()
1208
        >>> e = i.add(InventoryDirectory('src-id', 'src', ROOT_ID))
1209
        >>> e = i.add(InventoryFile('foo-id', 'foo.c', parent_id='src-id'))
1185.31.34 by John Arbash Meinel
Removing instances of os.sep
1210
        >>> print i.id2path('foo-id')
1393.1.32 by Martin Pool
- add docstring demonstrating use of Inventory.id2path
1211
        src/foo.c
1212
        """
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
1213
        # get all names, skipping root
1596.2.19 by Robert Collins
Shave 20% off id2path.
1214
        return '/'.join(reversed(
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1215
            [parent.name for parent in
1596.2.19 by Robert Collins
Shave 20% off id2path.
1216
             self._iter_file_id_parents(file_id)][:-1]))
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1217
1 by mbp at sourcefrog
import from baz patch-364
1218
    def path2id(self, name):
1219
        """Walk down through directories to return entry of last component.
1220
1221
        names may be either a list of path components, or a single
1222
        string, in which case it is automatically split.
1223
1224
        This returns the entry of the last component in the path,
1225
        which may be either a file or a directory.
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
1226
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)
1227
        Returns None IFF the path is not found.
1 by mbp at sourcefrog
import from baz patch-364
1228
        """
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
1229
        if isinstance(name, basestring):
1230
            name = osutils.splitpath(name)
1 by mbp at sourcefrog
import from baz patch-364
1231
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)
1232
        # mutter("lookup path %r" % name)
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
1233
1234
        parent = self.root
1731.1.33 by Aaron Bentley
Revert no-special-root changes
1235
        if parent is None:
1236
            return None
70 by mbp at sourcefrog
Prepare for smart recursive add.
1237
        for f in name:
1 by mbp at sourcefrog
import from baz patch-364
1238
            try:
2091.3.1 by Aaron Bentley
When 'directory' path element isn't a directory, return None from path2id
1239
                children = getattr(parent, 'children', None)
2091.3.3 by Aaron Bentley
Test 'is None' not '== None'
1240
                if children is None:
2091.3.1 by Aaron Bentley
When 'directory' path element isn't a directory, return None from path2id
1241
                    return None
1242
                cie = children[f]
138 by mbp at sourcefrog
remove parallel tree from inventory;
1243
                parent = cie
1 by mbp at sourcefrog
import from baz patch-364
1244
            except KeyError:
1245
                # or raise an error?
1246
                return None
1247
138 by mbp at sourcefrog
remove parallel tree from inventory;
1248
        return parent.file_id
1 by mbp at sourcefrog
import from baz patch-364
1249
1250
    def has_filename(self, names):
1251
        return bool(self.path2id(names))
1252
1253
    def has_id(self, file_id):
1711.9.11 by John Arbash Meinel
change return foo in bar to return (foo in bar)
1254
        return (file_id in self._byid)
1 by mbp at sourcefrog
import from baz patch-364
1255
3879.2.6 by John Arbash Meinel
Bring in Inventory._make_delta
1256
    def _make_delta(self, old):
1257
        """Make an inventory delta from two inventories."""
3882.6.18 by John Arbash Meinel
Bring in optimizations to Inventory._make_delta.
1258
        old_getter = getattr(old, '_byid', old)
1259
        new_getter = self._byid
1260
        old_ids = set(old_getter)
1261
        new_ids = set(new_getter)
3879.2.6 by John Arbash Meinel
Bring in Inventory._make_delta
1262
        adds = new_ids - old_ids
1263
        deletes = old_ids - new_ids
3882.6.18 by John Arbash Meinel
Bring in optimizations to Inventory._make_delta.
1264
        if not adds and not deletes:
1265
            common = new_ids
1266
        else:
1267
            common = old_ids.intersection(new_ids)
3879.2.6 by John Arbash Meinel
Bring in Inventory._make_delta
1268
        delta = []
1269
        for file_id in deletes:
1270
            delta.append((old.id2path(file_id), None, file_id, None))
1271
        for file_id in adds:
1272
            delta.append((None, self.id2path(file_id), file_id, self[file_id]))
1273
        for file_id in common:
3882.6.18 by John Arbash Meinel
Bring in optimizations to Inventory._make_delta.
1274
            new_ie = new_getter[file_id]
1275
            old_ie = old_getter[file_id]
1276
            # If xml_serializer returns the cached InventoryEntries (rather
1277
            # than always doing .copy()), inlining the 'is' check saves 2.7M
1278
            # calls to __eq__.  Under lsprof this saves 20s => 6s.
1279
            # It is a minor improvement without lsprof.
1280
            if old_ie is new_ie or old_ie == new_ie:
1281
                continue
1282
            else:
3879.2.6 by John Arbash Meinel
Bring in Inventory._make_delta
1283
                delta.append((old.id2path(file_id), self.id2path(file_id),
3882.6.18 by John Arbash Meinel
Bring in optimizations to Inventory._make_delta.
1284
                              file_id, new_ie))
3879.2.6 by John Arbash Meinel
Bring in Inventory._make_delta
1285
        return delta
1286
1988.2.6 by Robert Collins
Review feedback.
1287
    def remove_recursive_id(self, file_id):
1288
        """Remove file_id, and children, from the inventory.
3879.2.6 by John Arbash Meinel
Bring in Inventory._make_delta
1289
1988.2.6 by Robert Collins
Review feedback.
1290
        :param file_id: A file_id to remove.
1291
        """
1988.2.1 by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of
1292
        to_find_delete = [self._byid[file_id]]
1293
        to_delete = []
1988.2.6 by Robert Collins
Review feedback.
1294
        while to_find_delete:
1988.2.1 by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of
1295
            ie = to_find_delete.pop()
1296
            to_delete.append(ie.file_id)
1297
            if ie.kind == 'directory':
1298
                to_find_delete.extend(ie.children.values())
1299
        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.
1300
            ie = self[file_id]
1988.2.1 by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of
1301
            del self._byid[file_id]
1731.2.16 by Aaron Bentley
Get extract working for standalone trees
1302
        if ie.parent_id is not None:
1303
            del self[ie.parent_id].children[ie.name]
2376.2.3 by Aaron Bentley
Fix root replacement for apply_inventory_delta
1304
        else:
1305
            self.root = None
1988.2.1 by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of
1306
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
1307
    def rename(self, file_id, new_parent_id, new_name):
1308
        """Move a file within the inventory.
1309
1310
        This can change either the name, or the parent, or both.
1311
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
1312
        This does not move the working file.
1313
        """
2825.6.1 by Robert Collins
* ``WorkingTree.rename_one`` will now raise an error if normalisation of the
1314
        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
1315
        if not is_valid_name(new_name):
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
1316
            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
1317
1318
        new_parent = self._byid[new_parent_id]
1319
        if new_name in new_parent.children:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
1320
            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
1321
172 by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory
1322
        new_parent_idpath = self.get_idpath(new_parent_id)
1323
        if file_id in new_parent_idpath:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
1324
            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
1325
                    % (self.id2path(file_id), self.id2path(new_parent_id)))
1326
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
1327
        file_ie = self._byid[file_id]
1328
        old_parent = self._byid[file_ie.parent_id]
1329
1330
        # TODO: Don't leave things messed up if this fails
1331
1332
        del old_parent.children[file_ie.name]
1333
        new_parent.children[new_name] = file_ie
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1334
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
1335
        file_ie.name = new_name
1336
        file_ie.parent_id = new_parent_id
1337
1731.1.1 by Aaron Bentley
Make root entry an InventoryDirectory, make EmptyTree really empty
1338
    def is_root(self, file_id):
1339
        return self.root is not None and file_id == self.root.file_id
1340
4137.3.1 by Ian Clatworthy
Inventory.filter() API with tests
1341
    def filter(self, specific_fileids):
4137.3.3 by Ian Clatworthy
tweak comments to set immutable expectation
1342
        """Get an inventory view filtered against a set of file-ids.
4137.3.1 by Ian Clatworthy
Inventory.filter() API with tests
1343
1344
        Children of directories and parents are included.
4137.3.3 by Ian Clatworthy
tweak comments to set immutable expectation
1345
1346
        The result may or may not reference the underlying inventory
1347
        so it should be treated as immutable.
4137.3.1 by Ian Clatworthy
Inventory.filter() API with tests
1348
        """
1349
        interesting_parents = set()
1350
        for fileid in specific_fileids:
1351
            try:
1352
                interesting_parents.update(self.get_idpath(fileid))
1353
            except errors.NoSuchId:
1354
                # This fileid is not in the inventory - that's ok
1355
                pass
1356
        entries = self.iter_entries()
1357
        if self.root is None:
1358
            return Inventory(root_id=None)
1359
        other = Inventory(entries.next()[1].file_id)
1360
        other.root.revision = self.root.revision
1361
        other.revision_id = self.revision_id
1362
        directories_to_expand = set()
1363
        for path, entry in entries:
1364
            file_id = entry.file_id
1365
            if (file_id in specific_fileids
1366
                or entry.parent_id in directories_to_expand):
1367
                if entry.kind == 'directory':
1368
                    directories_to_expand.add(file_id)
1369
            elif file_id not in interesting_parents:
1370
                continue
1371
            other.add(entry.copy())
1372
        return other
1373
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
1374
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.
1375
entry_factory = {
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
1376
    'directory': InventoryDirectory,
1377
    'file': InventoryFile,
1378
    'symlink': InventoryLink,
2255.6.8 by Aaron Bentley
Merge refactoring of add_reference
1379
    '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.
1380
}
1381
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)
1382
def make_entry(kind, name, parent_id, file_id=None):
1383
    """Create an inventory entry.
1384
1385
    :param kind: the type of inventory entry to create.
1386
    :param name: the basename of the entry.
1387
    :param parent_id: the parent_id of the entry.
1388
    :param file_id: the file_id to use. if None, one will be created.
1389
    """
1390
    if file_id is None:
2116.4.1 by John Arbash Meinel
Update file and revision id generators.
1391
        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
1392
    name = ensure_normalized_name(name)
1393
    try:
1394
        factory = entry_factory[kind]
1395
    except KeyError:
1396
        raise BzrError("unknown kind %r" % kind)
1397
    return factory(file_id, name, parent_id)
1398
1399
1400
def ensure_normalized_name(name):
1401
    """Normalize name.
1402
1403
    :raises InvalidNormalization: When name is not normalized, and cannot be
1404
        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
1405
    :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
1406
    """
2255.2.54 by Robert Collins
Add in non-normalized filename sanity check to dirstate add().
1407
    #------- This has been copied to bzrlib.dirstate.DirState.add, please
1408
    # 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.
1409
    # we dont import normalized_filename directly because we want to be
1410
    # able to change the implementation at runtime for tests.
1830.3.5 by John Arbash Meinel
make_entry refuses to create non-normalized entries.
1411
    norm_name, can_access = osutils.normalized_filename(name)
1412
    if norm_name != name:
1413
        if can_access:
2825.6.1 by Robert Collins
* ``WorkingTree.rename_one`` will now raise an error if normalisation of the
1414
            return norm_name
1830.3.5 by John Arbash Meinel
make_entry refuses to create non-normalized entries.
1415
        else:
1416
            # TODO: jam 20060701 This would probably be more useful
1417
            #       if the error was raised with the full path
1418
            raise errors.InvalidNormalization(name)
2825.6.1 by Robert Collins
* ``WorkingTree.rename_one`` will now raise an error if normalisation of the
1419
    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)
1420
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
1421
1077 by Martin Pool
- avoid compiling REs at module load time
1422
_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
1423
1424
def is_valid_name(name):
1077 by Martin Pool
- avoid compiling REs at module load time
1425
    global _NAME_RE
1753.1.4 by Robert Collins
Fixup '== None' usage in inventory.py.
1426
    if _NAME_RE is None:
1077 by Martin Pool
- avoid compiling REs at module load time
1427
        _NAME_RE = re.compile(r'^[^/\\]+$')
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1428
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
1429
    return bool(_NAME_RE.match(name))