41
36
return expanded_file_list
39
def add_reporter_null(path, kind, entry):
40
"""Absorb add reports and do nothing."""
43
def add_reporter_print(path, kind, entry):
44
"""Print a line to stdout for each file that's added."""
45
print "added", quotefn(path)
44
47
def _prepare_file_list(file_list):
45
48
"""Prepare a file list for use by smart_add_*."""
47
50
if sys.platform == 'win32':
48
51
file_list = glob_expand_for_win32(file_list)
51
54
file_list = list(file_list)
55
def add_action_null(inv, path, kind):
56
"""Absorb add actions and do nothing."""
59
def add_action_print(inv, path, kind):
60
"""Print a line to stdout for each file that would be added."""
61
print "added", bzrlib.osutils.quotefn(path)
63
def add_action_add(inv, path, kind):
64
"""Add each file to the given inventory. Produce no output."""
65
entry = inv.add_path(path, kind=kind)
66
mutter("added %r kind %r file_id={%s}" % (path, kind, entry.file_id))
68
def add_action_add_and_print(inv, path, kind):
69
"""Add each file to the given inventory, and print a line to stdout."""
70
add_action_add(inv, path, kind)
71
add_action_print(inv, path, kind)
74
def smart_add(file_list, recurse=True, action=add_action_add):
58
def smart_add(file_list, recurse=True, reporter=add_reporter_null):
75
59
"""Add files to version, optionally recursing into directories.
77
61
This is designed more towards DWIM for humans than API simplicity.
80
64
Returns the number of files added.
82
66
file_list = _prepare_file_list(file_list)
83
tree = WorkingTree.open_containing(file_list[0])[0]
84
return smart_add_tree(tree, file_list, recurse, action)
67
b = Branch(file_list[0], find_root=True)
68
return smart_add_branch(b, file_list, recurse, reporter)
86
def smart_add_tree(tree, file_list, recurse=True, action=add_action_add):
71
def smart_add_branch(branch, file_list, recurse=True, reporter=add_reporter_null):
87
72
"""Add files to version, optionally recursing into directories.
89
74
This is designed more towards DWIM for humans than API simplicity.
90
75
For the specific behaviour see the help for cmd_add().
92
This calls reporter with each (path, kind, file_id) of added files.
77
This yields a sequence of (path, kind, file_id) for added files.
94
79
Returns the number of files added.
97
82
from bzrlib.errors import BadFileKindError, ForbiddenFileError
98
85
assert isinstance(recurse, bool)
100
87
file_list = _prepare_file_list(file_list)
101
88
user_list = file_list[:]
102
inv = tree.read_working_inventory()
89
inv = branch.read_working_inventory()
90
tree = branch.working_tree()
106
93
for f in file_list:
108
af = tree.abspath(rf)
111
kind = bzrlib.osutils.file_kind(af)
113
if hasattr(e, 'errno') and e.errno == errno.ENOENT:
114
raise errors.NoSuchFile(rf)
117
if not InventoryEntry.versionable_kind(kind):
94
rf = branch.relpath(f)
95
af = branch.abspath(rf)
97
kind = bzrlib.osutils.file_kind(af)
99
if kind != 'file' and kind != 'directory':
118
100
if f in user_list:
119
101
raise BadFileKindError("cannot add %s of type %s" % (f, kind))
121
103
warning("skipping %s (can't add file of kind '%s')", f, kind)
124
mutter("smart add of %r, abs=%r", f, af)
106
mutter("smart add of %r, abs=%r" % (f, af))
126
if is_control_file(af):
108
if bzrlib.branch.is_control_file(af):
127
109
raise ForbiddenFileError('cannot add control file %s' % f)
129
111
versioned = (inv.path2id(rf) != None)
131
113
if kind == 'directory':
133
sub_branch = WorkingTree(af)
115
sub_branch = Branch(af, find_root=False)
135
117
except NotBranchError:
137
except errors.UnsupportedFormatError:
143
mutter("tree root doesn't need to be added")
123
mutter("branch root doesn't need to be added")
146
mutter("%r is already versioned", f)
126
mutter("%r is already versioned" % f)
148
mutter("%r is a bzr tree", f)
128
mutter("%r is a bzr tree" %f)
150
added.extend(__add_one(tree, inv, rf, kind, action))
130
count += __add_one(branch, inv, rf, kind, reporter)
152
132
if kind == 'directory' and recurse and not sub_tree:
153
133
for subf in os.listdir(af):
154
subp = bzrlib.osutils.pathjoin(rf, subf)
134
subp = os.path.join(rf, subf)
155
135
if subf == bzrlib.BZRDIR:
156
mutter("skip control directory %r", subp)
136
mutter("skip control directory %r" % subp)
137
elif tree.is_ignored(subp):
138
mutter("skip ignored sub-file %r" % subp)
158
ignore_glob = tree.is_ignored(subp)
159
if ignore_glob is not None:
160
mutter("skip ignored sub-file %r", subp)
161
if ignore_glob not in ignored:
162
ignored[ignore_glob] = []
163
ignored[ignore_glob].append(subp)
165
mutter("queue to add sub-file %r", subp)
166
file_list.append(tree.abspath(subp))
169
mutter('added %d entries', len(added))
140
mutter("queue to add sub-file %r" % subp)
141
file_list.append(branch.abspath(subp))
144
mutter('added %d entries', count)
172
tree._write_inventory(inv)
174
return added, ignored
176
def __add_one(tree, inv, path, kind, action):
147
branch._write_inventory(inv)
151
def __add_one(branch, inv, path, kind, reporter):
177
152
"""Add a file or directory, automatically add unversioned parents."""
179
154
# Nothing to do if path is already versioned.
180
# This is safe from infinite recursion because the tree root is
155
# This is safe from infinite recursion because the branch root is
181
156
# always versioned.
182
157
if inv.path2id(path) != None:
186
added = __add_one(tree, inv, dirname(path), 'directory', action)
187
action(inv, path, kind)
189
return added + [path]
161
count = __add_one(branch, inv, dirname(path), 'directory', reporter)
163
entry = inv.add_path(path, kind=kind)
164
mutter("added %r kind %r file_id={%s}" % (path, kind, entry.file_id))
165
reporter(path, kind, entry)
added
removed
bzrlib/add.py
