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 os.path import dirname
19
import bzrlib.errors as errors
20
from bzrlib.inventory import InventoryEntry
21
from bzrlib.trace import mutter, note, warning
22
from bzrlib.errors import NotBranchError
23
from bzrlib.branch import Branch
24
from bzrlib.osutils import quotefn
26
def glob_expand_for_win32(file_list):
30
expanded_file_list = []
31
for possible_glob in file_list:
32
glob_files = glob.glob(possible_glob)
35
# special case to let the normal code path handle
36
# files that do not exists
37
expanded_file_list.append(possible_glob)
39
expanded_file_list += glob_files
40
return expanded_file_list
43
def add_reporter_null(path, kind, entry):
44
"""Absorb add reports and do nothing."""
47
def add_reporter_print(path, kind, entry):
48
"""Print a line to stdout for each file that's added."""
49
print "added", quotefn(path)
51
def _prepare_file_list(file_list):
52
"""Prepare a file list for use by smart_add_*."""
54
if sys.platform == 'win32':
55
file_list = glob_expand_for_win32(file_list)
58
file_list = list(file_list)
62
def smart_add(file_list, recurse=True, reporter=add_reporter_null):
63
"""Add files to version, optionally recursing into directories.
65
This is designed more towards DWIM for humans than API simplicity.
66
For the specific behaviour see the help for cmd_add().
68
Returns the number of files added.
70
file_list = _prepare_file_list(file_list)
71
b = Branch.open_containing(file_list[0])[0]
72
return smart_add_branch(b, file_list, recurse, reporter)
75
def smart_add_branch(branch, file_list, recurse=True, reporter=add_reporter_null):
76
"""Add files to version, optionally recursing into directories.
78
This is designed more towards DWIM for humans than API simplicity.
79
For the specific behaviour see the help for cmd_add().
81
This yields a sequence of (path, kind, file_id) for added files.
83
Returns the number of files added.
86
from bzrlib.errors import BadFileKindError, ForbiddenFileError
89
assert isinstance(recurse, bool)
91
file_list = _prepare_file_list(file_list)
92
user_list = file_list[:]
93
inv = branch.read_working_inventory()
94
tree = branch.working_tree()
17
import types, os, sys, stat
20
from osutils import quotefn
21
from errors import bailout
23
def smart_add(file_list, verbose=False, recurse=False):
24
"""Add files to version, optionall recursing into directories.
26
This is designed more towards DWIM for humans than API simplicity.
27
For the specific behaviour see the help for cmd_add().
30
assert not isinstance(file_list, types.StringTypes)
31
b = bzrlib.branch.Branch(file_list[0], find_root=True)
32
inv = b.read_working_inventory()
97
35
for f in file_list:
99
af = branch.abspath(rf)
101
kind = bzrlib.osutils.file_kind(af)
103
if not InventoryEntry.versionable_kind(kind):
105
raise BadFileKindError("cannot add %s of type %s" % (f, kind))
107
warning("skipping %s (can't add file of kind '%s')", f, kind)
39
bzrlib.mutter("smart add of %r" % f)
41
if bzrlib.branch.is_control_file(af):
42
bailout("cannot add control file %r" % af)
44
kind = bzrlib.osutils.file_kind(f)
47
bzrlib.warning("%r is already versioned" % f)
110
mutter("smart add of %r, abs=%r" % (f, af))
112
if bzrlib.branch.is_control_file(af):
113
raise ForbiddenFileError('cannot add control file %s' % f)
115
versioned = (inv.path2id(rf) != None)
117
if kind == 'directory':
119
sub_branch = Branch.open(af)
121
except NotBranchError:
123
except errors.UnsupportedFormatError:
129
mutter("branch root doesn't need to be added")
132
mutter("%r is already versioned" % f)
134
mutter("%r is a bzr tree" %f)
136
count += __add_one(branch, inv, rf, kind, reporter)
138
if kind == 'directory' and recurse and not sub_tree:
139
for subf in os.listdir(af):
140
subp = os.path.join(rf, subf)
141
if subf == bzrlib.BZRDIR:
142
mutter("skip control directory %r" % subp)
143
elif tree.is_ignored(subp):
144
mutter("skip ignored sub-file %r" % subp)
49
elif kind == 'directory':
52
bzrlib.warning("%r is already versioned" % f)
146
mutter("queue to add sub-file %r" % subp)
147
file_list.append(branch.abspath(subp))
150
mutter('added %d entries', count)
153
branch._write_inventory(inv)
157
def __add_one(branch, inv, path, kind, reporter):
158
"""Add a file or directory, automatically add unversioned parents."""
160
# Nothing to do if path is already versioned.
161
# This is safe from infinite recursion because the branch root is
163
if inv.path2id(path) != None:
167
count = __add_one(branch, inv, dirname(path), 'directory', reporter)
169
entry = inv.add_path(path, kind=kind)
170
mutter("added %r kind %r file_id={%s}" % (path, kind, entry.file_id))
171
reporter(path, kind, entry)
55
# TODO: don't add, but recurse down
58
bailout("can't smart_add file kind %r" % kind)
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))
68
b._write_inventory(inv)
added
removed
bzrlib/add.py
