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