~bzr-pqm/bzr/bzr.dev

138 by mbp at sourcefrog
remove parallel tree from inventory;
1
# (C) 2005 Canonical Ltd
1448 by Robert Collins
revert symlinks correctly
2
#
1 by mbp at sourcefrog
import from baz patch-364
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
1448 by Robert Collins
revert symlinks correctly
7
#
1 by mbp at sourcefrog
import from baz patch-364
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
1448 by Robert Collins
revert symlinks correctly
12
#
1 by mbp at sourcefrog
import from baz patch-364
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
1185.16.72 by Martin Pool
[merge] from robert and fix up tests
17
# FIXME: This refactoring of the workingtree code doesn't seem to keep 
18
# the WorkingTree's copy of the inventory in sync with the branch.  The
19
# branch modifies its working inventory when it does a commit to make
20
# missing files permanently removed.
1 by mbp at sourcefrog
import from baz patch-364
21
1197 by Martin Pool
doc
22
# TODO: Maybe also keep the full path of the entry, and the children?
23
# But those depend on its position within a particular inventory, and
24
# it would be nice not to need to hold the backpointer here.
25
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
26
# This should really be an id randomly assigned when the tree is
27
# created, but it's not for now.
28
ROOT_ID = "TREE_ROOT"
29
30
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
31
import os.path
32
import re
33
import sys
1399.1.6 by Robert Collins
move exporting functionality into inventory.py - uncovers bug in symlink support
34
import tarfile
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
35
import types
1 by mbp at sourcefrog
import from baz patch-364
36
800 by Martin Pool
Merge John's import-speedup branch:
37
import bzrlib
1399.1.6 by Robert Collins
move exporting functionality into inventory.py - uncovers bug in symlink support
38
from bzrlib.osutils import (pumpfile, quotefn, splitpath, joinpath,
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)
1185.31.4 by John Arbash Meinel
Fixing mutter() calls to not have to do string processing.
272
        mutter("  export {%s} kind %s to %s", self.file_id,
273
                self.kind, fullpath)
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
274
275
    def _put_on_disk(self, fullpath, tree):
276
        """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
277
        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
278
156 by mbp at sourcefrog
new "directories" command
279
    def sorted_children(self):
280
        l = self.children.items()
281
        l.sort()
282
        return l
283
1399.1.1 by Robert Collins
move checks for versionability of file kinds into InventoryEntry
284
    @staticmethod
285
    def versionable_kind(kind):
286
        return kind in ('file', 'directory', 'symlink')
287
1092.2.20 by Robert Collins
symlink and weaves, whaddya know
288
    def check(self, checker, rev_id, inv, tree):
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
289
        """Check this inventory entry is intact.
290
291
        This is a template method, override _check for kind specific
292
        tests.
293
        """
1092.2.20 by Robert Collins
symlink and weaves, whaddya know
294
        if self.parent_id != None:
295
            if not inv.has_id(self.parent_id):
296
                raise BzrCheckError('missing parent {%s} in inventory for revision {%s}'
297
                        % (self.parent_id, rev_id))
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
298
        self._check(checker, rev_id, tree)
299
300
    def _check(self, checker, rev_id, tree):
301
        """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
302
        raise BzrCheckError('unknown entry kind %r in revision {%s}' % 
303
                            (self.kind, rev_id))
1092.2.20 by Robert Collins
symlink and weaves, whaddya know
304
156 by mbp at sourcefrog
new "directories" command
305
1 by mbp at sourcefrog
import from baz patch-364
306
    def copy(self):
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
307
        """Clone this inventory entry."""
308
        raise NotImplementedError
1 by mbp at sourcefrog
import from baz patch-364
309
1092.2.23 by Robert Collins
move inventory entry centric snapshot taking logic to inventory.py
310
    def _get_snapshot_change(self, previous_entries):
311
        if len(previous_entries) > 1:
312
            return 'merged'
313
        elif len(previous_entries) == 0:
314
            return 'added'
315
        else:
316
            return 'modified/renamed/reparented'
1 by mbp at sourcefrog
import from baz patch-364
317
318
    def __repr__(self):
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
319
        return ("%s(%r, %r, parent_id=%r)"
1 by mbp at sourcefrog
import from baz patch-364
320
                % (self.__class__.__name__,
321
                   self.file_id,
322
                   self.name,
323
                   self.parent_id))
324
1411 by Robert Collins
use weave ancestry to determine inventory entry previous heads, prevent propogating 'I did a merge' merges.
325
    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
326
                 work_tree, weave_store, transaction):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
327
        """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
328
        
329
        This means that all its fields are populated, that it has its
330
        text stored in the text store or weave.
331
        """
332
        mutter('new parents of %s are %r', path, previous_entries)
1185.12.33 by Aaron Bentley
Fixed symlink reverting
333
        self._read_tree_state(path, work_tree)
1092.2.23 by Robert Collins
move inventory entry centric snapshot taking logic to inventory.py
334
        if len(previous_entries) == 1:
335
            # cannot be unchanged unless there is only one parent file rev.
336
            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
337
            if self._unchanged(parent_ie):
1092.2.23 by Robert Collins
move inventory entry centric snapshot taking logic to inventory.py
338
                mutter("found unchanged entry")
339
                self.revision = parent_ie.revision
340
                return "unchanged"
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
341
        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
342
                                      work_tree, weave_store, transaction)
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
343
344
    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
345
                          weave_store, transaction):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
346
        """Record this revision unconditionally."""
1092.2.23 by Robert Collins
move inventory entry centric snapshot taking logic to inventory.py
347
        mutter('new revision for {%s}', self.file_id)
348
        self.revision = revision
349
        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
350
        self._snapshot_text(previous_entries, work_tree, weave_store,
351
                            transaction)
1092.2.23 by Robert Collins
move inventory entry centric snapshot taking logic to inventory.py
352
        return change
353
1417.1.8 by Robert Collins
use transactions in the weave store interface, which enables caching for log
354
    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
355
        """Record the 'text' of this entry, whatever form that takes.
356
        
357
        This default implementation simply adds an empty text.
358
        """
1092.2.23 by Robert Collins
move inventory entry centric snapshot taking logic to inventory.py
359
        mutter('storing file {%s} in revision {%s}',
360
               self.file_id, self.revision)
1417.1.8 by Robert Collins
use transactions in the weave store interface, which enables caching for log
361
        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
362
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
363
    def __eq__(self, other):
1 by mbp at sourcefrog
import from baz patch-364
364
        if not isinstance(other, InventoryEntry):
365
            return NotImplemented
366
1398 by Robert Collins
integrate in Gustavos x-bit patch
367
        return ((self.file_id == other.file_id)
368
                and (self.name == other.name)
369
                and (other.symlink_target == self.symlink_target)
370
                and (self.text_sha1 == other.text_sha1)
371
                and (self.text_size == other.text_size)
372
                and (self.text_id == other.text_id)
373
                and (self.parent_id == other.parent_id)
374
                and (self.kind == other.kind)
375
                and (self.revision == other.revision)
376
                and (self.executable == other.executable)
377
                )
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
378
379
    def __ne__(self, other):
380
        return not (self == other)
381
382
    def __hash__(self):
383
        raise ValueError('not hashable')
1 by mbp at sourcefrog
import from baz patch-364
384
1405 by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave
385
    def _unchanged(self, previous_ie):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
386
        """Has this entry changed relative to previous_ie.
387
388
        This method should be overriden in child classes.
389
        """
1092.2.22 by Robert Collins
text_version and name_version unification looking reasonable
390
        compatible = True
391
        # different inv parent
392
        if previous_ie.parent_id != self.parent_id:
393
            compatible = False
394
        # renamed
395
        elif previous_ie.name != self.name:
396
            compatible = False
397
        return compatible
398
1185.12.33 by Aaron Bentley
Fixed symlink reverting
399
    def _read_tree_state(self, path, work_tree):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
400
        """Populate fields in the inventory entry from the given tree.
401
        
402
        Note that this should be modified to be a noop on virtual trees
403
        as all entries created there are prepopulated.
404
        """
1185.16.5 by Martin Pool
doc
405
        # TODO: Rather than running this manually, we should check the 
406
        # working sha1 and other expensive properties when they're
407
        # first requested, or preload them if they're already known
408
        pass            # nothing to do by default
1092.2.23 by Robert Collins
move inventory entry centric snapshot taking logic to inventory.py
409
1 by mbp at sourcefrog
import from baz patch-364
410
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
411
class RootEntry(InventoryEntry):
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
412
413
    def _check(self, checker, rev_id, tree):
414
        """See InventoryEntry._check"""
415
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
416
    def __init__(self, file_id):
417
        self.file_id = file_id
418
        self.children = {}
419
        self.kind = 'root_directory'
420
        self.parent_id = None
156 by mbp at sourcefrog
new "directories" command
421
        self.name = ''
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
422
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
423
    def __eq__(self, other):
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
424
        if not isinstance(other, RootEntry):
425
            return NotImplemented
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
426
        
427
        return (self.file_id == other.file_id) \
428
               and (self.children == other.children)
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
429
430
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
431
class InventoryDirectory(InventoryEntry):
432
    """A directory in an inventory."""
433
434
    def _check(self, checker, rev_id, tree):
435
        """See InventoryEntry._check"""
436
        if self.text_sha1 != None or self.text_size != None or self.text_id != None:
437
            raise BzrCheckError('directory {%s} has text in revision {%s}'
438
                                % (self.file_id, rev_id))
439
440
    def copy(self):
441
        other = InventoryDirectory(self.file_id, self.name, self.parent_id)
442
        other.revision = self.revision
443
        # note that children are *not* copied; they're pulled across when
444
        # others are added
445
        return other
446
447
    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
448
        super(InventoryDirectory, self).__init__(file_id, name, parent_id)
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
449
        self.children = {}
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
450
        self.kind = 'directory'
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
451
452
    def kind_character(self):
453
        """See InventoryEntry.kind_character."""
454
        return '/'
455
456
    def _put_in_tar(self, item, tree):
457
        """See InventoryEntry._put_in_tar."""
458
        item.type = tarfile.DIRTYPE
459
        fileobj = None
460
        item.name += '/'
461
        item.size = 0
462
        item.mode = 0755
463
        return fileobj
464
465
    def _put_on_disk(self, fullpath, tree):
466
        """See InventoryEntry._put_on_disk."""
467
        os.mkdir(fullpath)
468
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
469
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
470
class InventoryFile(InventoryEntry):
471
    """A file in an inventory."""
472
473
    def _check(self, checker, rev_id, tree):
474
        """See InventoryEntry._check"""
475
        revision = self.revision
476
        t = (self.file_id, revision)
477
        if t in checker.checked_texts:
478
            prev_sha = checker.checked_texts[t] 
479
            if prev_sha != self.text_sha1:
480
                raise BzrCheckError('mismatched sha1 on {%s} in {%s}' %
481
                                    (self.file_id, rev_id))
482
            else:
483
                checker.repeated_text_cnt += 1
484
                return
485
        mutter('check version {%s} of {%s}', rev_id, self.file_id)
486
        file_lines = tree.get_file_lines(self.file_id)
487
        checker.checked_text_cnt += 1 
488
        if self.text_size != sum(map(len, file_lines)):
489
            raise BzrCheckError('text {%s} wrong size' % self.text_id)
490
        if self.text_sha1 != sha_strings(file_lines):
491
            raise BzrCheckError('text {%s} wrong sha1' % self.text_id)
492
        checker.checked_texts[t] = self.text_sha1
493
494
    def copy(self):
495
        other = InventoryFile(self.file_id, self.name, self.parent_id)
496
        other.executable = self.executable
497
        other.text_id = self.text_id
498
        other.text_sha1 = self.text_sha1
499
        other.text_size = self.text_size
500
        other.revision = self.revision
501
        return other
502
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
503
    def detect_changes(self, old_entry):
504
        """See InventoryEntry.detect_changes."""
505
        assert self.text_sha1 != None
506
        assert old_entry.text_sha1 != None
507
        text_modified = (self.text_sha1 != old_entry.text_sha1)
508
        meta_modified = (self.executable != old_entry.executable)
509
        return text_modified, meta_modified
510
511
    def _diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree,
512
             output_to, reverse=False):
513
        """See InventoryEntry._diff."""
514
        from_text = tree.get_file(self.file_id).readlines()
515
        if to_entry:
516
            to_text = to_tree.get_file(to_entry.file_id).readlines()
517
        else:
518
            to_text = []
519
        if not reverse:
520
            text_diff(from_label, from_text,
521
                      to_label, to_text, output_to)
522
        else:
523
            text_diff(to_label, to_text,
524
                      from_label, from_text, output_to)
525
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
526
    def has_text(self):
527
        """See InventoryEntry.has_text."""
528
        return True
529
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
530
    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
531
        super(InventoryFile, self).__init__(file_id, name, parent_id)
532
        self.kind = 'file'
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
533
534
    def kind_character(self):
535
        """See InventoryEntry.kind_character."""
536
        return ''
537
538
    def _put_in_tar(self, item, tree):
539
        """See InventoryEntry._put_in_tar."""
540
        item.type = tarfile.REGTYPE
541
        fileobj = tree.get_file(self.file_id)
542
        item.size = self.text_size
543
        if tree.is_executable(self.file_id):
544
            item.mode = 0755
545
        else:
546
            item.mode = 0644
547
        return fileobj
548
549
    def _put_on_disk(self, fullpath, tree):
550
        """See InventoryEntry._put_on_disk."""
551
        pumpfile(tree.get_file(self.file_id), file(fullpath, 'wb'))
552
        if tree.is_executable(self.file_id):
553
            os.chmod(fullpath, 0755)
554
1185.12.33 by Aaron Bentley
Fixed symlink reverting
555
    def _read_tree_state(self, path, work_tree):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
556
        """See InventoryEntry._read_tree_state."""
557
        self.text_sha1 = work_tree.get_file_sha1(self.file_id)
558
        self.executable = work_tree.is_executable(self.file_id)
559
1417.1.8 by Robert Collins
use transactions in the weave store interface, which enables caching for log
560
    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
561
        """See InventoryEntry._snapshot_text."""
562
        mutter('storing file {%s} in revision {%s}',
563
               self.file_id, self.revision)
564
        # special case to avoid diffing on renames or 
565
        # reparenting
566
        if (len(file_parents) == 1
567
            and self.text_sha1 == file_parents.values()[0].text_sha1
568
            and self.text_size == file_parents.values()[0].text_size):
569
            previous_ie = file_parents.values()[0]
570
            weave_store.add_identical_text(
571
                self.file_id, previous_ie.revision, 
1417.1.8 by Robert Collins
use transactions in the weave store interface, which enables caching for log
572
                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
573
        else:
574
            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
575
            self._add_text_to_weave(new_lines, file_parents, weave_store,
576
                                    transaction)
1405 by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave
577
            self.text_sha1 = sha_strings(new_lines)
578
            self.text_size = sum(map(len, new_lines))
579
580
581
    def _unchanged(self, previous_ie):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
582
        """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
583
        compatible = super(InventoryFile, self)._unchanged(previous_ie)
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
584
        if self.text_sha1 != previous_ie.text_sha1:
585
            compatible = False
586
        else:
587
            # FIXME: 20050930 probe for the text size when getting sha1
588
            # in _read_tree_state
589
            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
590
        if self.executable != previous_ie.executable:
591
            compatible = False
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
592
        return compatible
593
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
594
595
class InventoryLink(InventoryEntry):
596
    """A file in an inventory."""
597
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
598
    __slots__ = ['symlink_target']
599
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
600
    def _check(self, checker, rev_id, tree):
601
        """See InventoryEntry._check"""
602
        if self.text_sha1 != None or self.text_size != None or self.text_id != None:
603
            raise BzrCheckError('symlink {%s} has text in revision {%s}'
604
                    % (self.file_id, rev_id))
605
        if self.symlink_target == None:
606
            raise BzrCheckError('symlink {%s} has no target in revision {%s}'
607
                    % (self.file_id, rev_id))
608
609
    def copy(self):
610
        other = InventoryLink(self.file_id, self.name, self.parent_id)
611
        other.symlink_target = self.symlink_target
612
        other.revision = self.revision
613
        return other
614
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
615
    def detect_changes(self, old_entry):
616
        """See InventoryEntry.detect_changes."""
617
        # FIXME: which _modified field should we use ? RBC 20051003
618
        text_modified = (self.symlink_target != old_entry.symlink_target)
619
        if text_modified:
620
            mutter("    symlink target changed")
621
        meta_modified = False
622
        return text_modified, meta_modified
623
624
    def _diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree,
625
             output_to, reverse=False):
626
        """See InventoryEntry._diff."""
627
        from_text = self.symlink_target
628
        if to_entry is not None:
629
            to_text = to_entry.symlink_target
630
            if reverse:
631
                temp = from_text
632
                from_text = to_text
633
                to_text = temp
634
            print >>output_to, '=== target changed %r => %r' % (from_text, to_text)
635
        else:
636
            if not reverse:
637
                print >>output_to, '=== target was %r' % self.symlink_target
638
            else:
639
                print >>output_to, '=== target is %r' % self.symlink_target
640
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
641
    def __init__(self, file_id, name, parent_id):
642
        super(InventoryLink, self).__init__(file_id, name, parent_id)
643
        self.kind = 'symlink'
644
645
    def kind_character(self):
646
        """See InventoryEntry.kind_character."""
647
        return ''
648
649
    def _put_in_tar(self, item, tree):
650
        """See InventoryEntry._put_in_tar."""
1185.33.3 by Martin Pool
[merge] jelmer
651
        item.type = tarfile.SYMTYPE
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
652
        fileobj = None
653
        item.size = 0
654
        item.mode = 0755
655
        item.linkname = self.symlink_target
656
        return fileobj
657
658
    def _put_on_disk(self, fullpath, tree):
659
        """See InventoryEntry._put_on_disk."""
660
        try:
661
            os.symlink(self.symlink_target, fullpath)
662
        except OSError,e:
663
            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
664
1185.12.33 by Aaron Bentley
Fixed symlink reverting
665
    def _read_tree_state(self, path, work_tree):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
666
        """See InventoryEntry._read_tree_state."""
667
        self.symlink_target = work_tree.get_symlink_target(self.file_id)
668
1405 by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave
669
    def _unchanged(self, previous_ie):
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
670
        """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
671
        compatible = super(InventoryLink, self)._unchanged(previous_ie)
1399.1.11 by Robert Collins
finish off nearly all of the kind separations
672
        if self.symlink_target != previous_ie.symlink_target:
673
            compatible = False
674
        return compatible
675
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
676
802 by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions
677
class Inventory(object):
1 by mbp at sourcefrog
import from baz patch-364
678
    """Inventory of versioned files in a tree.
679
240 by mbp at sourcefrog
doc
680
    This describes which file_id is present at each point in the tree,
681
    and possibly the SHA-1 or other information about the file.
682
    Entries can be looked up either by path or by file_id.
1 by mbp at sourcefrog
import from baz patch-364
683
684
    The inventory represents a typical unix file tree, with
685
    directories containing files and subdirectories.  We never store
686
    the full path to a file, because renaming a directory implicitly
687
    moves all of its contents.  This class internally maintains a
688
    lookup tree that allows the children under a directory to be
689
    returned quickly.
690
691
    InventoryEntry objects must not be modified after they are
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
692
    inserted, other than through the Inventory API.
1 by mbp at sourcefrog
import from baz patch-364
693
694
    >>> inv = Inventory()
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
695
    >>> inv.add(InventoryFile('123-123', 'hello.c', ROOT_ID))
696
    InventoryFile('123-123', 'hello.c', parent_id='TREE_ROOT')
1 by mbp at sourcefrog
import from baz patch-364
697
    >>> inv['123-123'].name
698
    'hello.c'
699
700
    May be treated as an iterator or set to look up file ids:
701
    
702
    >>> bool(inv.path2id('hello.c'))
703
    True
704
    >>> '123-123' in inv
705
    True
706
707
    May also look up by name:
708
709
    >>> [x[0] for x in inv.iter_entries()]
710
    ['hello.c']
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
711
    >>> 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
712
    >>> inv.add(InventoryFile('123-123', 'hello.c', ROOT_ID))
713
    InventoryFile('123-123', 'hello.c', parent_id='TREE_ROOT-12345678-12345678')
1 by mbp at sourcefrog
import from baz patch-364
714
    """
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
715
    def __init__(self, root_id=ROOT_ID):
1 by mbp at sourcefrog
import from baz patch-364
716
        """Create or read an inventory.
717
718
        If a working directory is specified, the inventory is read
719
        from there.  If the file is specified, read from that. If not,
720
        the inventory is created empty.
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
721
722
        The inventory is created with a default root directory, with
723
        an id of None.
1 by mbp at sourcefrog
import from baz patch-364
724
        """
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
725
        # 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
726
        # root id. Rather than generating a random one here.
727
        #if root_id is None:
728
        #    root_id = bzrlib.branch.gen_file_id('TREE_ROOT')
729
        self.root = RootEntry(root_id)
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
730
        self._byid = {self.root.file_id: self.root}
1 by mbp at sourcefrog
import from baz patch-364
731
732
1189 by Martin Pool
- BROKEN: partial support for commit into weave
733
    def copy(self):
734
        other = Inventory(self.root.file_id)
1206 by Martin Pool
- fix bug in Inventory.copy()
735
        # copy recursively so we know directories will be added before
736
        # their children.  There are more efficient ways than this...
737
        for path, entry in self.iter_entries():
1189 by Martin Pool
- BROKEN: partial support for commit into weave
738
            if entry == self.root:
739
                continue
740
            other.add(entry.copy())
741
        return other
742
743
1 by mbp at sourcefrog
import from baz patch-364
744
    def __iter__(self):
745
        return iter(self._byid)
746
747
748
    def __len__(self):
749
        """Returns number of entries."""
750
        return len(self._byid)
751
752
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
753
    def iter_entries(self, from_dir=None):
1 by mbp at sourcefrog
import from baz patch-364
754
        """Return (path, entry) pairs, in order by name."""
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
755
        if from_dir == None:
756
            assert self.root
757
            from_dir = self.root
758
        elif isinstance(from_dir, basestring):
759
            from_dir = self._byid[from_dir]
760
            
761
        kids = from_dir.children.items()
1 by mbp at sourcefrog
import from baz patch-364
762
        kids.sort()
763
        for name, ie in kids:
764
            yield name, ie
765
            if ie.kind == 'directory':
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
766
                for cn, cie in self.iter_entries(from_dir=ie.file_id):
271 by Martin Pool
- Windows path fixes
767
                    yield os.path.join(name, cn), cie
555 by Martin Pool
- New Inventory.entries() method
768
769
770
    def entries(self):
771
        """Return list of (path, ie) for all entries except the root.
772
773
        This may be faster than iter_entries.
774
        """
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
775
        accum = []
776
        def descend(dir_ie, dir_path):
556 by Martin Pool
- fix up Inventory.entries()
777
            kids = dir_ie.children.items()
555 by Martin Pool
- New Inventory.entries() method
778
            kids.sort()
779
            for name, ie in kids:
780
                child_path = os.path.join(dir_path, name)
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
781
                accum.append((child_path, ie))
555 by Martin Pool
- New Inventory.entries() method
782
                if ie.kind == 'directory':
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
783
                    descend(ie, child_path)
555 by Martin Pool
- New Inventory.entries() method
784
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
785
        descend(self.root, '')
786
        return accum
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
787
788
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
789
    def directories(self):
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
790
        """Return (path, entry) pairs for all directories, including the root.
1 by mbp at sourcefrog
import from baz patch-364
791
        """
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
792
        accum = []
793
        def descend(parent_ie, parent_path):
794
            accum.append((parent_path, parent_ie))
156 by mbp at sourcefrog
new "directories" command
795
            
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
796
            kids = [(ie.name, ie) for ie in parent_ie.children.itervalues() if ie.kind == 'directory']
797
            kids.sort()
156 by mbp at sourcefrog
new "directories" command
798
557 by Martin Pool
- Refactor/cleanup Inventory.entries()
799
            for name, child_ie in kids:
800
                child_path = os.path.join(parent_path, name)
801
                descend(child_ie, child_path)
802
        descend(self.root, '')
803
        return accum
1 by mbp at sourcefrog
import from baz patch-364
804
        
805
806
807
    def __contains__(self, file_id):
808
        """True if this entry contains a file with given id.
809
810
        >>> inv = Inventory()
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
811
        >>> inv.add(InventoryFile('123', 'foo.c', ROOT_ID))
812
        InventoryFile('123', 'foo.c', parent_id='TREE_ROOT')
1 by mbp at sourcefrog
import from baz patch-364
813
        >>> '123' in inv
814
        True
815
        >>> '456' in inv
816
        False
817
        """
818
        return file_id in self._byid
819
820
821
    def __getitem__(self, file_id):
822
        """Return the entry for given file_id.
823
824
        >>> inv = Inventory()
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
825
        >>> inv.add(InventoryFile('123123', 'hello.c', ROOT_ID))
826
        InventoryFile('123123', 'hello.c', parent_id='TREE_ROOT')
1 by mbp at sourcefrog
import from baz patch-364
827
        >>> inv['123123'].name
828
        'hello.c'
829
        """
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
830
        try:
831
            return self._byid[file_id]
832
        except KeyError:
380 by Martin Pool
- Slight optimization for Inventory.__getitem__
833
            if file_id == None:
834
                raise BzrError("can't look up file_id None")
835
            else:
836
                raise BzrError("file_id {%s} not in inventory" % file_id)
1 by mbp at sourcefrog
import from baz patch-364
837
838
460 by Martin Pool
- new testing command compare-trees
839
    def get_file_kind(self, file_id):
840
        return self._byid[file_id].kind
841
138 by mbp at sourcefrog
remove parallel tree from inventory;
842
    def get_child(self, parent_id, filename):
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
843
        return self[parent_id].children.get(filename)
138 by mbp at sourcefrog
remove parallel tree from inventory;
844
845
1 by mbp at sourcefrog
import from baz patch-364
846
    def add(self, entry):
847
        """Add entry to inventory.
848
849
        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
850
        which calls this.
851
852
        Returns the new entry object.
853
        """
139 by mbp at sourcefrog
simplified/faster Inventory.add
854
        if entry.file_id in self._byid:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
855
            raise BzrError("inventory already contains entry with id {%s}" % entry.file_id)
1 by mbp at sourcefrog
import from baz patch-364
856
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
857
        if entry.parent_id == ROOT_ID or entry.parent_id is None:
858
            entry.parent_id = self.root.file_id
859
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
860
        try:
861
            parent = self._byid[entry.parent_id]
862
        except KeyError:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
863
            raise BzrError("parent_id {%s} not in inventory" % entry.parent_id)
139 by mbp at sourcefrog
simplified/faster Inventory.add
864
865
        if parent.children.has_key(entry.name):
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
866
            raise BzrError("%s is already versioned" %
140 by mbp at sourcefrog
fix error message for repeated add
867
                    appendpath(self.id2path(parent.file_id), entry.name))
1 by mbp at sourcefrog
import from baz patch-364
868
869
        self._byid[entry.file_id] = entry
139 by mbp at sourcefrog
simplified/faster Inventory.add
870
        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
871
        return entry
1 by mbp at sourcefrog
import from baz patch-364
872
873
70 by mbp at sourcefrog
Prepare for smart recursive add.
874
    def add_path(self, relpath, kind, file_id=None):
875
        """Add entry from a path.
876
1180 by Martin Pool
- start splitting code for xml (de)serialization away from objects
877
        The immediate parent must already be versioned.
878
879
        Returns the new entry object."""
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
880
        from bzrlib.workingtree import gen_file_id
1015 by Martin Pool
- fix circular imports
881
        
70 by mbp at sourcefrog
Prepare for smart recursive add.
882
        parts = bzrlib.osutils.splitpath(relpath)
883
        if len(parts) == 0:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
884
            raise BzrError("cannot re-add root of inventory")
70 by mbp at sourcefrog
Prepare for smart recursive add.
885
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
886
        if file_id == None:
800 by Martin Pool
Merge John's import-speedup branch:
887
            file_id = gen_file_id(relpath)
70 by mbp at sourcefrog
Prepare for smart recursive add.
888
753 by Martin Pool
- new exception NotVersionedError
889
        parent_path = parts[:-1]
890
        parent_id = self.path2id(parent_path)
891
        if parent_id == None:
1185.16.72 by Martin Pool
[merge] from robert and fix up tests
892
            raise NotVersionedError(path=parent_path)
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
893
        if kind == 'directory':
894
            ie = InventoryDirectory(file_id, parts[-1], parent_id)
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
895
        elif kind == 'file':
896
            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
897
        elif kind == 'symlink':
898
            ie = InventoryLink(file_id, parts[-1], parent_id)
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
899
        else:
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
900
            raise BzrError("unknown kind %r" % kind)
70 by mbp at sourcefrog
Prepare for smart recursive add.
901
        return self.add(ie)
902
903
1 by mbp at sourcefrog
import from baz patch-364
904
    def __delitem__(self, file_id):
905
        """Remove entry by id.
906
907
        >>> inv = Inventory()
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
908
        >>> inv.add(InventoryFile('123', 'foo.c', ROOT_ID))
909
        InventoryFile('123', 'foo.c', parent_id='TREE_ROOT')
1 by mbp at sourcefrog
import from baz patch-364
910
        >>> '123' in inv
911
        True
912
        >>> del inv['123']
913
        >>> '123' in inv
914
        False
915
        """
916
        ie = self[file_id]
917
138 by mbp at sourcefrog
remove parallel tree from inventory;
918
        assert self[ie.parent_id].children[ie.name] == ie
1 by mbp at sourcefrog
import from baz patch-364
919
        
920
        # TODO: Test deleting all children; maybe hoist to a separate
921
        # deltree method?
922
        if ie.kind == 'directory':
138 by mbp at sourcefrog
remove parallel tree from inventory;
923
            for cie in ie.children.values():
1 by mbp at sourcefrog
import from baz patch-364
924
                del self[cie.file_id]
138 by mbp at sourcefrog
remove parallel tree from inventory;
925
            del ie.children
1 by mbp at sourcefrog
import from baz patch-364
926
927
        del self._byid[file_id]
138 by mbp at sourcefrog
remove parallel tree from inventory;
928
        del self[ie.parent_id].children[ie.name]
1 by mbp at sourcefrog
import from baz patch-364
929
930
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
931
    def __eq__(self, other):
1 by mbp at sourcefrog
import from baz patch-364
932
        """Compare two sets by comparing their contents.
933
934
        >>> i1 = Inventory()
935
        >>> i2 = Inventory()
936
        >>> i1 == i2
937
        True
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
938
        >>> i1.add(InventoryFile('123', 'foo', ROOT_ID))
939
        InventoryFile('123', 'foo', parent_id='TREE_ROOT')
1 by mbp at sourcefrog
import from baz patch-364
940
        >>> i1 == i2
941
        False
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
942
        >>> i2.add(InventoryFile('123', 'foo', ROOT_ID))
943
        InventoryFile('123', 'foo', parent_id='TREE_ROOT')
1 by mbp at sourcefrog
import from baz patch-364
944
        >>> i1 == i2
945
        True
946
        """
947
        if not isinstance(other, Inventory):
948
            return NotImplemented
949
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
950
        if len(self._byid) != len(other._byid):
543 by Martin Pool
- More cleanups for set type
951
            # shortcut: obviously not the same
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
952
            return False
953
954
        return self._byid == other._byid
955
956
957
    def __ne__(self, other):
1249 by Martin Pool
- improvements to weave commit [broken]
958
        return not self.__eq__(other)
544 by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects,
959
960
961
    def __hash__(self):
962
        raise ValueError('not hashable')
963
1 by mbp at sourcefrog
import from baz patch-364
964
172 by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory
965
    def get_idpath(self, file_id):
966
        """Return a list of file_ids for the path to an entry.
967
968
        The list contains one element for each directory followed by
969
        the id of the file itself.  So the length of the returned list
970
        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
971
        root directory as depth 1.
172 by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory
972
        """
973
        p = []
974
        while file_id != None:
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
975
            try:
976
                ie = self._byid[file_id]
977
            except KeyError:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
978
                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
979
            p.insert(0, ie.file_id)
980
            file_id = ie.parent_id
981
        return p
982
983
1 by mbp at sourcefrog
import from baz patch-364
984
    def id2path(self, file_id):
1393.1.32 by Martin Pool
- add docstring demonstrating use of Inventory.id2path
985
        """Return as a list the path to file_id.
986
        
987
        >>> i = Inventory()
988
        >>> e = i.add(InventoryDirectory('src-id', 'src', ROOT_ID))
989
        >>> e = i.add(InventoryFile('foo-id', 'foo.c', parent_id='src-id'))
990
        >>> print i.id2path('foo-id').replace(os.sep, '/')
991
        src/foo.c
992
        """
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
993
        # get all names, skipping root
922 by Martin Pool
- optimization for Inventory.id2path; access byid map directly rather than
994
        p = [self._byid[fid].name for fid in self.get_idpath(file_id)[1:]]
271 by Martin Pool
- Windows path fixes
995
        return os.sep.join(p)
1 by mbp at sourcefrog
import from baz patch-364
996
            
997
998
999
    def path2id(self, name):
1000
        """Walk down through directories to return entry of last component.
1001
1002
        names may be either a list of path components, or a single
1003
        string, in which case it is automatically split.
1004
1005
        This returns the entry of the last component in the path,
1006
        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
1007
1008
        Returns None iff the path is not found.
1 by mbp at sourcefrog
import from baz patch-364
1009
        """
70 by mbp at sourcefrog
Prepare for smart recursive add.
1010
        if isinstance(name, types.StringTypes):
1011
            name = splitpath(name)
1 by mbp at sourcefrog
import from baz patch-364
1012
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
1013
        mutter("lookup path %r" % name)
1014
1015
        parent = self.root
70 by mbp at sourcefrog
Prepare for smart recursive add.
1016
        for f in name:
1 by mbp at sourcefrog
import from baz patch-364
1017
            try:
138 by mbp at sourcefrog
remove parallel tree from inventory;
1018
                cie = parent.children[f]
1 by mbp at sourcefrog
import from baz patch-364
1019
                assert cie.name == f
178 by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment
1020
                assert cie.parent_id == parent.file_id
138 by mbp at sourcefrog
remove parallel tree from inventory;
1021
                parent = cie
1 by mbp at sourcefrog
import from baz patch-364
1022
            except KeyError:
1023
                # or raise an error?
1024
                return None
1025
138 by mbp at sourcefrog
remove parallel tree from inventory;
1026
        return parent.file_id
1 by mbp at sourcefrog
import from baz patch-364
1027
1028
1029
    def has_filename(self, names):
1030
        return bool(self.path2id(names))
1031
1032
1033
    def has_id(self, file_id):
1034
        return self._byid.has_key(file_id)
1035
1036
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
1037
    def rename(self, file_id, new_parent_id, new_name):
1038
        """Move a file within the inventory.
1039
1040
        This can change either the name, or the parent, or both.
1041
1042
        This does not move the working file."""
1043
        if not is_valid_name(new_name):
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
1044
            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
1045
1046
        new_parent = self._byid[new_parent_id]
1047
        if new_name in new_parent.children:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
1048
            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
1049
172 by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory
1050
        new_parent_idpath = self.get_idpath(new_parent_id)
1051
        if file_id in new_parent_idpath:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
1052
            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
1053
                    % (self.id2path(file_id), self.id2path(new_parent_id)))
1054
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
1055
        file_ie = self._byid[file_id]
1056
        old_parent = self._byid[file_ie.parent_id]
1057
1058
        # TODO: Don't leave things messed up if this fails
1059
1060
        del old_parent.children[file_ie.name]
1061
        new_parent.children[new_name] = file_ie
1062
        
1063
        file_ie.name = new_name
1064
        file_ie.parent_id = new_parent_id
1065
1066
1067
1068
1077 by Martin Pool
- avoid compiling REs at module load time
1069
_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
1070
1071
def is_valid_name(name):
1077 by Martin Pool
- avoid compiling REs at module load time
1072
    global _NAME_RE
1073
    if _NAME_RE == None:
1074
        _NAME_RE = re.compile(r'^[^/\\]+$')
1075
        
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
1076
    return bool(_NAME_RE.match(name))