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