/brz/remove-bazaar

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