/brz/remove-bazaar

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