/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
1669.2.1 by Martin Pool
verbose commit now specifically identifies modified/renamed/reparented files
1
# Copyright (C) 2005, 2006 Canonical Ltd
1448 by Robert Collins
revert symlinks correctly
2
#
1 by mbp at sourcefrog
import from baz patch-364
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
1448 by Robert Collins
revert symlinks correctly
7
#
1 by mbp at sourcefrog
import from baz patch-364
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
1448 by Robert Collins
revert symlinks correctly
12
#
1 by mbp at sourcefrog
import from baz patch-364
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
1185.16.72 by Martin Pool
[merge] from robert and fix up tests
17
# FIXME: This refactoring of the workingtree code doesn't seem to keep 
18
# the WorkingTree's copy of the inventory in sync with the branch.  The
19
# branch modifies its working inventory when it does a commit to make
20
# missing files permanently removed.
1 by mbp at sourcefrog
import from baz patch-364
21
1197 by Martin Pool
doc
22
# TODO: Maybe also keep the full path of the entry, and the children?
23
# But those depend on its position within a particular inventory, and
24
# it would be nice not to need to hold the backpointer here.
25
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
26
# This should really be an id randomly assigned when the tree is
27
# created, but it's not for now.
28
ROOT_ID = "TREE_ROOT"
29
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
    ... 
1731.1.28 by Aaron Bentley
Merge from bzr.dev
88
    (True, InventoryDirectory('TREE_ROOT', '', parent_id=None, revision=None))
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
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__ = []
1092.2.23 by Robert Collins
move inventory entry centric snapshot taking logic to inventory.py
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
1731.1.2 by Aaron Bentley
Removed all remaining uses of root_directory
298
    known_kinds = ('file', 'directory', 'symlink')
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
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
500
class InventoryDirectory(InventoryEntry):
501
    """A directory in an inventory."""
502
1757.2.10 by Robert Collins
Give all inventory entries __slots__ that are useful with the current codebase.
503
    __slots__ = ['text_sha1', 'text_size', 'file_id', 'name', 'kind',
504
                 'text_id', 'parent_id', 'children', 'executable', 
505
                 'revision', 'symlink_target']
506
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
507
    def _check(self, checker, rev_id, tree):
508
        """See InventoryEntry._check"""
1757.2.11 by Robert Collins
Correct bzr diff | less= None clauses in inventory.py to be is not None.
509
        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
510
            raise BzrCheckError('directory {%s} has text in revision {%s}'
511
                                % (self.file_id, rev_id))
512
513
    def copy(self):
514
        other = InventoryDirectory(self.file_id, self.name, self.parent_id)
515
        other.revision = self.revision
516
        # note that children are *not* copied; they're pulled across when
517
        # others are added
518
        return other
519
520
    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
521
        super(InventoryDirectory, self).__init__(file_id, name, parent_id)
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
522
        self.children = {}
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
523
        self.kind = 'directory'
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
524
525
    def kind_character(self):
526
        """See InventoryEntry.kind_character."""
527
        return '/'
528
529
    def _put_in_tar(self, item, tree):
530
        """See InventoryEntry._put_in_tar."""
531
        item.type = tarfile.DIRTYPE
532
        fileobj = None
533
        item.name += '/'
534
        item.size = 0
535
        item.mode = 0755
536
        return fileobj
537
538
    def _put_on_disk(self, fullpath, tree):
539
        """See InventoryEntry._put_on_disk."""
540
        os.mkdir(fullpath)
541
1740.3.3 by Jelmer Vernooij
Move storing directories and links to commit builder.
542
    def _snapshot_text(self, file_parents, work_tree, commit_builder):
543
        """See InventoryEntry._snapshot_text."""
544
        commit_builder.modified_directory(self.file_id, file_parents)
545
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
546
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
547
class InventoryFile(InventoryEntry):
548
    """A file in an inventory."""
549
1757.2.10 by Robert Collins
Give all inventory entries __slots__ that are useful with the current codebase.
550
    __slots__ = ['text_sha1', 'text_size', 'file_id', 'name', 'kind',
551
                 'text_id', 'parent_id', 'children', 'executable', 
552
                 'revision', 'symlink_target']
553
1616.1.5 by Martin Pool
Cleanup and document some check code
554
    def _check(self, checker, tree_revision_id, tree):
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
555
        """See InventoryEntry._check"""
1616.1.5 by Martin Pool
Cleanup and document some check code
556
        t = (self.file_id, self.revision)
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
557
        if t in checker.checked_texts:
1616.1.5 by Martin Pool
Cleanup and document some check code
558
            prev_sha = checker.checked_texts[t]
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
559
            if prev_sha != self.text_sha1:
560
                raise BzrCheckError('mismatched sha1 on {%s} in {%s}' %
1616.1.5 by Martin Pool
Cleanup and document some check code
561
                                    (self.file_id, tree_revision_id))
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
562
            else:
563
                checker.repeated_text_cnt += 1
564
                return
1185.50.28 by John Arbash Meinel
Lots of updates for 'bzr check'
565
566
        if self.file_id not in checker.checked_weaves:
567
            mutter('check weave {%s}', self.file_id)
568
            w = tree.get_weave(self.file_id)
569
            # Not passing a progress bar, because it creates a new
570
            # progress, which overwrites the current progress,
571
            # and doesn't look nice
572
            w.check()
573
            checker.checked_weaves[self.file_id] = True
574
        else:
1563.2.14 by Robert Collins
Prepare weave store to delegate copy details to the versioned file.
575
            w = tree.get_weave(self.file_id)
1185.50.28 by John Arbash Meinel
Lots of updates for 'bzr check'
576
1616.1.5 by Martin Pool
Cleanup and document some check code
577
        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'.
578
        checker.checked_text_cnt += 1
1185.50.28 by John Arbash Meinel
Lots of updates for 'bzr check'
579
        # We can't check the length, because Weave doesn't store that
580
        # information, and the whole point of looking at the weave's
581
        # sha1sum is that we don't have to extract the text.
582
        if self.text_sha1 != w.get_sha1(self.revision):
583
            raise BzrCheckError('text {%s} version {%s} wrong sha1' 
584
                                % (self.file_id, self.revision))
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
585
        checker.checked_texts[t] = self.text_sha1
586
587
    def copy(self):
588
        other = InventoryFile(self.file_id, self.name, self.parent_id)
589
        other.executable = self.executable
590
        other.text_id = self.text_id
591
        other.text_sha1 = self.text_sha1
592
        other.text_size = self.text_size
593
        other.revision = self.revision
594
        return other
595
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
596
    def detect_changes(self, old_entry):
597
        """See InventoryEntry.detect_changes."""
1757.2.11 by Robert Collins
Correct bzr diff | less= None clauses in inventory.py to be is not None.
598
        assert self.text_sha1 is not None
599
        assert old_entry.text_sha1 is not None
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
600
        text_modified = (self.text_sha1 != old_entry.text_sha1)
601
        meta_modified = (self.executable != old_entry.executable)
602
        return text_modified, meta_modified
603
604
    def _diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree,
605
             output_to, reverse=False):
606
        """See InventoryEntry._diff."""
1558.15.2 by Aaron Bentley
Implemented binary file handling for diff
607
        try:
608
            from_text = tree.get_file(self.file_id).readlines()
609
            if to_entry:
610
                to_text = to_tree.get_file(to_entry.file_id).readlines()
611
            else:
612
                to_text = []
613
            if not reverse:
614
                text_diff(from_label, from_text,
615
                          to_label, to_text, output_to)
616
            else:
617
                text_diff(to_label, to_text,
618
                          from_label, from_text, output_to)
619
        except BinaryFile:
1558.15.11 by Aaron Bentley
Apply merge review suggestions
620
            if reverse:
621
                label_pair = (to_label, from_label)
622
            else:
623
                label_pair = (from_label, to_label)
624
            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
625
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
626
    def has_text(self):
627
        """See InventoryEntry.has_text."""
628
        return True
629
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
630
    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
631
        super(InventoryFile, self).__init__(file_id, name, parent_id)
632
        self.kind = 'file'
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
633
634
    def kind_character(self):
635
        """See InventoryEntry.kind_character."""
636
        return ''
637
638
    def _put_in_tar(self, item, tree):
639
        """See InventoryEntry._put_in_tar."""
640
        item.type = tarfile.REGTYPE
641
        fileobj = tree.get_file(self.file_id)
642
        item.size = self.text_size
643
        if tree.is_executable(self.file_id):
644
            item.mode = 0755
645
        else:
646
            item.mode = 0644
647
        return fileobj
648
649
    def _put_on_disk(self, fullpath, tree):
650
        """See InventoryEntry._put_on_disk."""
651
        pumpfile(tree.get_file(self.file_id), file(fullpath, 'wb'))
652
        if tree.is_executable(self.file_id):
653
            os.chmod(fullpath, 0755)
654
1185.12.33 by Aaron Bentley
Fixed symlink reverting
655
    def _read_tree_state(self, path, work_tree):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
656
        """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
657
        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.
658
        # FIXME: 20050930 probe for the text size when getting sha1
659
        # in _read_tree_state
1732.1.19 by John Arbash Meinel
If you have the path, use it rather than looking it up again
660
        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
661
1733.1.4 by Robert Collins
Cosmetic niceties for debugging, extra comments etc.
662
    def __repr__(self):
663
        return ("%s(%r, %r, parent_id=%r, sha1=%r, len=%s)"
664
                % (self.__class__.__name__,
665
                   self.file_id,
666
                   self.name,
667
                   self.parent_id,
668
                   self.text_sha1,
669
                   self.text_size))
670
1534.7.175 by Aaron Bentley
Ensured revert writes a normal inventory
671
    def _forget_tree_state(self):
672
        self.text_sha1 = None
673
1740.3.3 by Jelmer Vernooij
Move storing directories and links to commit builder.
674
    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
675
        """See InventoryEntry._snapshot_text."""
1740.3.2 by Jelmer Vernooij
Move storing file texts to commit builder.
676
        def get_content_byte_lines():
677
            return work_tree.get_file(self.file_id).readlines()
1740.3.3 by Jelmer Vernooij
Move storing directories and links to commit builder.
678
        self.text_sha1, self.text_size = commit_builder.modified_file_text(
1740.3.2 by Jelmer Vernooij
Move storing file texts to commit builder.
679
            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
680
681
    def _unchanged(self, previous_ie):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
682
        """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
683
        compatible = super(InventoryFile, self)._unchanged(previous_ie)
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
684
        if self.text_sha1 != previous_ie.text_sha1:
685
            compatible = False
686
        else:
687
            # FIXME: 20050930 probe for the text size when getting sha1
688
            # in _read_tree_state
689
            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
690
        if self.executable != previous_ie.executable:
691
            compatible = False
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
692
        return compatible
693
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
694
695
class InventoryLink(InventoryEntry):
696
    """A file in an inventory."""
697
1757.2.10 by Robert Collins
Give all inventory entries __slots__ that are useful with the current codebase.
698
    __slots__ = ['text_sha1', 'text_size', 'file_id', 'name', 'kind',
699
                 'text_id', 'parent_id', 'children', 'executable', 
700
                 'revision', 'symlink_target']
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
701
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
702
    def _check(self, checker, rev_id, tree):
703
        """See InventoryEntry._check"""
1757.2.11 by Robert Collins
Correct bzr diff | less= None clauses in inventory.py to be is not None.
704
        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
705
            raise BzrCheckError('symlink {%s} has text in revision {%s}'
706
                    % (self.file_id, rev_id))
1753.1.4 by Robert Collins
Fixup '== None' usage in inventory.py.
707
        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
708
            raise BzrCheckError('symlink {%s} has no target in revision {%s}'
709
                    % (self.file_id, rev_id))
710
711
    def copy(self):
712
        other = InventoryLink(self.file_id, self.name, self.parent_id)
713
        other.symlink_target = self.symlink_target
714
        other.revision = self.revision
715
        return other
716
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
717
    def detect_changes(self, old_entry):
718
        """See InventoryEntry.detect_changes."""
719
        # FIXME: which _modified field should we use ? RBC 20051003
720
        text_modified = (self.symlink_target != old_entry.symlink_target)
721
        if text_modified:
722
            mutter("    symlink target changed")
723
        meta_modified = False
724
        return text_modified, meta_modified
725
726
    def _diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree,
727
             output_to, reverse=False):
728
        """See InventoryEntry._diff."""
729
        from_text = self.symlink_target
730
        if to_entry is not None:
731
            to_text = to_entry.symlink_target
732
            if reverse:
733
                temp = from_text
734
                from_text = to_text
735
                to_text = temp
736
            print >>output_to, '=== target changed %r => %r' % (from_text, to_text)
737
        else:
738
            if not reverse:
739
                print >>output_to, '=== target was %r' % self.symlink_target
740
            else:
741
                print >>output_to, '=== target is %r' % self.symlink_target
742
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
743
    def __init__(self, file_id, name, parent_id):
744
        super(InventoryLink, self).__init__(file_id, name, parent_id)
745
        self.kind = 'symlink'
746
747
    def kind_character(self):
748
        """See InventoryEntry.kind_character."""
749
        return ''
750
751
    def _put_in_tar(self, item, tree):
752
        """See InventoryEntry._put_in_tar."""
1185.33.3 by Martin Pool
[merge] jelmer
753
        item.type = tarfile.SYMTYPE
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
754
        fileobj = None
755
        item.size = 0
756
        item.mode = 0755
757
        item.linkname = self.symlink_target
758
        return fileobj
759
760
    def _put_on_disk(self, fullpath, tree):
761
        """See InventoryEntry._put_on_disk."""
762
        try:
763
            os.symlink(self.symlink_target, fullpath)
764
        except OSError,e:
765
            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
766
1185.12.33 by Aaron Bentley
Fixed symlink reverting
767
    def _read_tree_state(self, path, work_tree):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
768
        """See InventoryEntry._read_tree_state."""
769
        self.symlink_target = work_tree.get_symlink_target(self.file_id)
770
1534.7.175 by Aaron Bentley
Ensured revert writes a normal inventory
771
    def _forget_tree_state(self):
772
        self.symlink_target = None
773
1405 by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave
774
    def _unchanged(self, previous_ie):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
775
        """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
776
        compatible = super(InventoryLink, self)._unchanged(previous_ie)
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
777
        if self.symlink_target != previous_ie.symlink_target:
778
            compatible = False
779
        return compatible
780
1740.3.3 by Jelmer Vernooij
Move storing directories and links to commit builder.
781
    def _snapshot_text(self, file_parents, work_tree, commit_builder):
782
        """See InventoryEntry._snapshot_text."""
783
        commit_builder.modified_link(
784
            self.file_id, file_parents, self.symlink_target)
785
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
786
802 by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions
787
class Inventory(object):
1 by mbp at sourcefrog
import from baz patch-364
788
    """Inventory of versioned files in a tree.
789
240 by mbp at sourcefrog
doc
790
    This describes which file_id is present at each point in the tree,
791
    and possibly the SHA-1 or other information about the file.
792
    Entries can be looked up either by path or by file_id.
1 by mbp at sourcefrog
import from baz patch-364
793
794
    The inventory represents a typical unix file tree, with
795
    directories containing files and subdirectories.  We never store
796
    the full path to a file, because renaming a directory implicitly
797
    moves all of its contents.  This class internally maintains a
798
    lookup tree that allows the children under a directory to be
799
    returned quickly.
800
801
    InventoryEntry objects must not be modified after they are
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
802
    inserted, other than through the Inventory API.
1 by mbp at sourcefrog
import from baz patch-364
803
804
    >>> inv = Inventory()
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
805
    >>> 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.
806
    InventoryFile('123-123', 'hello.c', parent_id='TREE_ROOT', sha1=None, len=None)
1 by mbp at sourcefrog
import from baz patch-364
807
    >>> inv['123-123'].name
808
    'hello.c'
809
810
    May be treated as an iterator or set to look up file ids:
811
    
812
    >>> bool(inv.path2id('hello.c'))
813
    True
814
    >>> '123-123' in inv
815
    True
816
817
    May also look up by name:
818
819
    >>> [x[0] for x in inv.iter_entries()]
1852.6.6 by Robert Collins
Finish updating iter_entries change to make all tests pass.
820
    ['', u'hello.c']
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
821
    >>> 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
822
    >>> 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.
823
    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
824
    """
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
825
    def __init__(self, root_id=ROOT_ID, revision_id=None):
1 by mbp at sourcefrog
import from baz patch-364
826
        """Create or read an inventory.
827
828
        If a working directory is specified, the inventory is read
829
        from there.  If the file is specified, read from that. If not,
830
        the inventory is created empty.
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
831
832
        The inventory is created with a default root directory, with
833
        an id of None.
1 by mbp at sourcefrog
import from baz patch-364
834
        """
1731.1.1 by Aaron Bentley
Make root entry an InventoryDirectory, make EmptyTree really empty
835
        if root_id is not None:
836
            self.root = InventoryDirectory(root_id, '', None)
837
            self._byid = {self.root.file_id: self.root}
838
        else:
839
            self.root = None
840
            self._byid = {}
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
841
        self.revision_id = revision_id
1 by mbp at sourcefrog
import from baz patch-364
842
1189 by Martin Pool
- BROKEN: partial support for commit into weave
843
    def copy(self):
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
844
        # TODO: jam 20051218 Should copy also copy the revision_id?
1852.6.3 by Robert Collins
Make iter(Tree) consistent for all tree types.
845
        entries = self.iter_entries()
846
        other = Inventory(entries.next()[1].file_id)
1206 by Martin Pool
- fix bug in Inventory.copy()
847
        # copy recursively so we know directories will be added before
848
        # their children.  There are more efficient ways than this...
1852.6.3 by Robert Collins
Make iter(Tree) consistent for all tree types.
849
        for path, entry in entries():
1189 by Martin Pool
- BROKEN: partial support for commit into weave
850
            other.add(entry.copy())
851
        return other
852
1 by mbp at sourcefrog
import from baz patch-364
853
    def __iter__(self):
854
        return iter(self._byid)
855
856
    def __len__(self):
857
        """Returns number of entries."""
858
        return len(self._byid)
859
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
860
    def iter_entries(self, from_dir=None):
1 by mbp at sourcefrog
import from baz patch-364
861
        """Return (path, entry) pairs, in order by name."""
1753.1.4 by Robert Collins
Fixup '== None' usage in inventory.py.
862
        if from_dir is None:
1907.1.1 by Aaron Bentley
Unshelved all changes except those related to removing RootEntry
863
            assert self.root
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
864
            from_dir = self.root
1852.6.3 by Robert Collins
Make iter(Tree) consistent for all tree types.
865
            yield '', self.root
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
866
        elif isinstance(from_dir, basestring):
867
            from_dir = self._byid[from_dir]
868
            
1732.1.24 by John Arbash Meinel
iter_entries time drops to 1/6th time
869
        # unrolling the recursive called changed the time from
870
        # 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
871
        children = from_dir.children.items()
872
        children.sort()
873
        children = collections.deque(children)
874
        stack = [(u'', children)]
875
        while stack:
876
            from_dir_relpath, children = stack[-1]
877
878
            while children:
879
                name, ie = children.popleft()
880
881
                # we know that from_dir_relpath never ends in a slash
882
                # and 'f' doesn't begin with one, we can do a string op, rather
883
                # than the checks of pathjoin(), though this means that all paths
884
                # start with a slash
885
                path = from_dir_relpath + '/' + name
886
887
                yield path[1:], ie
888
889
                if ie.kind != 'directory':
890
                    continue
891
892
                # But do this child first
893
                new_children = ie.children.items()
894
                new_children.sort()
895
                new_children = collections.deque(new_children)
896
                stack.append((path, new_children))
897
                # Break out of inner loop, so that we start outer loop with child
898
                break
899
            else:
900
                # 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.
901
                stack.pop()
555 by Martin Pool
- New Inventory.entries() method
902
1711.2.36 by John Arbash Meinel
Add an iter_entries_by_dir which returns directory children before their children.
903
    def iter_entries_by_dir(self, from_dir=None):
904
        """Iterate over the entries in a directory first order.
905
906
        This returns all entries for a directory before returning
907
        the entries for children of a directory. This is not
908
        lexicographically sorted order, and is a hybrid between
909
        depth-first and breadth-first.
910
911
        :return: This yields (path, entry) pairs
912
        """
1755.1.1 by Robert Collins
(jam, robertc, ab)Merge new iter_entries_by_dirs routine which matches the order walkdirs provides.
913
        # TODO? Perhaps this should return the from_dir so that the root is
914
        # yielded? or maybe an option?
1753.1.4 by Robert Collins
Fixup '== None' usage in inventory.py.
915
        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.
916
            assert self.root
917
            from_dir = self.root
1852.6.6 by Robert Collins
Finish updating iter_entries change to make all tests pass.
918
            yield '', self.root
1711.2.36 by John Arbash Meinel
Add an iter_entries_by_dir which returns directory children before their children.
919
        elif isinstance(from_dir, basestring):
920
            from_dir = self._byid[from_dir]
921
            
922
        stack = [(u'', from_dir)]
923
        while stack:
924
            cur_relpath, cur_dir = stack.pop()
925
926
            child_dirs = []
927
            for child_name, child_ie in sorted(cur_dir.children.iteritems()):
928
929
                child_relpath = cur_relpath + child_name
930
931
                yield child_relpath, child_ie
932
933
                if child_ie.kind == 'directory':
934
                    child_dirs.append((child_relpath+'/', child_ie))
935
            stack.extend(reversed(child_dirs))
936
555 by Martin Pool
- New Inventory.entries() method
937
    def entries(self):
938
        """Return list of (path, ie) for all entries except the root.
939
940
        This may be faster than iter_entries.
941
        """
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
942
        accum = []
943
        def descend(dir_ie, dir_path):
556 by Martin Pool
- fix up Inventory.entries()
944
            kids = dir_ie.children.items()
555 by Martin Pool
- New Inventory.entries() method
945
            kids.sort()
946
            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 \
947
                child_path = pathjoin(dir_path, name)
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
948
                accum.append((child_path, ie))
555 by Martin Pool
- New Inventory.entries() method
949
                if ie.kind == 'directory':
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
950
                    descend(ie, child_path)
555 by Martin Pool
- New Inventory.entries() method
951
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
952
        descend(self.root, u'')
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
953
        return accum
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
954
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
955
    def directories(self):
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
956
        """Return (path, entry) pairs for all directories, including the root.
1 by mbp at sourcefrog
import from baz patch-364
957
        """
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
958
        accum = []
959
        def descend(parent_ie, parent_path):
960
            accum.append((parent_path, parent_ie))
156 by mbp at sourcefrog
new "directories" command
961
            
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
962
            kids = [(ie.name, ie) for ie in parent_ie.children.itervalues() if ie.kind == 'directory']
963
            kids.sort()
156 by mbp at sourcefrog
new "directories" command
964
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
965
            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 \
966
                child_path = pathjoin(parent_path, name)
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
967
                descend(child_ie, child_path)
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
968
        descend(self.root, u'')
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
969
        return accum
1 by mbp at sourcefrog
import from baz patch-364
970
        
971
    def __contains__(self, file_id):
972
        """True if this entry contains a file with given id.
973
974
        >>> inv = Inventory()
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
975
        >>> inv.add(InventoryFile('123', 'foo.c', ROOT_ID))
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
976
        InventoryFile('123', 'foo.c', parent_id='TREE_ROOT', sha1=None, len=None)
1 by mbp at sourcefrog
import from baz patch-364
977
        >>> '123' in inv
978
        True
979
        >>> '456' in inv
980
        False
981
        """
982
        return file_id in self._byid
983
984
    def __getitem__(self, file_id):
985
        """Return the entry for given file_id.
986
987
        >>> inv = Inventory()
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
988
        >>> inv.add(InventoryFile('123123', 'hello.c', ROOT_ID))
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
989
        InventoryFile('123123', 'hello.c', parent_id='TREE_ROOT', sha1=None, len=None)
1 by mbp at sourcefrog
import from baz patch-364
990
        >>> inv['123123'].name
991
        'hello.c'
992
        """
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
993
        try:
994
            return self._byid[file_id]
995
        except KeyError:
1753.1.4 by Robert Collins
Fixup '== None' usage in inventory.py.
996
            if file_id is None:
380 by Martin Pool
- Slight optimization for Inventory.__getitem__
997
                raise BzrError("can't look up file_id None")
998
            else:
999
                raise BzrError("file_id {%s} not in inventory" % file_id)
1 by mbp at sourcefrog
import from baz patch-364
1000
460 by Martin Pool
- new testing command compare-trees
1001
    def get_file_kind(self, file_id):
1002
        return self._byid[file_id].kind
1003
138 by mbp at sourcefrog
remove parallel tree from inventory;
1004
    def get_child(self, parent_id, filename):
1732.1.18 by John Arbash Meinel
50ms is probably not worth it
1005
        return self[parent_id].children.get(filename)
138 by mbp at sourcefrog
remove parallel tree from inventory;
1006
1 by mbp at sourcefrog
import from baz patch-364
1007
    def add(self, entry):
1008
        """Add entry to inventory.
1009
1010
        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
1011
        which calls this.
1012
1013
        Returns the new entry object.
1014
        """
139 by mbp at sourcefrog
simplified/faster Inventory.add
1015
        if entry.file_id in self._byid:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
1016
            raise BzrError("inventory already contains entry with id {%s}" % entry.file_id)
1 by mbp at sourcefrog
import from baz patch-364
1017
1907.1.1 by Aaron Bentley
Unshelved all changes except those related to removing RootEntry
1018
        if entry.parent_id == ROOT_ID or entry.parent_id is None:
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
1019
            entry.parent_id = self.root.file_id
1020
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
1021
        try:
1022
            parent = self._byid[entry.parent_id]
1023
        except KeyError:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
1024
            raise BzrError("parent_id {%s} not in inventory" % entry.parent_id)
139 by mbp at sourcefrog
simplified/faster Inventory.add
1025
1757.2.7 by Robert Collins
Split out the recursive add and add of a single entry in add.py.
1026
        if entry.name in parent.children:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
1027
            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 \
1028
                    pathjoin(self.id2path(parent.file_id), entry.name))
1 by mbp at sourcefrog
import from baz patch-364
1029
1030
        self._byid[entry.file_id] = entry
139 by mbp at sourcefrog
simplified/faster Inventory.add
1031
        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
1032
        return entry
1 by mbp at sourcefrog
import from baz patch-364
1033
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)
1034
    def add_path(self, relpath, kind, file_id=None, parent_id=None):
70 by mbp at sourcefrog
Prepare for smart recursive add.
1035
        """Add entry from a path.
1036
1180 by Martin Pool
- start splitting code for xml (de)serialization away from objects
1037
        The immediate parent must already be versioned.
1038
1039
        Returns the new entry object."""
1015 by Martin Pool
- fix circular imports
1040
        
1830.3.5 by John Arbash Meinel
make_entry refuses to create non-normalized entries.
1041
        parts = osutils.splitpath(relpath)
70 by mbp at sourcefrog
Prepare for smart recursive add.
1042
1534.7.69 by Aaron Bentley
Got real root moves working
1043
        if len(parts) == 0:
1713.1.6 by Robert Collins
Move file id random data selection out of the inner loop for 'bzr add'.
1044
            if file_id is None:
1045
                file_id = bzrlib.workingtree.gen_root_id()
1731.1.1 by Aaron Bentley
Make root entry an InventoryDirectory, make EmptyTree really empty
1046
            self.root = InventoryDirectory(file_id, '', None)
1534.7.69 by Aaron Bentley
Got real root moves working
1047
            self._byid = {self.root.file_id: self.root}
1048
            return
1049
        else:
1050
            parent_path = parts[:-1]
1051
            parent_id = self.path2id(parent_path)
1753.1.4 by Robert Collins
Fixup '== None' usage in inventory.py.
1052
            if parent_id is None:
1534.7.69 by Aaron Bentley
Got real root moves working
1053
                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)
1054
        ie = make_entry(kind, parts[-1], parent_id, file_id)
70 by mbp at sourcefrog
Prepare for smart recursive add.
1055
        return self.add(ie)
1056
1 by mbp at sourcefrog
import from baz patch-364
1057
    def __delitem__(self, file_id):
1058
        """Remove entry by id.
1059
1060
        >>> inv = Inventory()
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
1061
        >>> inv.add(InventoryFile('123', 'foo.c', ROOT_ID))
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
1062
        InventoryFile('123', 'foo.c', parent_id='TREE_ROOT', sha1=None, len=None)
1 by mbp at sourcefrog
import from baz patch-364
1063
        >>> '123' in inv
1064
        True
1065
        >>> del inv['123']
1066
        >>> '123' in inv
1067
        False
1068
        """
1069
        ie = self[file_id]
1070
1534.7.69 by Aaron Bentley
Got real root moves working
1071
        assert ie.parent_id is None or \
1072
            self[ie.parent_id].children[ie.name] == ie
1 by mbp at sourcefrog
import from baz patch-364
1073
        
1074
        del self._byid[file_id]
1534.7.69 by Aaron Bentley
Got real root moves working
1075
        if ie.parent_id is not None:
1076
            del self[ie.parent_id].children[ie.name]
1 by mbp at sourcefrog
import from baz patch-364
1077
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
1078
    def __eq__(self, other):
1 by mbp at sourcefrog
import from baz patch-364
1079
        """Compare two sets by comparing their contents.
1080
1081
        >>> i1 = Inventory()
1082
        >>> i2 = Inventory()
1083
        >>> i1 == i2
1084
        True
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
1085
        >>> i1.add(InventoryFile('123', 'foo', ROOT_ID))
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
1086
        InventoryFile('123', 'foo', parent_id='TREE_ROOT', sha1=None, len=None)
1 by mbp at sourcefrog
import from baz patch-364
1087
        >>> i1 == i2
1088
        False
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
1089
        >>> i2.add(InventoryFile('123', 'foo', ROOT_ID))
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
1090
        InventoryFile('123', 'foo', parent_id='TREE_ROOT', sha1=None, len=None)
1 by mbp at sourcefrog
import from baz patch-364
1091
        >>> i1 == i2
1092
        True
1093
        """
1094
        if not isinstance(other, Inventory):
1095
            return NotImplemented
1096
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
1097
        return self._byid == other._byid
1098
1099
    def __ne__(self, other):
1249 by Martin Pool
- improvements to weave commit [broken]
1100
        return not self.__eq__(other)
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
1101
1102
    def __hash__(self):
1103
        raise ValueError('not hashable')
1104
1596.2.19 by Robert Collins
Shave 20% off id2path.
1105
    def _iter_file_id_parents(self, file_id):
1106
        """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.
1107
        while file_id is not None:
1596.2.19 by Robert Collins
Shave 20% off id2path.
1108
            try:
1109
                ie = self._byid[file_id]
1110
            except KeyError:
1111
                raise BzrError("file_id {%s} not found in inventory" % file_id)
1112
            yield ie
1113
            file_id = ie.parent_id
1 by mbp at sourcefrog
import from baz patch-364
1114
172 by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory
1115
    def get_idpath(self, file_id):
1116
        """Return a list of file_ids for the path to an entry.
1117
1118
        The list contains one element for each directory followed by
1119
        the id of the file itself.  So the length of the returned list
1120
        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
1121
        root directory as depth 1.
172 by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory
1122
        """
1123
        p = []
1596.2.19 by Robert Collins
Shave 20% off id2path.
1124
        for parent in self._iter_file_id_parents(file_id):
1125
            p.insert(0, parent.file_id)
172 by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory
1126
        return p
1127
1 by mbp at sourcefrog
import from baz patch-364
1128
    def id2path(self, file_id):
1596.2.19 by Robert Collins
Shave 20% off id2path.
1129
        """Return as a string the path to file_id.
1393.1.32 by Martin Pool
- add docstring demonstrating use of Inventory.id2path
1130
        
1131
        >>> i = Inventory()
1132
        >>> e = i.add(InventoryDirectory('src-id', 'src', ROOT_ID))
1133
        >>> e = i.add(InventoryFile('foo-id', 'foo.c', parent_id='src-id'))
1185.31.34 by John Arbash Meinel
Removing instances of os.sep
1134
        >>> print i.id2path('foo-id')
1393.1.32 by Martin Pool
- add docstring demonstrating use of Inventory.id2path
1135
        src/foo.c
1136
        """
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
1137
        # get all names, skipping root
1596.2.19 by Robert Collins
Shave 20% off id2path.
1138
        return '/'.join(reversed(
1139
            [parent.name for parent in 
1140
             self._iter_file_id_parents(file_id)][:-1]))
1 by mbp at sourcefrog
import from baz patch-364
1141
            
1142
    def path2id(self, name):
1143
        """Walk down through directories to return entry of last component.
1144
1145
        names may be either a list of path components, or a single
1146
        string, in which case it is automatically split.
1147
1148
        This returns the entry of the last component in the path,
1149
        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
1150
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)
1151
        Returns None IFF the path is not found.
1 by mbp at sourcefrog
import from baz patch-364
1152
        """
70 by mbp at sourcefrog
Prepare for smart recursive add.
1153
        if isinstance(name, types.StringTypes):
1154
            name = splitpath(name)
1 by mbp at sourcefrog
import from baz patch-364
1155
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)
1156
        # mutter("lookup path %r" % name)
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
1157
1158
        parent = self.root
70 by mbp at sourcefrog
Prepare for smart recursive add.
1159
        for f in name:
1 by mbp at sourcefrog
import from baz patch-364
1160
            try:
138 by mbp at sourcefrog
remove parallel tree from inventory;
1161
                cie = parent.children[f]
1 by mbp at sourcefrog
import from baz patch-364
1162
                assert cie.name == f
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
1163
                assert cie.parent_id == parent.file_id
138 by mbp at sourcefrog
remove parallel tree from inventory;
1164
                parent = cie
1 by mbp at sourcefrog
import from baz patch-364
1165
            except KeyError:
1166
                # or raise an error?
1167
                return None
1168
138 by mbp at sourcefrog
remove parallel tree from inventory;
1169
        return parent.file_id
1 by mbp at sourcefrog
import from baz patch-364
1170
1171
    def has_filename(self, names):
1172
        return bool(self.path2id(names))
1173
1174
    def has_id(self, file_id):
1175
        return self._byid.has_key(file_id)
1176
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
1177
    def rename(self, file_id, new_parent_id, new_name):
1178
        """Move a file within the inventory.
1179
1180
        This can change either the name, or the parent, or both.
1181
1182
        This does not move the working file."""
1183
        if not is_valid_name(new_name):
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
1184
            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
1185
1186
        new_parent = self._byid[new_parent_id]
1187
        if new_name in new_parent.children:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
1188
            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
1189
172 by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory
1190
        new_parent_idpath = self.get_idpath(new_parent_id)
1191
        if file_id in new_parent_idpath:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
1192
            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
1193
                    % (self.id2path(file_id), self.id2path(new_parent_id)))
1194
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
1195
        file_ie = self._byid[file_id]
1196
        old_parent = self._byid[file_ie.parent_id]
1197
1198
        # TODO: Don't leave things messed up if this fails
1199
1200
        del old_parent.children[file_ie.name]
1201
        new_parent.children[new_name] = file_ie
1202
        
1203
        file_ie.name = new_name
1204
        file_ie.parent_id = new_parent_id
1205
1731.1.1 by Aaron Bentley
Make root entry an InventoryDirectory, make EmptyTree really empty
1206
    def is_root(self, file_id):
1207
        return self.root is not None and file_id == self.root.file_id
1208
160 by mbp at sourcefrog
- basic support for moving files to different directories - have not done support for renaming them yet, but should be straightforward - some tests, but many cases are not handled yet i think
1209
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)
1210
def make_entry(kind, name, parent_id, file_id=None):
1211
    """Create an inventory entry.
1212
1213
    :param kind: the type of inventory entry to create.
1214
    :param name: the basename of the entry.
1215
    :param parent_id: the parent_id of the entry.
1216
    :param file_id: the file_id to use. if None, one will be created.
1217
    """
1218
    if file_id is None:
1219
        file_id = bzrlib.workingtree.gen_file_id(name)
1830.3.5 by John Arbash Meinel
make_entry refuses to create non-normalized entries.
1220
1221
    norm_name, can_access = osutils.normalized_filename(name)
1222
    if norm_name != name:
1223
        if can_access:
1224
            name = norm_name
1225
        else:
1226
            # TODO: jam 20060701 This would probably be more useful
1227
            #       if the error was raised with the full path
1228
            raise errors.InvalidNormalization(name)
1229
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)
1230
    if kind == 'directory':
1231
        return InventoryDirectory(file_id, name, parent_id)
1232
    elif kind == 'file':
1233
        return InventoryFile(file_id, name, parent_id)
1234
    elif kind == 'symlink':
1235
        return InventoryLink(file_id, name, parent_id)
1236
    else:
1237
        raise BzrError("unknown kind %r" % kind)
1238
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
1239
1077 by Martin Pool
- avoid compiling REs at module load time
1240
_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
1241
1242
def is_valid_name(name):
1077 by Martin Pool
- avoid compiling REs at module load time
1243
    global _NAME_RE
1753.1.4 by Robert Collins
Fixup '== None' usage in inventory.py.
1244
    if _NAME_RE is None:
1077 by Martin Pool
- avoid compiling REs at module load time
1245
        _NAME_RE = re.compile(r'^[^/\\]+$')
1246
        
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
1247
    return bool(_NAME_RE.match(name))