~bzr-pqm/bzr/bzr.dev

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