~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
1185.53.1 by Michael Ellerman
Add support for bzr add --dry-run
54
def add_action_null(inv, path, kind):
55
    """Absorb add actions and do nothing."""
56
    pass
57
58
def add_action_print(inv, path, kind):
59
    """Print a line to stdout for each file that would be added."""
60
    print "added", bzrlib.osutils.quotefn(path)
61
62
def add_action_add(inv, path, kind):
63
    """Add each file to the given inventory. Produce no output."""
64
    entry = inv.add_path(path, kind=kind)
65
    mutter("added %r kind %r file_id={%s}" % (path, kind, entry.file_id))
66
1711.1.2 by Robert Collins
'bzr add' is now less verbose in telling you what ignore globs were
67
1185.53.1 by Michael Ellerman
Add support for bzr add --dry-run
68
def add_action_add_and_print(inv, path, kind):
69
    """Add each file to the given inventory, and print a line to stdout."""
70
    add_action_add(inv, path, kind)
71
    add_action_print(inv, path, kind)
72
73
74
def smart_add(file_list, recurse=True, action=add_action_add):
598 by Martin Pool
doc
75
    """Add files to version, optionally recursing into directories.
70 by mbp at sourcefrog
Prepare for smart recursive add.
76
77
    This is designed more towards DWIM for humans than API simplicity.
78
    For the specific behaviour see the help for cmd_add().
1159 by Martin Pool
- clean up parameters to smart_add and smart_add_branch
79
80
    Returns the number of files added.
70 by mbp at sourcefrog
Prepare for smart recursive add.
81
    """
1092.1.29 by Robert Collins
break smart_add into smart_add and smart_add_branch which will accept a branch parameter
82
    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)
83
    tree = WorkingTree.open_containing(file_list[0])[0]
1185.53.1 by Michael Ellerman
Add support for bzr add --dry-run
84
    return smart_add_tree(tree, file_list, recurse, action)
1159 by Martin Pool
- clean up parameters to smart_add and smart_add_branch
85
1711.1.2 by Robert Collins
'bzr add' is now less verbose in telling you what ignore globs were
86
1185.53.1 by Michael Ellerman
Add support for bzr add --dry-run
87
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
88
    """Add files to version, optionally recursing into directories.
89
90
    This is designed more towards DWIM for humans than API simplicity.
91
    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
92
1508.1.11 by Robert Collins
Documentation.
93
    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
94
95
    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
96
    """
1185.56.2 by Michael Ellerman
Raise NoSuchFile when someone tries to add a non-existant file.
97
    import os, errno
599 by Martin Pool
- better error reporting from smart_add
98
    from bzrlib.errors import BadFileKindError, ForbiddenFileError
1159 by Martin Pool
- clean up parameters to smart_add and smart_add_branch
99
    assert isinstance(recurse, bool)
100
1092.1.29 by Robert Collins
break smart_add into smart_add and smart_add_branch which will accept a branch parameter
101
    file_list = _prepare_file_list(file_list)
426 by Martin Pool
- Skip symlinks during recursive add (path from aaron)
102
    user_list = file_list[:]
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
103
    inv = tree.read_working_inventory()
1185.46.8 by Aaron Bentley
bzr add reports ignored patterns.
104
    added = []
105
    ignored = {}
1713.1.5 by Robert Collins
Remove unnecessary calls into 'is_control_filename' from smart_add.
106
    user_files = set(file_list)
86 by mbp at sourcefrog
first cut at recursive add
107
70 by mbp at sourcefrog
Prepare for smart recursive add.
108
    for f in file_list:
1457.1.4 by Robert Collins
Branch.relpath has been moved to WorkingTree.relpath.
109
        rf = tree.relpath(f)
1508.1.10 by Robert Collins
bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)
110
        af = tree.abspath(rf)
510 by Martin Pool
- fix add of files when standing in subdirectory
111
1185.56.2 by Michael Ellerman
Raise NoSuchFile when someone tries to add a non-existant file.
112
        try:
113
            kind = bzrlib.osutils.file_kind(af)
114
        except OSError, e:
115
            if hasattr(e, 'errno') and e.errno == errno.ENOENT:
116
                raise errors.NoSuchFile(rf)
117
            raise
426 by Martin Pool
- Skip symlinks during recursive add (path from aaron)
118
1399.1.1 by Robert Collins
move checks for versionability of file kinds into InventoryEntry
119
        if not InventoryEntry.versionable_kind(kind):
599 by Martin Pool
- better error reporting from smart_add
120
            if f in user_list:
121
                raise BadFileKindError("cannot add %s of type %s" % (f, kind))
122
            else:
1128 by Martin Pool
- smart_add routine now doesn't print filenames directly, but rather
123
                warning("skipping %s (can't add file of kind '%s')", f, kind)
426 by Martin Pool
- Skip symlinks during recursive add (path from aaron)
124
                continue
125
1185.31.4 by John Arbash Meinel
Fixing mutter() calls to not have to do string processing.
126
        mutter("smart add of %r, abs=%r", f, af)
1713.1.5 by Robert Collins
Remove unnecessary calls into 'is_control_filename' from smart_add.
127
            
128
        # validate user parameters. Our recursive code avoids adding new files
129
        # that need such validation 
130
        if f in user_files and tree.is_control_filename(af):
599 by Martin Pool
- better error reporting from smart_add
131
            raise ForbiddenFileError('cannot add control file %s' % f)
1713.1.5 by Robert Collins
Remove unnecessary calls into 'is_control_filename' from smart_add.
132
86 by mbp at sourcefrog
first cut at recursive add
133
        versioned = (inv.path2id(rf) != None)
134
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
135
        if kind == 'directory':
136
            try:
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
137
                sub_branch = WorkingTree.open(af)
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
138
                sub_tree = True
139
            except NotBranchError:
140
                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
141
            except errors.UnsupportedFormatError:
142
                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
143
        else:
144
            sub_tree = False
145
91 by mbp at sourcefrog
special handling of root directory for recursive add
146
        if rf == '':
1508.1.10 by Robert Collins
bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)
147
            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
148
            sub_tree = False
91 by mbp at sourcefrog
special handling of root directory for recursive add
149
        elif versioned:
1185.31.4 by John Arbash Meinel
Fixing mutter() calls to not have to do string processing.
150
            mutter("%r is already versioned", f)
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
151
        elif sub_tree:
1185.31.4 by John Arbash Meinel
Fixing mutter() calls to not have to do string processing.
152
            mutter("%r is a bzr tree", f)
70 by mbp at sourcefrog
Prepare for smart recursive add.
153
        else:
1185.46.8 by Aaron Bentley
bzr add reports ignored patterns.
154
            added.extend(__add_one(tree, inv, rf, kind, action))
87 by mbp at sourcefrog
- clean up smart_add code, and make it commit the inventory
155
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
156
        if kind == 'directory' and recurse and not sub_tree:
87 by mbp at sourcefrog
- clean up smart_add code, and make it commit the inventory
157
            for subf in os.listdir(af):
1185.31.32 by John Arbash Meinel
Updated the bzr sourcecode to use bzrlib.osutils.pathjoin rather than os.path.join to enforce internal use of / instead of \
158
                subp = bzrlib.osutils.pathjoin(rf, subf)
1534.5.5 by Robert Collins
Move is_control_file into WorkingTree.is_control_filename and test.
159
                if tree.is_control_filename(subp):
1185.31.4 by John Arbash Meinel
Fixing mutter() calls to not have to do string processing.
160
                    mutter("skip control directory %r", subp)
87 by mbp at sourcefrog
- clean up smart_add code, and make it commit the inventory
161
                else:
1185.46.8 by Aaron Bentley
bzr add reports ignored patterns.
162
                    ignore_glob = tree.is_ignored(subp)
163
                    if ignore_glob is not None:
164
                        mutter("skip ignored sub-file %r", subp)
165
                        if ignore_glob not in ignored:
166
                            ignored[ignore_glob] = []
167
                        ignored[ignore_glob].append(subp)
168
                    else:
169
                        mutter("queue to add sub-file %r", subp)
170
                        file_list.append(tree.abspath(subp))
171
172
    mutter('added %d entries', len(added))
1159 by Martin Pool
- clean up parameters to smart_add and smart_add_branch
173
    
1185.46.8 by Aaron Bentley
bzr add reports ignored patterns.
174
    if len(added) > 0:
1508.1.10 by Robert Collins
bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)
175
        tree._write_inventory(inv)
1159 by Martin Pool
- clean up parameters to smart_add and smart_add_branch
176
1185.46.8 by Aaron Bentley
bzr add reports ignored patterns.
177
    return added, ignored
1185.3.3 by Martin Pool
- patch from mpe to automatically add parent directories
178
1711.1.2 by Robert Collins
'bzr add' is now less verbose in telling you what ignore globs were
179
1185.53.1 by Michael Ellerman
Add support for bzr add --dry-run
180
def __add_one(tree, inv, path, kind, action):
1185.3.3 by Martin Pool
- patch from mpe to automatically add parent directories
181
    """Add a file or directory, automatically add unversioned parents."""
182
183
    # 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)
184
    # 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
185
    # always versioned.
186
    if inv.path2id(path) != None:
1185.46.8 by Aaron Bentley
bzr add reports ignored patterns.
187
        return []
1185.3.3 by Martin Pool
- patch from mpe to automatically add parent directories
188
189
    # add parent
1185.46.8 by Aaron Bentley
bzr add reports ignored patterns.
190
    added = __add_one(tree, inv, dirname(path), 'directory', action)
1185.53.1 by Michael Ellerman
Add support for bzr add --dry-run
191
    action(inv, path, kind)
1185.3.3 by Martin Pool
- patch from mpe to automatically add parent directories
192
1185.46.8 by Aaron Bentley
bzr add reports ignored patterns.
193
    return added + [path]