/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
138 by mbp at sourcefrog
remove parallel tree from inventory;
1
# (C) 2005 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
30
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
31
import os.path
32
import re
33
import sys
1399.1.6 by Robert Collins
move exporting functionality into inventory.py - uncovers bug in symlink support
34
import tarfile
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
35
import types
1 by mbp at sourcefrog
import from baz patch-364
36
800 by Martin Pool
Merge John's import-speedup branch:
37
import bzrlib
1399.1.6 by Robert Collins
move exporting functionality into inventory.py - uncovers bug in symlink support
38
from bzrlib.osutils import (pumpfile, quotefn, splitpath, joinpath,
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 \
39
                            pathjoin, sha_strings)
1558.15.2 by Aaron Bentley
Implemented binary file handling for diff
40
from bzrlib.errors import (NotVersionedError, InvalidEntryName,
41
                           BzrError, BzrCheckError, BinaryFile)
70 by mbp at sourcefrog
Prepare for smart recursive add.
42
from bzrlib.trace import mutter
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
43
1 by mbp at sourcefrog
import from baz patch-364
44
802 by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions
45
class InventoryEntry(object):
1 by mbp at sourcefrog
import from baz patch-364
46
    """Description of a versioned file.
47
48
    An InventoryEntry has the following fields, which are also
49
    present in the XML inventory-entry element:
50
1197 by Martin Pool
doc
51
    file_id
52
53
    name
54
        (within the parent directory)
55
56
    parent_id
57
        file_id of the parent directory, or ROOT_ID
58
1092.2.21 by Robert Collins
convert name_version to revision in inventory entries
59
    revision
1398 by Robert Collins
integrate in Gustavos x-bit patch
60
        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
61
        introduced.
1197 by Martin Pool
doc
62
1398 by Robert Collins
integrate in Gustavos x-bit patch
63
    executable
64
        Indicates that this file should be executable on systems
65
        that support it.
66
1197 by Martin Pool
doc
67
    text_sha1
68
        sha-1 of the text of the file
69
        
70
    text_size
71
        size in bytes of the text of the file
72
        
73
    (reading a version 4 tree created a text_id field.)
1 by mbp at sourcefrog
import from baz patch-364
74
75
    >>> i = Inventory()
76
    >>> i.path2id('')
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
77
    'TREE_ROOT'
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
78
    >>> i.add(InventoryDirectory('123', 'src', ROOT_ID))
79
    InventoryDirectory('123', 'src', parent_id='TREE_ROOT')
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
80
    >>> i.add(InventoryFile('2323', 'hello.c', parent_id='123'))
81
    InventoryFile('2323', 'hello.c', parent_id='123')
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 \
82
    >>> shouldbe = {0: 'src', 1: pathjoin('src','hello.c')}
1185.16.151 by Martin Pool
[patch] win32 fix for InventoryEntry doctest (Alexander, patch 21)
83
    >>> for ix, j in enumerate(i.iter_entries()):
84
    ...   print (j[0] == shouldbe[ix], j[1])
1 by mbp at sourcefrog
import from baz patch-364
85
    ... 
1185.16.151 by Martin Pool
[patch] win32 fix for InventoryEntry doctest (Alexander, patch 21)
86
    (True, InventoryDirectory('123', 'src', parent_id='TREE_ROOT'))
87
    (True, InventoryFile('2323', 'hello.c', parent_id='123'))
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
88
    >>> i.add(InventoryFile('2323', 'bye.c', '123'))
1 by mbp at sourcefrog
import from baz patch-364
89
    Traceback (most recent call last):
90
    ...
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
91
    BzrError: inventory already contains entry with id {2323}
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
92
    >>> i.add(InventoryFile('2324', 'bye.c', '123'))
93
    InventoryFile('2324', 'bye.c', parent_id='123')
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
94
    >>> i.add(InventoryDirectory('2325', 'wibble', '123'))
95
    InventoryDirectory('2325', 'wibble', parent_id='123')
1 by mbp at sourcefrog
import from baz patch-364
96
    >>> i.path2id('src/wibble')
97
    '2325'
98
    >>> '2325' in i
99
    True
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
100
    >>> i.add(InventoryFile('2326', 'wibble.c', '2325'))
101
    InventoryFile('2326', 'wibble.c', parent_id='2325')
1 by mbp at sourcefrog
import from baz patch-364
102
    >>> i['2326']
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
103
    InventoryFile('2326', 'wibble.c', parent_id='2325')
1185.1.40 by Robert Collins
Merge what applied of Alexander Belchenko's win32 patch.
104
    >>> 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 \
105
    ...     print path
1185.1.40 by Robert Collins
Merge what applied of Alexander Belchenko's win32 patch.
106
    ...     assert i.path2id(path)
1 by mbp at sourcefrog
import from baz patch-364
107
    ... 
108
    src
109
    src/bye.c
110
    src/hello.c
111
    src/wibble
112
    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 \
113
    >>> i.id2path('2326')
1 by mbp at sourcefrog
import from baz patch-364
114
    'src/wibble/wibble.c'
115
    """
1197 by Martin Pool
doc
116
    
955 by Martin Pool
- use __slots__ on InventoryEntry; rather faster
117
    __slots__ = ['text_sha1', 'text_size', 'file_id', 'name', 'kind',
1398 by Robert Collins
integrate in Gustavos x-bit patch
118
                 'text_id', 'parent_id', 'children', 'executable', 
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
119
                 'revision']
1185 by Martin Pool
- add xml round-trip test for revisions
120
1417.1.8 by Robert Collins
use transactions in the weave store interface, which enables caching for log
121
    def _add_text_to_weave(self, new_lines, parents, weave_store, transaction):
1596.2.20 by Robert Collins
optimise commit to only access weaves for merged, or altered files during commit.
122
        versionedfile = weave_store.get_weave_or_empty(self.file_id,
123
                                                       transaction)
1563.2.10 by Robert Collins
Change weave store to be a versioned store, using WeaveFiles which maintain integrity without needing explicit 'put' operations.
124
        versionedfile.add_lines(self.revision, parents, new_lines)
1092.2.23 by Robert Collins
move inventory entry centric snapshot taking logic to inventory.py
125
1399.1.3 by Robert Collins
move change detection for text and metadata from delta to entry.detect_changes
126
    def detect_changes(self, old_entry):
127
        """Return a (text_modified, meta_modified) from this to old_entry.
128
        
129
        _read_tree_state must have been called on self and old_entry prior to 
130
        calling detect_changes.
131
        """
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
132
        return False, False
1399.1.3 by Robert Collins
move change detection for text and metadata from delta to entry.detect_changes
133
1399.1.4 by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py
134
    def diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree,
135
             output_to, reverse=False):
136
        """Perform a diff from this to to_entry.
137
138
        text_diff will be used for textual difference calculation.
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
139
        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
140
        """
1185.12.33 by Aaron Bentley
Fixed symlink reverting
141
        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
142
        if to_entry:
143
            # cannot diff from one kind to another - you must do a removal
144
            # and an addif they do not match.
145
            assert self.kind == to_entry.kind
1185.12.33 by Aaron Bentley
Fixed symlink reverting
146
            to_entry._read_tree_state(to_tree.id2path(to_entry.file_id),
147
                                      to_tree)
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
148
        self._diff(text_diff, from_label, tree, to_label, to_entry, to_tree,
149
                   output_to, reverse)
150
151
    def _diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree,
152
             output_to, reverse=False):
153
        """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
154
1596.2.20 by Robert Collins
optimise commit to only access weaves for merged, or altered files during commit.
155
    def find_previous_heads(self, previous_inventories,
156
                            versioned_file_store,
157
                            transaction,
158
                            entry_vf=None):
1409 by Robert Collins
unify previous inventory entry parent logic in preparation for fixing the revision-thrashing bug
159
        """Return the revisions and entries that directly preceed this.
160
161
        Returned as a map from revision to inventory entry.
162
163
        This is a map containing the file revisions in all parents
164
        for which the file exists, and its revision is not a parent of
165
        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.
166
167
        :param versioned_file_store: A store where ancestry data on this
168
                                     file id can be queried.
169
        :param transaction: The transaction that queries to the versioned 
170
                            file store should be completed under.
171
        :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
172
        """
1411 by Robert Collins
use weave ancestry to determine inventory entry previous heads, prevent propogating 'I did a merge' merges.
173
        def get_ancestors(weave, entry):
1563.2.18 by Robert Collins
get knit repositories really using knits for text storage.
174
            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.
175
        # revision:ie mapping for each ie found in previous_inventories.
176
        candidates = {}
177
        # 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
178
        heads = {}
1596.2.20 by Robert Collins
optimise commit to only access weaves for merged, or altered files during commit.
179
        # 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.
180
        head_ancestors = {}
1596.2.20 by Robert Collins
optimise commit to only access weaves for merged, or altered files during commit.
181
        # identify candidate head revision ids.
1409 by Robert Collins
unify previous inventory entry parent logic in preparation for fixing the revision-thrashing bug
182
        for inv in previous_inventories:
183
            if self.file_id in inv:
184
                ie = inv[self.file_id]
185
                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.
186
                if ie.revision in candidates:
187
                    # same revision value in two different inventories:
188
                    # correct possible inconsistencies:
189
                    #     * there was a bug in revision updates with 'x' bit 
190
                    #       support.
1185.1.51 by Robert Collins
merge in reweave support
191
                    try:
1596.2.20 by Robert Collins
optimise commit to only access weaves for merged, or altered files during commit.
192
                        if candidates[ie.revision].executable != ie.executable:
193
                            candidates[ie.revision].executable = False
1185.1.51 by Robert Collins
merge in reweave support
194
                            ie.executable = False
195
                    except AttributeError:
196
                        pass
1596.2.20 by Robert Collins
optimise commit to only access weaves for merged, or altered files during commit.
197
                    # must now be the same.
198
                    assert candidates[ie.revision] == ie
1409 by Robert Collins
unify previous inventory entry parent logic in preparation for fixing the revision-thrashing bug
199
                else:
1596.2.20 by Robert Collins
optimise commit to only access weaves for merged, or altered files during commit.
200
                    # add this revision as a candidate.
201
                    candidates[ie.revision] = ie
202
203
        # common case optimisation
204
        if len(candidates) == 1:
205
            # if there is only one candidate revision found
206
            # then we can opening the versioned file to access ancestry:
207
            # there cannot be any ancestors to eliminate when there is 
208
            # only one revision available.
209
            heads[ie.revision] = ie
210
            return heads
211
212
        # eliminate ancestors amongst the available candidates:
213
        # heads are those that are not an ancestor of any other candidate
214
        # - this provides convergence at a per-file level.
215
        for ie in candidates.values():
216
            # may be an ancestor of a known head:
217
            already_present = 0 != len(
218
                [head for head in heads 
219
                 if ie.revision in head_ancestors[head]])
220
            if already_present:
221
                # an ancestor of an analyzed candidate.
222
                continue
223
            # not an ancestor of a known head:
224
            # load the versioned file for this file id if needed
225
            if entry_vf is None:
226
                entry_vf = versioned_file_store.get_weave_or_empty(
227
                    self.file_id, transaction)
228
            ancestors = get_ancestors(entry_vf, ie)
229
            # may knock something else out:
230
            check_heads = list(heads.keys())
231
            for head in check_heads:
232
                if head in ancestors:
233
                    # this previously discovered 'head' is not
234
                    # really a head - its an ancestor of the newly 
235
                    # found head,
236
                    heads.pop(head)
237
            head_ancestors[ie.revision] = ancestors
238
            heads[ie.revision] = ie
1409 by Robert Collins
unify previous inventory entry parent logic in preparation for fixing the revision-thrashing bug
239
        return heads
240
1399.1.6 by Robert Collins
move exporting functionality into inventory.py - uncovers bug in symlink support
241
    def get_tar_item(self, root, dp, now, tree):
1399.1.7 by Robert Collins
implement symlink exporting to tarballs
242
        """Get a tarfile item and a file stream for its content."""
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 \
243
        item = tarfile.TarInfo(pathjoin(root, dp))
1399.1.6 by Robert Collins
move exporting functionality into inventory.py - uncovers bug in symlink support
244
        # TODO: would be cool to actually set it to the timestamp of the
245
        # revision it was last changed
246
        item.mtime = now
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
247
        fileobj = self._put_in_tar(item, tree)
1399.1.6 by Robert Collins
move exporting functionality into inventory.py - uncovers bug in symlink support
248
        return item, fileobj
249
1399.1.5 by Robert Collins
move checking whether an entry stores text into inventory.py from fetch,py
250
    def has_text(self):
251
        """Return true if the object this entry represents has textual data.
252
253
        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
254
255
        Also note that all entries get weave files created for them.
256
        This attribute is primarily used when upgrading from old trees that
257
        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
258
        """
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
259
        return False
1399.1.5 by Robert Collins
move checking whether an entry stores text into inventory.py from fetch,py
260
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
261
    def __init__(self, file_id, name, parent_id, text_id=None):
1 by mbp at sourcefrog
import from baz patch-364
262
        """Create an InventoryEntry
263
        
264
        The filename must be a single component, relative to the
265
        parent directory; it cannot be a whole path or relative name.
266
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
267
        >>> e = InventoryFile('123', 'hello.c', ROOT_ID)
1 by mbp at sourcefrog
import from baz patch-364
268
        >>> e.name
269
        'hello.c'
270
        >>> e.file_id
271
        '123'
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
272
        >>> e = InventoryFile('123', 'src/hello.c', ROOT_ID)
1 by mbp at sourcefrog
import from baz patch-364
273
        Traceback (most recent call last):
1185.16.63 by Martin Pool
- more error conversion
274
        InvalidEntryName: Invalid entry name: src/hello.c
1 by mbp at sourcefrog
import from baz patch-364
275
        """
1183 by Martin Pool
- implement version 5 xml storage, and tests
276
        assert isinstance(name, basestring), name
376 by Martin Pool
- fix slow invariant check when reading in InventoryEntry objects
277
        if '/' in name or '\\' in name:
1185.16.63 by Martin Pool
- more error conversion
278
            raise InvalidEntryName(name=name)
1398 by Robert Collins
integrate in Gustavos x-bit patch
279
        self.executable = False
1092.2.21 by Robert Collins
convert name_version to revision in inventory entries
280
        self.revision = None
955 by Martin Pool
- use __slots__ on InventoryEntry; rather faster
281
        self.text_sha1 = None
282
        self.text_size = None
1 by mbp at sourcefrog
import from baz patch-364
283
        self.file_id = file_id
284
        self.name = name
285
        self.text_id = text_id
286
        self.parent_id = parent_id
1092.2.6 by Robert Collins
symlink support updated to work
287
        self.symlink_target = None
237 by mbp at sourcefrog
- Better assertions in InventoryEntry constructor
288
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
289
    def kind_character(self):
290
        """Return a short kind indicator useful for appending to names."""
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
291
        raise BzrError('unknown kind %r' % self.kind)
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
292
1399.1.3 by Robert Collins
move change detection for text and metadata from delta to entry.detect_changes
293
    known_kinds = ('file', 'directory', 'symlink', 'root_directory')
1 by mbp at sourcefrog
import from baz patch-364
294
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
295
    def _put_in_tar(self, item, tree):
296
        """populate item for stashing in a tar, and return the content stream.
297
298
        If no content is available, return None.
299
        """
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
300
        raise BzrError("don't know how to export {%s} of kind %r" %
301
                       (self.file_id, self.kind))
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
302
1399.1.6 by Robert Collins
move exporting functionality into inventory.py - uncovers bug in symlink support
303
    def put_on_disk(self, dest, dp, tree):
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
304
        """Create a representation of self on disk in the prefix dest.
305
        
306
        This is a template method - implement _put_on_disk in subclasses.
307
        """
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 \
308
        fullpath = pathjoin(dest, dp)
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
309
        self._put_on_disk(fullpath, tree)
1185.31.4 by John Arbash Meinel
Fixing mutter() calls to not have to do string processing.
310
        mutter("  export {%s} kind %s to %s", self.file_id,
311
                self.kind, fullpath)
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
312
313
    def _put_on_disk(self, fullpath, tree):
314
        """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
315
        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
316
156 by mbp at sourcefrog
new "directories" command
317
    def sorted_children(self):
318
        l = self.children.items()
319
        l.sort()
320
        return l
321
1399.1.1 by Robert Collins
move checks for versionability of file kinds into InventoryEntry
322
    @staticmethod
323
    def versionable_kind(kind):
324
        return kind in ('file', 'directory', 'symlink')
325
1092.2.20 by Robert Collins
symlink and weaves, whaddya know
326
    def check(self, checker, rev_id, inv, tree):
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
327
        """Check this inventory entry is intact.
328
329
        This is a template method, override _check for kind specific
330
        tests.
1616.1.5 by Martin Pool
Cleanup and document some check code
331
332
        :param checker: Check object providing context for the checks; 
333
             can be used to find out what parts of the repository have already
334
             been checked.
335
        :param rev_id: Revision id from which this InventoryEntry was loaded.
336
             Not necessarily the last-changed revision for this file.
337
        :param inv: Inventory from which the entry was loaded.
338
        :param tree: RevisionTree for this entry.
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
339
        """
1092.2.20 by Robert Collins
symlink and weaves, whaddya know
340
        if self.parent_id != None:
341
            if not inv.has_id(self.parent_id):
342
                raise BzrCheckError('missing parent {%s} in inventory for revision {%s}'
343
                        % (self.parent_id, rev_id))
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
344
        self._check(checker, rev_id, tree)
345
346
    def _check(self, checker, rev_id, tree):
347
        """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
348
        raise BzrCheckError('unknown entry kind %r in revision {%s}' % 
349
                            (self.kind, rev_id))
1092.2.20 by Robert Collins
symlink and weaves, whaddya know
350
156 by mbp at sourcefrog
new "directories" command
351
1 by mbp at sourcefrog
import from baz patch-364
352
    def copy(self):
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
353
        """Clone this inventory entry."""
354
        raise NotImplementedError
1 by mbp at sourcefrog
import from baz patch-364
355
1092.2.23 by Robert Collins
move inventory entry centric snapshot taking logic to inventory.py
356
    def _get_snapshot_change(self, previous_entries):
357
        if len(previous_entries) > 1:
358
            return 'merged'
359
        elif len(previous_entries) == 0:
360
            return 'added'
361
        else:
362
            return 'modified/renamed/reparented'
1 by mbp at sourcefrog
import from baz patch-364
363
364
    def __repr__(self):
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
365
        return ("%s(%r, %r, parent_id=%r)"
1 by mbp at sourcefrog
import from baz patch-364
366
                % (self.__class__.__name__,
367
                   self.file_id,
368
                   self.name,
369
                   self.parent_id))
370
1411 by Robert Collins
use weave ancestry to determine inventory entry previous heads, prevent propogating 'I did a merge' merges.
371
    def snapshot(self, revision, path, previous_entries,
1417.1.8 by Robert Collins
use transactions in the weave store interface, which enables caching for log
372
                 work_tree, weave_store, transaction):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
373
        """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
374
        
375
        This means that all its fields are populated, that it has its
376
        text stored in the text store or weave.
377
        """
378
        mutter('new parents of %s are %r', path, previous_entries)
1185.12.33 by Aaron Bentley
Fixed symlink reverting
379
        self._read_tree_state(path, work_tree)
1092.2.23 by Robert Collins
move inventory entry centric snapshot taking logic to inventory.py
380
        if len(previous_entries) == 1:
381
            # cannot be unchanged unless there is only one parent file rev.
382
            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
383
            if self._unchanged(parent_ie):
1092.2.23 by Robert Collins
move inventory entry centric snapshot taking logic to inventory.py
384
                mutter("found unchanged entry")
385
                self.revision = parent_ie.revision
386
                return "unchanged"
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
387
        return self.snapshot_revision(revision, previous_entries, 
1417.1.8 by Robert Collins
use transactions in the weave store interface, which enables caching for log
388
                                      work_tree, weave_store, transaction)
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
389
390
    def snapshot_revision(self, revision, previous_entries, work_tree,
1417.1.8 by Robert Collins
use transactions in the weave store interface, which enables caching for log
391
                          weave_store, transaction):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
392
        """Record this revision unconditionally."""
1092.2.23 by Robert Collins
move inventory entry centric snapshot taking logic to inventory.py
393
        mutter('new revision for {%s}', self.file_id)
394
        self.revision = revision
395
        change = self._get_snapshot_change(previous_entries)
1417.1.8 by Robert Collins
use transactions in the weave store interface, which enables caching for log
396
        self._snapshot_text(previous_entries, work_tree, weave_store,
397
                            transaction)
1092.2.23 by Robert Collins
move inventory entry centric snapshot taking logic to inventory.py
398
        return change
399
1417.1.8 by Robert Collins
use transactions in the weave store interface, which enables caching for log
400
    def _snapshot_text(self, file_parents, work_tree, weave_store, transaction): 
1405 by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave
401
        """Record the 'text' of this entry, whatever form that takes.
402
        
403
        This default implementation simply adds an empty text.
404
        """
1092.2.23 by Robert Collins
move inventory entry centric snapshot taking logic to inventory.py
405
        mutter('storing file {%s} in revision {%s}',
406
               self.file_id, self.revision)
1563.2.18 by Robert Collins
get knit repositories really using knits for text storage.
407
        self._add_text_to_weave([], file_parents.keys(), weave_store, transaction)
1092.2.23 by Robert Collins
move inventory entry centric snapshot taking logic to inventory.py
408
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
409
    def __eq__(self, other):
1 by mbp at sourcefrog
import from baz patch-364
410
        if not isinstance(other, InventoryEntry):
411
            return NotImplemented
412
1398 by Robert Collins
integrate in Gustavos x-bit patch
413
        return ((self.file_id == other.file_id)
414
                and (self.name == other.name)
415
                and (other.symlink_target == self.symlink_target)
416
                and (self.text_sha1 == other.text_sha1)
417
                and (self.text_size == other.text_size)
418
                and (self.text_id == other.text_id)
419
                and (self.parent_id == other.parent_id)
420
                and (self.kind == other.kind)
421
                and (self.revision == other.revision)
422
                and (self.executable == other.executable)
423
                )
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
424
425
    def __ne__(self, other):
426
        return not (self == other)
427
428
    def __hash__(self):
429
        raise ValueError('not hashable')
1 by mbp at sourcefrog
import from baz patch-364
430
1405 by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave
431
    def _unchanged(self, previous_ie):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
432
        """Has this entry changed relative to previous_ie.
433
434
        This method should be overriden in child classes.
435
        """
1092.2.22 by Robert Collins
text_version and name_version unification looking reasonable
436
        compatible = True
437
        # different inv parent
438
        if previous_ie.parent_id != self.parent_id:
439
            compatible = False
440
        # renamed
441
        elif previous_ie.name != self.name:
442
            compatible = False
443
        return compatible
444
1185.12.33 by Aaron Bentley
Fixed symlink reverting
445
    def _read_tree_state(self, path, work_tree):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
446
        """Populate fields in the inventory entry from the given tree.
447
        
448
        Note that this should be modified to be a noop on virtual trees
449
        as all entries created there are prepopulated.
450
        """
1185.16.5 by Martin Pool
doc
451
        # TODO: Rather than running this manually, we should check the 
452
        # working sha1 and other expensive properties when they're
453
        # first requested, or preload them if they're already known
454
        pass            # nothing to do by default
1092.2.23 by Robert Collins
move inventory entry centric snapshot taking logic to inventory.py
455
1534.7.175 by Aaron Bentley
Ensured revert writes a normal inventory
456
    def _forget_tree_state(self):
457
        pass
458
1 by mbp at sourcefrog
import from baz patch-364
459
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
460
class RootEntry(InventoryEntry):
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
461
462
    def _check(self, checker, rev_id, tree):
463
        """See InventoryEntry._check"""
464
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
465
    def __init__(self, file_id):
466
        self.file_id = file_id
467
        self.children = {}
468
        self.kind = 'root_directory'
469
        self.parent_id = None
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
470
        self.name = u''
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
471
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
472
    def __eq__(self, other):
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
473
        if not isinstance(other, RootEntry):
474
            return NotImplemented
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
475
        
476
        return (self.file_id == other.file_id) \
477
               and (self.children == other.children)
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
478
479
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
480
class InventoryDirectory(InventoryEntry):
481
    """A directory in an inventory."""
482
483
    def _check(self, checker, rev_id, tree):
484
        """See InventoryEntry._check"""
485
        if self.text_sha1 != None or self.text_size != None or self.text_id != None:
486
            raise BzrCheckError('directory {%s} has text in revision {%s}'
487
                                % (self.file_id, rev_id))
488
489
    def copy(self):
490
        other = InventoryDirectory(self.file_id, self.name, self.parent_id)
491
        other.revision = self.revision
492
        # note that children are *not* copied; they're pulled across when
493
        # others are added
494
        return other
495
496
    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
497
        super(InventoryDirectory, self).__init__(file_id, name, parent_id)
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
498
        self.children = {}
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
499
        self.kind = 'directory'
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
500
501
    def kind_character(self):
502
        """See InventoryEntry.kind_character."""
503
        return '/'
504
505
    def _put_in_tar(self, item, tree):
506
        """See InventoryEntry._put_in_tar."""
507
        item.type = tarfile.DIRTYPE
508
        fileobj = None
509
        item.name += '/'
510
        item.size = 0
511
        item.mode = 0755
512
        return fileobj
513
514
    def _put_on_disk(self, fullpath, tree):
515
        """See InventoryEntry._put_on_disk."""
516
        os.mkdir(fullpath)
517
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
518
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
519
class InventoryFile(InventoryEntry):
520
    """A file in an inventory."""
521
1616.1.5 by Martin Pool
Cleanup and document some check code
522
    def _check(self, checker, tree_revision_id, tree):
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
523
        """See InventoryEntry._check"""
1616.1.5 by Martin Pool
Cleanup and document some check code
524
        t = (self.file_id, self.revision)
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
525
        if t in checker.checked_texts:
1616.1.5 by Martin Pool
Cleanup and document some check code
526
            prev_sha = checker.checked_texts[t]
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
527
            if prev_sha != self.text_sha1:
528
                raise BzrCheckError('mismatched sha1 on {%s} in {%s}' %
1616.1.5 by Martin Pool
Cleanup and document some check code
529
                                    (self.file_id, tree_revision_id))
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
530
            else:
531
                checker.repeated_text_cnt += 1
532
                return
1185.50.28 by John Arbash Meinel
Lots of updates for 'bzr check'
533
534
        if self.file_id not in checker.checked_weaves:
535
            mutter('check weave {%s}', self.file_id)
536
            w = tree.get_weave(self.file_id)
537
            # Not passing a progress bar, because it creates a new
538
            # progress, which overwrites the current progress,
539
            # and doesn't look nice
540
            w.check()
541
            checker.checked_weaves[self.file_id] = True
542
        else:
1563.2.14 by Robert Collins
Prepare weave store to delegate copy details to the versioned file.
543
            w = tree.get_weave(self.file_id)
1185.50.28 by John Arbash Meinel
Lots of updates for 'bzr check'
544
1616.1.5 by Martin Pool
Cleanup and document some check code
545
        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'.
546
        checker.checked_text_cnt += 1
1185.50.28 by John Arbash Meinel
Lots of updates for 'bzr check'
547
        # We can't check the length, because Weave doesn't store that
548
        # information, and the whole point of looking at the weave's
549
        # sha1sum is that we don't have to extract the text.
550
        if self.text_sha1 != w.get_sha1(self.revision):
551
            raise BzrCheckError('text {%s} version {%s} wrong sha1' 
552
                                % (self.file_id, self.revision))
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
553
        checker.checked_texts[t] = self.text_sha1
554
555
    def copy(self):
556
        other = InventoryFile(self.file_id, self.name, self.parent_id)
557
        other.executable = self.executable
558
        other.text_id = self.text_id
559
        other.text_sha1 = self.text_sha1
560
        other.text_size = self.text_size
561
        other.revision = self.revision
562
        return other
563
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
564
    def detect_changes(self, old_entry):
565
        """See InventoryEntry.detect_changes."""
566
        assert self.text_sha1 != None
567
        assert old_entry.text_sha1 != None
568
        text_modified = (self.text_sha1 != old_entry.text_sha1)
569
        meta_modified = (self.executable != old_entry.executable)
570
        return text_modified, meta_modified
571
572
    def _diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree,
573
             output_to, reverse=False):
574
        """See InventoryEntry._diff."""
1558.15.2 by Aaron Bentley
Implemented binary file handling for diff
575
        try:
576
            from_text = tree.get_file(self.file_id).readlines()
577
            if to_entry:
578
                to_text = to_tree.get_file(to_entry.file_id).readlines()
579
            else:
580
                to_text = []
581
            if not reverse:
582
                text_diff(from_label, from_text,
583
                          to_label, to_text, output_to)
584
            else:
585
                text_diff(to_label, to_text,
586
                          from_label, from_text, output_to)
587
        except BinaryFile:
588
            print >> output_to, "Binary files differ"
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
589
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
590
    def has_text(self):
591
        """See InventoryEntry.has_text."""
592
        return True
593
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
594
    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
595
        super(InventoryFile, self).__init__(file_id, name, parent_id)
596
        self.kind = 'file'
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
597
598
    def kind_character(self):
599
        """See InventoryEntry.kind_character."""
600
        return ''
601
602
    def _put_in_tar(self, item, tree):
603
        """See InventoryEntry._put_in_tar."""
604
        item.type = tarfile.REGTYPE
605
        fileobj = tree.get_file(self.file_id)
606
        item.size = self.text_size
607
        if tree.is_executable(self.file_id):
608
            item.mode = 0755
609
        else:
610
            item.mode = 0644
611
        return fileobj
612
613
    def _put_on_disk(self, fullpath, tree):
614
        """See InventoryEntry._put_on_disk."""
615
        pumpfile(tree.get_file(self.file_id), file(fullpath, 'wb'))
616
        if tree.is_executable(self.file_id):
617
            os.chmod(fullpath, 0755)
618
1185.12.33 by Aaron Bentley
Fixed symlink reverting
619
    def _read_tree_state(self, path, work_tree):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
620
        """See InventoryEntry._read_tree_state."""
621
        self.text_sha1 = work_tree.get_file_sha1(self.file_id)
622
        self.executable = work_tree.is_executable(self.file_id)
623
1534.7.175 by Aaron Bentley
Ensured revert writes a normal inventory
624
    def _forget_tree_state(self):
625
        self.text_sha1 = None
626
        self.executable = None
627
1417.1.8 by Robert Collins
use transactions in the weave store interface, which enables caching for log
628
    def _snapshot_text(self, file_parents, work_tree, weave_store, transaction):
1405 by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave
629
        """See InventoryEntry._snapshot_text."""
630
        mutter('storing file {%s} in revision {%s}',
631
               self.file_id, self.revision)
632
        # special case to avoid diffing on renames or 
633
        # reparenting
634
        if (len(file_parents) == 1
635
            and self.text_sha1 == file_parents.values()[0].text_sha1
636
            and self.text_size == file_parents.values()[0].text_size):
637
            previous_ie = file_parents.values()[0]
1563.2.10 by Robert Collins
Change weave store to be a versioned store, using WeaveFiles which maintain integrity without needing explicit 'put' operations.
638
            versionedfile = weave_store.get_weave(self.file_id, transaction)
1563.2.18 by Robert Collins
get knit repositories really using knits for text storage.
639
            versionedfile.clone_text(self.revision, previous_ie.revision, file_parents.keys())
1405 by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave
640
        else:
641
            new_lines = work_tree.get_file(self.file_id).readlines()
1563.2.18 by Robert Collins
get knit repositories really using knits for text storage.
642
            self._add_text_to_weave(new_lines, file_parents.keys(), weave_store,
1417.1.8 by Robert Collins
use transactions in the weave store interface, which enables caching for log
643
                                    transaction)
1405 by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave
644
            self.text_sha1 = sha_strings(new_lines)
645
            self.text_size = sum(map(len, new_lines))
646
647
648
    def _unchanged(self, previous_ie):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
649
        """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
650
        compatible = super(InventoryFile, self)._unchanged(previous_ie)
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
651
        if self.text_sha1 != previous_ie.text_sha1:
652
            compatible = False
653
        else:
654
            # FIXME: 20050930 probe for the text size when getting sha1
655
            # in _read_tree_state
656
            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
657
        if self.executable != previous_ie.executable:
658
            compatible = False
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
659
        return compatible
660
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
661
662
class InventoryLink(InventoryEntry):
663
    """A file in an inventory."""
664
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
665
    __slots__ = ['symlink_target']
666
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
667
    def _check(self, checker, rev_id, tree):
668
        """See InventoryEntry._check"""
669
        if self.text_sha1 != None or self.text_size != None or self.text_id != None:
670
            raise BzrCheckError('symlink {%s} has text in revision {%s}'
671
                    % (self.file_id, rev_id))
672
        if self.symlink_target == None:
673
            raise BzrCheckError('symlink {%s} has no target in revision {%s}'
674
                    % (self.file_id, rev_id))
675
676
    def copy(self):
677
        other = InventoryLink(self.file_id, self.name, self.parent_id)
678
        other.symlink_target = self.symlink_target
679
        other.revision = self.revision
680
        return other
681
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
682
    def detect_changes(self, old_entry):
683
        """See InventoryEntry.detect_changes."""
684
        # FIXME: which _modified field should we use ? RBC 20051003
685
        text_modified = (self.symlink_target != old_entry.symlink_target)
686
        if text_modified:
687
            mutter("    symlink target changed")
688
        meta_modified = False
689
        return text_modified, meta_modified
690
691
    def _diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree,
692
             output_to, reverse=False):
693
        """See InventoryEntry._diff."""
694
        from_text = self.symlink_target
695
        if to_entry is not None:
696
            to_text = to_entry.symlink_target
697
            if reverse:
698
                temp = from_text
699
                from_text = to_text
700
                to_text = temp
701
            print >>output_to, '=== target changed %r => %r' % (from_text, to_text)
702
        else:
703
            if not reverse:
704
                print >>output_to, '=== target was %r' % self.symlink_target
705
            else:
706
                print >>output_to, '=== target is %r' % self.symlink_target
707
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
708
    def __init__(self, file_id, name, parent_id):
709
        super(InventoryLink, self).__init__(file_id, name, parent_id)
710
        self.kind = 'symlink'
711
712
    def kind_character(self):
713
        """See InventoryEntry.kind_character."""
714
        return ''
715
716
    def _put_in_tar(self, item, tree):
717
        """See InventoryEntry._put_in_tar."""
1185.33.3 by Martin Pool
[merge] jelmer
718
        item.type = tarfile.SYMTYPE
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
719
        fileobj = None
720
        item.size = 0
721
        item.mode = 0755
722
        item.linkname = self.symlink_target
723
        return fileobj
724
725
    def _put_on_disk(self, fullpath, tree):
726
        """See InventoryEntry._put_on_disk."""
727
        try:
728
            os.symlink(self.symlink_target, fullpath)
729
        except OSError,e:
730
            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
731
1185.12.33 by Aaron Bentley
Fixed symlink reverting
732
    def _read_tree_state(self, path, work_tree):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
733
        """See InventoryEntry._read_tree_state."""
734
        self.symlink_target = work_tree.get_symlink_target(self.file_id)
735
1534.7.175 by Aaron Bentley
Ensured revert writes a normal inventory
736
    def _forget_tree_state(self):
737
        self.symlink_target = None
738
1405 by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave
739
    def _unchanged(self, previous_ie):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
740
        """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
741
        compatible = super(InventoryLink, self)._unchanged(previous_ie)
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
742
        if self.symlink_target != previous_ie.symlink_target:
743
            compatible = False
744
        return compatible
745
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
746
802 by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions
747
class Inventory(object):
1 by mbp at sourcefrog
import from baz patch-364
748
    """Inventory of versioned files in a tree.
749
240 by mbp at sourcefrog
doc
750
    This describes which file_id is present at each point in the tree,
751
    and possibly the SHA-1 or other information about the file.
752
    Entries can be looked up either by path or by file_id.
1 by mbp at sourcefrog
import from baz patch-364
753
754
    The inventory represents a typical unix file tree, with
755
    directories containing files and subdirectories.  We never store
756
    the full path to a file, because renaming a directory implicitly
757
    moves all of its contents.  This class internally maintains a
758
    lookup tree that allows the children under a directory to be
759
    returned quickly.
760
761
    InventoryEntry objects must not be modified after they are
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
762
    inserted, other than through the Inventory API.
1 by mbp at sourcefrog
import from baz patch-364
763
764
    >>> inv = Inventory()
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
765
    >>> inv.add(InventoryFile('123-123', 'hello.c', ROOT_ID))
766
    InventoryFile('123-123', 'hello.c', parent_id='TREE_ROOT')
1 by mbp at sourcefrog
import from baz patch-364
767
    >>> inv['123-123'].name
768
    'hello.c'
769
770
    May be treated as an iterator or set to look up file ids:
771
    
772
    >>> bool(inv.path2id('hello.c'))
773
    True
774
    >>> '123-123' in inv
775
    True
776
777
    May also look up by name:
778
779
    >>> [x[0] for x in inv.iter_entries()]
780
    ['hello.c']
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
781
    >>> 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
782
    >>> inv.add(InventoryFile('123-123', 'hello.c', ROOT_ID))
783
    InventoryFile('123-123', 'hello.c', parent_id='TREE_ROOT-12345678-12345678')
1 by mbp at sourcefrog
import from baz patch-364
784
    """
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
785
    def __init__(self, root_id=ROOT_ID, revision_id=None):
1 by mbp at sourcefrog
import from baz patch-364
786
        """Create or read an inventory.
787
788
        If a working directory is specified, the inventory is read
789
        from there.  If the file is specified, read from that. If not,
790
        the inventory is created empty.
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
791
792
        The inventory is created with a default root directory, with
793
        an id of None.
1 by mbp at sourcefrog
import from baz patch-364
794
        """
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
795
        # We are letting Branch.create() create a unique inventory
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
796
        # root id. Rather than generating a random one here.
797
        #if root_id is None:
798
        #    root_id = bzrlib.branch.gen_file_id('TREE_ROOT')
799
        self.root = RootEntry(root_id)
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
800
        self.revision_id = revision_id
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
801
        self._byid = {self.root.file_id: self.root}
1 by mbp at sourcefrog
import from baz patch-364
802
803
1189 by Martin Pool
- BROKEN: partial support for commit into weave
804
    def copy(self):
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
805
        # TODO: jam 20051218 Should copy also copy the revision_id?
1189 by Martin Pool
- BROKEN: partial support for commit into weave
806
        other = Inventory(self.root.file_id)
1206 by Martin Pool
- fix bug in Inventory.copy()
807
        # copy recursively so we know directories will be added before
808
        # their children.  There are more efficient ways than this...
809
        for path, entry in self.iter_entries():
1189 by Martin Pool
- BROKEN: partial support for commit into weave
810
            if entry == self.root:
811
                continue
812
            other.add(entry.copy())
813
        return other
814
815
1 by mbp at sourcefrog
import from baz patch-364
816
    def __iter__(self):
817
        return iter(self._byid)
818
819
820
    def __len__(self):
821
        """Returns number of entries."""
822
        return len(self._byid)
823
824
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
825
    def iter_entries(self, from_dir=None):
1 by mbp at sourcefrog
import from baz patch-364
826
        """Return (path, entry) pairs, in order by name."""
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
827
        if from_dir == None:
828
            assert self.root
829
            from_dir = self.root
830
        elif isinstance(from_dir, basestring):
831
            from_dir = self._byid[from_dir]
832
            
833
        kids = from_dir.children.items()
1 by mbp at sourcefrog
import from baz patch-364
834
        kids.sort()
835
        for name, ie in kids:
836
            yield name, ie
837
            if ie.kind == 'directory':
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
838
                for cn, cie in self.iter_entries(from_dir=ie.file_id):
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 \
839
                    yield pathjoin(name, cn), cie
555 by Martin Pool
- New Inventory.entries() method
840
841
842
    def entries(self):
843
        """Return list of (path, ie) for all entries except the root.
844
845
        This may be faster than iter_entries.
846
        """
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
847
        accum = []
848
        def descend(dir_ie, dir_path):
556 by Martin Pool
- fix up Inventory.entries()
849
            kids = dir_ie.children.items()
555 by Martin Pool
- New Inventory.entries() method
850
            kids.sort()
851
            for name, ie in kids:
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 \
852
                child_path = pathjoin(dir_path, name)
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
853
                accum.append((child_path, ie))
555 by Martin Pool
- New Inventory.entries() method
854
                if ie.kind == 'directory':
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
855
                    descend(ie, child_path)
555 by Martin Pool
- New Inventory.entries() method
856
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
857
        descend(self.root, u'')
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
858
        return accum
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
859
860
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
861
    def directories(self):
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
862
        """Return (path, entry) pairs for all directories, including the root.
1 by mbp at sourcefrog
import from baz patch-364
863
        """
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
864
        accum = []
865
        def descend(parent_ie, parent_path):
866
            accum.append((parent_path, parent_ie))
156 by mbp at sourcefrog
new "directories" command
867
            
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
868
            kids = [(ie.name, ie) for ie in parent_ie.children.itervalues() if ie.kind == 'directory']
869
            kids.sort()
156 by mbp at sourcefrog
new "directories" command
870
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
871
            for name, child_ie in kids:
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 \
872
                child_path = pathjoin(parent_path, name)
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
873
                descend(child_ie, child_path)
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
874
        descend(self.root, u'')
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
875
        return accum
1 by mbp at sourcefrog
import from baz patch-364
876
        
877
878
879
    def __contains__(self, file_id):
880
        """True if this entry contains a file with given id.
881
882
        >>> inv = Inventory()
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
883
        >>> inv.add(InventoryFile('123', 'foo.c', ROOT_ID))
884
        InventoryFile('123', 'foo.c', parent_id='TREE_ROOT')
1 by mbp at sourcefrog
import from baz patch-364
885
        >>> '123' in inv
886
        True
887
        >>> '456' in inv
888
        False
889
        """
890
        return file_id in self._byid
891
892
893
    def __getitem__(self, file_id):
894
        """Return the entry for given file_id.
895
896
        >>> inv = Inventory()
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
897
        >>> inv.add(InventoryFile('123123', 'hello.c', ROOT_ID))
898
        InventoryFile('123123', 'hello.c', parent_id='TREE_ROOT')
1 by mbp at sourcefrog
import from baz patch-364
899
        >>> inv['123123'].name
900
        'hello.c'
901
        """
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
902
        try:
903
            return self._byid[file_id]
904
        except KeyError:
380 by Martin Pool
- Slight optimization for Inventory.__getitem__
905
            if file_id == None:
906
                raise BzrError("can't look up file_id None")
907
            else:
908
                raise BzrError("file_id {%s} not in inventory" % file_id)
1 by mbp at sourcefrog
import from baz patch-364
909
910
460 by Martin Pool
- new testing command compare-trees
911
    def get_file_kind(self, file_id):
912
        return self._byid[file_id].kind
913
138 by mbp at sourcefrog
remove parallel tree from inventory;
914
    def get_child(self, parent_id, filename):
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
915
        return self[parent_id].children.get(filename)
138 by mbp at sourcefrog
remove parallel tree from inventory;
916
917
1 by mbp at sourcefrog
import from baz patch-364
918
    def add(self, entry):
919
        """Add entry to inventory.
920
921
        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
922
        which calls this.
923
924
        Returns the new entry object.
925
        """
139 by mbp at sourcefrog
simplified/faster Inventory.add
926
        if entry.file_id in self._byid:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
927
            raise BzrError("inventory already contains entry with id {%s}" % entry.file_id)
1 by mbp at sourcefrog
import from baz patch-364
928
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
929
        if entry.parent_id == ROOT_ID or entry.parent_id is None:
930
            entry.parent_id = self.root.file_id
931
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
932
        try:
933
            parent = self._byid[entry.parent_id]
934
        except KeyError:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
935
            raise BzrError("parent_id {%s} not in inventory" % entry.parent_id)
139 by mbp at sourcefrog
simplified/faster Inventory.add
936
937
        if parent.children.has_key(entry.name):
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
938
            raise BzrError("%s is already versioned" %
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 \
939
                    pathjoin(self.id2path(parent.file_id), entry.name))
1 by mbp at sourcefrog
import from baz patch-364
940
941
        self._byid[entry.file_id] = entry
139 by mbp at sourcefrog
simplified/faster Inventory.add
942
        parent.children[entry.name] = entry
1092.1.30 by Robert Collins
change smart_add reporting of added files to callback with the entry, and change the inventory.add signature to return the added entry
943
        return entry
1 by mbp at sourcefrog
import from baz patch-364
944
945
70 by mbp at sourcefrog
Prepare for smart recursive add.
946
    def add_path(self, relpath, kind, file_id=None):
947
        """Add entry from a path.
948
1180 by Martin Pool
- start splitting code for xml (de)serialization away from objects
949
        The immediate parent must already be versioned.
950
951
        Returns the new entry object."""
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
952
        from bzrlib.workingtree import gen_file_id
1015 by Martin Pool
- fix circular imports
953
        
70 by mbp at sourcefrog
Prepare for smart recursive add.
954
        parts = bzrlib.osutils.splitpath(relpath)
955
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
956
        if file_id == None:
800 by Martin Pool
Merge John's import-speedup branch:
957
            file_id = gen_file_id(relpath)
70 by mbp at sourcefrog
Prepare for smart recursive add.
958
1534.7.69 by Aaron Bentley
Got real root moves working
959
        if len(parts) == 0:
960
            self.root = RootEntry(file_id)
961
            self._byid = {self.root.file_id: self.root}
962
            return
963
        else:
964
            parent_path = parts[:-1]
965
            parent_id = self.path2id(parent_path)
966
            if parent_id == None:
967
                raise NotVersionedError(path=parent_path)
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
968
        if kind == 'directory':
969
            ie = InventoryDirectory(file_id, parts[-1], parent_id)
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
970
        elif kind == 'file':
971
            ie = InventoryFile(file_id, parts[-1], parent_id)
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
972
        elif kind == 'symlink':
973
            ie = InventoryLink(file_id, parts[-1], parent_id)
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
974
        else:
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
975
            raise BzrError("unknown kind %r" % kind)
70 by mbp at sourcefrog
Prepare for smart recursive add.
976
        return self.add(ie)
977
978
1 by mbp at sourcefrog
import from baz patch-364
979
    def __delitem__(self, file_id):
980
        """Remove entry by id.
981
982
        >>> inv = Inventory()
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
983
        >>> inv.add(InventoryFile('123', 'foo.c', ROOT_ID))
984
        InventoryFile('123', 'foo.c', parent_id='TREE_ROOT')
1 by mbp at sourcefrog
import from baz patch-364
985
        >>> '123' in inv
986
        True
987
        >>> del inv['123']
988
        >>> '123' in inv
989
        False
990
        """
991
        ie = self[file_id]
992
1534.7.69 by Aaron Bentley
Got real root moves working
993
        assert ie.parent_id is None or \
994
            self[ie.parent_id].children[ie.name] == ie
1 by mbp at sourcefrog
import from baz patch-364
995
        
996
        del self._byid[file_id]
1534.7.69 by Aaron Bentley
Got real root moves working
997
        if ie.parent_id is not None:
998
            del self[ie.parent_id].children[ie.name]
1 by mbp at sourcefrog
import from baz patch-364
999
1000
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
1001
    def __eq__(self, other):
1 by mbp at sourcefrog
import from baz patch-364
1002
        """Compare two sets by comparing their contents.
1003
1004
        >>> i1 = Inventory()
1005
        >>> i2 = Inventory()
1006
        >>> i1 == i2
1007
        True
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
1008
        >>> i1.add(InventoryFile('123', 'foo', ROOT_ID))
1009
        InventoryFile('123', 'foo', parent_id='TREE_ROOT')
1 by mbp at sourcefrog
import from baz patch-364
1010
        >>> i1 == i2
1011
        False
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
1012
        >>> i2.add(InventoryFile('123', 'foo', ROOT_ID))
1013
        InventoryFile('123', 'foo', parent_id='TREE_ROOT')
1 by mbp at sourcefrog
import from baz patch-364
1014
        >>> i1 == i2
1015
        True
1016
        """
1017
        if not isinstance(other, Inventory):
1018
            return NotImplemented
1019
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
1020
        if len(self._byid) != len(other._byid):
543 by Martin Pool
- More cleanups for set type
1021
            # shortcut: obviously not the same
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
1022
            return False
1023
1024
        return self._byid == other._byid
1025
1026
1027
    def __ne__(self, other):
1249 by Martin Pool
- improvements to weave commit [broken]
1028
        return not self.__eq__(other)
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
1029
1030
1031
    def __hash__(self):
1032
        raise ValueError('not hashable')
1033
1596.2.19 by Robert Collins
Shave 20% off id2path.
1034
    def _iter_file_id_parents(self, file_id):
1035
        """Yield the parents of file_id up to the root."""
1036
        while file_id != None:
1037
            try:
1038
                ie = self._byid[file_id]
1039
            except KeyError:
1040
                raise BzrError("file_id {%s} not found in inventory" % file_id)
1041
            yield ie
1042
            file_id = ie.parent_id
1 by mbp at sourcefrog
import from baz patch-364
1043
172 by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory
1044
    def get_idpath(self, file_id):
1045
        """Return a list of file_ids for the path to an entry.
1046
1047
        The list contains one element for each directory followed by
1048
        the id of the file itself.  So the length of the returned list
1049
        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
1050
        root directory as depth 1.
172 by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory
1051
        """
1052
        p = []
1596.2.19 by Robert Collins
Shave 20% off id2path.
1053
        for parent in self._iter_file_id_parents(file_id):
1054
            p.insert(0, parent.file_id)
172 by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory
1055
        return p
1056
1 by mbp at sourcefrog
import from baz patch-364
1057
    def id2path(self, file_id):
1596.2.19 by Robert Collins
Shave 20% off id2path.
1058
        """Return as a string the path to file_id.
1393.1.32 by Martin Pool
- add docstring demonstrating use of Inventory.id2path
1059
        
1060
        >>> i = Inventory()
1061
        >>> e = i.add(InventoryDirectory('src-id', 'src', ROOT_ID))
1062
        >>> e = i.add(InventoryFile('foo-id', 'foo.c', parent_id='src-id'))
1185.31.34 by John Arbash Meinel
Removing instances of os.sep
1063
        >>> print i.id2path('foo-id')
1393.1.32 by Martin Pool
- add docstring demonstrating use of Inventory.id2path
1064
        src/foo.c
1065
        """
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
1066
        # get all names, skipping root
1596.2.19 by Robert Collins
Shave 20% off id2path.
1067
        return '/'.join(reversed(
1068
            [parent.name for parent in 
1069
             self._iter_file_id_parents(file_id)][:-1]))
1 by mbp at sourcefrog
import from baz patch-364
1070
            
1071
    def path2id(self, name):
1072
        """Walk down through directories to return entry of last component.
1073
1074
        names may be either a list of path components, or a single
1075
        string, in which case it is automatically split.
1076
1077
        This returns the entry of the last component in the path,
1078
        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
1079
1080
        Returns None iff the path is not found.
1 by mbp at sourcefrog
import from baz patch-364
1081
        """
70 by mbp at sourcefrog
Prepare for smart recursive add.
1082
        if isinstance(name, types.StringTypes):
1083
            name = splitpath(name)
1 by mbp at sourcefrog
import from baz patch-364
1084
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
1085
        mutter("lookup path %r" % name)
1086
1087
        parent = self.root
70 by mbp at sourcefrog
Prepare for smart recursive add.
1088
        for f in name:
1 by mbp at sourcefrog
import from baz patch-364
1089
            try:
138 by mbp at sourcefrog
remove parallel tree from inventory;
1090
                cie = parent.children[f]
1 by mbp at sourcefrog
import from baz patch-364
1091
                assert cie.name == f
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
1092
                assert cie.parent_id == parent.file_id
138 by mbp at sourcefrog
remove parallel tree from inventory;
1093
                parent = cie
1 by mbp at sourcefrog
import from baz patch-364
1094
            except KeyError:
1095
                # or raise an error?
1096
                return None
1097
138 by mbp at sourcefrog
remove parallel tree from inventory;
1098
        return parent.file_id
1 by mbp at sourcefrog
import from baz patch-364
1099
1100
1101
    def has_filename(self, names):
1102
        return bool(self.path2id(names))
1103
1104
1105
    def has_id(self, file_id):
1106
        return self._byid.has_key(file_id)
1107
1108
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
1109
    def rename(self, file_id, new_parent_id, new_name):
1110
        """Move a file within the inventory.
1111
1112
        This can change either the name, or the parent, or both.
1113
1114
        This does not move the working file."""
1115
        if not is_valid_name(new_name):
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
1116
            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
1117
1118
        new_parent = self._byid[new_parent_id]
1119
        if new_name in new_parent.children:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
1120
            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
1121
172 by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory
1122
        new_parent_idpath = self.get_idpath(new_parent_id)
1123
        if file_id in new_parent_idpath:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
1124
            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
1125
                    % (self.id2path(file_id), self.id2path(new_parent_id)))
1126
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
1127
        file_ie = self._byid[file_id]
1128
        old_parent = self._byid[file_ie.parent_id]
1129
1130
        # TODO: Don't leave things messed up if this fails
1131
1132
        del old_parent.children[file_ie.name]
1133
        new_parent.children[new_name] = file_ie
1134
        
1135
        file_ie.name = new_name
1136
        file_ie.parent_id = new_parent_id
1137
1138
1139
1140
1077 by Martin Pool
- avoid compiling REs at module load time
1141
_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
1142
1143
def is_valid_name(name):
1077 by Martin Pool
- avoid compiling REs at module load time
1144
    global _NAME_RE
1145
    if _NAME_RE == None:
1146
        _NAME_RE = re.compile(r'^[^/\\]+$')
1147
        
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
1148
    return bool(_NAME_RE.match(name))