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