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
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.open_containing(file_list[0])
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)
88
user_list = file_list[:]
89
inv = branch.read_working_inventory()
90
tree = branch.working_tree()
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().
31
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()
93
37
for f in file_list:
94
rf = branch.relpath(f)
95
af = branch.abspath(rf)
97
kind = bzrlib.osutils.file_kind(af)
41
## TODO: It's OK to add root but only in recursive mode
43
bzrlib.mutter("smart add of %r" % f)
45
if bzrlib.branch.is_control_file(af):
46
bailout("cannot add control file %r" % af)
48
kind = bzrlib.osutils.file_kind(f)
99
50
if kind != 'file' and kind != 'directory':
101
raise BadFileKindError("cannot add %s of type %s" % (f, kind))
103
warning("skipping %s (can't add file of kind '%s')", f, kind)
106
mutter("smart add of %r, abs=%r" % (f, af))
108
if bzrlib.branch.is_control_file(af):
109
raise ForbiddenFileError('cannot add control file %s' % f)
51
bailout("can't add file of kind %r" % kind)
111
53
versioned = (inv.path2id(rf) != None)
113
if kind == 'directory':
115
sub_branch = Branch.open(af)
117
except NotBranchError:
123
56
mutter("branch root doesn't need to be added")
126
58
mutter("%r is already versioned" % f)
128
mutter("%r is a bzr tree" %f)
130
count += __add_one(branch, inv, rf, kind, reporter)
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))
65
bzrlib.textui.show_status('A', kind, quotefn(f))
132
if kind == 'directory' and recurse and not sub_tree:
67
if kind == 'directory' and recurse:
133
68
for subf in os.listdir(af):
134
subp = os.path.join(rf, subf)
69
subp = appendpath(rf, subf)
135
70
if subf == bzrlib.BZRDIR:
136
71
mutter("skip control directory %r" % subp)
137
72
elif tree.is_ignored(subp):
138
73
mutter("skip ignored sub-file %r" % subp)
140
mutter("queue to add sub-file %r" % subp)
141
file_list.append(branch.abspath(subp))
144
mutter('added %d entries', count)
75
mutter("queue to add sub-file %r" % (subp))
76
file_list.append(subp)
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)
80
note('added %d' % count)
81
b._write_inventory(inv)
added
removed
bzrlib/add.py
