/brz/remove-bazaar

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