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
17
from trace import mutter, note
22
19
def glob_expand_for_win32(file_list):
34
31
expanded_file_list += glob_files
35
32
return expanded_file_list
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_*."""
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().
42
from bzrlib.osutils import quotefn, kind_marker
43
from bzrlib.errors import BadFileKindError, ForbiddenFileError
49
47
if sys.platform == 'win32':
50
48
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)
90
53
user_list = file_list[:]
91
inv = branch.read_working_inventory()
92
tree = branch.working_tree()
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()
95
60
for f in file_list:
96
rf = branch.relpath(f)
97
af = branch.abspath(rf)
99
64
kind = bzrlib.osutils.file_kind(af)
113
78
versioned = (inv.path2id(rf) != None)
115
if kind == 'directory':
117
sub_branch = Branch(af, find_root=False)
119
except NotBranchError:
125
81
mutter("branch root doesn't need to be added")
128
83
mutter("%r is already versioned" % f)
130
mutter("%r is a bzr tree" %f)
132
entry = inv.add_path(rf, kind=kind)
133
mutter("added %r kind %r file_id={%s}" % (rf, kind, entry.file_id))
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))
135
reporter(rf, kind, entry)
137
if kind == 'directory' and recurse and not sub_tree:
90
print 'added', quotefn(f)
92
if kind == 'directory' and recurse:
138
93
for subf in os.listdir(af):
139
94
subp = os.path.join(rf, subf)
140
95
if subf == bzrlib.BZRDIR:
143
98
mutter("skip ignored sub-file %r" % subp)
145
100
mutter("queue to add sub-file %r" % subp)
146
file_list.append(branch.abspath(subp))
149
mutter('added %d entries', count)
101
file_list.append(b.abspath(subp))
152
branch._write_inventory(inv)
105
note('added %d' % count)
106
b._write_inventory(inv)
108
print "nothing new to add"
109
# should this return 1 to the shell?
added
removed
bzrlib/add.py
