~bzr-pqm/bzr/bzr.dev

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