/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
138 by mbp at sourcefrog
remove parallel tree from inventory;
1
# (C) 2005 Canonical Ltd
1448 by Robert Collins
revert symlinks correctly
2
#
1 by mbp at sourcefrog
import from baz patch-364
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
1448 by Robert Collins
revert symlinks correctly
7
#
1 by mbp at sourcefrog
import from baz patch-364
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
1448 by Robert Collins
revert symlinks correctly
12
#
1 by mbp at sourcefrog
import from baz patch-364
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
1185.16.72 by Martin Pool
[merge] from robert and fix up tests
17
# FIXME: This refactoring of the workingtree code doesn't seem to keep 
18
# the WorkingTree's copy of the inventory in sync with the branch.  The
19
# branch modifies its working inventory when it does a commit to make
20
# missing files permanently removed.
1 by mbp at sourcefrog
import from baz patch-364
21
1197 by Martin Pool
doc
22
# TODO: Maybe also keep the full path of the entry, and the children?
23
# But those depend on its position within a particular inventory, and
24
# it would be nice not to need to hold the backpointer here.
25
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
26
# This should really be an id randomly assigned when the tree is
27
# created, but it's not for now.
28
ROOT_ID = "TREE_ROOT"
29
30
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
31
import os.path
32
import re
33
import sys
1399.1.6 by Robert Collins
move exporting functionality into inventory.py - uncovers bug in symlink support
34
import tarfile
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
35
import types
1 by mbp at sourcefrog
import from baz patch-364
36
800 by Martin Pool
Merge John's import-speedup branch:
37
import bzrlib
1399.1.6 by Robert Collins
move exporting functionality into inventory.py - uncovers bug in symlink support
38
from bzrlib.osutils import (pumpfile, quotefn, splitpath, joinpath,
39
                            appendpath, 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.16.151 by Martin Pool
[patch] win32 fix for InventoryEntry doctest (Alexander, patch 21)
82
    >>> shouldbe = {0: 'src', 1: os.path.join('src','hello.c')}
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():
105
    ...     print path.replace('\\\\', '/')     # for win32 os.sep
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.1.40 by Robert Collins
Merge what applied of Alexander Belchenko's win32 patch.
113
    >>> i.id2path('2326').replace('\\\\', '/')
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):
122
        weave_store.add_text(self.file_id, self.revision, new_lines, parents,
123
                             transaction)
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):
164
            return set(map(weave.idx_to_name,
165
                           weave.inclusions([weave.lookup(entry.revision)])))
1409 by Robert Collins
unify previous inventory entry parent logic in preparation for fixing the revision-thrashing bug
166
        heads = {}
1411 by Robert Collins
use weave ancestry to determine inventory entry previous heads, prevent propogating 'I did a merge' merges.
167
        head_ancestors = {}
1409 by Robert Collins
unify previous inventory entry parent logic in preparation for fixing the revision-thrashing bug
168
        for inv in previous_inventories:
169
            if self.file_id in inv:
170
                ie = inv[self.file_id]
171
                assert ie.file_id == self.file_id
172
                if ie.revision in heads:
1185.1.51 by Robert Collins
merge in reweave support
173
                    # fixup logic, there was a bug in revision updates.
174
                    # with x bit support.
175
                    try:
176
                        if heads[ie.revision].executable != ie.executable:
177
                            heads[ie.revision].executable = False
178
                            ie.executable = False
179
                    except AttributeError:
180
                        pass
1409 by Robert Collins
unify previous inventory entry parent logic in preparation for fixing the revision-thrashing bug
181
                    assert heads[ie.revision] == ie
182
                else:
1411 by Robert Collins
use weave ancestry to determine inventory entry previous heads, prevent propogating 'I did a merge' merges.
183
                    # may want to add it.
184
                    # may already be covered:
185
                    already_present = 0 != len(
186
                        [head for head in heads 
187
                         if ie.revision in head_ancestors[head]])
188
                    if already_present:
189
                        # an ancestor of a known head.
190
                        continue
191
                    # definately a head:
192
                    ancestors = get_ancestors(entry_weave, ie)
193
                    # may knock something else out:
194
                    check_heads = list(heads.keys())
195
                    for head in check_heads:
196
                        if head in ancestors:
197
                            # this head is not really a head
198
                            heads.pop(head)
199
                    head_ancestors[ie.revision] = ancestors
1409 by Robert Collins
unify previous inventory entry parent logic in preparation for fixing the revision-thrashing bug
200
                    heads[ie.revision] = ie
201
        return heads
202
1399.1.6 by Robert Collins
move exporting functionality into inventory.py - uncovers bug in symlink support
203
    def get_tar_item(self, root, dp, now, tree):
1399.1.7 by Robert Collins
implement symlink exporting to tarballs
204
        """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
205
        item = tarfile.TarInfo(os.path.join(root, dp))
206
        # TODO: would be cool to actually set it to the timestamp of the
207
        # revision it was last changed
208
        item.mtime = now
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
209
        fileobj = self._put_in_tar(item, tree)
1399.1.6 by Robert Collins
move exporting functionality into inventory.py - uncovers bug in symlink support
210
        return item, fileobj
211
1399.1.5 by Robert Collins
move checking whether an entry stores text into inventory.py from fetch,py
212
    def has_text(self):
213
        """Return true if the object this entry represents has textual data.
214
215
        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
216
217
        Also note that all entries get weave files created for them.
218
        This attribute is primarily used when upgrading from old trees that
219
        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
220
        """
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
221
        return False
1399.1.5 by Robert Collins
move checking whether an entry stores text into inventory.py from fetch,py
222
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
223
    def __init__(self, file_id, name, parent_id, text_id=None):
1 by mbp at sourcefrog
import from baz patch-364
224
        """Create an InventoryEntry
225
        
226
        The filename must be a single component, relative to the
227
        parent directory; it cannot be a whole path or relative name.
228
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
229
        >>> e = InventoryFile('123', 'hello.c', ROOT_ID)
1 by mbp at sourcefrog
import from baz patch-364
230
        >>> e.name
231
        'hello.c'
232
        >>> e.file_id
233
        '123'
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
234
        >>> e = InventoryFile('123', 'src/hello.c', ROOT_ID)
1 by mbp at sourcefrog
import from baz patch-364
235
        Traceback (most recent call last):
1185.16.63 by Martin Pool
- more error conversion
236
        InvalidEntryName: Invalid entry name: src/hello.c
1 by mbp at sourcefrog
import from baz patch-364
237
        """
1183 by Martin Pool
- implement version 5 xml storage, and tests
238
        assert isinstance(name, basestring), name
376 by Martin Pool
- fix slow invariant check when reading in InventoryEntry objects
239
        if '/' in name or '\\' in name:
1185.16.63 by Martin Pool
- more error conversion
240
            raise InvalidEntryName(name=name)
1398 by Robert Collins
integrate in Gustavos x-bit patch
241
        self.executable = False
1092.2.21 by Robert Collins
convert name_version to revision in inventory entries
242
        self.revision = None
955 by Martin Pool
- use __slots__ on InventoryEntry; rather faster
243
        self.text_sha1 = None
244
        self.text_size = None
1 by mbp at sourcefrog
import from baz patch-364
245
        self.file_id = file_id
246
        self.name = name
247
        self.text_id = text_id
248
        self.parent_id = parent_id
1092.2.6 by Robert Collins
symlink support updated to work
249
        self.symlink_target = None
237 by mbp at sourcefrog
- Better assertions in InventoryEntry constructor
250
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
251
    def kind_character(self):
252
        """Return a short kind indicator useful for appending to names."""
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
253
        raise BzrError('unknown kind %r' % self.kind)
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
254
1399.1.3 by Robert Collins
move change detection for text and metadata from delta to entry.detect_changes
255
    known_kinds = ('file', 'directory', 'symlink', 'root_directory')
1 by mbp at sourcefrog
import from baz patch-364
256
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
257
    def _put_in_tar(self, item, tree):
258
        """populate item for stashing in a tar, and return the content stream.
259
260
        If no content is available, return None.
261
        """
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
262
        raise BzrError("don't know how to export {%s} of kind %r" %
263
                       (self.file_id, self.kind))
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
264
1399.1.6 by Robert Collins
move exporting functionality into inventory.py - uncovers bug in symlink support
265
    def put_on_disk(self, dest, dp, tree):
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
266
        """Create a representation of self on disk in the prefix dest.
267
        
268
        This is a template method - implement _put_on_disk in subclasses.
269
        """
1399.1.6 by Robert Collins
move exporting functionality into inventory.py - uncovers bug in symlink support
270
        fullpath = appendpath(dest, dp)
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
271
        self._put_on_disk(fullpath, tree)
272
        mutter("  export {%s} kind %s to %s" % (self.file_id, self.kind, fullpath))
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)
1417.1.8 by Robert Collins
use transactions in the weave store interface, which enables caching for log
360
        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
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
1 by mbp at sourcefrog
import from baz patch-364
409
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
410
class RootEntry(InventoryEntry):
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
411
412
    def _check(self, checker, rev_id, tree):
413
        """See InventoryEntry._check"""
414
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
415
    def __init__(self, file_id):
416
        self.file_id = file_id
417
        self.children = {}
418
        self.kind = 'root_directory'
419
        self.parent_id = None
156 by mbp at sourcefrog
new "directories" command
420
        self.name = ''
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
421
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
422
    def __eq__(self, other):
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
423
        if not isinstance(other, RootEntry):
424
            return NotImplemented
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
425
        
426
        return (self.file_id == other.file_id) \
427
               and (self.children == other.children)
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
428
429
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
430
class InventoryDirectory(InventoryEntry):
431
    """A directory in an inventory."""
432
433
    def _check(self, checker, rev_id, tree):
434
        """See InventoryEntry._check"""
435
        if self.text_sha1 != None or self.text_size != None or self.text_id != None:
436
            raise BzrCheckError('directory {%s} has text in revision {%s}'
437
                                % (self.file_id, rev_id))
438
439
    def copy(self):
440
        other = InventoryDirectory(self.file_id, self.name, self.parent_id)
441
        other.revision = self.revision
442
        # note that children are *not* copied; they're pulled across when
443
        # others are added
444
        return other
445
446
    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
447
        super(InventoryDirectory, self).__init__(file_id, name, parent_id)
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
448
        self.children = {}
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
449
        self.kind = 'directory'
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
450
451
    def kind_character(self):
452
        """See InventoryEntry.kind_character."""
453
        return '/'
454
455
    def _put_in_tar(self, item, tree):
456
        """See InventoryEntry._put_in_tar."""
457
        item.type = tarfile.DIRTYPE
458
        fileobj = None
459
        item.name += '/'
460
        item.size = 0
461
        item.mode = 0755
462
        return fileobj
463
464
    def _put_on_disk(self, fullpath, tree):
465
        """See InventoryEntry._put_on_disk."""
466
        os.mkdir(fullpath)
467
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
468
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
469
class InventoryFile(InventoryEntry):
470
    """A file in an inventory."""
471
472
    def _check(self, checker, rev_id, tree):
473
        """See InventoryEntry._check"""
474
        revision = self.revision
475
        t = (self.file_id, revision)
476
        if t in checker.checked_texts:
477
            prev_sha = checker.checked_texts[t] 
478
            if prev_sha != self.text_sha1:
479
                raise BzrCheckError('mismatched sha1 on {%s} in {%s}' %
480
                                    (self.file_id, rev_id))
481
            else:
482
                checker.repeated_text_cnt += 1
483
                return
484
        mutter('check version {%s} of {%s}', rev_id, self.file_id)
485
        file_lines = tree.get_file_lines(self.file_id)
486
        checker.checked_text_cnt += 1 
487
        if self.text_size != sum(map(len, file_lines)):
488
            raise BzrCheckError('text {%s} wrong size' % self.text_id)
489
        if self.text_sha1 != sha_strings(file_lines):
490
            raise BzrCheckError('text {%s} wrong sha1' % self.text_id)
491
        checker.checked_texts[t] = self.text_sha1
492
493
    def copy(self):
494
        other = InventoryFile(self.file_id, self.name, self.parent_id)
495
        other.executable = self.executable
496
        other.text_id = self.text_id
497
        other.text_sha1 = self.text_sha1
498
        other.text_size = self.text_size
499
        other.revision = self.revision
500
        return other
501
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
502
    def detect_changes(self, old_entry):
503
        """See InventoryEntry.detect_changes."""
504
        assert self.text_sha1 != None
505
        assert old_entry.text_sha1 != None
506
        text_modified = (self.text_sha1 != old_entry.text_sha1)
507
        meta_modified = (self.executable != old_entry.executable)
508
        return text_modified, meta_modified
509
510
    def _diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree,
511
             output_to, reverse=False):
512
        """See InventoryEntry._diff."""
513
        from_text = tree.get_file(self.file_id).readlines()
514
        if to_entry:
515
            to_text = to_tree.get_file(to_entry.file_id).readlines()
516
        else:
517
            to_text = []
518
        if not reverse:
519
            text_diff(from_label, from_text,
520
                      to_label, to_text, output_to)
521
        else:
522
            text_diff(to_label, to_text,
523
                      from_label, from_text, output_to)
524
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
525
    def has_text(self):
526
        """See InventoryEntry.has_text."""
527
        return True
528
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
529
    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
530
        super(InventoryFile, self).__init__(file_id, name, parent_id)
531
        self.kind = 'file'
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
532
533
    def kind_character(self):
534
        """See InventoryEntry.kind_character."""
535
        return ''
536
537
    def _put_in_tar(self, item, tree):
538
        """See InventoryEntry._put_in_tar."""
539
        item.type = tarfile.REGTYPE
540
        fileobj = tree.get_file(self.file_id)
541
        item.size = self.text_size
542
        if tree.is_executable(self.file_id):
543
            item.mode = 0755
544
        else:
545
            item.mode = 0644
546
        return fileobj
547
548
    def _put_on_disk(self, fullpath, tree):
549
        """See InventoryEntry._put_on_disk."""
550
        pumpfile(tree.get_file(self.file_id), file(fullpath, 'wb'))
551
        if tree.is_executable(self.file_id):
552
            os.chmod(fullpath, 0755)
553
1185.12.33 by Aaron Bentley
Fixed symlink reverting
554
    def _read_tree_state(self, path, work_tree):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
555
        """See InventoryEntry._read_tree_state."""
556
        self.text_sha1 = work_tree.get_file_sha1(self.file_id)
557
        self.executable = work_tree.is_executable(self.file_id)
558
1417.1.8 by Robert Collins
use transactions in the weave store interface, which enables caching for log
559
    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
560
        """See InventoryEntry._snapshot_text."""
561
        mutter('storing file {%s} in revision {%s}',
562
               self.file_id, self.revision)
563
        # special case to avoid diffing on renames or 
564
        # reparenting
565
        if (len(file_parents) == 1
566
            and self.text_sha1 == file_parents.values()[0].text_sha1
567
            and self.text_size == file_parents.values()[0].text_size):
568
            previous_ie = file_parents.values()[0]
569
            weave_store.add_identical_text(
570
                self.file_id, previous_ie.revision, 
1417.1.8 by Robert Collins
use transactions in the weave store interface, which enables caching for log
571
                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
572
        else:
573
            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
574
            self._add_text_to_weave(new_lines, file_parents, weave_store,
575
                                    transaction)
1405 by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave
576
            self.text_sha1 = sha_strings(new_lines)
577
            self.text_size = sum(map(len, new_lines))
578
579
580
    def _unchanged(self, previous_ie):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
581
        """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
582
        compatible = super(InventoryFile, self)._unchanged(previous_ie)
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
583
        if self.text_sha1 != previous_ie.text_sha1:
584
            compatible = False
585
        else:
586
            # FIXME: 20050930 probe for the text size when getting sha1
587
            # in _read_tree_state
588
            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
589
        if self.executable != previous_ie.executable:
590
            compatible = False
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
591
        return compatible
592
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
593
594
class InventoryLink(InventoryEntry):
595
    """A file in an inventory."""
596
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
597
    __slots__ = ['symlink_target']
598
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
599
    def _check(self, checker, rev_id, tree):
600
        """See InventoryEntry._check"""
601
        if self.text_sha1 != None or self.text_size != None or self.text_id != None:
602
            raise BzrCheckError('symlink {%s} has text in revision {%s}'
603
                    % (self.file_id, rev_id))
604
        if self.symlink_target == None:
605
            raise BzrCheckError('symlink {%s} has no target in revision {%s}'
606
                    % (self.file_id, rev_id))
607
608
    def copy(self):
609
        other = InventoryLink(self.file_id, self.name, self.parent_id)
610
        other.symlink_target = self.symlink_target
611
        other.revision = self.revision
612
        return other
613
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
614
    def detect_changes(self, old_entry):
615
        """See InventoryEntry.detect_changes."""
616
        # FIXME: which _modified field should we use ? RBC 20051003
617
        text_modified = (self.symlink_target != old_entry.symlink_target)
618
        if text_modified:
619
            mutter("    symlink target changed")
620
        meta_modified = False
621
        return text_modified, meta_modified
622
623
    def _diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree,
624
             output_to, reverse=False):
625
        """See InventoryEntry._diff."""
626
        from_text = self.symlink_target
627
        if to_entry is not None:
628
            to_text = to_entry.symlink_target
629
            if reverse:
630
                temp = from_text
631
                from_text = to_text
632
                to_text = temp
633
            print >>output_to, '=== target changed %r => %r' % (from_text, to_text)
634
        else:
635
            if not reverse:
636
                print >>output_to, '=== target was %r' % self.symlink_target
637
            else:
638
                print >>output_to, '=== target is %r' % self.symlink_target
639
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
640
    def __init__(self, file_id, name, parent_id):
641
        super(InventoryLink, self).__init__(file_id, name, parent_id)
642
        self.kind = 'symlink'
643
644
    def kind_character(self):
645
        """See InventoryEntry.kind_character."""
646
        return ''
647
648
    def _put_in_tar(self, item, tree):
649
        """See InventoryEntry._put_in_tar."""
650
        iterm.type = tarfile.SYMTYPE
651
        fileobj = None
652
        item.size = 0
653
        item.mode = 0755
654
        item.linkname = self.symlink_target
655
        return fileobj
656
657
    def _put_on_disk(self, fullpath, tree):
658
        """See InventoryEntry._put_on_disk."""
659
        try:
660
            os.symlink(self.symlink_target, fullpath)
661
        except OSError,e:
662
            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
663
1185.12.33 by Aaron Bentley
Fixed symlink reverting
664
    def _read_tree_state(self, path, work_tree):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
665
        """See InventoryEntry._read_tree_state."""
666
        self.symlink_target = work_tree.get_symlink_target(self.file_id)
667
1405 by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave
668
    def _unchanged(self, previous_ie):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
669
        """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
670
        compatible = super(InventoryLink, self)._unchanged(previous_ie)
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
671
        if self.symlink_target != previous_ie.symlink_target:
672
            compatible = False
673
        return compatible
674
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
675
802 by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions
676
class Inventory(object):
1 by mbp at sourcefrog
import from baz patch-364
677
    """Inventory of versioned files in a tree.
678
240 by mbp at sourcefrog
doc
679
    This describes which file_id is present at each point in the tree,
680
    and possibly the SHA-1 or other information about the file.
681
    Entries can be looked up either by path or by file_id.
1 by mbp at sourcefrog
import from baz patch-364
682
683
    The inventory represents a typical unix file tree, with
684
    directories containing files and subdirectories.  We never store
685
    the full path to a file, because renaming a directory implicitly
686
    moves all of its contents.  This class internally maintains a
687
    lookup tree that allows the children under a directory to be
688
    returned quickly.
689
690
    InventoryEntry objects must not be modified after they are
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
691
    inserted, other than through the Inventory API.
1 by mbp at sourcefrog
import from baz patch-364
692
693
    >>> inv = Inventory()
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
694
    >>> inv.add(InventoryFile('123-123', 'hello.c', ROOT_ID))
695
    InventoryFile('123-123', 'hello.c', parent_id='TREE_ROOT')
1 by mbp at sourcefrog
import from baz patch-364
696
    >>> inv['123-123'].name
697
    'hello.c'
698
699
    May be treated as an iterator or set to look up file ids:
700
    
701
    >>> bool(inv.path2id('hello.c'))
702
    True
703
    >>> '123-123' in inv
704
    True
705
706
    May also look up by name:
707
708
    >>> [x[0] for x in inv.iter_entries()]
709
    ['hello.c']
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
710
    >>> 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
711
    >>> inv.add(InventoryFile('123-123', 'hello.c', ROOT_ID))
712
    InventoryFile('123-123', 'hello.c', parent_id='TREE_ROOT-12345678-12345678')
1 by mbp at sourcefrog
import from baz patch-364
713
    """
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
714
    def __init__(self, root_id=ROOT_ID):
1 by mbp at sourcefrog
import from baz patch-364
715
        """Create or read an inventory.
716
717
        If a working directory is specified, the inventory is read
718
        from there.  If the file is specified, read from that. If not,
719
        the inventory is created empty.
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
720
721
        The inventory is created with a default root directory, with
722
        an id of None.
1 by mbp at sourcefrog
import from baz patch-364
723
        """
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
724
        # 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
725
        # root id. Rather than generating a random one here.
726
        #if root_id is None:
727
        #    root_id = bzrlib.branch.gen_file_id('TREE_ROOT')
728
        self.root = RootEntry(root_id)
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
729
        self._byid = {self.root.file_id: self.root}
1 by mbp at sourcefrog
import from baz patch-364
730
731
1189 by Martin Pool
- BROKEN: partial support for commit into weave
732
    def copy(self):
733
        other = Inventory(self.root.file_id)
1206 by Martin Pool
- fix bug in Inventory.copy()
734
        # copy recursively so we know directories will be added before
735
        # their children.  There are more efficient ways than this...
736
        for path, entry in self.iter_entries():
1189 by Martin Pool
- BROKEN: partial support for commit into weave
737
            if entry == self.root:
738
                continue
739
            other.add(entry.copy())
740
        return other
741
742
1 by mbp at sourcefrog
import from baz patch-364
743
    def __iter__(self):
744
        return iter(self._byid)
745
746
747
    def __len__(self):
748
        """Returns number of entries."""
749
        return len(self._byid)
750
751
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
752
    def iter_entries(self, from_dir=None):
1 by mbp at sourcefrog
import from baz patch-364
753
        """Return (path, entry) pairs, in order by name."""
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
754
        if from_dir == None:
755
            assert self.root
756
            from_dir = self.root
757
        elif isinstance(from_dir, basestring):
758
            from_dir = self._byid[from_dir]
759
            
760
        kids = from_dir.children.items()
1 by mbp at sourcefrog
import from baz patch-364
761
        kids.sort()
762
        for name, ie in kids:
763
            yield name, ie
764
            if ie.kind == 'directory':
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
765
                for cn, cie in self.iter_entries(from_dir=ie.file_id):
271 by Martin Pool
- Windows path fixes
766
                    yield os.path.join(name, cn), cie
555 by Martin Pool
- New Inventory.entries() method
767
768
769
    def entries(self):
770
        """Return list of (path, ie) for all entries except the root.
771
772
        This may be faster than iter_entries.
773
        """
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
774
        accum = []
775
        def descend(dir_ie, dir_path):
556 by Martin Pool
- fix up Inventory.entries()
776
            kids = dir_ie.children.items()
555 by Martin Pool
- New Inventory.entries() method
777
            kids.sort()
778
            for name, ie in kids:
779
                child_path = os.path.join(dir_path, name)
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
780
                accum.append((child_path, ie))
555 by Martin Pool
- New Inventory.entries() method
781
                if ie.kind == 'directory':
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
782
                    descend(ie, child_path)
555 by Martin Pool
- New Inventory.entries() method
783
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
784
        descend(self.root, '')
785
        return accum
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
786
787
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
788
    def directories(self):
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
789
        """Return (path, entry) pairs for all directories, including the root.
1 by mbp at sourcefrog
import from baz patch-364
790
        """
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
791
        accum = []
792
        def descend(parent_ie, parent_path):
793
            accum.append((parent_path, parent_ie))
156 by mbp at sourcefrog
new "directories" command
794
            
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
795
            kids = [(ie.name, ie) for ie in parent_ie.children.itervalues() if ie.kind == 'directory']
796
            kids.sort()
156 by mbp at sourcefrog
new "directories" command
797
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
798
            for name, child_ie in kids:
799
                child_path = os.path.join(parent_path, name)
800
                descend(child_ie, child_path)
801
        descend(self.root, '')
802
        return accum
1 by mbp at sourcefrog
import from baz patch-364
803
        
804
805
806
    def __contains__(self, file_id):
807
        """True if this entry contains a file with given id.
808
809
        >>> inv = Inventory()
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
810
        >>> inv.add(InventoryFile('123', 'foo.c', ROOT_ID))
811
        InventoryFile('123', 'foo.c', parent_id='TREE_ROOT')
1 by mbp at sourcefrog
import from baz patch-364
812
        >>> '123' in inv
813
        True
814
        >>> '456' in inv
815
        False
816
        """
817
        return file_id in self._byid
818
819
820
    def __getitem__(self, file_id):
821
        """Return the entry for given file_id.
822
823
        >>> inv = Inventory()
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
824
        >>> inv.add(InventoryFile('123123', 'hello.c', ROOT_ID))
825
        InventoryFile('123123', 'hello.c', parent_id='TREE_ROOT')
1 by mbp at sourcefrog
import from baz patch-364
826
        >>> inv['123123'].name
827
        'hello.c'
828
        """
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
829
        try:
830
            return self._byid[file_id]
831
        except KeyError:
380 by Martin Pool
- Slight optimization for Inventory.__getitem__
832
            if file_id == None:
833
                raise BzrError("can't look up file_id None")
834
            else:
835
                raise BzrError("file_id {%s} not in inventory" % file_id)
1 by mbp at sourcefrog
import from baz patch-364
836
837
460 by Martin Pool
- new testing command compare-trees
838
    def get_file_kind(self, file_id):
839
        return self._byid[file_id].kind
840
138 by mbp at sourcefrog
remove parallel tree from inventory;
841
    def get_child(self, parent_id, filename):
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
842
        return self[parent_id].children.get(filename)
138 by mbp at sourcefrog
remove parallel tree from inventory;
843
844
1 by mbp at sourcefrog
import from baz patch-364
845
    def add(self, entry):
846
        """Add entry to inventory.
847
848
        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
849
        which calls this.
850
851
        Returns the new entry object.
852
        """
139 by mbp at sourcefrog
simplified/faster Inventory.add
853
        if entry.file_id in self._byid:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
854
            raise BzrError("inventory already contains entry with id {%s}" % entry.file_id)
1 by mbp at sourcefrog
import from baz patch-364
855
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
856
        if entry.parent_id == ROOT_ID or entry.parent_id is None:
857
            entry.parent_id = self.root.file_id
858
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
859
        try:
860
            parent = self._byid[entry.parent_id]
861
        except KeyError:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
862
            raise BzrError("parent_id {%s} not in inventory" % entry.parent_id)
139 by mbp at sourcefrog
simplified/faster Inventory.add
863
864
        if parent.children.has_key(entry.name):
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
865
            raise BzrError("%s is already versioned" %
140 by mbp at sourcefrog
fix error message for repeated add
866
                    appendpath(self.id2path(parent.file_id), entry.name))
1 by mbp at sourcefrog
import from baz patch-364
867
868
        self._byid[entry.file_id] = entry
139 by mbp at sourcefrog
simplified/faster Inventory.add
869
        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
870
        return entry
1 by mbp at sourcefrog
import from baz patch-364
871
872
70 by mbp at sourcefrog
Prepare for smart recursive add.
873
    def add_path(self, relpath, kind, file_id=None):
874
        """Add entry from a path.
875
1180 by Martin Pool
- start splitting code for xml (de)serialization away from objects
876
        The immediate parent must already be versioned.
877
878
        Returns the new entry object."""
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
879
        from bzrlib.branch import gen_file_id
1015 by Martin Pool
- fix circular imports
880
        
70 by mbp at sourcefrog
Prepare for smart recursive add.
881
        parts = bzrlib.osutils.splitpath(relpath)
882
        if len(parts) == 0:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
883
            raise BzrError("cannot re-add root of inventory")
70 by mbp at sourcefrog
Prepare for smart recursive add.
884
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
885
        if file_id == None:
800 by Martin Pool
Merge John's import-speedup branch:
886
            file_id = gen_file_id(relpath)
70 by mbp at sourcefrog
Prepare for smart recursive add.
887
753 by Martin Pool
- new exception NotVersionedError
888
        parent_path = parts[:-1]
889
        parent_id = self.path2id(parent_path)
890
        if parent_id == None:
1185.16.72 by Martin Pool
[merge] from robert and fix up tests
891
            raise NotVersionedError(path=parent_path)
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
892
        if kind == 'directory':
893
            ie = InventoryDirectory(file_id, parts[-1], parent_id)
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
894
        elif kind == 'file':
895
            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
896
        elif kind == 'symlink':
897
            ie = InventoryLink(file_id, parts[-1], parent_id)
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
898
        else:
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
899
            raise BzrError("unknown kind %r" % kind)
70 by mbp at sourcefrog
Prepare for smart recursive add.
900
        return self.add(ie)
901
902
1 by mbp at sourcefrog
import from baz patch-364
903
    def __delitem__(self, file_id):
904
        """Remove entry by id.
905
906
        >>> inv = Inventory()
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
907
        >>> inv.add(InventoryFile('123', 'foo.c', ROOT_ID))
908
        InventoryFile('123', 'foo.c', parent_id='TREE_ROOT')
1 by mbp at sourcefrog
import from baz patch-364
909
        >>> '123' in inv
910
        True
911
        >>> del inv['123']
912
        >>> '123' in inv
913
        False
914
        """
915
        ie = self[file_id]
916
138 by mbp at sourcefrog
remove parallel tree from inventory;
917
        assert self[ie.parent_id].children[ie.name] == ie
1 by mbp at sourcefrog
import from baz patch-364
918
        
919
        # TODO: Test deleting all children; maybe hoist to a separate
920
        # deltree method?
921
        if ie.kind == 'directory':
138 by mbp at sourcefrog
remove parallel tree from inventory;
922
            for cie in ie.children.values():
1 by mbp at sourcefrog
import from baz patch-364
923
                del self[cie.file_id]
138 by mbp at sourcefrog
remove parallel tree from inventory;
924
            del ie.children
1 by mbp at sourcefrog
import from baz patch-364
925
926
        del self._byid[file_id]
138 by mbp at sourcefrog
remove parallel tree from inventory;
927
        del self[ie.parent_id].children[ie.name]
1 by mbp at sourcefrog
import from baz patch-364
928
929
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
930
    def __eq__(self, other):
1 by mbp at sourcefrog
import from baz patch-364
931
        """Compare two sets by comparing their contents.
932
933
        >>> i1 = Inventory()
934
        >>> i2 = Inventory()
935
        >>> i1 == i2
936
        True
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
937
        >>> i1.add(InventoryFile('123', 'foo', ROOT_ID))
938
        InventoryFile('123', 'foo', parent_id='TREE_ROOT')
1 by mbp at sourcefrog
import from baz patch-364
939
        >>> i1 == i2
940
        False
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
941
        >>> i2.add(InventoryFile('123', 'foo', ROOT_ID))
942
        InventoryFile('123', 'foo', parent_id='TREE_ROOT')
1 by mbp at sourcefrog
import from baz patch-364
943
        >>> i1 == i2
944
        True
945
        """
946
        if not isinstance(other, Inventory):
947
            return NotImplemented
948
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
949
        if len(self._byid) != len(other._byid):
543 by Martin Pool
- More cleanups for set type
950
            # shortcut: obviously not the same
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
951
            return False
952
953
        return self._byid == other._byid
954
955
956
    def __ne__(self, other):
1249 by Martin Pool
- improvements to weave commit [broken]
957
        return not self.__eq__(other)
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
958
959
960
    def __hash__(self):
961
        raise ValueError('not hashable')
962
1 by mbp at sourcefrog
import from baz patch-364
963
172 by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory
964
    def get_idpath(self, file_id):
965
        """Return a list of file_ids for the path to an entry.
966
967
        The list contains one element for each directory followed by
968
        the id of the file itself.  So the length of the returned list
969
        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
970
        root directory as depth 1.
172 by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory
971
        """
972
        p = []
973
        while file_id != None:
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
974
            try:
975
                ie = self._byid[file_id]
976
            except KeyError:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
977
                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
978
            p.insert(0, ie.file_id)
979
            file_id = ie.parent_id
980
        return p
981
982
1 by mbp at sourcefrog
import from baz patch-364
983
    def id2path(self, file_id):
1393.1.32 by Martin Pool
- add docstring demonstrating use of Inventory.id2path
984
        """Return as a list the path to file_id.
985
        
986
        >>> i = Inventory()
987
        >>> e = i.add(InventoryDirectory('src-id', 'src', ROOT_ID))
988
        >>> e = i.add(InventoryFile('foo-id', 'foo.c', parent_id='src-id'))
989
        >>> print i.id2path('foo-id').replace(os.sep, '/')
990
        src/foo.c
991
        """
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
992
        # get all names, skipping root
922 by Martin Pool
- optimization for Inventory.id2path; access byid map directly rather than
993
        p = [self._byid[fid].name for fid in self.get_idpath(file_id)[1:]]
271 by Martin Pool
- Windows path fixes
994
        return os.sep.join(p)
1 by mbp at sourcefrog
import from baz patch-364
995
            
996
997
998
    def path2id(self, name):
999
        """Walk down through directories to return entry of last component.
1000
1001
        names may be either a list of path components, or a single
1002
        string, in which case it is automatically split.
1003
1004
        This returns the entry of the last component in the path,
1005
        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
1006
1007
        Returns None iff the path is not found.
1 by mbp at sourcefrog
import from baz patch-364
1008
        """
70 by mbp at sourcefrog
Prepare for smart recursive add.
1009
        if isinstance(name, types.StringTypes):
1010
            name = splitpath(name)
1 by mbp at sourcefrog
import from baz patch-364
1011
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
1012
        mutter("lookup path %r" % name)
1013
1014
        parent = self.root
70 by mbp at sourcefrog
Prepare for smart recursive add.
1015
        for f in name:
1 by mbp at sourcefrog
import from baz patch-364
1016
            try:
138 by mbp at sourcefrog
remove parallel tree from inventory;
1017
                cie = parent.children[f]
1 by mbp at sourcefrog
import from baz patch-364
1018
                assert cie.name == f
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
1019
                assert cie.parent_id == parent.file_id
138 by mbp at sourcefrog
remove parallel tree from inventory;
1020
                parent = cie
1 by mbp at sourcefrog
import from baz patch-364
1021
            except KeyError:
1022
                # or raise an error?
1023
                return None
1024
138 by mbp at sourcefrog
remove parallel tree from inventory;
1025
        return parent.file_id
1 by mbp at sourcefrog
import from baz patch-364
1026
1027
1028
    def has_filename(self, names):
1029
        return bool(self.path2id(names))
1030
1031
1032
    def has_id(self, file_id):
1033
        return self._byid.has_key(file_id)
1034
1035
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
1036
    def rename(self, file_id, new_parent_id, new_name):
1037
        """Move a file within the inventory.
1038
1039
        This can change either the name, or the parent, or both.
1040
1041
        This does not move the working file."""
1042
        if not is_valid_name(new_name):
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
1043
            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
1044
1045
        new_parent = self._byid[new_parent_id]
1046
        if new_name in new_parent.children:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
1047
            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
1048
172 by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory
1049
        new_parent_idpath = self.get_idpath(new_parent_id)
1050
        if file_id in new_parent_idpath:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
1051
            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
1052
                    % (self.id2path(file_id), self.id2path(new_parent_id)))
1053
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
1054
        file_ie = self._byid[file_id]
1055
        old_parent = self._byid[file_ie.parent_id]
1056
1057
        # TODO: Don't leave things messed up if this fails
1058
1059
        del old_parent.children[file_ie.name]
1060
        new_parent.children[new_name] = file_ie
1061
        
1062
        file_ie.name = new_name
1063
        file_ie.parent_id = new_parent_id
1064
1065
1066
1067
1077 by Martin Pool
- avoid compiling REs at module load time
1068
_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
1069
1070
def is_valid_name(name):
1077 by Martin Pool
- avoid compiling REs at module load time
1071
    global _NAME_RE
1072
    if _NAME_RE == None:
1073
        _NAME_RE = re.compile(r'^[^/\\]+$')
1074
        
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
1075
    return bool(_NAME_RE.match(name))