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
 | 
|
15  | 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 | 
|
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
 | 
|
26  | 
||
| 
2568.2.6
by Robert Collins
 Review feedback.  | 
27  | 
from bzrlib import (
 | 
28  | 
    add,
 | 
|
29  | 
    bzrdir,
 | 
|
30  | 
    )
 | 
|
| 
2568.2.4
by Robert Collins
 * ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now  | 
31  | 
from bzrlib.osutils import dirname
 | 
| 
2568.2.9
by Robert Collins
 Really honestly finally fix tests.  | 
32  | 
from bzrlib.trace import mutter, warning
 | 
| 
2568.2.4
by Robert Collins
 * ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now  | 
33  | 
""")  | 
34  | 
||
| 
2100.3.27
by Aaron Bentley
 Enable nested commits  | 
35  | 
from bzrlib import (  | 
36  | 
errors,  | 
|
| 
2294.1.10
by John Arbash Meinel
 Switch all apis over to utf8 file ids. All tests pass  | 
37  | 
osutils,  | 
| 
2100.3.27
by Aaron Bentley
 Enable nested commits  | 
38  | 
tree,  | 
39  | 
    )
 | 
|
| 
1986.1.2
by Robert Collins
 Various changes to allow non-workingtree specific tests to run entirely  | 
40  | 
from bzrlib.decorators import needs_read_lock, needs_write_lock  | 
41  | 
from bzrlib.osutils import splitpath  | 
|
42  | 
from bzrlib.symbol_versioning import DEPRECATED_PARAMETER  | 
|
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
 | 
|
70  | 
    conformance tests for - rather we are testing MemoryTree specifically, and 
 | 
|
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  | 
    """
 | 
|
76  | 
||
| 
2255.7.66
by Robert Collins
 MutableTree.add only needs a tree write lock.  | 
77  | 
    @needs_tree_write_lock
 | 
| 
1986.1.2
by Robert Collins
 Various changes to allow non-workingtree specific tests to run entirely  | 
78  | 
def add(self, files, ids=None, kinds=None):  | 
79  | 
"""Add paths to the set of versioned paths.  | 
|
80  | 
||
81  | 
        Note that the command line normally calls smart_add instead,
 | 
|
82  | 
        which can automatically recurse.
 | 
|
83  | 
||
84  | 
        This adds the files to the inventory, so that they will be
 | 
|
85  | 
        recorded by the next commit.
 | 
|
86  | 
||
87  | 
        :param files: List of paths to add, relative to the base of the tree.
 | 
|
88  | 
        :param ids: If set, use these instead of automatically generated ids.
 | 
|
89  | 
            Must be the same length as the list of files, but may
 | 
|
90  | 
            contain None for ids that are to be autogenerated.
 | 
|
91  | 
        :param kinds: Optional parameter to specify the kinds to be used for
 | 
|
92  | 
            each file.
 | 
|
93  | 
||
94  | 
        TODO: Perhaps callback with the ids and paths as they're added.
 | 
|
95  | 
        """
 | 
|
96  | 
if isinstance(files, basestring):  | 
|
97  | 
assert(ids is None or isinstance(ids, basestring))  | 
|
98  | 
assert(kinds is None or isinstance(kinds, basestring))  | 
|
99  | 
files = [files]  | 
|
100  | 
if ids is not None:  | 
|
101  | 
ids = [ids]  | 
|
102  | 
if kinds is not None:  | 
|
103  | 
kinds = [kinds]  | 
|
104  | 
||
| 
2323.4.2
by Robert Collins
 Fix the behaviour of dirstate optimised iter_changes recursing its disk iterator into subtrees inappropriately.  | 
105  | 
files = [path.strip('/') for path in files]  | 
106  | 
||
| 
1986.1.2
by Robert Collins
 Various changes to allow non-workingtree specific tests to run entirely  | 
107  | 
if ids is None:  | 
108  | 
ids = [None] * len(files)  | 
|
109  | 
else:  | 
|
110  | 
assert(len(ids) == len(files))  | 
|
| 
2294.1.10
by John Arbash Meinel
 Switch all apis over to utf8 file ids. All tests pass  | 
111  | 
ids = [osutils.safe_file_id(file_id) for file_id in ids]  | 
| 
1986.1.2
by Robert Collins
 Various changes to allow non-workingtree specific tests to run entirely  | 
112  | 
|
113  | 
if kinds is None:  | 
|
114  | 
kinds = [None] * len(files)  | 
|
115  | 
else:  | 
|
116  | 
assert(len(kinds) == len(files))  | 
|
117  | 
for f in files:  | 
|
118  | 
            # generic constraint checks:
 | 
|
119  | 
if self.is_control_filename(f):  | 
|
120  | 
raise errors.ForbiddenControlFileError(filename=f)  | 
|
121  | 
fp = splitpath(f)  | 
|
122  | 
        # fill out file kinds for all files [not needed when we stop 
 | 
|
123  | 
        # caring about the instantaneous file kind within a uncommmitted tree
 | 
|
124  | 
        #
 | 
|
125  | 
self._gather_kinds(files, kinds)  | 
|
126  | 
self._add(files, ids, kinds)  | 
|
127  | 
||
| 
2255.6.8
by Aaron Bentley
 Merge refactoring of add_reference  | 
128  | 
def add_reference(self, sub_tree):  | 
129  | 
"""Add a TreeReference to the tree, pointing at sub_tree"""  | 
|
130  | 
raise errors.UnsupportedOperation(self.add_reference, self)  | 
|
131  | 
||
132  | 
def _add_reference(self, sub_tree):  | 
|
133  | 
"""Standard add_reference implementation, for use by subclasses"""  | 
|
134  | 
try:  | 
|
135  | 
sub_tree_path = self.relpath(sub_tree.basedir)  | 
|
136  | 
except errors.PathNotChild:  | 
|
137  | 
raise errors.BadReferenceTarget(self, sub_tree,  | 
|
138  | 
'Target not inside tree.')  | 
|
139  | 
sub_tree_id = sub_tree.get_root_id()  | 
|
140  | 
if sub_tree_id == self.get_root_id():  | 
|
141  | 
raise errors.BadReferenceTarget(self, sub_tree,  | 
|
142  | 
'Trees have the same root id.')  | 
|
143  | 
if sub_tree_id in self.inventory:  | 
|
144  | 
raise errors.BadReferenceTarget(self, sub_tree,  | 
|
145  | 
'Root id already present in tree')  | 
|
146  | 
self._add([sub_tree_path], [sub_tree_id], ['tree-reference'])  | 
|
147  | 
||
| 
1986.1.2
by Robert Collins
 Various changes to allow non-workingtree specific tests to run entirely  | 
148  | 
def _add(self, files, ids, kinds):  | 
| 
2255.6.8
by Aaron Bentley
 Merge refactoring of add_reference  | 
149  | 
"""Helper function for add - updates the inventory.  | 
150  | 
||
151  | 
        :param files: sequence of pathnames, relative to the tree root
 | 
|
152  | 
        :param ids: sequence of suggested ids for the files (may be None)
 | 
|
153  | 
        :param kinds: sequence of  inventory kinds of the files (i.e. may
 | 
|
154  | 
            contain "tree-reference")
 | 
|
155  | 
        """
 | 
|
| 
1986.1.2
by Robert Collins
 Various changes to allow non-workingtree specific tests to run entirely  | 
156  | 
raise NotImplementedError(self._add)  | 
157  | 
||
| 
2376.2.2
by Aaron Bentley
 Reduce lock to tree lock  | 
158  | 
    @needs_tree_write_lock
 | 
| 
2376.2.1
by Aaron Bentley
 Implement MutableTree.apply_inventory_delta  | 
159  | 
def apply_inventory_delta(self, changes):  | 
160  | 
"""Apply changes to the inventory as an atomic operation.  | 
|
161  | 
||
162  | 
        The argument is a set of changes to apply.  It must describe a
 | 
|
163  | 
        valid result, but the order is not important.  Specifically,
 | 
|
164  | 
        intermediate stages *may* be invalid, such as when two files
 | 
|
165  | 
        swap names.
 | 
|
166  | 
||
167  | 
        The changes should be structured as a list of tuples, of the form
 | 
|
168  | 
        (old_path, new_path, file_id, new_entry).  For creation, old_path
 | 
|
169  | 
        must be None.  For deletion, new_path and new_entry must be None.
 | 
|
170  | 
        file_id is always non-None.  For renames and other mutations, all
 | 
|
171  | 
        values must be non-None.
 | 
|
172  | 
||
173  | 
        If the new_entry is a directory, its children should be an empty
 | 
|
174  | 
        dict.  Children are handled by apply_inventory_delta itself.
 | 
|
175  | 
||
| 
2376.2.9
by Aaron Bentley
 Cleanup from review  | 
176  | 
        :param changes: A list of tuples for the change to apply:
 | 
177  | 
            [(old_path, new_path, file_id, new_inventory_entry), ...]
 | 
|
178  | 
        """
 | 
|
| 
2376.2.1
by Aaron Bentley
 Implement MutableTree.apply_inventory_delta  | 
179  | 
self.flush()  | 
180  | 
inv = self.inventory  | 
|
181  | 
children = {}  | 
|
182  | 
for old_path, file_id in sorted(((op, f) for op, np, f, e in changes  | 
|
183  | 
if op is not None), reverse=True):  | 
|
| 
2376.2.2
by Aaron Bentley
 Reduce lock to tree lock  | 
184  | 
if file_id not in inv:  | 
185  | 
                continue
 | 
|
| 
2376.2.1
by Aaron Bentley
 Implement MutableTree.apply_inventory_delta  | 
186  | 
children[file_id] = getattr(inv[file_id], 'children', {})  | 
187  | 
inv.remove_recursive_id(file_id)  | 
|
188  | 
for new_path, new_entry in sorted((np, e) for op, np, f, e in  | 
|
189  | 
changes if np is not None):  | 
|
190  | 
if getattr(new_entry, 'children', None) is not None:  | 
|
191  | 
new_entry.children = children.get(new_entry.file_id, {})  | 
|
192  | 
inv.add(new_entry)  | 
|
193  | 
self._write_inventory(inv)  | 
|
194  | 
||
195  | 
    @needs_write_lock
 | 
|
| 
2255.2.218
by Robert Collins
 Make the nested tree commit smoke test be more rigourous.  | 
196  | 
def commit(self, message=None, revprops=None, *args,  | 
| 
2100.3.27
by Aaron Bentley
 Enable nested commits  | 
197  | 
**kwargs):  | 
| 
1986.1.3
by Robert Collins
 Merge bzr.dev.  | 
198  | 
        # avoid circular imports
 | 
| 
1986.1.2
by Robert Collins
 Various changes to allow non-workingtree specific tests to run entirely  | 
199  | 
from bzrlib import commit  | 
200  | 
if revprops is None:  | 
|
201  | 
revprops = {}  | 
|
202  | 
if not 'branch-nick' in revprops:  | 
|
203  | 
revprops['branch-nick'] = self.branch.nick  | 
|
204  | 
        # args for wt.commit start at message from the Commit.commit method,
 | 
|
| 
2367.2.1
by Robert Collins
 Remove bzrlib 0.8 compatability where it was making the code unclear or messy. (Robert Collins)  | 
205  | 
args = (message, ) + args  | 
| 
1986.1.2
by Robert Collins
 Various changes to allow non-workingtree specific tests to run entirely  | 
206  | 
committed_id = commit.Commit().commit(working_tree=self,  | 
| 
1986.1.3
by Robert Collins
 Merge bzr.dev.  | 
207  | 
revprops=revprops, *args, **kwargs)  | 
| 
1986.1.2
by Robert Collins
 Various changes to allow non-workingtree specific tests to run entirely  | 
208  | 
return committed_id  | 
209  | 
||
210  | 
def _gather_kinds(self, files, kinds):  | 
|
211  | 
"""Helper function for add - sets the entries of kinds."""  | 
|
212  | 
raise NotImplementedError(self._gather_kinds)  | 
|
213  | 
||
| 
1986.1.6
by Robert Collins
 Add MemoryTree.last_revision.  | 
214  | 
    @needs_read_lock
 | 
215  | 
def last_revision(self):  | 
|
| 
1986.1.7
by Robert Collins
 Merge bzr.dev.  | 
216  | 
"""Return the revision id of the last commit performed in this tree.  | 
217  | 
||
218  | 
        In early tree formats the result of last_revision is the same as the
 | 
|
219  | 
        branch last_revision, but that is no longer the case for modern tree
 | 
|
220  | 
        formats.
 | 
|
221  | 
        
 | 
|
222  | 
        last_revision returns the left most parent id, or None if there are no
 | 
|
223  | 
        parents.
 | 
|
224  | 
||
225  | 
        last_revision was deprecated as of 0.11. Please use get_parent_ids
 | 
|
226  | 
        instead.
 | 
|
227  | 
        """
 | 
|
| 
1986.1.6
by Robert Collins
 Add MemoryTree.last_revision.  | 
228  | 
raise NotImplementedError(self.last_revision)  | 
229  | 
||
| 
1986.1.8
by Robert Collins
 Update to bzr.dev, which involves adding lock_tree_write to MutableTree and MemoryTree.  | 
230  | 
def lock_tree_write(self):  | 
231  | 
"""Lock the working tree for write, and the branch for read.  | 
|
232  | 
||
233  | 
        This is useful for operations which only need to mutate the working
 | 
|
234  | 
        tree. Taking out branch write locks is a relatively expensive process
 | 
|
235  | 
        and may fail if the branch is on read only media. So branch write locks
 | 
|
236  | 
        should only be taken out when we are modifying branch data - such as in
 | 
|
237  | 
        operations like commit, pull, uncommit and update.
 | 
|
238  | 
        """
 | 
|
239  | 
raise NotImplementedError(self.lock_tree_write)  | 
|
240  | 
||
| 
1986.1.2
by Robert Collins
 Various changes to allow non-workingtree specific tests to run entirely  | 
241  | 
def lock_write(self):  | 
242  | 
"""Lock the tree and its branch. This allows mutating calls to be made.  | 
|
243  | 
||
244  | 
        Some mutating methods will take out implicit write locks, but in 
 | 
|
245  | 
        general you should always obtain a write lock before calling mutating
 | 
|
246  | 
        methods on a tree.
 | 
|
247  | 
        """
 | 
|
248  | 
raise NotImplementedError(self.lock_write)  | 
|
249  | 
||
250  | 
    @needs_write_lock
 | 
|
251  | 
def mkdir(self, path, file_id=None):  | 
|
252  | 
"""Create a directory in the tree. if file_id is None, one is assigned.  | 
|
253  | 
||
254  | 
        :param path: A unicode file path.
 | 
|
255  | 
        :param file_id: An optional file-id.
 | 
|
256  | 
        :return: the file id of the new directory.
 | 
|
257  | 
        """
 | 
|
258  | 
raise NotImplementedError(self.mkdir)  | 
|
259  | 
||
| 
2418.5.1
by John Arbash Meinel
 Make a Branch helper which can create a very basic MemoryTree with history.  | 
260  | 
def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False):  | 
261  | 
"""Set the parents ids of the working tree.  | 
|
262  | 
||
263  | 
        :param revision_ids: A list of revision_ids.
 | 
|
264  | 
        """
 | 
|
265  | 
raise NotImplementedError(self.set_parent_ids)  | 
|
266  | 
||
| 
1986.1.2
by Robert Collins
 Various changes to allow non-workingtree specific tests to run entirely  | 
267  | 
def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):  | 
268  | 
"""Set the parents of the working tree.  | 
|
269  | 
||
270  | 
        :param parents_list: A list of (revision_id, tree) tuples. 
 | 
|
271  | 
            If tree is None, then that element is treated as an unreachable
 | 
|
272  | 
            parent tree - i.e. a ghost.
 | 
|
273  | 
        """
 | 
|
274  | 
raise NotImplementedError(self.set_parent_trees)  | 
|
| 
2568.2.4
by Robert Collins
 * ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now  | 
275  | 
|
276  | 
    @needs_tree_write_lock
 | 
|
277  | 
def smart_add(self, file_list, recurse=True, action=None, save=True):  | 
|
278  | 
"""Version file_list, optionally recursing into directories.  | 
|
279  | 
||
280  | 
        This is designed more towards DWIM for humans than API clarity.
 | 
|
281  | 
        For the specific behaviour see the help for cmd_add().
 | 
|
282  | 
||
283  | 
        :param action: A reporter to be called with the inventory, parent_ie,
 | 
|
284  | 
            path and kind of the path being added. It may return a file_id if 
 | 
|
285  | 
            a specific one should be used.
 | 
|
286  | 
        :param save: Save the inventory after completing the adds. If False
 | 
|
287  | 
            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  | 
288  | 
            the inventory.
 | 
| 
2568.2.6
by Robert Collins
 Review feedback.  | 
289  | 
        :return: A tuple - files_added, ignored_files. files_added is the count
 | 
290  | 
            of added files, and ignored_files is a dict mapping files that were
 | 
|
291  | 
            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  | 
292  | 
        """
 | 
293  | 
        # not in an inner loop; and we want to remove direct use of this,
 | 
|
294  | 
        # so here as a reminder for now. RBC 20070703
 | 
|
295  | 
from bzrlib.inventory import InventoryEntry  | 
|
296  | 
assert isinstance(recurse, bool)  | 
|
297  | 
if action is None:  | 
|
298  | 
action = add.AddAction()  | 
|
299  | 
||
300  | 
if not file_list:  | 
|
301  | 
            # no paths supplied: add the entire tree.
 | 
|
302  | 
file_list = [u'.']  | 
|
303  | 
        # mutter("smart add of %r")
 | 
|
304  | 
inv = self.inventory  | 
|
305  | 
added = []  | 
|
306  | 
ignored = {}  | 
|
307  | 
dirs_to_add = []  | 
|
308  | 
user_dirs = set()  | 
|
309  | 
||
310  | 
        # validate user file paths and convert all paths to tree 
 | 
|
| 
2568.2.6
by Robert Collins
 Review feedback.  | 
311  | 
        # relative : it's cheaper to make a tree relative path an abspath
 | 
| 
2568.2.4
by Robert Collins
 * ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now  | 
312  | 
        # than to convert an abspath to tree relative.
 | 
313  | 
for filepath in file_list:  | 
|
| 
2568.2.5
by Robert Collins
 * ``bzrlib.add.FastPath`` is now private and moved to  | 
314  | 
rf = _FastPath(self.relpath(filepath))  | 
| 
2568.2.4
by Robert Collins
 * ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now  | 
315  | 
            # validate user parameters. Our recursive code avoids adding new files
 | 
316  | 
            # that need such validation 
 | 
|
317  | 
if self.is_control_filename(rf.raw_path):  | 
|
318  | 
raise errors.ForbiddenControlFileError(filename=rf.raw_path)  | 
|
319  | 
||
320  | 
abspath = self.abspath(rf.raw_path)  | 
|
321  | 
kind = osutils.file_kind(abspath)  | 
|
322  | 
if kind == 'directory':  | 
|
323  | 
                # schedule the dir for scanning
 | 
|
324  | 
user_dirs.add(rf)  | 
|
325  | 
else:  | 
|
326  | 
if not InventoryEntry.versionable_kind(kind):  | 
|
327  | 
raise errors.BadFileKindError(filename=abspath, kind=kind)  | 
|
328  | 
            # ensure the named path is added, so that ignore rules in the later directory
 | 
|
329  | 
            # walk dont skip it.
 | 
|
330  | 
            # we dont have a parent ie known yet.: use the relatively slower inventory 
 | 
|
331  | 
            # probing method
 | 
|
332  | 
versioned = inv.has_filename(rf.raw_path)  | 
|
333  | 
if versioned:  | 
|
334  | 
                continue
 | 
|
335  | 
added.extend(_add_one_and_parent(self, inv, None, rf, kind, action))  | 
|
336  | 
||
337  | 
if not recurse:  | 
|
338  | 
            # no need to walk any directories at all.
 | 
|
339  | 
if len(added) > 0 and save:  | 
|
340  | 
self._write_inventory(inv)  | 
|
341  | 
return added, ignored  | 
|
342  | 
||
343  | 
        # only walk the minimal parents needed: we have user_dirs to override
 | 
|
344  | 
        # ignores.
 | 
|
345  | 
prev_dir = None  | 
|
346  | 
||
347  | 
is_inside = osutils.is_inside_or_parent_of_any  | 
|
348  | 
for path in sorted(user_dirs):  | 
|
349  | 
if (prev_dir is None or not is_inside([prev_dir], path.raw_path)):  | 
|
350  | 
dirs_to_add.append((path, None))  | 
|
351  | 
prev_dir = path.raw_path  | 
|
352  | 
||
353  | 
        # dirs_to_add is initialised to a list of directories, but as we scan
 | 
|
354  | 
        # directories we append files to it.
 | 
|
355  | 
        # XXX: We should determine kind of files when we scan them rather than
 | 
|
356  | 
        # adding to this list. RBC 20070703
 | 
|
357  | 
for directory, parent_ie in dirs_to_add:  | 
|
358  | 
            # directory is tree-relative
 | 
|
359  | 
abspath = self.abspath(directory.raw_path)  | 
|
360  | 
||
361  | 
            # get the contents of this directory.
 | 
|
362  | 
||
363  | 
            # find the kind of the path being added.
 | 
|
364  | 
kind = osutils.file_kind(abspath)  | 
|
365  | 
||
366  | 
if not InventoryEntry.versionable_kind(kind):  | 
|
367  | 
warning("skipping %s (can't add file of kind '%s')", abspath, kind)  | 
|
368  | 
                continue
 | 
|
369  | 
||
370  | 
if parent_ie is not None:  | 
|
371  | 
versioned = directory.base_path in parent_ie.children  | 
|
372  | 
else:  | 
|
373  | 
                # without the parent ie, use the relatively slower inventory 
 | 
|
374  | 
                # probing method
 | 
|
375  | 
versioned = inv.has_filename(directory.raw_path)  | 
|
376  | 
||
377  | 
if kind == 'directory':  | 
|
378  | 
try:  | 
|
379  | 
sub_branch = bzrdir.BzrDir.open(abspath)  | 
|
380  | 
sub_tree = True  | 
|
381  | 
except errors.NotBranchError:  | 
|
382  | 
sub_tree = False  | 
|
383  | 
except errors.UnsupportedFormatError:  | 
|
384  | 
sub_tree = True  | 
|
385  | 
else:  | 
|
386  | 
sub_tree = False  | 
|
387  | 
||
388  | 
if directory.raw_path == '':  | 
|
389  | 
                # mutter("tree root doesn't need to be added")
 | 
|
390  | 
sub_tree = False  | 
|
391  | 
elif versioned:  | 
|
392  | 
                pass
 | 
|
393  | 
                # mutter("%r is already versioned", abspath)
 | 
|
394  | 
elif sub_tree:  | 
|
395  | 
                # XXX: This is wrong; people *might* reasonably be trying to add
 | 
|
396  | 
                # subtrees as subtrees.  This should probably only be done in formats 
 | 
|
397  | 
                # which can represent subtrees, and even then perhaps only when
 | 
|
398  | 
                # the user asked to add subtrees.  At the moment you can add them
 | 
|
399  | 
                # specially through 'join --reference', which is perhaps
 | 
|
400  | 
                # reasonable: adding a new reference is a special operation and
 | 
|
401  | 
                # can have a special behaviour.  mbp 20070306
 | 
|
402  | 
mutter("%r is a nested bzr tree", abspath)  | 
|
403  | 
else:  | 
|
404  | 
_add_one(self, inv, parent_ie, directory, kind, action)  | 
|
405  | 
added.append(directory.raw_path)  | 
|
406  | 
||
407  | 
if kind == 'directory' and not sub_tree:  | 
|
408  | 
if parent_ie is not None:  | 
|
409  | 
                    # must be present:
 | 
|
410  | 
this_ie = parent_ie.children[directory.base_path]  | 
|
411  | 
else:  | 
|
412  | 
                    # without the parent ie, use the relatively slower inventory 
 | 
|
413  | 
                    # probing method
 | 
|
414  | 
this_id = inv.path2id(directory.raw_path)  | 
|
415  | 
if this_id is None:  | 
|
416  | 
this_ie = None  | 
|
417  | 
else:  | 
|
418  | 
this_ie = inv[this_id]  | 
|
419  | 
||
420  | 
for subf in sorted(os.listdir(abspath)):  | 
|
421  | 
                    # here we could use TreeDirectory rather than 
 | 
|
422  | 
                    # string concatenation.
 | 
|
423  | 
subp = osutils.pathjoin(directory.raw_path, subf)  | 
|
424  | 
                    # TODO: is_control_filename is very slow. Make it faster. 
 | 
|
425  | 
                    # TreeDirectory.is_control_filename could also make this 
 | 
|
426  | 
                    # faster - its impossible for a non root dir to have a 
 | 
|
427  | 
                    # control file.
 | 
|
428  | 
if self.is_control_filename(subp):  | 
|
429  | 
mutter("skip control directory %r", subp)  | 
|
430  | 
elif subf in this_ie.children:  | 
|
431  | 
                        # recurse into this already versioned subdir.
 | 
|
| 
2568.2.5
by Robert Collins
 * ``bzrlib.add.FastPath`` is now private and moved to  | 
432  | 
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  | 
433  | 
else:  | 
434  | 
                        # user selection overrides ignoes
 | 
|
435  | 
                        # ignore while selecting files - if we globbed in the
 | 
|
436  | 
                        # outer loop we would ignore user files.
 | 
|
437  | 
ignore_glob = self.is_ignored(subp)  | 
|
438  | 
if ignore_glob is not None:  | 
|
439  | 
                            # mutter("skip ignored sub-file %r", subp)
 | 
|
440  | 
ignored.setdefault(ignore_glob, []).append(subp)  | 
|
441  | 
else:  | 
|
442  | 
                            #mutter("queue to add sub-file %r", subp)
 | 
|
| 
2568.2.5
by Robert Collins
 * ``bzrlib.add.FastPath`` is now private and moved to  | 
443  | 
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  | 
444  | 
|
| 
2585.1.1
by Aaron Bentley
 Unify MutableTree.smart_add behavior by disabling quirky memory-only Inventory  | 
445  | 
if len(added) > 0:  | 
446  | 
if save:  | 
|
447  | 
self._write_inventory(inv)  | 
|
448  | 
else:  | 
|
449  | 
self.read_working_inventory()  | 
|
| 
2568.2.4
by Robert Collins
 * ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now  | 
450  | 
return added, ignored  | 
451  | 
||
452  | 
||
| 
2568.2.5
by Robert Collins
 * ``bzrlib.add.FastPath`` is now private and moved to  | 
453  | 
class _FastPath(object):  | 
| 
2568.2.4
by Robert Collins
 * ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now  | 
454  | 
"""A path object with fast accessors for things like basename."""  | 
455  | 
||
456  | 
__slots__ = ['raw_path', 'base_path']  | 
|
457  | 
||
458  | 
def __init__(self, path, base_path=None):  | 
|
459  | 
"""Construct a FastPath from path."""  | 
|
460  | 
if base_path is None:  | 
|
461  | 
self.base_path = osutils.basename(path)  | 
|
462  | 
else:  | 
|
463  | 
self.base_path = base_path  | 
|
464  | 
self.raw_path = path  | 
|
465  | 
||
466  | 
def __cmp__(self, other):  | 
|
467  | 
return cmp(self.raw_path, other.raw_path)  | 
|
468  | 
||
469  | 
def __hash__(self):  | 
|
470  | 
return hash(self.raw_path)  | 
|
471  | 
||
472  | 
||
473  | 
def _add_one_and_parent(tree, inv, parent_ie, path, kind, action):  | 
|
474  | 
"""Add a new entry to the inventory and automatically add unversioned parents.  | 
|
475  | 
||
476  | 
    :param inv: Inventory which will receive the new entry.
 | 
|
477  | 
    :param parent_ie: Parent inventory entry if known, or None.  If
 | 
|
478  | 
        None, the parent is looked up by name and used if present, otherwise it
 | 
|
479  | 
        is recursively added.
 | 
|
480  | 
    :param kind: Kind of new entry (file, directory, etc)
 | 
|
481  | 
    :param action: callback(inv, parent_ie, path, kind); return ignored.
 | 
|
482  | 
    :return: A list of paths which have been added.
 | 
|
483  | 
    """
 | 
|
484  | 
    # Nothing to do if path is already versioned.
 | 
|
485  | 
    # This is safe from infinite recursion because the tree root is
 | 
|
486  | 
    # always versioned.
 | 
|
487  | 
if parent_ie is not None:  | 
|
488  | 
        # we have a parent ie already
 | 
|
489  | 
added = []  | 
|
490  | 
else:  | 
|
491  | 
        # slower but does not need parent_ie
 | 
|
492  | 
if inv.has_filename(path.raw_path):  | 
|
493  | 
return []  | 
|
494  | 
        # its really not there : add the parent
 | 
|
495  | 
        # note that the dirname use leads to some extra str copying etc but as
 | 
|
496  | 
        # there are a limited number of dirs we can be nested under, it should
 | 
|
497  | 
        # 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  | 
498  | 
added = _add_one_and_parent(tree, inv, None,  | 
499  | 
_FastPath(dirname(path.raw_path)), 'directory', action)  | 
|
| 
2568.2.4
by Robert Collins
 * ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now  | 
500  | 
parent_id = inv.path2id(dirname(path.raw_path))  | 
501  | 
parent_ie = inv[parent_id]  | 
|
502  | 
_add_one(tree, inv, parent_ie, path, kind, action)  | 
|
503  | 
return added + [path.raw_path]  | 
|
504  | 
||
505  | 
||
506  | 
def _add_one(tree, inv, parent_ie, path, kind, file_id_callback):  | 
|
507  | 
"""Add a new entry to the inventory.  | 
|
508  | 
||
509  | 
    :param inv: Inventory which will receive the new entry.
 | 
|
510  | 
    :param parent_ie: Parent inventory entry.
 | 
|
511  | 
    :param kind: Kind of new entry (file, directory, etc)
 | 
|
512  | 
    :param file_id_callback: callback(inv, parent_ie, path, kind); return a
 | 
|
513  | 
        file_id or None to generate a new file id
 | 
|
514  | 
    :returns: None
 | 
|
515  | 
    """
 | 
|
516  | 
file_id = file_id_callback(inv, parent_ie, path, kind)  | 
|
517  | 
entry = inv.make_entry(kind, path.base_path, parent_ie.file_id,  | 
|
518  | 
file_id=file_id)  | 
|
519  | 
inv.add(entry)  |