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