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 trace import mutter, note
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
22
def glob_expand_for_win32(file_list):
34
34
expanded_file_list += glob_files
35
35
return expanded_file_list
37
def smart_add(file_list, verbose=True, recurse=True):
38
"""Add files to version, optionally recursing into directories.
40
This is designed more towards DWIM for humans than API simplicity.
41
For the specific behaviour see the help for cmd_add().
43
from bzrlib.osutils import quotefn, kind_marker
44
from bzrlib.errors import BadFileKindError, ForbiddenFileError
38
def add_reporter_null(path, kind, entry):
39
"""Absorb add reports and do nothing."""
42
def add_reporter_print(path, kind, entry):
43
"""Print a line to stdout for each file that's added."""
44
print "added", quotefn(path)
46
def _prepare_file_list(file_list):
47
"""Prepare a file list for use by smart_add_*."""
48
49
if sys.platform == 'win32':
49
50
file_list = glob_expand_for_win32(file_list)
53
file_list = list(file_list)
57
def smart_add(file_list, recurse=True, reporter=add_reporter_null):
58
"""Add files to version, optionally recursing into directories.
60
This is designed more towards DWIM for humans than API simplicity.
61
For the specific behaviour see the help for cmd_add().
63
Returns the number of files added.
65
file_list = _prepare_file_list(file_list)
66
b = Branch(file_list[0], find_root=True)
67
return smart_add_branch(b, file_list, recurse, reporter)
70
def smart_add_branch(branch, file_list, recurse=True, reporter=add_reporter_null):
71
"""Add files to version, optionally recursing into directories.
73
This is designed more towards DWIM for humans than API simplicity.
74
For the specific behaviour see the help for cmd_add().
76
This yields a sequence of (path, kind, file_id) for added files.
78
Returns the number of files added.
82
from bzrlib.osutils import quotefn
83
from bzrlib.errors import BadFileKindError, ForbiddenFileError
87
assert isinstance(recurse, bool)
89
file_list = _prepare_file_list(file_list)
51
90
user_list = file_list[:]
52
assert not isinstance(file_list, basestring)
53
b = bzrlib.branch.Branch(file_list[0], find_root=True)
54
inv = b.read_working_inventory()
55
tree = b.working_tree()
91
inv = branch.read_working_inventory()
92
tree = branch.working_tree()
58
95
for f in file_list:
96
rf = branch.relpath(f)
97
af = branch.abspath(rf)
62
99
kind = bzrlib.osutils.file_kind(af)
65
102
if f in user_list:
66
103
raise BadFileKindError("cannot add %s of type %s" % (f, kind))
68
print "skipping %s (can't add file of kind '%s')" % (f, kind)
105
warning("skipping %s (can't add file of kind '%s')", f, kind)
71
bzrlib.mutter("smart add of %r, abs=%r" % (f, af))
108
mutter("smart add of %r, abs=%r" % (f, af))
73
110
if bzrlib.branch.is_control_file(af):
74
111
raise ForbiddenFileError('cannot add control file %s' % f)
76
113
versioned = (inv.path2id(rf) != None)
115
if kind == 'directory':
117
sub_branch = Branch(af, find_root=False)
119
except NotBranchError:
79
125
mutter("branch root doesn't need to be added")
81
128
mutter("%r is already versioned" % f)
130
mutter("%r is a bzr tree" %f)
83
file_id = bzrlib.branch.gen_file_id(rf)
84
inv.add_path(rf, kind=kind, file_id=file_id)
85
bzrlib.mutter("added %r kind %r file_id={%s}" % (rf, kind, file_id))
132
entry = inv.add_path(rf, kind=kind)
133
mutter("added %r kind %r file_id={%s}" % (rf, kind, entry.file_id))
88
print 'added', quotefn(f)
90
if kind == 'directory' and recurse:
135
reporter(rf, kind, entry)
137
if kind == 'directory' and recurse and not sub_tree:
91
138
for subf in os.listdir(af):
92
139
subp = os.path.join(rf, subf)
93
140
if subf == bzrlib.BZRDIR:
added
removed
bzrlib/add.py
