~bzr-pqm/bzr/bzr.dev

1669.2.1 by Martin Pool
verbose commit now specifically identifies modified/renamed/reparented files
1
# Copyright (C) 2005, 2006 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
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
1669.2.1 by Martin Pool
verbose commit now specifically identifies modified/renamed/reparented files
356
    def _describe_snapshot_change(self, previous_entries):
357
        """Describe how this entry will have changed in a new commit.
358
359
        :param previous_entries: Dictionary from revision_id to inventory entry.
360
361
        :returns: One-word description: "merged", "added", "renamed", "modified".
362
        """
363
        # XXX: This assumes that the file *has* changed -- it should probably
364
        # be fused with whatever does that detection.  Why not just a single
365
        # thing to compare the entries?
366
        #
367
        # TODO: Return some kind of object describing all the possible
368
        # dimensions that can change, not just a string.  That can then give
369
        # both old and new names for renames, etc.
370
        #
1092.2.23 by Robert Collins
move inventory entry centric snapshot taking logic to inventory.py
371
        if len(previous_entries) > 1:
372
            return 'merged'
373
        elif len(previous_entries) == 0:
374
            return 'added'
1669.2.1 by Martin Pool
verbose commit now specifically identifies modified/renamed/reparented files
375
        the_parent, = previous_entries.values()
376
        if self.parent_id != the_parent.parent_id:
377
            # actually, moved to another directory
378
            return 'renamed'
379
        elif self.name != the_parent.name:
380
            return 'renamed'
381
        return 'modified'
1 by mbp at sourcefrog
import from baz patch-364
382
383
    def __repr__(self):
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
384
        return ("%s(%r, %r, parent_id=%r)"
1 by mbp at sourcefrog
import from baz patch-364
385
                % (self.__class__.__name__,
386
                   self.file_id,
387
                   self.name,
388
                   self.parent_id))
389
1411 by Robert Collins
use weave ancestry to determine inventory entry previous heads, prevent propogating 'I did a merge' merges.
390
    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
391
                 work_tree, weave_store, transaction):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
392
        """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
393
        
394
        This means that all its fields are populated, that it has its
395
        text stored in the text store or weave.
396
        """
397
        mutter('new parents of %s are %r', path, previous_entries)
1185.12.33 by Aaron Bentley
Fixed symlink reverting
398
        self._read_tree_state(path, work_tree)
1092.2.23 by Robert Collins
move inventory entry centric snapshot taking logic to inventory.py
399
        if len(previous_entries) == 1:
400
            # cannot be unchanged unless there is only one parent file rev.
401
            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
402
            if self._unchanged(parent_ie):
1092.2.23 by Robert Collins
move inventory entry centric snapshot taking logic to inventory.py
403
                mutter("found unchanged entry")
404
                self.revision = parent_ie.revision
405
                return "unchanged"
1669.2.1 by Martin Pool
verbose commit now specifically identifies modified/renamed/reparented files
406
        return self._snapshot_into_revision(revision, previous_entries, 
407
                                            work_tree, weave_store, transaction)
408
409
    def _snapshot_into_revision(self, revision, previous_entries, work_tree,
410
                                weave_store, transaction):
411
        """Record this revision unconditionally into a store.
412
413
        The entry's last-changed revision property (`revision`) is updated to 
414
        that of the new revision.
415
        
416
        :param revision: id of the new revision that is being recorded.
417
418
        :returns: String description of the commit (e.g. "merged", "modified"), etc.
419
        """
420
        mutter('new revision {%s} for {%s}', revision, self.file_id)
1092.2.23 by Robert Collins
move inventory entry centric snapshot taking logic to inventory.py
421
        self.revision = revision
1669.2.1 by Martin Pool
verbose commit now specifically identifies modified/renamed/reparented files
422
        change = self._describe_snapshot_change(previous_entries)
1417.1.8 by Robert Collins
use transactions in the weave store interface, which enables caching for log
423
        self._snapshot_text(previous_entries, work_tree, weave_store,
424
                            transaction)
1092.2.23 by Robert Collins
move inventory entry centric snapshot taking logic to inventory.py
425
        return change
426
1417.1.8 by Robert Collins
use transactions in the weave store interface, which enables caching for log
427
    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
428
        """Record the 'text' of this entry, whatever form that takes.
429
        
430
        This default implementation simply adds an empty text.
431
        """
1092.2.23 by Robert Collins
move inventory entry centric snapshot taking logic to inventory.py
432
        mutter('storing file {%s} in revision {%s}',
433
               self.file_id, self.revision)
1563.2.18 by Robert Collins
get knit repositories really using knits for text storage.
434
        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
435
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
436
    def __eq__(self, other):
1 by mbp at sourcefrog
import from baz patch-364
437
        if not isinstance(other, InventoryEntry):
438
            return NotImplemented
439
1398 by Robert Collins
integrate in Gustavos x-bit patch
440
        return ((self.file_id == other.file_id)
441
                and (self.name == other.name)
442
                and (other.symlink_target == self.symlink_target)
443
                and (self.text_sha1 == other.text_sha1)
444
                and (self.text_size == other.text_size)
445
                and (self.text_id == other.text_id)
446
                and (self.parent_id == other.parent_id)
447
                and (self.kind == other.kind)
448
                and (self.revision == other.revision)
449
                and (self.executable == other.executable)
450
                )
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
451
452
    def __ne__(self, other):
453
        return not (self == other)
454
455
    def __hash__(self):
456
        raise ValueError('not hashable')
1 by mbp at sourcefrog
import from baz patch-364
457
1405 by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave
458
    def _unchanged(self, previous_ie):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
459
        """Has this entry changed relative to previous_ie.
460
461
        This method should be overriden in child classes.
462
        """
1092.2.22 by Robert Collins
text_version and name_version unification looking reasonable
463
        compatible = True
464
        # different inv parent
465
        if previous_ie.parent_id != self.parent_id:
466
            compatible = False
467
        # renamed
468
        elif previous_ie.name != self.name:
469
            compatible = False
470
        return compatible
471
1185.12.33 by Aaron Bentley
Fixed symlink reverting
472
    def _read_tree_state(self, path, work_tree):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
473
        """Populate fields in the inventory entry from the given tree.
474
        
475
        Note that this should be modified to be a noop on virtual trees
476
        as all entries created there are prepopulated.
477
        """
1185.16.5 by Martin Pool
doc
478
        # TODO: Rather than running this manually, we should check the 
479
        # working sha1 and other expensive properties when they're
480
        # first requested, or preload them if they're already known
481
        pass            # nothing to do by default
1092.2.23 by Robert Collins
move inventory entry centric snapshot taking logic to inventory.py
482
1534.7.175 by Aaron Bentley
Ensured revert writes a normal inventory
483
    def _forget_tree_state(self):
484
        pass
485
1 by mbp at sourcefrog
import from baz patch-364
486
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
487
class RootEntry(InventoryEntry):
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
488
489
    def _check(self, checker, rev_id, tree):
490
        """See InventoryEntry._check"""
491
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
492
    def __init__(self, file_id):
493
        self.file_id = file_id
494
        self.children = {}
495
        self.kind = 'root_directory'
496
        self.parent_id = None
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
497
        self.name = u''
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
498
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
499
    def __eq__(self, other):
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
500
        if not isinstance(other, RootEntry):
501
            return NotImplemented
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
502
        
503
        return (self.file_id == other.file_id) \
504
               and (self.children == other.children)
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
505
506
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
507
class InventoryDirectory(InventoryEntry):
508
    """A directory in an inventory."""
509
510
    def _check(self, checker, rev_id, tree):
511
        """See InventoryEntry._check"""
512
        if self.text_sha1 != None or self.text_size != None or self.text_id != None:
513
            raise BzrCheckError('directory {%s} has text in revision {%s}'
514
                                % (self.file_id, rev_id))
515
516
    def copy(self):
517
        other = InventoryDirectory(self.file_id, self.name, self.parent_id)
518
        other.revision = self.revision
519
        # note that children are *not* copied; they're pulled across when
520
        # others are added
521
        return other
522
523
    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
524
        super(InventoryDirectory, self).__init__(file_id, name, parent_id)
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
525
        self.children = {}
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
526
        self.kind = 'directory'
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
527
528
    def kind_character(self):
529
        """See InventoryEntry.kind_character."""
530
        return '/'
531
532
    def _put_in_tar(self, item, tree):
533
        """See InventoryEntry._put_in_tar."""
534
        item.type = tarfile.DIRTYPE
535
        fileobj = None
536
        item.name += '/'
537
        item.size = 0
538
        item.mode = 0755
539
        return fileobj
540
541
    def _put_on_disk(self, fullpath, tree):
542
        """See InventoryEntry._put_on_disk."""
543
        os.mkdir(fullpath)
544
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
545
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
546
class InventoryFile(InventoryEntry):
547
    """A file in an inventory."""
548
1616.1.5 by Martin Pool
Cleanup and document some check code
549
    def _check(self, checker, tree_revision_id, tree):
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
550
        """See InventoryEntry._check"""
1616.1.5 by Martin Pool
Cleanup and document some check code
551
        t = (self.file_id, self.revision)
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
552
        if t in checker.checked_texts:
1616.1.5 by Martin Pool
Cleanup and document some check code
553
            prev_sha = checker.checked_texts[t]
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
554
            if prev_sha != self.text_sha1:
555
                raise BzrCheckError('mismatched sha1 on {%s} in {%s}' %
1616.1.5 by Martin Pool
Cleanup and document some check code
556
                                    (self.file_id, tree_revision_id))
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
557
            else:
558
                checker.repeated_text_cnt += 1
559
                return
1185.50.28 by John Arbash Meinel
Lots of updates for 'bzr check'
560
561
        if self.file_id not in checker.checked_weaves:
562
            mutter('check weave {%s}', self.file_id)
563
            w = tree.get_weave(self.file_id)
564
            # Not passing a progress bar, because it creates a new
565
            # progress, which overwrites the current progress,
566
            # and doesn't look nice
567
            w.check()
568
            checker.checked_weaves[self.file_id] = True
569
        else:
1563.2.14 by Robert Collins
Prepare weave store to delegate copy details to the versioned file.
570
            w = tree.get_weave(self.file_id)
1185.50.28 by John Arbash Meinel
Lots of updates for 'bzr check'
571
1616.1.5 by Martin Pool
Cleanup and document some check code
572
        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'.
573
        checker.checked_text_cnt += 1
1185.50.28 by John Arbash Meinel
Lots of updates for 'bzr check'
574
        # We can't check the length, because Weave doesn't store that
575
        # information, and the whole point of looking at the weave's
576
        # sha1sum is that we don't have to extract the text.
577
        if self.text_sha1 != w.get_sha1(self.revision):
578
            raise BzrCheckError('text {%s} version {%s} wrong sha1' 
579
                                % (self.file_id, self.revision))
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
580
        checker.checked_texts[t] = self.text_sha1
581
582
    def copy(self):
583
        other = InventoryFile(self.file_id, self.name, self.parent_id)
584
        other.executable = self.executable
585
        other.text_id = self.text_id
586
        other.text_sha1 = self.text_sha1
587
        other.text_size = self.text_size
588
        other.revision = self.revision
589
        return other
590
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
591
    def detect_changes(self, old_entry):
592
        """See InventoryEntry.detect_changes."""
593
        assert self.text_sha1 != None
594
        assert old_entry.text_sha1 != None
595
        text_modified = (self.text_sha1 != old_entry.text_sha1)
596
        meta_modified = (self.executable != old_entry.executable)
597
        return text_modified, meta_modified
598
599
    def _diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree,
600
             output_to, reverse=False):
601
        """See InventoryEntry._diff."""
1558.15.2 by Aaron Bentley
Implemented binary file handling for diff
602
        try:
603
            from_text = tree.get_file(self.file_id).readlines()
604
            if to_entry:
605
                to_text = to_tree.get_file(to_entry.file_id).readlines()
606
            else:
607
                to_text = []
608
            if not reverse:
609
                text_diff(from_label, from_text,
610
                          to_label, to_text, output_to)
611
            else:
612
                text_diff(to_label, to_text,
613
                          from_label, from_text, output_to)
614
        except BinaryFile:
1558.15.11 by Aaron Bentley
Apply merge review suggestions
615
            if reverse:
616
                label_pair = (to_label, from_label)
617
            else:
618
                label_pair = (from_label, to_label)
619
            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
620
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
621
    def has_text(self):
622
        """See InventoryEntry.has_text."""
623
        return True
624
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
625
    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
626
        super(InventoryFile, self).__init__(file_id, name, parent_id)
627
        self.kind = 'file'
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
628
629
    def kind_character(self):
630
        """See InventoryEntry.kind_character."""
631
        return ''
632
633
    def _put_in_tar(self, item, tree):
634
        """See InventoryEntry._put_in_tar."""
635
        item.type = tarfile.REGTYPE
636
        fileobj = tree.get_file(self.file_id)
637
        item.size = self.text_size
638
        if tree.is_executable(self.file_id):
639
            item.mode = 0755
640
        else:
641
            item.mode = 0644
642
        return fileobj
643
644
    def _put_on_disk(self, fullpath, tree):
645
        """See InventoryEntry._put_on_disk."""
646
        pumpfile(tree.get_file(self.file_id), file(fullpath, 'wb'))
647
        if tree.is_executable(self.file_id):
648
            os.chmod(fullpath, 0755)
649
1185.12.33 by Aaron Bentley
Fixed symlink reverting
650
    def _read_tree_state(self, path, work_tree):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
651
        """See InventoryEntry._read_tree_state."""
652
        self.text_sha1 = work_tree.get_file_sha1(self.file_id)
653
        self.executable = work_tree.is_executable(self.file_id)
654
1534.7.175 by Aaron Bentley
Ensured revert writes a normal inventory
655
    def _forget_tree_state(self):
656
        self.text_sha1 = None
657
        self.executable = None
658
1417.1.8 by Robert Collins
use transactions in the weave store interface, which enables caching for log
659
    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
660
        """See InventoryEntry._snapshot_text."""
661
        mutter('storing file {%s} in revision {%s}',
662
               self.file_id, self.revision)
663
        # special case to avoid diffing on renames or 
664
        # reparenting
665
        if (len(file_parents) == 1
666
            and self.text_sha1 == file_parents.values()[0].text_sha1
667
            and self.text_size == file_parents.values()[0].text_size):
668
            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.
669
            versionedfile = weave_store.get_weave(self.file_id, transaction)
1563.2.18 by Robert Collins
get knit repositories really using knits for text storage.
670
            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
671
        else:
672
            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.
673
            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
674
                                    transaction)
1405 by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave
675
            self.text_sha1 = sha_strings(new_lines)
676
            self.text_size = sum(map(len, new_lines))
677
678
679
    def _unchanged(self, previous_ie):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
680
        """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
681
        compatible = super(InventoryFile, self)._unchanged(previous_ie)
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
682
        if self.text_sha1 != previous_ie.text_sha1:
683
            compatible = False
684
        else:
685
            # FIXME: 20050930 probe for the text size when getting sha1
686
            # in _read_tree_state
687
            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
688
        if self.executable != previous_ie.executable:
689
            compatible = False
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
690
        return compatible
691
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
692
693
class InventoryLink(InventoryEntry):
694
    """A file in an inventory."""
695
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
696
    __slots__ = ['symlink_target']
697
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
698
    def _check(self, checker, rev_id, tree):
699
        """See InventoryEntry._check"""
700
        if self.text_sha1 != None or self.text_size != None or self.text_id != None:
701
            raise BzrCheckError('symlink {%s} has text in revision {%s}'
702
                    % (self.file_id, rev_id))
703
        if self.symlink_target == None:
704
            raise BzrCheckError('symlink {%s} has no target in revision {%s}'
705
                    % (self.file_id, rev_id))
706
707
    def copy(self):
708
        other = InventoryLink(self.file_id, self.name, self.parent_id)
709
        other.symlink_target = self.symlink_target
710
        other.revision = self.revision
711
        return other
712
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
713
    def detect_changes(self, old_entry):
714
        """See InventoryEntry.detect_changes."""
715
        # FIXME: which _modified field should we use ? RBC 20051003
716
        text_modified = (self.symlink_target != old_entry.symlink_target)
717
        if text_modified:
718
            mutter("    symlink target changed")
719
        meta_modified = False
720
        return text_modified, meta_modified
721
722
    def _diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree,
723
             output_to, reverse=False):
724
        """See InventoryEntry._diff."""
725
        from_text = self.symlink_target
726
        if to_entry is not None:
727
            to_text = to_entry.symlink_target
728
            if reverse:
729
                temp = from_text
730
                from_text = to_text
731
                to_text = temp
732
            print >>output_to, '=== target changed %r => %r' % (from_text, to_text)
733
        else:
734
            if not reverse:
735
                print >>output_to, '=== target was %r' % self.symlink_target
736
            else:
737
                print >>output_to, '=== target is %r' % self.symlink_target
738
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
739
    def __init__(self, file_id, name, parent_id):
740
        super(InventoryLink, self).__init__(file_id, name, parent_id)
741
        self.kind = 'symlink'
742
743
    def kind_character(self):
744
        """See InventoryEntry.kind_character."""
745
        return ''
746
747
    def _put_in_tar(self, item, tree):
748
        """See InventoryEntry._put_in_tar."""
1185.33.3 by Martin Pool
[merge] jelmer
749
        item.type = tarfile.SYMTYPE
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
750
        fileobj = None
751
        item.size = 0
752
        item.mode = 0755
753
        item.linkname = self.symlink_target
754
        return fileobj
755
756
    def _put_on_disk(self, fullpath, tree):
757
        """See InventoryEntry._put_on_disk."""
758
        try:
759
            os.symlink(self.symlink_target, fullpath)
760
        except OSError,e:
761
            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
762
1185.12.33 by Aaron Bentley
Fixed symlink reverting
763
    def _read_tree_state(self, path, work_tree):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
764
        """See InventoryEntry._read_tree_state."""
765
        self.symlink_target = work_tree.get_symlink_target(self.file_id)
766
1534.7.175 by Aaron Bentley
Ensured revert writes a normal inventory
767
    def _forget_tree_state(self):
768
        self.symlink_target = None
769
1405 by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave
770
    def _unchanged(self, previous_ie):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
771
        """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
772
        compatible = super(InventoryLink, self)._unchanged(previous_ie)
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
773
        if self.symlink_target != previous_ie.symlink_target:
774
            compatible = False
775
        return compatible
776
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
777
802 by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions
778
class Inventory(object):
1 by mbp at sourcefrog
import from baz patch-364
779
    """Inventory of versioned files in a tree.
780
240 by mbp at sourcefrog
doc
781
    This describes which file_id is present at each point in the tree,
782
    and possibly the SHA-1 or other information about the file.
783
    Entries can be looked up either by path or by file_id.
1 by mbp at sourcefrog
import from baz patch-364
784
785
    The inventory represents a typical unix file tree, with
786
    directories containing files and subdirectories.  We never store
787
    the full path to a file, because renaming a directory implicitly
788
    moves all of its contents.  This class internally maintains a
789
    lookup tree that allows the children under a directory to be
790
    returned quickly.
791
792
    InventoryEntry objects must not be modified after they are
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
793
    inserted, other than through the Inventory API.
1 by mbp at sourcefrog
import from baz patch-364
794
795
    >>> inv = Inventory()
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
796
    >>> inv.add(InventoryFile('123-123', 'hello.c', ROOT_ID))
797
    InventoryFile('123-123', 'hello.c', parent_id='TREE_ROOT')
1 by mbp at sourcefrog
import from baz patch-364
798
    >>> inv['123-123'].name
799
    'hello.c'
800
801
    May be treated as an iterator or set to look up file ids:
802
    
803
    >>> bool(inv.path2id('hello.c'))
804
    True
805
    >>> '123-123' in inv
806
    True
807
808
    May also look up by name:
809
810
    >>> [x[0] for x in inv.iter_entries()]
811
    ['hello.c']
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
812
    >>> 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
813
    >>> inv.add(InventoryFile('123-123', 'hello.c', ROOT_ID))
814
    InventoryFile('123-123', 'hello.c', parent_id='TREE_ROOT-12345678-12345678')
1 by mbp at sourcefrog
import from baz patch-364
815
    """
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
816
    def __init__(self, root_id=ROOT_ID, revision_id=None):
1 by mbp at sourcefrog
import from baz patch-364
817
        """Create or read an inventory.
818
819
        If a working directory is specified, the inventory is read
820
        from there.  If the file is specified, read from that. If not,
821
        the inventory is created empty.
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
822
823
        The inventory is created with a default root directory, with
824
        an id of None.
1 by mbp at sourcefrog
import from baz patch-364
825
        """
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
826
        # 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
827
        # root id. Rather than generating a random one here.
828
        #if root_id is None:
829
        #    root_id = bzrlib.branch.gen_file_id('TREE_ROOT')
830
        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.
831
        self.revision_id = revision_id
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
832
        self._byid = {self.root.file_id: self.root}
1 by mbp at sourcefrog
import from baz patch-364
833
834
1189 by Martin Pool
- BROKEN: partial support for commit into weave
835
    def copy(self):
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
836
        # TODO: jam 20051218 Should copy also copy the revision_id?
1189 by Martin Pool
- BROKEN: partial support for commit into weave
837
        other = Inventory(self.root.file_id)
1206 by Martin Pool
- fix bug in Inventory.copy()
838
        # copy recursively so we know directories will be added before
839
        # their children.  There are more efficient ways than this...
840
        for path, entry in self.iter_entries():
1189 by Martin Pool
- BROKEN: partial support for commit into weave
841
            if entry == self.root:
842
                continue
843
            other.add(entry.copy())
844
        return other
845
846
1 by mbp at sourcefrog
import from baz patch-364
847
    def __iter__(self):
848
        return iter(self._byid)
849
850
851
    def __len__(self):
852
        """Returns number of entries."""
853
        return len(self._byid)
854
855
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
856
    def iter_entries(self, from_dir=None):
1 by mbp at sourcefrog
import from baz patch-364
857
        """Return (path, entry) pairs, in order by name."""
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
858
        if from_dir == None:
859
            assert self.root
860
            from_dir = self.root
861
        elif isinstance(from_dir, basestring):
862
            from_dir = self._byid[from_dir]
863
            
864
        kids = from_dir.children.items()
1 by mbp at sourcefrog
import from baz patch-364
865
        kids.sort()
866
        for name, ie in kids:
867
            yield name, ie
868
            if ie.kind == 'directory':
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
869
                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 \
870
                    yield pathjoin(name, cn), cie
555 by Martin Pool
- New Inventory.entries() method
871
872
873
    def entries(self):
874
        """Return list of (path, ie) for all entries except the root.
875
876
        This may be faster than iter_entries.
877
        """
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
878
        accum = []
879
        def descend(dir_ie, dir_path):
556 by Martin Pool
- fix up Inventory.entries()
880
            kids = dir_ie.children.items()
555 by Martin Pool
- New Inventory.entries() method
881
            kids.sort()
882
            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 \
883
                child_path = pathjoin(dir_path, name)
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
884
                accum.append((child_path, ie))
555 by Martin Pool
- New Inventory.entries() method
885
                if ie.kind == 'directory':
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
886
                    descend(ie, child_path)
555 by Martin Pool
- New Inventory.entries() method
887
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
888
        descend(self.root, u'')
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
889
        return accum
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
890
891
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
892
    def directories(self):
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
893
        """Return (path, entry) pairs for all directories, including the root.
1 by mbp at sourcefrog
import from baz patch-364
894
        """
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
895
        accum = []
896
        def descend(parent_ie, parent_path):
897
            accum.append((parent_path, parent_ie))
156 by mbp at sourcefrog
new "directories" command
898
            
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
899
            kids = [(ie.name, ie) for ie in parent_ie.children.itervalues() if ie.kind == 'directory']
900
            kids.sort()
156 by mbp at sourcefrog
new "directories" command
901
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
902
            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 \
903
                child_path = pathjoin(parent_path, name)
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
904
                descend(child_ie, child_path)
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
905
        descend(self.root, u'')
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
906
        return accum
1 by mbp at sourcefrog
import from baz patch-364
907
        
908
909
910
    def __contains__(self, file_id):
911
        """True if this entry contains a file with given id.
912
913
        >>> inv = Inventory()
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
914
        >>> inv.add(InventoryFile('123', 'foo.c', ROOT_ID))
915
        InventoryFile('123', 'foo.c', parent_id='TREE_ROOT')
1 by mbp at sourcefrog
import from baz patch-364
916
        >>> '123' in inv
917
        True
918
        >>> '456' in inv
919
        False
920
        """
921
        return file_id in self._byid
922
923
924
    def __getitem__(self, file_id):
925
        """Return the entry for given file_id.
926
927
        >>> inv = Inventory()
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
928
        >>> inv.add(InventoryFile('123123', 'hello.c', ROOT_ID))
929
        InventoryFile('123123', 'hello.c', parent_id='TREE_ROOT')
1 by mbp at sourcefrog
import from baz patch-364
930
        >>> inv['123123'].name
931
        'hello.c'
932
        """
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
933
        try:
934
            return self._byid[file_id]
935
        except KeyError:
380 by Martin Pool
- Slight optimization for Inventory.__getitem__
936
            if file_id == None:
937
                raise BzrError("can't look up file_id None")
938
            else:
939
                raise BzrError("file_id {%s} not in inventory" % file_id)
1 by mbp at sourcefrog
import from baz patch-364
940
941
460 by Martin Pool
- new testing command compare-trees
942
    def get_file_kind(self, file_id):
943
        return self._byid[file_id].kind
944
138 by mbp at sourcefrog
remove parallel tree from inventory;
945
    def get_child(self, parent_id, filename):
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
946
        return self[parent_id].children.get(filename)
138 by mbp at sourcefrog
remove parallel tree from inventory;
947
948
1 by mbp at sourcefrog
import from baz patch-364
949
    def add(self, entry):
950
        """Add entry to inventory.
951
952
        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
953
        which calls this.
954
955
        Returns the new entry object.
956
        """
139 by mbp at sourcefrog
simplified/faster Inventory.add
957
        if entry.file_id in self._byid:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
958
            raise BzrError("inventory already contains entry with id {%s}" % entry.file_id)
1 by mbp at sourcefrog
import from baz patch-364
959
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
960
        if entry.parent_id == ROOT_ID or entry.parent_id is None:
961
            entry.parent_id = self.root.file_id
962
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
963
        try:
964
            parent = self._byid[entry.parent_id]
965
        except KeyError:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
966
            raise BzrError("parent_id {%s} not in inventory" % entry.parent_id)
139 by mbp at sourcefrog
simplified/faster Inventory.add
967
968
        if parent.children.has_key(entry.name):
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
969
            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 \
970
                    pathjoin(self.id2path(parent.file_id), entry.name))
1 by mbp at sourcefrog
import from baz patch-364
971
972
        self._byid[entry.file_id] = entry
139 by mbp at sourcefrog
simplified/faster Inventory.add
973
        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
974
        return entry
1 by mbp at sourcefrog
import from baz patch-364
975
976
70 by mbp at sourcefrog
Prepare for smart recursive add.
977
    def add_path(self, relpath, kind, file_id=None):
978
        """Add entry from a path.
979
1180 by Martin Pool
- start splitting code for xml (de)serialization away from objects
980
        The immediate parent must already be versioned.
981
982
        Returns the new entry object."""
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
983
        from bzrlib.workingtree import gen_file_id
1015 by Martin Pool
- fix circular imports
984
        
70 by mbp at sourcefrog
Prepare for smart recursive add.
985
        parts = bzrlib.osutils.splitpath(relpath)
986
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
987
        if file_id == None:
800 by Martin Pool
Merge John's import-speedup branch:
988
            file_id = gen_file_id(relpath)
70 by mbp at sourcefrog
Prepare for smart recursive add.
989
1534.7.69 by Aaron Bentley
Got real root moves working
990
        if len(parts) == 0:
991
            self.root = RootEntry(file_id)
992
            self._byid = {self.root.file_id: self.root}
993
            return
994
        else:
995
            parent_path = parts[:-1]
996
            parent_id = self.path2id(parent_path)
997
            if parent_id == None:
998
                raise NotVersionedError(path=parent_path)
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
999
        if kind == 'directory':
1000
            ie = InventoryDirectory(file_id, parts[-1], parent_id)
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
1001
        elif kind == 'file':
1002
            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
1003
        elif kind == 'symlink':
1004
            ie = InventoryLink(file_id, parts[-1], parent_id)
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
1005
        else:
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
1006
            raise BzrError("unknown kind %r" % kind)
70 by mbp at sourcefrog
Prepare for smart recursive add.
1007
        return self.add(ie)
1008
1009
1 by mbp at sourcefrog
import from baz patch-364
1010
    def __delitem__(self, file_id):
1011
        """Remove entry by id.
1012
1013
        >>> inv = Inventory()
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
1014
        >>> inv.add(InventoryFile('123', 'foo.c', ROOT_ID))
1015
        InventoryFile('123', 'foo.c', parent_id='TREE_ROOT')
1 by mbp at sourcefrog
import from baz patch-364
1016
        >>> '123' in inv
1017
        True
1018
        >>> del inv['123']
1019
        >>> '123' in inv
1020
        False
1021
        """
1022
        ie = self[file_id]
1023
1534.7.69 by Aaron Bentley
Got real root moves working
1024
        assert ie.parent_id is None or \
1025
            self[ie.parent_id].children[ie.name] == ie
1 by mbp at sourcefrog
import from baz patch-364
1026
        
1027
        del self._byid[file_id]
1534.7.69 by Aaron Bentley
Got real root moves working
1028
        if ie.parent_id is not None:
1029
            del self[ie.parent_id].children[ie.name]
1 by mbp at sourcefrog
import from baz patch-364
1030
1031
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
1032
    def __eq__(self, other):
1 by mbp at sourcefrog
import from baz patch-364
1033
        """Compare two sets by comparing their contents.
1034
1035
        >>> i1 = Inventory()
1036
        >>> i2 = Inventory()
1037
        >>> i1 == i2
1038
        True
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
1039
        >>> i1.add(InventoryFile('123', 'foo', ROOT_ID))
1040
        InventoryFile('123', 'foo', parent_id='TREE_ROOT')
1 by mbp at sourcefrog
import from baz patch-364
1041
        >>> i1 == i2
1042
        False
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
1043
        >>> i2.add(InventoryFile('123', 'foo', ROOT_ID))
1044
        InventoryFile('123', 'foo', parent_id='TREE_ROOT')
1 by mbp at sourcefrog
import from baz patch-364
1045
        >>> i1 == i2
1046
        True
1047
        """
1048
        if not isinstance(other, Inventory):
1049
            return NotImplemented
1050
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
1051
        if len(self._byid) != len(other._byid):
543 by Martin Pool
- More cleanups for set type
1052
            # shortcut: obviously not the same
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
1053
            return False
1054
1055
        return self._byid == other._byid
1056
1057
1058
    def __ne__(self, other):
1249 by Martin Pool
- improvements to weave commit [broken]
1059
        return not self.__eq__(other)
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
1060
1061
1062
    def __hash__(self):
1063
        raise ValueError('not hashable')
1064
1596.2.19 by Robert Collins
Shave 20% off id2path.
1065
    def _iter_file_id_parents(self, file_id):
1066
        """Yield the parents of file_id up to the root."""
1067
        while file_id != None:
1068
            try:
1069
                ie = self._byid[file_id]
1070
            except KeyError:
1071
                raise BzrError("file_id {%s} not found in inventory" % file_id)
1072
            yield ie
1073
            file_id = ie.parent_id
1 by mbp at sourcefrog
import from baz patch-364
1074
172 by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory
1075
    def get_idpath(self, file_id):
1076
        """Return a list of file_ids for the path to an entry.
1077
1078
        The list contains one element for each directory followed by
1079
        the id of the file itself.  So the length of the returned list
1080
        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
1081
        root directory as depth 1.
172 by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory
1082
        """
1083
        p = []
1596.2.19 by Robert Collins
Shave 20% off id2path.
1084
        for parent in self._iter_file_id_parents(file_id):
1085
            p.insert(0, parent.file_id)
172 by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory
1086
        return p
1087
1 by mbp at sourcefrog
import from baz patch-364
1088
    def id2path(self, file_id):
1596.2.19 by Robert Collins
Shave 20% off id2path.
1089
        """Return as a string the path to file_id.
1393.1.32 by Martin Pool
- add docstring demonstrating use of Inventory.id2path
1090
        
1091
        >>> i = Inventory()
1092
        >>> e = i.add(InventoryDirectory('src-id', 'src', ROOT_ID))
1093
        >>> e = i.add(InventoryFile('foo-id', 'foo.c', parent_id='src-id'))
1185.31.34 by John Arbash Meinel
Removing instances of os.sep
1094
        >>> print i.id2path('foo-id')
1393.1.32 by Martin Pool
- add docstring demonstrating use of Inventory.id2path
1095
        src/foo.c
1096
        """
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
1097
        # get all names, skipping root
1596.2.19 by Robert Collins
Shave 20% off id2path.
1098
        return '/'.join(reversed(
1099
            [parent.name for parent in 
1100
             self._iter_file_id_parents(file_id)][:-1]))
1 by mbp at sourcefrog
import from baz patch-364
1101
            
1102
    def path2id(self, name):
1103
        """Walk down through directories to return entry of last component.
1104
1105
        names may be either a list of path components, or a single
1106
        string, in which case it is automatically split.
1107
1108
        This returns the entry of the last component in the path,
1109
        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
1110
1111
        Returns None iff the path is not found.
1 by mbp at sourcefrog
import from baz patch-364
1112
        """
70 by mbp at sourcefrog
Prepare for smart recursive add.
1113
        if isinstance(name, types.StringTypes):
1114
            name = splitpath(name)
1 by mbp at sourcefrog
import from baz patch-364
1115
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
1116
        mutter("lookup path %r" % name)
1117
1118
        parent = self.root
70 by mbp at sourcefrog
Prepare for smart recursive add.
1119
        for f in name:
1 by mbp at sourcefrog
import from baz patch-364
1120
            try:
138 by mbp at sourcefrog
remove parallel tree from inventory;
1121
                cie = parent.children[f]
1 by mbp at sourcefrog
import from baz patch-364
1122
                assert cie.name == f
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
1123
                assert cie.parent_id == parent.file_id
138 by mbp at sourcefrog
remove parallel tree from inventory;
1124
                parent = cie
1 by mbp at sourcefrog
import from baz patch-364
1125
            except KeyError:
1126
                # or raise an error?
1127
                return None
1128
138 by mbp at sourcefrog
remove parallel tree from inventory;
1129
        return parent.file_id
1 by mbp at sourcefrog
import from baz patch-364
1130
1131
1132
    def has_filename(self, names):
1133
        return bool(self.path2id(names))
1134
1135
1136
    def has_id(self, file_id):
1137
        return self._byid.has_key(file_id)
1138
1139
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
1140
    def rename(self, file_id, new_parent_id, new_name):
1141
        """Move a file within the inventory.
1142
1143
        This can change either the name, or the parent, or both.
1144
1145
        This does not move the working file."""
1146
        if not is_valid_name(new_name):
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
1147
            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
1148
1149
        new_parent = self._byid[new_parent_id]
1150
        if new_name in new_parent.children:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
1151
            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
1152
172 by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory
1153
        new_parent_idpath = self.get_idpath(new_parent_id)
1154
        if file_id in new_parent_idpath:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
1155
            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
1156
                    % (self.id2path(file_id), self.id2path(new_parent_id)))
1157
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
1158
        file_ie = self._byid[file_id]
1159
        old_parent = self._byid[file_ie.parent_id]
1160
1161
        # TODO: Don't leave things messed up if this fails
1162
1163
        del old_parent.children[file_ie.name]
1164
        new_parent.children[new_name] = file_ie
1165
        
1166
        file_ie.name = new_name
1167
        file_ie.parent_id = new_parent_id
1168
1169
1170
1171
1077 by Martin Pool
- avoid compiling REs at module load time
1172
_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
1173
1174
def is_valid_name(name):
1077 by Martin Pool
- avoid compiling REs at module load time
1175
    global _NAME_RE
1176
    if _NAME_RE == None:
1177
        _NAME_RE = re.compile(r'^[^/\\]+$')
1178
        
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
1179
    return bool(_NAME_RE.match(name))