/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
1128 by Martin Pool
- smart_add routine now doesn't print filenames directly, but rather
17
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
18
from bzrlib.errors import NotBranchError
19
from bzrlib.branch import Branch
1139 by Martin Pool
- merge in merge improvements and additional tests
20
from bzrlib.osutils import quotefn
70 by mbp at sourcefrog
Prepare for smart recursive add.
21
686 by Martin Pool
- glob expand add arguments on win32
22
def glob_expand_for_win32(file_list):
23
    import glob
24
    
25
    expanded_file_list = []
26
    for possible_glob in file_list:
27
        glob_files = glob.glob(possible_glob)
28
       
29
        if glob_files == []:
30
            # special case to let the normal code path handle
31
            # files that do not exists
32
            expanded_file_list.append(possible_glob)
33
        else:
34
            expanded_file_list += glob_files
35
    return expanded_file_list
36
1128 by Martin Pool
- smart_add routine now doesn't print filenames directly, but rather
37
1139 by Martin Pool
- merge in merge improvements and additional tests
38
def _NullAddCallback(path, kind, entry):
1092.1.30 by Robert Collins
change smart_add reporting of added files to callback with the entry, and change the inventory.add signature to return the added entry
39
    pass
40
1139 by Martin Pool
- merge in merge improvements and additional tests
41
def _PrintAddCallback(path, kind, entry):
42
    print "added", quotefn(path)
1092.1.30 by Robert Collins
change smart_add reporting of added files to callback with the entry, and change the inventory.add signature to return the added entry
43
    
1092.1.29 by Robert Collins
break smart_add into smart_add and smart_add_branch which will accept a branch parameter
44
def _prepare_file_list(file_list):
45
    """Prepare a file list for use by smart_add_*."""
46
    import sys
47
    if sys.platform == 'win32':
48
        file_list = glob_expand_for_win32(file_list)
49
    if not file_list:
50
        file_list = ['.']
51
    file_list = list(file_list)
52
    assert not isinstance(file_list, basestring)
53
    return file_list
54
1092.1.30 by Robert Collins
change smart_add reporting of added files to callback with the entry, and change the inventory.add signature to return the added entry
55
def smart_add(file_list, verbose=True, recurse=True, callback=_NullAddCallback):
598 by Martin Pool
doc
56
    """Add files to version, optionally recursing into directories.
70 by mbp at sourcefrog
Prepare for smart recursive add.
57
58
    This is designed more towards DWIM for humans than API simplicity.
59
    For the specific behaviour see the help for cmd_add().
60
    """
1092.1.29 by Robert Collins
break smart_add into smart_add and smart_add_branch which will accept a branch parameter
61
    file_list = _prepare_file_list(file_list)
62
    b = Branch(file_list[0], find_root=True)
63
    return smart_add_branch(b, file_list, verbose, recurse)
64
        
1092.1.30 by Robert Collins
change smart_add reporting of added files to callback with the entry, and change the inventory.add signature to return the added entry
65
def smart_add_branch(branch, file_list, verbose=True, recurse=True,
66
                     callback=_NullAddCallback):
1092.1.29 by Robert Collins
break smart_add into smart_add and smart_add_branch which will accept a branch parameter
67
    """Add files to version, optionally recursing into directories.
68
69
    This is designed more towards DWIM for humans than API simplicity.
70
    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
71
72
    This yields a sequence of (path, kind, file_id) for added files.
1092.1.29 by Robert Collins
break smart_add into smart_add and smart_add_branch which will accept a branch parameter
73
    """
974 by Martin Pool
- start adding tests for commit in subdir
74
    import os
75
    import sys
1103 by Martin Pool
- some pychecker cleanups
76
    from bzrlib.osutils import quotefn
599 by Martin Pool
- better error reporting from smart_add
77
    from bzrlib.errors import BadFileKindError, ForbiddenFileError
974 by Martin Pool
- start adding tests for commit in subdir
78
    import bzrlib.branch
79
    import bzrlib.osutils
599 by Martin Pool
- better error reporting from smart_add
80
1092.1.29 by Robert Collins
break smart_add into smart_add and smart_add_branch which will accept a branch parameter
81
    file_list = _prepare_file_list(file_list)
426 by Martin Pool
- Skip symlinks during recursive add (path from aaron)
82
    user_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
83
    inv = branch.read_working_inventory()
84
    tree = branch.working_tree()
87 by mbp at sourcefrog
- clean up smart_add code, and make it commit the inventory
85
    count = 0
86 by mbp at sourcefrog
first cut at recursive add
86
70 by mbp at sourcefrog
Prepare for smart recursive add.
87
    for f in file_list:
1092.1.29 by Robert Collins
break smart_add into smart_add and smart_add_branch which will accept a branch parameter
88
        rf = branch.relpath(f)
89
        af = branch.abspath(rf)
510 by Martin Pool
- fix add of files when standing in subdirectory
90
91
        kind = bzrlib.osutils.file_kind(af)
426 by Martin Pool
- Skip symlinks during recursive add (path from aaron)
92
93
        if kind != 'file' and kind != 'directory':
599 by Martin Pool
- better error reporting from smart_add
94
            if f in user_list:
95
                raise BadFileKindError("cannot add %s of type %s" % (f, kind))
96
            else:
1128 by Martin Pool
- smart_add routine now doesn't print filenames directly, but rather
97
                warning("skipping %s (can't add file of kind '%s')", f, kind)
426 by Martin Pool
- Skip symlinks during recursive add (path from aaron)
98
                continue
99
800 by Martin Pool
Merge John's import-speedup branch:
100
        mutter("smart add of %r, abs=%r" % (f, af))
70 by mbp at sourcefrog
Prepare for smart recursive add.
101
        
102
        if bzrlib.branch.is_control_file(af):
599 by Martin Pool
- better error reporting from smart_add
103
            raise ForbiddenFileError('cannot add control file %s' % f)
87 by mbp at sourcefrog
- clean up smart_add code, and make it commit the inventory
104
            
86 by mbp at sourcefrog
first cut at recursive add
105
        versioned = (inv.path2id(rf) != None)
106
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
107
        if kind == 'directory':
108
            try:
109
                sub_branch = Branch(af, find_root=False)
110
                sub_tree = True
111
            except NotBranchError:
112
                sub_tree = False
113
        else:
114
            sub_tree = False
115
91 by mbp at sourcefrog
special handling of root directory for recursive add
116
        if rf == '':
117
            mutter("branch 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
118
            sub_tree = False
91 by mbp at sourcefrog
special handling of root directory for recursive add
119
        elif versioned:
88 by mbp at sourcefrog
smart_add: no warning for already-added files
120
            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
121
        elif sub_tree:
122
            mutter("%r is a bzr tree" %f)
70 by mbp at sourcefrog
Prepare for smart recursive add.
123
        else:
1092.1.30 by Robert Collins
change smart_add reporting of added files to callback with the entry, and change the inventory.add signature to return the added entry
124
            entry = inv.add_path(rf, kind=kind)
125
            mutter("added %r kind %r file_id={%s}" % (rf, kind, entry.file_id))
87 by mbp at sourcefrog
- clean up smart_add code, and make it commit the inventory
126
            count += 1 
1139 by Martin Pool
- merge in merge improvements and additional tests
127
            callback(rf, kind, entry)
87 by mbp at sourcefrog
- clean up smart_add code, and make it commit the inventory
128
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
129
        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
130
            for subf in os.listdir(af):
597 by Martin Pool
- tidy up add code
131
                subp = os.path.join(rf, subf)
103 by mbp at sourcefrog
Skip control directories in recursive add
132
                if subf == bzrlib.BZRDIR:
133
                    mutter("skip control directory %r" % subp)
134
                elif tree.is_ignored(subp):
87 by mbp at sourcefrog
- clean up smart_add code, and make it commit the inventory
135
                    mutter("skip ignored sub-file %r" % subp)
136
                else:
510 by Martin Pool
- fix add of files when standing in subdirectory
137
                    mutter("queue to add sub-file %r" % subp)
1092.1.29 by Robert Collins
break smart_add into smart_add and smart_add_branch which will accept a branch parameter
138
                    file_list.append(branch.abspath(subp))
87 by mbp at sourcefrog
- clean up smart_add code, and make it commit the inventory
139
1128 by Martin Pool
- smart_add routine now doesn't print filenames directly, but rather
140
87 by mbp at sourcefrog
- clean up smart_add code, and make it commit the inventory
141
    if count > 0:
95 by mbp at sourcefrog
only show count of added files with --verbose
142
        if verbose:
143
            note('added %d' % count)
1092.1.29 by Robert Collins
break smart_add into smart_add and smart_add_branch which will accept a branch parameter
144
        branch._write_inventory(inv)
974 by Martin Pool
- start adding tests for commit in subdir
145
    else:
1139 by Martin Pool
- merge in merge improvements and additional tests
146
        note("nothing new to add")
974 by Martin Pool
- start adding tests for commit in subdir
147
        # should this return 1 to the shell?