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
17
from trace import mutter, note
18
18
from bzrlib.errors import NotBranchError
19
19
from bzrlib.branch import Branch
20
from bzrlib.osutils import quotefn
21
from os.path import dirname
23
21
def glob_expand_for_win32(file_list):
35
33
expanded_file_list += glob_files
36
34
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_*."""
36
def smart_add(file_list, verbose=True, recurse=True):
37
"""Add files to version, optionally recursing into directories.
39
This is designed more towards DWIM for humans than API simplicity.
40
For the specific behaviour see the help for cmd_add().
44
from bzrlib.osutils import quotefn
45
from bzrlib.errors import BadFileKindError, ForbiddenFileError
50
49
if sys.platform == 'win32':
51
50
file_list = glob_expand_for_win32(file_list)
55
user_list = file_list[:]
54
56
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)
57
assert not isinstance(file_list, basestring)
67
58
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)
88
user_list = file_list[:]
89
inv = branch.read_working_inventory()
90
tree = branch.working_tree()
59
inv = b.read_working_inventory()
60
tree = b.working_tree()
93
63
for f in file_list:
94
rf = branch.relpath(f)
95
af = branch.abspath(rf)
97
67
kind = bzrlib.osutils.file_kind(af)
128
98
mutter("%r is a bzr tree" %f)
130
count += __add_one(branch, inv, rf, kind, reporter)
100
file_id = bzrlib.branch.gen_file_id(rf)
101
inv.add_path(rf, kind=kind, file_id=file_id)
102
mutter("added %r kind %r file_id={%s}" % (rf, kind, file_id))
105
print 'added', quotefn(f)
132
107
if kind == 'directory' and recurse and not sub_tree:
133
108
for subf in os.listdir(af):
138
113
mutter("skip ignored sub-file %r" % subp)
140
115
mutter("queue to add sub-file %r" % subp)
141
file_list.append(branch.abspath(subp))
144
mutter('added %d entries', count)
116
file_list.append(b.abspath(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)
120
note('added %d' % count)
121
b._write_inventory(inv)
123
print "nothing new to add"
124
# should this return 1 to the shell?
added
removed
bzrlib/add.py
