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().
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()
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):
25
expanded_file_list = []
26
for possible_glob in file_list:
27
glob_files = glob.glob(possible_glob)
30
# special case to let the normal code path handle
31
# files that do not exists
32
expanded_file_list.append(possible_glob)
34
expanded_file_list += glob_files
35
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_*."""
49
if sys.platform == 'win32':
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.open_containing(file_list[0])
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.
81
from bzrlib.errors import BadFileKindError, ForbiddenFileError
84
assert isinstance(recurse, bool)
86
file_list = _prepare_file_list(file_list)
87
user_list = file_list[:]
88
inv = branch.read_working_inventory()
89
tree = branch.working_tree()
37
92
for f in file_list:
41
## TODO: It's OK to add root but only in recursive mode
43
bzrlib.mutter("smart add of %r" % f)
93
rf = branch.relpath(f)
94
af = branch.abspath(rf)
96
kind = bzrlib.osutils.file_kind(af)
98
if kind != 'file' and kind != 'directory':
100
raise BadFileKindError("cannot add %s of type %s" % (f, kind))
102
warning("skipping %s (can't add file of kind '%s')", f, kind)
105
mutter("smart add of %r, abs=%r" % (f, af))
45
107
if bzrlib.branch.is_control_file(af):
46
bailout("cannot add control file %r" % af)
48
kind = bzrlib.osutils.file_kind(f)
50
if kind != 'file' and kind != 'directory':
51
bailout("can't add file of kind %r" % kind)
108
raise ForbiddenFileError('cannot add control file %s' % f)
53
110
versioned = (inv.path2id(rf) != None)
112
if kind == 'directory':
114
sub_branch = Branch.open(af)
116
except NotBranchError:
56
122
mutter("branch root doesn't need to be added")
58
125
mutter("%r is already versioned" % f)
127
mutter("%r is a bzr tree" %f)
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))
129
count += __add_one(branch, inv, rf, kind, reporter)
67
if kind == 'directory' and recurse:
131
if kind == 'directory' and recurse and not sub_tree:
68
132
for subf in os.listdir(af):
69
subp = appendpath(rf, subf)
133
subp = os.path.join(rf, subf)
70
134
if subf == bzrlib.BZRDIR:
71
135
mutter("skip control directory %r" % subp)
72
136
elif tree.is_ignored(subp):
73
137
mutter("skip ignored sub-file %r" % subp)
75
mutter("queue to add sub-file %r" % (subp))
76
file_list.append(subp)
139
mutter("queue to add sub-file %r" % subp)
140
file_list.append(branch.abspath(subp))
143
mutter('added %d entries', count)
80
note('added %d' % count)
81
b._write_inventory(inv)
146
branch._write_inventory(inv)
150
def __add_one(branch, inv, path, kind, reporter):
151
"""Add a file or directory, automatically add unversioned parents."""
153
# Nothing to do if path is already versioned.
154
# This is safe from infinite recursion because the branch root is
156
if inv.path2id(path) != None:
160
count = __add_one(branch, inv, dirname(path), 'directory', reporter)
162
entry = inv.add_path(path, kind=kind)
163
mutter("added %r kind %r file_id={%s}" % (path, kind, entry.file_id))
164
reporter(path, kind, entry)
added
removed
bzrlib/add.py
