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