~bzr-pqm/bzr/bzr.dev

70 by mbp at sourcefrog
Prepare for smart recursive add.
1
# Copyright (C) 2005 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
1185.85.12 by John Arbash Meinel
Refactoring AddAction to allow redirecting to an encoding file.
17
import sys
1185.1.53 by Robert Collins
raise a specific error on unsupported branches so that they can be distinguished from generic errors
18
from os.path import dirname
19
20
import bzrlib.errors as errors
1399.1.1 by Robert Collins
move checks for versionability of file kinds into InventoryEntry
21
from bzrlib.inventory import InventoryEntry
1128 by Martin Pool
- smart_add routine now doesn't print filenames directly, but rather
22
from bzrlib.trace import mutter, note, warning
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
23
from bzrlib.errors import NotBranchError
1508.1.10 by Robert Collins
bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)
24
import bzrlib.osutils
25
from bzrlib.workingtree import WorkingTree
70 by mbp at sourcefrog
Prepare for smart recursive add.
26
1685.1.80 by Wouter van Heyst
more code cleanup
27
686 by Martin Pool
- glob expand add arguments on win32
28
def glob_expand_for_win32(file_list):
1185.23.2 by Aaron Bentley
win32 glob expansion fix from Belchenko
29
    if not file_list:
30
        return
686 by Martin Pool
- glob expand add arguments on win32
31
    import glob
32
    expanded_file_list = []
33
    for possible_glob in file_list:
34
        glob_files = glob.glob(possible_glob)
35
       
36
        if glob_files == []:
37
            # special case to let the normal code path handle
38
            # files that do not exists
39
            expanded_file_list.append(possible_glob)
40
        else:
41
            expanded_file_list += glob_files
42
    return expanded_file_list
43
1128 by Martin Pool
- smart_add routine now doesn't print filenames directly, but rather
44
1092.1.29 by Robert Collins
break smart_add into smart_add and smart_add_branch which will accept a branch parameter
45
def _prepare_file_list(file_list):
46
    """Prepare a file list for use by smart_add_*."""
47
    if sys.platform == 'win32':
48
        file_list = glob_expand_for_win32(file_list)
49
    if not file_list:
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
50
        file_list = [u'.']
1092.1.29 by Robert Collins
break smart_add into smart_add and smart_add_branch which will accept a branch parameter
51
    file_list = list(file_list)
52
    return file_list
53
1159 by Martin Pool
- clean up parameters to smart_add and smart_add_branch
54
1185.85.12 by John Arbash Meinel
Refactoring AddAction to allow redirecting to an encoding file.
55
class AddAction(object):
56
    """A class which defines what action to take when adding a file."""
57
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.
58
    def __init__(self, to_file=None, should_print=None):
1185.85.12 by John Arbash Meinel
Refactoring AddAction to allow redirecting to an encoding file.
59
        self._to_file = to_file
60
        if to_file is None:
61
            self._to_file = sys.stdout
1685.1.69 by Wouter van Heyst
merge bzr.dev 1740
62
        self.should_print = False
1185.85.12 by John Arbash Meinel
Refactoring AddAction to allow redirecting to an encoding file.
63
        if should_print is not None:
64
            self.should_print = should_print
65
1757.2.15 by Robert Collins
Consolidate writes of adds to one write per file - drops encoding overhead by 1/3.
66
    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.
67
        """Add path to inventory.
68
69
        The default action does nothing.
70
71
        :param inv: The inventory we are working with.
1757.2.2 by Robert Collins
Merge basename call eliminate for smart_add.
72
        :param path: The FastPath being added
1185.85.12 by John Arbash Meinel
Refactoring AddAction to allow redirecting to an encoding file.
73
        :param kind: The kind of the object being added.
74
        """
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.
75
        if not self.should_print:
76
            return
1757.2.15 by Robert Collins
Consolidate writes of adds to one write per file - drops encoding overhead by 1/3.
77
        self._to_file.write('added %s\n' % _quote(path.raw_path))
1185.85.12 by John Arbash Meinel
Refactoring AddAction to allow redirecting to an encoding file.
78
79
80
# TODO: jam 20050105 These could be used for compatibility
81
#       however, they bind against the current stdout, not the
82
#       one which exists at the time they are called, so they
83
#       don't work for the test suite.
84
# 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.
85
add_action_add = AddAction()
86
add_action_null = add_action_add
87
add_action_add_and_print = AddAction(should_print=True)
88
add_action_print = add_action_add_and_print
89
90
91
def smart_add(file_list, recurse=True, action=None, save=True):
598 by Martin Pool
doc
92
    """Add files to version, optionally recursing into directories.
70 by mbp at sourcefrog
Prepare for smart recursive add.
93
94
    This is designed more towards DWIM for humans than API simplicity.
95
    For the specific behaviour see the help for cmd_add().
1159 by Martin Pool
- clean up parameters to smart_add and smart_add_branch
96
97
    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.
98
    Please see smart_add_tree for more detail.
70 by mbp at sourcefrog
Prepare for smart recursive add.
99
    """
1092.1.29 by Robert Collins
break smart_add into smart_add and smart_add_branch which will accept a branch parameter
100
    file_list = _prepare_file_list(file_list)
1508.1.10 by Robert Collins
bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)
101
    tree = WorkingTree.open_containing(file_list[0])[0]
1185.85.12 by John Arbash Meinel
Refactoring AddAction to allow redirecting to an encoding file.
102
    return smart_add_tree(tree, file_list, recurse, action=action)
103
104
1757.2.2 by Robert Collins
Merge basename call eliminate for smart_add.
105
class FastPath(object):
106
    """A path object with fast accessors for things like basename."""
107
108
    __slots__ = ['raw_path', 'base_path']
109
110
    def __init__(self, path, base_path=None):
111
        """Construct a FastPath from path."""
112
        if base_path is None:
113
            self.base_path = bzrlib.osutils.basename(path)
114
        else:
115
            self.base_path = base_path
116
        self.raw_path = path
117
118
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.
119
def smart_add_tree(tree, file_list, recurse=True, action=None, save=True):
1092.1.29 by Robert Collins
break smart_add into smart_add and smart_add_branch which will accept a branch parameter
120
    """Add files to version, optionally recursing into directories.
121
122
    This is designed more towards DWIM for humans than API simplicity.
123
    For the specific behaviour see the help for cmd_add().
1128 by Martin Pool
- smart_add routine now doesn't print filenames directly, but rather
124
1508.1.11 by Robert Collins
Documentation.
125
    This calls reporter with each (path, kind, file_id) of added files.
1159 by Martin Pool
- clean up parameters to smart_add and smart_add_branch
126
127
    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.
128
    
129
    :param save: Save the inventory after completing the adds. If False this
130
    provides dry-run functionality by doing the add and not saving the
131
    inventory.  Note that the modified inventory is left in place, allowing 
132
    further dry-run tasks to take place. To restore the original inventory
133
    call tree.read_working_inventory().
1092.1.29 by Robert Collins
break smart_add into smart_add and smart_add_branch which will accept a branch parameter
134
    """
1185.56.2 by Michael Ellerman
Raise NoSuchFile when someone tries to add a non-existant file.
135
    import os, errno
599 by Martin Pool
- better error reporting from smart_add
136
    from bzrlib.errors import BadFileKindError, ForbiddenFileError
1159 by Martin Pool
- clean up parameters to smart_add and smart_add_branch
137
    assert isinstance(recurse, bool)
1185.85.12 by John Arbash Meinel
Refactoring AddAction to allow redirecting to an encoding file.
138
    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.
139
        action = AddAction()
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
140
    
1713.1.14 by Robert Collins
Review feedback.
141
    prepared_list = _prepare_file_list(file_list)
142
    mutter("smart add of %r, originally %r", prepared_list, file_list)
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
143
    inv = tree.read_working_inventory()
1185.46.8 by Aaron Bentley
bzr add reports ignored patterns.
144
    added = []
145
    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.
146
    dirs_to_add = []
1757.2.5 by Robert Collins
De-dup the add list so we only walk subtrees once for add.
147
    user_dirs = set()
86 by mbp at sourcefrog
first cut at recursive add
148
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)
149
    # validate user file paths and convert all paths to tree 
150
    # relative : its cheaper to make a tree relative path an abspath
151
    # than to convert an abspath to tree relative.
1713.1.14 by Robert Collins
Review feedback.
152
    for filepath in prepared_list:
1757.2.2 by Robert Collins
Merge basename call eliminate for smart_add.
153
        rf = FastPath(tree.relpath(filepath))
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
154
        # validate user parameters. Our recursive code avoids adding new files
155
        # that need such validation 
1757.2.2 by Robert Collins
Merge basename call eliminate for smart_add.
156
        if tree.is_control_filename(rf.raw_path):
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
157
            raise ForbiddenFileError('cannot add control file %s' % filepath)
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.
158
        
159
        abspath = tree.abspath(rf.raw_path)
160
        kind = bzrlib.osutils.file_kind(abspath)
161
        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.
162
            # schedule the dir for scanning
1757.2.5 by Robert Collins
De-dup the add list so we only walk subtrees once for add.
163
            user_dirs.add(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.
164
        else:
165
            if not InventoryEntry.versionable_kind(kind):
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)
166
                raise BadFileKindError("cannot add %s of type %s" % (abspath, 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.
167
        # ensure the named path is added, so that ignore rules in the later directory
168
        # walk dont skip it.
169
        # we dont have a parent ie known yet.: use the relatively slower inventory 
170
        # probing method
171
        versioned = inv.has_filename(rf.raw_path)
172
        if versioned:
173
            continue
1757.2.7 by Robert Collins
Split out the recursive add and add of a single entry in add.py.
174
        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.
175
176
    if not recurse:
177
        # no need to walk any directories at all.
178
        if len(added) > 0 and save:
179
            tree._write_inventory(inv)
180
        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.
181
1757.2.5 by Robert Collins
De-dup the add list so we only walk subtrees once for add.
182
    # only walk the minimal parents needed: we have user_dirs to override
183
    # ignores.
184
    prev_dir = None
185
    for path in sorted(user_dirs):
186
        if (prev_dir is None or not
187
            bzrlib.osutils.is_inside_or_parent_of_any([prev_dir], path)):
188
            dirs_to_add.append((rf, None))
189
        prev_dir = path
190
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.
191
    # this will eventually be *just* directories, right now it starts off with 
192
    # just directories.
193
    for directory, parent_ie in dirs_to_add:
194
        # directory is tree-relative
195
        abspath = tree.abspath(directory.raw_path)
196
1757.2.7 by Robert Collins
Split out the recursive add and add of a single entry in add.py.
197
        # get the contents of this directory.
198
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.
199
        # find the kind of the path being added.
200
        kind = bzrlib.osutils.file_kind(abspath)
201
202
        if not InventoryEntry.versionable_kind(kind):
203
            warning("skipping %s (can't add file of kind '%s')", abspath, kind)
204
            continue
426 by Martin Pool
- Skip symlinks during recursive add (path from aaron)
205
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)
206
        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.
207
            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)
208
        else:
209
            # without the parent ie, use the relatively slower inventory 
210
            # 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.
211
            versioned = inv.has_filename(directory.raw_path)
86 by mbp at sourcefrog
first cut at recursive add
212
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
213
        if kind == 'directory':
214
            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)
215
                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
216
                sub_tree = True
217
            except NotBranchError:
218
                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
219
            except errors.UnsupportedFormatError:
220
                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
221
        else:
222
            sub_tree = False
223
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.
224
        if directory.raw_path == '':
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
225
            # 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
226
            sub_tree = False
91 by mbp at sourcefrog
special handling of root directory for recursive add
227
        elif versioned:
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
228
            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)
229
            # 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
230
        elif sub_tree:
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)
231
            mutter("%r is a nested bzr tree", abspath)
70 by mbp at sourcefrog
Prepare for smart recursive add.
232
        else:
1757.2.7 by Robert Collins
Split out the recursive add and add of a single entry in add.py.
233
            __add_one(tree, inv, parent_ie, directory, kind, action)
234
            added.append(directory.raw_path)
87 by mbp at sourcefrog
- clean up smart_add code, and make it commit the inventory
235
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.
236
        if kind == 'directory' and not sub_tree:
237
            if parent_ie is not None:
238
                # must be present:
239
                this_ie = parent_ie.children[directory.base_path]
240
            else:
241
                # without the parent ie, use the relatively slower inventory 
242
                # probing method
243
                this_id = inv.path2id(directory.raw_path)
244
                if this_id is None:
245
                    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)
246
                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.
247
                    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)
248
249
            for subf in os.listdir(abspath):
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
250
                # here we could use TreeDirectory rather than 
251
                # 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.
252
                subp = bzrlib.osutils.pathjoin(directory.raw_path, subf)
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
253
                # TODO: is_control_filename is very slow. Make it faster. 
254
                # TreeDirectory.is_control_filename could also make this 
255
                # faster - its impossible for a non root dir to have a 
256
                # control file.
1534.5.5 by Robert Collins
Move is_control_file into WorkingTree.is_control_filename and test.
257
                if tree.is_control_filename(subp):
1185.31.4 by John Arbash Meinel
Fixing mutter() calls to not have to do string processing.
258
                    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.
259
                elif subf in this_ie.children:
260
                    # recurse into this already versioned subdir.
261
                    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
262
                else:
1757.2.5 by Robert Collins
De-dup the add list so we only walk subtrees once for add.
263
                    # user selection overrides ignoes
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
264
                    # ignore while selecting files - if we globbed in the
265
                    # outer loop we would ignore user files.
1185.46.8 by Aaron Bentley
bzr add reports ignored patterns.
266
                    ignore_glob = tree.is_ignored(subp)
267
                    if ignore_glob is not None:
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
268
                        # mutter("skip ignored sub-file %r", subp)
1185.46.8 by Aaron Bentley
bzr add reports ignored patterns.
269
                        if ignore_glob not in ignored:
270
                            ignored[ignore_glob] = []
271
                        ignored[ignore_glob].append(subp)
272
                    else:
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
273
                        #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.
274
                        dirs_to_add.append((FastPath(subp, subf), this_ie))
1185.46.8 by Aaron Bentley
bzr add reports ignored patterns.
275
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.
276
    if len(added) > 0 and save:
1508.1.10 by Robert Collins
bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)
277
        tree._write_inventory(inv)
1185.46.8 by Aaron Bentley
bzr add reports ignored patterns.
278
    return added, ignored
1185.3.3 by Martin Pool
- patch from mpe to automatically add parent directories
279
1685.1.80 by Wouter van Heyst
more code cleanup
280
1757.2.7 by Robert Collins
Split out the recursive add and add of a single entry in add.py.
281
def __add_one_and_parent(tree, inv, parent_ie, path, kind, action):
1713.1.14 by Robert Collins
Review feedback.
282
    """Add a new entry to the inventory and automatically add unversioned parents.
283
284
    :param inv: Inventory which will receive the new entry.
285
    :param parent_ie: Parent inventory entry if known, or None.  If
286
    None, the parent is looked up by name and used if present, otherwise
287
    it is recursively added.
288
    :param kind: Kind of new entry (file, directory, etc)
289
    :param action: callback(inv, parent_ie, path, kind); return ignored.
290
    :returns: A list of paths which have been added.
291
    """
1185.3.3 by Martin Pool
- patch from mpe to automatically add parent directories
292
    # 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)
293
    # 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
294
    # 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)
295
    if parent_ie is not None:
296
        # we have a parent ie already
297
        added = []
298
    else:
299
        # slower but does not need parent_ie
1757.2.2 by Robert Collins
Merge basename call eliminate for smart_add.
300
        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)
301
            return []
1757.2.2 by Robert Collins
Merge basename call eliminate for smart_add.
302
        # its really not there : add the parent
303
        # note that the dirname use leads to some extra str copying etc but as
304
        # there are a limited number of dirs we can be nested under, it should
305
        # 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.
306
        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.
307
        parent_id = inv.path2id(dirname(path.raw_path))
1757.2.16 by Robert Collins
Review comments.
308
        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.
309
    __add_one(tree, inv, parent_ie, path, kind, action)
310
    return added + [path.raw_path]
311
312
313
def __add_one(tree, inv, parent_ie, path, kind, action):
314
    """Add a new entry to the inventory.
315
316
    :param inv: Inventory which will receive the new entry.
317
    :param parent_ie: Parent inventory entry.
318
    :param kind: Kind of new entry (file, directory, etc)
319
    :param action: callback(inv, parent_ie, path, kind); return ignored.
320
    :returns: None
321
    """
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)
322
    action(inv, parent_ie, path, kind)
1757.2.7 by Robert Collins
Split out the recursive add and add of a single entry in add.py.
323
    entry = bzrlib.inventory.make_entry(kind, path.base_path, parent_ie.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.
324
    inv.add(entry)