~bzr-pqm/bzr/bzr.dev

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