/brz/remove-bazaar

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