/brz/remove-bazaar

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