14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
20
from osutils import quotefn, appendpath
21
from errors import bailout
22
from trace import mutter, note
24
def smart_add(file_list, verbose=False, recurse=True):
25
"""Add files to version, optionall recursing into directories.
27
This is designed more towards DWIM for humans than API simplicity.
28
For the specific behaviour see the help for cmd_add().
17
from bzrlib.trace import mutter, note, warning
18
from bzrlib.errors import NotBranchError
19
from bzrlib.branch import Branch
20
from bzrlib.osutils import quotefn
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
38
def _NullAddCallback(path, kind, entry):
41
def _PrintAddCallback(path, kind, entry):
42
print "added", quotefn(path)
44
def _prepare_file_list(file_list):
45
"""Prepare a file list for use by smart_add_*."""
47
if sys.platform == 'win32':
48
file_list = glob_expand_for_win32(file_list)
51
file_list = list(file_list)
31
52
assert not isinstance(file_list, basestring)
32
b = bzrlib.branch.Branch(file_list[0], find_root=True)
33
inv = b.read_working_inventory()
34
tree = b.working_tree()
55
def smart_add(file_list, verbose=True, recurse=True, callback=_NullAddCallback):
56
"""Add files to version, optionally recursing into directories.
58
This is designed more towards DWIM for humans than API simplicity.
59
For the specific behaviour see the help for cmd_add().
61
file_list = _prepare_file_list(file_list)
62
b = Branch(file_list[0], find_root=True)
63
return smart_add_branch(b, file_list, verbose, recurse)
65
def smart_add_branch(branch, file_list, verbose=True, recurse=True,
66
callback=_NullAddCallback):
67
"""Add files to version, optionally recursing into directories.
69
This is designed more towards DWIM for humans than API simplicity.
70
For the specific behaviour see the help for cmd_add().
72
This yields a sequence of (path, kind, file_id) for added files.
76
from bzrlib.osutils import quotefn
77
from bzrlib.errors import BadFileKindError, ForbiddenFileError
81
file_list = _prepare_file_list(file_list)
82
user_list = file_list[:]
83
inv = branch.read_working_inventory()
84
tree = branch.working_tree()
37
87
for f in file_list:
41
## TODO: It's OK to add root but only in recursive mode
43
bzrlib.mutter("smart add of %r" % f)
88
rf = branch.relpath(f)
89
af = branch.abspath(rf)
91
kind = bzrlib.osutils.file_kind(af)
93
if kind != 'file' and kind != 'directory':
95
raise BadFileKindError("cannot add %s of type %s" % (f, kind))
97
warning("skipping %s (can't add file of kind '%s')", f, kind)
100
mutter("smart add of %r, abs=%r" % (f, af))
45
102
if bzrlib.branch.is_control_file(af):
46
bailout("cannot add control file %r" % af)
48
kind = bzrlib.osutils.file_kind(f)
50
if kind != 'file' and kind != 'directory':
51
bailout("can't add file of kind %r" % kind)
103
raise ForbiddenFileError('cannot add control file %s' % f)
53
105
versioned = (inv.path2id(rf) != None)
107
if kind == 'directory':
109
sub_branch = Branch(af, find_root=False)
111
except NotBranchError:
56
117
mutter("branch root doesn't need to be added")
58
120
mutter("%r is already versioned" % f)
122
mutter("%r is a bzr tree" %f)
60
file_id = bzrlib.branch.gen_file_id(rf)
61
inv.add_path(rf, kind=kind, file_id=file_id)
62
bzrlib.mutter("added %r kind %r file_id={%s}" % (rf, kind, file_id))
124
entry = inv.add_path(rf, kind=kind)
125
mutter("added %r kind %r file_id={%s}" % (rf, kind, entry.file_id))
65
bzrlib.textui.show_status('A', kind, quotefn(f))
127
callback(rf, kind, entry)
67
if kind == 'directory' and recurse:
129
if kind == 'directory' and recurse and not sub_tree:
68
130
for subf in os.listdir(af):
69
subp = appendpath(rf, subf)
131
subp = os.path.join(rf, subf)
70
132
if subf == bzrlib.BZRDIR:
71
133
mutter("skip control directory %r" % subp)
72
134
elif tree.is_ignored(subp):
73
135
mutter("skip ignored sub-file %r" % subp)
75
mutter("queue to add sub-file %r" % (subp))
76
file_list.append(subp)
137
mutter("queue to add sub-file %r" % subp)
138
file_list.append(branch.abspath(subp))
80
143
note('added %d' % count)
81
b._write_inventory(inv)
144
branch._write_inventory(inv)
146
note("nothing new to add")
147
# should this return 1 to the shell?
added
removed
bzrlib/add.py
