~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
161 by mbp at sourcefrog
pychecker warnings
17
import os, sys
70 by mbp at sourcefrog
Prepare for smart recursive add.
18
import bzrlib
19
95 by mbp at sourcefrog
only show count of added files with --verbose
20
from trace import mutter, note
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
597 by Martin Pool
- tidy up add code
37
def smart_add(file_list, verbose=True, recurse=True):
598 by Martin Pool
doc
38
    """Add files to version, optionally recursing into directories.
70 by mbp at sourcefrog
Prepare for smart recursive add.
39
40
    This is designed more towards DWIM for humans than API simplicity.
41
    For the specific behaviour see the help for cmd_add().
42
    """
597 by Martin Pool
- tidy up add code
43
    from bzrlib.osutils import quotefn, kind_marker
599 by Martin Pool
- better error reporting from smart_add
44
    from bzrlib.errors import BadFileKindError, ForbiddenFileError
45
70 by mbp at sourcefrog
Prepare for smart recursive add.
46
    assert file_list
686 by Martin Pool
- glob expand add arguments on win32
47
    
48
    if sys.platform == 'win32':
49
        file_list = glob_expand_for_win32(file_list)
50
    
426 by Martin Pool
- Skip symlinks during recursive add (path from aaron)
51
    user_list = file_list[:]
88 by mbp at sourcefrog
smart_add: no warning for already-added files
52
    assert not isinstance(file_list, basestring)
70 by mbp at sourcefrog
Prepare for smart recursive add.
53
    b = bzrlib.branch.Branch(file_list[0], find_root=True)
54
    inv = b.read_working_inventory()
86 by mbp at sourcefrog
first cut at recursive add
55
    tree = b.working_tree()
87 by mbp at sourcefrog
- clean up smart_add code, and make it commit the inventory
56
    count = 0
86 by mbp at sourcefrog
first cut at recursive add
57
70 by mbp at sourcefrog
Prepare for smart recursive add.
58
    for f in file_list:
510 by Martin Pool
- fix add of files when standing in subdirectory
59
        rf = b.relpath(f)
60
        af = b.abspath(rf)
61
62
        kind = bzrlib.osutils.file_kind(af)
426 by Martin Pool
- Skip symlinks during recursive add (path from aaron)
63
64
        if kind != 'file' and kind != 'directory':
599 by Martin Pool
- better error reporting from smart_add
65
            if f in user_list:
66
                raise BadFileKindError("cannot add %s of type %s" % (f, kind))
67
            else:
68
                print "skipping %s (can't add file of kind '%s')" % (f, kind)
426 by Martin Pool
- Skip symlinks during recursive add (path from aaron)
69
                continue
70
800 by Martin Pool
Merge John's import-speedup branch:
71
        mutter("smart add of %r, abs=%r" % (f, af))
70 by mbp at sourcefrog
Prepare for smart recursive add.
72
        
73
        if bzrlib.branch.is_control_file(af):
599 by Martin Pool
- better error reporting from smart_add
74
            raise ForbiddenFileError('cannot add control file %s' % f)
87 by mbp at sourcefrog
- clean up smart_add code, and make it commit the inventory
75
            
86 by mbp at sourcefrog
first cut at recursive add
76
        versioned = (inv.path2id(rf) != None)
77
91 by mbp at sourcefrog
special handling of root directory for recursive add
78
        if rf == '':
79
            mutter("branch root doesn't need to be added")
80
        elif versioned:
88 by mbp at sourcefrog
smart_add: no warning for already-added files
81
            mutter("%r is already versioned" % f)
70 by mbp at sourcefrog
Prepare for smart recursive add.
82
        else:
87 by mbp at sourcefrog
- clean up smart_add code, and make it commit the inventory
83
            file_id = bzrlib.branch.gen_file_id(rf)
84
            inv.add_path(rf, kind=kind, file_id=file_id)
800 by Martin Pool
Merge John's import-speedup branch:
85
            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
86
            count += 1 
597 by Martin Pool
- tidy up add code
87
88
            print 'added', quotefn(f)
87 by mbp at sourcefrog
- clean up smart_add code, and make it commit the inventory
89
90
        if kind == 'directory' and recurse:
91
            for subf in os.listdir(af):
597 by Martin Pool
- tidy up add code
92
                subp = os.path.join(rf, subf)
103 by mbp at sourcefrog
Skip control directories in recursive add
93
                if subf == bzrlib.BZRDIR:
94
                    mutter("skip control directory %r" % subp)
95
                elif tree.is_ignored(subp):
87 by mbp at sourcefrog
- clean up smart_add code, and make it commit the inventory
96
                    mutter("skip ignored sub-file %r" % subp)
97
                else:
510 by Martin Pool
- fix add of files when standing in subdirectory
98
                    mutter("queue to add sub-file %r" % subp)
99
                    file_list.append(b.abspath(subp))
87 by mbp at sourcefrog
- clean up smart_add code, and make it commit the inventory
100
101
    if count > 0:
95 by mbp at sourcefrog
only show count of added files with --verbose
102
        if verbose:
103
            note('added %d' % count)
70 by mbp at sourcefrog
Prepare for smart recursive add.
104
        b._write_inventory(inv)