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