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
21
from os.path import dirname
23
def glob_expand_for_win32(file_list):
26
expanded_file_list = []
27
for possible_glob in file_list:
28
glob_files = glob.glob(possible_glob)
31
# special case to let the normal code path handle
32
# files that do not exists
33
expanded_file_list.append(possible_glob)
35
expanded_file_list += glob_files
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)
47
def _prepare_file_list(file_list):
48
"""Prepare a file list for use by smart_add_*."""
50
if sys.platform == 'win32':
51
file_list = glob_expand_for_win32(file_list)
54
file_list = list(file_list)
58
def smart_add(file_list, recurse=True, reporter=add_reporter_null):
59
"""Add files to version, optionally recursing into directories.
61
This is designed more towards DWIM for humans than API simplicity.
62
For the specific behaviour see the help for cmd_add().
64
Returns the number of files added.
66
file_list = _prepare_file_list(file_list)
67
b = Branch(file_list[0], find_root=True)
68
return smart_add_branch(b, file_list, recurse, reporter)
71
def smart_add_branch(branch, file_list, recurse=True, reporter=add_reporter_null):
72
"""Add files to version, optionally recursing into directories.
74
This is designed more towards DWIM for humans than API simplicity.
75
For the specific behaviour see the help for cmd_add().
77
This yields a sequence of (path, kind, file_id) for added files.
79
Returns the number of files added.
82
from bzrlib.errors import BadFileKindError, ForbiddenFileError
85
assert isinstance(recurse, bool)
87
file_list = _prepare_file_list(file_list)
31
88
user_list = file_list[:]
32
assert not isinstance(file_list, basestring)
33
b = bzrlib.branch.Branch(file_list[0], find_root=True)
34
inv = b.read_working_inventory()
35
tree = b.working_tree()
89
inv = branch.read_working_inventory()
90
tree = branch.working_tree()
38
93
for f in file_list:
39
kind = bzrlib.osutils.file_kind(f)
94
rf = branch.relpath(f)
95
af = branch.abspath(rf)
97
kind = bzrlib.osutils.file_kind(af)
41
99
if kind != 'file' and kind != 'directory':
42
if f not in user_list:
43
print "Skipping %s (can't add file of kind '%s')" % (f, kind)
101
raise BadFileKindError("cannot add %s of type %s" % (f, kind))
103
warning("skipping %s (can't add file of kind '%s')", f, kind)
45
bailout("can't add file of kind %r" % kind)
50
## TODO: It's OK to add root but only in recursive mode
52
bzrlib.mutter("smart add of %r" % f)
106
mutter("smart add of %r, abs=%r" % (f, af))
54
108
if bzrlib.branch.is_control_file(af):
55
bailout("cannot add control file %r" % af)
57
kind = bzrlib.osutils.file_kind(f)
59
if kind != 'file' and kind != 'directory':
60
bailout("can't add file '%s' of kind %r" % (f, kind))
109
raise ForbiddenFileError('cannot add control file %s' % f)
62
111
versioned = (inv.path2id(rf) != None)
113
if kind == 'directory':
115
sub_branch = Branch(af, find_root=False)
117
except NotBranchError:
65
123
mutter("branch root doesn't need to be added")
67
126
mutter("%r is already versioned" % f)
128
mutter("%r is a bzr tree" %f)
69
file_id = bzrlib.branch.gen_file_id(rf)
70
inv.add_path(rf, kind=kind, file_id=file_id)
71
bzrlib.mutter("added %r kind %r file_id={%s}" % (rf, kind, file_id))
74
bzrlib.textui.show_status('A', kind, quotefn(f))
130
count += __add_one(branch, inv, rf, kind, reporter)
76
if kind == 'directory' and recurse:
132
if kind == 'directory' and recurse and not sub_tree:
77
133
for subf in os.listdir(af):
78
subp = appendpath(rf, subf)
134
subp = os.path.join(rf, subf)
79
135
if subf == bzrlib.BZRDIR:
80
136
mutter("skip control directory %r" % subp)
81
137
elif tree.is_ignored(subp):
82
138
mutter("skip ignored sub-file %r" % subp)
84
mutter("queue to add sub-file %r" % (subp))
85
file_list.append(subp)
140
mutter("queue to add sub-file %r" % subp)
141
file_list.append(branch.abspath(subp))
144
mutter('added %d entries', count)
89
note('added %d' % count)
90
b._write_inventory(inv)
147
branch._write_inventory(inv)
151
def __add_one(branch, inv, path, kind, reporter):
152
"""Add a file or directory, automatically add unversioned parents."""
154
# Nothing to do if path is already versioned.
155
# This is safe from infinite recursion because the branch root is
157
if inv.path2id(path) != None:
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
