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