/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
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
1685.1.69 by Wouter van Heyst
merge bzr.dev 1740
66
    def __call__(self, inv, parent_ie, path, kind):
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
1185.85.12 by John Arbash Meinel
Refactoring AddAction to allow redirecting to an encoding file.
77
        self._to_file.write('added ')
1757.2.2 by Robert Collins
Merge basename call eliminate for smart_add.
78
        self._to_file.write(bzrlib.osutils.quotefn(path.raw_path))
1185.85.12 by John Arbash Meinel
Refactoring AddAction to allow redirecting to an encoding file.
79
        self._to_file.write('\n')
80
81
82
# TODO: jam 20050105 These could be used for compatibility
83
#       however, they bind against the current stdout, not the
84
#       one which exists at the time they are called, so they
85
#       don't work for the test suite.
86
# 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.
87
add_action_add = AddAction()
88
add_action_null = add_action_add
89
add_action_add_and_print = AddAction(should_print=True)
90
add_action_print = add_action_add_and_print
91
92
93
def smart_add(file_list, recurse=True, action=None, save=True):
598 by Martin Pool
doc
94
    """Add files to version, optionally recursing into directories.
70 by mbp at sourcefrog
Prepare for smart recursive add.
95
96
    This is designed more towards DWIM for humans than API simplicity.
97
    For the specific behaviour see the help for cmd_add().
1159 by Martin Pool
- clean up parameters to smart_add and smart_add_branch
98
99
    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.
100
    Please see smart_add_tree for more detail.
70 by mbp at sourcefrog
Prepare for smart recursive add.
101
    """
1092.1.29 by Robert Collins
break smart_add into smart_add and smart_add_branch which will accept a branch parameter
102
    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)
103
    tree = WorkingTree.open_containing(file_list[0])[0]
1185.85.12 by John Arbash Meinel
Refactoring AddAction to allow redirecting to an encoding file.
104
    return smart_add_tree(tree, file_list, recurse, action=action)
105
106
1757.2.2 by Robert Collins
Merge basename call eliminate for smart_add.
107
class FastPath(object):
108
    """A path object with fast accessors for things like basename."""
109
110
    __slots__ = ['raw_path', 'base_path']
111
112
    def __init__(self, path, base_path=None):
113
        """Construct a FastPath from path."""
114
        if base_path is None:
115
            self.base_path = bzrlib.osutils.basename(path)
116
        else:
117
            self.base_path = base_path
118
        self.raw_path = path
119
120
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.
121
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
122
    """Add files to version, optionally recursing into directories.
123
124
    This is designed more towards DWIM for humans than API simplicity.
125
    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
126
1508.1.11 by Robert Collins
Documentation.
127
    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
128
129
    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.
130
    
131
    :param save: Save the inventory after completing the adds. If False this
132
    provides dry-run functionality by doing the add and not saving the
133
    inventory.  Note that the modified inventory is left in place, allowing 
134
    further dry-run tasks to take place. To restore the original inventory
135
    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
136
    """
1185.56.2 by Michael Ellerman
Raise NoSuchFile when someone tries to add a non-existant file.
137
    import os, errno
599 by Martin Pool
- better error reporting from smart_add
138
    from bzrlib.errors import BadFileKindError, ForbiddenFileError
1159 by Martin Pool
- clean up parameters to smart_add and smart_add_branch
139
    assert isinstance(recurse, bool)
1185.85.12 by John Arbash Meinel
Refactoring AddAction to allow redirecting to an encoding file.
140
    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.
141
        action = AddAction()
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
142
    
1713.1.14 by Robert Collins
Review feedback.
143
    prepared_list = _prepare_file_list(file_list)
144
    mutter("smart add of %r, originally %r", prepared_list, file_list)
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
145
    inv = tree.read_working_inventory()
1185.46.8 by Aaron Bentley
bzr add reports ignored patterns.
146
    added = []
147
    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.
148
    dirs_to_add = []
1757.2.5 by Robert Collins
De-dup the add list so we only walk subtrees once for add.
149
    user_dirs = set()
86 by mbp at sourcefrog
first cut at recursive add
150
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)
151
    # validate user file paths and convert all paths to tree 
152
    # relative : its cheaper to make a tree relative path an abspath
153
    # than to convert an abspath to tree relative.
1713.1.14 by Robert Collins
Review feedback.
154
    for filepath in prepared_list:
1757.2.2 by Robert Collins
Merge basename call eliminate for smart_add.
155
        rf = FastPath(tree.relpath(filepath))
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
156
        # validate user parameters. Our recursive code avoids adding new files
157
        # that need such validation 
1757.2.2 by Robert Collins
Merge basename call eliminate for smart_add.
158
        if tree.is_control_filename(rf.raw_path):
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
159
            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.
160
        
161
        abspath = tree.abspath(rf.raw_path)
162
        kind = bzrlib.osutils.file_kind(abspath)
163
        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.
164
            # schedule the dir for scanning
1757.2.5 by Robert Collins
De-dup the add list so we only walk subtrees once for add.
165
            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.
166
        else:
167
            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)
168
                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.
169
        # ensure the named path is added, so that ignore rules in the later directory
170
        # walk dont skip it.
171
        # we dont have a parent ie known yet.: use the relatively slower inventory 
172
        # probing method
173
        versioned = inv.has_filename(rf.raw_path)
174
        if versioned:
175
            continue
176
        added.extend(__add_one(tree, inv, None, rf, kind, action))
177
178
    if not recurse:
179
        # no need to walk any directories at all.
180
        if len(added) > 0 and save:
181
            tree._write_inventory(inv)
182
        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.
183
1757.2.5 by Robert Collins
De-dup the add list so we only walk subtrees once for add.
184
    # only walk the minimal parents needed: we have user_dirs to override
185
    # ignores.
186
    prev_dir = None
187
    for path in sorted(user_dirs):
188
        if (prev_dir is None or not
189
            bzrlib.osutils.is_inside_or_parent_of_any([prev_dir], path)):
190
            dirs_to_add.append((rf, None))
191
        prev_dir = path
192
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.
193
    # this will eventually be *just* directories, right now it starts off with 
194
    # just directories.
195
    for directory, parent_ie in dirs_to_add:
196
        # directory is tree-relative
197
        abspath = tree.abspath(directory.raw_path)
198
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.4 by Robert Collins
Teach file_kind about NoSuchFile, reducing duplicate code, and add user files before entering the main loop in smart_add.
233
            added.extend(__add_one(tree, inv, parent_ie, directory, kind, action))
87 by mbp at sourcefrog
- clean up smart_add code, and make it commit the inventory
234
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.
235
        if kind == 'directory' and not sub_tree:
236
            if parent_ie is not None:
237
                # must be present:
238
                this_ie = parent_ie.children[directory.base_path]
239
            else:
240
                # without the parent ie, use the relatively slower inventory 
241
                # probing method
242
                this_id = inv.path2id(directory.raw_path)
243
                if this_id is None:
244
                    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)
245
                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.
246
                    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)
247
248
            for subf in os.listdir(abspath):
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
249
                # here we could use TreeDirectory rather than 
250
                # 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.
251
                subp = bzrlib.osutils.pathjoin(directory.raw_path, subf)
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
252
                # TODO: is_control_filename is very slow. Make it faster. 
253
                # TreeDirectory.is_control_filename could also make this 
254
                # faster - its impossible for a non root dir to have a 
255
                # control file.
1534.5.5 by Robert Collins
Move is_control_file into WorkingTree.is_control_filename and test.
256
                if tree.is_control_filename(subp):
1185.31.4 by John Arbash Meinel
Fixing mutter() calls to not have to do string processing.
257
                    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.
258
                elif subf in this_ie.children:
259
                    # recurse into this already versioned subdir.
260
                    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
261
                else:
1757.2.5 by Robert Collins
De-dup the add list so we only walk subtrees once for add.
262
                    # user selection overrides ignoes
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
263
                    # ignore while selecting files - if we globbed in the
264
                    # outer loop we would ignore user files.
1185.46.8 by Aaron Bentley
bzr add reports ignored patterns.
265
                    ignore_glob = tree.is_ignored(subp)
266
                    if ignore_glob is not None:
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
267
                        # mutter("skip ignored sub-file %r", subp)
1185.46.8 by Aaron Bentley
bzr add reports ignored patterns.
268
                        if ignore_glob not in ignored:
269
                            ignored[ignore_glob] = []
270
                        ignored[ignore_glob].append(subp)
271
                    else:
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
272
                        #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.
273
                        dirs_to_add.append((FastPath(subp, subf), this_ie))
1185.46.8 by Aaron Bentley
bzr add reports ignored patterns.
274
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.
275
    if len(added) > 0 and save:
1508.1.10 by Robert Collins
bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)
276
        tree._write_inventory(inv)
1185.46.8 by Aaron Bentley
bzr add reports ignored patterns.
277
    return added, ignored
1185.3.3 by Martin Pool
- patch from mpe to automatically add parent directories
278
1685.1.80 by Wouter van Heyst
more code cleanup
279
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)
280
def __add_one(tree, inv, parent_ie, path, kind, action):
1713.1.14 by Robert Collins
Review feedback.
281
    """Add a new entry to the inventory and automatically add unversioned parents.
282
283
    Actual adding of the entry is delegated to the action callback.
284
285
    :param inv: Inventory which will receive the new entry.
286
    :param parent_ie: Parent inventory entry if known, or None.  If
287
    None, the parent is looked up by name and used if present, otherwise
288
    it is recursively added.
289
    :param kind: Kind of new entry (file, directory, etc)
290
    :param action: callback(inv, parent_ie, path, kind); return ignored.
291
    :returns: A list of paths which have been added.
292
    """
1185.3.3 by Martin Pool
- patch from mpe to automatically add parent directories
293
294
    # 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)
295
    # 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
296
    # 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)
297
    if parent_ie is not None:
298
        # we have a parent ie already
299
        added = []
300
    else:
301
        # slower but does not need parent_ie
1757.2.2 by Robert Collins
Merge basename call eliminate for smart_add.
302
        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)
303
            return []
1757.2.2 by Robert Collins
Merge basename call eliminate for smart_add.
304
        # its really not there : add the parent
305
        # note that the dirname use leads to some extra str copying etc but as
306
        # there are a limited number of dirs we can be nested under, it should
307
        # generally find it very fast and not recurse after that.
1757.2.3 by Robert Collins
Get add tests passing.
308
        added = __add_one(tree, inv, None, FastPath(dirname(path.raw_path)), 'directory', action)
1757.2.2 by Robert Collins
Merge basename call eliminate for smart_add.
309
        parent_id = inv.path2id(dirname(path.raw_path))
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.
310
        if parent_id is None:
1757.2.2 by Robert Collins
Merge basename call eliminate for smart_add.
311
            parent_ie = inv[inv.path2id(dirname(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)
312
        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.
313
            parent_ie = inv[parent_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)
314
    action(inv, parent_ie, path, 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.
315
    #if parent_ie is not None:
316
    entry = bzrlib.inventory.make_entry(
317
        kind, bzrlib.osutils.basename(path.raw_path),  parent_ie.file_id)
318
    inv.add(entry)
319
    #else:
320
    #    entry = inv.add_path(path.raw_path, kind=kind)
321
1185.3.3 by Martin Pool
- patch from mpe to automatically add parent directories
322
1757.2.3 by Robert Collins
Get add tests passing.
323
    return added + [path.raw_path]