/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
1
# Copyright (C) 2005, 2006, 2007 Canonical Ltd
1448 by Robert Collins
revert symlinks correctly
2
#
1 by mbp at sourcefrog
import from baz patch-364
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
1448 by Robert Collins
revert symlinks correctly
7
#
1 by mbp at sourcefrog
import from baz patch-364
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
1448 by Robert Collins
revert symlinks correctly
12
#
1 by mbp at sourcefrog
import from baz patch-364
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
17
# FIXME: This refactoring of the workingtree code doesn't seem to keep
1185.16.72 by Martin Pool
[merge] from robert and fix up tests
18
# the WorkingTree's copy of the inventory in sync with the branch.  The
19
# branch modifies its working inventory when it does a commit to make
20
# missing files permanently removed.
1 by mbp at sourcefrog
import from baz patch-364
21
1197 by Martin Pool
doc
22
# TODO: Maybe also keep the full path of the entry, and the children?
23
# But those depend on its position within a particular inventory, and
24
# it would be nice not to need to hold the backpointer here.
25
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
26
# This should really be an id randomly assigned when the tree is
27
# created, but it's not for now.
28
ROOT_ID = "TREE_ROOT"
29
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.5 by Martin Pool
Cleanup and document some check code
492
        mutter('check version {%s} of {%s}', tree_revision_id, self.file_id)
1616.1.7 by Martin Pool
New developer commands 'weave-list' and 'weave-join'.
493
        checker.checked_text_cnt += 1
1185.50.28 by John Arbash Meinel
Lots of updates for 'bzr check'
494
        # We can't check the length, because Weave doesn't store that
495
        # information, and the whole point of looking at the weave's
496
        # sha1sum is that we don't have to extract the text.
3350.8.3 by Robert Collins
VF.get_sha1s needed changing to be stackable.
497
        if (self.text_sha1 != tree._repository.texts.get_sha1s([key])[key]):
498
            raise BzrCheckError('text {%s} version {%s} wrong sha1' % key)
499
        checker.checked_texts[key] = self.text_sha1
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
500
501
    def copy(self):
502
        other = InventoryFile(self.file_id, self.name, self.parent_id)
503
        other.executable = self.executable
504
        other.text_id = self.text_id
505
        other.text_sha1 = self.text_sha1
506
        other.text_size = self.text_size
507
        other.revision = self.revision
508
        return other
509
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
510
    def detect_changes(self, old_entry):
511
        """See InventoryEntry.detect_changes."""
512
        text_modified = (self.text_sha1 != old_entry.text_sha1)
513
        meta_modified = (self.executable != old_entry.executable)
514
        return text_modified, meta_modified
515
516
    def _diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree,
517
             output_to, reverse=False):
518
        """See InventoryEntry._diff."""
3009.2.22 by Aaron Bentley
Update names & docstring
519
        from bzrlib.diff import DiffText
3009.2.5 by Aaron Bentley
Factor symlink and file diffing into differ
520
        from_file_id = self.file_id
521
        if to_entry:
522
            to_file_id = to_entry.file_id
523
        else:
524
            to_file_id = None
525
        if reverse:
526
            to_file_id, from_file_id = from_file_id, to_file_id
527
            tree, to_tree = to_tree, tree
528
            from_label, to_label = to_label, from_label
3009.2.22 by Aaron Bentley
Update names & docstring
529
        differ = DiffText(tree, to_tree, output_to, 'utf-8', '', '',
530
                          text_diff)
3009.2.5 by Aaron Bentley
Factor symlink and file diffing into differ
531
        return differ.diff_text(from_file_id, to_file_id, from_label, to_label)
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
532
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
533
    def has_text(self):
534
        """See InventoryEntry.has_text."""
535
        return True
536
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
537
    def __init__(self, file_id, name, parent_id):
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
538
        super(InventoryFile, self).__init__(file_id, name, parent_id)
539
        self.kind = 'file'
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
540
541
    def kind_character(self):
542
        """See InventoryEntry.kind_character."""
543
        return ''
544
545
    def _put_in_tar(self, item, tree):
546
        """See InventoryEntry._put_in_tar."""
547
        item.type = tarfile.REGTYPE
548
        fileobj = tree.get_file(self.file_id)
549
        item.size = self.text_size
550
        if tree.is_executable(self.file_id):
551
            item.mode = 0755
552
        else:
553
            item.mode = 0644
554
        return fileobj
555
556
    def _put_on_disk(self, fullpath, tree):
557
        """See InventoryEntry._put_on_disk."""
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
558
        osutils.pumpfile(tree.get_file(self.file_id), file(fullpath, 'wb'))
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
559
        if tree.is_executable(self.file_id):
560
            os.chmod(fullpath, 0755)
561
1185.12.33 by Aaron Bentley
Fixed symlink reverting
562
    def _read_tree_state(self, path, work_tree):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
563
        """See InventoryEntry._read_tree_state."""
1732.1.19 by John Arbash Meinel
If you have the path, use it rather than looking it up again
564
        self.text_sha1 = work_tree.get_file_sha1(self.file_id, path=path)
1740.3.2 by Jelmer Vernooij
Move storing file texts to commit builder.
565
        # FIXME: 20050930 probe for the text size when getting sha1
566
        # in _read_tree_state
1732.1.19 by John Arbash Meinel
If you have the path, use it rather than looking it up again
567
        self.executable = work_tree.is_executable(self.file_id, path=path)
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
568
1733.1.4 by Robert Collins
Cosmetic niceties for debugging, extra comments etc.
569
    def __repr__(self):
570
        return ("%s(%r, %r, parent_id=%r, sha1=%r, len=%s)"
571
                % (self.__class__.__name__,
572
                   self.file_id,
573
                   self.name,
574
                   self.parent_id,
575
                   self.text_sha1,
576
                   self.text_size))
577
1534.7.175 by Aaron Bentley
Ensured revert writes a normal inventory
578
    def _forget_tree_state(self):
579
        self.text_sha1 = None
580
1405 by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave
581
    def _unchanged(self, previous_ie):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
582
        """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
583
        compatible = super(InventoryFile, self)._unchanged(previous_ie)
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
584
        if self.text_sha1 != previous_ie.text_sha1:
585
            compatible = False
586
        else:
587
            # FIXME: 20050930 probe for the text size when getting sha1
588
            # in _read_tree_state
589
            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
590
        if self.executable != previous_ie.executable:
591
            compatible = False
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
592
        return compatible
593
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
594
595
class InventoryLink(InventoryEntry):
596
    """A file in an inventory."""
597
1757.2.10 by Robert Collins
Give all inventory entries __slots__ that are useful with the current codebase.
598
    __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.
599
                 'text_id', 'parent_id', 'children', 'executable',
600
                 'revision', 'symlink_target', 'reference_revision']
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
601
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
602
    def _check(self, checker, rev_id, tree):
603
        """See InventoryEntry._check"""
1757.2.11 by Robert Collins
Correct bzr diff | less= None clauses in inventory.py to be is not None.
604
        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
605
            raise BzrCheckError('symlink {%s} has text in revision {%s}'
606
                    % (self.file_id, rev_id))
1753.1.4 by Robert Collins
Fixup '== None' usage in inventory.py.
607
        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
608
            raise BzrCheckError('symlink {%s} has no target in revision {%s}'
609
                    % (self.file_id, rev_id))
610
611
    def copy(self):
612
        other = InventoryLink(self.file_id, self.name, self.parent_id)
613
        other.symlink_target = self.symlink_target
614
        other.revision = self.revision
615
        return other
616
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
617
    def detect_changes(self, old_entry):
618
        """See InventoryEntry.detect_changes."""
619
        # FIXME: which _modified field should we use ? RBC 20051003
620
        text_modified = (self.symlink_target != old_entry.symlink_target)
621
        if text_modified:
622
            mutter("    symlink target changed")
623
        meta_modified = False
624
        return text_modified, meta_modified
625
626
    def _diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree,
627
             output_to, reverse=False):
628
        """See InventoryEntry._diff."""
3009.2.22 by Aaron Bentley
Update names & docstring
629
        from bzrlib.diff import DiffSymlink
3009.2.5 by Aaron Bentley
Factor symlink and file diffing into differ
630
        old_target = self.symlink_target
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
631
        if to_entry is not None:
3009.2.5 by Aaron Bentley
Factor symlink and file diffing into differ
632
            new_target = to_entry.symlink_target
633
        else:
634
            new_target = None
635
        if not reverse:
636
            old_tree = tree
637
            new_tree = to_tree
638
        else:
639
            old_tree = to_tree
640
            new_tree = tree
641
            new_target, old_target = old_target, new_target
3009.2.22 by Aaron Bentley
Update names & docstring
642
        differ = DiffSymlink(old_tree, new_tree, output_to)
3009.2.5 by Aaron Bentley
Factor symlink and file diffing into differ
643
        return differ.diff_symlink(old_target, new_target)
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
644
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
645
    def __init__(self, file_id, name, parent_id):
646
        super(InventoryLink, self).__init__(file_id, name, parent_id)
647
        self.kind = 'symlink'
648
649
    def kind_character(self):
650
        """See InventoryEntry.kind_character."""
651
        return ''
652
653
    def _put_in_tar(self, item, tree):
654
        """See InventoryEntry._put_in_tar."""
1185.33.3 by Martin Pool
[merge] jelmer
655
        item.type = tarfile.SYMTYPE
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
656
        fileobj = None
657
        item.size = 0
658
        item.mode = 0755
659
        item.linkname = self.symlink_target
660
        return fileobj
661
662
    def _put_on_disk(self, fullpath, tree):
663
        """See InventoryEntry._put_on_disk."""
664
        try:
665
            os.symlink(self.symlink_target, fullpath)
666
        except OSError,e:
667
            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
668
1185.12.33 by Aaron Bentley
Fixed symlink reverting
669
    def _read_tree_state(self, path, work_tree):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
670
        """See InventoryEntry._read_tree_state."""
671
        self.symlink_target = work_tree.get_symlink_target(self.file_id)
672
1534.7.175 by Aaron Bentley
Ensured revert writes a normal inventory
673
    def _forget_tree_state(self):
674
        self.symlink_target = None
675
1405 by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave
676
    def _unchanged(self, previous_ie):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
677
        """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
678
        compatible = super(InventoryLink, self)._unchanged(previous_ie)
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
679
        if self.symlink_target != previous_ie.symlink_target:
680
            compatible = False
681
        return compatible
682
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
683
2100.3.1 by Aaron Bentley
Start roundtripping tree-reference entries
684
class TreeReference(InventoryEntry):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
685
2100.3.1 by Aaron Bentley
Start roundtripping tree-reference entries
686
    kind = 'tree-reference'
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
687
2255.6.8 by Aaron Bentley
Merge refactoring of add_reference
688
    def __init__(self, file_id, name, parent_id, revision=None,
689
                 reference_revision=None):
2100.3.1 by Aaron Bentley
Start roundtripping tree-reference entries
690
        InventoryEntry.__init__(self, file_id, name, parent_id)
691
        self.revision = revision
692
        self.reference_revision = reference_revision
693
2100.3.18 by Aaron Bentley
Get commit working for tree references
694
    def copy(self):
695
        return TreeReference(self.file_id, self.name, self.parent_id,
696
                             self.revision, self.reference_revision)
697
2100.3.19 by Aaron Bentley
Ensure commit preserves reference revision
698
    def _read_tree_state(self, path, work_tree):
699
        """Populate fields in the inventory entry from the given tree.
700
        """
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.
701
        self.reference_revision = work_tree.get_reference_revision(
702
            self.file_id, path)
2100.3.19 by Aaron Bentley
Ensure commit preserves reference revision
703
704
    def _forget_tree_state(self):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
705
        self.reference_revision = None
2100.3.19 by Aaron Bentley
Ensure commit preserves reference revision
706
2825.5.2 by Robert Collins
Review feedback, and fix pointless commits with nested trees to raise PointlessCommit appropriately.
707
    def _unchanged(self, previous_ie):
708
        """See InventoryEntry._unchanged."""
709
        compatible = super(TreeReference, self)._unchanged(previous_ie)
710
        if self.reference_revision != previous_ie.reference_revision:
711
            compatible = False
712
        return compatible
713
2100.3.19 by Aaron Bentley
Ensure commit preserves reference revision
714
802 by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions
715
class Inventory(object):
1 by mbp at sourcefrog
import from baz patch-364
716
    """Inventory of versioned files in a tree.
717
240 by mbp at sourcefrog
doc
718
    This describes which file_id is present at each point in the tree,
719
    and possibly the SHA-1 or other information about the file.
720
    Entries can be looked up either by path or by file_id.
1 by mbp at sourcefrog
import from baz patch-364
721
722
    The inventory represents a typical unix file tree, with
723
    directories containing files and subdirectories.  We never store
724
    the full path to a file, because renaming a directory implicitly
725
    moves all of its contents.  This class internally maintains a
726
    lookup tree that allows the children under a directory to be
727
    returned quickly.
728
729
    InventoryEntry objects must not be modified after they are
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
730
    inserted, other than through the Inventory API.
1 by mbp at sourcefrog
import from baz patch-364
731
732
    >>> inv = Inventory()
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
733
    >>> 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.
734
    InventoryFile('123-123', 'hello.c', parent_id='TREE_ROOT', sha1=None, len=None)
1 by mbp at sourcefrog
import from baz patch-364
735
    >>> inv['123-123'].name
736
    'hello.c'
737
738
    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
739
1 by mbp at sourcefrog
import from baz patch-364
740
    >>> bool(inv.path2id('hello.c'))
741
    True
742
    >>> '123-123' in inv
743
    True
744
745
    May also look up by name:
746
747
    >>> [x[0] for x in inv.iter_entries()]
1852.6.6 by Robert Collins
Finish updating iter_entries change to make all tests pass.
748
    ['', u'hello.c']
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
749
    >>> 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
750
    >>> inv.add(InventoryFile('123-123', 'hello.c', ROOT_ID))
1731.1.33 by Aaron Bentley
Revert no-special-root changes
751
    Traceback (most recent call last):
752
    BzrError: parent_id {TREE_ROOT} not in inventory
753
    >>> 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.
754
    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
755
    """
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
756
    def __init__(self, root_id=ROOT_ID, revision_id=None):
1 by mbp at sourcefrog
import from baz patch-364
757
        """Create or read an inventory.
758
759
        If a working directory is specified, the inventory is read
760
        from there.  If the file is specified, read from that. If not,
761
        the inventory is created empty.
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
762
763
        The inventory is created with a default root directory, with
764
        an id of None.
1 by mbp at sourcefrog
import from baz patch-364
765
        """
1731.1.33 by Aaron Bentley
Revert no-special-root changes
766
        if root_id is not None:
2294.1.5 by John Arbash Meinel
Fix Inventory.iter_entries_by_dir to return Unicode paths,
767
            self._set_root(InventoryDirectory(root_id, u'', None))
1731.1.33 by Aaron Bentley
Revert no-special-root changes
768
        else:
769
            self.root = None
770
            self._byid = {}
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
771
        self.revision_id = revision_id
1910.2.3 by Aaron Bentley
All tests pass
772
2865.1.1 by Robert Collins
Create new mutable tree method update_to_one_parent_via_delta for eventual use by commit.
773
    def __repr__(self):
4112.1.1 by Vincent Ladeuil
Fallback to old revision id if the current one doesn't exist in
774
        # More than one page of ouput is not useful anymore to debug
775
        max_len = 2048
776
        closing = '...}'
777
        contents = repr(self._byid)
778
        if len(contents) > max_len:
779
            contents = contents[:(max_len-len(closing))] + closing
780
        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.
781
782
    def apply_delta(self, delta):
783
        """Apply a delta to this inventory.
784
785
        :param delta: A list of changes to apply. After all the changes are
786
            applied the final inventory must be internally consistent, but it
787
            is ok to supply changes which, if only half-applied would have an
788
            invalid result - such as supplying two changes which rename two
789
            files, 'A' and 'B' with each other : [('A', 'B', 'A-id', a_entry),
790
            ('B', 'A', 'B-id', b_entry)].
791
792
            Each change is a tuple, of the form (old_path, new_path, file_id,
793
            new_entry).
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
794
2865.1.1 by Robert Collins
Create new mutable tree method update_to_one_parent_via_delta for eventual use by commit.
795
            When new_path is None, the change indicates the removal of an entry
796
            from the inventory and new_entry will be ignored (using None is
797
            appropriate). If new_path is not None, then new_entry must be an
798
            InventoryEntry instance, which will be incorporated into the
799
            inventory (and replace any existing entry with the same file id).
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
800
2865.1.1 by Robert Collins
Create new mutable tree method update_to_one_parent_via_delta for eventual use by commit.
801
            When old_path is None, the change indicates the addition of
802
            a new entry to the inventory.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
803
2865.1.1 by Robert Collins
Create new mutable tree method update_to_one_parent_via_delta for eventual use by commit.
804
            When neither new_path nor old_path are None, the change is a
805
            modification to an entry, such as a rename, reparent, kind change
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
806
            etc.
2865.1.1 by Robert Collins
Create new mutable tree method update_to_one_parent_via_delta for eventual use by commit.
807
808
            The children attribute of new_entry is ignored. This is because
2865.1.3 by Robert Collins
Review feedback.
809
            this method preserves children automatically across alterations to
810
            the parent of the children, and cases where the parent id of a
811
            child is changing require the child to be passed in as a separate
812
            change regardless. E.g. in the recursive deletion of a directory -
813
            the directory's children must be included in the delta, or the
814
            final inventory will be invalid.
2865.1.1 by Robert Collins
Create new mutable tree method update_to_one_parent_via_delta for eventual use by commit.
815
        """
816
        children = {}
817
        # Remove all affected items which were in the original inventory,
818
        # starting with the longest paths, thus ensuring parents are examined
819
        # after their children, which means that everything we examine has no
820
        # modified children remaining by the time we examine it.
821
        for old_path, file_id in sorted(((op, f) for op, np, f, e in delta
822
                                        if op is not None), reverse=True):
823
            if file_id not in self:
824
                # adds come later
825
                continue
826
            # 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.
827
            file_id_children = getattr(self[file_id], 'children', {})
828
            if len(file_id_children):
829
                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.
830
            # Remove file_id and the unaltered children. If file_id is not
831
            # being deleted it will be reinserted back later.
832
            self.remove_recursive_id(file_id)
833
        # Insert all affected which should be in the new inventory, reattaching
834
        # their children if they had any. This is done from shortest path to
835
        # longest, ensuring that items which were modified and whose parents in
836
        # the resulting inventory were also modified, are inserted after their
837
        # parents.
838
        for new_path, new_entry in sorted((np, e) for op, np, f, e in
839
                                          delta if np is not None):
840
            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.
841
                # Pop the child which to allow detection of children whose
842
                # parents were deleted and which were not reattached to a new
843
                # parent.
844
                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.
845
            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.
846
        if len(children):
847
            # Get the parent id that was deleted
848
            parent_id, children = children.popitem()
849
            raise errors.InconsistentDelta("<deleted>", parent_id,
850
                "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.
851
1910.2.3 by Aaron Bentley
All tests pass
852
    def _set_root(self, ie):
853
        self.root = ie
1907.1.2 by Aaron Bentley
More removal of unique-root stuff
854
        self._byid = {self.root.file_id: self.root}
1 by mbp at sourcefrog
import from baz patch-364
855
1189 by Martin Pool
- BROKEN: partial support for commit into weave
856
    def copy(self):
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
857
        # TODO: jam 20051218 Should copy also copy the revision_id?
1852.6.3 by Robert Collins
Make iter(Tree) consistent for all tree types.
858
        entries = self.iter_entries()
2938.2.1 by Jelmer Vernooij
Handle empty inventories in Inventory.copy().
859
        if self.root is None:
860
            return Inventory(root_id=None)
1852.6.3 by Robert Collins
Make iter(Tree) consistent for all tree types.
861
        other = Inventory(entries.next()[1].file_id)
3616.1.1 by Jelmer Vernooij
Fix copying of root revision in inventory.
862
        other.root.revision = self.root.revision
1206 by Martin Pool
- fix bug in Inventory.copy()
863
        # copy recursively so we know directories will be added before
864
        # their children.  There are more efficient ways than this...
2935.2.1 by Jelmer Vernooij
Fix Inventory.copy() and add a test for it.
865
        for path, entry in entries:
1189 by Martin Pool
- BROKEN: partial support for commit into weave
866
            other.add(entry.copy())
867
        return other
868
1 by mbp at sourcefrog
import from baz patch-364
869
    def __iter__(self):
870
        return iter(self._byid)
871
872
    def __len__(self):
873
        """Returns number of entries."""
874
        return len(self._byid)
875
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
876
    def iter_entries(self, from_dir=None):
1 by mbp at sourcefrog
import from baz patch-364
877
        """Return (path, entry) pairs, in order by name."""
1753.1.4 by Robert Collins
Fixup '== None' usage in inventory.py.
878
        if from_dir is None:
1731.1.33 by Aaron Bentley
Revert no-special-root changes
879
            if self.root is None:
880
                return
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
881
            from_dir = self.root
1852.6.3 by Robert Collins
Make iter(Tree) consistent for all tree types.
882
            yield '', self.root
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
883
        elif isinstance(from_dir, basestring):
884
            from_dir = self._byid[from_dir]
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
885
1732.1.24 by John Arbash Meinel
iter_entries time drops to 1/6th time
886
        # unrolling the recursive called changed the time from
887
        # 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
888
        children = from_dir.children.items()
889
        children.sort()
890
        children = collections.deque(children)
891
        stack = [(u'', children)]
892
        while stack:
893
            from_dir_relpath, children = stack[-1]
894
895
            while children:
896
                name, ie = children.popleft()
897
898
                # we know that from_dir_relpath never ends in a slash
899
                # and 'f' doesn't begin with one, we can do a string op, rather
900
                # than the checks of pathjoin(), though this means that all paths
901
                # start with a slash
902
                path = from_dir_relpath + '/' + name
903
904
                yield path[1:], ie
905
906
                if ie.kind != 'directory':
907
                    continue
908
909
                # But do this child first
910
                new_children = ie.children.items()
911
                new_children.sort()
912
                new_children = collections.deque(new_children)
913
                stack.append((path, new_children))
914
                # Break out of inner loop, so that we start outer loop with child
915
                break
916
            else:
917
                # 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.
918
                stack.pop()
555 by Martin Pool
- New Inventory.entries() method
919
2825.7.1 by Robert Collins
* Partial commits are now approximately 40% faster by walking over the
920
    def iter_entries_by_dir(self, from_dir=None, specific_file_ids=None,
921
        yield_parents=False):
1711.2.36 by John Arbash Meinel
Add an iter_entries_by_dir which returns directory children before their children.
922
        """Iterate over the entries in a directory first order.
923
924
        This returns all entries for a directory before returning
925
        the entries for children of a directory. This is not
926
        lexicographically sorted order, and is a hybrid between
927
        depth-first and breadth-first.
928
2825.7.1 by Robert Collins
* Partial commits are now approximately 40% faster by walking over the
929
        :param yield_parents: If True, yield the parents from the root leading
930
            down to specific_file_ids that have been requested. This has no
931
            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.
932
        :return: This yields (path, entry) pairs
933
        """
2858.2.1 by Martin Pool
Remove most calls to safe_file_id and safe_revision_id.
934
        if specific_file_ids and not isinstance(specific_file_ids, set):
935
            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.
936
        # TODO? Perhaps this should return the from_dir so that the root is
937
        # yielded? or maybe an option?
1753.1.4 by Robert Collins
Fixup '== None' usage in inventory.py.
938
        if from_dir is None:
1731.1.47 by Aaron Bentley
Merge bzr.dev
939
            if self.root is None:
940
                return
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
941
            # Optimize a common case
2825.7.1 by Robert Collins
* Partial commits are now approximately 40% faster by walking over the
942
            if (not yield_parents and specific_file_ids is not None and
943
                len(specific_file_ids) == 1):
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
944
                file_id = list(specific_file_ids)[0]
945
                if file_id in self:
946
                    yield self.id2path(file_id), self[file_id]
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
947
                return
1711.2.36 by John Arbash Meinel
Add an iter_entries_by_dir which returns directory children before their children.
948
            from_dir = self.root
2825.7.1 by Robert Collins
* Partial commits are now approximately 40% faster by walking over the
949
            if (specific_file_ids is None or yield_parents or
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
950
                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,
951
                yield u'', self.root
1711.2.36 by John Arbash Meinel
Add an iter_entries_by_dir which returns directory children before their children.
952
        elif isinstance(from_dir, basestring):
953
            from_dir = self._byid[from_dir]
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
954
955
        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.
956
            # TODO: jam 20070302 This could really be done as a loop rather
957
            #       than a bunch of recursive calls.
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
958
            parents = set()
2309.4.2 by John Arbash Meinel
Change iter_entries_by_dir to avoid extra file id safety checks.
959
            byid = self._byid
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
960
            def add_ancestors(file_id):
2309.4.2 by John Arbash Meinel
Change iter_entries_by_dir to avoid extra file id safety checks.
961
                if file_id not in byid:
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
962
                    return
2309.4.2 by John Arbash Meinel
Change iter_entries_by_dir to avoid extra file id safety checks.
963
                parent_id = byid[file_id].parent_id
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
964
                if parent_id is None:
965
                    return
966
                if parent_id not in parents:
967
                    parents.add(parent_id)
968
                    add_ancestors(parent_id)
969
            for file_id in specific_file_ids:
970
                add_ancestors(file_id)
971
        else:
972
            parents = None
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
973
1711.2.36 by John Arbash Meinel
Add an iter_entries_by_dir which returns directory children before their children.
974
        stack = [(u'', from_dir)]
975
        while stack:
976
            cur_relpath, cur_dir = stack.pop()
977
978
            child_dirs = []
979
            for child_name, child_ie in sorted(cur_dir.children.iteritems()):
980
981
                child_relpath = cur_relpath + child_name
982
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
983
                if (specific_file_ids is None or
2825.7.1 by Robert Collins
* Partial commits are now approximately 40% faster by walking over the
984
                    child_ie.file_id in specific_file_ids or
985
                    (yield_parents and child_ie.file_id in parents)):
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
986
                    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.
987
988
                if child_ie.kind == 'directory':
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
989
                    if parents is None or child_ie.file_id in parents:
990
                        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.
991
            stack.extend(reversed(child_dirs))
992
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
993
    def make_entry(self, kind, name, parent_id, file_id=None):
994
        """Simple thunk to bzrlib.inventory.make_entry."""
995
        return make_entry(kind, name, parent_id, file_id)
996
555 by Martin Pool
- New Inventory.entries() method
997
    def entries(self):
998
        """Return list of (path, ie) for all entries except the root.
999
1000
        This may be faster than iter_entries.
1001
        """
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
1002
        accum = []
1003
        def descend(dir_ie, dir_path):
556 by Martin Pool
- fix up Inventory.entries()
1004
            kids = dir_ie.children.items()
555 by Martin Pool
- New Inventory.entries() method
1005
            kids.sort()
1006
            for name, ie in kids:
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
1007
                child_path = osutils.pathjoin(dir_path, name)
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
1008
                accum.append((child_path, ie))
555 by Martin Pool
- New Inventory.entries() method
1009
                if ie.kind == 'directory':
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
1010
                    descend(ie, child_path)
555 by Martin Pool
- New Inventory.entries() method
1011
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1012
        descend(self.root, u'')
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
1013
        return accum
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
1014
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
1015
    def directories(self):
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
1016
        """Return (path, entry) pairs for all directories, including the root.
1 by mbp at sourcefrog
import from baz patch-364
1017
        """
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
1018
        accum = []
1019
        def descend(parent_ie, parent_path):
1020
            accum.append((parent_path, parent_ie))
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1021
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
1022
            kids = [(ie.name, ie) for ie in parent_ie.children.itervalues() if ie.kind == 'directory']
1023
            kids.sort()
156 by mbp at sourcefrog
new "directories" command
1024
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
1025
            for name, child_ie in kids:
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
1026
                child_path = osutils.pathjoin(parent_path, name)
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
1027
                descend(child_ie, child_path)
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1028
        descend(self.root, u'')
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
1029
        return accum
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1030
1 by mbp at sourcefrog
import from baz patch-364
1031
    def __contains__(self, file_id):
1032
        """True if this entry contains a file with given id.
1033
1034
        >>> inv = Inventory()
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
1035
        >>> inv.add(InventoryFile('123', 'foo.c', ROOT_ID))
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
1036
        InventoryFile('123', 'foo.c', parent_id='TREE_ROOT', sha1=None, len=None)
1 by mbp at sourcefrog
import from baz patch-364
1037
        >>> '123' in inv
1038
        True
1039
        >>> '456' in inv
1040
        False
1041
        """
1711.9.11 by John Arbash Meinel
change return foo in bar to return (foo in bar)
1042
        return (file_id in self._byid)
1 by mbp at sourcefrog
import from baz patch-364
1043
1044
    def __getitem__(self, file_id):
1045
        """Return the entry for given file_id.
1046
1047
        >>> inv = Inventory()
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
1048
        >>> inv.add(InventoryFile('123123', 'hello.c', ROOT_ID))
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
1049
        InventoryFile('123123', 'hello.c', parent_id='TREE_ROOT', sha1=None, len=None)
1 by mbp at sourcefrog
import from baz patch-364
1050
        >>> inv['123123'].name
1051
        'hello.c'
1052
        """
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
1053
        try:
1054
            return self._byid[file_id]
1055
        except KeyError:
2067.3.1 by Martin Pool
Clean up BzrNewError, other exception classes and users.
1056
            # really we're passing an inventory, not a tree...
1057
            raise errors.NoSuchId(self, file_id)
1 by mbp at sourcefrog
import from baz patch-364
1058
460 by Martin Pool
- new testing command compare-trees
1059
    def get_file_kind(self, file_id):
1060
        return self._byid[file_id].kind
1061
138 by mbp at sourcefrog
remove parallel tree from inventory;
1062
    def get_child(self, parent_id, filename):
1732.1.18 by John Arbash Meinel
50ms is probably not worth it
1063
        return self[parent_id].children.get(filename)
138 by mbp at sourcefrog
remove parallel tree from inventory;
1064
2100.3.6 by Aaron Bentley
Make add recursive for children of added entries
1065
    def _add_child(self, entry):
1066
        """Add an entry to the inventory, without adding it to its parent"""
1067
        if entry.file_id in self._byid:
1068
            raise BzrError("inventory already contains entry with id {%s}" %
1069
                           entry.file_id)
1070
        self._byid[entry.file_id] = entry
1071
        for child in getattr(entry, 'children', {}).itervalues():
1072
            self._add_child(child)
1073
        return entry
1074
1 by mbp at sourcefrog
import from baz patch-364
1075
    def add(self, entry):
1076
        """Add entry to inventory.
1077
1078
        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
1079
        which calls this.
1080
1081
        Returns the new entry object.
1082
        """
139 by mbp at sourcefrog
simplified/faster Inventory.add
1083
        if entry.file_id in self._byid:
2255.7.16 by John Arbash Meinel
Make sure adding a duplicate file_id raises DuplicateFileId.
1084
            raise errors.DuplicateFileId(entry.file_id,
1085
                                         self._byid[entry.file_id])
1 by mbp at sourcefrog
import from baz patch-364
1086
1731.1.33 by Aaron Bentley
Revert no-special-root changes
1087
        if entry.parent_id is None:
2100.3.6 by Aaron Bentley
Make add recursive for children of added entries
1088
            self.root = entry
1089
        else:
1090
            try:
1091
                parent = self._byid[entry.parent_id]
1092
            except KeyError:
1093
                raise BzrError("parent_id {%s} not in inventory" %
1094
                               entry.parent_id)
1095
1096
            if entry.name in parent.children:
1097
                raise BzrError("%s is already versioned" %
1098
                        osutils.pathjoin(self.id2path(parent.file_id),
1551.13.12 by Aaron Bentley
Fix encoding of 'already versioned' error
1099
                        entry.name).encode('utf-8'))
2100.3.6 by Aaron Bentley
Make add recursive for children of added entries
1100
            parent.children[entry.name] = entry
1101
        return self._add_child(entry)
1 by mbp at sourcefrog
import from baz patch-364
1102
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)
1103
    def add_path(self, relpath, kind, file_id=None, parent_id=None):
70 by mbp at sourcefrog
Prepare for smart recursive add.
1104
        """Add entry from a path.
1105
1180 by Martin Pool
- start splitting code for xml (de)serialization away from objects
1106
        The immediate parent must already be versioned.
1107
1108
        Returns the new entry object."""
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1109
1830.3.5 by John Arbash Meinel
make_entry refuses to create non-normalized entries.
1110
        parts = osutils.splitpath(relpath)
70 by mbp at sourcefrog
Prepare for smart recursive add.
1111
1534.7.69 by Aaron Bentley
Got real root moves working
1112
        if len(parts) == 0:
1713.1.6 by Robert Collins
Move file id random data selection out of the inner loop for 'bzr add'.
1113
            if file_id is None:
2116.4.1 by John Arbash Meinel
Update file and revision id generators.
1114
                file_id = generate_ids.gen_root_id()
1731.1.1 by Aaron Bentley
Make root entry an InventoryDirectory, make EmptyTree really empty
1115
            self.root = InventoryDirectory(file_id, '', None)
1534.7.69 by Aaron Bentley
Got real root moves working
1116
            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.
1117
            return self.root
1534.7.69 by Aaron Bentley
Got real root moves working
1118
        else:
1119
            parent_path = parts[:-1]
1120
            parent_id = self.path2id(parent_path)
1753.1.4 by Robert Collins
Fixup '== None' usage in inventory.py.
1121
            if parent_id is None:
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
1122
                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)
1123
        ie = make_entry(kind, parts[-1], parent_id, file_id)
70 by mbp at sourcefrog
Prepare for smart recursive add.
1124
        return self.add(ie)
1125
1 by mbp at sourcefrog
import from baz patch-364
1126
    def __delitem__(self, file_id):
1127
        """Remove entry by id.
1128
1129
        >>> inv = Inventory()
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
1130
        >>> inv.add(InventoryFile('123', 'foo.c', ROOT_ID))
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
1131
        InventoryFile('123', 'foo.c', parent_id='TREE_ROOT', sha1=None, len=None)
1 by mbp at sourcefrog
import from baz patch-364
1132
        >>> '123' in inv
1133
        True
1134
        >>> del inv['123']
1135
        >>> '123' in inv
1136
        False
1137
        """
1138
        ie = self[file_id]
1139
        del self._byid[file_id]
1534.7.69 by Aaron Bentley
Got real root moves working
1140
        if ie.parent_id is not None:
1141
            del self[ie.parent_id].children[ie.name]
1 by mbp at sourcefrog
import from baz patch-364
1142
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
1143
    def __eq__(self, other):
1 by mbp at sourcefrog
import from baz patch-364
1144
        """Compare two sets by comparing their contents.
1145
1146
        >>> i1 = Inventory()
1147
        >>> i2 = Inventory()
1148
        >>> i1 == i2
1149
        True
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
1150
        >>> i1.add(InventoryFile('123', 'foo', ROOT_ID))
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
1151
        InventoryFile('123', 'foo', parent_id='TREE_ROOT', sha1=None, len=None)
1 by mbp at sourcefrog
import from baz patch-364
1152
        >>> i1 == i2
1153
        False
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
1154
        >>> i2.add(InventoryFile('123', 'foo', ROOT_ID))
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
1155
        InventoryFile('123', 'foo', parent_id='TREE_ROOT', sha1=None, len=None)
1 by mbp at sourcefrog
import from baz patch-364
1156
        >>> i1 == i2
1157
        True
1158
        """
1159
        if not isinstance(other, Inventory):
1160
            return NotImplemented
1161
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
1162
        return self._byid == other._byid
1163
1164
    def __ne__(self, other):
1249 by Martin Pool
- improvements to weave commit [broken]
1165
        return not self.__eq__(other)
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
1166
1167
    def __hash__(self):
1168
        raise ValueError('not hashable')
1169
1596.2.19 by Robert Collins
Shave 20% off id2path.
1170
    def _iter_file_id_parents(self, file_id):
1171
        """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.
1172
        while file_id is not None:
1596.2.19 by Robert Collins
Shave 20% off id2path.
1173
            try:
1174
                ie = self._byid[file_id]
1175
            except KeyError:
2255.11.5 by Martin Pool
Tree.id2path should raise NoSuchId, not return None.
1176
                raise errors.NoSuchId(tree=None, file_id=file_id)
1596.2.19 by Robert Collins
Shave 20% off id2path.
1177
            yield ie
1178
            file_id = ie.parent_id
1 by mbp at sourcefrog
import from baz patch-364
1179
172 by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory
1180
    def get_idpath(self, file_id):
1181
        """Return a list of file_ids for the path to an entry.
1182
1183
        The list contains one element for each directory followed by
1184
        the id of the file itself.  So the length of the returned list
1185
        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
1186
        root directory as depth 1.
172 by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory
1187
        """
1188
        p = []
1596.2.19 by Robert Collins
Shave 20% off id2path.
1189
        for parent in self._iter_file_id_parents(file_id):
1190
            p.insert(0, parent.file_id)
172 by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory
1191
        return p
1192
1 by mbp at sourcefrog
import from baz patch-364
1193
    def id2path(self, file_id):
1596.2.19 by Robert Collins
Shave 20% off id2path.
1194
        """Return as a string the path to file_id.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1195
1393.1.32 by Martin Pool
- add docstring demonstrating use of Inventory.id2path
1196
        >>> i = Inventory()
1197
        >>> e = i.add(InventoryDirectory('src-id', 'src', ROOT_ID))
1198
        >>> e = i.add(InventoryFile('foo-id', 'foo.c', parent_id='src-id'))
1185.31.34 by John Arbash Meinel
Removing instances of os.sep
1199
        >>> print i.id2path('foo-id')
1393.1.32 by Martin Pool
- add docstring demonstrating use of Inventory.id2path
1200
        src/foo.c
1201
        """
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
1202
        # get all names, skipping root
1596.2.19 by Robert Collins
Shave 20% off id2path.
1203
        return '/'.join(reversed(
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1204
            [parent.name for parent in
1596.2.19 by Robert Collins
Shave 20% off id2path.
1205
             self._iter_file_id_parents(file_id)][:-1]))
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1206
1 by mbp at sourcefrog
import from baz patch-364
1207
    def path2id(self, name):
1208
        """Walk down through directories to return entry of last component.
1209
1210
        names may be either a list of path components, or a single
1211
        string, in which case it is automatically split.
1212
1213
        This returns the entry of the last component in the path,
1214
        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
1215
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)
1216
        Returns None IFF the path is not found.
1 by mbp at sourcefrog
import from baz patch-364
1217
        """
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
1218
        if isinstance(name, basestring):
1219
            name = osutils.splitpath(name)
1 by mbp at sourcefrog
import from baz patch-364
1220
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)
1221
        # mutter("lookup path %r" % name)
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
1222
1223
        parent = self.root
1731.1.33 by Aaron Bentley
Revert no-special-root changes
1224
        if parent is None:
1225
            return None
70 by mbp at sourcefrog
Prepare for smart recursive add.
1226
        for f in name:
1 by mbp at sourcefrog
import from baz patch-364
1227
            try:
2091.3.1 by Aaron Bentley
When 'directory' path element isn't a directory, return None from path2id
1228
                children = getattr(parent, 'children', None)
2091.3.3 by Aaron Bentley
Test 'is None' not '== None'
1229
                if children is None:
2091.3.1 by Aaron Bentley
When 'directory' path element isn't a directory, return None from path2id
1230
                    return None
1231
                cie = children[f]
138 by mbp at sourcefrog
remove parallel tree from inventory;
1232
                parent = cie
1 by mbp at sourcefrog
import from baz patch-364
1233
            except KeyError:
1234
                # or raise an error?
1235
                return None
1236
138 by mbp at sourcefrog
remove parallel tree from inventory;
1237
        return parent.file_id
1 by mbp at sourcefrog
import from baz patch-364
1238
1239
    def has_filename(self, names):
1240
        return bool(self.path2id(names))
1241
1242
    def has_id(self, file_id):
1711.9.11 by John Arbash Meinel
change return foo in bar to return (foo in bar)
1243
        return (file_id in self._byid)
1 by mbp at sourcefrog
import from baz patch-364
1244
3879.2.6 by John Arbash Meinel
Bring in Inventory._make_delta
1245
    def _make_delta(self, old):
1246
        """Make an inventory delta from two inventories."""
3882.6.18 by John Arbash Meinel
Bring in optimizations to Inventory._make_delta.
1247
        old_getter = getattr(old, '_byid', old)
1248
        new_getter = self._byid
1249
        old_ids = set(old_getter)
1250
        new_ids = set(new_getter)
3879.2.6 by John Arbash Meinel
Bring in Inventory._make_delta
1251
        adds = new_ids - old_ids
1252
        deletes = old_ids - new_ids
3882.6.18 by John Arbash Meinel
Bring in optimizations to Inventory._make_delta.
1253
        if not adds and not deletes:
1254
            common = new_ids
1255
        else:
1256
            common = old_ids.intersection(new_ids)
3879.2.6 by John Arbash Meinel
Bring in Inventory._make_delta
1257
        delta = []
1258
        for file_id in deletes:
1259
            delta.append((old.id2path(file_id), None, file_id, None))
1260
        for file_id in adds:
1261
            delta.append((None, self.id2path(file_id), file_id, self[file_id]))
1262
        for file_id in common:
3882.6.18 by John Arbash Meinel
Bring in optimizations to Inventory._make_delta.
1263
            new_ie = new_getter[file_id]
1264
            old_ie = old_getter[file_id]
1265
            # If xml_serializer returns the cached InventoryEntries (rather
1266
            # than always doing .copy()), inlining the 'is' check saves 2.7M
1267
            # calls to __eq__.  Under lsprof this saves 20s => 6s.
1268
            # It is a minor improvement without lsprof.
1269
            if old_ie is new_ie or old_ie == new_ie:
1270
                continue
1271
            else:
3879.2.6 by John Arbash Meinel
Bring in Inventory._make_delta
1272
                delta.append((old.id2path(file_id), self.id2path(file_id),
3882.6.18 by John Arbash Meinel
Bring in optimizations to Inventory._make_delta.
1273
                              file_id, new_ie))
3879.2.6 by John Arbash Meinel
Bring in Inventory._make_delta
1274
        return delta
1275
1988.2.6 by Robert Collins
Review feedback.
1276
    def remove_recursive_id(self, file_id):
1277
        """Remove file_id, and children, from the inventory.
3879.2.6 by John Arbash Meinel
Bring in Inventory._make_delta
1278
1988.2.6 by Robert Collins
Review feedback.
1279
        :param file_id: A file_id to remove.
1280
        """
1988.2.1 by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of
1281
        to_find_delete = [self._byid[file_id]]
1282
        to_delete = []
1988.2.6 by Robert Collins
Review feedback.
1283
        while to_find_delete:
1988.2.1 by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of
1284
            ie = to_find_delete.pop()
1285
            to_delete.append(ie.file_id)
1286
            if ie.kind == 'directory':
1287
                to_find_delete.extend(ie.children.values())
1288
        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.
1289
            ie = self[file_id]
1988.2.1 by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of
1290
            del self._byid[file_id]
1731.2.16 by Aaron Bentley
Get extract working for standalone trees
1291
        if ie.parent_id is not None:
1292
            del self[ie.parent_id].children[ie.name]
2376.2.3 by Aaron Bentley
Fix root replacement for apply_inventory_delta
1293
        else:
1294
            self.root = None
1988.2.1 by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of
1295
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
1296
    def rename(self, file_id, new_parent_id, new_name):
1297
        """Move a file within the inventory.
1298
1299
        This can change either the name, or the parent, or both.
1300
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
1301
        This does not move the working file.
1302
        """
2825.6.1 by Robert Collins
* ``WorkingTree.rename_one`` will now raise an error if normalisation of the
1303
        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
1304
        if not is_valid_name(new_name):
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
1305
            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
1306
1307
        new_parent = self._byid[new_parent_id]
1308
        if new_name in new_parent.children:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
1309
            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
1310
172 by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory
1311
        new_parent_idpath = self.get_idpath(new_parent_id)
1312
        if file_id in new_parent_idpath:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
1313
            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
1314
                    % (self.id2path(file_id), self.id2path(new_parent_id)))
1315
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
1316
        file_ie = self._byid[file_id]
1317
        old_parent = self._byid[file_ie.parent_id]
1318
1319
        # TODO: Don't leave things messed up if this fails
1320
1321
        del old_parent.children[file_ie.name]
1322
        new_parent.children[new_name] = file_ie
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1323
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
1324
        file_ie.name = new_name
1325
        file_ie.parent_id = new_parent_id
1326
1731.1.1 by Aaron Bentley
Make root entry an InventoryDirectory, make EmptyTree really empty
1327
    def is_root(self, file_id):
1328
        return self.root is not None and file_id == self.root.file_id
1329
160 by mbp at sourcefrog
- basic support for moving files to different directories - have not done support for renaming them yet, but should be straightforward - some tests, but many cases are not handled yet i think
1330
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.
1331
entry_factory = {
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
1332
    'directory': InventoryDirectory,
1333
    'file': InventoryFile,
1334
    'symlink': InventoryLink,
2255.6.8 by Aaron Bentley
Merge refactoring of add_reference
1335
    '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.
1336
}
1337
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)
1338
def make_entry(kind, name, parent_id, file_id=None):
1339
    """Create an inventory entry.
1340
1341
    :param kind: the type of inventory entry to create.
1342
    :param name: the basename of the entry.
1343
    :param parent_id: the parent_id of the entry.
1344
    :param file_id: the file_id to use. if None, one will be created.
1345
    """
1346
    if file_id is None:
2116.4.1 by John Arbash Meinel
Update file and revision id generators.
1347
        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
1348
    name = ensure_normalized_name(name)
1349
    try:
1350
        factory = entry_factory[kind]
1351
    except KeyError:
1352
        raise BzrError("unknown kind %r" % kind)
1353
    return factory(file_id, name, parent_id)
1354
1355
1356
def ensure_normalized_name(name):
1357
    """Normalize name.
1358
1359
    :raises InvalidNormalization: When name is not normalized, and cannot be
1360
        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
1361
    :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
1362
    """
2255.2.54 by Robert Collins
Add in non-normalized filename sanity check to dirstate add().
1363
    #------- This has been copied to bzrlib.dirstate.DirState.add, please
1364
    # 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.
1365
    # we dont import normalized_filename directly because we want to be
1366
    # able to change the implementation at runtime for tests.
1830.3.5 by John Arbash Meinel
make_entry refuses to create non-normalized entries.
1367
    norm_name, can_access = osutils.normalized_filename(name)
1368
    if norm_name != name:
1369
        if can_access:
2825.6.1 by Robert Collins
* ``WorkingTree.rename_one`` will now raise an error if normalisation of the
1370
            return norm_name
1830.3.5 by John Arbash Meinel
make_entry refuses to create non-normalized entries.
1371
        else:
1372
            # TODO: jam 20060701 This would probably be more useful
1373
            #       if the error was raised with the full path
1374
            raise errors.InvalidNormalization(name)
2825.6.1 by Robert Collins
* ``WorkingTree.rename_one`` will now raise an error if normalisation of the
1375
    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)
1376
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
1377
1077 by Martin Pool
- avoid compiling REs at module load time
1378
_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
1379
1380
def is_valid_name(name):
1077 by Martin Pool
- avoid compiling REs at module load time
1381
    global _NAME_RE
1753.1.4 by Robert Collins
Fixup '== None' usage in inventory.py.
1382
    if _NAME_RE is None:
1077 by Martin Pool
- avoid compiling REs at module load time
1383
        _NAME_RE = re.compile(r'^[^/\\]+$')
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1384
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
1385
    return bool(_NAME_RE.match(name))