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