38
40
return expanded_file_list
41
def add_reporter_null(path, kind, entry):
42
"""Absorb add reports and do nothing."""
45
def add_reporter_print(path, kind, entry):
46
"""Print a line to stdout for each file that's added."""
47
print "added", quotefn(path)
49
43
def _prepare_file_list(file_list):
50
44
"""Prepare a file list for use by smart_add_*."""
52
46
if sys.platform == 'win32':
53
47
file_list = glob_expand_for_win32(file_list)
56
50
file_list = list(file_list)
60
def smart_add(file_list, recurse=True, reporter=add_reporter_null):
54
def add_action_null(inv, parent_ie, path, kind):
55
"""Absorb add actions and do nothing."""
59
def add_action_print(inv, parent_ie, path, kind):
60
"""Print a line to stdout for each file that would be added."""
61
print "added", bzrlib.osutils.quotefn(path)
64
def add_action_add(inv, parent_ie, path, kind):
65
"""Add each file to the given inventory. Produce no output."""
66
if parent_ie is not None:
67
entry = bzrlib.inventory.make_entry(
68
kind, bzrlib.osutils.basename(path), parent_ie.file_id)
71
entry = inv.add_path(path, kind=kind)
72
# mutter("added %r kind %r file_id={%s}" % (path, kind, entry.file_id))
75
def add_action_add_and_print(inv, parent_ie, path, kind):
76
"""Add each file to the given inventory, and print a line to stdout."""
77
add_action_add(inv, parent_ie, path, kind)
78
add_action_print(inv, parent_ie, path, kind)
81
def smart_add(file_list, recurse=True, action=add_action_add):
61
82
"""Add files to version, optionally recursing into directories.
63
84
This is designed more towards DWIM for humans than API simplicity.
66
87
Returns the number of files added.
68
89
file_list = _prepare_file_list(file_list)
69
b = Branch.open_containing(file_list[0])[0]
70
return smart_add_branch(b, file_list, recurse, reporter)
73
def smart_add_branch(branch, file_list, recurse=True, reporter=add_reporter_null):
90
tree = WorkingTree.open_containing(file_list[0])[0]
91
return smart_add_tree(tree, file_list, recurse, action)
94
def smart_add_tree(tree, file_list, recurse=True, action=add_action_add):
74
95
"""Add files to version, optionally recursing into directories.
76
97
This is designed more towards DWIM for humans than API simplicity.
77
98
For the specific behaviour see the help for cmd_add().
79
This yields a sequence of (path, kind, file_id) for added files.
100
This calls reporter with each (path, kind, file_id) of added files.
81
102
Returns the number of files added.
84
105
from bzrlib.errors import BadFileKindError, ForbiddenFileError
87
106
assert isinstance(recurse, bool)
89
file_list = _prepare_file_list(file_list)
90
user_list = file_list[:]
91
inv = branch.read_working_inventory()
92
tree = branch.working_tree()
97
af = branch.abspath(rf)
99
kind = bzrlib.osutils.file_kind(af)
108
prepared_list = _prepare_file_list(file_list)
109
mutter("smart add of %r, originally %r", prepared_list, file_list)
110
inv = tree.read_working_inventory()
116
# validate user file paths and convert all paths to tree
117
# relative : its cheaper to make a tree relative path an abspath
118
# than to convert an abspath to tree relative.
119
for filepath in prepared_list:
120
rf = tree.relpath(filepath)
122
files_to_add.append((rf, None))
123
# validate user parameters. Our recursive code avoids adding new files
124
# that need such validation
125
if tree.is_control_filename(rf):
126
raise ForbiddenFileError('cannot add control file %s' % filepath)
128
for filepath, parent_ie in files_to_add:
129
# filepath is tree-relative
130
abspath = tree.abspath(filepath)
132
# find the kind of the path being added. This is not
133
# currently determined when we list directories
134
# recursively, but in theory we can determine while
135
# doing the directory listing on *some* platformans.
136
# TODO: a safe, portable, clean interface which will
137
# be faster than os.listdir() + stat. Specifically,
138
# readdir - dirent.d_type supplies the file type when
139
# it is defined. (Apparently Mac OSX has the field but
140
# does not fill it in ?!) Robert C, Martin P.
142
kind = bzrlib.osutils.file_kind(abspath)
144
if hasattr(e, 'errno') and e.errno == errno.ENOENT:
145
raise errors.NoSuchFile(abspath)
148
# we need to call this to determine the inventory kind to create.
101
149
if not InventoryEntry.versionable_kind(kind):
103
raise BadFileKindError("cannot add %s of type %s" % (f, kind))
150
if filepath in user_files:
151
raise BadFileKindError("cannot add %s of type %s" % (abspath, kind))
105
warning("skipping %s (can't add file of kind '%s')", f, kind)
153
warning("skipping %s (can't add file of kind '%s')", abspath, kind)
108
mutter("smart add of %r, abs=%r" % (f, af))
110
if bzrlib.branch.is_control_file(af):
111
raise ForbiddenFileError('cannot add control file %s' % f)
113
versioned = (inv.path2id(rf) != None)
156
if parent_ie is not None:
157
versioned = bzrlib.osutils.basename(filepath) in parent_ie.children
159
# without the parent ie, use the relatively slower inventory
161
versioned = inv.has_filename(filepath)
115
163
if kind == 'directory':
117
sub_branch = Branch.open(af)
165
sub_branch = bzrlib.bzrdir.BzrDir.open(abspath)
119
167
except NotBranchError:
127
mutter("branch root doesn't need to be added")
175
# mutter("tree root doesn't need to be added")
130
mutter("%r is already versioned" % f)
179
# mutter("%r is already versioned", abspath)
132
mutter("%r is a bzr tree" %f)
181
mutter("%r is a nested bzr tree", abspath)
134
count += __add_one(branch, inv, rf, kind, reporter)
183
added.extend(__add_one(tree, inv, parent_ie, filepath, kind, action))
136
185
if kind == 'directory' and recurse and not sub_tree:
137
for subf in os.listdir(af):
138
subp = os.path.join(rf, subf)
139
if subf == bzrlib.BZRDIR:
140
mutter("skip control directory %r" % subp)
141
elif tree.is_ignored(subp):
142
mutter("skip ignored sub-file %r" % subp)
144
mutter("queue to add sub-file %r" % subp)
145
file_list.append(branch.abspath(subp))
148
mutter('added %d entries', count)
151
branch._write_inventory(inv)
155
def __add_one(branch, inv, path, kind, reporter):
156
"""Add a file or directory, automatically add unversioned parents."""
187
if parent_ie is not None:
189
this_ie = parent_ie.children[bzrlib.osutils.basename(filepath)]
191
# without the parent ie, use the relatively slower inventory
193
this_id = inv.path2id(filepath)
197
this_ie = inv[this_id]
201
for subf in os.listdir(abspath):
202
# here we could use TreeDirectory rather than
203
# string concatenation.
204
subp = bzrlib.osutils.pathjoin(filepath, subf)
205
# TODO: is_control_filename is very slow. Make it faster.
206
# TreeDirectory.is_control_filename could also make this
207
# faster - its impossible for a non root dir to have a
209
if tree.is_control_filename(subp):
210
mutter("skip control directory %r", subp)
212
# ignore while selecting files - if we globbed in the
213
# outer loop we would ignore user files.
214
ignore_glob = tree.is_ignored(subp)
215
if ignore_glob is not None:
216
# mutter("skip ignored sub-file %r", subp)
217
if ignore_glob not in ignored:
218
ignored[ignore_glob] = []
219
ignored[ignore_glob].append(subp)
221
#mutter("queue to add sub-file %r", subp)
222
files_to_add.append((subp, this_ie))
225
tree._write_inventory(inv)
226
return added, ignored
229
def __add_one(tree, inv, parent_ie, path, kind, action):
230
"""Add a new entry to the inventory and automatically add unversioned parents.
232
Actual adding of the entry is delegated to the action callback.
234
:param inv: Inventory which will receive the new entry.
235
:param parent_ie: Parent inventory entry if known, or None. If
236
None, the parent is looked up by name and used if present, otherwise
237
it is recursively added.
238
:param kind: Kind of new entry (file, directory, etc)
239
:param action: callback(inv, parent_ie, path, kind); return ignored.
240
:returns: A list of paths which have been added.
158
243
# Nothing to do if path is already versioned.
159
# This is safe from infinite recursion because the branch root is
244
# This is safe from infinite recursion because the tree root is
160
245
# always versioned.
161
if inv.path2id(path) != None:
165
count = __add_one(branch, inv, dirname(path), 'directory', reporter)
167
entry = inv.add_path(path, kind=kind)
168
mutter("added %r kind %r file_id={%s}" % (path, kind, entry.file_id))
169
reporter(path, kind, entry)
246
if parent_ie is not None:
247
# we have a parent ie already
250
# slower but does not need parent_ie
251
if inv.has_filename(path):
254
added = __add_one(tree, inv, None, dirname(path), 'directory', action)
255
parent_id = inv.path2id(dirname(path))
256
if parent_id is not None:
257
parent_ie = inv[inv.path2id(dirname(path))]
260
action(inv, parent_ie, path, kind)
262
return added + [path]
added
removed
bzrlib/add.py
