/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
1
# Copyright (C) 2005, 2006, 2007 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
    ... 
2294.1.8 by John Arbash Meinel
Fix one doc test in Inventory which expected a plain str
97
    (True, InventoryDirectory('TREE_ROOT', u'', 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('2324', 'bye.c', '123'))
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
101
    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
102
    >>> i.add(InventoryDirectory('2325', 'wibble', '123'))
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
103
    InventoryDirectory('2325', 'wibble', parent_id='123', revision=None)
1 by mbp at sourcefrog
import from baz patch-364
104
    >>> i.path2id('src/wibble')
105
    '2325'
106
    >>> '2325' in i
107
    True
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
108
    >>> i.add(InventoryFile('2326', 'wibble.c', '2325'))
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
109
    InventoryFile('2326', 'wibble.c', parent_id='2325', sha1=None, len=None)
1 by mbp at sourcefrog
import from baz patch-364
110
    >>> i['2326']
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
111
    InventoryFile('2326', 'wibble.c', parent_id='2325', sha1=None, len=None)
1185.1.40 by Robert Collins
Merge what applied of Alexander Belchenko's win32 patch.
112
    >>> 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 \
113
    ...     print path
1185.1.40 by Robert Collins
Merge what applied of Alexander Belchenko's win32 patch.
114
    ...     assert i.path2id(path)
1 by mbp at sourcefrog
import from baz patch-364
115
    ... 
1852.6.6 by Robert Collins
Finish updating iter_entries change to make all tests pass.
116
    <BLANKLINE>
1 by mbp at sourcefrog
import from baz patch-364
117
    src
118
    src/bye.c
119
    src/hello.c
120
    src/wibble
121
    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 \
122
    >>> i.id2path('2326')
1 by mbp at sourcefrog
import from baz patch-364
123
    'src/wibble/wibble.c'
124
    """
1668.1.5 by Martin Pool
[broken] fix up display of files changed by a commit
125
126
    # Constants returned by describe_change()
127
    #
128
    # TODO: These should probably move to some kind of FileChangeDescription 
129
    # class; that's like what's inside a TreeDelta but we want to be able to 
130
    # generate them just for one file at a time.
131
    RENAMED = 'renamed'
132
    MODIFIED_AND_RENAMED = 'modified and renamed'
1197 by Martin Pool
doc
133
    
1757.2.10 by Robert Collins
Give all inventory entries __slots__ that are useful with the current codebase.
134
    __slots__ = []
1092.2.23 by Robert Collins
move inventory entry centric snapshot taking logic to inventory.py
135
1399.1.3 by Robert Collins
move change detection for text and metadata from delta to entry.detect_changes
136
    def detect_changes(self, old_entry):
137
        """Return a (text_modified, meta_modified) from this to old_entry.
138
        
139
        _read_tree_state must have been called on self and old_entry prior to 
140
        calling detect_changes.
141
        """
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
142
        return False, False
1399.1.3 by Robert Collins
move change detection for text and metadata from delta to entry.detect_changes
143
1399.1.4 by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py
144
    def diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree,
145
             output_to, reverse=False):
146
        """Perform a diff from this to to_entry.
147
148
        text_diff will be used for textual difference calculation.
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
149
        This is a template method, override _diff in child classes.
1399.1.4 by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py
150
        """
1185.12.33 by Aaron Bentley
Fixed symlink reverting
151
        self._read_tree_state(tree.id2path(self.file_id), tree)
1399.1.4 by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py
152
        if to_entry:
153
            # cannot diff from one kind to another - you must do a removal
154
            # and an addif they do not match.
155
            assert self.kind == to_entry.kind
1185.12.33 by Aaron Bentley
Fixed symlink reverting
156
            to_entry._read_tree_state(to_tree.id2path(to_entry.file_id),
157
                                      to_tree)
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
158
        self._diff(text_diff, from_label, tree, to_label, to_entry, to_tree,
159
                   output_to, reverse)
160
161
    def _diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree,
162
             output_to, reverse=False):
163
        """Perform a diff between two entries of the same kind."""
1399.1.4 by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py
164
1596.2.20 by Robert Collins
optimise commit to only access weaves for merged, or altered files during commit.
165
    def find_previous_heads(self, previous_inventories,
166
                            versioned_file_store,
167
                            transaction,
168
                            entry_vf=None):
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
169
        """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
170
171
        Returned as a map from revision to inventory entry.
172
173
        This is a map containing the file revisions in all parents
174
        for which the file exists, and its revision is not a parent of
175
        any other. If the file is new, the set will be empty.
1596.2.20 by Robert Collins
optimise commit to only access weaves for merged, or altered files during commit.
176
177
        :param versioned_file_store: A store where ancestry data on this
178
                                     file id can be queried.
179
        :param transaction: The transaction that queries to the versioned 
180
                            file store should be completed under.
181
        :param entry_vf: The entry versioned file, if its already available.
1409 by Robert Collins
unify previous inventory entry parent logic in preparation for fixing the revision-thrashing bug
182
        """
1411 by Robert Collins
use weave ancestry to determine inventory entry previous heads, prevent propogating 'I did a merge' merges.
183
        def get_ancestors(weave, entry):
1563.2.18 by Robert Collins
get knit repositories really using knits for text storage.
184
            return set(weave.get_ancestry(entry.revision))
1596.2.20 by Robert Collins
optimise commit to only access weaves for merged, or altered files during commit.
185
        # revision:ie mapping for each ie found in previous_inventories.
186
        candidates = {}
187
        # revision:ie mapping with one revision for each head.
1409 by Robert Collins
unify previous inventory entry parent logic in preparation for fixing the revision-thrashing bug
188
        heads = {}
1596.2.20 by Robert Collins
optimise commit to only access weaves for merged, or altered files during commit.
189
        # revision: ancestor list for each head
1411 by Robert Collins
use weave ancestry to determine inventory entry previous heads, prevent propogating 'I did a merge' merges.
190
        head_ancestors = {}
1596.2.20 by Robert Collins
optimise commit to only access weaves for merged, or altered files during commit.
191
        # identify candidate head revision ids.
1409 by Robert Collins
unify previous inventory entry parent logic in preparation for fixing the revision-thrashing bug
192
        for inv in previous_inventories:
193
            if self.file_id in inv:
194
                ie = inv[self.file_id]
195
                assert ie.file_id == self.file_id
1596.2.20 by Robert Collins
optimise commit to only access weaves for merged, or altered files during commit.
196
                if ie.revision in candidates:
197
                    # same revision value in two different inventories:
198
                    # correct possible inconsistencies:
199
                    #     * there was a bug in revision updates with 'x' bit 
200
                    #       support.
1185.1.51 by Robert Collins
merge in reweave support
201
                    try:
1596.2.20 by Robert Collins
optimise commit to only access weaves for merged, or altered files during commit.
202
                        if candidates[ie.revision].executable != ie.executable:
203
                            candidates[ie.revision].executable = False
1185.1.51 by Robert Collins
merge in reweave support
204
                            ie.executable = False
205
                    except AttributeError:
206
                        pass
1596.2.20 by Robert Collins
optimise commit to only access weaves for merged, or altered files during commit.
207
                    # must now be the same.
208
                    assert candidates[ie.revision] == ie
1409 by Robert Collins
unify previous inventory entry parent logic in preparation for fixing the revision-thrashing bug
209
                else:
1596.2.20 by Robert Collins
optimise commit to only access weaves for merged, or altered files during commit.
210
                    # add this revision as a candidate.
211
                    candidates[ie.revision] = ie
212
213
        # common case optimisation
214
        if len(candidates) == 1:
215
            # if there is only one candidate revision found
216
            # then we can opening the versioned file to access ancestry:
217
            # there cannot be any ancestors to eliminate when there is 
218
            # only one revision available.
219
            heads[ie.revision] = ie
220
            return heads
221
222
        # eliminate ancestors amongst the available candidates:
223
        # heads are those that are not an ancestor of any other candidate
224
        # - this provides convergence at a per-file level.
225
        for ie in candidates.values():
226
            # may be an ancestor of a known head:
227
            already_present = 0 != len(
228
                [head for head in heads 
229
                 if ie.revision in head_ancestors[head]])
230
            if already_present:
231
                # an ancestor of an analyzed candidate.
232
                continue
233
            # not an ancestor of a known head:
234
            # load the versioned file for this file id if needed
235
            if entry_vf is None:
236
                entry_vf = versioned_file_store.get_weave_or_empty(
237
                    self.file_id, transaction)
238
            ancestors = get_ancestors(entry_vf, ie)
239
            # may knock something else out:
240
            check_heads = list(heads.keys())
241
            for head in check_heads:
242
                if head in ancestors:
243
                    # this previously discovered 'head' is not
244
                    # really a head - its an ancestor of the newly 
245
                    # found head,
246
                    heads.pop(head)
247
            head_ancestors[ie.revision] = ancestors
248
            heads[ie.revision] = ie
1409 by Robert Collins
unify previous inventory entry parent logic in preparation for fixing the revision-thrashing bug
249
        return heads
250
1399.1.6 by Robert Collins
move exporting functionality into inventory.py - uncovers bug in symlink support
251
    def get_tar_item(self, root, dp, now, tree):
1399.1.7 by Robert Collins
implement symlink exporting to tarballs
252
        """Get a tarfile item and a file stream for its content."""
1996.3.20 by John Arbash Meinel
[merge] bzr.dev 2063
253
        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
254
        # TODO: would be cool to actually set it to the timestamp of the
255
        # revision it was last changed
256
        item.mtime = now
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
257
        fileobj = self._put_in_tar(item, tree)
1399.1.6 by Robert Collins
move exporting functionality into inventory.py - uncovers bug in symlink support
258
        return item, fileobj
259
1399.1.5 by Robert Collins
move checking whether an entry stores text into inventory.py from fetch,py
260
    def has_text(self):
261
        """Return true if the object this entry represents has textual data.
262
263
        Note that textual data includes binary content.
1405 by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave
264
265
        Also note that all entries get weave files created for them.
266
        This attribute is primarily used when upgrading from old trees that
267
        did not have the weave index for all inventory entries.
1399.1.5 by Robert Collins
move checking whether an entry stores text into inventory.py from fetch,py
268
        """
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
269
        return False
1399.1.5 by Robert Collins
move checking whether an entry stores text into inventory.py from fetch,py
270
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
271
    def __init__(self, file_id, name, parent_id, text_id=None):
1 by mbp at sourcefrog
import from baz patch-364
272
        """Create an InventoryEntry
273
        
274
        The filename must be a single component, relative to the
275
        parent directory; it cannot be a whole path or relative name.
276
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
277
        >>> e = InventoryFile('123', 'hello.c', ROOT_ID)
1 by mbp at sourcefrog
import from baz patch-364
278
        >>> e.name
279
        'hello.c'
280
        >>> e.file_id
281
        '123'
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
282
        >>> e = InventoryFile('123', 'src/hello.c', ROOT_ID)
1 by mbp at sourcefrog
import from baz patch-364
283
        Traceback (most recent call last):
1185.16.63 by Martin Pool
- more error conversion
284
        InvalidEntryName: Invalid entry name: src/hello.c
1 by mbp at sourcefrog
import from baz patch-364
285
        """
1183 by Martin Pool
- implement version 5 xml storage, and tests
286
        assert isinstance(name, basestring), name
376 by Martin Pool
- fix slow invariant check when reading in InventoryEntry objects
287
        if '/' in name or '\\' in name:
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
288
            raise errors.InvalidEntryName(name=name)
1398 by Robert Collins
integrate in Gustavos x-bit patch
289
        self.executable = False
1092.2.21 by Robert Collins
convert name_version to revision in inventory entries
290
        self.revision = None
955 by Martin Pool
- use __slots__ on InventoryEntry; rather faster
291
        self.text_sha1 = None
292
        self.text_size = None
1 by mbp at sourcefrog
import from baz patch-364
293
        self.file_id = file_id
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
294
        assert isinstance(file_id, (str, None.__class__)), \
295
            'bad type %r for %r' % (type(file_id), file_id)
1 by mbp at sourcefrog
import from baz patch-364
296
        self.name = name
297
        self.text_id = text_id
298
        self.parent_id = parent_id
1092.2.6 by Robert Collins
symlink support updated to work
299
        self.symlink_target = None
237 by mbp at sourcefrog
- Better assertions in InventoryEntry constructor
300
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
301
    def kind_character(self):
302
        """Return a short kind indicator useful for appending to names."""
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
303
        raise BzrError('unknown kind %r' % self.kind)
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
304
1731.1.2 by Aaron Bentley
Removed all remaining uses of root_directory
305
    known_kinds = ('file', 'directory', 'symlink')
1 by mbp at sourcefrog
import from baz patch-364
306
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
307
    def _put_in_tar(self, item, tree):
308
        """populate item for stashing in a tar, and return the content stream.
309
310
        If no content is available, return None.
311
        """
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
312
        raise BzrError("don't know how to export {%s} of kind %r" %
313
                       (self.file_id, self.kind))
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
314
1399.1.6 by Robert Collins
move exporting functionality into inventory.py - uncovers bug in symlink support
315
    def put_on_disk(self, dest, dp, tree):
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
316
        """Create a representation of self on disk in the prefix dest.
317
        
318
        This is a template method - implement _put_on_disk in subclasses.
319
        """
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
320
        fullpath = osutils.pathjoin(dest, dp)
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
321
        self._put_on_disk(fullpath, tree)
1711.2.101 by John Arbash Meinel
Clean up some unnecessary mutter() calls
322
        # mutter("  export {%s} kind %s to %s", self.file_id,
323
        #         self.kind, fullpath)
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
324
325
    def _put_on_disk(self, fullpath, tree):
326
        """Put this entry onto disk at fullpath, from tree tree."""
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
327
        raise BzrError("don't know how to export {%s} of kind %r" % (self.file_id, self.kind))
1399.1.6 by Robert Collins
move exporting functionality into inventory.py - uncovers bug in symlink support
328
156 by mbp at sourcefrog
new "directories" command
329
    def sorted_children(self):
1757.2.13 by Robert Collins
Tweak InventoryEntry.sorted_children to be simpler.
330
        return sorted(self.children.items())
156 by mbp at sourcefrog
new "directories" command
331
1399.1.1 by Robert Collins
move checks for versionability of file kinds into InventoryEntry
332
    @staticmethod
333
    def versionable_kind(kind):
2100.3.1 by Aaron Bentley
Start roundtripping tree-reference entries
334
        return (kind in ('file', 'directory', 'symlink', 'tree-reference'))
1399.1.1 by Robert Collins
move checks for versionability of file kinds into InventoryEntry
335
1092.2.20 by Robert Collins
symlink and weaves, whaddya know
336
    def check(self, checker, rev_id, inv, tree):
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
337
        """Check this inventory entry is intact.
338
339
        This is a template method, override _check for kind specific
340
        tests.
1616.1.5 by Martin Pool
Cleanup and document some check code
341
342
        :param checker: Check object providing context for the checks; 
343
             can be used to find out what parts of the repository have already
344
             been checked.
345
        :param rev_id: Revision id from which this InventoryEntry was loaded.
346
             Not necessarily the last-changed revision for this file.
347
        :param inv: Inventory from which the entry was loaded.
348
        :param tree: RevisionTree for this entry.
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
349
        """
1757.2.11 by Robert Collins
Correct bzr diff | less= None clauses in inventory.py to be is not None.
350
        if self.parent_id is not None:
1092.2.20 by Robert Collins
symlink and weaves, whaddya know
351
            if not inv.has_id(self.parent_id):
352
                raise BzrCheckError('missing parent {%s} in inventory for revision {%s}'
353
                        % (self.parent_id, rev_id))
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
354
        self._check(checker, rev_id, tree)
355
356
    def _check(self, checker, rev_id, tree):
357
        """Check this inventory entry for kind specific errors."""
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
358
        raise BzrCheckError('unknown entry kind %r in revision {%s}' % 
359
                            (self.kind, rev_id))
1092.2.20 by Robert Collins
symlink and weaves, whaddya know
360
1 by mbp at sourcefrog
import from baz patch-364
361
    def copy(self):
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
362
        """Clone this inventory entry."""
363
        raise NotImplementedError
1 by mbp at sourcefrog
import from baz patch-364
364
1668.1.5 by Martin Pool
[broken] fix up display of files changed by a commit
365
    @staticmethod
366
    def describe_change(old_entry, new_entry):
367
        """Describe the change between old_entry and this.
368
        
369
        This smells of being an InterInventoryEntry situation, but as its
370
        the first one, we're making it a static method for now.
371
372
        An entry with a different parent, or different name is considered 
373
        to be renamed. Reparenting is an internal detail.
374
        Note that renaming the parent does not trigger a rename for the
375
        child entry itself.
1669.2.1 by Martin Pool
verbose commit now specifically identifies modified/renamed/reparented files
376
        """
1668.1.5 by Martin Pool
[broken] fix up display of files changed by a commit
377
        # TODO: Perhaps return an object rather than just a string
378
        if old_entry is new_entry:
379
            # also the case of both being None
380
            return 'unchanged'
381
        elif old_entry is None:
1092.2.23 by Robert Collins
move inventory entry centric snapshot taking logic to inventory.py
382
            return 'added'
1668.1.5 by Martin Pool
[broken] fix up display of files changed by a commit
383
        elif new_entry is None:
384
            return 'removed'
1959.4.1 by Aaron Bentley
Correctly handle all file kind changes
385
        if old_entry.kind != new_entry.kind:
386
            return 'modified'
1668.1.5 by Martin Pool
[broken] fix up display of files changed by a commit
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
2100.3.1 by Aaron Bentley
Start roundtripping tree-reference entries
824
class TreeReference(InventoryEntry):
825
    
826
    kind = 'tree-reference'
827
    
2255.6.8 by Aaron Bentley
Merge refactoring of add_reference
828
    def __init__(self, file_id, name, parent_id, revision=None,
829
                 reference_revision=None):
2100.3.1 by Aaron Bentley
Start roundtripping tree-reference entries
830
        InventoryEntry.__init__(self, file_id, name, parent_id)
831
        self.revision = revision
832
        self.reference_revision = reference_revision
833
2100.3.18 by Aaron Bentley
Get commit working for tree references
834
    def copy(self):
835
        return TreeReference(self.file_id, self.name, self.parent_id,
836
                             self.revision, self.reference_revision)
837
838
    def _snapshot_text(self, file_parents, work_tree, commit_builder):
839
        commit_builder.modified_reference(self.file_id, file_parents)
2100.3.1 by Aaron Bentley
Start roundtripping tree-reference entries
840
2100.3.19 by Aaron Bentley
Ensure commit preserves reference revision
841
    def _read_tree_state(self, path, work_tree):
842
        """Populate fields in the inventory entry from the given tree.
843
        """
2100.3.20 by Aaron Bentley
Implement tree comparison for tree references
844
        self.reference_revision = work_tree.get_reference_revision(self, path)
2100.3.19 by Aaron Bentley
Ensure commit preserves reference revision
845
846
    def _forget_tree_state(self):
847
        self.reference_revision = None 
848
849
802 by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions
850
class Inventory(object):
1 by mbp at sourcefrog
import from baz patch-364
851
    """Inventory of versioned files in a tree.
852
240 by mbp at sourcefrog
doc
853
    This describes which file_id is present at each point in the tree,
854
    and possibly the SHA-1 or other information about the file.
855
    Entries can be looked up either by path or by file_id.
1 by mbp at sourcefrog
import from baz patch-364
856
857
    The inventory represents a typical unix file tree, with
858
    directories containing files and subdirectories.  We never store
859
    the full path to a file, because renaming a directory implicitly
860
    moves all of its contents.  This class internally maintains a
861
    lookup tree that allows the children under a directory to be
862
    returned quickly.
863
864
    InventoryEntry objects must not be modified after they are
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
865
    inserted, other than through the Inventory API.
1 by mbp at sourcefrog
import from baz patch-364
866
867
    >>> inv = Inventory()
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
868
    >>> 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.
869
    InventoryFile('123-123', 'hello.c', parent_id='TREE_ROOT', sha1=None, len=None)
1 by mbp at sourcefrog
import from baz patch-364
870
    >>> inv['123-123'].name
871
    'hello.c'
872
873
    May be treated as an iterator or set to look up file ids:
874
    
875
    >>> bool(inv.path2id('hello.c'))
876
    True
877
    >>> '123-123' in inv
878
    True
879
880
    May also look up by name:
881
882
    >>> [x[0] for x in inv.iter_entries()]
1852.6.6 by Robert Collins
Finish updating iter_entries change to make all tests pass.
883
    ['', u'hello.c']
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
884
    >>> 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
885
    >>> inv.add(InventoryFile('123-123', 'hello.c', ROOT_ID))
1731.1.33 by Aaron Bentley
Revert no-special-root changes
886
    Traceback (most recent call last):
887
    BzrError: parent_id {TREE_ROOT} not in inventory
888
    >>> 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.
889
    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
890
    """
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
891
    def __init__(self, root_id=ROOT_ID, revision_id=None):
1 by mbp at sourcefrog
import from baz patch-364
892
        """Create or read an inventory.
893
894
        If a working directory is specified, the inventory is read
895
        from there.  If the file is specified, read from that. If not,
896
        the inventory is created empty.
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
897
898
        The inventory is created with a default root directory, with
899
        an id of None.
1 by mbp at sourcefrog
import from baz patch-364
900
        """
1731.1.33 by Aaron Bentley
Revert no-special-root changes
901
        if root_id is not None:
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
902
            assert root_id.__class__ == str
2294.1.5 by John Arbash Meinel
Fix Inventory.iter_entries_by_dir to return Unicode paths,
903
            self._set_root(InventoryDirectory(root_id, u'', None))
1731.1.33 by Aaron Bentley
Revert no-special-root changes
904
        else:
905
            self.root = None
906
            self._byid = {}
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
907
        self.revision_id = revision_id
1910.2.3 by Aaron Bentley
All tests pass
908
909
    def _set_root(self, ie):
910
        self.root = ie
1907.1.2 by Aaron Bentley
More removal of unique-root stuff
911
        self._byid = {self.root.file_id: self.root}
1 by mbp at sourcefrog
import from baz patch-364
912
1189 by Martin Pool
- BROKEN: partial support for commit into weave
913
    def copy(self):
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
914
        # TODO: jam 20051218 Should copy also copy the revision_id?
1852.6.3 by Robert Collins
Make iter(Tree) consistent for all tree types.
915
        entries = self.iter_entries()
916
        other = Inventory(entries.next()[1].file_id)
1206 by Martin Pool
- fix bug in Inventory.copy()
917
        # copy recursively so we know directories will be added before
918
        # their children.  There are more efficient ways than this...
1852.6.3 by Robert Collins
Make iter(Tree) consistent for all tree types.
919
        for path, entry in entries():
1189 by Martin Pool
- BROKEN: partial support for commit into weave
920
            other.add(entry.copy())
921
        return other
922
1 by mbp at sourcefrog
import from baz patch-364
923
    def __iter__(self):
924
        return iter(self._byid)
925
926
    def __len__(self):
927
        """Returns number of entries."""
928
        return len(self._byid)
929
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
930
    def iter_entries(self, from_dir=None):
1 by mbp at sourcefrog
import from baz patch-364
931
        """Return (path, entry) pairs, in order by name."""
1753.1.4 by Robert Collins
Fixup '== None' usage in inventory.py.
932
        if from_dir is None:
1731.1.33 by Aaron Bentley
Revert no-special-root changes
933
            if self.root is None:
934
                return
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
935
            from_dir = self.root
1852.6.3 by Robert Collins
Make iter(Tree) consistent for all tree types.
936
            yield '', self.root
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
937
        elif isinstance(from_dir, basestring):
938
            from_dir = self._byid[from_dir]
939
            
1732.1.24 by John Arbash Meinel
iter_entries time drops to 1/6th time
940
        # unrolling the recursive called changed the time from
941
        # 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
942
        children = from_dir.children.items()
943
        children.sort()
944
        children = collections.deque(children)
945
        stack = [(u'', children)]
946
        while stack:
947
            from_dir_relpath, children = stack[-1]
948
949
            while children:
950
                name, ie = children.popleft()
951
952
                # we know that from_dir_relpath never ends in a slash
953
                # and 'f' doesn't begin with one, we can do a string op, rather
954
                # than the checks of pathjoin(), though this means that all paths
955
                # start with a slash
956
                path = from_dir_relpath + '/' + name
957
958
                yield path[1:], ie
959
960
                if ie.kind != 'directory':
961
                    continue
962
963
                # But do this child first
964
                new_children = ie.children.items()
965
                new_children.sort()
966
                new_children = collections.deque(new_children)
967
                stack.append((path, new_children))
968
                # Break out of inner loop, so that we start outer loop with child
969
                break
970
            else:
971
                # 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.
972
                stack.pop()
555 by Martin Pool
- New Inventory.entries() method
973
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
974
    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.
975
        """Iterate over the entries in a directory first order.
976
977
        This returns all entries for a directory before returning
978
        the entries for children of a directory. This is not
979
        lexicographically sorted order, and is a hybrid between
980
        depth-first and breadth-first.
981
982
        :return: This yields (path, entry) pairs
983
        """
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
984
        if specific_file_ids:
2304.1.2 by John Arbash Meinel
Use a set for specific ids for Inventory.iter_entries_by_dir
985
            safe = osutils.safe_file_id
986
            specific_file_ids = set(safe(fid) for fid in specific_file_ids)
1755.1.1 by Robert Collins
(jam, robertc, ab)Merge new iter_entries_by_dirs routine which matches the order walkdirs provides.
987
        # TODO? Perhaps this should return the from_dir so that the root is
988
        # yielded? or maybe an option?
1753.1.4 by Robert Collins
Fixup '== None' usage in inventory.py.
989
        if from_dir is None:
1731.1.47 by Aaron Bentley
Merge bzr.dev
990
            if self.root is None:
991
                return
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
992
            # Optimize a common case
993
            if specific_file_ids is not None and len(specific_file_ids) == 1:
994
                file_id = list(specific_file_ids)[0]
995
                if file_id in self:
996
                    yield self.id2path(file_id), self[file_id]
997
                return 
1711.2.36 by John Arbash Meinel
Add an iter_entries_by_dir which returns directory children before their children.
998
            from_dir = self.root
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
999
            if (specific_file_ids is None or 
1000
                self.root.file_id in specific_file_ids):
2294.1.5 by John Arbash Meinel
Fix Inventory.iter_entries_by_dir to return Unicode paths,
1001
                yield u'', self.root
1711.2.36 by John Arbash Meinel
Add an iter_entries_by_dir which returns directory children before their children.
1002
        elif isinstance(from_dir, basestring):
1003
            from_dir = self._byid[from_dir]
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
1004
1005
        if specific_file_ids is not None:
1006
            parents = set()
1007
            def add_ancestors(file_id):
1008
                if file_id not in self:
1009
                    return
1010
                parent_id = self[file_id].parent_id
1011
                if parent_id is None:
1012
                    return
1013
                if parent_id not in parents:
1014
                    parents.add(parent_id)
1015
                    add_ancestors(parent_id)
1016
            for file_id in specific_file_ids:
1017
                add_ancestors(file_id)
1018
        else:
1019
            parents = None
1711.2.36 by John Arbash Meinel
Add an iter_entries_by_dir which returns directory children before their children.
1020
            
1021
        stack = [(u'', from_dir)]
1022
        while stack:
1023
            cur_relpath, cur_dir = stack.pop()
1024
1025
            child_dirs = []
1026
            for child_name, child_ie in sorted(cur_dir.children.iteritems()):
1027
1028
                child_relpath = cur_relpath + child_name
1029
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
1030
                if (specific_file_ids is None or 
1031
                    child_ie.file_id in specific_file_ids):
1032
                    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.
1033
1034
                if child_ie.kind == 'directory':
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
1035
                    if parents is None or child_ie.file_id in parents:
1036
                        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.
1037
            stack.extend(reversed(child_dirs))
1038
555 by Martin Pool
- New Inventory.entries() method
1039
    def entries(self):
1040
        """Return list of (path, ie) for all entries except the root.
1041
1042
        This may be faster than iter_entries.
1043
        """
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
1044
        accum = []
1045
        def descend(dir_ie, dir_path):
556 by Martin Pool
- fix up Inventory.entries()
1046
            kids = dir_ie.children.items()
555 by Martin Pool
- New Inventory.entries() method
1047
            kids.sort()
1048
            for name, ie in kids:
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
1049
                child_path = osutils.pathjoin(dir_path, name)
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
1050
                accum.append((child_path, ie))
555 by Martin Pool
- New Inventory.entries() method
1051
                if ie.kind == 'directory':
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
1052
                    descend(ie, child_path)
555 by Martin Pool
- New Inventory.entries() method
1053
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1054
        descend(self.root, u'')
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
1055
        return accum
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
1056
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
1057
    def directories(self):
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
1058
        """Return (path, entry) pairs for all directories, including the root.
1 by mbp at sourcefrog
import from baz patch-364
1059
        """
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
1060
        accum = []
1061
        def descend(parent_ie, parent_path):
1062
            accum.append((parent_path, parent_ie))
156 by mbp at sourcefrog
new "directories" command
1063
            
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
1064
            kids = [(ie.name, ie) for ie in parent_ie.children.itervalues() if ie.kind == 'directory']
1065
            kids.sort()
156 by mbp at sourcefrog
new "directories" command
1066
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
1067
            for name, child_ie in kids:
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
1068
                child_path = osutils.pathjoin(parent_path, name)
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
1069
                descend(child_ie, child_path)
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1070
        descend(self.root, u'')
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
1071
        return accum
1 by mbp at sourcefrog
import from baz patch-364
1072
        
1073
    def __contains__(self, file_id):
1074
        """True if this entry contains a file with given id.
1075
1076
        >>> inv = Inventory()
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
1077
        >>> inv.add(InventoryFile('123', 'foo.c', ROOT_ID))
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
1078
        InventoryFile('123', 'foo.c', parent_id='TREE_ROOT', sha1=None, len=None)
1 by mbp at sourcefrog
import from baz patch-364
1079
        >>> '123' in inv
1080
        True
1081
        >>> '456' in inv
1082
        False
1083
        """
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
1084
        file_id = osutils.safe_file_id(file_id)
1711.9.11 by John Arbash Meinel
change return foo in bar to return (foo in bar)
1085
        return (file_id in self._byid)
1 by mbp at sourcefrog
import from baz patch-364
1086
1087
    def __getitem__(self, file_id):
1088
        """Return the entry for given file_id.
1089
1090
        >>> inv = Inventory()
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
1091
        >>> inv.add(InventoryFile('123123', 'hello.c', ROOT_ID))
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
1092
        InventoryFile('123123', 'hello.c', parent_id='TREE_ROOT', sha1=None, len=None)
1 by mbp at sourcefrog
import from baz patch-364
1093
        >>> inv['123123'].name
1094
        'hello.c'
1095
        """
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
1096
        file_id = osutils.safe_file_id(file_id)
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
1097
        try:
1098
            return self._byid[file_id]
1099
        except KeyError:
2067.3.1 by Martin Pool
Clean up BzrNewError, other exception classes and users.
1100
            # really we're passing an inventory, not a tree...
1101
            raise errors.NoSuchId(self, file_id)
1 by mbp at sourcefrog
import from baz patch-364
1102
460 by Martin Pool
- new testing command compare-trees
1103
    def get_file_kind(self, file_id):
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
1104
        file_id = osutils.safe_file_id(file_id)
460 by Martin Pool
- new testing command compare-trees
1105
        return self._byid[file_id].kind
1106
138 by mbp at sourcefrog
remove parallel tree from inventory;
1107
    def get_child(self, parent_id, filename):
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
1108
        parent_id = osutils.safe_file_id(parent_id)
1732.1.18 by John Arbash Meinel
50ms is probably not worth it
1109
        return self[parent_id].children.get(filename)
138 by mbp at sourcefrog
remove parallel tree from inventory;
1110
2100.3.6 by Aaron Bentley
Make add recursive for children of added entries
1111
    def _add_child(self, entry):
1112
        """Add an entry to the inventory, without adding it to its parent"""
1113
        if entry.file_id in self._byid:
1114
            raise BzrError("inventory already contains entry with id {%s}" %
1115
                           entry.file_id)
1116
        self._byid[entry.file_id] = entry
1117
        for child in getattr(entry, 'children', {}).itervalues():
1118
            self._add_child(child)
1119
        return entry
1120
1 by mbp at sourcefrog
import from baz patch-364
1121
    def add(self, entry):
1122
        """Add entry to inventory.
1123
1124
        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
1125
        which calls this.
1126
1127
        Returns the new entry object.
1128
        """
139 by mbp at sourcefrog
simplified/faster Inventory.add
1129
        if entry.file_id in self._byid:
2255.7.16 by John Arbash Meinel
Make sure adding a duplicate file_id raises DuplicateFileId.
1130
            raise errors.DuplicateFileId(entry.file_id,
1131
                                         self._byid[entry.file_id])
1 by mbp at sourcefrog
import from baz patch-364
1132
1731.1.33 by Aaron Bentley
Revert no-special-root changes
1133
        if entry.parent_id is None:
1910.2.3 by Aaron Bentley
All tests pass
1134
            assert self.root is None and len(self._byid) == 0
2100.3.6 by Aaron Bentley
Make add recursive for children of added entries
1135
            self.root = entry
1136
        else:
1137
            try:
1138
                parent = self._byid[entry.parent_id]
1139
            except KeyError:
1140
                raise BzrError("parent_id {%s} not in inventory" %
1141
                               entry.parent_id)
1142
1143
            if entry.name in parent.children:
1144
                raise BzrError("%s is already versioned" %
1145
                        osutils.pathjoin(self.id2path(parent.file_id),
1146
                        entry.name))
1147
            parent.children[entry.name] = entry
1148
        return self._add_child(entry)
1 by mbp at sourcefrog
import from baz patch-364
1149
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)
1150
    def add_path(self, relpath, kind, file_id=None, parent_id=None):
70 by mbp at sourcefrog
Prepare for smart recursive add.
1151
        """Add entry from a path.
1152
1180 by Martin Pool
- start splitting code for xml (de)serialization away from objects
1153
        The immediate parent must already be versioned.
1154
1155
        Returns the new entry object."""
1015 by Martin Pool
- fix circular imports
1156
        
1830.3.5 by John Arbash Meinel
make_entry refuses to create non-normalized entries.
1157
        parts = osutils.splitpath(relpath)
70 by mbp at sourcefrog
Prepare for smart recursive add.
1158
1534.7.69 by Aaron Bentley
Got real root moves working
1159
        if len(parts) == 0:
1713.1.6 by Robert Collins
Move file id random data selection out of the inner loop for 'bzr add'.
1160
            if file_id is None:
2116.4.1 by John Arbash Meinel
Update file and revision id generators.
1161
                file_id = generate_ids.gen_root_id()
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
1162
            else:
1163
                file_id = osutils.safe_file_id(file_id)
1731.1.1 by Aaron Bentley
Make root entry an InventoryDirectory, make EmptyTree really empty
1164
            self.root = InventoryDirectory(file_id, '', None)
1534.7.69 by Aaron Bentley
Got real root moves working
1165
            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.
1166
            return self.root
1534.7.69 by Aaron Bentley
Got real root moves working
1167
        else:
1168
            parent_path = parts[:-1]
1169
            parent_id = self.path2id(parent_path)
1753.1.4 by Robert Collins
Fixup '== None' usage in inventory.py.
1170
            if parent_id is None:
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
1171
                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)
1172
        ie = make_entry(kind, parts[-1], parent_id, file_id)
70 by mbp at sourcefrog
Prepare for smart recursive add.
1173
        return self.add(ie)
1174
1 by mbp at sourcefrog
import from baz patch-364
1175
    def __delitem__(self, file_id):
1176
        """Remove entry by id.
1177
1178
        >>> inv = Inventory()
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
1179
        >>> inv.add(InventoryFile('123', 'foo.c', ROOT_ID))
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
1180
        InventoryFile('123', 'foo.c', parent_id='TREE_ROOT', sha1=None, len=None)
1 by mbp at sourcefrog
import from baz patch-364
1181
        >>> '123' in inv
1182
        True
1183
        >>> del inv['123']
1184
        >>> '123' in inv
1185
        False
1186
        """
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
1187
        file_id = osutils.safe_file_id(file_id)
1 by mbp at sourcefrog
import from baz patch-364
1188
        ie = self[file_id]
1189
1534.7.69 by Aaron Bentley
Got real root moves working
1190
        assert ie.parent_id is None or \
1191
            self[ie.parent_id].children[ie.name] == ie
1 by mbp at sourcefrog
import from baz patch-364
1192
        
1193
        del self._byid[file_id]
1534.7.69 by Aaron Bentley
Got real root moves working
1194
        if ie.parent_id is not None:
1195
            del self[ie.parent_id].children[ie.name]
1 by mbp at sourcefrog
import from baz patch-364
1196
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
1197
    def __eq__(self, other):
1 by mbp at sourcefrog
import from baz patch-364
1198
        """Compare two sets by comparing their contents.
1199
1200
        >>> i1 = Inventory()
1201
        >>> i2 = Inventory()
1202
        >>> i1 == i2
1203
        True
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
1204
        >>> i1.add(InventoryFile('123', 'foo', ROOT_ID))
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
1205
        InventoryFile('123', 'foo', parent_id='TREE_ROOT', sha1=None, len=None)
1 by mbp at sourcefrog
import from baz patch-364
1206
        >>> i1 == i2
1207
        False
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
1208
        >>> i2.add(InventoryFile('123', 'foo', ROOT_ID))
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
1209
        InventoryFile('123', 'foo', parent_id='TREE_ROOT', sha1=None, len=None)
1 by mbp at sourcefrog
import from baz patch-364
1210
        >>> i1 == i2
1211
        True
1212
        """
1213
        if not isinstance(other, Inventory):
1214
            return NotImplemented
1215
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
1216
        return self._byid == other._byid
1217
1218
    def __ne__(self, other):
1249 by Martin Pool
- improvements to weave commit [broken]
1219
        return not self.__eq__(other)
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
1220
1221
    def __hash__(self):
1222
        raise ValueError('not hashable')
1223
1596.2.19 by Robert Collins
Shave 20% off id2path.
1224
    def _iter_file_id_parents(self, file_id):
1225
        """Yield the parents of file_id up to the root."""
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
1226
        file_id = osutils.safe_file_id(file_id)
1757.2.11 by Robert Collins
Correct bzr diff | less= None clauses in inventory.py to be is not None.
1227
        while file_id is not None:
1596.2.19 by Robert Collins
Shave 20% off id2path.
1228
            try:
1229
                ie = self._byid[file_id]
1230
            except KeyError:
2255.11.5 by Martin Pool
Tree.id2path should raise NoSuchId, not return None.
1231
                raise errors.NoSuchId(tree=None, file_id=file_id)
1596.2.19 by Robert Collins
Shave 20% off id2path.
1232
            yield ie
1233
            file_id = ie.parent_id
1 by mbp at sourcefrog
import from baz patch-364
1234
172 by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory
1235
    def get_idpath(self, file_id):
1236
        """Return a list of file_ids for the path to an entry.
1237
1238
        The list contains one element for each directory followed by
1239
        the id of the file itself.  So the length of the returned list
1240
        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
1241
        root directory as depth 1.
172 by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory
1242
        """
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
1243
        file_id = osutils.safe_file_id(file_id)
172 by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory
1244
        p = []
1596.2.19 by Robert Collins
Shave 20% off id2path.
1245
        for parent in self._iter_file_id_parents(file_id):
1246
            p.insert(0, parent.file_id)
172 by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory
1247
        return p
1248
1 by mbp at sourcefrog
import from baz patch-364
1249
    def id2path(self, file_id):
1596.2.19 by Robert Collins
Shave 20% off id2path.
1250
        """Return as a string the path to file_id.
1393.1.32 by Martin Pool
- add docstring demonstrating use of Inventory.id2path
1251
        
1252
        >>> i = Inventory()
1253
        >>> e = i.add(InventoryDirectory('src-id', 'src', ROOT_ID))
1254
        >>> e = i.add(InventoryFile('foo-id', 'foo.c', parent_id='src-id'))
1185.31.34 by John Arbash Meinel
Removing instances of os.sep
1255
        >>> print i.id2path('foo-id')
1393.1.32 by Martin Pool
- add docstring demonstrating use of Inventory.id2path
1256
        src/foo.c
1257
        """
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
1258
        file_id = osutils.safe_file_id(file_id)
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
1259
        # get all names, skipping root
1596.2.19 by Robert Collins
Shave 20% off id2path.
1260
        return '/'.join(reversed(
1261
            [parent.name for parent in 
1262
             self._iter_file_id_parents(file_id)][:-1]))
1 by mbp at sourcefrog
import from baz patch-364
1263
            
1264
    def path2id(self, name):
1265
        """Walk down through directories to return entry of last component.
1266
1267
        names may be either a list of path components, or a single
1268
        string, in which case it is automatically split.
1269
1270
        This returns the entry of the last component in the path,
1271
        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
1272
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)
1273
        Returns None IFF the path is not found.
1 by mbp at sourcefrog
import from baz patch-364
1274
        """
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
1275
        if isinstance(name, basestring):
1276
            name = osutils.splitpath(name)
1 by mbp at sourcefrog
import from baz patch-364
1277
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)
1278
        # mutter("lookup path %r" % name)
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
1279
1280
        parent = self.root
1731.1.33 by Aaron Bentley
Revert no-special-root changes
1281
        if parent is None:
1282
            return None
70 by mbp at sourcefrog
Prepare for smart recursive add.
1283
        for f in name:
1 by mbp at sourcefrog
import from baz patch-364
1284
            try:
2091.3.1 by Aaron Bentley
When 'directory' path element isn't a directory, return None from path2id
1285
                children = getattr(parent, 'children', None)
2091.3.3 by Aaron Bentley
Test 'is None' not '== None'
1286
                if children is None:
2091.3.1 by Aaron Bentley
When 'directory' path element isn't a directory, return None from path2id
1287
                    return None
1288
                cie = children[f]
1 by mbp at sourcefrog
import from baz patch-364
1289
                assert cie.name == f
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
1290
                assert cie.parent_id == parent.file_id
138 by mbp at sourcefrog
remove parallel tree from inventory;
1291
                parent = cie
1 by mbp at sourcefrog
import from baz patch-364
1292
            except KeyError:
1293
                # or raise an error?
1294
                return None
1295
138 by mbp at sourcefrog
remove parallel tree from inventory;
1296
        return parent.file_id
1 by mbp at sourcefrog
import from baz patch-364
1297
1298
    def has_filename(self, names):
1299
        return bool(self.path2id(names))
1300
1301
    def has_id(self, file_id):
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
1302
        file_id = osutils.safe_file_id(file_id)
1711.9.11 by John Arbash Meinel
change return foo in bar to return (foo in bar)
1303
        return (file_id in self._byid)
1 by mbp at sourcefrog
import from baz patch-364
1304
1988.2.6 by Robert Collins
Review feedback.
1305
    def remove_recursive_id(self, file_id):
1306
        """Remove file_id, and children, from the inventory.
1307
        
1308
        :param file_id: A file_id to remove.
1309
        """
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
1310
        file_id = osutils.safe_file_id(file_id)
1988.2.1 by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of
1311
        to_find_delete = [self._byid[file_id]]
1312
        to_delete = []
1988.2.6 by Robert Collins
Review feedback.
1313
        while to_find_delete:
1988.2.1 by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of
1314
            ie = to_find_delete.pop()
1315
            to_delete.append(ie.file_id)
1316
            if ie.kind == 'directory':
1317
                to_find_delete.extend(ie.children.values())
1318
        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.
1319
            ie = self[file_id]
1988.2.1 by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of
1320
            del self._byid[file_id]
1731.2.16 by Aaron Bentley
Get extract working for standalone trees
1321
        if ie.parent_id is not None:
1322
            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
1323
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
1324
    def rename(self, file_id, new_parent_id, new_name):
1325
        """Move a file within the inventory.
1326
1327
        This can change either the name, or the parent, or both.
1328
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
1329
        This does not move the working file.
1330
        """
1331
        file_id = osutils.safe_file_id(file_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
1332
        if not is_valid_name(new_name):
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
1333
            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
1334
1335
        new_parent = self._byid[new_parent_id]
1336
        if new_name in new_parent.children:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
1337
            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
1338
172 by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory
1339
        new_parent_idpath = self.get_idpath(new_parent_id)
1340
        if file_id in new_parent_idpath:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
1341
            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
1342
                    % (self.id2path(file_id), self.id2path(new_parent_id)))
1343
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
1344
        file_ie = self._byid[file_id]
1345
        old_parent = self._byid[file_ie.parent_id]
1346
1347
        # TODO: Don't leave things messed up if this fails
1348
1349
        del old_parent.children[file_ie.name]
1350
        new_parent.children[new_name] = file_ie
1351
        
1352
        file_ie.name = new_name
1353
        file_ie.parent_id = new_parent_id
1354
1731.1.1 by Aaron Bentley
Make root entry an InventoryDirectory, make EmptyTree really empty
1355
    def is_root(self, file_id):
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
1356
        file_id = osutils.safe_file_id(file_id)
1731.1.1 by Aaron Bentley
Make root entry an InventoryDirectory, make EmptyTree really empty
1357
        return self.root is not None and file_id == self.root.file_id
1358
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
1359
2255.2.74 by Robert Collins
Minor performance optimisation in _generate_inventory by avoiding normalisation checks and just using a factory to create the inventory entries.
1360
entry_factory = {
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
1361
    'directory': InventoryDirectory,
1362
    'file': InventoryFile,
1363
    'symlink': InventoryLink,
2255.6.8 by Aaron Bentley
Merge refactoring of add_reference
1364
    'tree-reference': TreeReference
2255.2.74 by Robert Collins
Minor performance optimisation in _generate_inventory by avoiding normalisation checks and just using a factory to create the inventory entries.
1365
}
1366
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)
1367
def make_entry(kind, name, parent_id, file_id=None):
1368
    """Create an inventory entry.
1369
1370
    :param kind: the type of inventory entry to create.
1371
    :param name: the basename of the entry.
1372
    :param parent_id: the parent_id of the entry.
1373
    :param file_id: the file_id to use. if None, one will be created.
1374
    """
1375
    if file_id is None:
2116.4.1 by John Arbash Meinel
Update file and revision id generators.
1376
        file_id = generate_ids.gen_file_id(name)
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
1377
    else:
1378
        file_id = osutils.safe_file_id(file_id)
1830.3.5 by John Arbash Meinel
make_entry refuses to create non-normalized entries.
1379
2255.2.54 by Robert Collins
Add in non-normalized filename sanity check to dirstate add().
1380
    #------- This has been copied to bzrlib.dirstate.DirState.add, please
1381
    # keep them synchronised.
2255.2.58 by Robert Collins
Fix the way we used osutils.normalized_filename in dirstate to support overriding in tests - and document this in the original location it was used.
1382
    # we dont import normalized_filename directly because we want to be
1383
    # able to change the implementation at runtime for tests.
1830.3.5 by John Arbash Meinel
make_entry refuses to create non-normalized entries.
1384
    norm_name, can_access = osutils.normalized_filename(name)
1385
    if norm_name != name:
1386
        if can_access:
1387
            name = norm_name
1388
        else:
1389
            # TODO: jam 20060701 This would probably be more useful
1390
            #       if the error was raised with the full path
1391
            raise errors.InvalidNormalization(name)
1392
2255.2.74 by Robert Collins
Minor performance optimisation in _generate_inventory by avoiding normalisation checks and just using a factory to create the inventory entries.
1393
    try:
1394
        factory = entry_factory[kind]
1395
    except KeyError:
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)
1396
        raise BzrError("unknown kind %r" % kind)
2255.2.74 by Robert Collins
Minor performance optimisation in _generate_inventory by avoiding normalisation checks and just using a factory to create the inventory entries.
1397
    return factory(file_id, name, parent_id)
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)
1398
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
1399
1077 by Martin Pool
- avoid compiling REs at module load time
1400
_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
1401
1402
def is_valid_name(name):
1077 by Martin Pool
- avoid compiling REs at module load time
1403
    global _NAME_RE
1753.1.4 by Robert Collins
Fixup '== None' usage in inventory.py.
1404
    if _NAME_RE is None:
1077 by Martin Pool
- avoid compiling REs at module load time
1405
        _NAME_RE = re.compile(r'^[^/\\]+$')
1406
        
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
1407
    return bool(_NAME_RE.match(name))