/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
70 by mbp at sourcefrog
Prepare for smart recursive add.
1
# Copyright (C) 2005 Canonical Ltd
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)
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
100
    
101
    orig_list = file_list
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)
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
103
    mutter("smart add of %r, originally %r", file_list, orig_list)
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
104
    inv = tree.read_working_inventory()
1185.46.8 by Aaron Bentley
bzr add reports ignored patterns.
105
    added = []
106
    ignored = {}
1713.1.5 by Robert Collins
Remove unnecessary calls into 'is_control_filename' from smart_add.
107
    user_files = set(file_list)
86 by mbp at sourcefrog
first cut at recursive add
108
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
109
    for filepath in file_list:
110
        # convert a random abs or cwd-relative path to tree relative.
111
        rf = tree.relpath(filepath)
112
113
        # validate user parameters. Our recursive code avoids adding new files
114
        # that need such validation 
115
        if filepath in user_files and tree.is_control_filename(rf):
116
            raise ForbiddenFileError('cannot add control file %s' % filepath)
117
118
        # find the kind of the path being added. This is not
119
        # currently determined when we list directories 
120
        # recursively, but in theory we can determine while 
121
        # doing the directory listing on *some* platformans.
122
        # TODO: a safe, portable, clean interface which will 
123
        # be faster than os.listdir() + stat. Specifically,
124
        # readdir - dirent.d_type supplies the file type when
125
        # it is defined. (Apparently Mac OSX has the field but
126
        # 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.
127
        try:
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
128
            kind = bzrlib.osutils.file_kind(filepath)
1185.56.2 by Michael Ellerman
Raise NoSuchFile when someone tries to add a non-existant file.
129
        except OSError, e:
130
            if hasattr(e, 'errno') and e.errno == errno.ENOENT:
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
131
                raise errors.NoSuchFile(filepath)
1185.56.2 by Michael Ellerman
Raise NoSuchFile when someone tries to add a non-existant file.
132
            raise
426 by Martin Pool
- Skip symlinks during recursive add (path from aaron)
133
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
134
        # 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
135
        if not InventoryEntry.versionable_kind(kind):
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
136
            if filepath in user_files:
137
                raise BadFileKindError("cannot add %s of type %s" % (filepath, kind))
599 by Martin Pool
- better error reporting from smart_add
138
            else:
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
139
                warning("skipping %s (can't add file of kind '%s')", filepath, kind)
426 by Martin Pool
- Skip symlinks during recursive add (path from aaron)
140
                continue
141
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
142
        # TODO make has_filename faster or provide a better api for accessing/determining 
143
        # this status. perhaps off the inventory directory object.
144
        versioned = inv.has_filename(rf)
86 by mbp at sourcefrog
first cut at recursive add
145
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
146
        if kind == 'directory':
147
            try:
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
148
                sub_branch = bzrlib.bzrdir.BzrDir.open(filepath)
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
149
                sub_tree = True
150
            except NotBranchError:
151
                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
152
            except errors.UnsupportedFormatError:
153
                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
154
        else:
155
            sub_tree = False
156
91 by mbp at sourcefrog
special handling of root directory for recursive add
157
        if rf == '':
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
158
            # 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
159
            sub_tree = False
91 by mbp at sourcefrog
special handling of root directory for recursive add
160
        elif versioned:
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
161
            pass
162
            # mutter("%r is already versioned", filepath)
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
        elif sub_tree:
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
164
            mutter("%r is a nested bzr tree", filepath)
70 by mbp at sourcefrog
Prepare for smart recursive add.
165
        else:
1185.46.8 by Aaron Bentley
bzr add reports ignored patterns.
166
            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
167
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
168
        if kind == 'directory' and recurse and not sub_tree:
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
169
            for subf in os.listdir(filepath):
170
                # here we could use TreeDirectory rather than 
171
                # string concatenation.
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 \
172
                subp = bzrlib.osutils.pathjoin(rf, subf)
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
173
                # TODO: is_control_filename is very slow. Make it faster. 
174
                # TreeDirectory.is_control_filename could also make this 
175
                # faster - its impossible for a non root dir to have a 
176
                # control file.
1534.5.5 by Robert Collins
Move is_control_file into WorkingTree.is_control_filename and test.
177
                if tree.is_control_filename(subp):
1185.31.4 by John Arbash Meinel
Fixing mutter() calls to not have to do string processing.
178
                    mutter("skip control directory %r", subp)
87 by mbp at sourcefrog
- clean up smart_add code, and make it commit the inventory
179
                else:
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
180
                    # ignore while selecting files - if we globbed in the
181
                    # outer loop we would ignore user files.
1185.46.8 by Aaron Bentley
bzr add reports ignored patterns.
182
                    ignore_glob = tree.is_ignored(subp)
183
                    if ignore_glob is not None:
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
184
                        # mutter("skip ignored sub-file %r", subp)
1185.46.8 by Aaron Bentley
bzr add reports ignored patterns.
185
                        if ignore_glob not in ignored:
186
                            ignored[ignore_glob] = []
187
                        ignored[ignore_glob].append(subp)
188
                    else:
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
189
                        #mutter("queue to add sub-file %r", subp)
1185.46.8 by Aaron Bentley
bzr add reports ignored patterns.
190
                        file_list.append(tree.abspath(subp))
191
192
    if len(added) > 0:
1508.1.10 by Robert Collins
bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)
193
        tree._write_inventory(inv)
1185.46.8 by Aaron Bentley
bzr add reports ignored patterns.
194
    return added, ignored
1185.3.3 by Martin Pool
- patch from mpe to automatically add parent directories
195
1711.1.2 by Robert Collins
'bzr add' is now less verbose in telling you what ignore globs were
196
1185.53.1 by Michael Ellerman
Add support for bzr add --dry-run
197
def __add_one(tree, inv, path, kind, action):
1185.3.3 by Martin Pool
- patch from mpe to automatically add parent directories
198
    """Add a file or directory, automatically add unversioned parents."""
199
200
    # 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)
201
    # 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
202
    # always versioned.
203
    if inv.path2id(path) != None:
1185.46.8 by Aaron Bentley
bzr add reports ignored patterns.
204
        return []
1185.3.3 by Martin Pool
- patch from mpe to automatically add parent directories
205
206
    # add parent
1185.46.8 by Aaron Bentley
bzr add reports ignored patterns.
207
    added = __add_one(tree, inv, dirname(path), 'directory', action)
1185.53.1 by Michael Ellerman
Add support for bzr add --dry-run
208
    action(inv, path, kind)
1185.3.3 by Martin Pool
- patch from mpe to automatically add parent directories
209
1185.46.8 by Aaron Bentley
bzr add reports ignored patterns.
210
    return added + [path]