/brz/remove-bazaar

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