20
from osutils import quotefn, appendpath
21
from errors import bailout
20
22
from trace import mutter, note
22
def glob_expand_for_win32(file_list):
25
expanded_file_list = []
26
for possible_glob in file_list:
27
glob_files = glob.glob(possible_glob)
30
# special case to let the normal code path handle
31
# files that do not exists
32
expanded_file_list.append(possible_glob)
34
expanded_file_list += glob_files
35
return expanded_file_list
37
def smart_add(file_list, verbose=True, recurse=True):
38
"""Add files to version, optionally recursing into directories.
24
def smart_add(file_list, verbose=False, recurse=True):
25
"""Add files to version, optionall recursing into directories.
40
27
This is designed more towards DWIM for humans than API simplicity.
41
28
For the specific behaviour see the help for cmd_add().
43
from bzrlib.osutils import quotefn, kind_marker
44
from bzrlib.errors import BadFileKindError, ForbiddenFileError
48
if sys.platform == 'win32':
49
file_list = glob_expand_for_win32(file_list)
51
31
user_list = file_list[:]
52
32
assert not isinstance(file_list, basestring)
53
33
b = bzrlib.branch.Branch(file_list[0], find_root=True)
58
38
for f in file_list:
39
kind = bzrlib.osutils.file_kind(f)
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)
45
bailout("can't add file of kind %r" % kind)
62
kind = bzrlib.osutils.file_kind(af)
64
if kind != 'file' and kind != 'directory':
66
raise BadFileKindError("cannot add %s of type %s" % (f, kind))
68
print "skipping %s (can't add file of kind '%s')" % (f, kind)
71
mutter("smart add of %r, abs=%r" % (f, af))
50
## TODO: It's OK to add root but only in recursive mode
52
bzrlib.mutter("smart add of %r" % f)
73
54
if bzrlib.branch.is_control_file(af):
74
raise ForbiddenFileError('cannot add control file %s' % f)
55
bailout("cannot add control file %r" % af)
76
58
versioned = (inv.path2id(rf) != None)
83
65
file_id = bzrlib.branch.gen_file_id(rf)
84
66
inv.add_path(rf, kind=kind, file_id=file_id)
85
mutter("added %r kind %r file_id={%s}" % (rf, kind, file_id))
67
bzrlib.mutter("added %r kind %r file_id={%s}" % (rf, kind, file_id))
88
print 'added', quotefn(f)
70
bzrlib.textui.show_status('A', kind, quotefn(f))
90
72
if kind == 'directory' and recurse:
91
73
for subf in os.listdir(af):
92
subp = os.path.join(rf, subf)
74
subp = appendpath(rf, subf)
93
75
if subf == bzrlib.BZRDIR:
94
76
mutter("skip control directory %r" % subp)
95
77
elif tree.is_ignored(subp):
96
78
mutter("skip ignored sub-file %r" % subp)
98
mutter("queue to add sub-file %r" % subp)
99
file_list.append(b.abspath(subp))
80
mutter("queue to add sub-file %r" % (subp))
81
file_list.append(subp)