~bzr-pqm/bzr/bzr.dev

2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
1
# Copyright (C) 2005, 2006, 2007 Canonical Ltd
1448 by Robert Collins
revert symlinks correctly
2
#
1 by mbp at sourcefrog
import from baz patch-364
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
1448 by Robert Collins
revert symlinks correctly
7
#
1 by mbp at sourcefrog
import from baz patch-364
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
1448 by Robert Collins
revert symlinks correctly
12
#
1 by mbp at sourcefrog
import from baz patch-364
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
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.
2743.3.1 by Ian Clatworthy
Simplify InventoryEntry.snapshot and clean-up the return value
425
426
        :return: True if anything was recorded
1092.2.23 by Robert Collins
move inventory entry centric snapshot taking logic to inventory.py
427
        """
2743.3.1 by Ian Clatworthy
Simplify InventoryEntry.snapshot and clean-up the return value
428
        # cannot be unchanged unless there is only one parent file rev.
1185.12.33 by Aaron Bentley
Fixed symlink reverting
429
        self._read_tree_state(path, work_tree)
1092.2.23 by Robert Collins
move inventory entry centric snapshot taking logic to inventory.py
430
        if len(previous_entries) == 1:
431
            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
432
            if self._unchanged(parent_ie):
1092.2.23 by Robert Collins
move inventory entry centric snapshot taking logic to inventory.py
433
                self.revision = parent_ie.revision
2743.3.1 by Ian Clatworthy
Simplify InventoryEntry.snapshot and clean-up the return value
434
                return False
1092.2.23 by Robert Collins
move inventory entry centric snapshot taking logic to inventory.py
435
        self.revision = revision
2743.3.1 by Ian Clatworthy
Simplify InventoryEntry.snapshot and clean-up the return value
436
        return 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
437
1740.3.3 by Jelmer Vernooij
Move storing directories and links to commit builder.
438
    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
439
        """Record the 'text' of this entry, whatever form that takes.
2743.3.1 by Ian Clatworthy
Simplify InventoryEntry.snapshot and clean-up the return value
440
441
        :return: True if anything was recorded
1405 by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave
442
        """
1740.3.3 by Jelmer Vernooij
Move storing directories and links to commit builder.
443
        raise NotImplementedError(self._snapshot_text)
1092.2.23 by Robert Collins
move inventory entry centric snapshot taking logic to inventory.py
444
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
445
    def __eq__(self, other):
1 by mbp at sourcefrog
import from baz patch-364
446
        if not isinstance(other, InventoryEntry):
447
            return NotImplemented
448
1398 by Robert Collins
integrate in Gustavos x-bit patch
449
        return ((self.file_id == other.file_id)
450
                and (self.name == other.name)
451
                and (other.symlink_target == self.symlink_target)
452
                and (self.text_sha1 == other.text_sha1)
453
                and (self.text_size == other.text_size)
454
                and (self.text_id == other.text_id)
455
                and (self.parent_id == other.parent_id)
456
                and (self.kind == other.kind)
457
                and (self.revision == other.revision)
458
                and (self.executable == other.executable)
2255.2.220 by Robert Collins
Fix failing detection of changes restricted to subtrees causing spurious pointless commit errors.
459
                and (self.reference_revision == other.reference_revision)
1398 by Robert Collins
integrate in Gustavos x-bit patch
460
                )
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
461
462
    def __ne__(self, other):
463
        return not (self == other)
464
465
    def __hash__(self):
466
        raise ValueError('not hashable')
1 by mbp at sourcefrog
import from baz patch-364
467
1405 by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave
468
    def _unchanged(self, previous_ie):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
469
        """Has this entry changed relative to previous_ie.
470
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
471
        This method should be overridden in child classes.
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
472
        """
1092.2.22 by Robert Collins
text_version and name_version unification looking reasonable
473
        compatible = True
474
        # different inv parent
475
        if previous_ie.parent_id != self.parent_id:
476
            compatible = False
477
        # renamed
478
        elif previous_ie.name != self.name:
479
            compatible = False
2374.2.2 by John Arbash Meinel
Fix the small bug that ie.snapshot() didn't think about kind changes.
480
        elif previous_ie.kind != self.kind:
481
            compatible = False
1092.2.22 by Robert Collins
text_version and name_version unification looking reasonable
482
        return compatible
483
1185.12.33 by Aaron Bentley
Fixed symlink reverting
484
    def _read_tree_state(self, path, work_tree):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
485
        """Populate fields in the inventory entry from the given tree.
486
        
487
        Note that this should be modified to be a noop on virtual trees
488
        as all entries created there are prepopulated.
489
        """
1185.16.5 by Martin Pool
doc
490
        # TODO: Rather than running this manually, we should check the 
491
        # working sha1 and other expensive properties when they're
492
        # first requested, or preload them if they're already known
493
        pass            # nothing to do by default
1092.2.23 by Robert Collins
move inventory entry centric snapshot taking logic to inventory.py
494
1534.7.175 by Aaron Bentley
Ensured revert writes a normal inventory
495
    def _forget_tree_state(self):
496
        pass
497
1 by mbp at sourcefrog
import from baz patch-364
498
1907.1.4 by Aaron Bentley
Restore RootEntry, but mark it deprecated, restore EmptyTree.kind
499
class RootEntry(InventoryEntry):
500
501
    __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.
502
                 'text_id', 'parent_id', 'children', 'executable',
503
                 'revision', 'symlink_target', 'reference_revision']
1907.1.4 by Aaron Bentley
Restore RootEntry, but mark it deprecated, restore EmptyTree.kind
504
505
    def _check(self, checker, rev_id, tree):
506
        """See InventoryEntry._check"""
507
508
    def __init__(self, file_id):
509
        self.file_id = file_id
510
        self.children = {}
511
        self.kind = 'directory'
512
        self.parent_id = None
513
        self.name = u''
514
        self.revision = None
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
515
        symbol_versioning.warn('RootEntry is deprecated as of bzr 0.10.'
516
                               '  Please use InventoryDirectory instead.',
517
                               DeprecationWarning, stacklevel=2)
1907.1.4 by Aaron Bentley
Restore RootEntry, but mark it deprecated, restore EmptyTree.kind
518
519
    def __eq__(self, other):
520
        if not isinstance(other, RootEntry):
521
            return NotImplemented
522
        
523
        return (self.file_id == other.file_id) \
524
               and (self.children == other.children)
525
526
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
527
class InventoryDirectory(InventoryEntry):
528
    """A directory in an inventory."""
529
1757.2.10 by Robert Collins
Give all inventory entries __slots__ that are useful with the current codebase.
530
    __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.
531
                 'text_id', 'parent_id', 'children', 'executable',
532
                 'revision', 'symlink_target', 'reference_revision']
1757.2.10 by Robert Collins
Give all inventory entries __slots__ that are useful with the current codebase.
533
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
534
    def _check(self, checker, rev_id, tree):
535
        """See InventoryEntry._check"""
1757.2.11 by Robert Collins
Correct bzr diff | less= None clauses in inventory.py to be is not None.
536
        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
537
            raise BzrCheckError('directory {%s} has text in revision {%s}'
538
                                % (self.file_id, rev_id))
539
540
    def copy(self):
541
        other = InventoryDirectory(self.file_id, self.name, self.parent_id)
542
        other.revision = self.revision
543
        # note that children are *not* copied; they're pulled across when
544
        # others are added
545
        return other
546
547
    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
548
        super(InventoryDirectory, self).__init__(file_id, name, parent_id)
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
549
        self.children = {}
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
550
        self.kind = 'directory'
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
551
552
    def kind_character(self):
553
        """See InventoryEntry.kind_character."""
554
        return '/'
555
556
    def _put_in_tar(self, item, tree):
557
        """See InventoryEntry._put_in_tar."""
558
        item.type = tarfile.DIRTYPE
559
        fileobj = None
560
        item.name += '/'
561
        item.size = 0
562
        item.mode = 0755
563
        return fileobj
564
565
    def _put_on_disk(self, fullpath, tree):
566
        """See InventoryEntry._put_on_disk."""
567
        os.mkdir(fullpath)
568
1740.3.3 by Jelmer Vernooij
Move storing directories and links to commit builder.
569
    def _snapshot_text(self, file_parents, work_tree, commit_builder):
570
        """See InventoryEntry._snapshot_text."""
571
        commit_builder.modified_directory(self.file_id, file_parents)
2743.3.1 by Ian Clatworthy
Simplify InventoryEntry.snapshot and clean-up the return value
572
        return True
1740.3.3 by Jelmer Vernooij
Move storing directories and links to commit builder.
573
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
574
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
575
class InventoryFile(InventoryEntry):
576
    """A file in an inventory."""
577
1757.2.10 by Robert Collins
Give all inventory entries __slots__ that are useful with the current codebase.
578
    __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.
579
                 'text_id', 'parent_id', 'children', 'executable',
580
                 'revision', 'symlink_target', 'reference_revision']
1757.2.10 by Robert Collins
Give all inventory entries __slots__ that are useful with the current codebase.
581
1616.1.5 by Martin Pool
Cleanup and document some check code
582
    def _check(self, checker, tree_revision_id, tree):
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
583
        """See InventoryEntry._check"""
1616.1.5 by Martin Pool
Cleanup and document some check code
584
        t = (self.file_id, self.revision)
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
585
        if t in checker.checked_texts:
1616.1.5 by Martin Pool
Cleanup and document some check code
586
            prev_sha = checker.checked_texts[t]
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
587
            if prev_sha != self.text_sha1:
588
                raise BzrCheckError('mismatched sha1 on {%s} in {%s}' %
1616.1.5 by Martin Pool
Cleanup and document some check code
589
                                    (self.file_id, tree_revision_id))
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
590
            else:
591
                checker.repeated_text_cnt += 1
592
                return
1185.50.28 by John Arbash Meinel
Lots of updates for 'bzr check'
593
594
        if self.file_id not in checker.checked_weaves:
595
            mutter('check weave {%s}', self.file_id)
1551.15.50 by Aaron Bentley
Deprecate RevisionTree.get_weave
596
            w = tree._get_weave(self.file_id)
1185.50.28 by John Arbash Meinel
Lots of updates for 'bzr check'
597
            # Not passing a progress bar, because it creates a new
598
            # progress, which overwrites the current progress,
599
            # and doesn't look nice
600
            w.check()
601
            checker.checked_weaves[self.file_id] = True
602
        else:
1551.15.50 by Aaron Bentley
Deprecate RevisionTree.get_weave
603
            w = tree._get_weave(self.file_id)
1185.50.28 by John Arbash Meinel
Lots of updates for 'bzr check'
604
1616.1.5 by Martin Pool
Cleanup and document some check code
605
        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'.
606
        checker.checked_text_cnt += 1
1185.50.28 by John Arbash Meinel
Lots of updates for 'bzr check'
607
        # We can't check the length, because Weave doesn't store that
608
        # information, and the whole point of looking at the weave's
609
        # sha1sum is that we don't have to extract the text.
610
        if self.text_sha1 != w.get_sha1(self.revision):
611
            raise BzrCheckError('text {%s} version {%s} wrong sha1' 
612
                                % (self.file_id, self.revision))
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
613
        checker.checked_texts[t] = self.text_sha1
614
615
    def copy(self):
616
        other = InventoryFile(self.file_id, self.name, self.parent_id)
617
        other.executable = self.executable
618
        other.text_id = self.text_id
619
        other.text_sha1 = self.text_sha1
620
        other.text_size = self.text_size
621
        other.revision = self.revision
622
        return other
623
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
624
    def detect_changes(self, old_entry):
625
        """See InventoryEntry.detect_changes."""
1757.2.11 by Robert Collins
Correct bzr diff | less= None clauses in inventory.py to be is not None.
626
        assert self.text_sha1 is not None
627
        assert old_entry.text_sha1 is not None
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
628
        text_modified = (self.text_sha1 != old_entry.text_sha1)
629
        meta_modified = (self.executable != old_entry.executable)
630
        return text_modified, meta_modified
631
632
    def _diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree,
633
             output_to, reverse=False):
634
        """See InventoryEntry._diff."""
1558.15.2 by Aaron Bentley
Implemented binary file handling for diff
635
        try:
636
            from_text = tree.get_file(self.file_id).readlines()
637
            if to_entry:
638
                to_text = to_tree.get_file(to_entry.file_id).readlines()
639
            else:
640
                to_text = []
641
            if not reverse:
642
                text_diff(from_label, from_text,
643
                          to_label, to_text, output_to)
644
            else:
645
                text_diff(to_label, to_text,
646
                          from_label, from_text, output_to)
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
647
        except errors.BinaryFile:
1558.15.11 by Aaron Bentley
Apply merge review suggestions
648
            if reverse:
649
                label_pair = (to_label, from_label)
650
            else:
651
                label_pair = (from_label, to_label)
2592.2.1 by Jonathan Lange
Reproduce and fix bug 110092.
652
            print >> output_to, \
653
                  ("Binary files %s and %s differ" % label_pair).encode('utf8')
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
654
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
655
    def has_text(self):
656
        """See InventoryEntry.has_text."""
657
        return True
658
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
659
    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
660
        super(InventoryFile, self).__init__(file_id, name, parent_id)
661
        self.kind = 'file'
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
662
663
    def kind_character(self):
664
        """See InventoryEntry.kind_character."""
665
        return ''
666
667
    def _put_in_tar(self, item, tree):
668
        """See InventoryEntry._put_in_tar."""
669
        item.type = tarfile.REGTYPE
670
        fileobj = tree.get_file(self.file_id)
671
        item.size = self.text_size
672
        if tree.is_executable(self.file_id):
673
            item.mode = 0755
674
        else:
675
            item.mode = 0644
676
        return fileobj
677
678
    def _put_on_disk(self, fullpath, tree):
679
        """See InventoryEntry._put_on_disk."""
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
680
        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
681
        if tree.is_executable(self.file_id):
682
            os.chmod(fullpath, 0755)
683
1185.12.33 by Aaron Bentley
Fixed symlink reverting
684
    def _read_tree_state(self, path, work_tree):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
685
        """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
686
        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.
687
        # FIXME: 20050930 probe for the text size when getting sha1
688
        # in _read_tree_state
1732.1.19 by John Arbash Meinel
If you have the path, use it rather than looking it up again
689
        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
690
1733.1.4 by Robert Collins
Cosmetic niceties for debugging, extra comments etc.
691
    def __repr__(self):
692
        return ("%s(%r, %r, parent_id=%r, sha1=%r, len=%s)"
693
                % (self.__class__.__name__,
694
                   self.file_id,
695
                   self.name,
696
                   self.parent_id,
697
                   self.text_sha1,
698
                   self.text_size))
699
1534.7.175 by Aaron Bentley
Ensured revert writes a normal inventory
700
    def _forget_tree_state(self):
701
        self.text_sha1 = None
702
2743.3.2 by Ian Clatworthy
Custom snapshot method for InventoryFile so don't SHA twice
703
    def snapshot(self, revision, path, previous_entries,
704
                 work_tree, commit_builder):
705
        """See InventoryEntry.snapshot."""
2743.3.5 by Ian Clatworthy
Incorporate feedback from abentley
706
        # Note: We use a custom implementation of this method for files
707
        # because it's a performance critical part of commit.
708
709
        # If this is the initial commit for this file, we know the sha is
2772.2.1 by Ian Clatworthy
(Ian Clatworthy) Quicker initial commit - skip SHAing twice & skip path lookup as we know it
710
        # coming later so skip calculating it now (in _read_tree_state())
2743.3.2 by Ian Clatworthy
Custom snapshot method for InventoryFile so don't SHA twice
711
        if len(previous_entries) == 0:
712
            self.executable = work_tree.is_executable(self.file_id, path=path)
713
        else:
714
            self._read_tree_state(path, work_tree)
2743.3.5 by Ian Clatworthy
Incorporate feedback from abentley
715
716
        # If nothing is changed from the sole parent, there's nothing to do
717
        if len(previous_entries) == 1:
718
            parent_ie = previous_entries.values()[0]
719
            if self._unchanged(parent_ie):
720
                self.revision = parent_ie.revision
721
                return False
722
723
        # Add the file to the repository
2743.3.2 by Ian Clatworthy
Custom snapshot method for InventoryFile so don't SHA twice
724
        self.revision = revision
1740.3.2 by Jelmer Vernooij
Move storing file texts to commit builder.
725
        def get_content_byte_lines():
2743.3.3 by Ian Clatworthy
Skip path lookup for tree.get_file() when we already know the path
726
            return work_tree.get_file(self.file_id, path).readlines()
1740.3.3 by Jelmer Vernooij
Move storing directories and links to commit builder.
727
        self.text_sha1, self.text_size = commit_builder.modified_file_text(
2743.3.2 by Ian Clatworthy
Custom snapshot method for InventoryFile so don't SHA twice
728
            self.file_id, previous_entries, get_content_byte_lines,
729
            self.text_sha1, self.text_size)
2743.3.1 by Ian Clatworthy
Simplify InventoryEntry.snapshot and clean-up the return value
730
        return True
1405 by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave
731
732
    def _unchanged(self, previous_ie):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
733
        """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
734
        compatible = super(InventoryFile, self)._unchanged(previous_ie)
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
735
        if self.text_sha1 != previous_ie.text_sha1:
736
            compatible = False
737
        else:
738
            # FIXME: 20050930 probe for the text size when getting sha1
739
            # in _read_tree_state
740
            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
741
        if self.executable != previous_ie.executable:
742
            compatible = False
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
743
        return compatible
744
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
745
746
class InventoryLink(InventoryEntry):
747
    """A file in an inventory."""
748
1757.2.10 by Robert Collins
Give all inventory entries __slots__ that are useful with the current codebase.
749
    __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.
750
                 'text_id', 'parent_id', 'children', 'executable',
751
                 'revision', 'symlink_target', 'reference_revision']
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
752
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
753
    def _check(self, checker, rev_id, tree):
754
        """See InventoryEntry._check"""
1757.2.11 by Robert Collins
Correct bzr diff | less= None clauses in inventory.py to be is not None.
755
        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
756
            raise BzrCheckError('symlink {%s} has text in revision {%s}'
757
                    % (self.file_id, rev_id))
1753.1.4 by Robert Collins
Fixup '== None' usage in inventory.py.
758
        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
759
            raise BzrCheckError('symlink {%s} has no target in revision {%s}'
760
                    % (self.file_id, rev_id))
761
762
    def copy(self):
763
        other = InventoryLink(self.file_id, self.name, self.parent_id)
764
        other.symlink_target = self.symlink_target
765
        other.revision = self.revision
766
        return other
767
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
768
    def detect_changes(self, old_entry):
769
        """See InventoryEntry.detect_changes."""
770
        # FIXME: which _modified field should we use ? RBC 20051003
771
        text_modified = (self.symlink_target != old_entry.symlink_target)
772
        if text_modified:
773
            mutter("    symlink target changed")
774
        meta_modified = False
775
        return text_modified, meta_modified
776
777
    def _diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree,
778
             output_to, reverse=False):
779
        """See InventoryEntry._diff."""
780
        from_text = self.symlink_target
781
        if to_entry is not None:
782
            to_text = to_entry.symlink_target
783
            if reverse:
784
                temp = from_text
785
                from_text = to_text
786
                to_text = temp
787
            print >>output_to, '=== target changed %r => %r' % (from_text, to_text)
788
        else:
789
            if not reverse:
790
                print >>output_to, '=== target was %r' % self.symlink_target
791
            else:
792
                print >>output_to, '=== target is %r' % self.symlink_target
793
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
794
    def __init__(self, file_id, name, parent_id):
795
        super(InventoryLink, self).__init__(file_id, name, parent_id)
796
        self.kind = 'symlink'
797
798
    def kind_character(self):
799
        """See InventoryEntry.kind_character."""
800
        return ''
801
802
    def _put_in_tar(self, item, tree):
803
        """See InventoryEntry._put_in_tar."""
1185.33.3 by Martin Pool
[merge] jelmer
804
        item.type = tarfile.SYMTYPE
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
805
        fileobj = None
806
        item.size = 0
807
        item.mode = 0755
808
        item.linkname = self.symlink_target
809
        return fileobj
810
811
    def _put_on_disk(self, fullpath, tree):
812
        """See InventoryEntry._put_on_disk."""
813
        try:
814
            os.symlink(self.symlink_target, fullpath)
815
        except OSError,e:
816
            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
817
1185.12.33 by Aaron Bentley
Fixed symlink reverting
818
    def _read_tree_state(self, path, work_tree):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
819
        """See InventoryEntry._read_tree_state."""
820
        self.symlink_target = work_tree.get_symlink_target(self.file_id)
821
1534.7.175 by Aaron Bentley
Ensured revert writes a normal inventory
822
    def _forget_tree_state(self):
823
        self.symlink_target = None
824
1405 by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave
825
    def _unchanged(self, previous_ie):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
826
        """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
827
        compatible = super(InventoryLink, self)._unchanged(previous_ie)
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
828
        if self.symlink_target != previous_ie.symlink_target:
829
            compatible = False
830
        return compatible
831
1740.3.3 by Jelmer Vernooij
Move storing directories and links to commit builder.
832
    def _snapshot_text(self, file_parents, work_tree, commit_builder):
833
        """See InventoryEntry._snapshot_text."""
834
        commit_builder.modified_link(
835
            self.file_id, file_parents, self.symlink_target)
2743.3.1 by Ian Clatworthy
Simplify InventoryEntry.snapshot and clean-up the return value
836
        return True
1740.3.3 by Jelmer Vernooij
Move storing directories and links to commit builder.
837
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
838
2100.3.1 by Aaron Bentley
Start roundtripping tree-reference entries
839
class TreeReference(InventoryEntry):
840
    
841
    kind = 'tree-reference'
842
    
2255.6.8 by Aaron Bentley
Merge refactoring of add_reference
843
    def __init__(self, file_id, name, parent_id, revision=None,
844
                 reference_revision=None):
2100.3.1 by Aaron Bentley
Start roundtripping tree-reference entries
845
        InventoryEntry.__init__(self, file_id, name, parent_id)
846
        self.revision = revision
847
        self.reference_revision = reference_revision
848
2100.3.18 by Aaron Bentley
Get commit working for tree references
849
    def copy(self):
850
        return TreeReference(self.file_id, self.name, self.parent_id,
851
                             self.revision, self.reference_revision)
852
853
    def _snapshot_text(self, file_parents, work_tree, commit_builder):
854
        commit_builder.modified_reference(self.file_id, file_parents)
2743.3.1 by Ian Clatworthy
Simplify InventoryEntry.snapshot and clean-up the return value
855
        return True
2100.3.1 by Aaron Bentley
Start roundtripping tree-reference entries
856
2100.3.19 by Aaron Bentley
Ensure commit preserves reference revision
857
    def _read_tree_state(self, path, work_tree):
858
        """Populate fields in the inventory entry from the given tree.
859
        """
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.
860
        self.reference_revision = work_tree.get_reference_revision(
861
            self.file_id, path)
2100.3.19 by Aaron Bentley
Ensure commit preserves reference revision
862
863
    def _forget_tree_state(self):
864
        self.reference_revision = None 
865
866
802 by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions
867
class Inventory(object):
1 by mbp at sourcefrog
import from baz patch-364
868
    """Inventory of versioned files in a tree.
869
240 by mbp at sourcefrog
doc
870
    This describes which file_id is present at each point in the tree,
871
    and possibly the SHA-1 or other information about the file.
872
    Entries can be looked up either by path or by file_id.
1 by mbp at sourcefrog
import from baz patch-364
873
874
    The inventory represents a typical unix file tree, with
875
    directories containing files and subdirectories.  We never store
876
    the full path to a file, because renaming a directory implicitly
877
    moves all of its contents.  This class internally maintains a
878
    lookup tree that allows the children under a directory to be
879
    returned quickly.
880
881
    InventoryEntry objects must not be modified after they are
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
882
    inserted, other than through the Inventory API.
1 by mbp at sourcefrog
import from baz patch-364
883
884
    >>> inv = Inventory()
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
885
    >>> inv.add(InventoryFile('123-123', 'hello.c', ROOT_ID))
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
886
    InventoryFile('123-123', 'hello.c', parent_id='TREE_ROOT', sha1=None, len=None)
1 by mbp at sourcefrog
import from baz patch-364
887
    >>> inv['123-123'].name
888
    'hello.c'
889
890
    May be treated as an iterator or set to look up file ids:
891
    
892
    >>> bool(inv.path2id('hello.c'))
893
    True
894
    >>> '123-123' in inv
895
    True
896
897
    May also look up by name:
898
899
    >>> [x[0] for x in inv.iter_entries()]
1852.6.6 by Robert Collins
Finish updating iter_entries change to make all tests pass.
900
    ['', u'hello.c']
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
901
    >>> inv = Inventory('TREE_ROOT-12345678-12345678')
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
902
    >>> inv.add(InventoryFile('123-123', 'hello.c', ROOT_ID))
1731.1.33 by Aaron Bentley
Revert no-special-root changes
903
    Traceback (most recent call last):
904
    BzrError: parent_id {TREE_ROOT} not in inventory
905
    >>> inv.add(InventoryFile('123-123', 'hello.c', 'TREE_ROOT-12345678-12345678'))
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
906
    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
907
    """
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
908
    def __init__(self, root_id=ROOT_ID, revision_id=None):
1 by mbp at sourcefrog
import from baz patch-364
909
        """Create or read an inventory.
910
911
        If a working directory is specified, the inventory is read
912
        from there.  If the file is specified, read from that. If not,
913
        the inventory is created empty.
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
914
915
        The inventory is created with a default root directory, with
916
        an id of None.
1 by mbp at sourcefrog
import from baz patch-364
917
        """
1731.1.33 by Aaron Bentley
Revert no-special-root changes
918
        if root_id is not None:
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
919
            assert root_id.__class__ == str
2294.1.5 by John Arbash Meinel
Fix Inventory.iter_entries_by_dir to return Unicode paths,
920
            self._set_root(InventoryDirectory(root_id, u'', None))
1731.1.33 by Aaron Bentley
Revert no-special-root changes
921
        else:
922
            self.root = None
923
            self._byid = {}
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
924
        self.revision_id = revision_id
1910.2.3 by Aaron Bentley
All tests pass
925
926
    def _set_root(self, ie):
927
        self.root = ie
1907.1.2 by Aaron Bentley
More removal of unique-root stuff
928
        self._byid = {self.root.file_id: self.root}
1 by mbp at sourcefrog
import from baz patch-364
929
1189 by Martin Pool
- BROKEN: partial support for commit into weave
930
    def copy(self):
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
931
        # TODO: jam 20051218 Should copy also copy the revision_id?
1852.6.3 by Robert Collins
Make iter(Tree) consistent for all tree types.
932
        entries = self.iter_entries()
933
        other = Inventory(entries.next()[1].file_id)
1206 by Martin Pool
- fix bug in Inventory.copy()
934
        # copy recursively so we know directories will be added before
935
        # their children.  There are more efficient ways than this...
1852.6.3 by Robert Collins
Make iter(Tree) consistent for all tree types.
936
        for path, entry in entries():
1189 by Martin Pool
- BROKEN: partial support for commit into weave
937
            other.add(entry.copy())
938
        return other
939
1 by mbp at sourcefrog
import from baz patch-364
940
    def __iter__(self):
941
        return iter(self._byid)
942
943
    def __len__(self):
944
        """Returns number of entries."""
945
        return len(self._byid)
946
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
947
    def iter_entries(self, from_dir=None):
1 by mbp at sourcefrog
import from baz patch-364
948
        """Return (path, entry) pairs, in order by name."""
1753.1.4 by Robert Collins
Fixup '== None' usage in inventory.py.
949
        if from_dir is None:
1731.1.33 by Aaron Bentley
Revert no-special-root changes
950
            if self.root is None:
951
                return
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
952
            from_dir = self.root
1852.6.3 by Robert Collins
Make iter(Tree) consistent for all tree types.
953
            yield '', self.root
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
954
        elif isinstance(from_dir, basestring):
955
            from_dir = self._byid[from_dir]
956
            
1732.1.24 by John Arbash Meinel
iter_entries time drops to 1/6th time
957
        # unrolling the recursive called changed the time from
958
        # 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
959
        children = from_dir.children.items()
960
        children.sort()
961
        children = collections.deque(children)
962
        stack = [(u'', children)]
963
        while stack:
964
            from_dir_relpath, children = stack[-1]
965
966
            while children:
967
                name, ie = children.popleft()
968
969
                # we know that from_dir_relpath never ends in a slash
970
                # and 'f' doesn't begin with one, we can do a string op, rather
971
                # than the checks of pathjoin(), though this means that all paths
972
                # start with a slash
973
                path = from_dir_relpath + '/' + name
974
975
                yield path[1:], ie
976
977
                if ie.kind != 'directory':
978
                    continue
979
980
                # But do this child first
981
                new_children = ie.children.items()
982
                new_children.sort()
983
                new_children = collections.deque(new_children)
984
                stack.append((path, new_children))
985
                # Break out of inner loop, so that we start outer loop with child
986
                break
987
            else:
988
                # 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.
989
                stack.pop()
555 by Martin Pool
- New Inventory.entries() method
990
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
991
    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.
992
        """Iterate over the entries in a directory first order.
993
994
        This returns all entries for a directory before returning
995
        the entries for children of a directory. This is not
996
        lexicographically sorted order, and is a hybrid between
997
        depth-first and breadth-first.
998
999
        :return: This yields (path, entry) pairs
1000
        """
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
1001
        if specific_file_ids:
2304.1.2 by John Arbash Meinel
Use a set for specific ids for Inventory.iter_entries_by_dir
1002
            safe = osutils.safe_file_id
1003
            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.
1004
        # TODO? Perhaps this should return the from_dir so that the root is
1005
        # yielded? or maybe an option?
1753.1.4 by Robert Collins
Fixup '== None' usage in inventory.py.
1006
        if from_dir is None:
1731.1.47 by Aaron Bentley
Merge bzr.dev
1007
            if self.root is None:
1008
                return
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
1009
            # Optimize a common case
1010
            if specific_file_ids is not None and len(specific_file_ids) == 1:
1011
                file_id = list(specific_file_ids)[0]
1012
                if file_id in self:
1013
                    yield self.id2path(file_id), self[file_id]
1014
                return 
1711.2.36 by John Arbash Meinel
Add an iter_entries_by_dir which returns directory children before their children.
1015
            from_dir = self.root
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
1016
            if (specific_file_ids is None or 
1017
                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,
1018
                yield u'', self.root
1711.2.36 by John Arbash Meinel
Add an iter_entries_by_dir which returns directory children before their children.
1019
        elif isinstance(from_dir, basestring):
1020
            from_dir = self._byid[from_dir]
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
1021
1022
        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.
1023
            # TODO: jam 20070302 This could really be done as a loop rather
1024
            #       than a bunch of recursive calls.
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
1025
            parents = set()
2309.4.2 by John Arbash Meinel
Change iter_entries_by_dir to avoid extra file id safety checks.
1026
            byid = self._byid
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
1027
            def add_ancestors(file_id):
2309.4.2 by John Arbash Meinel
Change iter_entries_by_dir to avoid extra file id safety checks.
1028
                if file_id not in byid:
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
1029
                    return
2309.4.2 by John Arbash Meinel
Change iter_entries_by_dir to avoid extra file id safety checks.
1030
                parent_id = byid[file_id].parent_id
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
1031
                if parent_id is None:
1032
                    return
1033
                if parent_id not in parents:
1034
                    parents.add(parent_id)
1035
                    add_ancestors(parent_id)
1036
            for file_id in specific_file_ids:
1037
                add_ancestors(file_id)
1038
        else:
1039
            parents = None
1711.2.36 by John Arbash Meinel
Add an iter_entries_by_dir which returns directory children before their children.
1040
            
1041
        stack = [(u'', from_dir)]
1042
        while stack:
1043
            cur_relpath, cur_dir = stack.pop()
1044
1045
            child_dirs = []
1046
            for child_name, child_ie in sorted(cur_dir.children.iteritems()):
1047
1048
                child_relpath = cur_relpath + child_name
1049
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
1050
                if (specific_file_ids is None or 
1051
                    child_ie.file_id in specific_file_ids):
1052
                    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.
1053
1054
                if child_ie.kind == 'directory':
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
1055
                    if parents is None or child_ie.file_id in parents:
1056
                        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.
1057
            stack.extend(reversed(child_dirs))
1058
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
1059
    def make_entry(self, kind, name, parent_id, file_id=None):
1060
        """Simple thunk to bzrlib.inventory.make_entry."""
1061
        return make_entry(kind, name, parent_id, file_id)
1062
555 by Martin Pool
- New Inventory.entries() method
1063
    def entries(self):
1064
        """Return list of (path, ie) for all entries except the root.
1065
1066
        This may be faster than iter_entries.
1067
        """
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
1068
        accum = []
1069
        def descend(dir_ie, dir_path):
556 by Martin Pool
- fix up Inventory.entries()
1070
            kids = dir_ie.children.items()
555 by Martin Pool
- New Inventory.entries() method
1071
            kids.sort()
1072
            for name, ie in kids:
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
1073
                child_path = osutils.pathjoin(dir_path, name)
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
1074
                accum.append((child_path, ie))
555 by Martin Pool
- New Inventory.entries() method
1075
                if ie.kind == 'directory':
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
1076
                    descend(ie, child_path)
555 by Martin Pool
- New Inventory.entries() method
1077
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1078
        descend(self.root, u'')
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
1079
        return accum
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
1080
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
1081
    def directories(self):
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
1082
        """Return (path, entry) pairs for all directories, including the root.
1 by mbp at sourcefrog
import from baz patch-364
1083
        """
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
1084
        accum = []
1085
        def descend(parent_ie, parent_path):
1086
            accum.append((parent_path, parent_ie))
156 by mbp at sourcefrog
new "directories" command
1087
            
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
1088
            kids = [(ie.name, ie) for ie in parent_ie.children.itervalues() if ie.kind == 'directory']
1089
            kids.sort()
156 by mbp at sourcefrog
new "directories" command
1090
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
1091
            for name, child_ie in kids:
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
1092
                child_path = osutils.pathjoin(parent_path, name)
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
1093
                descend(child_ie, child_path)
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1094
        descend(self.root, u'')
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
1095
        return accum
1 by mbp at sourcefrog
import from baz patch-364
1096
        
1097
    def __contains__(self, file_id):
1098
        """True if this entry contains a file with given id.
1099
1100
        >>> inv = Inventory()
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
1101
        >>> inv.add(InventoryFile('123', 'foo.c', ROOT_ID))
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
1102
        InventoryFile('123', 'foo.c', parent_id='TREE_ROOT', sha1=None, len=None)
1 by mbp at sourcefrog
import from baz patch-364
1103
        >>> '123' in inv
1104
        True
1105
        >>> '456' in inv
1106
        False
1107
        """
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
1108
        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)
1109
        return (file_id in self._byid)
1 by mbp at sourcefrog
import from baz patch-364
1110
1111
    def __getitem__(self, file_id):
1112
        """Return the entry for given file_id.
1113
1114
        >>> inv = Inventory()
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
1115
        >>> inv.add(InventoryFile('123123', 'hello.c', ROOT_ID))
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
1116
        InventoryFile('123123', 'hello.c', parent_id='TREE_ROOT', sha1=None, len=None)
1 by mbp at sourcefrog
import from baz patch-364
1117
        >>> inv['123123'].name
1118
        'hello.c'
1119
        """
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)
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
1121
        try:
1122
            return self._byid[file_id]
1123
        except KeyError:
2067.3.1 by Martin Pool
Clean up BzrNewError, other exception classes and users.
1124
            # really we're passing an inventory, not a tree...
1125
            raise errors.NoSuchId(self, file_id)
1 by mbp at sourcefrog
import from baz patch-364
1126
460 by Martin Pool
- new testing command compare-trees
1127
    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
1128
        file_id = osutils.safe_file_id(file_id)
460 by Martin Pool
- new testing command compare-trees
1129
        return self._byid[file_id].kind
1130
138 by mbp at sourcefrog
remove parallel tree from inventory;
1131
    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
1132
        parent_id = osutils.safe_file_id(parent_id)
1732.1.18 by John Arbash Meinel
50ms is probably not worth it
1133
        return self[parent_id].children.get(filename)
138 by mbp at sourcefrog
remove parallel tree from inventory;
1134
2100.3.6 by Aaron Bentley
Make add recursive for children of added entries
1135
    def _add_child(self, entry):
1136
        """Add an entry to the inventory, without adding it to its parent"""
1137
        if entry.file_id in self._byid:
1138
            raise BzrError("inventory already contains entry with id {%s}" %
1139
                           entry.file_id)
1140
        self._byid[entry.file_id] = entry
1141
        for child in getattr(entry, 'children', {}).itervalues():
1142
            self._add_child(child)
1143
        return entry
1144
1 by mbp at sourcefrog
import from baz patch-364
1145
    def add(self, entry):
1146
        """Add entry to inventory.
1147
1148
        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
1149
        which calls this.
1150
1151
        Returns the new entry object.
1152
        """
139 by mbp at sourcefrog
simplified/faster Inventory.add
1153
        if entry.file_id in self._byid:
2255.7.16 by John Arbash Meinel
Make sure adding a duplicate file_id raises DuplicateFileId.
1154
            raise errors.DuplicateFileId(entry.file_id,
1155
                                         self._byid[entry.file_id])
1 by mbp at sourcefrog
import from baz patch-364
1156
1731.1.33 by Aaron Bentley
Revert no-special-root changes
1157
        if entry.parent_id is None:
1910.2.3 by Aaron Bentley
All tests pass
1158
            assert self.root is None and len(self._byid) == 0
2100.3.6 by Aaron Bentley
Make add recursive for children of added entries
1159
            self.root = entry
1160
        else:
1161
            try:
1162
                parent = self._byid[entry.parent_id]
1163
            except KeyError:
1164
                raise BzrError("parent_id {%s} not in inventory" %
1165
                               entry.parent_id)
1166
1167
            if entry.name in parent.children:
1168
                raise BzrError("%s is already versioned" %
1169
                        osutils.pathjoin(self.id2path(parent.file_id),
1551.13.12 by Aaron Bentley
Fix encoding of 'already versioned' error
1170
                        entry.name).encode('utf-8'))
2100.3.6 by Aaron Bentley
Make add recursive for children of added entries
1171
            parent.children[entry.name] = entry
1172
        return self._add_child(entry)
1 by mbp at sourcefrog
import from baz patch-364
1173
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)
1174
    def add_path(self, relpath, kind, file_id=None, parent_id=None):
70 by mbp at sourcefrog
Prepare for smart recursive add.
1175
        """Add entry from a path.
1176
1180 by Martin Pool
- start splitting code for xml (de)serialization away from objects
1177
        The immediate parent must already be versioned.
1178
1179
        Returns the new entry object."""
1015 by Martin Pool
- fix circular imports
1180
        
1830.3.5 by John Arbash Meinel
make_entry refuses to create non-normalized entries.
1181
        parts = osutils.splitpath(relpath)
70 by mbp at sourcefrog
Prepare for smart recursive add.
1182
1534.7.69 by Aaron Bentley
Got real root moves working
1183
        if len(parts) == 0:
1713.1.6 by Robert Collins
Move file id random data selection out of the inner loop for 'bzr add'.
1184
            if file_id is None:
2116.4.1 by John Arbash Meinel
Update file and revision id generators.
1185
                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
1186
            else:
1187
                file_id = osutils.safe_file_id(file_id)
1731.1.1 by Aaron Bentley
Make root entry an InventoryDirectory, make EmptyTree really empty
1188
            self.root = InventoryDirectory(file_id, '', None)
1534.7.69 by Aaron Bentley
Got real root moves working
1189
            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.
1190
            return self.root
1534.7.69 by Aaron Bentley
Got real root moves working
1191
        else:
1192
            parent_path = parts[:-1]
1193
            parent_id = self.path2id(parent_path)
1753.1.4 by Robert Collins
Fixup '== None' usage in inventory.py.
1194
            if parent_id is None:
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
1195
                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)
1196
        ie = make_entry(kind, parts[-1], parent_id, file_id)
70 by mbp at sourcefrog
Prepare for smart recursive add.
1197
        return self.add(ie)
1198
1 by mbp at sourcefrog
import from baz patch-364
1199
    def __delitem__(self, file_id):
1200
        """Remove entry by id.
1201
1202
        >>> inv = Inventory()
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
1203
        >>> inv.add(InventoryFile('123', 'foo.c', ROOT_ID))
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
1204
        InventoryFile('123', 'foo.c', parent_id='TREE_ROOT', sha1=None, len=None)
1 by mbp at sourcefrog
import from baz patch-364
1205
        >>> '123' in inv
1206
        True
1207
        >>> del inv['123']
1208
        >>> '123' in inv
1209
        False
1210
        """
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
1211
        file_id = osutils.safe_file_id(file_id)
1 by mbp at sourcefrog
import from baz patch-364
1212
        ie = self[file_id]
1213
1534.7.69 by Aaron Bentley
Got real root moves working
1214
        assert ie.parent_id is None or \
1215
            self[ie.parent_id].children[ie.name] == ie
1 by mbp at sourcefrog
import from baz patch-364
1216
        
1217
        del self._byid[file_id]
1534.7.69 by Aaron Bentley
Got real root moves working
1218
        if ie.parent_id is not None:
1219
            del self[ie.parent_id].children[ie.name]
1 by mbp at sourcefrog
import from baz patch-364
1220
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
1221
    def __eq__(self, other):
1 by mbp at sourcefrog
import from baz patch-364
1222
        """Compare two sets by comparing their contents.
1223
1224
        >>> i1 = Inventory()
1225
        >>> i2 = Inventory()
1226
        >>> i1 == i2
1227
        True
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
1228
        >>> i1.add(InventoryFile('123', 'foo', ROOT_ID))
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
1229
        InventoryFile('123', 'foo', parent_id='TREE_ROOT', sha1=None, len=None)
1 by mbp at sourcefrog
import from baz patch-364
1230
        >>> i1 == i2
1231
        False
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
1232
        >>> i2.add(InventoryFile('123', 'foo', ROOT_ID))
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
1233
        InventoryFile('123', 'foo', parent_id='TREE_ROOT', sha1=None, len=None)
1 by mbp at sourcefrog
import from baz patch-364
1234
        >>> i1 == i2
1235
        True
1236
        """
1237
        if not isinstance(other, Inventory):
1238
            return NotImplemented
1239
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
1240
        return self._byid == other._byid
1241
1242
    def __ne__(self, other):
1249 by Martin Pool
- improvements to weave commit [broken]
1243
        return not self.__eq__(other)
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
1244
1245
    def __hash__(self):
1246
        raise ValueError('not hashable')
1247
1596.2.19 by Robert Collins
Shave 20% off id2path.
1248
    def _iter_file_id_parents(self, file_id):
1249
        """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
1250
        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.
1251
        while file_id is not None:
1596.2.19 by Robert Collins
Shave 20% off id2path.
1252
            try:
1253
                ie = self._byid[file_id]
1254
            except KeyError:
2255.11.5 by Martin Pool
Tree.id2path should raise NoSuchId, not return None.
1255
                raise errors.NoSuchId(tree=None, file_id=file_id)
1596.2.19 by Robert Collins
Shave 20% off id2path.
1256
            yield ie
1257
            file_id = ie.parent_id
1 by mbp at sourcefrog
import from baz patch-364
1258
172 by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory
1259
    def get_idpath(self, file_id):
1260
        """Return a list of file_ids for the path to an entry.
1261
1262
        The list contains one element for each directory followed by
1263
        the id of the file itself.  So the length of the returned list
1264
        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
1265
        root directory as depth 1.
172 by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory
1266
        """
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
1267
        file_id = osutils.safe_file_id(file_id)
172 by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory
1268
        p = []
1596.2.19 by Robert Collins
Shave 20% off id2path.
1269
        for parent in self._iter_file_id_parents(file_id):
1270
            p.insert(0, parent.file_id)
172 by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory
1271
        return p
1272
1 by mbp at sourcefrog
import from baz patch-364
1273
    def id2path(self, file_id):
1596.2.19 by Robert Collins
Shave 20% off id2path.
1274
        """Return as a string the path to file_id.
1393.1.32 by Martin Pool
- add docstring demonstrating use of Inventory.id2path
1275
        
1276
        >>> i = Inventory()
1277
        >>> e = i.add(InventoryDirectory('src-id', 'src', ROOT_ID))
1278
        >>> e = i.add(InventoryFile('foo-id', 'foo.c', parent_id='src-id'))
1185.31.34 by John Arbash Meinel
Removing instances of os.sep
1279
        >>> print i.id2path('foo-id')
1393.1.32 by Martin Pool
- add docstring demonstrating use of Inventory.id2path
1280
        src/foo.c
1281
        """
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
1282
        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
1283
        # get all names, skipping root
1596.2.19 by Robert Collins
Shave 20% off id2path.
1284
        return '/'.join(reversed(
1285
            [parent.name for parent in 
1286
             self._iter_file_id_parents(file_id)][:-1]))
1 by mbp at sourcefrog
import from baz patch-364
1287
            
1288
    def path2id(self, name):
1289
        """Walk down through directories to return entry of last component.
1290
1291
        names may be either a list of path components, or a single
1292
        string, in which case it is automatically split.
1293
1294
        This returns the entry of the last component in the path,
1295
        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
1296
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)
1297
        Returns None IFF the path is not found.
1 by mbp at sourcefrog
import from baz patch-364
1298
        """
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
1299
        if isinstance(name, basestring):
1300
            name = osutils.splitpath(name)
1 by mbp at sourcefrog
import from baz patch-364
1301
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)
1302
        # mutter("lookup path %r" % name)
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
1303
1304
        parent = self.root
1731.1.33 by Aaron Bentley
Revert no-special-root changes
1305
        if parent is None:
1306
            return None
70 by mbp at sourcefrog
Prepare for smart recursive add.
1307
        for f in name:
1 by mbp at sourcefrog
import from baz patch-364
1308
            try:
2091.3.1 by Aaron Bentley
When 'directory' path element isn't a directory, return None from path2id
1309
                children = getattr(parent, 'children', None)
2091.3.3 by Aaron Bentley
Test 'is None' not '== None'
1310
                if children is None:
2091.3.1 by Aaron Bentley
When 'directory' path element isn't a directory, return None from path2id
1311
                    return None
1312
                cie = children[f]
1 by mbp at sourcefrog
import from baz patch-364
1313
                assert cie.name == f
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
1314
                assert cie.parent_id == parent.file_id
138 by mbp at sourcefrog
remove parallel tree from inventory;
1315
                parent = cie
1 by mbp at sourcefrog
import from baz patch-364
1316
            except KeyError:
1317
                # or raise an error?
1318
                return None
1319
138 by mbp at sourcefrog
remove parallel tree from inventory;
1320
        return parent.file_id
1 by mbp at sourcefrog
import from baz patch-364
1321
1322
    def has_filename(self, names):
1323
        return bool(self.path2id(names))
1324
1325
    def has_id(self, file_id):
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)
1711.9.11 by John Arbash Meinel
change return foo in bar to return (foo in bar)
1327
        return (file_id in self._byid)
1 by mbp at sourcefrog
import from baz patch-364
1328
1988.2.6 by Robert Collins
Review feedback.
1329
    def remove_recursive_id(self, file_id):
1330
        """Remove file_id, and children, from the inventory.
1331
        
1332
        :param file_id: A file_id to remove.
1333
        """
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
1334
        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
1335
        to_find_delete = [self._byid[file_id]]
1336
        to_delete = []
1988.2.6 by Robert Collins
Review feedback.
1337
        while to_find_delete:
1988.2.1 by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of
1338
            ie = to_find_delete.pop()
1339
            to_delete.append(ie.file_id)
1340
            if ie.kind == 'directory':
1341
                to_find_delete.extend(ie.children.values())
1342
        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.
1343
            ie = self[file_id]
1988.2.1 by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of
1344
            del self._byid[file_id]
1731.2.16 by Aaron Bentley
Get extract working for standalone trees
1345
        if ie.parent_id is not None:
1346
            del self[ie.parent_id].children[ie.name]
2376.2.3 by Aaron Bentley
Fix root replacement for apply_inventory_delta
1347
        else:
1348
            self.root = None
1988.2.1 by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of
1349
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
    def rename(self, file_id, new_parent_id, new_name):
1351
        """Move a file within the inventory.
1352
1353
        This can change either the name, or the parent, or both.
1354
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
1355
        This does not move the working file.
1356
        """
1357
        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
1358
        if not is_valid_name(new_name):
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
1359
            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
1360
1361
        new_parent = self._byid[new_parent_id]
1362
        if new_name in new_parent.children:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
1363
            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
1364
172 by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory
1365
        new_parent_idpath = self.get_idpath(new_parent_id)
1366
        if file_id in new_parent_idpath:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
1367
            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
1368
                    % (self.id2path(file_id), self.id2path(new_parent_id)))
1369
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
1370
        file_ie = self._byid[file_id]
1371
        old_parent = self._byid[file_ie.parent_id]
1372
1373
        # TODO: Don't leave things messed up if this fails
1374
1375
        del old_parent.children[file_ie.name]
1376
        new_parent.children[new_name] = file_ie
1377
        
1378
        file_ie.name = new_name
1379
        file_ie.parent_id = new_parent_id
1380
1731.1.1 by Aaron Bentley
Make root entry an InventoryDirectory, make EmptyTree really empty
1381
    def is_root(self, file_id):
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
1382
        file_id = osutils.safe_file_id(file_id)
1731.1.1 by Aaron Bentley
Make root entry an InventoryDirectory, make EmptyTree really empty
1383
        return self.root is not None and file_id == self.root.file_id
1384
160 by mbp at sourcefrog
- basic support for moving files to different directories - have not done support for renaming them yet, but should be straightforward - some tests, but many cases are not handled yet i think
1385
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.
1386
entry_factory = {
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
1387
    'directory': InventoryDirectory,
1388
    'file': InventoryFile,
1389
    'symlink': InventoryLink,
2255.6.8 by Aaron Bentley
Merge refactoring of add_reference
1390
    '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.
1391
}
1392
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)
1393
def make_entry(kind, name, parent_id, file_id=None):
1394
    """Create an inventory entry.
1395
1396
    :param kind: the type of inventory entry to create.
1397
    :param name: the basename of the entry.
1398
    :param parent_id: the parent_id of the entry.
1399
    :param file_id: the file_id to use. if None, one will be created.
1400
    """
1401
    if file_id is None:
2116.4.1 by John Arbash Meinel
Update file and revision id generators.
1402
        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
1403
    else:
1404
        file_id = osutils.safe_file_id(file_id)
1830.3.5 by John Arbash Meinel
make_entry refuses to create non-normalized entries.
1405
2255.2.54 by Robert Collins
Add in non-normalized filename sanity check to dirstate add().
1406
    #------- This has been copied to bzrlib.dirstate.DirState.add, please
1407
    # 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.
1408
    # we dont import normalized_filename directly because we want to be
1409
    # able to change the implementation at runtime for tests.
1830.3.5 by John Arbash Meinel
make_entry refuses to create non-normalized entries.
1410
    norm_name, can_access = osutils.normalized_filename(name)
1411
    if norm_name != name:
1412
        if can_access:
1413
            name = norm_name
1414
        else:
1415
            # TODO: jam 20060701 This would probably be more useful
1416
            #       if the error was raised with the full path
1417
            raise errors.InvalidNormalization(name)
1418
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.
1419
    try:
1420
        factory = entry_factory[kind]
1421
    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)
1422
        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.
1423
    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)
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
1077 by Martin Pool
- avoid compiling REs at module load time
1426
_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
1427
1428
def is_valid_name(name):
1077 by Martin Pool
- avoid compiling REs at module load time
1429
    global _NAME_RE
1753.1.4 by Robert Collins
Fixup '== None' usage in inventory.py.
1430
    if _NAME_RE is None:
1077 by Martin Pool
- avoid compiling REs at module load time
1431
        _NAME_RE = re.compile(r'^[^/\\]+$')
1432
        
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
1433
    return bool(_NAME_RE.match(name))