~bzr-pqm/bzr/bzr.dev

70 by mbp at sourcefrog
Prepare for smart recursive add.
1
# Copyright (C) 2005 Canonical Ltd
2
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.
7
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.
12
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.1.53 by Robert Collins
raise a specific error on unsupported branches so that they can be distinguished from generic errors
17
from os.path import dirname
18
19
import bzrlib.errors as errors
1399.1.1 by Robert Collins
move checks for versionability of file kinds into InventoryEntry
20
from bzrlib.inventory import InventoryEntry
1128 by Martin Pool
- smart_add routine now doesn't print filenames directly, but rather
21
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
22
from bzrlib.errors import NotBranchError
1508.1.10 by Robert Collins
bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)
23
import bzrlib.osutils
24
from bzrlib.workingtree import WorkingTree
70 by mbp at sourcefrog
Prepare for smart recursive add.
25
686 by Martin Pool
- glob expand add arguments on win32
26
def glob_expand_for_win32(file_list):
1185.23.2 by Aaron Bentley
win32 glob expansion fix from Belchenko
27
    if not file_list:
28
        return
686 by Martin Pool
- glob expand add arguments on win32
29
    import glob
30
    expanded_file_list = []
31
    for possible_glob in file_list:
32
        glob_files = glob.glob(possible_glob)
33
       
34
        if glob_files == []:
35
            # special case to let the normal code path handle
36
            # files that do not exists
37
            expanded_file_list.append(possible_glob)
38
        else:
39
            expanded_file_list += glob_files
40
    return expanded_file_list
41
1128 by Martin Pool
- smart_add routine now doesn't print filenames directly, but rather
42
1092.1.29 by Robert Collins
break smart_add into smart_add and smart_add_branch which will accept a branch parameter
43
def _prepare_file_list(file_list):
44
    """Prepare a file list for use by smart_add_*."""
45
    import sys
46
    if sys.platform == 'win32':
47
        file_list = glob_expand_for_win32(file_list)
48
    if not file_list:
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
49
        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
50
    file_list = list(file_list)
51
    return file_list
52
1159 by Martin Pool
- clean up parameters to smart_add and smart_add_branch
53
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)
54
def add_action_null(inv, parent_ie, path, kind):
1185.53.1 by Michael Ellerman
Add support for bzr add --dry-run
55
    """Absorb add actions and do nothing."""
56
    pass
57
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)
58
59
def add_action_print(inv, parent_ie, path, kind):
1185.53.1 by Michael Ellerman
Add support for bzr add --dry-run
60
    """Print a line to stdout for each file that would be added."""
61
    print "added", bzrlib.osutils.quotefn(path)
62
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)
63
64
def add_action_add(inv, parent_ie, path, kind):
1185.53.1 by Michael Ellerman
Add support for bzr add --dry-run
65
    """Add each file to the given inventory. Produce no output."""
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)
66
    if parent_ie is not None:
67
        entry = bzrlib.inventory.make_entry(
68
            kind, bzrlib.osutils.basename(path),  parent_ie.file_id)
69
        inv.add(entry)
70
    else:
71
        entry = inv.add_path(path, kind=kind)
72
    # mutter("added %r kind %r file_id={%s}" % (path, kind, entry.file_id))
73
74
75
def add_action_add_and_print(inv, parent_ie, path, kind):
1185.53.1 by Michael Ellerman
Add support for bzr add --dry-run
76
    """Add each file to the given inventory, and print a line to stdout."""
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)
77
    add_action_add(inv, parent_ie, path, kind)
78
    add_action_print(inv, parent_ie, path, kind)
1185.53.1 by Michael Ellerman
Add support for bzr add --dry-run
79
80
81
def smart_add(file_list, recurse=True, action=add_action_add):
598 by Martin Pool
doc
82
    """Add files to version, optionally recursing into directories.
70 by mbp at sourcefrog
Prepare for smart recursive add.
83
84
    This is designed more towards DWIM for humans than API simplicity.
85
    For the specific behaviour see the help for cmd_add().
1159 by Martin Pool
- clean up parameters to smart_add and smart_add_branch
86
87
    Returns the number of files added.
70 by mbp at sourcefrog
Prepare for smart recursive add.
88
    """
1092.1.29 by Robert Collins
break smart_add into smart_add and smart_add_branch which will accept a branch parameter
89
    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)
90
    tree = WorkingTree.open_containing(file_list[0])[0]
1185.53.1 by Michael Ellerman
Add support for bzr add --dry-run
91
    return smart_add_tree(tree, file_list, recurse, action)
1159 by Martin Pool
- clean up parameters to smart_add and smart_add_branch
92
1711.1.2 by Robert Collins
'bzr add' is now less verbose in telling you what ignore globs were
93
1185.53.1 by Michael Ellerman
Add support for bzr add --dry-run
94
def smart_add_tree(tree, file_list, recurse=True, action=add_action_add):
1092.1.29 by Robert Collins
break smart_add into smart_add and smart_add_branch which will accept a branch parameter
95
    """Add files to version, optionally recursing into directories.
96
97
    This is designed more towards DWIM for humans than API simplicity.
98
    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
99
1508.1.11 by Robert Collins
Documentation.
100
    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
101
102
    Returns the number of files added.
1092.1.29 by Robert Collins
break smart_add into smart_add and smart_add_branch which will accept a branch parameter
103
    """
1185.56.2 by Michael Ellerman
Raise NoSuchFile when someone tries to add a non-existant file.
104
    import os, errno
599 by Martin Pool
- better error reporting from smart_add
105
    from bzrlib.errors import BadFileKindError, ForbiddenFileError
1159 by Martin Pool
- clean up parameters to smart_add and smart_add_branch
106
    assert isinstance(recurse, bool)
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
107
    
1713.1.14 by Robert Collins
Review feedback.
108
    prepared_list = _prepare_file_list(file_list)
109
    mutter("smart add of %r, originally %r", prepared_list, file_list)
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
110
    inv = tree.read_working_inventory()
1185.46.8 by Aaron Bentley
bzr add reports ignored patterns.
111
    added = []
112
    ignored = {}
1713.1.14 by Robert Collins
Review feedback.
113
    user_files = set()
114
    files_to_add = []
86 by mbp at sourcefrog
first cut at recursive add
115
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)
116
    # validate user file paths and convert all paths to tree 
117
    # relative : its cheaper to make a tree relative path an abspath
118
    # than to convert an abspath to tree relative.
1713.1.14 by Robert Collins
Review feedback.
119
    for filepath in prepared_list:
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
120
        rf = tree.relpath(filepath)
1713.1.14 by Robert Collins
Review feedback.
121
        user_files.add(rf)
122
        files_to_add.append((rf, None))
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
123
        # validate user parameters. Our recursive code avoids adding new files
124
        # that need such validation 
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)
125
        if tree.is_control_filename(rf):
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
126
            raise ForbiddenFileError('cannot add control file %s' % filepath)
127
1713.1.14 by Robert Collins
Review feedback.
128
    for filepath, parent_ie in files_to_add:
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)
129
        # filepath is tree-relative
130
        abspath = tree.abspath(filepath)
131
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
132
        # find the kind of the path being added. This is not
133
        # currently determined when we list directories 
134
        # recursively, but in theory we can determine while 
135
        # doing the directory listing on *some* platformans.
136
        # TODO: a safe, portable, clean interface which will 
137
        # be faster than os.listdir() + stat. Specifically,
138
        # readdir - dirent.d_type supplies the file type when
139
        # it is defined. (Apparently Mac OSX has the field but
140
        # does not fill it in ?!) Robert C, Martin P.
1185.56.2 by Michael Ellerman
Raise NoSuchFile when someone tries to add a non-existant file.
141
        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)
142
            kind = bzrlib.osutils.file_kind(abspath)
1185.56.2 by Michael Ellerman
Raise NoSuchFile when someone tries to add a non-existant file.
143
        except OSError, e:
144
            if hasattr(e, 'errno') and e.errno == errno.ENOENT:
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)
145
                raise errors.NoSuchFile(abspath)
1185.56.2 by Michael Ellerman
Raise NoSuchFile when someone tries to add a non-existant file.
146
            raise
426 by Martin Pool
- Skip symlinks during recursive add (path from aaron)
147
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
148
        # we need to call this to determine the inventory kind to create.
1399.1.1 by Robert Collins
move checks for versionability of file kinds into InventoryEntry
149
        if not InventoryEntry.versionable_kind(kind):
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
150
            if filepath in user_files:
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
                raise BadFileKindError("cannot add %s of type %s" % (abspath, kind))
599 by Martin Pool
- better error reporting from smart_add
152
            else:
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)
153
                warning("skipping %s (can't add file of kind '%s')", abspath, kind)
426 by Martin Pool
- Skip symlinks during recursive add (path from aaron)
154
                continue
155
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)
156
        if parent_ie is not None:
157
            versioned = bzrlib.osutils.basename(filepath) in parent_ie.children
158
        else:
159
            # without the parent ie, use the relatively slower inventory 
160
            # probing method
161
            versioned = inv.has_filename(filepath)
86 by mbp at sourcefrog
first cut at recursive add
162
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
163
        if kind == 'directory':
164
            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)
165
                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
166
                sub_tree = True
167
            except NotBranchError:
168
                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
169
            except errors.UnsupportedFormatError:
170
                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
171
        else:
172
            sub_tree = False
173
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)
174
        if filepath == '':
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
175
            # 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
176
            sub_tree = False
91 by mbp at sourcefrog
special handling of root directory for recursive add
177
        elif versioned:
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
178
            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)
179
            # 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
180
        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)
181
            mutter("%r is a nested bzr tree", abspath)
70 by mbp at sourcefrog
Prepare for smart recursive add.
182
        else:
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)
183
            added.extend(__add_one(tree, inv, parent_ie, filepath, kind, action))
87 by mbp at sourcefrog
- clean up smart_add code, and make it commit the inventory
184
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
185
        if kind == 'directory' and recurse and not 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)
186
            try:
187
                if parent_ie is not None:
188
                    # must be present:
189
                    this_ie = parent_ie.children[bzrlib.osutils.basename(filepath)]
190
                else:
191
                    # without the parent ie, use the relatively slower inventory 
192
                    # probing method
193
                    this_id = inv.path2id(filepath)
194
                    if this_id is None:
195
                        this_ie = None
196
                    else:
197
                        this_ie = inv[this_id]
198
            except KeyError:
199
                this_ie = None
200
201
            for subf in os.listdir(abspath):
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
202
                # here we could use TreeDirectory rather than 
203
                # string concatenation.
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)
204
                subp = bzrlib.osutils.pathjoin(filepath, subf)
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
205
                # TODO: is_control_filename is very slow. Make it faster. 
206
                # TreeDirectory.is_control_filename could also make this 
207
                # faster - its impossible for a non root dir to have a 
208
                # control file.
1534.5.5 by Robert Collins
Move is_control_file into WorkingTree.is_control_filename and test.
209
                if tree.is_control_filename(subp):
1185.31.4 by John Arbash Meinel
Fixing mutter() calls to not have to do string processing.
210
                    mutter("skip control directory %r", subp)
87 by mbp at sourcefrog
- clean up smart_add code, and make it commit the inventory
211
                else:
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
212
                    # ignore while selecting files - if we globbed in the
213
                    # outer loop we would ignore user files.
1185.46.8 by Aaron Bentley
bzr add reports ignored patterns.
214
                    ignore_glob = tree.is_ignored(subp)
215
                    if ignore_glob is not None:
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
216
                        # mutter("skip ignored sub-file %r", subp)
1185.46.8 by Aaron Bentley
bzr add reports ignored patterns.
217
                        if ignore_glob not in ignored:
218
                            ignored[ignore_glob] = []
219
                        ignored[ignore_glob].append(subp)
220
                    else:
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
221
                        #mutter("queue to add sub-file %r", subp)
1713.1.14 by Robert Collins
Review feedback.
222
                        files_to_add.append((subp, this_ie))
1185.46.8 by Aaron Bentley
bzr add reports ignored patterns.
223
224
    if len(added) > 0:
1508.1.10 by Robert Collins
bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)
225
        tree._write_inventory(inv)
1185.46.8 by Aaron Bentley
bzr add reports ignored patterns.
226
    return added, ignored
1185.3.3 by Martin Pool
- patch from mpe to automatically add parent directories
227
1711.1.2 by Robert Collins
'bzr add' is now less verbose in telling you what ignore globs were
228
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
def __add_one(tree, inv, parent_ie, path, kind, action):
1713.1.14 by Robert Collins
Review feedback.
230
    """Add a new entry to the inventory and automatically add unversioned parents.
231
232
    Actual adding of the entry is delegated to the action callback.
233
234
    :param inv: Inventory which will receive the new entry.
235
    :param parent_ie: Parent inventory entry if known, or None.  If
236
    None, the parent is looked up by name and used if present, otherwise
237
    it is recursively added.
238
    :param kind: Kind of new entry (file, directory, etc)
239
    :param action: callback(inv, parent_ie, path, kind); return ignored.
240
    :returns: A list of paths which have been added.
241
    """
1185.3.3 by Martin Pool
- patch from mpe to automatically add parent directories
242
243
    # 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)
244
    # 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
245
    # 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)
246
    if parent_ie is not None:
247
        # we have a parent ie already
248
        added = []
249
    else:
250
        # slower but does not need parent_ie
251
        if inv.has_filename(path):
252
            return []
253
        # add parent
254
        added = __add_one(tree, inv, None, dirname(path), 'directory', action)
255
        parent_id = inv.path2id(dirname(path))
256
        if parent_id is not None:
257
            parent_ie = inv[inv.path2id(dirname(path))]
258
        else:
259
            parent_ie = None
260
    action(inv, parent_ie, path, kind)
1185.3.3 by Martin Pool
- patch from mpe to automatically add parent directories
261
1185.46.8 by Aaron Bentley
bzr add reports ignored patterns.
262
    return added + [path]