~bzr-pqm/bzr/bzr.dev

1669.2.1 by Martin Pool
verbose commit now specifically identifies modified/renamed/reparented files
1
# Copyright (C) 2005, 2006 Canonical Ltd
1448 by Robert Collins
revert symlinks correctly
2
#
1 by mbp at sourcefrog
import from baz patch-364
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
1448 by Robert Collins
revert symlinks correctly
7
#
1 by mbp at sourcefrog
import from baz patch-364
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
1448 by Robert Collins
revert symlinks correctly
12
#
1 by mbp at sourcefrog
import from baz patch-364
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
1185.16.72 by Martin Pool
[merge] from robert and fix up tests
17
# FIXME: This refactoring of the workingtree code doesn't seem to keep 
18
# the WorkingTree's copy of the inventory in sync with the branch.  The
19
# branch modifies its working inventory when it does a commit to make
20
# missing files permanently removed.
1 by mbp at sourcefrog
import from baz patch-364
21
1197 by Martin Pool
doc
22
# TODO: Maybe also keep the full path of the entry, and the children?
23
# But those depend on its position within a particular inventory, and
24
# it would be nice not to need to hold the backpointer here.
25
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
26
# This should really be an id randomly assigned when the tree is
27
# created, but it's not for now.
28
ROOT_ID = "TREE_ROOT"
29
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
30
import os
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
31
import re
32
import sys
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
33
34
from bzrlib.lazy_import import lazy_import
35
lazy_import(globals(), """
36
import collections
1399.1.6 by Robert Collins
move exporting functionality into inventory.py - uncovers bug in symlink support
37
import tarfile
1 by mbp at sourcefrog
import from baz patch-364
38
800 by Martin Pool
Merge John's import-speedup branch:
39
import bzrlib
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
40
from bzrlib import (
41
    errors,
42
    osutils,
43
    symbol_versioning,
44
    )
45
""")
46
47
from bzrlib.errors import (
48
    BzrCheckError,
49
    BzrError,
50
    )
70 by mbp at sourcefrog
Prepare for smart recursive add.
51
from bzrlib.trace import mutter
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
52
1 by mbp at sourcefrog
import from baz patch-364
53
802 by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions
54
class InventoryEntry(object):
1 by mbp at sourcefrog
import from baz patch-364
55
    """Description of a versioned file.
56
57
    An InventoryEntry has the following fields, which are also
58
    present in the XML inventory-entry element:
59
1197 by Martin Pool
doc
60
    file_id
61
62
    name
63
        (within the parent directory)
64
65
    parent_id
66
        file_id of the parent directory, or ROOT_ID
67
1092.2.21 by Robert Collins
convert name_version to revision in inventory entries
68
    revision
1398 by Robert Collins
integrate in Gustavos x-bit patch
69
        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
70
        introduced.
1197 by Martin Pool
doc
71
1398 by Robert Collins
integrate in Gustavos x-bit patch
72
    executable
73
        Indicates that this file should be executable on systems
74
        that support it.
75
1197 by Martin Pool
doc
76
    text_sha1
77
        sha-1 of the text of the file
78
        
79
    text_size
80
        size in bytes of the text of the file
81
        
82
    (reading a version 4 tree created a text_id field.)
1 by mbp at sourcefrog
import from baz patch-364
83
84
    >>> i = Inventory()
85
    >>> i.path2id('')
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
86
    'TREE_ROOT'
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
87
    >>> i.add(InventoryDirectory('123', 'src', ROOT_ID))
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
88
    InventoryDirectory('123', 'src', parent_id='TREE_ROOT', revision=None)
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
89
    >>> i.add(InventoryFile('2323', 'hello.c', parent_id='123'))
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
90
    InventoryFile('2323', 'hello.c', parent_id='123', sha1=None, len=None)
1996.3.13 by John Arbash Meinel
Fix the inventory doc tests
91
    >>> shouldbe = {0: '', 1: 'src', 2: 'src/hello.c'}
1185.16.151 by Martin Pool
[patch] win32 fix for InventoryEntry doctest (Alexander, patch 21)
92
    >>> for ix, j in enumerate(i.iter_entries()):
93
    ...   print (j[0] == shouldbe[ix], j[1])
1 by mbp at sourcefrog
import from baz patch-364
94
    ... 
1731.1.28 by Aaron Bentley
Merge from bzr.dev
95
    (True, InventoryDirectory('TREE_ROOT', '', parent_id=None, revision=None))
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
96
    (True, InventoryDirectory('123', 'src', parent_id='TREE_ROOT', revision=None))
97
    (True, InventoryFile('2323', 'hello.c', parent_id='123', sha1=None, len=None))
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
98
    >>> i.add(InventoryFile('2323', 'bye.c', '123'))
1 by mbp at sourcefrog
import from baz patch-364
99
    Traceback (most recent call last):
100
    ...
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
101
    BzrError: inventory already contains entry with id {2323}
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
102
    >>> i.add(InventoryFile('2324', 'bye.c', '123'))
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
103
    InventoryFile('2324', 'bye.c', parent_id='123', sha1=None, len=None)
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
104
    >>> i.add(InventoryDirectory('2325', 'wibble', '123'))
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
105
    InventoryDirectory('2325', 'wibble', parent_id='123', revision=None)
1 by mbp at sourcefrog
import from baz patch-364
106
    >>> i.path2id('src/wibble')
107
    '2325'
108
    >>> '2325' in i
109
    True
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
110
    >>> i.add(InventoryFile('2326', 'wibble.c', '2325'))
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
111
    InventoryFile('2326', 'wibble.c', parent_id='2325', sha1=None, len=None)
1 by mbp at sourcefrog
import from baz patch-364
112
    >>> i['2326']
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
113
    InventoryFile('2326', 'wibble.c', parent_id='2325', sha1=None, len=None)
1185.1.40 by Robert Collins
Merge what applied of Alexander Belchenko's win32 patch.
114
    >>> 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 \
115
    ...     print path
1185.1.40 by Robert Collins
Merge what applied of Alexander Belchenko's win32 patch.
116
    ...     assert i.path2id(path)
1 by mbp at sourcefrog
import from baz patch-364
117
    ... 
1852.6.6 by Robert Collins
Finish updating iter_entries change to make all tests pass.
118
    <BLANKLINE>
1 by mbp at sourcefrog
import from baz patch-364
119
    src
120
    src/bye.c
121
    src/hello.c
122
    src/wibble
123
    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 \
124
    >>> i.id2path('2326')
1 by mbp at sourcefrog
import from baz patch-364
125
    'src/wibble/wibble.c'
126
    """
1668.1.5 by Martin Pool
[broken] fix up display of files changed by a commit
127
128
    # Constants returned by describe_change()
129
    #
130
    # TODO: These should probably move to some kind of FileChangeDescription 
131
    # class; that's like what's inside a TreeDelta but we want to be able to 
132
    # generate them just for one file at a time.
133
    RENAMED = 'renamed'
134
    MODIFIED_AND_RENAMED = 'modified and renamed'
1197 by Martin Pool
doc
135
    
1757.2.10 by Robert Collins
Give all inventory entries __slots__ that are useful with the current codebase.
136
    __slots__ = []
1092.2.23 by Robert Collins
move inventory entry centric snapshot taking logic to inventory.py
137
1399.1.3 by Robert Collins
move change detection for text and metadata from delta to entry.detect_changes
138
    def detect_changes(self, old_entry):
139
        """Return a (text_modified, meta_modified) from this to old_entry.
140
        
141
        _read_tree_state must have been called on self and old_entry prior to 
142
        calling detect_changes.
143
        """
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
144
        return False, False
1399.1.3 by Robert Collins
move change detection for text and metadata from delta to entry.detect_changes
145
1399.1.4 by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py
146
    def diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree,
147
             output_to, reverse=False):
148
        """Perform a diff from this to to_entry.
149
150
        text_diff will be used for textual difference calculation.
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
151
        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
152
        """
1185.12.33 by Aaron Bentley
Fixed symlink reverting
153
        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
154
        if to_entry:
155
            # cannot diff from one kind to another - you must do a removal
156
            # and an addif they do not match.
157
            assert self.kind == to_entry.kind
1185.12.33 by Aaron Bentley
Fixed symlink reverting
158
            to_entry._read_tree_state(to_tree.id2path(to_entry.file_id),
159
                                      to_tree)
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
160
        self._diff(text_diff, from_label, tree, to_label, to_entry, to_tree,
161
                   output_to, reverse)
162
163
    def _diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree,
164
             output_to, reverse=False):
165
        """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
166
1596.2.20 by Robert Collins
optimise commit to only access weaves for merged, or altered files during commit.
167
    def find_previous_heads(self, previous_inventories,
168
                            versioned_file_store,
169
                            transaction,
170
                            entry_vf=None):
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
171
        """Return the revisions and entries that directly precede this.
1409 by Robert Collins
unify previous inventory entry parent logic in preparation for fixing the revision-thrashing bug
172
173
        Returned as a map from revision to inventory entry.
174
175
        This is a map containing the file revisions in all parents
176
        for which the file exists, and its revision is not a parent of
177
        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.
178
179
        :param versioned_file_store: A store where ancestry data on this
180
                                     file id can be queried.
181
        :param transaction: The transaction that queries to the versioned 
182
                            file store should be completed under.
183
        :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
184
        """
1411 by Robert Collins
use weave ancestry to determine inventory entry previous heads, prevent propogating 'I did a merge' merges.
185
        def get_ancestors(weave, entry):
1563.2.18 by Robert Collins
get knit repositories really using knits for text storage.
186
            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.
187
        # revision:ie mapping for each ie found in previous_inventories.
188
        candidates = {}
189
        # 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
190
        heads = {}
1596.2.20 by Robert Collins
optimise commit to only access weaves for merged, or altered files during commit.
191
        # 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.
192
        head_ancestors = {}
1596.2.20 by Robert Collins
optimise commit to only access weaves for merged, or altered files during commit.
193
        # identify candidate head revision ids.
1409 by Robert Collins
unify previous inventory entry parent logic in preparation for fixing the revision-thrashing bug
194
        for inv in previous_inventories:
195
            if self.file_id in inv:
196
                ie = inv[self.file_id]
197
                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.
198
                if ie.revision in candidates:
199
                    # same revision value in two different inventories:
200
                    # correct possible inconsistencies:
201
                    #     * there was a bug in revision updates with 'x' bit 
202
                    #       support.
1185.1.51 by Robert Collins
merge in reweave support
203
                    try:
1596.2.20 by Robert Collins
optimise commit to only access weaves for merged, or altered files during commit.
204
                        if candidates[ie.revision].executable != ie.executable:
205
                            candidates[ie.revision].executable = False
1185.1.51 by Robert Collins
merge in reweave support
206
                            ie.executable = False
207
                    except AttributeError:
208
                        pass
1596.2.20 by Robert Collins
optimise commit to only access weaves for merged, or altered files during commit.
209
                    # must now be the same.
210
                    assert candidates[ie.revision] == ie
1409 by Robert Collins
unify previous inventory entry parent logic in preparation for fixing the revision-thrashing bug
211
                else:
1596.2.20 by Robert Collins
optimise commit to only access weaves for merged, or altered files during commit.
212
                    # add this revision as a candidate.
213
                    candidates[ie.revision] = ie
214
215
        # common case optimisation
216
        if len(candidates) == 1:
217
            # if there is only one candidate revision found
218
            # then we can opening the versioned file to access ancestry:
219
            # there cannot be any ancestors to eliminate when there is 
220
            # only one revision available.
221
            heads[ie.revision] = ie
222
            return heads
223
224
        # eliminate ancestors amongst the available candidates:
225
        # heads are those that are not an ancestor of any other candidate
226
        # - this provides convergence at a per-file level.
227
        for ie in candidates.values():
228
            # may be an ancestor of a known head:
229
            already_present = 0 != len(
230
                [head for head in heads 
231
                 if ie.revision in head_ancestors[head]])
232
            if already_present:
233
                # an ancestor of an analyzed candidate.
234
                continue
235
            # not an ancestor of a known head:
236
            # load the versioned file for this file id if needed
237
            if entry_vf is None:
238
                entry_vf = versioned_file_store.get_weave_or_empty(
239
                    self.file_id, transaction)
240
            ancestors = get_ancestors(entry_vf, ie)
241
            # may knock something else out:
242
            check_heads = list(heads.keys())
243
            for head in check_heads:
244
                if head in ancestors:
245
                    # this previously discovered 'head' is not
246
                    # really a head - its an ancestor of the newly 
247
                    # found head,
248
                    heads.pop(head)
249
            head_ancestors[ie.revision] = ancestors
250
            heads[ie.revision] = ie
1409 by Robert Collins
unify previous inventory entry parent logic in preparation for fixing the revision-thrashing bug
251
        return heads
252
1399.1.6 by Robert Collins
move exporting functionality into inventory.py - uncovers bug in symlink support
253
    def get_tar_item(self, root, dp, now, tree):
1399.1.7 by Robert Collins
implement symlink exporting to tarballs
254
        """Get a tarfile item and a file stream for its content."""
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
255
        item = tarfile.TarInfo(osutils.pathjoin(root, dp))
1399.1.6 by Robert Collins
move exporting functionality into inventory.py - uncovers bug in symlink support
256
        # TODO: would be cool to actually set it to the timestamp of the
257
        # revision it was last changed
258
        item.mtime = now
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
259
        fileobj = self._put_in_tar(item, tree)
1399.1.6 by Robert Collins
move exporting functionality into inventory.py - uncovers bug in symlink support
260
        return item, fileobj
261
1399.1.5 by Robert Collins
move checking whether an entry stores text into inventory.py from fetch,py
262
    def has_text(self):
263
        """Return true if the object this entry represents has textual data.
264
265
        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
266
267
        Also note that all entries get weave files created for them.
268
        This attribute is primarily used when upgrading from old trees that
269
        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
270
        """
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
271
        return False
1399.1.5 by Robert Collins
move checking whether an entry stores text into inventory.py from fetch,py
272
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
273
    def __init__(self, file_id, name, parent_id, text_id=None):
1 by mbp at sourcefrog
import from baz patch-364
274
        """Create an InventoryEntry
275
        
276
        The filename must be a single component, relative to the
277
        parent directory; it cannot be a whole path or relative name.
278
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
279
        >>> e = InventoryFile('123', 'hello.c', ROOT_ID)
1 by mbp at sourcefrog
import from baz patch-364
280
        >>> e.name
281
        'hello.c'
282
        >>> e.file_id
283
        '123'
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
284
        >>> e = InventoryFile('123', 'src/hello.c', ROOT_ID)
1 by mbp at sourcefrog
import from baz patch-364
285
        Traceback (most recent call last):
1185.16.63 by Martin Pool
- more error conversion
286
        InvalidEntryName: Invalid entry name: src/hello.c
1 by mbp at sourcefrog
import from baz patch-364
287
        """
1183 by Martin Pool
- implement version 5 xml storage, and tests
288
        assert isinstance(name, basestring), name
376 by Martin Pool
- fix slow invariant check when reading in InventoryEntry objects
289
        if '/' in name or '\\' in name:
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
290
            raise errors.InvalidEntryName(name=name)
1398 by Robert Collins
integrate in Gustavos x-bit patch
291
        self.executable = False
1092.2.21 by Robert Collins
convert name_version to revision in inventory entries
292
        self.revision = None
955 by Martin Pool
- use __slots__ on InventoryEntry; rather faster
293
        self.text_sha1 = None
294
        self.text_size = None
1 by mbp at sourcefrog
import from baz patch-364
295
        self.file_id = file_id
296
        self.name = name
297
        self.text_id = text_id
298
        self.parent_id = parent_id
1092.2.6 by Robert Collins
symlink support updated to work
299
        self.symlink_target = None
237 by mbp at sourcefrog
- Better assertions in InventoryEntry constructor
300
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
301
    def kind_character(self):
302
        """Return a short kind indicator useful for appending to names."""
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
303
        raise BzrError('unknown kind %r' % self.kind)
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
304
1731.1.2 by Aaron Bentley
Removed all remaining uses of root_directory
305
    known_kinds = ('file', 'directory', 'symlink')
1 by mbp at sourcefrog
import from baz patch-364
306
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
307
    def _put_in_tar(self, item, tree):
308
        """populate item for stashing in a tar, and return the content stream.
309
310
        If no content is available, return None.
311
        """
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
312
        raise BzrError("don't know how to export {%s} of kind %r" %
313
                       (self.file_id, self.kind))
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
314
1399.1.6 by Robert Collins
move exporting functionality into inventory.py - uncovers bug in symlink support
315
    def put_on_disk(self, dest, dp, tree):
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
316
        """Create a representation of self on disk in the prefix dest.
317
        
318
        This is a template method - implement _put_on_disk in subclasses.
319
        """
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
320
        fullpath = osutils.pathjoin(dest, dp)
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
321
        self._put_on_disk(fullpath, tree)
1711.2.101 by John Arbash Meinel
Clean up some unnecessary mutter() calls
322
        # mutter("  export {%s} kind %s to %s", self.file_id,
323
        #         self.kind, fullpath)
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
324
325
    def _put_on_disk(self, fullpath, tree):
326
        """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
327
        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
328
156 by mbp at sourcefrog
new "directories" command
329
    def sorted_children(self):
1757.2.13 by Robert Collins
Tweak InventoryEntry.sorted_children to be simpler.
330
        return sorted(self.children.items())
156 by mbp at sourcefrog
new "directories" command
331
1399.1.1 by Robert Collins
move checks for versionability of file kinds into InventoryEntry
332
    @staticmethod
333
    def versionable_kind(kind):
1711.9.11 by John Arbash Meinel
change return foo in bar to return (foo in bar)
334
        return (kind in ('file', 'directory', 'symlink'))
1399.1.1 by Robert Collins
move checks for versionability of file kinds into InventoryEntry
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
        """
1757.2.11 by Robert Collins
Correct bzr diff | less= None clauses in inventory.py to be is not None.
350
        if self.parent_id is not None:
1092.2.20 by Robert Collins
symlink and weaves, whaddya know
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):
1733.1.4 by Robert Collins
Cosmetic niceties for debugging, extra comments etc.
406
        return ("%s(%r, %r, parent_id=%r, revision=%r)"
1 by mbp at sourcefrog
import from baz patch-364
407
                % (self.__class__.__name__,
408
                   self.file_id,
409
                   self.name,
1733.1.4 by Robert Collins
Cosmetic niceties for debugging, extra comments etc.
410
                   self.parent_id,
411
                   self.revision))
1 by mbp at sourcefrog
import from baz patch-364
412
1411 by Robert Collins
use weave ancestry to determine inventory entry previous heads, prevent propogating 'I did a merge' merges.
413
    def snapshot(self, revision, path, previous_entries,
1740.3.3 by Jelmer Vernooij
Move storing directories and links to commit builder.
414
                 work_tree, commit_builder):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
415
        """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
416
        
417
        This means that all its fields are populated, that it has its
418
        text stored in the text store or weave.
419
        """
1711.2.101 by John Arbash Meinel
Clean up some unnecessary mutter() calls
420
        # mutter('new parents of %s are %r', path, previous_entries)
1185.12.33 by Aaron Bentley
Fixed symlink reverting
421
        self._read_tree_state(path, work_tree)
1740.3.2 by Jelmer Vernooij
Move storing file texts to commit builder.
422
        # TODO: Where should we determine whether to reuse a
423
        # 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
424
        if len(previous_entries) == 1:
425
            # cannot be unchanged unless there is only one parent file rev.
426
            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
427
            if self._unchanged(parent_ie):
1711.2.101 by John Arbash Meinel
Clean up some unnecessary mutter() calls
428
                # mutter("found unchanged entry")
1092.2.23 by Robert Collins
move inventory entry centric snapshot taking logic to inventory.py
429
                self.revision = parent_ie.revision
430
                return "unchanged"
1669.2.1 by Martin Pool
verbose commit now specifically identifies modified/renamed/reparented files
431
        return self._snapshot_into_revision(revision, previous_entries, 
1740.3.3 by Jelmer Vernooij
Move storing directories and links to commit builder.
432
                                            work_tree, commit_builder)
1669.2.1 by Martin Pool
verbose commit now specifically identifies modified/renamed/reparented files
433
434
    def _snapshot_into_revision(self, revision, previous_entries, work_tree,
1740.3.3 by Jelmer Vernooij
Move storing directories and links to commit builder.
435
                                commit_builder):
1669.2.1 by Martin Pool
verbose commit now specifically identifies modified/renamed/reparented files
436
        """Record this revision unconditionally into a store.
437
438
        The entry's last-changed revision property (`revision`) is updated to 
439
        that of the new revision.
440
        
441
        :param revision: id of the new revision that is being recorded.
442
443
        :returns: String description of the commit (e.g. "merged", "modified"), etc.
444
        """
1711.2.101 by John Arbash Meinel
Clean up some unnecessary mutter() calls
445
        # 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
446
        self.revision = revision
1740.3.3 by Jelmer Vernooij
Move storing directories and links to commit builder.
447
        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
448
1740.3.3 by Jelmer Vernooij
Move storing directories and links to commit builder.
449
    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
450
        """Record the 'text' of this entry, whatever form that takes.
451
        
452
        This default implementation simply adds an empty text.
453
        """
1740.3.3 by Jelmer Vernooij
Move storing directories and links to commit builder.
454
        raise NotImplementedError(self._snapshot_text)
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
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
481
        This method should be overridden in child classes.
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
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
1907.1.4 by Aaron Bentley
Restore RootEntry, but mark it deprecated, restore EmptyTree.kind
507
class RootEntry(InventoryEntry):
508
509
    __slots__ = ['text_sha1', 'text_size', 'file_id', 'name', 'kind',
510
                 'text_id', 'parent_id', 'children', 'executable', 
511
                 'revision', 'symlink_target']
512
513
    def _check(self, checker, rev_id, tree):
514
        """See InventoryEntry._check"""
515
516
    def __init__(self, file_id):
517
        self.file_id = file_id
518
        self.children = {}
519
        self.kind = 'directory'
520
        self.parent_id = None
521
        self.name = u''
522
        self.revision = None
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
523
        symbol_versioning.warn('RootEntry is deprecated as of bzr 0.10.'
524
                               '  Please use InventoryDirectory instead.',
525
                               DeprecationWarning, stacklevel=2)
1907.1.4 by Aaron Bentley
Restore RootEntry, but mark it deprecated, restore EmptyTree.kind
526
527
    def __eq__(self, other):
528
        if not isinstance(other, RootEntry):
529
            return NotImplemented
530
        
531
        return (self.file_id == other.file_id) \
532
               and (self.children == other.children)
533
534
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
535
class InventoryDirectory(InventoryEntry):
536
    """A directory in an inventory."""
537
1757.2.10 by Robert Collins
Give all inventory entries __slots__ that are useful with the current codebase.
538
    __slots__ = ['text_sha1', 'text_size', 'file_id', 'name', 'kind',
539
                 'text_id', 'parent_id', 'children', 'executable', 
540
                 'revision', 'symlink_target']
541
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
542
    def _check(self, checker, rev_id, tree):
543
        """See InventoryEntry._check"""
1757.2.11 by Robert Collins
Correct bzr diff | less= None clauses in inventory.py to be is not None.
544
        if self.text_sha1 is not None or self.text_size is not None or self.text_id is not None:
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
545
            raise BzrCheckError('directory {%s} has text in revision {%s}'
546
                                % (self.file_id, rev_id))
547
548
    def copy(self):
549
        other = InventoryDirectory(self.file_id, self.name, self.parent_id)
550
        other.revision = self.revision
551
        # note that children are *not* copied; they're pulled across when
552
        # others are added
553
        return other
554
555
    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
556
        super(InventoryDirectory, self).__init__(file_id, name, parent_id)
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
557
        self.children = {}
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
558
        self.kind = 'directory'
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
559
560
    def kind_character(self):
561
        """See InventoryEntry.kind_character."""
562
        return '/'
563
564
    def _put_in_tar(self, item, tree):
565
        """See InventoryEntry._put_in_tar."""
566
        item.type = tarfile.DIRTYPE
567
        fileobj = None
568
        item.name += '/'
569
        item.size = 0
570
        item.mode = 0755
571
        return fileobj
572
573
    def _put_on_disk(self, fullpath, tree):
574
        """See InventoryEntry._put_on_disk."""
575
        os.mkdir(fullpath)
576
1740.3.3 by Jelmer Vernooij
Move storing directories and links to commit builder.
577
    def _snapshot_text(self, file_parents, work_tree, commit_builder):
578
        """See InventoryEntry._snapshot_text."""
579
        commit_builder.modified_directory(self.file_id, file_parents)
580
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
581
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
582
class InventoryFile(InventoryEntry):
583
    """A file in an inventory."""
584
1757.2.10 by Robert Collins
Give all inventory entries __slots__ that are useful with the current codebase.
585
    __slots__ = ['text_sha1', 'text_size', 'file_id', 'name', 'kind',
586
                 'text_id', 'parent_id', 'children', 'executable', 
587
                 'revision', 'symlink_target']
588
1616.1.5 by Martin Pool
Cleanup and document some check code
589
    def _check(self, checker, tree_revision_id, tree):
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
590
        """See InventoryEntry._check"""
1616.1.5 by Martin Pool
Cleanup and document some check code
591
        t = (self.file_id, self.revision)
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
592
        if t in checker.checked_texts:
1616.1.5 by Martin Pool
Cleanup and document some check code
593
            prev_sha = checker.checked_texts[t]
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
594
            if prev_sha != self.text_sha1:
595
                raise BzrCheckError('mismatched sha1 on {%s} in {%s}' %
1616.1.5 by Martin Pool
Cleanup and document some check code
596
                                    (self.file_id, tree_revision_id))
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
597
            else:
598
                checker.repeated_text_cnt += 1
599
                return
1185.50.28 by John Arbash Meinel
Lots of updates for 'bzr check'
600
601
        if self.file_id not in checker.checked_weaves:
602
            mutter('check weave {%s}', self.file_id)
603
            w = tree.get_weave(self.file_id)
604
            # Not passing a progress bar, because it creates a new
605
            # progress, which overwrites the current progress,
606
            # and doesn't look nice
607
            w.check()
608
            checker.checked_weaves[self.file_id] = True
609
        else:
1563.2.14 by Robert Collins
Prepare weave store to delegate copy details to the versioned file.
610
            w = tree.get_weave(self.file_id)
1185.50.28 by John Arbash Meinel
Lots of updates for 'bzr check'
611
1616.1.5 by Martin Pool
Cleanup and document some check code
612
        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'.
613
        checker.checked_text_cnt += 1
1185.50.28 by John Arbash Meinel
Lots of updates for 'bzr check'
614
        # We can't check the length, because Weave doesn't store that
615
        # information, and the whole point of looking at the weave's
616
        # sha1sum is that we don't have to extract the text.
617
        if self.text_sha1 != w.get_sha1(self.revision):
618
            raise BzrCheckError('text {%s} version {%s} wrong sha1' 
619
                                % (self.file_id, self.revision))
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
620
        checker.checked_texts[t] = self.text_sha1
621
622
    def copy(self):
623
        other = InventoryFile(self.file_id, self.name, self.parent_id)
624
        other.executable = self.executable
625
        other.text_id = self.text_id
626
        other.text_sha1 = self.text_sha1
627
        other.text_size = self.text_size
628
        other.revision = self.revision
629
        return other
630
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
631
    def detect_changes(self, old_entry):
632
        """See InventoryEntry.detect_changes."""
1757.2.11 by Robert Collins
Correct bzr diff | less= None clauses in inventory.py to be is not None.
633
        assert self.text_sha1 is not None
634
        assert old_entry.text_sha1 is not None
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
635
        text_modified = (self.text_sha1 != old_entry.text_sha1)
636
        meta_modified = (self.executable != old_entry.executable)
637
        return text_modified, meta_modified
638
639
    def _diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree,
640
             output_to, reverse=False):
641
        """See InventoryEntry._diff."""
1558.15.2 by Aaron Bentley
Implemented binary file handling for diff
642
        try:
643
            from_text = tree.get_file(self.file_id).readlines()
644
            if to_entry:
645
                to_text = to_tree.get_file(to_entry.file_id).readlines()
646
            else:
647
                to_text = []
648
            if not reverse:
649
                text_diff(from_label, from_text,
650
                          to_label, to_text, output_to)
651
            else:
652
                text_diff(to_label, to_text,
653
                          from_label, from_text, output_to)
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
654
        except errors.BinaryFile:
1558.15.11 by Aaron Bentley
Apply merge review suggestions
655
            if reverse:
656
                label_pair = (to_label, from_label)
657
            else:
658
                label_pair = (from_label, to_label)
659
            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
660
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
661
    def has_text(self):
662
        """See InventoryEntry.has_text."""
663
        return True
664
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
665
    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
666
        super(InventoryFile, self).__init__(file_id, name, parent_id)
667
        self.kind = 'file'
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
668
669
    def kind_character(self):
670
        """See InventoryEntry.kind_character."""
671
        return ''
672
673
    def _put_in_tar(self, item, tree):
674
        """See InventoryEntry._put_in_tar."""
675
        item.type = tarfile.REGTYPE
676
        fileobj = tree.get_file(self.file_id)
677
        item.size = self.text_size
678
        if tree.is_executable(self.file_id):
679
            item.mode = 0755
680
        else:
681
            item.mode = 0644
682
        return fileobj
683
684
    def _put_on_disk(self, fullpath, tree):
685
        """See InventoryEntry._put_on_disk."""
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
686
        osutils.pumpfile(tree.get_file(self.file_id), file(fullpath, 'wb'))
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
687
        if tree.is_executable(self.file_id):
688
            os.chmod(fullpath, 0755)
689
1185.12.33 by Aaron Bentley
Fixed symlink reverting
690
    def _read_tree_state(self, path, work_tree):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
691
        """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
692
        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.
693
        # FIXME: 20050930 probe for the text size when getting sha1
694
        # in _read_tree_state
1732.1.19 by John Arbash Meinel
If you have the path, use it rather than looking it up again
695
        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
696
1733.1.4 by Robert Collins
Cosmetic niceties for debugging, extra comments etc.
697
    def __repr__(self):
698
        return ("%s(%r, %r, parent_id=%r, sha1=%r, len=%s)"
699
                % (self.__class__.__name__,
700
                   self.file_id,
701
                   self.name,
702
                   self.parent_id,
703
                   self.text_sha1,
704
                   self.text_size))
705
1534.7.175 by Aaron Bentley
Ensured revert writes a normal inventory
706
    def _forget_tree_state(self):
707
        self.text_sha1 = None
708
1740.3.3 by Jelmer Vernooij
Move storing directories and links to commit builder.
709
    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
710
        """See InventoryEntry._snapshot_text."""
1740.3.2 by Jelmer Vernooij
Move storing file texts to commit builder.
711
        def get_content_byte_lines():
712
            return work_tree.get_file(self.file_id).readlines()
1740.3.3 by Jelmer Vernooij
Move storing directories and links to commit builder.
713
        self.text_sha1, self.text_size = commit_builder.modified_file_text(
1740.3.2 by Jelmer Vernooij
Move storing file texts to commit builder.
714
            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
715
716
    def _unchanged(self, previous_ie):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
717
        """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
718
        compatible = super(InventoryFile, self)._unchanged(previous_ie)
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
719
        if self.text_sha1 != previous_ie.text_sha1:
720
            compatible = False
721
        else:
722
            # FIXME: 20050930 probe for the text size when getting sha1
723
            # in _read_tree_state
724
            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
725
        if self.executable != previous_ie.executable:
726
            compatible = False
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
727
        return compatible
728
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
729
730
class InventoryLink(InventoryEntry):
731
    """A file in an inventory."""
732
1757.2.10 by Robert Collins
Give all inventory entries __slots__ that are useful with the current codebase.
733
    __slots__ = ['text_sha1', 'text_size', 'file_id', 'name', 'kind',
734
                 'text_id', 'parent_id', 'children', 'executable', 
735
                 'revision', 'symlink_target']
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
736
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
737
    def _check(self, checker, rev_id, tree):
738
        """See InventoryEntry._check"""
1757.2.11 by Robert Collins
Correct bzr diff | less= None clauses in inventory.py to be is not None.
739
        if self.text_sha1 is not None or self.text_size is not None or self.text_id is not None:
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
740
            raise BzrCheckError('symlink {%s} has text in revision {%s}'
741
                    % (self.file_id, rev_id))
1753.1.4 by Robert Collins
Fixup '== None' usage in inventory.py.
742
        if self.symlink_target is None:
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
743
            raise BzrCheckError('symlink {%s} has no target in revision {%s}'
744
                    % (self.file_id, rev_id))
745
746
    def copy(self):
747
        other = InventoryLink(self.file_id, self.name, self.parent_id)
748
        other.symlink_target = self.symlink_target
749
        other.revision = self.revision
750
        return other
751
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
752
    def detect_changes(self, old_entry):
753
        """See InventoryEntry.detect_changes."""
754
        # FIXME: which _modified field should we use ? RBC 20051003
755
        text_modified = (self.symlink_target != old_entry.symlink_target)
756
        if text_modified:
757
            mutter("    symlink target changed")
758
        meta_modified = False
759
        return text_modified, meta_modified
760
761
    def _diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree,
762
             output_to, reverse=False):
763
        """See InventoryEntry._diff."""
764
        from_text = self.symlink_target
765
        if to_entry is not None:
766
            to_text = to_entry.symlink_target
767
            if reverse:
768
                temp = from_text
769
                from_text = to_text
770
                to_text = temp
771
            print >>output_to, '=== target changed %r => %r' % (from_text, to_text)
772
        else:
773
            if not reverse:
774
                print >>output_to, '=== target was %r' % self.symlink_target
775
            else:
776
                print >>output_to, '=== target is %r' % self.symlink_target
777
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
778
    def __init__(self, file_id, name, parent_id):
779
        super(InventoryLink, self).__init__(file_id, name, parent_id)
780
        self.kind = 'symlink'
781
782
    def kind_character(self):
783
        """See InventoryEntry.kind_character."""
784
        return ''
785
786
    def _put_in_tar(self, item, tree):
787
        """See InventoryEntry._put_in_tar."""
1185.33.3 by Martin Pool
[merge] jelmer
788
        item.type = tarfile.SYMTYPE
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
789
        fileobj = None
790
        item.size = 0
791
        item.mode = 0755
792
        item.linkname = self.symlink_target
793
        return fileobj
794
795
    def _put_on_disk(self, fullpath, tree):
796
        """See InventoryEntry._put_on_disk."""
797
        try:
798
            os.symlink(self.symlink_target, fullpath)
799
        except OSError,e:
800
            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
801
1185.12.33 by Aaron Bentley
Fixed symlink reverting
802
    def _read_tree_state(self, path, work_tree):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
803
        """See InventoryEntry._read_tree_state."""
804
        self.symlink_target = work_tree.get_symlink_target(self.file_id)
805
1534.7.175 by Aaron Bentley
Ensured revert writes a normal inventory
806
    def _forget_tree_state(self):
807
        self.symlink_target = None
808
1405 by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave
809
    def _unchanged(self, previous_ie):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
810
        """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
811
        compatible = super(InventoryLink, self)._unchanged(previous_ie)
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
812
        if self.symlink_target != previous_ie.symlink_target:
813
            compatible = False
814
        return compatible
815
1740.3.3 by Jelmer Vernooij
Move storing directories and links to commit builder.
816
    def _snapshot_text(self, file_parents, work_tree, commit_builder):
817
        """See InventoryEntry._snapshot_text."""
818
        commit_builder.modified_link(
819
            self.file_id, file_parents, self.symlink_target)
820
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
821
802 by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions
822
class Inventory(object):
1 by mbp at sourcefrog
import from baz patch-364
823
    """Inventory of versioned files in a tree.
824
240 by mbp at sourcefrog
doc
825
    This describes which file_id is present at each point in the tree,
826
    and possibly the SHA-1 or other information about the file.
827
    Entries can be looked up either by path or by file_id.
1 by mbp at sourcefrog
import from baz patch-364
828
829
    The inventory represents a typical unix file tree, with
830
    directories containing files and subdirectories.  We never store
831
    the full path to a file, because renaming a directory implicitly
832
    moves all of its contents.  This class internally maintains a
833
    lookup tree that allows the children under a directory to be
834
    returned quickly.
835
836
    InventoryEntry objects must not be modified after they are
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
837
    inserted, other than through the Inventory API.
1 by mbp at sourcefrog
import from baz patch-364
838
839
    >>> inv = Inventory()
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
840
    >>> inv.add(InventoryFile('123-123', 'hello.c', ROOT_ID))
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
841
    InventoryFile('123-123', 'hello.c', parent_id='TREE_ROOT', sha1=None, len=None)
1 by mbp at sourcefrog
import from baz patch-364
842
    >>> inv['123-123'].name
843
    'hello.c'
844
845
    May be treated as an iterator or set to look up file ids:
846
    
847
    >>> bool(inv.path2id('hello.c'))
848
    True
849
    >>> '123-123' in inv
850
    True
851
852
    May also look up by name:
853
854
    >>> [x[0] for x in inv.iter_entries()]
1852.6.6 by Robert Collins
Finish updating iter_entries change to make all tests pass.
855
    ['', u'hello.c']
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
856
    >>> 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
857
    >>> inv.add(InventoryFile('123-123', 'hello.c', ROOT_ID))
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
858
    InventoryFile('123-123', 'hello.c', parent_id='TREE_ROOT-12345678-12345678', sha1=None, len=None)
1 by mbp at sourcefrog
import from baz patch-364
859
    """
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
860
    def __init__(self, root_id=ROOT_ID, revision_id=None):
1 by mbp at sourcefrog
import from baz patch-364
861
        """Create or read an inventory.
862
863
        If a working directory is specified, the inventory is read
864
        from there.  If the file is specified, read from that. If not,
865
        the inventory is created empty.
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
866
867
        The inventory is created with a default root directory, with
868
        an id of None.
1 by mbp at sourcefrog
import from baz patch-364
869
        """
1907.1.2 by Aaron Bentley
More removal of unique-root stuff
870
        # We are letting Branch.create() create a unique inventory
871
        # root id. Rather than generating a random one here.
872
        #if root_id is None:
873
        #    root_id = bzrlib.branch.gen_file_id('TREE_ROOT')
1910.2.3 by Aaron Bentley
All tests pass
874
        if root_id is not None:
875
            self._set_root(InventoryDirectory(root_id, '', None))
876
        else:
877
            self.root = None
878
            self._byid = {}
1907.1.2 by Aaron Bentley
More removal of unique-root stuff
879
        # FIXME: this isn't ever used, changing it to self.revision may break
880
        # things. TODO make everything use self.revision_id
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
881
        self.revision_id = revision_id
1910.2.3 by Aaron Bentley
All tests pass
882
883
    def _set_root(self, ie):
884
        self.root = ie
1907.1.2 by Aaron Bentley
More removal of unique-root stuff
885
        self._byid = {self.root.file_id: self.root}
1 by mbp at sourcefrog
import from baz patch-364
886
1189 by Martin Pool
- BROKEN: partial support for commit into weave
887
    def copy(self):
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
888
        # TODO: jam 20051218 Should copy also copy the revision_id?
1852.6.3 by Robert Collins
Make iter(Tree) consistent for all tree types.
889
        entries = self.iter_entries()
890
        other = Inventory(entries.next()[1].file_id)
1206 by Martin Pool
- fix bug in Inventory.copy()
891
        # copy recursively so we know directories will be added before
892
        # their children.  There are more efficient ways than this...
1852.6.3 by Robert Collins
Make iter(Tree) consistent for all tree types.
893
        for path, entry in entries():
1189 by Martin Pool
- BROKEN: partial support for commit into weave
894
            other.add(entry.copy())
895
        return other
896
1 by mbp at sourcefrog
import from baz patch-364
897
    def __iter__(self):
898
        return iter(self._byid)
899
900
    def __len__(self):
901
        """Returns number of entries."""
902
        return len(self._byid)
903
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
904
    def iter_entries(self, from_dir=None):
1 by mbp at sourcefrog
import from baz patch-364
905
        """Return (path, entry) pairs, in order by name."""
1753.1.4 by Robert Collins
Fixup '== None' usage in inventory.py.
906
        if from_dir is None:
1907.1.1 by Aaron Bentley
Unshelved all changes except those related to removing RootEntry
907
            assert self.root
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
908
            from_dir = self.root
1852.6.3 by Robert Collins
Make iter(Tree) consistent for all tree types.
909
            yield '', self.root
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
910
        elif isinstance(from_dir, basestring):
911
            from_dir = self._byid[from_dir]
912
            
1732.1.24 by John Arbash Meinel
iter_entries time drops to 1/6th time
913
        # unrolling the recursive called changed the time from
914
        # 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
915
        children = from_dir.children.items()
916
        children.sort()
917
        children = collections.deque(children)
918
        stack = [(u'', children)]
919
        while stack:
920
            from_dir_relpath, children = stack[-1]
921
922
            while children:
923
                name, ie = children.popleft()
924
925
                # we know that from_dir_relpath never ends in a slash
926
                # and 'f' doesn't begin with one, we can do a string op, rather
927
                # than the checks of pathjoin(), though this means that all paths
928
                # start with a slash
929
                path = from_dir_relpath + '/' + name
930
931
                yield path[1:], ie
932
933
                if ie.kind != 'directory':
934
                    continue
935
936
                # But do this child first
937
                new_children = ie.children.items()
938
                new_children.sort()
939
                new_children = collections.deque(new_children)
940
                stack.append((path, new_children))
941
                # Break out of inner loop, so that we start outer loop with child
942
                break
943
            else:
944
                # 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.
945
                stack.pop()
555 by Martin Pool
- New Inventory.entries() method
946
1711.2.36 by John Arbash Meinel
Add an iter_entries_by_dir which returns directory children before their children.
947
    def iter_entries_by_dir(self, from_dir=None):
948
        """Iterate over the entries in a directory first order.
949
950
        This returns all entries for a directory before returning
951
        the entries for children of a directory. This is not
952
        lexicographically sorted order, and is a hybrid between
953
        depth-first and breadth-first.
954
955
        :return: This yields (path, entry) pairs
956
        """
1755.1.1 by Robert Collins
(jam, robertc, ab)Merge new iter_entries_by_dirs routine which matches the order walkdirs provides.
957
        # TODO? Perhaps this should return the from_dir so that the root is
958
        # yielded? or maybe an option?
1753.1.4 by Robert Collins
Fixup '== None' usage in inventory.py.
959
        if from_dir is None:
1711.2.36 by John Arbash Meinel
Add an iter_entries_by_dir which returns directory children before their children.
960
            assert self.root
961
            from_dir = self.root
1852.6.6 by Robert Collins
Finish updating iter_entries change to make all tests pass.
962
            yield '', self.root
1711.2.36 by John Arbash Meinel
Add an iter_entries_by_dir which returns directory children before their children.
963
        elif isinstance(from_dir, basestring):
964
            from_dir = self._byid[from_dir]
965
            
966
        stack = [(u'', from_dir)]
967
        while stack:
968
            cur_relpath, cur_dir = stack.pop()
969
970
            child_dirs = []
971
            for child_name, child_ie in sorted(cur_dir.children.iteritems()):
972
973
                child_relpath = cur_relpath + child_name
974
975
                yield child_relpath, child_ie
976
977
                if child_ie.kind == 'directory':
978
                    child_dirs.append((child_relpath+'/', child_ie))
979
            stack.extend(reversed(child_dirs))
980
555 by Martin Pool
- New Inventory.entries() method
981
    def entries(self):
982
        """Return list of (path, ie) for all entries except the root.
983
984
        This may be faster than iter_entries.
985
        """
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
986
        accum = []
987
        def descend(dir_ie, dir_path):
556 by Martin Pool
- fix up Inventory.entries()
988
            kids = dir_ie.children.items()
555 by Martin Pool
- New Inventory.entries() method
989
            kids.sort()
990
            for name, ie in kids:
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
991
                child_path = osutils.pathjoin(dir_path, name)
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
992
                accum.append((child_path, ie))
555 by Martin Pool
- New Inventory.entries() method
993
                if ie.kind == 'directory':
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
994
                    descend(ie, child_path)
555 by Martin Pool
- New Inventory.entries() method
995
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
996
        descend(self.root, u'')
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
997
        return accum
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
998
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
999
    def directories(self):
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
1000
        """Return (path, entry) pairs for all directories, including the root.
1 by mbp at sourcefrog
import from baz patch-364
1001
        """
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
1002
        accum = []
1003
        def descend(parent_ie, parent_path):
1004
            accum.append((parent_path, parent_ie))
156 by mbp at sourcefrog
new "directories" command
1005
            
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
1006
            kids = [(ie.name, ie) for ie in parent_ie.children.itervalues() if ie.kind == 'directory']
1007
            kids.sort()
156 by mbp at sourcefrog
new "directories" command
1008
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
1009
            for name, child_ie in kids:
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
1010
                child_path = osutils.pathjoin(parent_path, name)
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
1011
                descend(child_ie, child_path)
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1012
        descend(self.root, u'')
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
1013
        return accum
1 by mbp at sourcefrog
import from baz patch-364
1014
        
1015
    def __contains__(self, file_id):
1016
        """True if this entry contains a file with given id.
1017
1018
        >>> inv = Inventory()
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
1019
        >>> inv.add(InventoryFile('123', 'foo.c', ROOT_ID))
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
1020
        InventoryFile('123', 'foo.c', parent_id='TREE_ROOT', sha1=None, len=None)
1 by mbp at sourcefrog
import from baz patch-364
1021
        >>> '123' in inv
1022
        True
1023
        >>> '456' in inv
1024
        False
1025
        """
1711.9.11 by John Arbash Meinel
change return foo in bar to return (foo in bar)
1026
        return (file_id in self._byid)
1 by mbp at sourcefrog
import from baz patch-364
1027
1028
    def __getitem__(self, file_id):
1029
        """Return the entry for given file_id.
1030
1031
        >>> inv = Inventory()
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
1032
        >>> inv.add(InventoryFile('123123', 'hello.c', ROOT_ID))
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
1033
        InventoryFile('123123', 'hello.c', parent_id='TREE_ROOT', sha1=None, len=None)
1 by mbp at sourcefrog
import from baz patch-364
1034
        >>> inv['123123'].name
1035
        'hello.c'
1036
        """
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
1037
        try:
1038
            return self._byid[file_id]
1039
        except KeyError:
1753.1.4 by Robert Collins
Fixup '== None' usage in inventory.py.
1040
            if file_id is None:
380 by Martin Pool
- Slight optimization for Inventory.__getitem__
1041
                raise BzrError("can't look up file_id None")
1042
            else:
1043
                raise BzrError("file_id {%s} not in inventory" % file_id)
1 by mbp at sourcefrog
import from baz patch-364
1044
460 by Martin Pool
- new testing command compare-trees
1045
    def get_file_kind(self, file_id):
1046
        return self._byid[file_id].kind
1047
138 by mbp at sourcefrog
remove parallel tree from inventory;
1048
    def get_child(self, parent_id, filename):
1732.1.18 by John Arbash Meinel
50ms is probably not worth it
1049
        return self[parent_id].children.get(filename)
138 by mbp at sourcefrog
remove parallel tree from inventory;
1050
1 by mbp at sourcefrog
import from baz patch-364
1051
    def add(self, entry):
1052
        """Add entry to inventory.
1053
1054
        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
1055
        which calls this.
1056
1057
        Returns the new entry object.
1058
        """
139 by mbp at sourcefrog
simplified/faster Inventory.add
1059
        if entry.file_id in self._byid:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
1060
            raise BzrError("inventory already contains entry with id {%s}" % entry.file_id)
1 by mbp at sourcefrog
import from baz patch-364
1061
1910.2.3 by Aaron Bentley
All tests pass
1062
        if entry.parent_id is None:
1063
            assert self.root is None and len(self._byid) == 0
1064
            self._set_root(entry)
1065
            return entry
1066
        if entry.parent_id == ROOT_ID:
1067
            assert self.root is not None, self
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
1068
            entry.parent_id = self.root.file_id
1069
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
1070
        try:
1071
            parent = self._byid[entry.parent_id]
1072
        except KeyError:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
1073
            raise BzrError("parent_id {%s} not in inventory" % entry.parent_id)
139 by mbp at sourcefrog
simplified/faster Inventory.add
1074
1757.2.7 by Robert Collins
Split out the recursive add and add of a single entry in add.py.
1075
        if entry.name in parent.children:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
1076
            raise BzrError("%s is already versioned" %
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
1077
                    osutils.pathjoin(self.id2path(parent.file_id), entry.name))
1 by mbp at sourcefrog
import from baz patch-364
1078
1079
        self._byid[entry.file_id] = entry
139 by mbp at sourcefrog
simplified/faster Inventory.add
1080
        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
1081
        return entry
1 by mbp at sourcefrog
import from baz patch-364
1082
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)
1083
    def add_path(self, relpath, kind, file_id=None, parent_id=None):
70 by mbp at sourcefrog
Prepare for smart recursive add.
1084
        """Add entry from a path.
1085
1180 by Martin Pool
- start splitting code for xml (de)serialization away from objects
1086
        The immediate parent must already be versioned.
1087
1088
        Returns the new entry object."""
1015 by Martin Pool
- fix circular imports
1089
        
1830.3.5 by John Arbash Meinel
make_entry refuses to create non-normalized entries.
1090
        parts = osutils.splitpath(relpath)
70 by mbp at sourcefrog
Prepare for smart recursive add.
1091
1534.7.69 by Aaron Bentley
Got real root moves working
1092
        if len(parts) == 0:
1713.1.6 by Robert Collins
Move file id random data selection out of the inner loop for 'bzr add'.
1093
            if file_id is None:
1094
                file_id = bzrlib.workingtree.gen_root_id()
1731.1.1 by Aaron Bentley
Make root entry an InventoryDirectory, make EmptyTree really empty
1095
            self.root = InventoryDirectory(file_id, '', None)
1534.7.69 by Aaron Bentley
Got real root moves working
1096
            self._byid = {self.root.file_id: self.root}
1097
            return
1098
        else:
1099
            parent_path = parts[:-1]
1100
            parent_id = self.path2id(parent_path)
1753.1.4 by Robert Collins
Fixup '== None' usage in inventory.py.
1101
            if parent_id is None:
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
1102
                raise errors.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)
1103
        ie = make_entry(kind, parts[-1], parent_id, file_id)
70 by mbp at sourcefrog
Prepare for smart recursive add.
1104
        return self.add(ie)
1105
1 by mbp at sourcefrog
import from baz patch-364
1106
    def __delitem__(self, file_id):
1107
        """Remove entry by id.
1108
1109
        >>> inv = Inventory()
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
1110
        >>> inv.add(InventoryFile('123', 'foo.c', ROOT_ID))
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
1111
        InventoryFile('123', 'foo.c', parent_id='TREE_ROOT', sha1=None, len=None)
1 by mbp at sourcefrog
import from baz patch-364
1112
        >>> '123' in inv
1113
        True
1114
        >>> del inv['123']
1115
        >>> '123' in inv
1116
        False
1117
        """
1118
        ie = self[file_id]
1119
1534.7.69 by Aaron Bentley
Got real root moves working
1120
        assert ie.parent_id is None or \
1121
            self[ie.parent_id].children[ie.name] == ie
1 by mbp at sourcefrog
import from baz patch-364
1122
        
1123
        del self._byid[file_id]
1534.7.69 by Aaron Bentley
Got real root moves working
1124
        if ie.parent_id is not None:
1125
            del self[ie.parent_id].children[ie.name]
1 by mbp at sourcefrog
import from baz patch-364
1126
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
1127
    def __eq__(self, other):
1 by mbp at sourcefrog
import from baz patch-364
1128
        """Compare two sets by comparing their contents.
1129
1130
        >>> i1 = Inventory()
1131
        >>> i2 = Inventory()
1132
        >>> i1 == i2
1133
        True
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
1134
        >>> i1.add(InventoryFile('123', 'foo', ROOT_ID))
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
1135
        InventoryFile('123', 'foo', parent_id='TREE_ROOT', sha1=None, len=None)
1 by mbp at sourcefrog
import from baz patch-364
1136
        >>> i1 == i2
1137
        False
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
1138
        >>> i2.add(InventoryFile('123', 'foo', ROOT_ID))
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
1139
        InventoryFile('123', 'foo', parent_id='TREE_ROOT', sha1=None, len=None)
1 by mbp at sourcefrog
import from baz patch-364
1140
        >>> i1 == i2
1141
        True
1142
        """
1143
        if not isinstance(other, Inventory):
1144
            return NotImplemented
1145
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
1146
        return self._byid == other._byid
1147
1148
    def __ne__(self, other):
1249 by Martin Pool
- improvements to weave commit [broken]
1149
        return not self.__eq__(other)
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
1150
1151
    def __hash__(self):
1152
        raise ValueError('not hashable')
1153
1596.2.19 by Robert Collins
Shave 20% off id2path.
1154
    def _iter_file_id_parents(self, file_id):
1155
        """Yield the parents of file_id up to the root."""
1757.2.11 by Robert Collins
Correct bzr diff | less= None clauses in inventory.py to be is not None.
1156
        while file_id is not None:
1596.2.19 by Robert Collins
Shave 20% off id2path.
1157
            try:
1158
                ie = self._byid[file_id]
1159
            except KeyError:
1160
                raise BzrError("file_id {%s} not found in inventory" % file_id)
1161
            yield ie
1162
            file_id = ie.parent_id
1 by mbp at sourcefrog
import from baz patch-364
1163
172 by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory
1164
    def get_idpath(self, file_id):
1165
        """Return a list of file_ids for the path to an entry.
1166
1167
        The list contains one element for each directory followed by
1168
        the id of the file itself.  So the length of the returned list
1169
        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
1170
        root directory as depth 1.
172 by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory
1171
        """
1172
        p = []
1596.2.19 by Robert Collins
Shave 20% off id2path.
1173
        for parent in self._iter_file_id_parents(file_id):
1174
            p.insert(0, parent.file_id)
172 by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory
1175
        return p
1176
1 by mbp at sourcefrog
import from baz patch-364
1177
    def id2path(self, file_id):
1596.2.19 by Robert Collins
Shave 20% off id2path.
1178
        """Return as a string the path to file_id.
1393.1.32 by Martin Pool
- add docstring demonstrating use of Inventory.id2path
1179
        
1180
        >>> i = Inventory()
1181
        >>> e = i.add(InventoryDirectory('src-id', 'src', ROOT_ID))
1182
        >>> e = i.add(InventoryFile('foo-id', 'foo.c', parent_id='src-id'))
1185.31.34 by John Arbash Meinel
Removing instances of os.sep
1183
        >>> print i.id2path('foo-id')
1393.1.32 by Martin Pool
- add docstring demonstrating use of Inventory.id2path
1184
        src/foo.c
1185
        """
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
1186
        # get all names, skipping root
1596.2.19 by Robert Collins
Shave 20% off id2path.
1187
        return '/'.join(reversed(
1188
            [parent.name for parent in 
1189
             self._iter_file_id_parents(file_id)][:-1]))
1 by mbp at sourcefrog
import from baz patch-364
1190
            
1191
    def path2id(self, name):
1192
        """Walk down through directories to return entry of last component.
1193
1194
        names may be either a list of path components, or a single
1195
        string, in which case it is automatically split.
1196
1197
        This returns the entry of the last component in the path,
1198
        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
1199
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)
1200
        Returns None IFF the path is not found.
1 by mbp at sourcefrog
import from baz patch-364
1201
        """
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
1202
        if isinstance(name, basestring):
1203
            name = osutils.splitpath(name)
1 by mbp at sourcefrog
import from baz patch-364
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
        # mutter("lookup path %r" % name)
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
1206
1207
        parent = self.root
70 by mbp at sourcefrog
Prepare for smart recursive add.
1208
        for f in name:
1 by mbp at sourcefrog
import from baz patch-364
1209
            try:
138 by mbp at sourcefrog
remove parallel tree from inventory;
1210
                cie = parent.children[f]
1 by mbp at sourcefrog
import from baz patch-364
1211
                assert cie.name == f
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
1212
                assert cie.parent_id == parent.file_id
138 by mbp at sourcefrog
remove parallel tree from inventory;
1213
                parent = cie
1 by mbp at sourcefrog
import from baz patch-364
1214
            except KeyError:
1215
                # or raise an error?
1216
                return None
1217
138 by mbp at sourcefrog
remove parallel tree from inventory;
1218
        return parent.file_id
1 by mbp at sourcefrog
import from baz patch-364
1219
1220
    def has_filename(self, names):
1221
        return bool(self.path2id(names))
1222
1223
    def has_id(self, file_id):
1711.9.11 by John Arbash Meinel
change return foo in bar to return (foo in bar)
1224
        return (file_id in self._byid)
1 by mbp at sourcefrog
import from baz patch-364
1225
1988.2.6 by Robert Collins
Review feedback.
1226
    def remove_recursive_id(self, file_id):
1227
        """Remove file_id, and children, from the inventory.
1228
        
1229
        :param file_id: A file_id to remove.
1230
        """
1988.2.1 by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of
1231
        to_find_delete = [self._byid[file_id]]
1232
        to_delete = []
1988.2.6 by Robert Collins
Review feedback.
1233
        while to_find_delete:
1988.2.1 by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of
1234
            ie = to_find_delete.pop()
1235
            to_delete.append(ie.file_id)
1236
            if ie.kind == 'directory':
1237
                to_find_delete.extend(ie.children.values())
1238
        for file_id in reversed(to_delete):
1988.2.4 by Robert Collins
Bugfix the unversion implementation - it had a faulty inventory.remove included in it, which the initial test was not rigourous enough to detect.
1239
            ie = self[file_id]
1988.2.1 by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of
1240
            del self._byid[file_id]
1988.2.4 by Robert Collins
Bugfix the unversion implementation - it had a faulty inventory.remove included in it, which the initial test was not rigourous enough to detect.
1241
            if ie.parent_id is not None:
1242
                del self[ie.parent_id].children[ie.name]
1988.2.1 by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of
1243
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
1244
    def rename(self, file_id, new_parent_id, new_name):
1245
        """Move a file within the inventory.
1246
1247
        This can change either the name, or the parent, or both.
1248
1249
        This does not move the working file."""
1250
        if not is_valid_name(new_name):
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
1251
            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
1252
1253
        new_parent = self._byid[new_parent_id]
1254
        if new_name in new_parent.children:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
1255
            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
1256
172 by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory
1257
        new_parent_idpath = self.get_idpath(new_parent_id)
1258
        if file_id in new_parent_idpath:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
1259
            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
1260
                    % (self.id2path(file_id), self.id2path(new_parent_id)))
1261
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
1262
        file_ie = self._byid[file_id]
1263
        old_parent = self._byid[file_ie.parent_id]
1264
1265
        # TODO: Don't leave things messed up if this fails
1266
1267
        del old_parent.children[file_ie.name]
1268
        new_parent.children[new_name] = file_ie
1269
        
1270
        file_ie.name = new_name
1271
        file_ie.parent_id = new_parent_id
1272
1273
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)
1274
def make_entry(kind, name, parent_id, file_id=None):
1275
    """Create an inventory entry.
1276
1277
    :param kind: the type of inventory entry to create.
1278
    :param name: the basename of the entry.
1279
    :param parent_id: the parent_id of the entry.
1280
    :param file_id: the file_id to use. if None, one will be created.
1281
    """
1282
    if file_id is None:
1283
        file_id = bzrlib.workingtree.gen_file_id(name)
1830.3.5 by John Arbash Meinel
make_entry refuses to create non-normalized entries.
1284
1285
    norm_name, can_access = osutils.normalized_filename(name)
1286
    if norm_name != name:
1287
        if can_access:
1288
            name = norm_name
1289
        else:
1290
            # TODO: jam 20060701 This would probably be more useful
1291
            #       if the error was raised with the full path
1292
            raise errors.InvalidNormalization(name)
1293
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)
1294
    if kind == 'directory':
1295
        return InventoryDirectory(file_id, name, parent_id)
1296
    elif kind == 'file':
1297
        return InventoryFile(file_id, name, parent_id)
1298
    elif kind == 'symlink':
1299
        return InventoryLink(file_id, name, parent_id)
1300
    else:
1301
        raise BzrError("unknown kind %r" % kind)
1302
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
1303
1077 by Martin Pool
- avoid compiling REs at module load time
1304
_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
1305
1306
def is_valid_name(name):
1077 by Martin Pool
- avoid compiling REs at module load time
1307
    global _NAME_RE
1753.1.4 by Robert Collins
Fixup '== None' usage in inventory.py.
1308
    if _NAME_RE is None:
1077 by Martin Pool
- avoid compiling REs at module load time
1309
        _NAME_RE = re.compile(r'^[^/\\]+$')
1310
        
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
1311
    return bool(_NAME_RE.match(name))