~bzr-pqm/bzr/bzr.dev

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