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