~bzr-pqm/bzr/bzr.dev

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