/brz/remove-bazaar

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