/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1
# Copyright (C) 2005, 2006 Canonical Ltd
1685.1.80 by Wouter van Heyst
more code cleanup
2
#
70 by mbp at sourcefrog
Prepare for smart recursive add.
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.
1685.1.80 by Wouter van Heyst
more code cleanup
7
#
70 by mbp at sourcefrog
Prepare for smart recursive add.
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.
1685.1.80 by Wouter van Heyst
more code cleanup
12
#
70 by mbp at sourcefrog
Prepare for smart recursive add.
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
2399.1.5 by John Arbash Meinel
Clean up add.py documentation.
17
"""Helper functions for adding files to working trees."""
18
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
19
import errno
20
import os
21
from os.path import dirname
1185.85.12 by John Arbash Meinel
Refactoring AddAction to allow redirecting to an encoding file.
22
import sys
1185.1.53 by Robert Collins
raise a specific error on unsupported branches so that they can be distinguished from generic errors
23
2094.3.5 by John Arbash Meinel
Fix imports to ensure modules are loaded before they are used
24
import bzrlib.bzrdir
1185.1.53 by Robert Collins
raise a specific error on unsupported branches so that they can be distinguished from generic errors
25
import bzrlib.errors as errors
2568.2.2 by Robert Collins
* New method ``_glob_expand_file_list_if_needed`` on the ``Command`` class
26
from bzrlib.errors import NotBranchError
1399.1.1 by Robert Collins
move checks for versionability of file kinds into InventoryEntry
27
from bzrlib.inventory import InventoryEntry
2568.2.2 by Robert Collins
* New method ``_glob_expand_file_list_if_needed`` on the ``Command`` class
28
import bzrlib.osutils
29
from bzrlib.symbol_versioning import *
1128 by Martin Pool
- smart_add routine now doesn't print filenames directly, but rather
30
from bzrlib.trace import mutter, note, warning
1508.1.10 by Robert Collins
bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)
31
from bzrlib.workingtree import WorkingTree
70 by mbp at sourcefrog
Prepare for smart recursive add.
32
1685.1.80 by Wouter van Heyst
more code cleanup
33
1185.85.12 by John Arbash Meinel
Refactoring AddAction to allow redirecting to an encoding file.
34
class AddAction(object):
35
    """A class which defines what action to take when adding a file."""
36
1757.2.6 by Robert Collins
Steps towards a nicer smart add - unwind the conditional add logic - having parents not in the inventory was overly complicating the rest of the code.
37
    def __init__(self, to_file=None, should_print=None):
2399.1.5 by John Arbash Meinel
Clean up add.py documentation.
38
        """Initialize an action which prints added files to an output stream.
39
40
        :param to_file: The stream to write into. This is expected to take
41
            Unicode paths. If not supplied, it will default to ``sys.stdout``.
42
        :param should_print: If False, printing will be supressed.
43
        """
1185.85.12 by John Arbash Meinel
Refactoring AddAction to allow redirecting to an encoding file.
44
        self._to_file = to_file
45
        if to_file is None:
46
            self._to_file = sys.stdout
1685.1.69 by Wouter van Heyst
merge bzr.dev 1740
47
        self.should_print = False
1185.85.12 by John Arbash Meinel
Refactoring AddAction to allow redirecting to an encoding file.
48
        if should_print is not None:
49
            self.should_print = should_print
50
1757.2.15 by Robert Collins
Consolidate writes of adds to one write per file - drops encoding overhead by 1/3.
51
    def __call__(self, inv, parent_ie, path, kind, _quote=bzrlib.osutils.quotefn):
1185.85.12 by John Arbash Meinel
Refactoring AddAction to allow redirecting to an encoding file.
52
        """Add path to inventory.
53
54
        The default action does nothing.
55
56
        :param inv: The inventory we are working with.
1757.2.2 by Robert Collins
Merge basename call eliminate for smart_add.
57
        :param path: The FastPath being added
1185.85.12 by John Arbash Meinel
Refactoring AddAction to allow redirecting to an encoding file.
58
        :param kind: The kind of the object being added.
59
        """
1911.3.1 by John Arbash Meinel
Updated smart_add so that the AddAction can return a custom id.
60
        if self.should_print:
61
            self._to_file.write('added %s\n' % _quote(path.raw_path))
62
        return None
1185.85.12 by John Arbash Meinel
Refactoring AddAction to allow redirecting to an encoding file.
63
64
1911.3.2 by John Arbash Meinel
Adding the AddFromBaseAction, which tries to reuse file ids from another tree
65
class AddFromBaseAction(AddAction):
66
    """This class will try to extract file ids from another tree."""
67
68
    def __init__(self, base_tree, base_path, to_file=None, should_print=None):
69
        super(AddFromBaseAction, self).__init__(to_file=to_file,
70
                                                should_print=should_print)
71
        self.base_tree = base_tree
72
        self.base_path = base_path
73
74
    def __call__(self, inv, parent_ie, path, kind):
75
        # Place the parent call
76
        # Now check to see if we can extract an id for this file
77
        file_id, base_path = self._get_base_file_id(path, parent_ie)
78
        if file_id is not None:
79
            if self.should_print:
80
                self._to_file.write('added %s w/ file id from %s\n'
81
                                    % (path.raw_path, base_path))
82
        else:
83
            # we aren't doing anything special, so let the default
84
            # reporter happen
85
            file_id = super(AddFromBaseAction, self).__call__(
86
                        inv, parent_ie, path, kind)
87
        return file_id
88
89
    def _get_base_file_id(self, path, parent_ie):
90
        """Look for a file id in the base branch.
91
92
        First, if the base tree has the parent directory,
93
        we look for a file with the same name in that directory.
94
        Else, we look for an entry in the base tree with the same path.
95
        """
96
97
        if (parent_ie.file_id in self.base_tree):
98
            base_parent_ie = self.base_tree.inventory[parent_ie.file_id]
99
            base_child_ie = base_parent_ie.children.get(path.base_path)
100
            if base_child_ie is not None:
101
                return (base_child_ie.file_id,
102
                        self.base_tree.id2path(base_child_ie.file_id))
103
        full_base_path = bzrlib.osutils.pathjoin(self.base_path, path.raw_path)
104
        # This may return None, but it is our last attempt
105
        return self.base_tree.path2id(full_base_path), full_base_path
106
107
1185.85.12 by John Arbash Meinel
Refactoring AddAction to allow redirecting to an encoding file.
108
# TODO: jam 20050105 These could be used for compatibility
109
#       however, they bind against the current stdout, not the
110
#       one which exists at the time they are called, so they
111
#       don't work for the test suite.
112
# deprecated
1757.2.6 by Robert Collins
Steps towards a nicer smart add - unwind the conditional add logic - having parents not in the inventory was overly complicating the rest of the code.
113
add_action_add = AddAction()
114
add_action_null = add_action_add
115
add_action_add_and_print = AddAction(should_print=True)
116
add_action_print = add_action_add_and_print
117
118
2568.2.2 by Robert Collins
* New method ``_glob_expand_file_list_if_needed`` on the ``Command`` class
119
@deprecated_function(zero_eighteen)
1757.2.6 by Robert Collins
Steps towards a nicer smart add - unwind the conditional add logic - having parents not in the inventory was overly complicating the rest of the code.
120
def smart_add(file_list, recurse=True, action=None, save=True):
598 by Martin Pool
doc
121
    """Add files to version, optionally recursing into directories.
70 by mbp at sourcefrog
Prepare for smart recursive add.
122
123
    This is designed more towards DWIM for humans than API simplicity.
124
    For the specific behaviour see the help for cmd_add().
1159 by Martin Pool
- clean up parameters to smart_add and smart_add_branch
125
126
    Returns the number of files added.
1757.2.6 by Robert Collins
Steps towards a nicer smart add - unwind the conditional add logic - having parents not in the inventory was overly complicating the rest of the code.
127
    Please see smart_add_tree for more detail.
70 by mbp at sourcefrog
Prepare for smart recursive add.
128
    """
1508.1.10 by Robert Collins
bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)
129
    tree = WorkingTree.open_containing(file_list[0])[0]
1930.1.2 by John Arbash Meinel
Alexander Belchenko: Fix add --dry-run
130
    return smart_add_tree(tree, file_list, recurse, action=action, save=save)
1185.85.12 by John Arbash Meinel
Refactoring AddAction to allow redirecting to an encoding file.
131
132
1757.2.2 by Robert Collins
Merge basename call eliminate for smart_add.
133
class FastPath(object):
134
    """A path object with fast accessors for things like basename."""
135
136
    __slots__ = ['raw_path', 'base_path']
137
138
    def __init__(self, path, base_path=None):
139
        """Construct a FastPath from path."""
140
        if base_path is None:
141
            self.base_path = bzrlib.osutils.basename(path)
142
        else:
143
            self.base_path = base_path
144
        self.raw_path = path
145
1850.2.1 by John Arbash Meinel
Fix bug #52578, smart-add wasn't recursing all supplied directories.
146
    def __cmp__(self, other):
147
        return cmp(self.raw_path, other.raw_path)
148
149
    def __hash__(self):
150
        return hash(self.raw_path)
151
1757.2.2 by Robert Collins
Merge basename call eliminate for smart_add.
152
1757.2.6 by Robert Collins
Steps towards a nicer smart add - unwind the conditional add logic - having parents not in the inventory was overly complicating the rest of the code.
153
def smart_add_tree(tree, file_list, recurse=True, action=None, save=True):
2399.1.5 by John Arbash Meinel
Clean up add.py documentation.
154
    """Add files to version, optionally recursing into directories.
155
156
    This is designed more towards DWIM for humans than API simplicity.
157
    For the specific behaviour see the help for cmd_add().
158
159
    This calls reporter with each (path, kind, file_id) of added files.
160
161
    Returns the number of files added.
162
163
    :param save: Save the inventory after completing the adds. If False this
164
        provides dry-run functionality by doing the add and not saving the
165
        inventory.  Note that the modified inventory is left in place, allowing
166
        further dry-run tasks to take place. To restore the original inventory
167
        call tree.read_working_inventory().
168
    """
2255.2.62 by John Arbash Meinel
add a workingtree_implementations test that makes sure smart_add_tree orks properly
169
    tree.lock_tree_write()
170
    try:
171
        return _smart_add_tree(tree=tree, file_list=file_list, recurse=recurse,
172
                               action=action, save=save)
173
    finally:
174
        tree.unlock()
175
2399.1.5 by John Arbash Meinel
Clean up add.py documentation.
176
2255.2.62 by John Arbash Meinel
add a workingtree_implementations test that makes sure smart_add_tree orks properly
177
def _smart_add_tree(tree, file_list, recurse=True, action=None, save=True):
2399.1.5 by John Arbash Meinel
Clean up add.py documentation.
178
    """Helper for smart_add_tree.
179
180
    The tree should be locked before entering this function. See smart_add_tree
181
    for parameter definitions.
1092.1.29 by Robert Collins
break smart_add into smart_add and smart_add_branch which will accept a branch parameter
182
    """
1159 by Martin Pool
- clean up parameters to smart_add and smart_add_branch
183
    assert isinstance(recurse, bool)
1185.85.12 by John Arbash Meinel
Refactoring AddAction to allow redirecting to an encoding file.
184
    if action is None:
1757.2.6 by Robert Collins
Steps towards a nicer smart add - unwind the conditional add logic - having parents not in the inventory was overly complicating the rest of the code.
185
        action = AddAction()
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
186
    
2568.2.2 by Robert Collins
* New method ``_glob_expand_file_list_if_needed`` on the ``Command`` class
187
    if not file_list:
188
        # no paths supplied: add the entire tree.
189
        file_list = [u'.']
190
    mutter("smart add of %r")
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
191
    inv = tree.read_working_inventory()
1185.46.8 by Aaron Bentley
bzr add reports ignored patterns.
192
    added = []
193
    ignored = {}
1757.2.4 by Robert Collins
Teach file_kind about NoSuchFile, reducing duplicate code, and add user files before entering the main loop in smart_add.
194
    dirs_to_add = []
1757.2.5 by Robert Collins
De-dup the add list so we only walk subtrees once for add.
195
    user_dirs = set()
86 by mbp at sourcefrog
first cut at recursive add
196
1713.1.11 by Robert Collins
refactor smart_add to pass around the parent inventory entry and use that, resulting in another 100bzrlib/inventory.py performance improvement, and making inventory writing the dominating factory in add. (Robert Collins)
197
    # validate user file paths and convert all paths to tree 
198
    # relative : its cheaper to make a tree relative path an abspath
199
    # than to convert an abspath to tree relative.
2568.2.2 by Robert Collins
* New method ``_glob_expand_file_list_if_needed`` on the ``Command`` class
200
    for filepath in file_list:
1757.2.2 by Robert Collins
Merge basename call eliminate for smart_add.
201
        rf = FastPath(tree.relpath(filepath))
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
202
        # validate user parameters. Our recursive code avoids adding new files
203
        # that need such validation 
1757.2.2 by Robert Collins
Merge basename call eliminate for smart_add.
204
        if tree.is_control_filename(rf.raw_path):
2279.6.1 by Alexander Belchenko
Instead of __str__ method for FastPath object we use .raw_path attribute (note from Aaron).
205
            raise errors.ForbiddenControlFileError(filename=rf.raw_path)
1757.2.4 by Robert Collins
Teach file_kind about NoSuchFile, reducing duplicate code, and add user files before entering the main loop in smart_add.
206
        
207
        abspath = tree.abspath(rf.raw_path)
208
        kind = bzrlib.osutils.file_kind(abspath)
209
        if kind == 'directory':
1757.2.6 by Robert Collins
Steps towards a nicer smart add - unwind the conditional add logic - having parents not in the inventory was overly complicating the rest of the code.
210
            # schedule the dir for scanning
1850.2.1 by John Arbash Meinel
Fix bug #52578, smart-add wasn't recursing all supplied directories.
211
            user_dirs.add(rf)
1757.2.4 by Robert Collins
Teach file_kind about NoSuchFile, reducing duplicate code, and add user files before entering the main loop in smart_add.
212
        else:
213
            if not InventoryEntry.versionable_kind(kind):
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
214
                raise errors.BadFileKindError(filename=abspath, kind=kind)
1757.2.6 by Robert Collins
Steps towards a nicer smart add - unwind the conditional add logic - having parents not in the inventory was overly complicating the rest of the code.
215
        # ensure the named path is added, so that ignore rules in the later directory
216
        # walk dont skip it.
217
        # we dont have a parent ie known yet.: use the relatively slower inventory 
218
        # probing method
219
        versioned = inv.has_filename(rf.raw_path)
220
        if versioned:
221
            continue
1757.2.7 by Robert Collins
Split out the recursive add and add of a single entry in add.py.
222
        added.extend(__add_one_and_parent(tree, inv, None, rf, kind, action))
1757.2.6 by Robert Collins
Steps towards a nicer smart add - unwind the conditional add logic - having parents not in the inventory was overly complicating the rest of the code.
223
224
    if not recurse:
225
        # no need to walk any directories at all.
226
        if len(added) > 0 and save:
227
            tree._write_inventory(inv)
228
        return added, ignored
1757.2.4 by Robert Collins
Teach file_kind about NoSuchFile, reducing duplicate code, and add user files before entering the main loop in smart_add.
229
1757.2.5 by Robert Collins
De-dup the add list so we only walk subtrees once for add.
230
    # only walk the minimal parents needed: we have user_dirs to override
231
    # ignores.
232
    prev_dir = None
1850.2.1 by John Arbash Meinel
Fix bug #52578, smart-add wasn't recursing all supplied directories.
233
234
    is_inside = bzrlib.osutils.is_inside_or_parent_of_any
1757.2.5 by Robert Collins
De-dup the add list so we only walk subtrees once for add.
235
    for path in sorted(user_dirs):
1850.2.1 by John Arbash Meinel
Fix bug #52578, smart-add wasn't recursing all supplied directories.
236
        if (prev_dir is None or not is_inside([prev_dir], path.raw_path)):
237
            dirs_to_add.append((path, None))
238
        prev_dir = path.raw_path
1757.2.5 by Robert Collins
De-dup the add list so we only walk subtrees once for add.
239
1757.2.4 by Robert Collins
Teach file_kind about NoSuchFile, reducing duplicate code, and add user files before entering the main loop in smart_add.
240
    # this will eventually be *just* directories, right now it starts off with 
241
    # just directories.
242
    for directory, parent_ie in dirs_to_add:
243
        # directory is tree-relative
244
        abspath = tree.abspath(directory.raw_path)
245
1757.2.7 by Robert Collins
Split out the recursive add and add of a single entry in add.py.
246
        # get the contents of this directory.
247
1757.2.4 by Robert Collins
Teach file_kind about NoSuchFile, reducing duplicate code, and add user files before entering the main loop in smart_add.
248
        # find the kind of the path being added.
249
        kind = bzrlib.osutils.file_kind(abspath)
250
251
        if not InventoryEntry.versionable_kind(kind):
252
            warning("skipping %s (can't add file of kind '%s')", abspath, kind)
253
            continue
426 by Martin Pool
- Skip symlinks during recursive add (path from aaron)
254
1713.1.11 by Robert Collins
refactor smart_add to pass around the parent inventory entry and use that, resulting in another 100bzrlib/inventory.py performance improvement, and making inventory writing the dominating factory in add. (Robert Collins)
255
        if parent_ie is not None:
1757.2.4 by Robert Collins
Teach file_kind about NoSuchFile, reducing duplicate code, and add user files before entering the main loop in smart_add.
256
            versioned = directory.base_path in parent_ie.children
1713.1.11 by Robert Collins
refactor smart_add to pass around the parent inventory entry and use that, resulting in another 100bzrlib/inventory.py performance improvement, and making inventory writing the dominating factory in add. (Robert Collins)
257
        else:
258
            # without the parent ie, use the relatively slower inventory 
259
            # probing method
1757.2.4 by Robert Collins
Teach file_kind about NoSuchFile, reducing duplicate code, and add user files before entering the main loop in smart_add.
260
            versioned = inv.has_filename(directory.raw_path)
86 by mbp at sourcefrog
first cut at recursive add
261
1092.1.27 by Robert Collins
two bugfixes to smart_add - do not add paths from nested trees to the parent tree, and do not mutate the user supplied file list
262
        if kind == 'directory':
263
            try:
1713.1.11 by Robert Collins
refactor smart_add to pass around the parent inventory entry and use that, resulting in another 100bzrlib/inventory.py performance improvement, and making inventory writing the dominating factory in add. (Robert Collins)
264
                sub_branch = bzrlib.bzrdir.BzrDir.open(abspath)
1092.1.27 by Robert Collins
two bugfixes to smart_add - do not add paths from nested trees to the parent tree, and do not mutate the user supplied file list
265
                sub_tree = True
266
            except NotBranchError:
267
                sub_tree = False
1185.1.53 by Robert Collins
raise a specific error on unsupported branches so that they can be distinguished from generic errors
268
            except errors.UnsupportedFormatError:
269
                sub_tree = True
1092.1.27 by Robert Collins
two bugfixes to smart_add - do not add paths from nested trees to the parent tree, and do not mutate the user supplied file list
270
        else:
271
            sub_tree = False
272
1757.2.4 by Robert Collins
Teach file_kind about NoSuchFile, reducing duplicate code, and add user files before entering the main loop in smart_add.
273
        if directory.raw_path == '':
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
274
            # mutter("tree root doesn't need to be added")
1092.1.27 by Robert Collins
two bugfixes to smart_add - do not add paths from nested trees to the parent tree, and do not mutate the user supplied file list
275
            sub_tree = False
91 by mbp at sourcefrog
special handling of root directory for recursive add
276
        elif versioned:
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
277
            pass
1713.1.11 by Robert Collins
refactor smart_add to pass around the parent inventory entry and use that, resulting in another 100bzrlib/inventory.py performance improvement, and making inventory writing the dominating factory in add. (Robert Collins)
278
            # mutter("%r is already versioned", abspath)
1092.1.27 by Robert Collins
two bugfixes to smart_add - do not add paths from nested trees to the parent tree, and do not mutate the user supplied file list
279
        elif sub_tree:
2255.2.217 by Martin Pool
docs
280
            # XXX: This is wrong; people *might* reasonably be trying to add
281
            # subtrees as subtrees.  This should probably only be done in formats 
282
            # which can represent subtrees, and even then perhaps only when
2255.2.236 by Martin Pool
Review cleanups: mostly updating or removing todo comments.
283
            # the user asked to add subtrees.  At the moment you can add them
284
            # specially through 'join --reference', which is perhaps
285
            # reasonable: adding a new reference is a special operation and
286
            # can have a special behaviour.  mbp 20070306
1713.1.11 by Robert Collins
refactor smart_add to pass around the parent inventory entry and use that, resulting in another 100bzrlib/inventory.py performance improvement, and making inventory writing the dominating factory in add. (Robert Collins)
287
            mutter("%r is a nested bzr tree", abspath)
70 by mbp at sourcefrog
Prepare for smart recursive add.
288
        else:
1757.2.7 by Robert Collins
Split out the recursive add and add of a single entry in add.py.
289
            __add_one(tree, inv, parent_ie, directory, kind, action)
290
            added.append(directory.raw_path)
87 by mbp at sourcefrog
- clean up smart_add code, and make it commit the inventory
291
1757.2.6 by Robert Collins
Steps towards a nicer smart add - unwind the conditional add logic - having parents not in the inventory was overly complicating the rest of the code.
292
        if kind == 'directory' and not sub_tree:
293
            if parent_ie is not None:
294
                # must be present:
295
                this_ie = parent_ie.children[directory.base_path]
296
            else:
297
                # without the parent ie, use the relatively slower inventory 
298
                # probing method
299
                this_id = inv.path2id(directory.raw_path)
300
                if this_id is None:
301
                    this_ie = None
1713.1.11 by Robert Collins
refactor smart_add to pass around the parent inventory entry and use that, resulting in another 100bzrlib/inventory.py performance improvement, and making inventory writing the dominating factory in add. (Robert Collins)
302
                else:
1757.2.6 by Robert Collins
Steps towards a nicer smart add - unwind the conditional add logic - having parents not in the inventory was overly complicating the rest of the code.
303
                    this_ie = inv[this_id]
1713.1.11 by Robert Collins
refactor smart_add to pass around the parent inventory entry and use that, resulting in another 100bzrlib/inventory.py performance improvement, and making inventory writing the dominating factory in add. (Robert Collins)
304
1910.10.1 by Andrew Bennetts
Sort os.listdir results in add.py.
305
            for subf in sorted(os.listdir(abspath)):
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
306
                # here we could use TreeDirectory rather than 
307
                # string concatenation.
1757.2.4 by Robert Collins
Teach file_kind about NoSuchFile, reducing duplicate code, and add user files before entering the main loop in smart_add.
308
                subp = bzrlib.osutils.pathjoin(directory.raw_path, subf)
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
309
                # TODO: is_control_filename is very slow. Make it faster. 
310
                # TreeDirectory.is_control_filename could also make this 
311
                # faster - its impossible for a non root dir to have a 
312
                # control file.
1534.5.5 by Robert Collins
Move is_control_file into WorkingTree.is_control_filename and test.
313
                if tree.is_control_filename(subp):
1185.31.4 by John Arbash Meinel
Fixing mutter() calls to not have to do string processing.
314
                    mutter("skip control directory %r", subp)
1757.2.6 by Robert Collins
Steps towards a nicer smart add - unwind the conditional add logic - having parents not in the inventory was overly complicating the rest of the code.
315
                elif subf in this_ie.children:
316
                    # recurse into this already versioned subdir.
317
                    dirs_to_add.append((FastPath(subp, subf), this_ie))
87 by mbp at sourcefrog
- clean up smart_add code, and make it commit the inventory
318
                else:
1757.2.5 by Robert Collins
De-dup the add list so we only walk subtrees once for add.
319
                    # user selection overrides ignoes
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
320
                    # ignore while selecting files - if we globbed in the
321
                    # outer loop we would ignore user files.
1185.46.8 by Aaron Bentley
bzr add reports ignored patterns.
322
                    ignore_glob = tree.is_ignored(subp)
323
                    if ignore_glob is not None:
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
324
                        # mutter("skip ignored sub-file %r", subp)
1830.3.4 by John Arbash Meinel
A couple no-op cleanups
325
                        ignored.setdefault(ignore_glob, []).append(subp)
1185.46.8 by Aaron Bentley
bzr add reports ignored patterns.
326
                    else:
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
327
                        #mutter("queue to add sub-file %r", subp)
1757.2.4 by Robert Collins
Teach file_kind about NoSuchFile, reducing duplicate code, and add user files before entering the main loop in smart_add.
328
                        dirs_to_add.append((FastPath(subp, subf), this_ie))
1185.46.8 by Aaron Bentley
bzr add reports ignored patterns.
329
1757.2.6 by Robert Collins
Steps towards a nicer smart add - unwind the conditional add logic - having parents not in the inventory was overly complicating the rest of the code.
330
    if len(added) > 0 and save:
1508.1.10 by Robert Collins
bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)
331
        tree._write_inventory(inv)
1185.46.8 by Aaron Bentley
bzr add reports ignored patterns.
332
    return added, ignored
1185.3.3 by Martin Pool
- patch from mpe to automatically add parent directories
333
1685.1.80 by Wouter van Heyst
more code cleanup
334
1757.2.7 by Robert Collins
Split out the recursive add and add of a single entry in add.py.
335
def __add_one_and_parent(tree, inv, parent_ie, path, kind, action):
1713.1.14 by Robert Collins
Review feedback.
336
    """Add a new entry to the inventory and automatically add unversioned parents.
337
338
    :param inv: Inventory which will receive the new entry.
339
    :param parent_ie: Parent inventory entry if known, or None.  If
2399.1.5 by John Arbash Meinel
Clean up add.py documentation.
340
        None, the parent is looked up by name and used if present, otherwise it
341
        is recursively added.
1713.1.14 by Robert Collins
Review feedback.
342
    :param kind: Kind of new entry (file, directory, etc)
343
    :param action: callback(inv, parent_ie, path, kind); return ignored.
2399.1.5 by John Arbash Meinel
Clean up add.py documentation.
344
    :return: A list of paths which have been added.
1713.1.14 by Robert Collins
Review feedback.
345
    """
1185.3.3 by Martin Pool
- patch from mpe to automatically add parent directories
346
    # Nothing to do if path is already versioned.
1508.1.10 by Robert Collins
bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)
347
    # This is safe from infinite recursion because the tree root is
1185.3.3 by Martin Pool
- patch from mpe to automatically add parent directories
348
    # always versioned.
1713.1.11 by Robert Collins
refactor smart_add to pass around the parent inventory entry and use that, resulting in another 100bzrlib/inventory.py performance improvement, and making inventory writing the dominating factory in add. (Robert Collins)
349
    if parent_ie is not None:
350
        # we have a parent ie already
351
        added = []
352
    else:
353
        # slower but does not need parent_ie
1757.2.2 by Robert Collins
Merge basename call eliminate for smart_add.
354
        if inv.has_filename(path.raw_path):
1713.1.11 by Robert Collins
refactor smart_add to pass around the parent inventory entry and use that, resulting in another 100bzrlib/inventory.py performance improvement, and making inventory writing the dominating factory in add. (Robert Collins)
355
            return []
1757.2.2 by Robert Collins
Merge basename call eliminate for smart_add.
356
        # its really not there : add the parent
357
        # note that the dirname use leads to some extra str copying etc but as
358
        # there are a limited number of dirs we can be nested under, it should
359
        # generally find it very fast and not recurse after that.
1757.2.7 by Robert Collins
Split out the recursive add and add of a single entry in add.py.
360
        added = __add_one_and_parent(tree, inv, None, FastPath(dirname(path.raw_path)), 'directory', action)
1757.2.2 by Robert Collins
Merge basename call eliminate for smart_add.
361
        parent_id = inv.path2id(dirname(path.raw_path))
1757.2.16 by Robert Collins
Review comments.
362
        parent_ie = inv[parent_id]
1757.2.7 by Robert Collins
Split out the recursive add and add of a single entry in add.py.
363
    __add_one(tree, inv, parent_ie, path, kind, action)
364
    return added + [path.raw_path]
365
366
2568.2.3 by Robert Collins
Fix WorkingTree(3).add to not reset the entire inventory but modify the existing one.
367
def __add_one(tree, inv, parent_ie, path, kind, file_id_callback):
1757.2.7 by Robert Collins
Split out the recursive add and add of a single entry in add.py.
368
    """Add a new entry to the inventory.
369
370
    :param inv: Inventory which will receive the new entry.
371
    :param parent_ie: Parent inventory entry.
372
    :param kind: Kind of new entry (file, directory, etc)
2568.2.3 by Robert Collins
Fix WorkingTree(3).add to not reset the entire inventory but modify the existing one.
373
    :param file_id_callback: callback(inv, parent_ie, path, kind); return a file_id 
1911.3.1 by John Arbash Meinel
Updated smart_add so that the AddAction can return a custom id.
374
        or None to generate a new file id
1757.2.7 by Robert Collins
Split out the recursive add and add of a single entry in add.py.
375
    :returns: None
376
    """
2568.2.3 by Robert Collins
Fix WorkingTree(3).add to not reset the entire inventory but modify the existing one.
377
    file_id = file_id_callback(inv, parent_ie, path, kind)
1911.3.1 by John Arbash Meinel
Updated smart_add so that the AddAction can return a custom id.
378
    entry = bzrlib.inventory.make_entry(kind, path.base_path, parent_ie.file_id,
379
                                        file_id=file_id)
1757.2.6 by Robert Collins
Steps towards a nicer smart add - unwind the conditional add logic - having parents not in the inventory was overly complicating the rest of the code.
380
    inv.add(entry)