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