31
39
expanded_file_list += glob_files
32
40
return expanded_file_list
34
def smart_add(file_list, verbose=True, recurse=True):
35
"""Add files to version, optionally recursing into directories.
37
This is designed more towards DWIM for humans than API simplicity.
38
For the specific behaviour see the help for cmd_add().
43
def add_reporter_null(path, kind, entry):
44
"""Absorb add reports and do nothing."""
47
def add_reporter_print(path, kind, entry):
48
"""Print a line to stdout for each file that's added."""
49
print "added", quotefn(path)
51
def _prepare_file_list(file_list):
52
"""Prepare a file list for use by smart_add_*."""
42
from bzrlib.osutils import quotefn, kind_marker
43
from bzrlib.errors import BadFileKindError, ForbiddenFileError
47
54
if sys.platform == 'win32':
48
55
file_list = glob_expand_for_win32(file_list)
58
file_list = list(file_list)
62
def smart_add(file_list, recurse=True, reporter=add_reporter_null):
63
"""Add files to version, optionally recursing into directories.
65
This is designed more towards DWIM for humans than API simplicity.
66
For the specific behaviour see the help for cmd_add().
68
Returns the number of files added.
70
file_list = _prepare_file_list(file_list)
71
b = Branch.open_containing(file_list[0])[0]
72
return smart_add_branch(b, file_list, recurse, reporter)
75
def smart_add_branch(branch, file_list, recurse=True, reporter=add_reporter_null):
76
"""Add files to version, optionally recursing into directories.
78
This is designed more towards DWIM for humans than API simplicity.
79
For the specific behaviour see the help for cmd_add().
81
This yields a sequence of (path, kind, file_id) for added files.
83
Returns the number of files added.
86
from bzrlib.errors import BadFileKindError, ForbiddenFileError
89
assert isinstance(recurse, bool)
91
file_list = _prepare_file_list(file_list)
53
92
user_list = file_list[:]
54
assert not isinstance(file_list, basestring)
55
b = bzrlib.branch.Branch(file_list[0], find_root=True)
56
inv = b.read_working_inventory()
57
tree = b.working_tree()
93
tree = branch.working_tree()
94
inv = tree.read_working_inventory()
60
97
for f in file_list:
99
af = branch.abspath(rf)
64
101
kind = bzrlib.osutils.file_kind(af)
66
if kind != 'file' and kind != 'directory':
103
if not InventoryEntry.versionable_kind(kind):
67
104
if f in user_list:
68
105
raise BadFileKindError("cannot add %s of type %s" % (f, kind))
70
print "skipping %s (can't add file of kind '%s')" % (f, kind)
107
warning("skipping %s (can't add file of kind '%s')", f, kind)
73
mutter("smart add of %r, abs=%r" % (f, af))
110
mutter("smart add of %r, abs=%r", f, af)
75
112
if bzrlib.branch.is_control_file(af):
76
113
raise ForbiddenFileError('cannot add control file %s' % f)
78
115
versioned = (inv.path2id(rf) != None)
117
if kind == 'directory':
119
sub_branch = Branch.open(af)
121
except NotBranchError:
123
except errors.UnsupportedFormatError:
81
129
mutter("branch root doesn't need to be added")
83
mutter("%r is already versioned" % f)
132
mutter("%r is already versioned", f)
134
mutter("%r is a bzr tree", f)
85
file_id = bzrlib.branch.gen_file_id(rf)
86
inv.add_path(rf, kind=kind, file_id=file_id)
87
mutter("added %r kind %r file_id={%s}" % (rf, kind, file_id))
90
print 'added', quotefn(f)
92
if kind == 'directory' and recurse:
136
count += __add_one(branch, inv, rf, kind, reporter)
138
if kind == 'directory' and recurse and not sub_tree:
93
139
for subf in os.listdir(af):
94
140
subp = os.path.join(rf, subf)
95
141
if subf == bzrlib.BZRDIR:
96
mutter("skip control directory %r" % subp)
142
mutter("skip control directory %r", subp)
97
143
elif tree.is_ignored(subp):
98
mutter("skip ignored sub-file %r" % subp)
144
mutter("skip ignored sub-file %r", subp)
100
mutter("queue to add sub-file %r" % subp)
101
file_list.append(b.abspath(subp))
146
mutter("queue to add sub-file %r", subp)
147
file_list.append(branch.abspath(subp))
150
mutter('added %d entries', count)
105
note('added %d' % count)
106
b._write_inventory(inv)
108
print "nothing new to add"
109
# should this return 1 to the shell?
153
branch.working_tree()._write_inventory(inv)
157
def __add_one(branch, inv, path, kind, reporter):
158
"""Add a file or directory, automatically add unversioned parents."""
160
# Nothing to do if path is already versioned.
161
# This is safe from infinite recursion because the branch root is
163
if inv.path2id(path) != None:
167
count = __add_one(branch, inv, dirname(path), 'directory', reporter)
169
entry = inv.add_path(path, kind=kind)
170
mutter("added %r kind %r file_id={%s}", path, kind, entry.file_id)
171
reporter(path, kind, entry)
added
removed
bzrlib/add.py
