~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
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
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,
4056.2.1 by James Westby
Allow specifying multiple authors for a revision.
31
    symbol_versioning,
2568.2.6 by Robert Collins
Review feedback.
32
    )
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
33
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.
34
from bzrlib.revisiontree import RevisionTree
2568.2.9 by Robert Collins
Really honestly finally fix tests.
35
from bzrlib.trace import mutter, warning
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
36
""")
37
2100.3.27 by Aaron Bentley
Enable nested commits
38
from bzrlib import (
39
    errors,
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
40
    osutils,
2100.3.27 by Aaron Bentley
Enable nested commits
41
    tree,
42
    )
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
43
from bzrlib.decorators import needs_read_lock, needs_write_lock
44
from bzrlib.osutils import splitpath
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
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
72
    conformance tests for - rather we are testing MemoryTree specifically, and
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
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
    """
3794.5.19 by Mark Hammond
MutableTree gets case_sensitive attribute and smart_add takes advantage of it to enforce sane CICP-filesystem semantics
78
    def __init__(self, *args, **kw):
79
        super(MutableTree, self).__init__(*args, **kw)
80
        # Is this tree on a case-insensitive or case-preserving file-system?
81
        # Sub-classes may initialize to False if they detect they are being
82
        # used on media which doesn't differentiate the case of names.
83
        self.case_sensitive = True
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
84
2255.7.66 by Robert Collins
MutableTree.add only needs a tree write lock.
85
    @needs_tree_write_lock
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
86
    def add(self, files, ids=None, kinds=None):
87
        """Add paths to the set of versioned paths.
88
89
        Note that the command line normally calls smart_add instead,
90
        which can automatically recurse.
91
92
        This adds the files to the inventory, so that they will be
93
        recorded by the next commit.
94
95
        :param files: List of paths to add, relative to the base of the tree.
96
        :param ids: If set, use these instead of automatically generated ids.
97
            Must be the same length as the list of files, but may
98
            contain None for ids that are to be autogenerated.
99
        :param kinds: Optional parameter to specify the kinds to be used for
100
            each file.
101
102
        TODO: Perhaps callback with the ids and paths as they're added.
103
        """
104
        if isinstance(files, basestring):
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
105
            # XXX: Passing a single string is inconsistent and should be
106
            # deprecated.
107
            if not (ids is None or isinstance(ids, basestring)):
108
                raise AssertionError()
109
            if not (kinds is None or isinstance(kinds, basestring)):
110
                raise AssertionError()
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
111
            files = [files]
112
            if ids is not None:
113
                ids = [ids]
114
            if kinds is not None:
115
                kinds = [kinds]
116
2323.4.2 by Robert Collins
Fix the behaviour of dirstate optimised iter_changes recursing its disk iterator into subtrees inappropriately.
117
        files = [path.strip('/') for path in files]
118
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
119
        if ids is None:
120
            ids = [None] * len(files)
121
        else:
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
122
            if not (len(ids) == len(files)):
123
                raise AssertionError()
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
124
        if kinds is None:
125
            kinds = [None] * len(files)
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
126
        elif not len(kinds) == len(files):
127
            raise AssertionError()
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
128
        for f in files:
129
            # generic constraint checks:
130
            if self.is_control_filename(f):
131
                raise errors.ForbiddenControlFileError(filename=f)
132
            fp = splitpath(f)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
133
        # fill out file kinds for all files [not needed when we stop
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
134
        # caring about the instantaneous file kind within a uncommmitted tree
135
        #
136
        self._gather_kinds(files, kinds)
137
        self._add(files, ids, kinds)
138
2255.6.8 by Aaron Bentley
Merge refactoring of add_reference
139
    def add_reference(self, sub_tree):
140
        """Add a TreeReference to the tree, pointing at sub_tree"""
141
        raise errors.UnsupportedOperation(self.add_reference, self)
142
143
    def _add_reference(self, sub_tree):
144
        """Standard add_reference implementation, for use by subclasses"""
145
        try:
146
            sub_tree_path = self.relpath(sub_tree.basedir)
147
        except errors.PathNotChild:
148
            raise errors.BadReferenceTarget(self, sub_tree,
149
                                            'Target not inside tree.')
150
        sub_tree_id = sub_tree.get_root_id()
151
        if sub_tree_id == self.get_root_id():
152
            raise errors.BadReferenceTarget(self, sub_tree,
153
                                     'Trees have the same root id.')
154
        if sub_tree_id in self.inventory:
155
            raise errors.BadReferenceTarget(self, sub_tree,
156
                                            'Root id already present in tree')
157
        self._add([sub_tree_path], [sub_tree_id], ['tree-reference'])
158
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
159
    def _add(self, files, ids, kinds):
2255.6.8 by Aaron Bentley
Merge refactoring of add_reference
160
        """Helper function for add - updates the inventory.
161
162
        :param files: sequence of pathnames, relative to the tree root
163
        :param ids: sequence of suggested ids for the files (may be None)
164
        :param kinds: sequence of  inventory kinds of the files (i.e. may
165
            contain "tree-reference")
166
        """
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
167
        raise NotImplementedError(self._add)
168
2376.2.2 by Aaron Bentley
Reduce lock to tree lock
169
    @needs_tree_write_lock
2376.2.1 by Aaron Bentley
Implement MutableTree.apply_inventory_delta
170
    def apply_inventory_delta(self, changes):
171
        """Apply changes to the inventory as an atomic operation.
172
2865.1.1 by Robert Collins
Create new mutable tree method update_to_one_parent_via_delta for eventual use by commit.
173
        :param changes: An inventory delta to apply to the working tree's
174
            inventory.
175
        :return None:
176
        :seealso Inventory.apply_delta: For details on the changes parameter.
2376.2.9 by Aaron Bentley
Cleanup from review
177
        """
2376.2.1 by Aaron Bentley
Implement MutableTree.apply_inventory_delta
178
        self.flush()
179
        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.
180
        inv.apply_delta(changes)
2376.2.1 by Aaron Bentley
Implement MutableTree.apply_inventory_delta
181
        self._write_inventory(inv)
182
183
    @needs_write_lock
2255.2.218 by Robert Collins
Make the nested tree commit smoke test be more rigourous.
184
    def commit(self, message=None, revprops=None, *args,
2100.3.27 by Aaron Bentley
Enable nested commits
185
               **kwargs):
1986.1.3 by Robert Collins
Merge bzr.dev.
186
        # avoid circular imports
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
187
        from bzrlib import commit
188
        if revprops is None:
189
            revprops = {}
3565.6.9 by Marius Kruger
Jump through hoops not to open multiple connections when committing to a bound branch.
190
        possible_master_transports=[]
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
191
        if not 'branch-nick' in revprops:
3565.6.9 by Marius Kruger
Jump through hoops not to open multiple connections when committing to a bound branch.
192
            revprops['branch-nick'] = self.branch._get_nick(
3815.3.4 by Marius Kruger
When doing a `commit --local`, don't try to connect to the master branch.
193
                kwargs.get('local', False),
3565.6.9 by Marius Kruger
Jump through hoops not to open multiple connections when committing to a bound branch.
194
                possible_master_transports)
4056.2.1 by James Westby
Allow specifying multiple authors for a revision.
195
        authors = kwargs.pop('authors', None)
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.
196
        author = kwargs.pop('author', None)
4056.2.1 by James Westby
Allow specifying multiple authors for a revision.
197
        if authors is not None:
198
            if author is not None:
199
                raise AssertionError('Specifying both author and authors '
200
                        'is not allowed. Specify just authors instead')
4056.2.3 by James Westby
Use a new "authors" revision property to allow multiple authors
201
            if 'author' in revprops or 'authors' in revprops:
4056.2.1 by James Westby
Allow specifying multiple authors for a revision.
202
                # XXX: maybe we should just accept one of them?
203
                raise AssertionError('author property given twice')
204
            if authors:
205
                for individual in authors:
206
                    if '\n' in individual:
207
                        raise AssertionError('\\n is not a valid character '
208
                                'in an author identity')
4056.2.3 by James Westby
Use a new "authors" revision property to allow multiple authors
209
                revprops['authors'] = '\n'.join(authors)
2671.2.5 by Lukáš Lalinský
Fixes for comments from the mailing list.
210
        if author is not None:
4056.2.1 by James Westby
Allow specifying multiple authors for a revision.
211
            symbol_versioning.warn('The parameter author was deprecated'
212
                   ' in version 1.13. Use authors instead',
213
                   DeprecationWarning)
4056.2.3 by James Westby
Use a new "authors" revision property to allow multiple authors
214
            if 'author' in revprops or 'authors' in revprops:
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
215
                # XXX: maybe we should just accept one of them?
216
                raise AssertionError('author property given twice')
4056.2.1 by James Westby
Allow specifying multiple authors for a revision.
217
            if '\n' in author:
218
                raise AssertionError('\\n is not a valid character '
219
                        'in an author identity')
4056.2.3 by James Westby
Use a new "authors" revision property to allow multiple authors
220
            revprops['authors'] = author
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
221
        # 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)
222
        args = (message, ) + args
3335.1.2 by Jelmer Vernooij
Add mutabletree hooks class and start_commit hook.
223
        for hook in MutableTree.hooks['start_commit']:
224
            hook(self)
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
225
        committed_id = commit.Commit().commit(working_tree=self,
3565.6.9 by Marius Kruger
Jump through hoops not to open multiple connections when committing to a bound branch.
226
            revprops=revprops,
227
            possible_master_transports=possible_master_transports,
228
            *args, **kwargs)
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
229
        return committed_id
230
231
    def _gather_kinds(self, files, kinds):
232
        """Helper function for add - sets the entries of kinds."""
233
        raise NotImplementedError(self._gather_kinds)
234
1986.1.6 by Robert Collins
Add MemoryTree.last_revision.
235
    @needs_read_lock
236
    def last_revision(self):
1986.1.7 by Robert Collins
Merge bzr.dev.
237
        """Return the revision id of the last commit performed in this tree.
238
239
        In early tree formats the result of last_revision is the same as the
240
        branch last_revision, but that is no longer the case for modern tree
241
        formats.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
242
1986.1.7 by Robert Collins
Merge bzr.dev.
243
        last_revision returns the left most parent id, or None if there are no
244
        parents.
245
246
        last_revision was deprecated as of 0.11. Please use get_parent_ids
247
        instead.
248
        """
1986.1.6 by Robert Collins
Add MemoryTree.last_revision.
249
        raise NotImplementedError(self.last_revision)
250
1986.1.8 by Robert Collins
Update to bzr.dev, which involves adding lock_tree_write to MutableTree and MemoryTree.
251
    def lock_tree_write(self):
252
        """Lock the working tree for write, and the branch for read.
253
254
        This is useful for operations which only need to mutate the working
255
        tree. Taking out branch write locks is a relatively expensive process
256
        and may fail if the branch is on read only media. So branch write locks
257
        should only be taken out when we are modifying branch data - such as in
258
        operations like commit, pull, uncommit and update.
259
        """
260
        raise NotImplementedError(self.lock_tree_write)
261
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
262
    def lock_write(self):
263
        """Lock the tree and its branch. This allows mutating calls to be made.
264
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
265
        Some mutating methods will take out implicit write locks, but in
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
266
        general you should always obtain a write lock before calling mutating
267
        methods on a tree.
268
        """
269
        raise NotImplementedError(self.lock_write)
270
271
    @needs_write_lock
272
    def mkdir(self, path, file_id=None):
273
        """Create a directory in the tree. if file_id is None, one is assigned.
274
275
        :param path: A unicode file path.
276
        :param file_id: An optional file-id.
277
        :return: the file id of the new directory.
278
        """
279
        raise NotImplementedError(self.mkdir)
280
3709.3.2 by Robert Collins
Race-free stat-fingerprint updating during commit via a new method get_file_with_stat.
281
    def _observed_sha1(self, file_id, path, (sha1, stat_value)):
3709.3.1 by Robert Collins
First cut - make it work - at updating the tree stat cache during commit.
282
        """Tell the tree we have observed a paths sha1.
283
284
        The intent of this function is to allow trees that have a hashcache to
3709.3.2 by Robert Collins
Race-free stat-fingerprint updating during commit via a new method get_file_with_stat.
285
        update the hashcache during commit. If the observed file is too new
286
        (based on the stat_value) to be safely hash-cached the tree will ignore
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
287
        it.
3709.3.1 by Robert Collins
First cut - make it work - at updating the tree stat cache during commit.
288
289
        The default implementation does nothing.
290
291
        :param file_id: The file id
292
        :param path: The file path
293
        :param sha1: The sha 1 that was observed.
3709.3.2 by Robert Collins
Race-free stat-fingerprint updating during commit via a new method get_file_with_stat.
294
        :param stat_value: A stat result for the file the sha1 was read from.
3709.3.1 by Robert Collins
First cut - make it work - at updating the tree stat cache during commit.
295
        :return: None
296
        """
297
3794.5.31 by Mark Hammond
bulk of the simple review comments from igc.
298
    def _fix_case_of_inventory_path(self, path):
3794.5.19 by Mark Hammond
MutableTree gets case_sensitive attribute and smart_add takes advantage of it to enforce sane CICP-filesystem semantics
299
        """If our tree isn't case sensitive, return the canonical path"""
300
        if not self.case_sensitive:
301
            path = self.get_canonical_inventory_path(path)
302
        return path
303
3394.2.1 by Ian Clatworthy
add docstring for put_file_bytes_non_atomic
304
    @needs_write_lock
305
    def put_file_bytes_non_atomic(self, file_id, bytes):
306
        """Update the content of a file in the tree.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
307
3394.2.1 by Ian Clatworthy
add docstring for put_file_bytes_non_atomic
308
        Note that the file is written in-place rather than being
309
        written to a temporary location and renamed. As a consequence,
310
        readers can potentially see the file half-written.
311
312
        :param file_id: file-id of the file
313
        :param bytes: the new file contents
314
        """
315
        raise NotImplementedError(self.put_file_bytes_non_atomic)
316
2418.5.1 by John Arbash Meinel
Make a Branch helper which can create a very basic MemoryTree with history.
317
    def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False):
318
        """Set the parents ids of the working tree.
319
320
        :param revision_ids: A list of revision_ids.
321
        """
322
        raise NotImplementedError(self.set_parent_ids)
323
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
324
    def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
325
        """Set the parents of the working tree.
326
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
327
        :param parents_list: A list of (revision_id, tree) tuples.
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
328
            If tree is None, then that element is treated as an unreachable
329
            parent tree - i.e. a ghost.
330
        """
331
        raise NotImplementedError(self.set_parent_trees)
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
332
333
    @needs_tree_write_lock
334
    def smart_add(self, file_list, recurse=True, action=None, save=True):
335
        """Version file_list, optionally recursing into directories.
336
337
        This is designed more towards DWIM for humans than API clarity.
338
        For the specific behaviour see the help for cmd_add().
339
340
        :param action: A reporter to be called with the inventory, parent_ie,
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
341
            path and kind of the path being added. It may return a file_id if
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
342
            a specific one should be used.
343
        :param save: Save the inventory after completing the adds. If False
344
            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
345
            the inventory.
2568.2.6 by Robert Collins
Review feedback.
346
        :return: A tuple - files_added, ignored_files. files_added is the count
347
            of added files, and ignored_files is a dict mapping files that were
348
            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
349
        """
350
        # not in an inner loop; and we want to remove direct use of this,
351
        # so here as a reminder for now. RBC 20070703
352
        from bzrlib.inventory import InventoryEntry
353
        if action is None:
354
            action = add.AddAction()
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
355
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
356
        if not file_list:
357
            # no paths supplied: add the entire tree.
358
            file_list = [u'.']
359
        # mutter("smart add of %r")
360
        inv = self.inventory
361
        added = []
362
        ignored = {}
363
        dirs_to_add = []
364
        user_dirs = set()
365
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
366
        # validate user file paths and convert all paths to tree
2568.2.6 by Robert Collins
Review feedback.
367
        # relative : it's cheaper to make a tree relative path an abspath
3794.5.39 by Mark Hammond
typos and whitespace changes.
368
        # than to convert an abspath to tree relative, and it's cheaper to
3794.5.19 by Mark Hammond
MutableTree gets case_sensitive attribute and smart_add takes advantage of it to enforce sane CICP-filesystem semantics
369
        # perform the canonicalization in bulk.
370
        for filepath in osutils.canonical_relpaths(self.basedir, file_list):
371
            rf = _FastPath(filepath)
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
372
            # validate user parameters. Our recursive code avoids adding new files
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
373
            # that need such validation
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
374
            if self.is_control_filename(rf.raw_path):
375
                raise errors.ForbiddenControlFileError(filename=rf.raw_path)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
376
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
377
            abspath = self.abspath(rf.raw_path)
378
            kind = osutils.file_kind(abspath)
379
            if kind == 'directory':
380
                # schedule the dir for scanning
381
                user_dirs.add(rf)
382
            else:
383
                if not InventoryEntry.versionable_kind(kind):
384
                    raise errors.BadFileKindError(filename=abspath, kind=kind)
385
            # ensure the named path is added, so that ignore rules in the later directory
386
            # walk dont skip it.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
387
            # we dont have a parent ie known yet.: use the relatively slower inventory
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
388
            # probing method
389
            versioned = inv.has_filename(rf.raw_path)
390
            if versioned:
391
                continue
392
            added.extend(_add_one_and_parent(self, inv, None, rf, kind, action))
393
394
        if not recurse:
395
            # no need to walk any directories at all.
396
            if len(added) > 0 and save:
397
                self._write_inventory(inv)
398
            return added, ignored
399
400
        # only walk the minimal parents needed: we have user_dirs to override
401
        # ignores.
402
        prev_dir = None
403
404
        is_inside = osutils.is_inside_or_parent_of_any
405
        for path in sorted(user_dirs):
406
            if (prev_dir is None or not is_inside([prev_dir], path.raw_path)):
407
                dirs_to_add.append((path, None))
408
            prev_dir = path.raw_path
409
410
        # dirs_to_add is initialised to a list of directories, but as we scan
411
        # directories we append files to it.
412
        # XXX: We should determine kind of files when we scan them rather than
413
        # adding to this list. RBC 20070703
414
        for directory, parent_ie in dirs_to_add:
415
            # directory is tree-relative
416
            abspath = self.abspath(directory.raw_path)
417
418
            # get the contents of this directory.
419
420
            # find the kind of the path being added.
421
            kind = osutils.file_kind(abspath)
422
423
            if not InventoryEntry.versionable_kind(kind):
424
                warning("skipping %s (can't add file of kind '%s')", abspath, kind)
425
                continue
426
427
            if parent_ie is not None:
428
                versioned = directory.base_path in parent_ie.children
429
            else:
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
430
                # without the parent ie, use the relatively slower inventory
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
431
                # probing method
3794.5.19 by Mark Hammond
MutableTree gets case_sensitive attribute and smart_add takes advantage of it to enforce sane CICP-filesystem semantics
432
                versioned = inv.has_filename(
3794.5.31 by Mark Hammond
bulk of the simple review comments from igc.
433
                        self._fix_case_of_inventory_path(directory.raw_path))
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
434
435
            if kind == 'directory':
436
                try:
437
                    sub_branch = bzrdir.BzrDir.open(abspath)
438
                    sub_tree = True
439
                except errors.NotBranchError:
440
                    sub_tree = False
441
                except errors.UnsupportedFormatError:
442
                    sub_tree = True
443
            else:
444
                sub_tree = False
445
446
            if directory.raw_path == '':
447
                # mutter("tree root doesn't need to be added")
448
                sub_tree = False
449
            elif versioned:
450
                pass
451
                # mutter("%r is already versioned", abspath)
452
            elif sub_tree:
453
                # XXX: This is wrong; people *might* reasonably be trying to add
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
454
                # subtrees as subtrees.  This should probably only be done in formats
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
455
                # which can represent subtrees, and even then perhaps only when
456
                # the user asked to add subtrees.  At the moment you can add them
457
                # specially through 'join --reference', which is perhaps
458
                # reasonable: adding a new reference is a special operation and
459
                # can have a special behaviour.  mbp 20070306
460
                mutter("%r is a nested bzr tree", abspath)
461
            else:
462
                _add_one(self, inv, parent_ie, directory, kind, action)
463
                added.append(directory.raw_path)
464
465
            if kind == 'directory' and not sub_tree:
466
                if parent_ie is not None:
467
                    # must be present:
468
                    this_ie = parent_ie.children[directory.base_path]
469
                else:
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
470
                    # without the parent ie, use the relatively slower inventory
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
471
                    # probing method
3794.5.19 by Mark Hammond
MutableTree gets case_sensitive attribute and smart_add takes advantage of it to enforce sane CICP-filesystem semantics
472
                    this_id = inv.path2id(
3794.5.31 by Mark Hammond
bulk of the simple review comments from igc.
473
                            self._fix_case_of_inventory_path(directory.raw_path))
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
474
                    if this_id is None:
475
                        this_ie = None
476
                    else:
477
                        this_ie = inv[this_id]
478
479
                for subf in sorted(os.listdir(abspath)):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
480
                    # here we could use TreeDirectory rather than
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
481
                    # string concatenation.
482
                    subp = osutils.pathjoin(directory.raw_path, subf)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
483
                    # TODO: is_control_filename is very slow. Make it faster.
484
                    # TreeDirectory.is_control_filename could also make this
485
                    # faster - its impossible for a non root dir to have a
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
486
                    # control file.
487
                    if self.is_control_filename(subp):
488
                        mutter("skip control directory %r", subp)
489
                    elif subf in this_ie.children:
490
                        # recurse into this already versioned subdir.
2568.2.5 by Robert Collins
* ``bzrlib.add.FastPath`` is now private and moved to
491
                        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
492
                    else:
493
                        # user selection overrides ignoes
494
                        # ignore while selecting files - if we globbed in the
495
                        # outer loop we would ignore user files.
496
                        ignore_glob = self.is_ignored(subp)
497
                        if ignore_glob is not None:
498
                            # mutter("skip ignored sub-file %r", subp)
499
                            ignored.setdefault(ignore_glob, []).append(subp)
500
                        else:
501
                            #mutter("queue to add sub-file %r", subp)
2568.2.5 by Robert Collins
* ``bzrlib.add.FastPath`` is now private and moved to
502
                            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
503
2585.1.1 by Aaron Bentley
Unify MutableTree.smart_add behavior by disabling quirky memory-only Inventory
504
        if len(added) > 0:
505
            if save:
506
                self._write_inventory(inv)
507
            else:
508
                self.read_working_inventory()
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
509
        return added, ignored
510
2903.2.7 by Martin Pool
Rename update_to_one_parent_via_delta to more wieldy update_basis_by_delta
511
    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.
512
        """Update the parents of this tree after a commit.
513
514
        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
515
        inventory delta is applied to the current basis tree to generate the
2865.1.3 by Robert Collins
Review feedback.
516
        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.
517
        discarded.
518
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
519
        All the changes in the delta should be changes synchronising the basis
520
        tree with some or all of the working tree, with a change to a directory
521
        requiring that its contents have been recursively included. That is,
522
        this is not a general purpose tree modification routine, but a helper
523
        for commit which is not required to handle situations that do not arise
524
        outside of commit.
525
2865.1.1 by Robert Collins
Create new mutable tree method update_to_one_parent_via_delta for eventual use by commit.
526
        :param new_revid: The new revision id for the trees parent.
527
        :param delta: An inventory delta (see apply_inventory_delta) describing
528
            the changes from the current left most parent revision to new_revid.
529
        """
530
        # if the tree is updated by a pull to the branch, as happens in
531
        # WorkingTree2, when there was no separation between branch and tree,
532
        # then just clear merges, efficiency is not a concern for now as this
533
        # is legacy environments only, and they are slow regardless.
534
        if self.last_revision() == new_revid:
535
            self.set_parent_ids([new_revid])
536
            return
537
        # generic implementation based on Inventory manipulation. See
538
        # WorkingTree classes for optimised versions for specific format trees.
539
        basis = self.basis_tree()
540
        basis.lock_read()
4244.2.1 by Vincent Ladeuil
inv._get_mutable_inventory() - prepare for CHKInventory
541
        # TODO: Consider re-evaluating the need for this with CHKInventory
542
        # we don't strictly need to mutate an inventory for this
543
        # it only makes sense when apply_delta is cheaper than get_inventory()
544
        inventory = basis.inventory._get_mutable_inventory()
2865.1.1 by Robert Collins
Create new mutable tree method update_to_one_parent_via_delta for eventual use by commit.
545
        basis.unlock()
546
        inventory.apply_delta(delta)
547
        rev_tree = RevisionTree(self.branch.repository, inventory, new_revid)
548
        self.set_parent_trees([(new_revid, rev_tree)])
549
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
550
3335.1.2 by Jelmer Vernooij
Add mutabletree hooks class and start_commit hook.
551
class MutableTreeHooks(hooks.Hooks):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
552
    """A dictionary mapping a hook name to a list of callables for mutabletree
3335.1.4 by Jelmer Vernooij
Fix indentation, add version number.
553
    hooks.
3335.1.2 by Jelmer Vernooij
Add mutabletree hooks class and start_commit hook.
554
    """
555
556
    def __init__(self):
557
        """Create the default hooks.
558
559
        """
560
        hooks.Hooks.__init__(self)
4119.3.2 by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure.
561
        self.create_hook(hooks.HookPoint('start_commit',
562
            "Called before a commit is performed on a tree. The start commit "
563
            "hook is able to change the tree before the commit takes place. "
564
            "start_commit is called with the bzrlib.tree.MutableTree that the "
565
            "commit is being performed on.", (1, 4), None))
3335.1.2 by Jelmer Vernooij
Add mutabletree hooks class and start_commit hook.
566
567
568
# install the default hooks into the MutableTree class.
569
MutableTree.hooks = MutableTreeHooks()
570
571
2568.2.5 by Robert Collins
* ``bzrlib.add.FastPath`` is now private and moved to
572
class _FastPath(object):
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
573
    """A path object with fast accessors for things like basename."""
574
575
    __slots__ = ['raw_path', 'base_path']
576
577
    def __init__(self, path, base_path=None):
578
        """Construct a FastPath from path."""
579
        if base_path is None:
580
            self.base_path = osutils.basename(path)
581
        else:
582
            self.base_path = base_path
583
        self.raw_path = path
584
585
    def __cmp__(self, other):
586
        return cmp(self.raw_path, other.raw_path)
587
588
    def __hash__(self):
589
        return hash(self.raw_path)
590
591
592
def _add_one_and_parent(tree, inv, parent_ie, path, kind, action):
593
    """Add a new entry to the inventory and automatically add unversioned parents.
594
595
    :param inv: Inventory which will receive the new entry.
596
    :param parent_ie: Parent inventory entry if known, or None.  If
597
        None, the parent is looked up by name and used if present, otherwise it
598
        is recursively added.
599
    :param kind: Kind of new entry (file, directory, etc)
600
    :param action: callback(inv, parent_ie, path, kind); return ignored.
601
    :return: A list of paths which have been added.
602
    """
603
    # Nothing to do if path is already versioned.
604
    # This is safe from infinite recursion because the tree root is
605
    # always versioned.
606
    if parent_ie is not None:
607
        # we have a parent ie already
608
        added = []
609
    else:
610
        # slower but does not need parent_ie
3794.5.31 by Mark Hammond
bulk of the simple review comments from igc.
611
        if inv.has_filename(tree._fix_case_of_inventory_path(path.raw_path)):
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
612
            return []
613
        # its really not there : add the parent
614
        # note that the dirname use leads to some extra str copying etc but as
615
        # there are a limited number of dirs we can be nested under, it should
616
        # 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
617
        added = _add_one_and_parent(tree, inv, None,
618
            _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
619
        parent_id = inv.path2id(dirname(path.raw_path))
620
        parent_ie = inv[parent_id]
621
    _add_one(tree, inv, parent_ie, path, kind, action)
622
    return added + [path.raw_path]
623
624
625
def _add_one(tree, inv, parent_ie, path, kind, file_id_callback):
626
    """Add a new entry to the inventory.
627
628
    :param inv: Inventory which will receive the new entry.
629
    :param parent_ie: Parent inventory entry.
630
    :param kind: Kind of new entry (file, directory, etc)
631
    :param file_id_callback: callback(inv, parent_ie, path, kind); return a
632
        file_id or None to generate a new file id
633
    :returns: None
634
    """
635
    file_id = file_id_callback(inv, parent_ie, path, kind)
636
    entry = inv.make_entry(kind, path.base_path, parent_ie.file_id,
637
        file_id=file_id)
638
    inv.add(entry)