~bzr-pqm/bzr/bzr.dev

2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
1
# Copyright (C) 2006, 2007 Canonical Ltd
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
2
#
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.
7
#
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.
12
#
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
17
"""MutableTree object.
18
19
See MutableTree for more details.
20
"""
21
22
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
23
from bzrlib.lazy_import import lazy_import
24
lazy_import(globals(), """
25
import os
26
2568.2.6 by Robert Collins
Review feedback.
27
from bzrlib import (
28
    add,
29
    bzrdir,
3335.1.2 by Jelmer Vernooij
Add mutabletree hooks class and start_commit hook.
30
    hooks,
2568.2.6 by Robert Collins
Review feedback.
31
    )
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
32
from bzrlib.osutils import dirname
2865.1.1 by Robert Collins
Create new mutable tree method update_to_one_parent_via_delta for eventual use by commit.
33
from bzrlib.revisiontree import RevisionTree
2568.2.9 by Robert Collins
Really honestly finally fix tests.
34
from bzrlib.trace import mutter, warning
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
35
""")
36
2100.3.27 by Aaron Bentley
Enable nested commits
37
from bzrlib import (
38
    errors,
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
39
    osutils,
2100.3.27 by Aaron Bentley
Enable nested commits
40
    tree,
41
    )
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
42
from bzrlib.decorators import needs_read_lock, needs_write_lock
43
from bzrlib.osutils import splitpath
44
from bzrlib.symbol_versioning import DEPRECATED_PARAMETER
45
46
1986.1.8 by Robert Collins
Update to bzr.dev, which involves adding lock_tree_write to MutableTree and MemoryTree.
47
def needs_tree_write_lock(unbound):
48
    """Decorate unbound to take out and release a tree_write lock."""
49
    def tree_write_locked(self, *args, **kwargs):
50
        self.lock_tree_write()
51
        try:
52
            return unbound(self, *args, **kwargs)
53
        finally:
54
            self.unlock()
55
    tree_write_locked.__doc__ = unbound.__doc__
56
    tree_write_locked.__name__ = unbound.__name__
57
    return tree_write_locked
58
59
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
60
class MutableTree(tree.Tree):
61
    """A MutableTree is a specialisation of Tree which is able to be mutated.
62
63
    Generally speaking these mutations are only possible within a lock_write
64
    context, and will revert if the lock is broken abnormally - but this cannot
65
    be guaranteed - depending on the exact implementation of the mutable state.
66
67
    The most common form of Mutable Tree is WorkingTree, see bzrlib.workingtree.
68
    For tests we also have MemoryTree which is a MutableTree whose contents are
69
    entirely in memory.
70
71
    For now, we are not treating MutableTree as an interface to provide
72
    conformance tests for - rather we are testing MemoryTree specifically, and 
73
    interface testing implementations of WorkingTree.
74
75
    A mutable tree always has an associated Branch and BzrDir object - the
76
    branch and bzrdir attributes.
77
    """
78
2255.7.66 by Robert Collins
MutableTree.add only needs a tree write lock.
79
    @needs_tree_write_lock
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
80
    def add(self, files, ids=None, kinds=None):
81
        """Add paths to the set of versioned paths.
82
83
        Note that the command line normally calls smart_add instead,
84
        which can automatically recurse.
85
86
        This adds the files to the inventory, so that they will be
87
        recorded by the next commit.
88
89
        :param files: List of paths to add, relative to the base of the tree.
90
        :param ids: If set, use these instead of automatically generated ids.
91
            Must be the same length as the list of files, but may
92
            contain None for ids that are to be autogenerated.
93
        :param kinds: Optional parameter to specify the kinds to be used for
94
            each file.
95
96
        TODO: Perhaps callback with the ids and paths as they're added.
97
        """
98
        if isinstance(files, basestring):
99
            assert(ids is None or isinstance(ids, basestring))
100
            assert(kinds is None or isinstance(kinds, basestring))
101
            files = [files]
102
            if ids is not None:
103
                ids = [ids]
104
            if kinds is not None:
105
                kinds = [kinds]
106
2323.4.2 by Robert Collins
Fix the behaviour of dirstate optimised iter_changes recursing its disk iterator into subtrees inappropriately.
107
        files = [path.strip('/') for path in files]
108
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
109
        if ids is None:
110
            ids = [None] * len(files)
111
        else:
112
            assert(len(ids) == len(files))
113
        if kinds is None:
114
            kinds = [None] * len(files)
115
        else:
116
            assert(len(kinds) == len(files))
117
        for f in files:
118
            # generic constraint checks:
119
            if self.is_control_filename(f):
120
                raise errors.ForbiddenControlFileError(filename=f)
121
            fp = splitpath(f)
122
        # fill out file kinds for all files [not needed when we stop 
123
        # caring about the instantaneous file kind within a uncommmitted tree
124
        #
125
        self._gather_kinds(files, kinds)
126
        self._add(files, ids, kinds)
127
2255.6.8 by Aaron Bentley
Merge refactoring of add_reference
128
    def add_reference(self, sub_tree):
129
        """Add a TreeReference to the tree, pointing at sub_tree"""
130
        raise errors.UnsupportedOperation(self.add_reference, self)
131
132
    def _add_reference(self, sub_tree):
133
        """Standard add_reference implementation, for use by subclasses"""
134
        try:
135
            sub_tree_path = self.relpath(sub_tree.basedir)
136
        except errors.PathNotChild:
137
            raise errors.BadReferenceTarget(self, sub_tree,
138
                                            'Target not inside tree.')
139
        sub_tree_id = sub_tree.get_root_id()
140
        if sub_tree_id == self.get_root_id():
141
            raise errors.BadReferenceTarget(self, sub_tree,
142
                                     'Trees have the same root id.')
143
        if sub_tree_id in self.inventory:
144
            raise errors.BadReferenceTarget(self, sub_tree,
145
                                            'Root id already present in tree')
146
        self._add([sub_tree_path], [sub_tree_id], ['tree-reference'])
147
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
148
    def _add(self, files, ids, kinds):
2255.6.8 by Aaron Bentley
Merge refactoring of add_reference
149
        """Helper function for add - updates the inventory.
150
151
        :param files: sequence of pathnames, relative to the tree root
152
        :param ids: sequence of suggested ids for the files (may be None)
153
        :param kinds: sequence of  inventory kinds of the files (i.e. may
154
            contain "tree-reference")
155
        """
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
156
        raise NotImplementedError(self._add)
157
2376.2.2 by Aaron Bentley
Reduce lock to tree lock
158
    @needs_tree_write_lock
2376.2.1 by Aaron Bentley
Implement MutableTree.apply_inventory_delta
159
    def apply_inventory_delta(self, changes):
160
        """Apply changes to the inventory as an atomic operation.
161
2865.1.1 by Robert Collins
Create new mutable tree method update_to_one_parent_via_delta for eventual use by commit.
162
        :param changes: An inventory delta to apply to the working tree's
163
            inventory.
164
        :return None:
165
        :seealso Inventory.apply_delta: For details on the changes parameter.
2376.2.9 by Aaron Bentley
Cleanup from review
166
        """
2376.2.1 by Aaron Bentley
Implement MutableTree.apply_inventory_delta
167
        self.flush()
168
        inv = self.inventory
2865.1.1 by Robert Collins
Create new mutable tree method update_to_one_parent_via_delta for eventual use by commit.
169
        inv.apply_delta(changes)
2376.2.1 by Aaron Bentley
Implement MutableTree.apply_inventory_delta
170
        self._write_inventory(inv)
171
172
    @needs_write_lock
2255.2.218 by Robert Collins
Make the nested tree commit smoke test be more rigourous.
173
    def commit(self, message=None, revprops=None, *args,
2100.3.27 by Aaron Bentley
Enable nested commits
174
               **kwargs):
1986.1.3 by Robert Collins
Merge bzr.dev.
175
        # avoid circular imports
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
176
        from bzrlib import commit
177
        if revprops is None:
178
            revprops = {}
179
        if not 'branch-nick' in revprops:
180
            revprops['branch-nick'] = self.branch.nick
2671.2.2 by Lukáš Lalinský
Move setting of the author revision property to MutableTree.commit. Don't use try/except KeyError in LongLogFormatter to display authors and branch-nicks. Removed warning about missing e-mail in the authors name.
181
        author = kwargs.pop('author', None)
2671.2.5 by Lukáš Lalinský
Fixes for comments from the mailing list.
182
        if author is not None:
183
            assert 'author' not in revprops
2671.2.2 by Lukáš Lalinský
Move setting of the author revision property to MutableTree.commit. Don't use try/except KeyError in LongLogFormatter to display authors and branch-nicks. Removed warning about missing e-mail in the authors name.
184
            revprops['author'] = author
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
185
        # args for wt.commit start at message from the Commit.commit method,
2367.2.1 by Robert Collins
Remove bzrlib 0.8 compatability where it was making the code unclear or messy. (Robert Collins)
186
        args = (message, ) + args
3335.1.2 by Jelmer Vernooij
Add mutabletree hooks class and start_commit hook.
187
        for hook in MutableTree.hooks['start_commit']:
188
            hook(self)
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
189
        committed_id = commit.Commit().commit(working_tree=self,
1986.1.3 by Robert Collins
Merge bzr.dev.
190
            revprops=revprops, *args, **kwargs)
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
191
        return committed_id
192
193
    def _gather_kinds(self, files, kinds):
194
        """Helper function for add - sets the entries of kinds."""
195
        raise NotImplementedError(self._gather_kinds)
196
1986.1.6 by Robert Collins
Add MemoryTree.last_revision.
197
    @needs_read_lock
198
    def last_revision(self):
1986.1.7 by Robert Collins
Merge bzr.dev.
199
        """Return the revision id of the last commit performed in this tree.
200
201
        In early tree formats the result of last_revision is the same as the
202
        branch last_revision, but that is no longer the case for modern tree
203
        formats.
204
        
205
        last_revision returns the left most parent id, or None if there are no
206
        parents.
207
208
        last_revision was deprecated as of 0.11. Please use get_parent_ids
209
        instead.
210
        """
1986.1.6 by Robert Collins
Add MemoryTree.last_revision.
211
        raise NotImplementedError(self.last_revision)
212
1986.1.8 by Robert Collins
Update to bzr.dev, which involves adding lock_tree_write to MutableTree and MemoryTree.
213
    def lock_tree_write(self):
214
        """Lock the working tree for write, and the branch for read.
215
216
        This is useful for operations which only need to mutate the working
217
        tree. Taking out branch write locks is a relatively expensive process
218
        and may fail if the branch is on read only media. So branch write locks
219
        should only be taken out when we are modifying branch data - such as in
220
        operations like commit, pull, uncommit and update.
221
        """
222
        raise NotImplementedError(self.lock_tree_write)
223
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
224
    def lock_write(self):
225
        """Lock the tree and its branch. This allows mutating calls to be made.
226
227
        Some mutating methods will take out implicit write locks, but in 
228
        general you should always obtain a write lock before calling mutating
229
        methods on a tree.
230
        """
231
        raise NotImplementedError(self.lock_write)
232
233
    @needs_write_lock
234
    def mkdir(self, path, file_id=None):
235
        """Create a directory in the tree. if file_id is None, one is assigned.
236
237
        :param path: A unicode file path.
238
        :param file_id: An optional file-id.
239
        :return: the file id of the new directory.
240
        """
241
        raise NotImplementedError(self.mkdir)
242
2418.5.1 by John Arbash Meinel
Make a Branch helper which can create a very basic MemoryTree with history.
243
    def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False):
244
        """Set the parents ids of the working tree.
245
246
        :param revision_ids: A list of revision_ids.
247
        """
248
        raise NotImplementedError(self.set_parent_ids)
249
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
250
    def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
251
        """Set the parents of the working tree.
252
253
        :param parents_list: A list of (revision_id, tree) tuples. 
254
            If tree is None, then that element is treated as an unreachable
255
            parent tree - i.e. a ghost.
256
        """
257
        raise NotImplementedError(self.set_parent_trees)
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
258
259
    @needs_tree_write_lock
260
    def smart_add(self, file_list, recurse=True, action=None, save=True):
261
        """Version file_list, optionally recursing into directories.
262
263
        This is designed more towards DWIM for humans than API clarity.
264
        For the specific behaviour see the help for cmd_add().
265
266
        :param action: A reporter to be called with the inventory, parent_ie,
267
            path and kind of the path being added. It may return a file_id if 
268
            a specific one should be used.
269
        :param save: Save the inventory after completing the adds. If False
270
            this provides dry-run functionality by doing the add and not saving
2585.1.1 by Aaron Bentley
Unify MutableTree.smart_add behavior by disabling quirky memory-only Inventory
271
            the inventory.
2568.2.6 by Robert Collins
Review feedback.
272
        :return: A tuple - files_added, ignored_files. files_added is the count
273
            of added files, and ignored_files is a dict mapping files that were
274
            ignored to the rule that caused them to be ignored.
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
275
        """
276
        # not in an inner loop; and we want to remove direct use of this,
277
        # so here as a reminder for now. RBC 20070703
278
        from bzrlib.inventory import InventoryEntry
279
        assert isinstance(recurse, bool)
280
        if action is None:
281
            action = add.AddAction()
282
        
283
        if not file_list:
284
            # no paths supplied: add the entire tree.
285
            file_list = [u'.']
286
        # mutter("smart add of %r")
287
        inv = self.inventory
288
        added = []
289
        ignored = {}
290
        dirs_to_add = []
291
        user_dirs = set()
292
293
        # validate user file paths and convert all paths to tree 
2568.2.6 by Robert Collins
Review feedback.
294
        # relative : it's cheaper to make a tree relative path an abspath
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
295
        # than to convert an abspath to tree relative.
296
        for filepath in file_list:
2568.2.5 by Robert Collins
* ``bzrlib.add.FastPath`` is now private and moved to
297
            rf = _FastPath(self.relpath(filepath))
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
298
            # validate user parameters. Our recursive code avoids adding new files
299
            # that need such validation 
300
            if self.is_control_filename(rf.raw_path):
301
                raise errors.ForbiddenControlFileError(filename=rf.raw_path)
302
            
303
            abspath = self.abspath(rf.raw_path)
304
            kind = osutils.file_kind(abspath)
305
            if kind == 'directory':
306
                # schedule the dir for scanning
307
                user_dirs.add(rf)
308
            else:
309
                if not InventoryEntry.versionable_kind(kind):
310
                    raise errors.BadFileKindError(filename=abspath, kind=kind)
311
            # ensure the named path is added, so that ignore rules in the later directory
312
            # walk dont skip it.
313
            # we dont have a parent ie known yet.: use the relatively slower inventory 
314
            # probing method
315
            versioned = inv.has_filename(rf.raw_path)
316
            if versioned:
317
                continue
318
            added.extend(_add_one_and_parent(self, inv, None, rf, kind, action))
319
320
        if not recurse:
321
            # no need to walk any directories at all.
322
            if len(added) > 0 and save:
323
                self._write_inventory(inv)
324
            return added, ignored
325
326
        # only walk the minimal parents needed: we have user_dirs to override
327
        # ignores.
328
        prev_dir = None
329
330
        is_inside = osutils.is_inside_or_parent_of_any
331
        for path in sorted(user_dirs):
332
            if (prev_dir is None or not is_inside([prev_dir], path.raw_path)):
333
                dirs_to_add.append((path, None))
334
            prev_dir = path.raw_path
335
336
        # dirs_to_add is initialised to a list of directories, but as we scan
337
        # directories we append files to it.
338
        # XXX: We should determine kind of files when we scan them rather than
339
        # adding to this list. RBC 20070703
340
        for directory, parent_ie in dirs_to_add:
341
            # directory is tree-relative
342
            abspath = self.abspath(directory.raw_path)
343
344
            # get the contents of this directory.
345
346
            # find the kind of the path being added.
347
            kind = osutils.file_kind(abspath)
348
349
            if not InventoryEntry.versionable_kind(kind):
350
                warning("skipping %s (can't add file of kind '%s')", abspath, kind)
351
                continue
352
353
            if parent_ie is not None:
354
                versioned = directory.base_path in parent_ie.children
355
            else:
356
                # without the parent ie, use the relatively slower inventory 
357
                # probing method
358
                versioned = inv.has_filename(directory.raw_path)
359
360
            if kind == 'directory':
361
                try:
362
                    sub_branch = bzrdir.BzrDir.open(abspath)
363
                    sub_tree = True
364
                except errors.NotBranchError:
365
                    sub_tree = False
366
                except errors.UnsupportedFormatError:
367
                    sub_tree = True
368
            else:
369
                sub_tree = False
370
371
            if directory.raw_path == '':
372
                # mutter("tree root doesn't need to be added")
373
                sub_tree = False
374
            elif versioned:
375
                pass
376
                # mutter("%r is already versioned", abspath)
377
            elif sub_tree:
378
                # XXX: This is wrong; people *might* reasonably be trying to add
379
                # subtrees as subtrees.  This should probably only be done in formats 
380
                # which can represent subtrees, and even then perhaps only when
381
                # the user asked to add subtrees.  At the moment you can add them
382
                # specially through 'join --reference', which is perhaps
383
                # reasonable: adding a new reference is a special operation and
384
                # can have a special behaviour.  mbp 20070306
385
                mutter("%r is a nested bzr tree", abspath)
386
            else:
387
                _add_one(self, inv, parent_ie, directory, kind, action)
388
                added.append(directory.raw_path)
389
390
            if kind == 'directory' and not sub_tree:
391
                if parent_ie is not None:
392
                    # must be present:
393
                    this_ie = parent_ie.children[directory.base_path]
394
                else:
395
                    # without the parent ie, use the relatively slower inventory 
396
                    # probing method
397
                    this_id = inv.path2id(directory.raw_path)
398
                    if this_id is None:
399
                        this_ie = None
400
                    else:
401
                        this_ie = inv[this_id]
402
403
                for subf in sorted(os.listdir(abspath)):
404
                    # here we could use TreeDirectory rather than 
405
                    # string concatenation.
406
                    subp = osutils.pathjoin(directory.raw_path, subf)
407
                    # TODO: is_control_filename is very slow. Make it faster. 
408
                    # TreeDirectory.is_control_filename could also make this 
409
                    # faster - its impossible for a non root dir to have a 
410
                    # control file.
411
                    if self.is_control_filename(subp):
412
                        mutter("skip control directory %r", subp)
413
                    elif subf in this_ie.children:
414
                        # recurse into this already versioned subdir.
2568.2.5 by Robert Collins
* ``bzrlib.add.FastPath`` is now private and moved to
415
                        dirs_to_add.append((_FastPath(subp, subf), this_ie))
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
416
                    else:
417
                        # user selection overrides ignoes
418
                        # ignore while selecting files - if we globbed in the
419
                        # outer loop we would ignore user files.
420
                        ignore_glob = self.is_ignored(subp)
421
                        if ignore_glob is not None:
422
                            # mutter("skip ignored sub-file %r", subp)
423
                            ignored.setdefault(ignore_glob, []).append(subp)
424
                        else:
425
                            #mutter("queue to add sub-file %r", subp)
2568.2.5 by Robert Collins
* ``bzrlib.add.FastPath`` is now private and moved to
426
                            dirs_to_add.append((_FastPath(subp, subf), this_ie))
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
427
2585.1.1 by Aaron Bentley
Unify MutableTree.smart_add behavior by disabling quirky memory-only Inventory
428
        if len(added) > 0:
429
            if save:
430
                self._write_inventory(inv)
431
            else:
432
                self.read_working_inventory()
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
433
        return added, ignored
434
2903.2.7 by Martin Pool
Rename update_to_one_parent_via_delta to more wieldy update_basis_by_delta
435
    def update_basis_by_delta(self, new_revid, delta):
2865.1.1 by Robert Collins
Create new mutable tree method update_to_one_parent_via_delta for eventual use by commit.
436
        """Update the parents of this tree after a commit.
437
438
        This gives the tree one parent, with revision id new_revid. The
2903.2.1 by Martin Pool
Commit now tells the working tree about the new basis by passing the an inventory delta from the previous basis
439
        inventory delta is applied to the current basis tree to generate the
2865.1.3 by Robert Collins
Review feedback.
440
        inventory for the parent new_revid, and all other parent trees are
2865.1.1 by Robert Collins
Create new mutable tree method update_to_one_parent_via_delta for eventual use by commit.
441
        discarded.
442
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
443
        All the changes in the delta should be changes synchronising the basis
444
        tree with some or all of the working tree, with a change to a directory
445
        requiring that its contents have been recursively included. That is,
446
        this is not a general purpose tree modification routine, but a helper
447
        for commit which is not required to handle situations that do not arise
448
        outside of commit.
449
2865.1.1 by Robert Collins
Create new mutable tree method update_to_one_parent_via_delta for eventual use by commit.
450
        :param new_revid: The new revision id for the trees parent.
451
        :param delta: An inventory delta (see apply_inventory_delta) describing
452
            the changes from the current left most parent revision to new_revid.
453
        """
454
        # if the tree is updated by a pull to the branch, as happens in
455
        # WorkingTree2, when there was no separation between branch and tree,
456
        # then just clear merges, efficiency is not a concern for now as this
457
        # is legacy environments only, and they are slow regardless.
458
        if self.last_revision() == new_revid:
459
            self.set_parent_ids([new_revid])
460
            return
461
        # generic implementation based on Inventory manipulation. See
462
        # WorkingTree classes for optimised versions for specific format trees.
463
        basis = self.basis_tree()
464
        basis.lock_read()
465
        inventory = basis.inventory
466
        basis.unlock()
467
        inventory.apply_delta(delta)
468
        rev_tree = RevisionTree(self.branch.repository, inventory, new_revid)
469
        self.set_parent_trees([(new_revid, rev_tree)])
470
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
471
3335.1.2 by Jelmer Vernooij
Add mutabletree hooks class and start_commit hook.
472
class MutableTreeHooks(hooks.Hooks):
3335.1.4 by Jelmer Vernooij
Fix indentation, add version number.
473
    """A dictionary mapping a hook name to a list of callables for mutabletree 
474
    hooks.
3335.1.2 by Jelmer Vernooij
Add mutabletree hooks class and start_commit hook.
475
    """
476
477
    def __init__(self):
478
        """Create the default hooks.
479
480
        """
481
        hooks.Hooks.__init__(self)
3335.1.4 by Jelmer Vernooij
Fix indentation, add version number.
482
        # Invoked before a commit is done in a tree. New in 1.4
3335.1.2 by Jelmer Vernooij
Add mutabletree hooks class and start_commit hook.
483
        self['start_commit'] = []
484
485
486
# install the default hooks into the MutableTree class.
487
MutableTree.hooks = MutableTreeHooks()
488
489
2568.2.5 by Robert Collins
* ``bzrlib.add.FastPath`` is now private and moved to
490
class _FastPath(object):
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
491
    """A path object with fast accessors for things like basename."""
492
493
    __slots__ = ['raw_path', 'base_path']
494
495
    def __init__(self, path, base_path=None):
496
        """Construct a FastPath from path."""
497
        if base_path is None:
498
            self.base_path = osutils.basename(path)
499
        else:
500
            self.base_path = base_path
501
        self.raw_path = path
502
503
    def __cmp__(self, other):
504
        return cmp(self.raw_path, other.raw_path)
505
506
    def __hash__(self):
507
        return hash(self.raw_path)
508
509
510
def _add_one_and_parent(tree, inv, parent_ie, path, kind, action):
511
    """Add a new entry to the inventory and automatically add unversioned parents.
512
513
    :param inv: Inventory which will receive the new entry.
514
    :param parent_ie: Parent inventory entry if known, or None.  If
515
        None, the parent is looked up by name and used if present, otherwise it
516
        is recursively added.
517
    :param kind: Kind of new entry (file, directory, etc)
518
    :param action: callback(inv, parent_ie, path, kind); return ignored.
519
    :return: A list of paths which have been added.
520
    """
521
    # Nothing to do if path is already versioned.
522
    # This is safe from infinite recursion because the tree root is
523
    # always versioned.
524
    if parent_ie is not None:
525
        # we have a parent ie already
526
        added = []
527
    else:
528
        # slower but does not need parent_ie
529
        if inv.has_filename(path.raw_path):
530
            return []
531
        # its really not there : add the parent
532
        # note that the dirname use leads to some extra str copying etc but as
533
        # there are a limited number of dirs we can be nested under, it should
534
        # generally find it very fast and not recurse after that.
2568.2.5 by Robert Collins
* ``bzrlib.add.FastPath`` is now private and moved to
535
        added = _add_one_and_parent(tree, inv, None,
536
            _FastPath(dirname(path.raw_path)), 'directory', action)
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
537
        parent_id = inv.path2id(dirname(path.raw_path))
538
        parent_ie = inv[parent_id]
539
    _add_one(tree, inv, parent_ie, path, kind, action)
540
    return added + [path.raw_path]
541
542
543
def _add_one(tree, inv, parent_ie, path, kind, file_id_callback):
544
    """Add a new entry to the inventory.
545
546
    :param inv: Inventory which will receive the new entry.
547
    :param parent_ie: Parent inventory entry.
548
    :param kind: Kind of new entry (file, directory, etc)
549
    :param file_id_callback: callback(inv, parent_ie, path, kind); return a
550
        file_id or None to generate a new file id
551
    :returns: None
552
    """
553
    file_id = file_id_callback(inv, parent_ie, path, kind)
554
    entry = inv.make_entry(kind, path.base_path, parent_ie.file_id,
555
        file_id=file_id)
556
    inv.add(entry)