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