/brz/remove-bazaar

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