/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
70 by mbp at sourcefrog
Prepare for smart recursive add.
18
686 by Martin Pool
- glob expand add arguments on win32
19
def glob_expand_for_win32(file_list):
20
    import glob
21
    
22
    expanded_file_list = []
23
    for possible_glob in file_list:
24
        glob_files = glob.glob(possible_glob)
25
       
26
        if glob_files == []:
27
            # special case to let the normal code path handle
28
            # files that do not exists
29
            expanded_file_list.append(possible_glob)
30
        else:
31
            expanded_file_list += glob_files
32
    return expanded_file_list
33
1128 by Martin Pool
- smart_add routine now doesn't print filenames directly, but rather
34
597 by Martin Pool
- tidy up add code
35
def smart_add(file_list, verbose=True, recurse=True):
598 by Martin Pool
doc
36
    """Add files to version, optionally recursing into directories.
70 by mbp at sourcefrog
Prepare for smart recursive add.
37
38
    This is designed more towards DWIM for humans than API simplicity.
39
    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
40
41
    This yields a sequence of (path, kind, file_id) for added files.
70 by mbp at sourcefrog
Prepare for smart recursive add.
42
    """
974 by Martin Pool
- start adding tests for commit in subdir
43
    import os
44
    import sys
1103 by Martin Pool
- some pychecker cleanups
45
    from bzrlib.osutils import quotefn
599 by Martin Pool
- better error reporting from smart_add
46
    from bzrlib.errors import BadFileKindError, ForbiddenFileError
974 by Martin Pool
- start adding tests for commit in subdir
47
    import bzrlib.branch
48
    import bzrlib.osutils
599 by Martin Pool
- better error reporting from smart_add
49
686 by Martin Pool
- glob expand add arguments on win32
50
    if sys.platform == 'win32':
51
        file_list = glob_expand_for_win32(file_list)
974 by Martin Pool
- start adding tests for commit in subdir
52
        
53
    if not file_list:
54
        file_list = ['.']
686 by Martin Pool
- glob expand add arguments on win32
55
    
426 by Martin Pool
- Skip symlinks during recursive add (path from aaron)
56
    user_list = file_list[:]
88 by mbp at sourcefrog
smart_add: no warning for already-added files
57
    assert not isinstance(file_list, basestring)
70 by mbp at sourcefrog
Prepare for smart recursive add.
58
    b = bzrlib.branch.Branch(file_list[0], find_root=True)
59
    inv = b.read_working_inventory()
86 by mbp at sourcefrog
first cut at recursive add
60
    tree = b.working_tree()
87 by mbp at sourcefrog
- clean up smart_add code, and make it commit the inventory
61
    count = 0
86 by mbp at sourcefrog
first cut at recursive add
62
70 by mbp at sourcefrog
Prepare for smart recursive add.
63
    for f in file_list:
510 by Martin Pool
- fix add of files when standing in subdirectory
64
        rf = b.relpath(f)
65
        af = b.abspath(rf)
66
67
        kind = bzrlib.osutils.file_kind(af)
426 by Martin Pool
- Skip symlinks during recursive add (path from aaron)
68
69
        if kind != 'file' and kind != 'directory':
599 by Martin Pool
- better error reporting from smart_add
70
            if f in user_list:
71
                raise BadFileKindError("cannot add %s of type %s" % (f, kind))
72
            else:
1128 by Martin Pool
- smart_add routine now doesn't print filenames directly, but rather
73
                warning("skipping %s (can't add file of kind '%s')", f, kind)
426 by Martin Pool
- Skip symlinks during recursive add (path from aaron)
74
                continue
75
800 by Martin Pool
Merge John's import-speedup branch:
76
        mutter("smart add of %r, abs=%r" % (f, af))
70 by mbp at sourcefrog
Prepare for smart recursive add.
77
        
78
        if bzrlib.branch.is_control_file(af):
599 by Martin Pool
- better error reporting from smart_add
79
            raise ForbiddenFileError('cannot add control file %s' % f)
87 by mbp at sourcefrog
- clean up smart_add code, and make it commit the inventory
80
            
86 by mbp at sourcefrog
first cut at recursive add
81
        versioned = (inv.path2id(rf) != None)
82
91 by mbp at sourcefrog
special handling of root directory for recursive add
83
        if rf == '':
84
            mutter("branch root doesn't need to be added")
85
        elif versioned:
88 by mbp at sourcefrog
smart_add: no warning for already-added files
86
            mutter("%r is already versioned" % f)
70 by mbp at sourcefrog
Prepare for smart recursive add.
87
        else:
87 by mbp at sourcefrog
- clean up smart_add code, and make it commit the inventory
88
            file_id = bzrlib.branch.gen_file_id(rf)
89
            inv.add_path(rf, kind=kind, file_id=file_id)
800 by Martin Pool
Merge John's import-speedup branch:
90
            mutter("added %r kind %r file_id={%s}" % (rf, kind, file_id))
87 by mbp at sourcefrog
- clean up smart_add code, and make it commit the inventory
91
            count += 1 
597 by Martin Pool
- tidy up add code
92
1128 by Martin Pool
- smart_add routine now doesn't print filenames directly, but rather
93
            yield f, kind, file_id
94
87 by mbp at sourcefrog
- clean up smart_add code, and make it commit the inventory
95
96
        if kind == 'directory' and recurse:
97
            for subf in os.listdir(af):
597 by Martin Pool
- tidy up add code
98
                subp = os.path.join(rf, subf)
103 by mbp at sourcefrog
Skip control directories in recursive add
99
                if subf == bzrlib.BZRDIR:
100
                    mutter("skip control directory %r" % subp)
101
                elif tree.is_ignored(subp):
87 by mbp at sourcefrog
- clean up smart_add code, and make it commit the inventory
102
                    mutter("skip ignored sub-file %r" % subp)
103
                else:
510 by Martin Pool
- fix add of files when standing in subdirectory
104
                    mutter("queue to add sub-file %r" % subp)
105
                    file_list.append(b.abspath(subp))
87 by mbp at sourcefrog
- clean up smart_add code, and make it commit the inventory
106
1128 by Martin Pool
- smart_add routine now doesn't print filenames directly, but rather
107
87 by mbp at sourcefrog
- clean up smart_add code, and make it commit the inventory
108
    if count > 0:
95 by mbp at sourcefrog
only show count of added files with --verbose
109
        if verbose:
1128 by Martin Pool
- smart_add routine now doesn't print filenames directly, but rather
110
            note('added %d entries', count)
70 by mbp at sourcefrog
Prepare for smart recursive add.
111
        b._write_inventory(inv)
1128 by Martin Pool
- smart_add routine now doesn't print filenames directly, but rather
112