/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
5557.1.7 by John Arbash Meinel
Merge in the bzr.dev 5582
1
# Copyright (C) 2006-2011 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
6379.6.7 by Jelmer Vernooij
Move importing from future until after doc string, otherwise the doc string will disappear.
22
from __future__ import absolute_import
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
23
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
24
from .lazy_import import lazy_import
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
25
lazy_import(globals(), """
5870.1.16 by Jelmer Vernooij
Keep track of inv_path/ie .
26
import operator
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
27
import os
4634.55.1 by Robert Collins
Do not add files whose name contains new lines or carriage returns
28
import re
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
29
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
30
from breezy import (
2568.2.6 by Robert Collins
Review feedback.
31
    add,
5870.1.29 by Jelmer Vernooij
Probe for subtree formats only, don't actually open.
32
    controldir,
4721.3.1 by Vincent Ladeuil
Cleanup imports.
33
    errors,
3335.1.2 by Jelmer Vernooij
Add mutabletree hooks class and start_commit hook.
34
    hooks,
5802.1.1 by Jelmer Vernooij
Move Inventory._get_mutable_inventory -> mutable_inventory_from_tree.
35
    inventory as _mod_inventory,
4721.3.1 by Vincent Ladeuil
Cleanup imports.
36
    osutils,
37
    revisiontree,
38
    trace,
5870.1.29 by Jelmer Vernooij
Probe for subtree formats only, don't actually open.
39
    transport as _mod_transport,
4721.3.1 by Vincent Ladeuil
Cleanup imports.
40
    tree,
2568.2.6 by Robert Collins
Review feedback.
41
    )
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
42
""")
43
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
44
from .decorators import needs_read_lock, needs_write_lock
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
45
46
1986.1.8 by Robert Collins
Update to bzr.dev, which involves adding lock_tree_write to MutableTree and MemoryTree.
47
def needs_tree_write_lock(unbound):
48
    """Decorate unbound to take out and release a tree_write lock."""
49
    def tree_write_locked(self, *args, **kwargs):
50
        self.lock_tree_write()
51
        try:
52
            return unbound(self, *args, **kwargs)
53
        finally:
54
            self.unlock()
55
    tree_write_locked.__doc__ = unbound.__doc__
56
    tree_write_locked.__name__ = unbound.__name__
57
    return tree_write_locked
58
59
5777.4.1 by Jelmer Vernooij
Split inventory-specific code out of MutableTree into MutableInventoryTree.
60
class MutableTree(tree.Tree):
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
61
    """A MutableTree is a specialisation of Tree which is able to be mutated.
62
63
    Generally speaking these mutations are only possible within a lock_write
64
    context, and will revert if the lock is broken abnormally - but this cannot
65
    be guaranteed - depending on the exact implementation of the mutable state.
66
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
67
    The most common form of Mutable Tree is WorkingTree, see breezy.workingtree.
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
68
    For tests we also have MemoryTree which is a MutableTree whose contents are
69
    entirely in memory.
70
71
    For now, we are not treating MutableTree as an interface to provide
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
72
    conformance tests for - rather we are testing MemoryTree specifically, and
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
73
    interface testing implementations of WorkingTree.
74
6207.3.3 by jelmer at samba
Fix tests and the like.
75
    A mutable tree always has an associated Branch and ControlDir object - the
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
76
    branch and bzrdir attributes.
77
    """
3794.5.19 by Mark Hammond
MutableTree gets case_sensitive attribute and smart_add takes advantage of it to enforce sane CICP-filesystem semantics
78
    def __init__(self, *args, **kw):
79
        super(MutableTree, self).__init__(*args, **kw)
80
        # Is this tree on a case-insensitive or case-preserving file-system?
81
        # Sub-classes may initialize to False if they detect they are being
82
        # used on media which doesn't differentiate the case of names.
83
        self.case_sensitive = True
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
84
5699.2.1 by Jelmer Vernooij
Move is_control_filename() from Tree to MutableTree.
85
    def is_control_filename(self, filename):
86
        """True if filename is the name of a control file in this tree.
87
88
        :param filename: A filename within the tree. This is a relative path
5891.1.2 by Andrew Bennetts
Fix a bunch of docstring formatting nits, making pydoctor a bit happier.
89
            from the root of this tree.
5699.2.1 by Jelmer Vernooij
Move is_control_filename() from Tree to MutableTree.
90
91
        This is true IF and ONLY IF the filename is part of the meta data
92
        that bzr controls in this tree. I.E. a random .bzr directory placed
93
        on disk will not be a control file for this tree.
94
        """
95
        raise NotImplementedError(self.is_control_filename)
96
2255.7.66 by Robert Collins
MutableTree.add only needs a tree write lock.
97
    @needs_tree_write_lock
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
98
    def add(self, files, ids=None, kinds=None):
99
        """Add paths to the set of versioned paths.
100
101
        Note that the command line normally calls smart_add instead,
102
        which can automatically recurse.
103
104
        This adds the files to the inventory, so that they will be
105
        recorded by the next commit.
106
107
        :param files: List of paths to add, relative to the base of the tree.
108
        :param ids: If set, use these instead of automatically generated ids.
109
            Must be the same length as the list of files, but may
110
            contain None for ids that are to be autogenerated.
111
        :param kinds: Optional parameter to specify the kinds to be used for
112
            each file.
113
114
        TODO: Perhaps callback with the ids and paths as they're added.
115
        """
116
        if isinstance(files, basestring):
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
117
            # XXX: Passing a single string is inconsistent and should be
118
            # deprecated.
119
            if not (ids is None or isinstance(ids, basestring)):
120
                raise AssertionError()
121
            if not (kinds is None or isinstance(kinds, basestring)):
122
                raise AssertionError()
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
123
            files = [files]
124
            if ids is not None:
125
                ids = [ids]
126
            if kinds is not None:
127
                kinds = [kinds]
128
2323.4.2 by Robert Collins
Fix the behaviour of dirstate optimised iter_changes recursing its disk iterator into subtrees inappropriately.
129
        files = [path.strip('/') for path in files]
130
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
131
        if ids is None:
132
            ids = [None] * len(files)
133
        else:
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
134
            if not (len(ids) == len(files)):
135
                raise AssertionError()
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
136
        if kinds is None:
137
            kinds = [None] * len(files)
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
138
        elif not len(kinds) == len(files):
139
            raise AssertionError()
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
140
        for f in files:
141
            # generic constraint checks:
142
            if self.is_control_filename(f):
143
                raise errors.ForbiddenControlFileError(filename=f)
4721.3.1 by Vincent Ladeuil
Cleanup imports.
144
            fp = osutils.splitpath(f)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
145
        # 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
146
        # caring about the instantaneous file kind within a uncommmitted tree
147
        #
148
        self._gather_kinds(files, kinds)
149
        self._add(files, ids, kinds)
150
2255.6.8 by Aaron Bentley
Merge refactoring of add_reference
151
    def add_reference(self, sub_tree):
152
        """Add a TreeReference to the tree, pointing at sub_tree"""
153
        raise errors.UnsupportedOperation(self.add_reference, self)
154
155
    def _add_reference(self, sub_tree):
156
        """Standard add_reference implementation, for use by subclasses"""
157
        try:
158
            sub_tree_path = self.relpath(sub_tree.basedir)
159
        except errors.PathNotChild:
160
            raise errors.BadReferenceTarget(self, sub_tree,
161
                                            'Target not inside tree.')
162
        sub_tree_id = sub_tree.get_root_id()
163
        if sub_tree_id == self.get_root_id():
164
            raise errors.BadReferenceTarget(self, sub_tree,
165
                                     'Trees have the same root id.')
5967.7.1 by Martin Pool
Deprecate __contains__ on Tree and Inventory
166
        if self.has_id(sub_tree_id):
2255.6.8 by Aaron Bentley
Merge refactoring of add_reference
167
            raise errors.BadReferenceTarget(self, sub_tree,
168
                                            'Root id already present in tree')
169
        self._add([sub_tree_path], [sub_tree_id], ['tree-reference'])
170
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
171
    def _add(self, files, ids, kinds):
2255.6.8 by Aaron Bentley
Merge refactoring of add_reference
172
        """Helper function for add - updates the inventory.
173
174
        :param files: sequence of pathnames, relative to the tree root
175
        :param ids: sequence of suggested ids for the files (may be None)
176
        :param kinds: sequence of  inventory kinds of the files (i.e. may
177
            contain "tree-reference")
178
        """
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
179
        raise NotImplementedError(self._add)
180
2376.2.1 by Aaron Bentley
Implement MutableTree.apply_inventory_delta
181
    def apply_inventory_delta(self, changes):
182
        """Apply changes to the inventory as an atomic operation.
183
2865.1.1 by Robert Collins
Create new mutable tree method update_to_one_parent_via_delta for eventual use by commit.
184
        :param changes: An inventory delta to apply to the working tree's
185
            inventory.
186
        :return None:
187
        :seealso Inventory.apply_delta: For details on the changes parameter.
2376.2.9 by Aaron Bentley
Cleanup from review
188
        """
5777.4.1 by Jelmer Vernooij
Split inventory-specific code out of MutableTree into MutableInventoryTree.
189
        raise NotImplementedError(self.apply_inventory_delta)
2376.2.1 by Aaron Bentley
Implement MutableTree.apply_inventory_delta
190
191
    @needs_write_lock
2255.2.218 by Robert Collins
Make the nested tree commit smoke test be more rigourous.
192
    def commit(self, message=None, revprops=None, *args,
2100.3.27 by Aaron Bentley
Enable nested commits
193
               **kwargs):
1986.1.3 by Robert Collins
Merge bzr.dev.
194
        # avoid circular imports
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
195
        from breezy import commit
3565.6.9 by Marius Kruger
Jump through hoops not to open multiple connections when committing to a bound branch.
196
        possible_master_transports=[]
5162.4.1 by Aaron Bentley
TreeTransform supports normal commit parameters and includes branch nick.
197
        revprops = commit.Commit.update_revprops(
198
                revprops,
199
                self.branch,
200
                kwargs.pop('authors', None),
201
                kwargs.pop('author', None),
3815.3.4 by Marius Kruger
When doing a `commit --local`, don't try to connect to the master branch.
202
                kwargs.get('local', False),
3565.6.9 by Marius Kruger
Jump through hoops not to open multiple connections when committing to a bound branch.
203
                possible_master_transports)
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
204
        # 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)
205
        args = (message, ) + args
3335.1.2 by Jelmer Vernooij
Add mutabletree hooks class and start_commit hook.
206
        for hook in MutableTree.hooks['start_commit']:
207
            hook(self)
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
208
        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.
209
            revprops=revprops,
210
            possible_master_transports=possible_master_transports,
211
            *args, **kwargs)
4634.33.3 by Ian Clatworthy
review feedback from Robert: rename finish_commit to post_commit
212
        post_hook_params = PostCommitHookParams(self)
213
        for hook in MutableTree.hooks['post_commit']:
214
            hook(post_hook_params)
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
215
        return committed_id
216
217
    def _gather_kinds(self, files, kinds):
218
        """Helper function for add - sets the entries of kinds."""
219
        raise NotImplementedError(self._gather_kinds)
220
1986.1.6 by Robert Collins
Add MemoryTree.last_revision.
221
    @needs_read_lock
4721.3.2 by Vincent Ladeuil
Simplify mutable_tree.has_changes() and update call sites.
222
    def has_changes(self, _from_tree=None):
223
        """Quickly check that the tree contains at least one commitable change.
224
225
        :param _from_tree: tree to compare against to find changes (default to
226
            the basis tree and is intended to be used by tests).
4503.1.3 by Vincent Ladeuil
Take review comments into account.
227
228
        :return: True if a change is found. False otherwise
229
        """
4721.3.2 by Vincent Ladeuil
Simplify mutable_tree.has_changes() and update call sites.
230
        # Check pending merges
231
        if len(self.get_parent_ids()) > 1:
232
            return True
233
        if _from_tree is None:
234
            _from_tree = self.basis_tree()
235
        changes = self.iter_changes(_from_tree)
4503.1.3 by Vincent Ladeuil
Take review comments into account.
236
        try:
6634.2.1 by Martin
Apply 2to3 next fixer and make compatible
237
            change = next(changes)
4503.1.3 by Vincent Ladeuil
Take review comments into account.
238
            # Exclude root (talk about black magic... --vila 20090629)
239
            if change[4] == (None, None):
6634.2.1 by Martin
Apply 2to3 next fixer and make compatible
240
                change = next(changes)
4503.1.3 by Vincent Ladeuil
Take review comments into account.
241
            return True
242
        except StopIteration:
243
            # No changes
244
            return False
245
246
    @needs_read_lock
5171.2.2 by Vincent Ladeuil
Explain that the uncommitted changes are not processed when
247
    def check_changed_or_out_of_date(self, strict, opt_name,
248
                                     more_error, more_warning):
5147.2.2 by Vincent Ladeuil
Fix bug #519319 by defaulting to a warning for dirty trees.
249
        """Check the tree for uncommitted changes and branch synchronization.
250
251
        If strict is None and not set in the config files, a warning is issued.
252
        If strict is True, an error is raised.
253
        If strict is False, no checks are done and no warning is issued.
254
255
        :param strict: True, False or None, searched in branch config if None.
256
257
        :param opt_name: strict option name to search in config file.
258
5171.2.2 by Vincent Ladeuil
Explain that the uncommitted changes are not processed when
259
        :param more_error: Details about how to avoid the check.
260
261
        :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.
262
        """
263
        if strict is None:
6155.2.1 by Vincent Ladeuil
Migrate dpush_strict, push_strict and send_strict options to the stack based config design, introducing get_config_stack for branches.
264
            strict = self.branch.get_config_stack().get(opt_name)
5147.2.2 by Vincent Ladeuil
Fix bug #519319 by defaulting to a warning for dirty trees.
265
        if strict is not False:
5171.2.1 by Vincent Ladeuil
Fix the warning message for unclean trees.
266
            err_class = None
5147.2.2 by Vincent Ladeuil
Fix bug #519319 by defaulting to a warning for dirty trees.
267
            if (self.has_changes()):
5171.2.1 by Vincent Ladeuil
Fix the warning message for unclean trees.
268
                err_class = errors.UncommittedChanges
5147.2.2 by Vincent Ladeuil
Fix bug #519319 by defaulting to a warning for dirty trees.
269
            elif self.last_revision() != self.branch.last_revision():
270
                # The tree has lost sync with its branch, there is little
271
                # chance that the user is aware of it but he can still force
272
                # the action with --no-strict
5171.2.1 by Vincent Ladeuil
Fix the warning message for unclean trees.
273
                err_class = errors.OutOfDateTree
274
            if err_class is not None:
5147.2.2 by Vincent Ladeuil
Fix bug #519319 by defaulting to a warning for dirty trees.
275
                if strict is None:
5171.2.2 by Vincent Ladeuil
Explain that the uncommitted changes are not processed when
276
                    err = err_class(self, more=more_warning)
5147.2.2 by Vincent Ladeuil
Fix bug #519319 by defaulting to a warning for dirty trees.
277
                    # We don't want to interrupt the user if he expressed no
278
                    # preference about strict.
5158.1.1 by Vincent Ladeuil
Use the proper argument for the warning.
279
                    trace.warning('%s', err._format())
5147.2.2 by Vincent Ladeuil
Fix bug #519319 by defaulting to a warning for dirty trees.
280
                else:
5171.2.2 by Vincent Ladeuil
Explain that the uncommitted changes are not processed when
281
                    err = err_class(self, more=more_error)
5147.2.2 by Vincent Ladeuil
Fix bug #519319 by defaulting to a warning for dirty trees.
282
                    raise err
283
284
    @needs_read_lock
1986.1.6 by Robert Collins
Add MemoryTree.last_revision.
285
    def last_revision(self):
1986.1.7 by Robert Collins
Merge bzr.dev.
286
        """Return the revision id of the last commit performed in this tree.
287
288
        In early tree formats the result of last_revision is the same as the
289
        branch last_revision, but that is no longer the case for modern tree
290
        formats.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
291
1986.1.7 by Robert Collins
Merge bzr.dev.
292
        last_revision returns the left most parent id, or None if there are no
293
        parents.
294
295
        last_revision was deprecated as of 0.11. Please use get_parent_ids
296
        instead.
297
        """
1986.1.6 by Robert Collins
Add MemoryTree.last_revision.
298
        raise NotImplementedError(self.last_revision)
299
1986.1.8 by Robert Collins
Update to bzr.dev, which involves adding lock_tree_write to MutableTree and MemoryTree.
300
    def lock_tree_write(self):
301
        """Lock the working tree for write, and the branch for read.
302
303
        This is useful for operations which only need to mutate the working
304
        tree. Taking out branch write locks is a relatively expensive process
305
        and may fail if the branch is on read only media. So branch write locks
306
        should only be taken out when we are modifying branch data - such as in
307
        operations like commit, pull, uncommit and update.
308
        """
309
        raise NotImplementedError(self.lock_tree_write)
310
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
311
    def lock_write(self):
312
        """Lock the tree and its branch. This allows mutating calls to be made.
313
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
314
        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
315
        general you should always obtain a write lock before calling mutating
316
        methods on a tree.
317
        """
318
        raise NotImplementedError(self.lock_write)
319
320
    @needs_write_lock
321
    def mkdir(self, path, file_id=None):
322
        """Create a directory in the tree. if file_id is None, one is assigned.
323
324
        :param path: A unicode file path.
325
        :param file_id: An optional file-id.
326
        :return: the file id of the new directory.
327
        """
328
        raise NotImplementedError(self.mkdir)
329
6621.20.1 by Martin
Run 2to3 tuple_params fixer and tidy up.
330
    def _observed_sha1(self, file_id, path, sha_and_stat):
3709.3.1 by Robert Collins
First cut - make it work - at updating the tree stat cache during commit.
331
        """Tell the tree we have observed a paths sha1.
332
333
        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.
334
        update the hashcache during commit. If the observed file is too new
335
        (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
336
        it.
3709.3.1 by Robert Collins
First cut - make it work - at updating the tree stat cache during commit.
337
338
        The default implementation does nothing.
339
340
        :param file_id: The file id
341
        :param path: The file path
6621.20.1 by Martin
Run 2to3 tuple_params fixer and tidy up.
342
        :param sha_and_stat: The sha 1 and stat result observed.
3709.3.1 by Robert Collins
First cut - make it work - at updating the tree stat cache during commit.
343
        :return: None
344
        """
345
3394.2.1 by Ian Clatworthy
add docstring for put_file_bytes_non_atomic
346
    @needs_write_lock
347
    def put_file_bytes_non_atomic(self, file_id, bytes):
348
        """Update the content of a file in the tree.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
349
3394.2.1 by Ian Clatworthy
add docstring for put_file_bytes_non_atomic
350
        Note that the file is written in-place rather than being
351
        written to a temporary location and renamed. As a consequence,
352
        readers can potentially see the file half-written.
353
354
        :param file_id: file-id of the file
355
        :param bytes: the new file contents
356
        """
357
        raise NotImplementedError(self.put_file_bytes_non_atomic)
358
2418.5.1 by John Arbash Meinel
Make a Branch helper which can create a very basic MemoryTree with history.
359
    def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False):
360
        """Set the parents ids of the working tree.
361
362
        :param revision_ids: A list of revision_ids.
363
        """
364
        raise NotImplementedError(self.set_parent_ids)
365
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
366
    def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
367
        """Set the parents of the working tree.
368
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
369
        :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
370
            If tree is None, then that element is treated as an unreachable
371
            parent tree - i.e. a ghost.
372
        """
373
        raise NotImplementedError(self.set_parent_trees)
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
374
5777.4.1 by Jelmer Vernooij
Split inventory-specific code out of MutableTree into MutableInventoryTree.
375
    def smart_add(self, file_list, recurse=True, action=None, save=True):
376
        """Version file_list, optionally recursing into directories.
377
378
        This is designed more towards DWIM for humans than API clarity.
379
        For the specific behaviour see the help for cmd_add().
380
381
        :param file_list: List of zero or more paths.  *NB: these are 
382
            interpreted relative to the process cwd, not relative to the 
383
            tree.*  (Add and most other tree methods use tree-relative
384
            paths.)
385
        :param action: A reporter to be called with the inventory, parent_ie,
386
            path and kind of the path being added. It may return a file_id if
387
            a specific one should be used.
388
        :param save: Save the inventory after completing the adds. If False
389
            this provides dry-run functionality by doing the add and not saving
390
            the inventory.
391
        :return: A tuple - files_added, ignored_files. files_added is the count
392
            of added files, and ignored_files is a dict mapping files that were
393
            ignored to the rule that caused them to be ignored.
394
        """
395
        raise NotImplementedError(self.smart_add)
396
5870.1.42 by Jelmer Vernooij
Review feedback from John.
397
398
class MutableInventoryTree(MutableTree, tree.InventoryTree):
5777.4.1 by Jelmer Vernooij
Split inventory-specific code out of MutableTree into MutableInventoryTree.
399
400
    @needs_tree_write_lock
401
    def apply_inventory_delta(self, changes):
402
        """Apply changes to the inventory as an atomic operation.
403
404
        :param changes: An inventory delta to apply to the working tree's
405
            inventory.
406
        :return None:
407
        :seealso Inventory.apply_delta: For details on the changes parameter.
408
        """
409
        self.flush()
6405.2.6 by Jelmer Vernooij
Lots of test fixes.
410
        inv = self.root_inventory
5777.4.1 by Jelmer Vernooij
Split inventory-specific code out of MutableTree into MutableInventoryTree.
411
        inv.apply_delta(changes)
412
        self._write_inventory(inv)
413
414
    def _fix_case_of_inventory_path(self, path):
415
        """If our tree isn't case sensitive, return the canonical path"""
416
        if not self.case_sensitive:
417
            path = self.get_canonical_inventory_path(path)
418
        return path
419
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
420
    @needs_tree_write_lock
421
    def smart_add(self, file_list, recurse=True, action=None, save=True):
422
        """Version file_list, optionally recursing into directories.
423
424
        This is designed more towards DWIM for humans than API clarity.
425
        For the specific behaviour see the help for cmd_add().
426
4634.157.3 by Martin Pool
doc
427
        :param file_list: List of zero or more paths.  *NB: these are 
428
            interpreted relative to the process cwd, not relative to the 
429
            tree.*  (Add and most other tree methods use tree-relative
430
            paths.)
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
431
        :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
432
            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
433
            a specific one should be used.
434
        :param save: Save the inventory after completing the adds. If False
435
            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
436
            the inventory.
2568.2.6 by Robert Collins
Review feedback.
437
        :return: A tuple - files_added, ignored_files. files_added is the count
438
            of added files, and ignored_files is a dict mapping files that were
439
            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
440
        """
5870.1.33 by Jelmer Vernooij
Factor out gathering of dirs to add.
441
        # Not all mutable trees can have conflicts
442
        if getattr(self, 'conflicts', None) is not None:
443
            # Collect all related files without checking whether they exist or
444
            # are versioned. It's cheaper to do that once for all conflicts
445
            # than trying to find the relevant conflict for each added file.
446
            conflicts_related = set()
447
            for c in self.conflicts():
448
                conflicts_related.update(c.associated_filenames())
449
        else:
450
            conflicts_related = None
5870.1.40 by Jelmer Vernooij
Look at parent_ie.children.
451
        adder = _SmartAddHelper(self, action, conflicts_related)
5870.1.34 by Jelmer Vernooij
More refactoring.
452
        adder.add(file_list, recurse=recurse)
5870.1.31 by Jelmer Vernooij
Move smart_add into a helper.
453
        if save:
454
            invdelta = adder.get_inventory_delta()
455
            self.apply_inventory_delta(invdelta)
456
        return adder.added, adder.ignored
457
458
    def update_basis_by_delta(self, new_revid, delta):
459
        """Update the parents of this tree after a commit.
460
461
        This gives the tree one parent, with revision id new_revid. The
462
        inventory delta is applied to the current basis tree to generate the
463
        inventory for the parent new_revid, and all other parent trees are
464
        discarded.
465
466
        All the changes in the delta should be changes synchronising the basis
467
        tree with some or all of the working tree, with a change to a directory
468
        requiring that its contents have been recursively included. That is,
469
        this is not a general purpose tree modification routine, but a helper
470
        for commit which is not required to handle situations that do not arise
471
        outside of commit.
472
473
        See the inventory developers documentation for the theory behind
474
        inventory deltas.
475
476
        :param new_revid: The new revision id for the trees parent.
477
        :param delta: An inventory delta (see apply_inventory_delta) describing
478
            the changes from the current left most parent revision to new_revid.
479
        """
480
        # if the tree is updated by a pull to the branch, as happens in
481
        # WorkingTree2, when there was no separation between branch and tree,
482
        # then just clear merges, efficiency is not a concern for now as this
483
        # is legacy environments only, and they are slow regardless.
484
        if self.last_revision() == new_revid:
485
            self.set_parent_ids([new_revid])
486
            return
487
        # generic implementation based on Inventory manipulation. See
488
        # WorkingTree classes for optimised versions for specific format trees.
489
        basis = self.basis_tree()
490
        basis.lock_read()
491
        # TODO: Consider re-evaluating the need for this with CHKInventory
492
        # we don't strictly need to mutate an inventory for this
493
        # it only makes sense when apply_delta is cheaper than get_inventory()
494
        inventory = _mod_inventory.mutable_inventory_from_tree(basis)
495
        basis.unlock()
496
        inventory.apply_delta(delta)
497
        rev_tree = revisiontree.InventoryRevisionTree(self.branch.repository,
498
                                             inventory, new_revid)
499
        self.set_parent_trees([(new_revid, rev_tree)])
500
501
502
class MutableTreeHooks(hooks.Hooks):
503
    """A dictionary mapping a hook name to a list of callables for mutabletree
504
    hooks.
505
    """
506
507
    def __init__(self):
508
        """Create the default hooks.
509
510
        """
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
511
        hooks.Hooks.__init__(self, "breezy.mutabletree", "MutableTree.hooks")
5870.1.31 by Jelmer Vernooij
Move smart_add into a helper.
512
        self.add_hook('start_commit',
513
            "Called before a commit is performed on a tree. The start commit "
514
            "hook is able to change the tree before the commit takes place. "
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
515
            "start_commit is called with the breezy.mutabletree.MutableTree "
5870.1.31 by Jelmer Vernooij
Move smart_add into a helper.
516
            "that the commit is being performed on.", (1, 4))
517
        self.add_hook('post_commit',
518
            "Called after a commit is performed on a tree. The hook is "
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
519
            "called with a breezy.mutabletree.PostCommitHookParams object. "
5870.1.31 by Jelmer Vernooij
Move smart_add into a helper.
520
            "The mutable tree the commit was performed on is available via "
521
            "the mutable_tree attribute of that object.", (2, 0))
6434.2.1 by Jelmer Vernooij
Add pre_transform/post_transform hooks.
522
        self.add_hook('pre_transform',
523
            "Called before a tree transform on this tree. The hook is called "
6434.2.2 by Jelmer Vernooij
Add hooks for tree transforms.
524
            "with the tree that is being transformed and the transform.",
525
            (2, 5))
6435.1.1 by Jelmer Vernooij
Add post_build_tree hook.
526
        self.add_hook('post_build_tree',
527
            "Called after a completely new tree is built. The hook is "
528
            "called with the tree as its only argument.", (2, 5))
6434.2.1 by Jelmer Vernooij
Add pre_transform/post_transform hooks.
529
        self.add_hook('post_transform',
530
            "Called after a tree transform has been performed on a tree. "
6434.2.2 by Jelmer Vernooij
Add hooks for tree transforms.
531
            "The hook is called with the tree that is being transformed and "
532
            "the transform.",
6434.2.1 by Jelmer Vernooij
Add pre_transform/post_transform hooks.
533
            (2, 5))
5870.1.31 by Jelmer Vernooij
Move smart_add into a helper.
534
535
# install the default hooks into the MutableTree class.
536
MutableTree.hooks = MutableTreeHooks()
537
538
539
class PostCommitHookParams(object):
540
    """Parameters for the post_commit hook.
541
542
    To access the parameters, use the following attributes:
543
544
    * mutable_tree - the MutableTree object
545
    """
546
547
    def __init__(self, mutable_tree):
548
        """Create the parameters for the post_commit hook."""
549
        self.mutable_tree = mutable_tree
550
551
552
class _SmartAddHelper(object):
5870.1.33 by Jelmer Vernooij
Factor out gathering of dirs to add.
553
    """Helper for MutableTree.smart_add."""
5870.1.31 by Jelmer Vernooij
Move smart_add into a helper.
554
555
    def get_inventory_delta(self):
556
        return self._invdelta.values()
557
558
    def _get_ie(self, inv_path):
559
        """Retrieve the most up to date inventory entry for a path.
560
561
        :param inv_path: Normalized inventory path
562
        :return: Inventory entry (with possibly invalid .children for
563
            directories)
564
        """
565
        entry = self._invdelta.get(inv_path)
566
        if entry is not None:
567
            return entry[3]
5977.1.3 by John Arbash Meinel
Wrap a line that was too-long.
568
        # Find a 'best fit' match if the filesystem is case-insensitive
569
        inv_path = self.tree._fix_case_of_inventory_path(inv_path)
570
        file_id = self.tree.path2id(inv_path)
5870.1.31 by Jelmer Vernooij
Move smart_add into a helper.
571
        if file_id is not None:
5870.1.42 by Jelmer Vernooij
Review feedback from John.
572
            return self.tree.iter_entries_by_dir([file_id]).next()[1]
5870.1.31 by Jelmer Vernooij
Move smart_add into a helper.
573
        return None
574
5870.1.42 by Jelmer Vernooij
Review feedback from John.
575
    def _convert_to_directory(self, this_ie, inv_path):
5870.1.37 by Jelmer Vernooij
Simplify ensure_directory.
576
        """Convert an entry to a directory.
5870.1.32 by Jelmer Vernooij
Add helper for converting to directory.
577
578
        :param this_ie: Inventory entry
579
        :param inv_path: Normalized path for the inventory entry
580
        :return: The new inventory entry
581
        """
582
        # Same as in _add_one below, if the inventory doesn't
583
        # think this is a directory, update the inventory
5870.1.38 by Jelmer Vernooij
Use InventoryDirectory.
584
        this_ie = _mod_inventory.InventoryDirectory(
585
            this_ie.file_id, this_ie.name, this_ie.parent_id)
5870.1.32 by Jelmer Vernooij
Add helper for converting to directory.
586
        self._invdelta[inv_path] = (inv_path, inv_path, this_ie.file_id,
587
            this_ie)
588
        return this_ie
589
5870.1.31 by Jelmer Vernooij
Move smart_add into a helper.
590
    def _add_one_and_parent(self, parent_ie, path, kind, inv_path):
591
        """Add a new entry to the inventory and automatically add unversioned parents.
592
593
        :param parent_ie: Parent inventory entry if known, or None.  If
594
            None, the parent is looked up by name and used if present, otherwise it
595
            is recursively added.
6046.2.4 by Shannon Weyrick
Change AddAction interface to include a method for deciding whether to
596
        :param path: 
5870.1.31 by Jelmer Vernooij
Move smart_add into a helper.
597
        :param kind: Kind of new entry (file, directory, etc)
6046.2.4 by Shannon Weyrick
Change AddAction interface to include a method for deciding whether to
598
        :param inv_path:
5870.1.31 by Jelmer Vernooij
Move smart_add into a helper.
599
        :return: Inventory entry for path and a list of paths which have been added.
600
        """
601
        # Nothing to do if path is already versioned.
602
        # This is safe from infinite recursion because the tree root is
603
        # always versioned.
5870.1.39 by Jelmer Vernooij
Remove some unnecessary code.
604
        inv_dirname = osutils.dirname(inv_path)
5870.1.36 by Jelmer Vernooij
kill _FastPath.
605
        dirname, basename = osutils.split(path)
5870.1.35 by Jelmer Vernooij
Avoid dirname calls.
606
        if parent_ie is None:
5870.1.31 by Jelmer Vernooij
Move smart_add into a helper.
607
            # slower but does not need parent_ie
608
            this_ie = self._get_ie(inv_path)
609
            if this_ie is not None:
5870.1.34 by Jelmer Vernooij
More refactoring.
610
                return this_ie
5870.1.31 by Jelmer Vernooij
Move smart_add into a helper.
611
            # its really not there : add the parent
612
            # note that the dirname use leads to some extra str copying etc but as
613
            # there are a limited number of dirs we can be nested under, it should
614
            # generally find it very fast and not recurse after that.
5870.1.34 by Jelmer Vernooij
More refactoring.
615
            parent_ie = self._add_one_and_parent(None,
5870.1.36 by Jelmer Vernooij
kill _FastPath.
616
                dirname, 'directory', 
5870.1.35 by Jelmer Vernooij
Avoid dirname calls.
617
                inv_dirname)
5870.1.31 by Jelmer Vernooij
Move smart_add into a helper.
618
        # if the parent exists, but isn't a directory, we have to do the
619
        # kind change now -- really the inventory shouldn't pretend to know
620
        # the kind of wt files, but it does.
621
        if parent_ie.kind != 'directory':
622
            # nb: this relies on someone else checking that the path we're using
623
            # doesn't contain symlinks.
5870.1.42 by Jelmer Vernooij
Review feedback from John.
624
            parent_ie = self._convert_to_directory(parent_ie, inv_dirname)
6405.2.5 by Jelmer Vernooij
Add root_inventory.
625
        file_id = self.action(self.tree, parent_ie, path, kind)
5870.1.36 by Jelmer Vernooij
kill _FastPath.
626
        entry = _mod_inventory.make_entry(kind, basename, parent_ie.file_id,
5870.1.31 by Jelmer Vernooij
Move smart_add into a helper.
627
            file_id=file_id)
628
        self._invdelta[inv_path] = (None, inv_path, entry.file_id, entry)
5870.1.36 by Jelmer Vernooij
kill _FastPath.
629
        self.added.append(inv_path)
5870.1.34 by Jelmer Vernooij
More refactoring.
630
        return entry
5870.1.31 by Jelmer Vernooij
Move smart_add into a helper.
631
5870.1.33 by Jelmer Vernooij
Factor out gathering of dirs to add.
632
    def _gather_dirs_to_add(self, user_dirs):
633
        # only walk the minimal parents needed: we have user_dirs to override
634
        # ignores.
635
        prev_dir = None
636
637
        is_inside = osutils.is_inside_or_parent_of_any
5870.1.36 by Jelmer Vernooij
kill _FastPath.
638
        for path, (inv_path, this_ie) in sorted(
639
                user_dirs.iteritems(), key=operator.itemgetter(0)):
640
            if (prev_dir is None or not is_inside([prev_dir], path)):
5870.1.33 by Jelmer Vernooij
Factor out gathering of dirs to add.
641
                yield (path, inv_path, this_ie, None)
5870.1.36 by Jelmer Vernooij
kill _FastPath.
642
            prev_dir = path
6046.2.1 by Shannon Weyrick
Add support for skipping large files during add, based on configurable threshold (default 1M). Fixes bug #54624
643
        
5870.1.34 by Jelmer Vernooij
More refactoring.
644
    def __init__(self, tree, action, conflicts_related=None):
5870.1.31 by Jelmer Vernooij
Move smart_add into a helper.
645
        self.tree = tree
646
        if action is None:
647
            self.action = add.AddAction()
648
        else:
649
            self.action = action
650
        self._invdelta = {}
651
        self.added = []
652
        self.ignored = {}
5870.1.33 by Jelmer Vernooij
Factor out gathering of dirs to add.
653
        if conflicts_related is None:
5870.1.34 by Jelmer Vernooij
More refactoring.
654
            self.conflicts_related = frozenset()
655
        else:
656
            self.conflicts_related = conflicts_related
5870.1.31 by Jelmer Vernooij
Move smart_add into a helper.
657
5870.1.34 by Jelmer Vernooij
More refactoring.
658
    def add(self, file_list, recurse=True):
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
659
        from breezy.inventory import InventoryEntry
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
660
        if not file_list:
661
            # no paths supplied: add the entire tree.
5013.2.4 by Vincent Ladeuil
``bzr add`` won't blindly add conflict related files.
662
            # FIXME: this assumes we are running in a working tree subdir :-/
663
            # -- vila 20100208
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
664
            file_list = [u'.']
665
4634.159.8 by Martin Pool
Handle adding a file under a symlink whose real parent is not yet versioned
666
        # expand any symlinks in the directory part, while leaving the
667
        # filename alone
4634.169.2 by Martin
Add comment explaining has_symlinks check, and NEWS
668
        # only expanding if symlinks are supported avoids windows path bugs
4634.169.1 by Martin
Don't use normalizepath in smart_add unless symlinks are supported which avoids unicode breakage on windows
669
        if osutils.has_symlinks():
6631.3.1 by Martin
Run 2to3 map fixer and refactor after
670
            file_list = list(map(osutils.normalizepath, file_list))
4634.159.8 by Martin Pool
Handle adding a file under a symlink whose real parent is not yet versioned
671
5870.1.34 by Jelmer Vernooij
More refactoring.
672
        user_dirs = {}
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
673
        # validate user file paths and convert all paths to tree
2568.2.6 by Robert Collins
Review feedback.
674
        # relative : it's cheaper to make a tree relative path an abspath
3794.5.39 by Mark Hammond
typos and whitespace changes.
675
        # 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
676
        # perform the canonicalization in bulk.
5870.1.31 by Jelmer Vernooij
Move smart_add into a helper.
677
        for filepath in osutils.canonical_relpaths(self.tree.basedir, file_list):
4721.3.1 by Vincent Ladeuil
Cleanup imports.
678
            # validate user parameters. Our recursive code avoids adding new
679
            # files that need such validation
5870.1.36 by Jelmer Vernooij
kill _FastPath.
680
            if self.tree.is_control_filename(filepath):
681
                raise errors.ForbiddenControlFileError(filename=filepath)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
682
5870.1.36 by Jelmer Vernooij
kill _FastPath.
683
            abspath = self.tree.abspath(filepath)
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
684
            kind = osutils.file_kind(abspath)
4721.3.1 by Vincent Ladeuil
Cleanup imports.
685
            # ensure the named path is added, so that ignore rules in the later
686
            # directory walk dont skip it.
687
            # we dont have a parent ie known yet.: use the relatively slower
688
            # inventory probing method
5870.1.36 by Jelmer Vernooij
kill _FastPath.
689
            inv_path, _ = osutils.normalized_filename(filepath)
5870.1.31 by Jelmer Vernooij
Move smart_add into a helper.
690
            this_ie = self._get_ie(inv_path)
5870.1.16 by Jelmer Vernooij
Keep track of inv_path/ie .
691
            if this_ie is None:
5870.1.36 by Jelmer Vernooij
kill _FastPath.
692
                this_ie = self._add_one_and_parent(None, filepath, kind, inv_path)
5870.1.16 by Jelmer Vernooij
Keep track of inv_path/ie .
693
            if kind == 'directory':
694
                # schedule the dir for scanning
5870.1.36 by Jelmer Vernooij
kill _FastPath.
695
                user_dirs[filepath] = (inv_path, this_ie)
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
696
697
        if not recurse:
698
            # no need to walk any directories at all.
5870.1.31 by Jelmer Vernooij
Move smart_add into a helper.
699
            return
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
700
5870.1.34 by Jelmer Vernooij
More refactoring.
701
        things_to_add = list(self._gather_dirs_to_add(user_dirs))
5870.1.26 by Jelmer Vernooij
Remove unused memory.
702
4634.55.1 by Robert Collins
Do not add files whose name contains new lines or carriage returns
703
        illegalpath_re = re.compile(r'[\r\n]')
5870.1.34 by Jelmer Vernooij
More refactoring.
704
        for directory, inv_path, this_ie, parent_ie in things_to_add:
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
705
            # directory is tree-relative
5870.1.36 by Jelmer Vernooij
kill _FastPath.
706
            abspath = self.tree.abspath(directory)
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
707
708
            # get the contents of this directory.
709
6046.2.7 by Shannon Weyrick
Switch add to use file_stat, and reuse stat result in AddAction
710
            # find the kind of the path being added, and save stat_value
711
            # for reuse
712
            stat_value = None
5870.1.30 by Jelmer Vernooij
Avoid statting if not necessary.
713
            if this_ie is None:
6046.2.7 by Shannon Weyrick
Switch add to use file_stat, and reuse stat result in AddAction
714
                stat_value = osutils.file_stat(abspath)
715
                kind = osutils.file_kind_from_stat_mode(stat_value.st_mode)
5870.1.30 by Jelmer Vernooij
Avoid statting if not necessary.
716
            else:
717
                kind = this_ie.kind
6046.2.1 by Shannon Weyrick
Add support for skipping large files during add, based on configurable threshold (default 1M). Fixes bug #54624
718
            
6046.2.4 by Shannon Weyrick
Change AddAction interface to include a method for deciding whether to
719
            # allow AddAction to skip this file
6046.2.8 by Shannon Weyrick
Minor cleanup
720
            if self.action.skip_file(self.tree,  abspath,  kind,  stat_value):
6046.2.4 by Shannon Weyrick
Change AddAction interface to include a method for deciding whether to
721
                continue
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
722
            if not InventoryEntry.versionable_kind(kind):
4721.3.1 by Vincent Ladeuil
Cleanup imports.
723
                trace.warning("skipping %s (can't add file of kind '%s')",
724
                              abspath, kind)
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
725
                continue
5870.1.36 by Jelmer Vernooij
kill _FastPath.
726
            if illegalpath_re.search(directory):
4721.3.1 by Vincent Ladeuil
Cleanup imports.
727
                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
728
                continue
5870.1.36 by Jelmer Vernooij
kill _FastPath.
729
            if directory in self.conflicts_related:
5013.2.4 by Vincent Ladeuil
``bzr add`` won't blindly add conflict related files.
730
                # If the file looks like one generated for a conflict, don't
731
                # add it.
732
                trace.warning(
733
                    'skipping %s (generated to help resolve conflicts)',
734
                    abspath)
735
                continue
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
736
5870.1.36 by Jelmer Vernooij
kill _FastPath.
737
            if kind == 'directory' and directory != '':
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
738
                try:
6039.1.5 by Jelmer Vernooij
Add get_transport_from_url and get_transport_from_path functions.
739
                    transport = _mod_transport.get_transport_from_path(abspath)
5870.1.29 by Jelmer Vernooij
Probe for subtree formats only, don't actually open.
740
                    controldir.ControlDirFormat.find_format(transport)
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
741
                    sub_tree = True
742
                except errors.NotBranchError:
743
                    sub_tree = False
744
                except errors.UnsupportedFormatError:
745
                    sub_tree = True
746
            else:
747
                sub_tree = False
748
5870.1.36 by Jelmer Vernooij
kill _FastPath.
749
            if this_ie is not None:
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
750
                pass
751
            elif sub_tree:
4721.3.1 by Vincent Ladeuil
Cleanup imports.
752
                # XXX: This is wrong; people *might* reasonably be trying to
753
                # add subtrees as subtrees.  This should probably only be done
754
                # in formats which can represent subtrees, and even then
755
                # perhaps only when the user asked to add subtrees.  At the
756
                # moment you can add them specially through 'join --reference',
757
                # which is perhaps reasonable: adding a new reference is a
758
                # special operation and can have a special behaviour.  mbp
759
                # 20070306
6123.10.1 by Jelmer Vernooij
"bzr add" warns about nested trees that are skipped.
760
                trace.warning("skipping nested tree %r", abspath)
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
761
            else:
6123.10.1 by Jelmer Vernooij
"bzr add" warns about nested trees that are skipped.
762
                this_ie = self._add_one_and_parent(parent_ie, directory, kind,
763
                    inv_path)
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
764
765
            if kind == 'directory' and not sub_tree:
5870.1.37 by Jelmer Vernooij
Simplify ensure_directory.
766
                if this_ie.kind != 'directory':
5870.1.42 by Jelmer Vernooij
Review feedback from John.
767
                    this_ie = self._convert_to_directory(this_ie, inv_path)
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
768
769
                for subf in sorted(os.listdir(abspath)):
5870.1.15 by Jelmer Vernooij
More refactoring.
770
                    inv_f, _ = osutils.normalized_filename(subf)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
771
                    # 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
772
                    # string concatenation.
5870.1.36 by Jelmer Vernooij
kill _FastPath.
773
                    subp = osutils.pathjoin(directory, subf)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
774
                    # TODO: is_control_filename is very slow. Make it faster.
775
                    # TreeDirectory.is_control_filename could also make this
776
                    # 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
777
                    # control file.
5870.1.31 by Jelmer Vernooij
Move smart_add into a helper.
778
                    if self.tree.is_control_filename(subp):
4721.3.1 by Vincent Ladeuil
Cleanup imports.
779
                        trace.mutter("skip control directory %r", subp)
5870.1.15 by Jelmer Vernooij
More refactoring.
780
                        continue
781
                    sub_invp = osutils.pathjoin(inv_path, inv_f)
5870.1.40 by Jelmer Vernooij
Look at parent_ie.children.
782
                    entry = self._invdelta.get(sub_invp)
783
                    if entry is not None:
784
                        sub_ie = entry[3]
785
                    else:
786
                        sub_ie = this_ie.children.get(inv_f)
5870.1.20 by Jelmer Vernooij
Some more code reuse/
787
                    if sub_ie is not None:
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
788
                        # recurse into this already versioned subdir.
5870.1.36 by Jelmer Vernooij
kill _FastPath.
789
                        things_to_add.append((subp, sub_invp, sub_ie, this_ie))
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
790
                    else:
6046.2.4 by Shannon Weyrick
Change AddAction interface to include a method for deciding whether to
791
                        # user selection overrides ignores
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
792
                        # ignore while selecting files - if we globbed in the
793
                        # outer loop we would ignore user files.
5870.1.31 by Jelmer Vernooij
Move smart_add into a helper.
794
                        ignore_glob = self.tree.is_ignored(subp)
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
795
                        if ignore_glob is not None:
5870.1.31 by Jelmer Vernooij
Move smart_add into a helper.
796
                            self.ignored.setdefault(ignore_glob, []).append(subp)
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
797
                        else:
5870.1.36 by Jelmer Vernooij
kill _FastPath.
798
                            things_to_add.append((subp, sub_invp, None, this_ie))