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