/brz/remove-bazaar

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