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 _prepare_file_list(file_list):
44
"""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
46
if sys.platform == 'win32':
48
47
file_list = glob_expand_for_win32(file_list)
50
file_list = list(file_list)
54
def add_action_null(inv, path, kind):
55
"""Absorb add actions and do nothing."""
58
def add_action_print(inv, path, kind):
59
"""Print a line to stdout for each file that would be added."""
60
print "added", bzrlib.osutils.quotefn(path)
62
def add_action_add(inv, path, kind):
63
"""Add each file to the given inventory. Produce no output."""
64
entry = inv.add_path(path, kind=kind)
65
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):
75
"""Add files to version, optionally recursing into directories.
77
This is designed more towards DWIM for humans than API simplicity.
78
For the specific behaviour see the help for cmd_add().
80
Returns the number of files added.
82
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)
87
def smart_add_tree(tree, file_list, recurse=True, action=add_action_add):
88
"""Add files to version, optionally recursing into directories.
90
This is designed more towards DWIM for humans than API simplicity.
91
For the specific behaviour see the help for cmd_add().
93
This calls reporter with each (path, kind, file_id) of added files.
95
Returns the number of files added.
98
from bzrlib.errors import BadFileKindError, ForbiddenFileError
99
assert isinstance(recurse, bool)
53
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()
64
kind = bzrlib.osutils.file_kind(af)
66
if kind != 'file' and kind != 'directory':
68
raise BadFileKindError("cannot add %s of type %s" % (f, kind))
101
orig_list = file_list
102
file_list = _prepare_file_list(file_list)
103
mutter("smart add of %r, originally %r", file_list, orig_list)
104
inv = tree.read_working_inventory()
107
user_files = set(file_list)
109
for filepath in file_list:
110
# convert a random abs or cwd-relative path to tree relative.
111
rf = tree.relpath(filepath)
113
# validate user parameters. Our recursive code avoids adding new files
114
# that need such validation
115
if filepath in user_files and tree.is_control_filename(rf):
116
raise ForbiddenFileError('cannot add control file %s' % filepath)
118
# find the kind of the path being added. This is not
119
# currently determined when we list directories
120
# recursively, but in theory we can determine while
121
# doing the directory listing on *some* platformans.
122
# TODO: a safe, portable, clean interface which will
123
# be faster than os.listdir() + stat. Specifically,
124
# readdir - dirent.d_type supplies the file type when
125
# it is defined. (Apparently Mac OSX has the field but
126
# does not fill it in ?!) Robert C, Martin P.
128
kind = bzrlib.osutils.file_kind(filepath)
130
if hasattr(e, 'errno') and e.errno == errno.ENOENT:
131
raise errors.NoSuchFile(filepath)
134
# we need to call this to determine the inventory kind to create.
135
if not InventoryEntry.versionable_kind(kind):
136
if filepath in user_files:
137
raise BadFileKindError("cannot add %s of type %s" % (filepath, kind))
70
print "skipping %s (can't add file of kind '%s')" % (f, kind)
139
warning("skipping %s (can't add file of kind '%s')", filepath, kind)
73
mutter("smart add of %r, abs=%r" % (f, af))
75
if bzrlib.branch.is_control_file(af):
76
raise ForbiddenFileError('cannot add control file %s' % f)
78
versioned = (inv.path2id(rf) != None)
142
# TODO make has_filename faster or provide a better api for accessing/determining
143
# this status. perhaps off the inventory directory object.
144
versioned = inv.has_filename(rf)
146
if kind == 'directory':
148
sub_branch = bzrlib.bzrdir.BzrDir.open(filepath)
150
except NotBranchError:
152
except errors.UnsupportedFormatError:
81
mutter("branch root doesn't need to be added")
158
# mutter("tree root doesn't need to be added")
83
mutter("%r is already versioned" % f)
162
# mutter("%r is already versioned", filepath)
164
mutter("%r is a nested bzr tree", filepath)
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:
93
for subf in os.listdir(af):
94
subp = os.path.join(rf, subf)
95
if subf == bzrlib.BZRDIR:
96
mutter("skip control directory %r" % subp)
97
elif tree.is_ignored(subp):
98
mutter("skip ignored sub-file %r" % subp)
166
added.extend(__add_one(tree, inv, rf, kind, action))
168
if kind == 'directory' and recurse and not sub_tree:
169
for subf in os.listdir(filepath):
170
# here we could use TreeDirectory rather than
171
# string concatenation.
172
subp = bzrlib.osutils.pathjoin(rf, subf)
173
# TODO: is_control_filename is very slow. Make it faster.
174
# TreeDirectory.is_control_filename could also make this
175
# faster - its impossible for a non root dir to have a
177
if tree.is_control_filename(subp):
178
mutter("skip control directory %r", subp)
100
mutter("queue to add sub-file %r" % subp)
101
file_list.append(b.abspath(subp))
105
note('added %d' % count)
106
b._write_inventory(inv)
108
print "nothing new to add"
109
# should this return 1 to the shell?
180
# ignore while selecting files - if we globbed in the
181
# outer loop we would ignore user files.
182
ignore_glob = tree.is_ignored(subp)
183
if ignore_glob is not None:
184
# mutter("skip ignored sub-file %r", subp)
185
if ignore_glob not in ignored:
186
ignored[ignore_glob] = []
187
ignored[ignore_glob].append(subp)
189
#mutter("queue to add sub-file %r", subp)
190
file_list.append(tree.abspath(subp))
193
tree._write_inventory(inv)
194
return added, ignored
197
def __add_one(tree, inv, path, kind, action):
198
"""Add a file or directory, automatically add unversioned parents."""
200
# Nothing to do if path is already versioned.
201
# This is safe from infinite recursion because the tree root is
203
if inv.path2id(path) != None:
207
added = __add_one(tree, inv, dirname(path), 'directory', action)
208
action(inv, path, kind)
210
return added + [path]
added
removed
bzrlib/add.py
