~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"""
3350.8.3 by Robert Collins
VF.get_sha1s needed changing to be stackable.
475
        key = (self.file_id, self.revision)
476
        if key in checker.checked_texts:
477
            prev_sha = checker.checked_texts[key]
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
1616.1.5 by Martin Pool
Cleanup and document some check code
487
        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'.
488
        checker.checked_text_cnt += 1
1185.50.28 by John Arbash Meinel
Lots of updates for 'bzr check'
489
        # We can't check the length, because Weave doesn't store that
490
        # information, and the whole point of looking at the weave's
491
        # sha1sum is that we don't have to extract the text.
3350.8.3 by Robert Collins
VF.get_sha1s needed changing to be stackable.
492
        if (self.text_sha1 != tree._repository.texts.get_sha1s([key])[key]):
493
            raise BzrCheckError('text {%s} version {%s} wrong sha1' % key)
494
        checker.checked_texts[key] = self.text_sha1
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
495
496
    def copy(self):
497
        other = InventoryFile(self.file_id, self.name, self.parent_id)
498
        other.executable = self.executable
499
        other.text_id = self.text_id
500
        other.text_sha1 = self.text_sha1
501
        other.text_size = self.text_size
502
        other.revision = self.revision
503
        return other
504
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
505
    def detect_changes(self, old_entry):
506
        """See InventoryEntry.detect_changes."""
507
        text_modified = (self.text_sha1 != old_entry.text_sha1)
508
        meta_modified = (self.executable != old_entry.executable)
509
        return text_modified, meta_modified
510
511
    def _diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree,
512
             output_to, reverse=False):
513
        """See InventoryEntry._diff."""
3009.2.22 by Aaron Bentley
Update names & docstring
514
        from bzrlib.diff import DiffText
3009.2.5 by Aaron Bentley
Factor symlink and file diffing into differ
515
        from_file_id = self.file_id
516
        if to_entry:
517
            to_file_id = to_entry.file_id
518
        else:
519
            to_file_id = None
520
        if reverse:
521
            to_file_id, from_file_id = from_file_id, to_file_id
522
            tree, to_tree = to_tree, tree
523
            from_label, to_label = to_label, from_label
3009.2.22 by Aaron Bentley
Update names & docstring
524
        differ = DiffText(tree, to_tree, output_to, 'utf-8', '', '',
525
                          text_diff)
3009.2.5 by Aaron Bentley
Factor symlink and file diffing into differ
526
        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
527
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
528
    def has_text(self):
529
        """See InventoryEntry.has_text."""
530
        return True
531
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
532
    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
533
        super(InventoryFile, self).__init__(file_id, name, parent_id)
534
        self.kind = 'file'
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
535
536
    def kind_character(self):
537
        """See InventoryEntry.kind_character."""
538
        return ''
539
540
    def _put_in_tar(self, item, tree):
541
        """See InventoryEntry._put_in_tar."""
542
        item.type = tarfile.REGTYPE
543
        fileobj = tree.get_file(self.file_id)
544
        item.size = self.text_size
545
        if tree.is_executable(self.file_id):
546
            item.mode = 0755
547
        else:
548
            item.mode = 0644
549
        return fileobj
550
551
    def _put_on_disk(self, fullpath, tree):
552
        """See InventoryEntry._put_on_disk."""
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
553
        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
554
        if tree.is_executable(self.file_id):
555
            os.chmod(fullpath, 0755)
556
1185.12.33 by Aaron Bentley
Fixed symlink reverting
557
    def _read_tree_state(self, path, work_tree):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
558
        """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
559
        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.
560
        # FIXME: 20050930 probe for the text size when getting sha1
561
        # in _read_tree_state
1732.1.19 by John Arbash Meinel
If you have the path, use it rather than looking it up again
562
        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
563
1733.1.4 by Robert Collins
Cosmetic niceties for debugging, extra comments etc.
564
    def __repr__(self):
565
        return ("%s(%r, %r, parent_id=%r, sha1=%r, len=%s)"
566
                % (self.__class__.__name__,
567
                   self.file_id,
568
                   self.name,
569
                   self.parent_id,
570
                   self.text_sha1,
571
                   self.text_size))
572
1534.7.175 by Aaron Bentley
Ensured revert writes a normal inventory
573
    def _forget_tree_state(self):
574
        self.text_sha1 = None
575
1405 by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave
576
    def _unchanged(self, previous_ie):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
577
        """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
578
        compatible = super(InventoryFile, self)._unchanged(previous_ie)
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
579
        if self.text_sha1 != previous_ie.text_sha1:
580
            compatible = False
581
        else:
582
            # FIXME: 20050930 probe for the text size when getting sha1
583
            # in _read_tree_state
584
            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
585
        if self.executable != previous_ie.executable:
586
            compatible = False
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
587
        return compatible
588
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
589
590
class InventoryLink(InventoryEntry):
591
    """A file in an inventory."""
592
1757.2.10 by Robert Collins
Give all inventory entries __slots__ that are useful with the current codebase.
593
    __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.
594
                 'text_id', 'parent_id', 'children', 'executable',
595
                 'revision', 'symlink_target', 'reference_revision']
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
596
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
597
    def _check(self, checker, rev_id, tree):
598
        """See InventoryEntry._check"""
1757.2.11 by Robert Collins
Correct bzr diff | less= None clauses in inventory.py to be is not None.
599
        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
600
            raise BzrCheckError('symlink {%s} has text in revision {%s}'
601
                    % (self.file_id, rev_id))
1753.1.4 by Robert Collins
Fixup '== None' usage in inventory.py.
602
        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
603
            raise BzrCheckError('symlink {%s} has no target in revision {%s}'
604
                    % (self.file_id, rev_id))
605
606
    def copy(self):
607
        other = InventoryLink(self.file_id, self.name, self.parent_id)
608
        other.symlink_target = self.symlink_target
609
        other.revision = self.revision
610
        return other
611
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
612
    def detect_changes(self, old_entry):
613
        """See InventoryEntry.detect_changes."""
614
        # FIXME: which _modified field should we use ? RBC 20051003
615
        text_modified = (self.symlink_target != old_entry.symlink_target)
616
        if text_modified:
617
            mutter("    symlink target changed")
618
        meta_modified = False
619
        return text_modified, meta_modified
620
621
    def _diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree,
622
             output_to, reverse=False):
623
        """See InventoryEntry._diff."""
3009.2.22 by Aaron Bentley
Update names & docstring
624
        from bzrlib.diff import DiffSymlink
3009.2.5 by Aaron Bentley
Factor symlink and file diffing into differ
625
        old_target = self.symlink_target
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
626
        if to_entry is not None:
3009.2.5 by Aaron Bentley
Factor symlink and file diffing into differ
627
            new_target = to_entry.symlink_target
628
        else:
629
            new_target = None
630
        if not reverse:
631
            old_tree = tree
632
            new_tree = to_tree
633
        else:
634
            old_tree = to_tree
635
            new_tree = tree
636
            new_target, old_target = old_target, new_target
3009.2.22 by Aaron Bentley
Update names & docstring
637
        differ = DiffSymlink(old_tree, new_tree, output_to)
3009.2.5 by Aaron Bentley
Factor symlink and file diffing into differ
638
        return differ.diff_symlink(old_target, new_target)
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
639
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
640
    def __init__(self, file_id, name, parent_id):
641
        super(InventoryLink, self).__init__(file_id, name, parent_id)
642
        self.kind = 'symlink'
643
644
    def kind_character(self):
645
        """See InventoryEntry.kind_character."""
646
        return ''
647
648
    def _put_in_tar(self, item, tree):
649
        """See InventoryEntry._put_in_tar."""
1185.33.3 by Martin Pool
[merge] jelmer
650
        item.type = tarfile.SYMTYPE
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
651
        fileobj = None
652
        item.size = 0
653
        item.mode = 0755
654
        item.linkname = self.symlink_target
655
        return fileobj
656
657
    def _put_on_disk(self, fullpath, tree):
658
        """See InventoryEntry._put_on_disk."""
659
        try:
660
            os.symlink(self.symlink_target, fullpath)
661
        except OSError,e:
662
            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
663
1185.12.33 by Aaron Bentley
Fixed symlink reverting
664
    def _read_tree_state(self, path, work_tree):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
665
        """See InventoryEntry._read_tree_state."""
666
        self.symlink_target = work_tree.get_symlink_target(self.file_id)
667
1534.7.175 by Aaron Bentley
Ensured revert writes a normal inventory
668
    def _forget_tree_state(self):
669
        self.symlink_target = None
670
1405 by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave
671
    def _unchanged(self, previous_ie):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
672
        """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
673
        compatible = super(InventoryLink, self)._unchanged(previous_ie)
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
674
        if self.symlink_target != previous_ie.symlink_target:
675
            compatible = False
676
        return compatible
677
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
678
2100.3.1 by Aaron Bentley
Start roundtripping tree-reference entries
679
class TreeReference(InventoryEntry):
680
    
681
    kind = 'tree-reference'
682
    
2255.6.8 by Aaron Bentley
Merge refactoring of add_reference
683
    def __init__(self, file_id, name, parent_id, revision=None,
684
                 reference_revision=None):
2100.3.1 by Aaron Bentley
Start roundtripping tree-reference entries
685
        InventoryEntry.__init__(self, file_id, name, parent_id)
686
        self.revision = revision
687
        self.reference_revision = reference_revision
688
2100.3.18 by Aaron Bentley
Get commit working for tree references
689
    def copy(self):
690
        return TreeReference(self.file_id, self.name, self.parent_id,
691
                             self.revision, self.reference_revision)
692
2100.3.19 by Aaron Bentley
Ensure commit preserves reference revision
693
    def _read_tree_state(self, path, work_tree):
694
        """Populate fields in the inventory entry from the given tree.
695
        """
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.
696
        self.reference_revision = work_tree.get_reference_revision(
697
            self.file_id, path)
2100.3.19 by Aaron Bentley
Ensure commit preserves reference revision
698
699
    def _forget_tree_state(self):
700
        self.reference_revision = None 
701
2825.5.2 by Robert Collins
Review feedback, and fix pointless commits with nested trees to raise PointlessCommit appropriately.
702
    def _unchanged(self, previous_ie):
703
        """See InventoryEntry._unchanged."""
704
        compatible = super(TreeReference, self)._unchanged(previous_ie)
705
        if self.reference_revision != previous_ie.reference_revision:
706
            compatible = False
707
        return compatible
708
2100.3.19 by Aaron Bentley
Ensure commit preserves reference revision
709
802 by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions
710
class Inventory(object):
1 by mbp at sourcefrog
import from baz patch-364
711
    """Inventory of versioned files in a tree.
712
240 by mbp at sourcefrog
doc
713
    This describes which file_id is present at each point in the tree,
714
    and possibly the SHA-1 or other information about the file.
715
    Entries can be looked up either by path or by file_id.
1 by mbp at sourcefrog
import from baz patch-364
716
717
    The inventory represents a typical unix file tree, with
718
    directories containing files and subdirectories.  We never store
719
    the full path to a file, because renaming a directory implicitly
720
    moves all of its contents.  This class internally maintains a
721
    lookup tree that allows the children under a directory to be
722
    returned quickly.
723
724
    InventoryEntry objects must not be modified after they are
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
725
    inserted, other than through the Inventory API.
1 by mbp at sourcefrog
import from baz patch-364
726
727
    >>> inv = Inventory()
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
728
    >>> 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.
729
    InventoryFile('123-123', 'hello.c', parent_id='TREE_ROOT', sha1=None, len=None)
1 by mbp at sourcefrog
import from baz patch-364
730
    >>> inv['123-123'].name
731
    'hello.c'
732
733
    May be treated as an iterator or set to look up file ids:
734
    
735
    >>> bool(inv.path2id('hello.c'))
736
    True
737
    >>> '123-123' in inv
738
    True
739
740
    May also look up by name:
741
742
    >>> [x[0] for x in inv.iter_entries()]
1852.6.6 by Robert Collins
Finish updating iter_entries change to make all tests pass.
743
    ['', u'hello.c']
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
744
    >>> 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
745
    >>> inv.add(InventoryFile('123-123', 'hello.c', ROOT_ID))
1731.1.33 by Aaron Bentley
Revert no-special-root changes
746
    Traceback (most recent call last):
747
    BzrError: parent_id {TREE_ROOT} not in inventory
748
    >>> 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.
749
    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
750
    """
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
751
    def __init__(self, root_id=ROOT_ID, revision_id=None):
1 by mbp at sourcefrog
import from baz patch-364
752
        """Create or read an inventory.
753
754
        If a working directory is specified, the inventory is read
755
        from there.  If the file is specified, read from that. If not,
756
        the inventory is created empty.
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
757
758
        The inventory is created with a default root directory, with
759
        an id of None.
1 by mbp at sourcefrog
import from baz patch-364
760
        """
1731.1.33 by Aaron Bentley
Revert no-special-root changes
761
        if root_id is not None:
2294.1.5 by John Arbash Meinel
Fix Inventory.iter_entries_by_dir to return Unicode paths,
762
            self._set_root(InventoryDirectory(root_id, u'', None))
1731.1.33 by Aaron Bentley
Revert no-special-root changes
763
        else:
764
            self.root = None
765
            self._byid = {}
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
766
        self.revision_id = revision_id
1910.2.3 by Aaron Bentley
All tests pass
767
2865.1.1 by Robert Collins
Create new mutable tree method update_to_one_parent_via_delta for eventual use by commit.
768
    def __repr__(self):
769
        return "<Inventory object at %x, contents=%r>" % (id(self), self._byid)
770
771
    def apply_delta(self, delta):
772
        """Apply a delta to this inventory.
773
774
        :param delta: A list of changes to apply. After all the changes are
775
            applied the final inventory must be internally consistent, but it
776
            is ok to supply changes which, if only half-applied would have an
777
            invalid result - such as supplying two changes which rename two
778
            files, 'A' and 'B' with each other : [('A', 'B', 'A-id', a_entry),
779
            ('B', 'A', 'B-id', b_entry)].
780
781
            Each change is a tuple, of the form (old_path, new_path, file_id,
782
            new_entry).
783
            
784
            When new_path is None, the change indicates the removal of an entry
785
            from the inventory and new_entry will be ignored (using None is
786
            appropriate). If new_path is not None, then new_entry must be an
787
            InventoryEntry instance, which will be incorporated into the
788
            inventory (and replace any existing entry with the same file id).
789
            
790
            When old_path is None, the change indicates the addition of
791
            a new entry to the inventory.
792
            
793
            When neither new_path nor old_path are None, the change is a
794
            modification to an entry, such as a rename, reparent, kind change
795
            etc. 
796
797
            The children attribute of new_entry is ignored. This is because
2865.1.3 by Robert Collins
Review feedback.
798
            this method preserves children automatically across alterations to
799
            the parent of the children, and cases where the parent id of a
800
            child is changing require the child to be passed in as a separate
801
            change regardless. E.g. in the recursive deletion of a directory -
802
            the directory's children must be included in the delta, or the
803
            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.
804
        """
805
        children = {}
806
        # Remove all affected items which were in the original inventory,
807
        # starting with the longest paths, thus ensuring parents are examined
808
        # after their children, which means that everything we examine has no
809
        # modified children remaining by the time we examine it.
810
        for old_path, file_id in sorted(((op, f) for op, np, f, e in delta
811
                                        if op is not None), reverse=True):
812
            if file_id not in self:
813
                # adds come later
814
                continue
815
            # Preserve unaltered children of file_id for later reinsertion.
816
            children[file_id] = getattr(self[file_id], 'children', {})
817
            # Remove file_id and the unaltered children. If file_id is not
818
            # being deleted it will be reinserted back later.
819
            self.remove_recursive_id(file_id)
820
        # Insert all affected which should be in the new inventory, reattaching
821
        # their children if they had any. This is done from shortest path to
822
        # longest, ensuring that items which were modified and whose parents in
823
        # the resulting inventory were also modified, are inserted after their
824
        # parents.
825
        for new_path, new_entry in sorted((np, e) for op, np, f, e in
826
                                          delta if np is not None):
827
            if new_entry.kind == 'directory':
828
                new_entry.children = children.get(new_entry.file_id, {})
829
            self.add(new_entry)
830
1910.2.3 by Aaron Bentley
All tests pass
831
    def _set_root(self, ie):
832
        self.root = ie
1907.1.2 by Aaron Bentley
More removal of unique-root stuff
833
        self._byid = {self.root.file_id: self.root}
1 by mbp at sourcefrog
import from baz patch-364
834
1189 by Martin Pool
- BROKEN: partial support for commit into weave
835
    def copy(self):
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
836
        # TODO: jam 20051218 Should copy also copy the revision_id?
1852.6.3 by Robert Collins
Make iter(Tree) consistent for all tree types.
837
        entries = self.iter_entries()
2938.2.1 by Jelmer Vernooij
Handle empty inventories in Inventory.copy().
838
        if self.root is None:
839
            return Inventory(root_id=None)
1852.6.3 by Robert Collins
Make iter(Tree) consistent for all tree types.
840
        other = Inventory(entries.next()[1].file_id)
1206 by Martin Pool
- fix bug in Inventory.copy()
841
        # copy recursively so we know directories will be added before
842
        # their children.  There are more efficient ways than this...
2935.2.1 by Jelmer Vernooij
Fix Inventory.copy() and add a test for it.
843
        for path, entry in entries:
1189 by Martin Pool
- BROKEN: partial support for commit into weave
844
            other.add(entry.copy())
845
        return other
846
1 by mbp at sourcefrog
import from baz patch-364
847
    def __iter__(self):
848
        return iter(self._byid)
849
850
    def __len__(self):
851
        """Returns number of entries."""
852
        return len(self._byid)
853
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
854
    def iter_entries(self, from_dir=None):
1 by mbp at sourcefrog
import from baz patch-364
855
        """Return (path, entry) pairs, in order by name."""
1753.1.4 by Robert Collins
Fixup '== None' usage in inventory.py.
856
        if from_dir is None:
1731.1.33 by Aaron Bentley
Revert no-special-root changes
857
            if self.root is None:
858
                return
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
859
            from_dir = self.root
1852.6.3 by Robert Collins
Make iter(Tree) consistent for all tree types.
860
            yield '', self.root
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
861
        elif isinstance(from_dir, basestring):
862
            from_dir = self._byid[from_dir]
863
            
1732.1.24 by John Arbash Meinel
iter_entries time drops to 1/6th time
864
        # unrolling the recursive called changed the time from
865
        # 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
866
        children = from_dir.children.items()
867
        children.sort()
868
        children = collections.deque(children)
869
        stack = [(u'', children)]
870
        while stack:
871
            from_dir_relpath, children = stack[-1]
872
873
            while children:
874
                name, ie = children.popleft()
875
876
                # we know that from_dir_relpath never ends in a slash
877
                # and 'f' doesn't begin with one, we can do a string op, rather
878
                # than the checks of pathjoin(), though this means that all paths
879
                # start with a slash
880
                path = from_dir_relpath + '/' + name
881
882
                yield path[1:], ie
883
884
                if ie.kind != 'directory':
885
                    continue
886
887
                # But do this child first
888
                new_children = ie.children.items()
889
                new_children.sort()
890
                new_children = collections.deque(new_children)
891
                stack.append((path, new_children))
892
                # Break out of inner loop, so that we start outer loop with child
893
                break
894
            else:
895
                # 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.
896
                stack.pop()
555 by Martin Pool
- New Inventory.entries() method
897
2825.7.1 by Robert Collins
* Partial commits are now approximately 40% faster by walking over the
898
    def iter_entries_by_dir(self, from_dir=None, specific_file_ids=None,
899
        yield_parents=False):
1711.2.36 by John Arbash Meinel
Add an iter_entries_by_dir which returns directory children before their children.
900
        """Iterate over the entries in a directory first order.
901
902
        This returns all entries for a directory before returning
903
        the entries for children of a directory. This is not
904
        lexicographically sorted order, and is a hybrid between
905
        depth-first and breadth-first.
906
2825.7.1 by Robert Collins
* Partial commits are now approximately 40% faster by walking over the
907
        :param yield_parents: If True, yield the parents from the root leading
908
            down to specific_file_ids that have been requested. This has no
909
            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.
910
        :return: This yields (path, entry) pairs
911
        """
2858.2.1 by Martin Pool
Remove most calls to safe_file_id and safe_revision_id.
912
        if specific_file_ids and not isinstance(specific_file_ids, set):
913
            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.
914
        # TODO? Perhaps this should return the from_dir so that the root is
915
        # yielded? or maybe an option?
1753.1.4 by Robert Collins
Fixup '== None' usage in inventory.py.
916
        if from_dir is None:
1731.1.47 by Aaron Bentley
Merge bzr.dev
917
            if self.root is None:
918
                return
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
919
            # Optimize a common case
2825.7.1 by Robert Collins
* Partial commits are now approximately 40% faster by walking over the
920
            if (not yield_parents and specific_file_ids is not None and
921
                len(specific_file_ids) == 1):
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
922
                file_id = list(specific_file_ids)[0]
923
                if file_id in self:
924
                    yield self.id2path(file_id), self[file_id]
925
                return 
1711.2.36 by John Arbash Meinel
Add an iter_entries_by_dir which returns directory children before their children.
926
            from_dir = self.root
2825.7.1 by Robert Collins
* Partial commits are now approximately 40% faster by walking over the
927
            if (specific_file_ids is None or yield_parents or
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
928
                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,
929
                yield u'', self.root
1711.2.36 by John Arbash Meinel
Add an iter_entries_by_dir which returns directory children before their children.
930
        elif isinstance(from_dir, basestring):
931
            from_dir = self._byid[from_dir]
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
932
933
        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.
934
            # TODO: jam 20070302 This could really be done as a loop rather
935
            #       than a bunch of recursive calls.
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
936
            parents = set()
2309.4.2 by John Arbash Meinel
Change iter_entries_by_dir to avoid extra file id safety checks.
937
            byid = self._byid
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
938
            def add_ancestors(file_id):
2309.4.2 by John Arbash Meinel
Change iter_entries_by_dir to avoid extra file id safety checks.
939
                if file_id not in byid:
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
940
                    return
2309.4.2 by John Arbash Meinel
Change iter_entries_by_dir to avoid extra file id safety checks.
941
                parent_id = byid[file_id].parent_id
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
942
                if parent_id is None:
943
                    return
944
                if parent_id not in parents:
945
                    parents.add(parent_id)
946
                    add_ancestors(parent_id)
947
            for file_id in specific_file_ids:
948
                add_ancestors(file_id)
949
        else:
950
            parents = None
1711.2.36 by John Arbash Meinel
Add an iter_entries_by_dir which returns directory children before their children.
951
            
952
        stack = [(u'', from_dir)]
953
        while stack:
954
            cur_relpath, cur_dir = stack.pop()
955
956
            child_dirs = []
957
            for child_name, child_ie in sorted(cur_dir.children.iteritems()):
958
959
                child_relpath = cur_relpath + child_name
960
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
961
                if (specific_file_ids is None or 
2825.7.1 by Robert Collins
* Partial commits are now approximately 40% faster by walking over the
962
                    child_ie.file_id in specific_file_ids or
963
                    (yield_parents and child_ie.file_id in parents)):
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
964
                    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.
965
966
                if child_ie.kind == 'directory':
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
967
                    if parents is None or child_ie.file_id in parents:
968
                        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.
969
            stack.extend(reversed(child_dirs))
970
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
971
    def make_entry(self, kind, name, parent_id, file_id=None):
972
        """Simple thunk to bzrlib.inventory.make_entry."""
973
        return make_entry(kind, name, parent_id, file_id)
974
555 by Martin Pool
- New Inventory.entries() method
975
    def entries(self):
976
        """Return list of (path, ie) for all entries except the root.
977
978
        This may be faster than iter_entries.
979
        """
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
980
        accum = []
981
        def descend(dir_ie, dir_path):
556 by Martin Pool
- fix up Inventory.entries()
982
            kids = dir_ie.children.items()
555 by Martin Pool
- New Inventory.entries() method
983
            kids.sort()
984
            for name, ie in kids:
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
985
                child_path = osutils.pathjoin(dir_path, name)
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
986
                accum.append((child_path, ie))
555 by Martin Pool
- New Inventory.entries() method
987
                if ie.kind == 'directory':
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
988
                    descend(ie, child_path)
555 by Martin Pool
- New Inventory.entries() method
989
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
990
        descend(self.root, u'')
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
991
        return accum
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
992
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
993
    def directories(self):
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
994
        """Return (path, entry) pairs for all directories, including the root.
1 by mbp at sourcefrog
import from baz patch-364
995
        """
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
996
        accum = []
997
        def descend(parent_ie, parent_path):
998
            accum.append((parent_path, parent_ie))
156 by mbp at sourcefrog
new "directories" command
999
            
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
1000
            kids = [(ie.name, ie) for ie in parent_ie.children.itervalues() if ie.kind == 'directory']
1001
            kids.sort()
156 by mbp at sourcefrog
new "directories" command
1002
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
1003
            for name, child_ie in kids:
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
1004
                child_path = osutils.pathjoin(parent_path, name)
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
1005
                descend(child_ie, child_path)
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1006
        descend(self.root, u'')
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
1007
        return accum
1 by mbp at sourcefrog
import from baz patch-364
1008
        
1009
    def __contains__(self, file_id):
1010
        """True if this entry contains a file with given id.
1011
1012
        >>> inv = Inventory()
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
1013
        >>> inv.add(InventoryFile('123', 'foo.c', ROOT_ID))
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
1014
        InventoryFile('123', 'foo.c', parent_id='TREE_ROOT', sha1=None, len=None)
1 by mbp at sourcefrog
import from baz patch-364
1015
        >>> '123' in inv
1016
        True
1017
        >>> '456' in inv
1018
        False
1019
        """
1711.9.11 by John Arbash Meinel
change return foo in bar to return (foo in bar)
1020
        return (file_id in self._byid)
1 by mbp at sourcefrog
import from baz patch-364
1021
1022
    def __getitem__(self, file_id):
1023
        """Return the entry for given file_id.
1024
1025
        >>> inv = Inventory()
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
1026
        >>> inv.add(InventoryFile('123123', 'hello.c', ROOT_ID))
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
1027
        InventoryFile('123123', 'hello.c', parent_id='TREE_ROOT', sha1=None, len=None)
1 by mbp at sourcefrog
import from baz patch-364
1028
        >>> inv['123123'].name
1029
        'hello.c'
1030
        """
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
1031
        try:
1032
            return self._byid[file_id]
1033
        except KeyError:
2067.3.1 by Martin Pool
Clean up BzrNewError, other exception classes and users.
1034
            # really we're passing an inventory, not a tree...
1035
            raise errors.NoSuchId(self, file_id)
1 by mbp at sourcefrog
import from baz patch-364
1036
460 by Martin Pool
- new testing command compare-trees
1037
    def get_file_kind(self, file_id):
1038
        return self._byid[file_id].kind
1039
138 by mbp at sourcefrog
remove parallel tree from inventory;
1040
    def get_child(self, parent_id, filename):
1732.1.18 by John Arbash Meinel
50ms is probably not worth it
1041
        return self[parent_id].children.get(filename)
138 by mbp at sourcefrog
remove parallel tree from inventory;
1042
2100.3.6 by Aaron Bentley
Make add recursive for children of added entries
1043
    def _add_child(self, entry):
1044
        """Add an entry to the inventory, without adding it to its parent"""
1045
        if entry.file_id in self._byid:
1046
            raise BzrError("inventory already contains entry with id {%s}" %
1047
                           entry.file_id)
1048
        self._byid[entry.file_id] = entry
1049
        for child in getattr(entry, 'children', {}).itervalues():
1050
            self._add_child(child)
1051
        return entry
1052
1 by mbp at sourcefrog
import from baz patch-364
1053
    def add(self, entry):
1054
        """Add entry to inventory.
1055
1056
        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
1057
        which calls this.
1058
1059
        Returns the new entry object.
1060
        """
139 by mbp at sourcefrog
simplified/faster Inventory.add
1061
        if entry.file_id in self._byid:
2255.7.16 by John Arbash Meinel
Make sure adding a duplicate file_id raises DuplicateFileId.
1062
            raise errors.DuplicateFileId(entry.file_id,
1063
                                         self._byid[entry.file_id])
1 by mbp at sourcefrog
import from baz patch-364
1064
1731.1.33 by Aaron Bentley
Revert no-special-root changes
1065
        if entry.parent_id is None:
2100.3.6 by Aaron Bentley
Make add recursive for children of added entries
1066
            self.root = entry
1067
        else:
1068
            try:
1069
                parent = self._byid[entry.parent_id]
1070
            except KeyError:
1071
                raise BzrError("parent_id {%s} not in inventory" %
1072
                               entry.parent_id)
1073
1074
            if entry.name in parent.children:
1075
                raise BzrError("%s is already versioned" %
1076
                        osutils.pathjoin(self.id2path(parent.file_id),
1551.13.12 by Aaron Bentley
Fix encoding of 'already versioned' error
1077
                        entry.name).encode('utf-8'))
2100.3.6 by Aaron Bentley
Make add recursive for children of added entries
1078
            parent.children[entry.name] = entry
1079
        return self._add_child(entry)
1 by mbp at sourcefrog
import from baz patch-364
1080
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)
1081
    def add_path(self, relpath, kind, file_id=None, parent_id=None):
70 by mbp at sourcefrog
Prepare for smart recursive add.
1082
        """Add entry from a path.
1083
1180 by Martin Pool
- start splitting code for xml (de)serialization away from objects
1084
        The immediate parent must already be versioned.
1085
1086
        Returns the new entry object."""
1015 by Martin Pool
- fix circular imports
1087
        
1830.3.5 by John Arbash Meinel
make_entry refuses to create non-normalized entries.
1088
        parts = osutils.splitpath(relpath)
70 by mbp at sourcefrog
Prepare for smart recursive add.
1089
1534.7.69 by Aaron Bentley
Got real root moves working
1090
        if len(parts) == 0:
1713.1.6 by Robert Collins
Move file id random data selection out of the inner loop for 'bzr add'.
1091
            if file_id is None:
2116.4.1 by John Arbash Meinel
Update file and revision id generators.
1092
                file_id = generate_ids.gen_root_id()
1731.1.1 by Aaron Bentley
Make root entry an InventoryDirectory, make EmptyTree really empty
1093
            self.root = InventoryDirectory(file_id, '', None)
1534.7.69 by Aaron Bentley
Got real root moves working
1094
            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.
1095
            return self.root
1534.7.69 by Aaron Bentley
Got real root moves working
1096
        else:
1097
            parent_path = parts[:-1]
1098
            parent_id = self.path2id(parent_path)
1753.1.4 by Robert Collins
Fixup '== None' usage in inventory.py.
1099
            if parent_id is None:
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
1100
                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)
1101
        ie = make_entry(kind, parts[-1], parent_id, file_id)
70 by mbp at sourcefrog
Prepare for smart recursive add.
1102
        return self.add(ie)
1103
1 by mbp at sourcefrog
import from baz patch-364
1104
    def __delitem__(self, file_id):
1105
        """Remove entry by id.
1106
1107
        >>> inv = Inventory()
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
1108
        >>> inv.add(InventoryFile('123', 'foo.c', ROOT_ID))
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
1109
        InventoryFile('123', 'foo.c', parent_id='TREE_ROOT', sha1=None, len=None)
1 by mbp at sourcefrog
import from baz patch-364
1110
        >>> '123' in inv
1111
        True
1112
        >>> del inv['123']
1113
        >>> '123' in inv
1114
        False
1115
        """
1116
        ie = self[file_id]
1117
        del self._byid[file_id]
1534.7.69 by Aaron Bentley
Got real root moves working
1118
        if ie.parent_id is not None:
1119
            del self[ie.parent_id].children[ie.name]
1 by mbp at sourcefrog
import from baz patch-364
1120
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
1121
    def __eq__(self, other):
1 by mbp at sourcefrog
import from baz patch-364
1122
        """Compare two sets by comparing their contents.
1123
1124
        >>> i1 = Inventory()
1125
        >>> i2 = Inventory()
1126
        >>> i1 == i2
1127
        True
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
1128
        >>> i1.add(InventoryFile('123', 'foo', ROOT_ID))
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
1129
        InventoryFile('123', 'foo', parent_id='TREE_ROOT', sha1=None, len=None)
1 by mbp at sourcefrog
import from baz patch-364
1130
        >>> i1 == i2
1131
        False
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
1132
        >>> i2.add(InventoryFile('123', 'foo', ROOT_ID))
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
1133
        InventoryFile('123', 'foo', parent_id='TREE_ROOT', sha1=None, len=None)
1 by mbp at sourcefrog
import from baz patch-364
1134
        >>> i1 == i2
1135
        True
1136
        """
1137
        if not isinstance(other, Inventory):
1138
            return NotImplemented
1139
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
1140
        return self._byid == other._byid
1141
1142
    def __ne__(self, other):
1249 by Martin Pool
- improvements to weave commit [broken]
1143
        return not self.__eq__(other)
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
1144
1145
    def __hash__(self):
1146
        raise ValueError('not hashable')
1147
1596.2.19 by Robert Collins
Shave 20% off id2path.
1148
    def _iter_file_id_parents(self, file_id):
1149
        """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.
1150
        while file_id is not None:
1596.2.19 by Robert Collins
Shave 20% off id2path.
1151
            try:
1152
                ie = self._byid[file_id]
1153
            except KeyError:
2255.11.5 by Martin Pool
Tree.id2path should raise NoSuchId, not return None.
1154
                raise errors.NoSuchId(tree=None, file_id=file_id)
1596.2.19 by Robert Collins
Shave 20% off id2path.
1155
            yield ie
1156
            file_id = ie.parent_id
1 by mbp at sourcefrog
import from baz patch-364
1157
172 by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory
1158
    def get_idpath(self, file_id):
1159
        """Return a list of file_ids for the path to an entry.
1160
1161
        The list contains one element for each directory followed by
1162
        the id of the file itself.  So the length of the returned list
1163
        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
1164
        root directory as depth 1.
172 by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory
1165
        """
1166
        p = []
1596.2.19 by Robert Collins
Shave 20% off id2path.
1167
        for parent in self._iter_file_id_parents(file_id):
1168
            p.insert(0, parent.file_id)
172 by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory
1169
        return p
1170
1 by mbp at sourcefrog
import from baz patch-364
1171
    def id2path(self, file_id):
1596.2.19 by Robert Collins
Shave 20% off id2path.
1172
        """Return as a string the path to file_id.
1393.1.32 by Martin Pool
- add docstring demonstrating use of Inventory.id2path
1173
        
1174
        >>> i = Inventory()
1175
        >>> e = i.add(InventoryDirectory('src-id', 'src', ROOT_ID))
1176
        >>> e = i.add(InventoryFile('foo-id', 'foo.c', parent_id='src-id'))
1185.31.34 by John Arbash Meinel
Removing instances of os.sep
1177
        >>> print i.id2path('foo-id')
1393.1.32 by Martin Pool
- add docstring demonstrating use of Inventory.id2path
1178
        src/foo.c
1179
        """
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
1180
        # get all names, skipping root
1596.2.19 by Robert Collins
Shave 20% off id2path.
1181
        return '/'.join(reversed(
1182
            [parent.name for parent in 
1183
             self._iter_file_id_parents(file_id)][:-1]))
1 by mbp at sourcefrog
import from baz patch-364
1184
            
1185
    def path2id(self, name):
1186
        """Walk down through directories to return entry of last component.
1187
1188
        names may be either a list of path components, or a single
1189
        string, in which case it is automatically split.
1190
1191
        This returns the entry of the last component in the path,
1192
        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
1193
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)
1194
        Returns None IFF the path is not found.
1 by mbp at sourcefrog
import from baz patch-364
1195
        """
1996.3.10 by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile
1196
        if isinstance(name, basestring):
1197
            name = osutils.splitpath(name)
1 by mbp at sourcefrog
import from baz patch-364
1198
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)
1199
        # mutter("lookup path %r" % name)
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
1200
1201
        parent = self.root
1731.1.33 by Aaron Bentley
Revert no-special-root changes
1202
        if parent is None:
1203
            return None
70 by mbp at sourcefrog
Prepare for smart recursive add.
1204
        for f in name:
1 by mbp at sourcefrog
import from baz patch-364
1205
            try:
2091.3.1 by Aaron Bentley
When 'directory' path element isn't a directory, return None from path2id
1206
                children = getattr(parent, 'children', None)
2091.3.3 by Aaron Bentley
Test 'is None' not '== None'
1207
                if children is None:
2091.3.1 by Aaron Bentley
When 'directory' path element isn't a directory, return None from path2id
1208
                    return None
1209
                cie = children[f]
138 by mbp at sourcefrog
remove parallel tree from inventory;
1210
                parent = cie
1 by mbp at sourcefrog
import from baz patch-364
1211
            except KeyError:
1212
                # or raise an error?
1213
                return None
1214
138 by mbp at sourcefrog
remove parallel tree from inventory;
1215
        return parent.file_id
1 by mbp at sourcefrog
import from baz patch-364
1216
1217
    def has_filename(self, names):
1218
        return bool(self.path2id(names))
1219
1220
    def has_id(self, file_id):
1711.9.11 by John Arbash Meinel
change return foo in bar to return (foo in bar)
1221
        return (file_id in self._byid)
1 by mbp at sourcefrog
import from baz patch-364
1222
1988.2.6 by Robert Collins
Review feedback.
1223
    def remove_recursive_id(self, file_id):
1224
        """Remove file_id, and children, from the inventory.
1225
        
1226
        :param file_id: A file_id to remove.
1227
        """
1988.2.1 by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of
1228
        to_find_delete = [self._byid[file_id]]
1229
        to_delete = []
1988.2.6 by Robert Collins
Review feedback.
1230
        while to_find_delete:
1988.2.1 by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of
1231
            ie = to_find_delete.pop()
1232
            to_delete.append(ie.file_id)
1233
            if ie.kind == 'directory':
1234
                to_find_delete.extend(ie.children.values())
1235
        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.
1236
            ie = self[file_id]
1988.2.1 by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of
1237
            del self._byid[file_id]
1731.2.16 by Aaron Bentley
Get extract working for standalone trees
1238
        if ie.parent_id is not None:
1239
            del self[ie.parent_id].children[ie.name]
2376.2.3 by Aaron Bentley
Fix root replacement for apply_inventory_delta
1240
        else:
1241
            self.root = None
1988.2.1 by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of
1242
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
1243
    def rename(self, file_id, new_parent_id, new_name):
1244
        """Move a file within the inventory.
1245
1246
        This can change either the name, or the parent, or both.
1247
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
1248
        This does not move the working file.
1249
        """
2825.6.1 by Robert Collins
* ``WorkingTree.rename_one`` will now raise an error if normalisation of the
1250
        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
1251
        if not is_valid_name(new_name):
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
1252
            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
1253
1254
        new_parent = self._byid[new_parent_id]
1255
        if new_name in new_parent.children:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
1256
            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
1257
172 by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory
1258
        new_parent_idpath = self.get_idpath(new_parent_id)
1259
        if file_id in new_parent_idpath:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
1260
            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
1261
                    % (self.id2path(file_id), self.id2path(new_parent_id)))
1262
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
        file_ie = self._byid[file_id]
1264
        old_parent = self._byid[file_ie.parent_id]
1265
1266
        # TODO: Don't leave things messed up if this fails
1267
1268
        del old_parent.children[file_ie.name]
1269
        new_parent.children[new_name] = file_ie
1270
        
1271
        file_ie.name = new_name
1272
        file_ie.parent_id = new_parent_id
1273
1731.1.1 by Aaron Bentley
Make root entry an InventoryDirectory, make EmptyTree really empty
1274
    def is_root(self, file_id):
1275
        return self.root is not None and file_id == self.root.file_id
1276
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
1277
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.
1278
entry_factory = {
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
1279
    'directory': InventoryDirectory,
1280
    'file': InventoryFile,
1281
    'symlink': InventoryLink,
2255.6.8 by Aaron Bentley
Merge refactoring of add_reference
1282
    '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.
1283
}
1284
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)
1285
def make_entry(kind, name, parent_id, file_id=None):
1286
    """Create an inventory entry.
1287
1288
    :param kind: the type of inventory entry to create.
1289
    :param name: the basename of the entry.
1290
    :param parent_id: the parent_id of the entry.
1291
    :param file_id: the file_id to use. if None, one will be created.
1292
    """
1293
    if file_id is None:
2116.4.1 by John Arbash Meinel
Update file and revision id generators.
1294
        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
1295
    name = ensure_normalized_name(name)
1296
    try:
1297
        factory = entry_factory[kind]
1298
    except KeyError:
1299
        raise BzrError("unknown kind %r" % kind)
1300
    return factory(file_id, name, parent_id)
1301
1302
1303
def ensure_normalized_name(name):
1304
    """Normalize name.
1305
1306
    :raises InvalidNormalization: When name is not normalized, and cannot be
1307
        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
1308
    :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
1309
    """
2255.2.54 by Robert Collins
Add in non-normalized filename sanity check to dirstate add().
1310
    #------- This has been copied to bzrlib.dirstate.DirState.add, please
1311
    # 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.
1312
    # we dont import normalized_filename directly because we want to be
1313
    # able to change the implementation at runtime for tests.
1830.3.5 by John Arbash Meinel
make_entry refuses to create non-normalized entries.
1314
    norm_name, can_access = osutils.normalized_filename(name)
1315
    if norm_name != name:
1316
        if can_access:
2825.6.1 by Robert Collins
* ``WorkingTree.rename_one`` will now raise an error if normalisation of the
1317
            return norm_name
1830.3.5 by John Arbash Meinel
make_entry refuses to create non-normalized entries.
1318
        else:
1319
            # TODO: jam 20060701 This would probably be more useful
1320
            #       if the error was raised with the full path
1321
            raise errors.InvalidNormalization(name)
2825.6.1 by Robert Collins
* ``WorkingTree.rename_one`` will now raise an error if normalisation of the
1322
    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)
1323
160 by mbp at sourcefrog
- basic support for moving files to different directories - have not done support for renaming them yet, but should be straightforward - some tests, but many cases are not handled yet i think
1324
1077 by Martin Pool
- avoid compiling REs at module load time
1325
_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
1326
1327
def is_valid_name(name):
1077 by Martin Pool
- avoid compiling REs at module load time
1328
    global _NAME_RE
1753.1.4 by Robert Collins
Fixup '== None' usage in inventory.py.
1329
    if _NAME_RE is None:
1077 by Martin Pool
- avoid compiling REs at module load time
1330
        _NAME_RE = re.compile(r'^[^/\\]+$')
1331
        
160 by mbp at sourcefrog
- basic support for moving files to different directories - have not done support for renaming them yet, but should be straightforward - some tests, but many cases are not handled yet i think
1332
    return bool(_NAME_RE.match(name))