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