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