~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
        """
1911.3.1 by John Arbash Meinel
Updated smart_add so that the AddAction can return a custom id.
77
        if self.should_print:
78
            self._to_file.write('added %s\n' % _quote(path.raw_path))
79
        return None
1185.85.12 by John Arbash Meinel
Refactoring AddAction to allow redirecting to an encoding file.
80
81
1911.3.2 by John Arbash Meinel
Adding the AddFromBaseAction, which tries to reuse file ids from another tree
82
class AddFromBaseAction(AddAction):
83
    """This class will try to extract file ids from another tree."""
84
85
    def __init__(self, base_tree, base_path, to_file=None, should_print=None):
86
        super(AddFromBaseAction, self).__init__(to_file=to_file,
87
                                                should_print=should_print)
88
        self.base_tree = base_tree
89
        self.base_path = base_path
90
91
    def __call__(self, inv, parent_ie, path, kind):
92
        # Place the parent call
93
        # Now check to see if we can extract an id for this file
94
        file_id, base_path = self._get_base_file_id(path, parent_ie)
95
        if file_id is not None:
96
            if self.should_print:
97
                self._to_file.write('added %s w/ file id from %s\n'
98
                                    % (path.raw_path, base_path))
99
        else:
100
            # we aren't doing anything special, so let the default
101
            # reporter happen
102
            file_id = super(AddFromBaseAction, self).__call__(
103
                        inv, parent_ie, path, kind)
104
        return file_id
105
106
    def _get_base_file_id(self, path, parent_ie):
107
        """Look for a file id in the base branch.
108
109
        First, if the base tree has the parent directory,
110
        we look for a file with the same name in that directory.
111
        Else, we look for an entry in the base tree with the same path.
112
        """
113
114
        if (parent_ie.file_id in self.base_tree):
115
            base_parent_ie = self.base_tree.inventory[parent_ie.file_id]
116
            base_child_ie = base_parent_ie.children.get(path.base_path)
117
            if base_child_ie is not None:
118
                return (base_child_ie.file_id,
119
                        self.base_tree.id2path(base_child_ie.file_id))
120
        full_base_path = bzrlib.osutils.pathjoin(self.base_path, path.raw_path)
121
        # This may return None, but it is our last attempt
122
        return self.base_tree.path2id(full_base_path), full_base_path
123
124
1185.85.12 by John Arbash Meinel
Refactoring AddAction to allow redirecting to an encoding file.
125
# TODO: jam 20050105 These could be used for compatibility
126
#       however, they bind against the current stdout, not the
127
#       one which exists at the time they are called, so they
128
#       don't work for the test suite.
129
# 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.
130
add_action_add = AddAction()
131
add_action_null = add_action_add
132
add_action_add_and_print = AddAction(should_print=True)
133
add_action_print = add_action_add_and_print
134
135
136
def smart_add(file_list, recurse=True, action=None, save=True):
598 by Martin Pool
doc
137
    """Add files to version, optionally recursing into directories.
70 by mbp at sourcefrog
Prepare for smart recursive add.
138
139
    This is designed more towards DWIM for humans than API simplicity.
140
    For the specific behaviour see the help for cmd_add().
1159 by Martin Pool
- clean up parameters to smart_add and smart_add_branch
141
142
    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.
143
    Please see smart_add_tree for more detail.
70 by mbp at sourcefrog
Prepare for smart recursive add.
144
    """
1092.1.29 by Robert Collins
break smart_add into smart_add and smart_add_branch which will accept a branch parameter
145
    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)
146
    tree = WorkingTree.open_containing(file_list[0])[0]
1930.1.2 by John Arbash Meinel
Alexander Belchenko: Fix add --dry-run
147
    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.
148
149
1757.2.2 by Robert Collins
Merge basename call eliminate for smart_add.
150
class FastPath(object):
151
    """A path object with fast accessors for things like basename."""
152
153
    __slots__ = ['raw_path', 'base_path']
154
155
    def __init__(self, path, base_path=None):
156
        """Construct a FastPath from path."""
157
        if base_path is None:
158
            self.base_path = bzrlib.osutils.basename(path)
159
        else:
160
            self.base_path = base_path
161
        self.raw_path = path
162
1850.2.1 by John Arbash Meinel
Fix bug #52578, smart-add wasn't recursing all supplied directories.
163
    def __cmp__(self, other):
164
        return cmp(self.raw_path, other.raw_path)
165
166
    def __hash__(self):
167
        return hash(self.raw_path)
168
1757.2.2 by Robert Collins
Merge basename call eliminate for smart_add.
169
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.
170
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
171
    """Add files to version, optionally recursing into directories.
172
173
    This is designed more towards DWIM for humans than API simplicity.
174
    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
175
1508.1.11 by Robert Collins
Documentation.
176
    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
177
178
    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.
179
    
180
    :param save: Save the inventory after completing the adds. If False this
181
    provides dry-run functionality by doing the add and not saving the
182
    inventory.  Note that the modified inventory is left in place, allowing 
183
    further dry-run tasks to take place. To restore the original inventory
184
    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
185
    """
1159 by Martin Pool
- clean up parameters to smart_add and smart_add_branch
186
    assert isinstance(recurse, bool)
1185.85.12 by John Arbash Meinel
Refactoring AddAction to allow redirecting to an encoding file.
187
    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.
188
        action = AddAction()
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
189
    
1713.1.14 by Robert Collins
Review feedback.
190
    prepared_list = _prepare_file_list(file_list)
191
    mutter("smart add of %r, originally %r", prepared_list, file_list)
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
192
    inv = tree.read_working_inventory()
1185.46.8 by Aaron Bentley
bzr add reports ignored patterns.
193
    added = []
194
    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.
195
    dirs_to_add = []
1757.2.5 by Robert Collins
De-dup the add list so we only walk subtrees once for add.
196
    user_dirs = set()
86 by mbp at sourcefrog
first cut at recursive add
197
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)
198
    # validate user file paths and convert all paths to tree 
199
    # relative : its cheaper to make a tree relative path an abspath
200
    # than to convert an abspath to tree relative.
1713.1.14 by Robert Collins
Review feedback.
201
    for filepath in prepared_list:
1757.2.2 by Robert Collins
Merge basename call eliminate for smart_add.
202
        rf = FastPath(tree.relpath(filepath))
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
203
        # validate user parameters. Our recursive code avoids adding new files
204
        # that need such validation 
1757.2.2 by Robert Collins
Merge basename call eliminate for smart_add.
205
        if tree.is_control_filename(rf.raw_path):
1773.4.2 by Martin Pool
Cleanup of imports; undeprecate all_revision_ids()
206
            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.
207
        
208
        abspath = tree.abspath(rf.raw_path)
209
        kind = bzrlib.osutils.file_kind(abspath)
210
        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.
211
            # schedule the dir for scanning
1850.2.1 by John Arbash Meinel
Fix bug #52578, smart-add wasn't recursing all supplied directories.
212
            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.
213
        else:
214
            if not InventoryEntry.versionable_kind(kind):
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
215
                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.
216
        # ensure the named path is added, so that ignore rules in the later directory
217
        # walk dont skip it.
218
        # we dont have a parent ie known yet.: use the relatively slower inventory 
219
        # probing method
220
        versioned = inv.has_filename(rf.raw_path)
221
        if versioned:
222
            continue
1757.2.7 by Robert Collins
Split out the recursive add and add of a single entry in add.py.
223
        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.
224
225
    if not recurse:
226
        # no need to walk any directories at all.
227
        if len(added) > 0 and save:
228
            tree._write_inventory(inv)
229
        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.
230
1757.2.5 by Robert Collins
De-dup the add list so we only walk subtrees once for add.
231
    # only walk the minimal parents needed: we have user_dirs to override
232
    # ignores.
233
    prev_dir = None
1850.2.1 by John Arbash Meinel
Fix bug #52578, smart-add wasn't recursing all supplied directories.
234
235
    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.
236
    for path in sorted(user_dirs):
1850.2.1 by John Arbash Meinel
Fix bug #52578, smart-add wasn't recursing all supplied directories.
237
        if (prev_dir is None or not is_inside([prev_dir], path.raw_path)):
238
            dirs_to_add.append((path, None))
239
        prev_dir = path.raw_path
1757.2.5 by Robert Collins
De-dup the add list so we only walk subtrees once for add.
240
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.
241
    # this will eventually be *just* directories, right now it starts off with 
242
    # just directories.
243
    for directory, parent_ie in dirs_to_add:
244
        # directory is tree-relative
245
        abspath = tree.abspath(directory.raw_path)
246
1757.2.7 by Robert Collins
Split out the recursive add and add of a single entry in add.py.
247
        # get the contents of this directory.
248
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.
249
        # find the kind of the path being added.
250
        kind = bzrlib.osutils.file_kind(abspath)
251
252
        if not InventoryEntry.versionable_kind(kind):
253
            warning("skipping %s (can't add file of kind '%s')", abspath, kind)
254
            continue
426 by Martin Pool
- Skip symlinks during recursive add (path from aaron)
255
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)
256
        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.
257
            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)
258
        else:
259
            # without the parent ie, use the relatively slower inventory 
260
            # 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.
261
            versioned = inv.has_filename(directory.raw_path)
86 by mbp at sourcefrog
first cut at recursive add
262
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
263
        if kind == 'directory':
264
            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)
265
                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
266
                sub_tree = True
267
            except NotBranchError:
268
                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
269
            except errors.UnsupportedFormatError:
270
                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
271
        else:
272
            sub_tree = False
273
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
        if directory.raw_path == '':
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
275
            # 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
276
            sub_tree = False
91 by mbp at sourcefrog
special handling of root directory for recursive add
277
        elif versioned:
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
278
            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)
279
            # 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
280
        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)
281
            mutter("%r is a nested bzr tree", abspath)
70 by mbp at sourcefrog
Prepare for smart recursive add.
282
        else:
1757.2.7 by Robert Collins
Split out the recursive add and add of a single entry in add.py.
283
            __add_one(tree, inv, parent_ie, directory, kind, action)
284
            added.append(directory.raw_path)
87 by mbp at sourcefrog
- clean up smart_add code, and make it commit the inventory
285
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.
286
        if kind == 'directory' and not sub_tree:
287
            if parent_ie is not None:
288
                # must be present:
289
                this_ie = parent_ie.children[directory.base_path]
290
            else:
291
                # without the parent ie, use the relatively slower inventory 
292
                # probing method
293
                this_id = inv.path2id(directory.raw_path)
294
                if this_id is None:
295
                    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)
296
                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.
297
                    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)
298
1910.10.1 by Andrew Bennetts
Sort os.listdir results in add.py.
299
            for subf in sorted(os.listdir(abspath)):
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
300
                # here we could use TreeDirectory rather than 
301
                # 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.
302
                subp = bzrlib.osutils.pathjoin(directory.raw_path, subf)
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
303
                # TODO: is_control_filename is very slow. Make it faster. 
304
                # TreeDirectory.is_control_filename could also make this 
305
                # faster - its impossible for a non root dir to have a 
306
                # control file.
1534.5.5 by Robert Collins
Move is_control_file into WorkingTree.is_control_filename and test.
307
                if tree.is_control_filename(subp):
1185.31.4 by John Arbash Meinel
Fixing mutter() calls to not have to do string processing.
308
                    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.
309
                elif subf in this_ie.children:
310
                    # recurse into this already versioned subdir.
311
                    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
312
                else:
1757.2.5 by Robert Collins
De-dup the add list so we only walk subtrees once for add.
313
                    # user selection overrides ignoes
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
314
                    # ignore while selecting files - if we globbed in the
315
                    # outer loop we would ignore user files.
1185.46.8 by Aaron Bentley
bzr add reports ignored patterns.
316
                    ignore_glob = tree.is_ignored(subp)
317
                    if ignore_glob is not None:
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
318
                        # mutter("skip ignored sub-file %r", subp)
1830.3.4 by John Arbash Meinel
A couple no-op cleanups
319
                        ignored.setdefault(ignore_glob, []).append(subp)
1185.46.8 by Aaron Bentley
bzr add reports ignored patterns.
320
                    else:
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
321
                        #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.
322
                        dirs_to_add.append((FastPath(subp, subf), this_ie))
1185.46.8 by Aaron Bentley
bzr add reports ignored patterns.
323
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
    if len(added) > 0 and save:
1508.1.10 by Robert Collins
bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)
325
        tree._write_inventory(inv)
1185.46.8 by Aaron Bentley
bzr add reports ignored patterns.
326
    return added, ignored
1185.3.3 by Martin Pool
- patch from mpe to automatically add parent directories
327
1685.1.80 by Wouter van Heyst
more code cleanup
328
1757.2.7 by Robert Collins
Split out the recursive add and add of a single entry in add.py.
329
def __add_one_and_parent(tree, inv, parent_ie, path, kind, action):
1713.1.14 by Robert Collins
Review feedback.
330
    """Add a new entry to the inventory and automatically add unversioned parents.
331
332
    :param inv: Inventory which will receive the new entry.
333
    :param parent_ie: Parent inventory entry if known, or None.  If
334
    None, the parent is looked up by name and used if present, otherwise
335
    it is recursively added.
336
    :param kind: Kind of new entry (file, directory, etc)
337
    :param action: callback(inv, parent_ie, path, kind); return ignored.
338
    :returns: A list of paths which have been added.
339
    """
1185.3.3 by Martin Pool
- patch from mpe to automatically add parent directories
340
    # 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)
341
    # 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
342
    # 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)
343
    if parent_ie is not None:
344
        # we have a parent ie already
345
        added = []
346
    else:
347
        # slower but does not need parent_ie
1757.2.2 by Robert Collins
Merge basename call eliminate for smart_add.
348
        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)
349
            return []
1757.2.2 by Robert Collins
Merge basename call eliminate for smart_add.
350
        # its really not there : add the parent
351
        # note that the dirname use leads to some extra str copying etc but as
352
        # there are a limited number of dirs we can be nested under, it should
353
        # 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.
354
        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.
355
        parent_id = inv.path2id(dirname(path.raw_path))
1757.2.16 by Robert Collins
Review comments.
356
        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.
357
    __add_one(tree, inv, parent_ie, path, kind, action)
358
    return added + [path.raw_path]
359
360
361
def __add_one(tree, inv, parent_ie, path, kind, action):
362
    """Add a new entry to the inventory.
363
364
    :param inv: Inventory which will receive the new entry.
365
    :param parent_ie: Parent inventory entry.
366
    :param kind: Kind of new entry (file, directory, etc)
1911.3.1 by John Arbash Meinel
Updated smart_add so that the AddAction can return a custom id.
367
    :param action: callback(inv, parent_ie, path, kind); return a file_id 
368
        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.
369
    :returns: None
370
    """
1911.3.1 by John Arbash Meinel
Updated smart_add so that the AddAction can return a custom id.
371
    file_id = action(inv, parent_ie, path, kind)
372
    entry = bzrlib.inventory.make_entry(kind, path.base_path, parent_ie.file_id,
373
                                        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.
374
    inv.add(entry)