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