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