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 is_control_file
25
from bzrlib.workingtree import WorkingTree
27
def glob_expand_for_win32(file_list):
31
expanded_file_list = []
32
for possible_glob in file_list:
33
glob_files = glob.glob(possible_glob)
36
# special case to let the normal code path handle
37
# files that do not exists
38
expanded_file_list.append(possible_glob)
40
expanded_file_list += glob_files
41
return expanded_file_list
44
def add_reporter_null(path, kind, entry):
45
"""Absorb add reports and do nothing."""
49
def add_reporter_print(path, kind, entry):
50
"""Print a line to stdout for each file that's added."""
51
print "added", bzrlib.osutils.quotefn(path)
54
def _prepare_file_list(file_list):
55
"""Prepare a file list for use by smart_add_*."""
57
if sys.platform == 'win32':
58
file_list = glob_expand_for_win32(file_list)
61
file_list = list(file_list)
65
def smart_add(file_list, recurse=True, reporter=add_reporter_null):
66
"""Add files to version, optionally recursing into directories.
68
This is designed more towards DWIM for humans than API simplicity.
69
For the specific behaviour see the help for cmd_add().
71
Returns the number of files added.
73
file_list = _prepare_file_list(file_list)
74
tree = WorkingTree.open_containing(file_list[0])[0]
75
return smart_add_tree(tree, file_list, recurse, reporter)
78
def smart_add_tree(tree, file_list, recurse=True, reporter=add_reporter_null):
79
"""Add files to version, optionally recursing into directories.
81
This is designed more towards DWIM for humans than API simplicity.
82
For the specific behaviour see the help for cmd_add().
84
This calls reporter with each (path, kind, file_id) of added files.
86
Returns the number of files added.
20
from trace import mutter, note
22
def smart_add(file_list, verbose=True, recurse=True):
23
"""Add files to version, optionally recursing into directories.
25
This is designed more towards DWIM for humans than API simplicity.
26
For the specific behaviour see the help for cmd_add().
28
from bzrlib.osutils import quotefn, kind_marker
89
29
from bzrlib.errors import BadFileKindError, ForbiddenFileError
90
assert isinstance(recurse, bool)
92
file_list = _prepare_file_list(file_list)
93
32
user_list = file_list[:]
94
inv = tree.read_working_inventory()
33
assert not isinstance(file_list, basestring)
34
b = bzrlib.branch.Branch(file_list[0], find_root=True)
35
inv = b.read_working_inventory()
36
tree = b.working_tree()
97
39
for f in file_list:
101
43
kind = bzrlib.osutils.file_kind(af)
103
if not InventoryEntry.versionable_kind(kind):
45
if kind != 'file' and kind != 'directory':
104
46
if f in user_list:
105
47
raise BadFileKindError("cannot add %s of type %s" % (f, kind))
107
warning("skipping %s (can't add file of kind '%s')", f, kind)
49
print "skipping %s (can't add file of kind '%s')" % (f, kind)
110
mutter("smart add of %r, abs=%r", f, af)
52
bzrlib.mutter("smart add of %r, abs=%r" % (f, af))
112
if is_control_file(af):
54
if bzrlib.branch.is_control_file(af):
113
55
raise ForbiddenFileError('cannot add control file %s' % f)
115
57
versioned = (inv.path2id(rf) != None)
117
if kind == 'directory':
119
sub_branch = WorkingTree(af)
121
except NotBranchError:
123
except errors.UnsupportedFormatError:
129
mutter("tree root doesn't need to be added")
60
mutter("branch root doesn't need to be added")
132
mutter("%r is already versioned", f)
134
mutter("%r is a bzr tree", f)
62
mutter("%r is already versioned" % f)
136
count += __add_one(tree, inv, rf, kind, reporter)
138
if kind == 'directory' and recurse and not sub_tree:
64
file_id = bzrlib.branch.gen_file_id(rf)
65
inv.add_path(rf, kind=kind, file_id=file_id)
66
bzrlib.mutter("added %r kind %r file_id={%s}" % (rf, kind, file_id))
69
print 'added', quotefn(f)
71
if kind == 'directory' and recurse:
139
72
for subf in os.listdir(af):
140
73
subp = os.path.join(rf, subf)
141
74
if subf == bzrlib.BZRDIR:
142
mutter("skip control directory %r", subp)
75
mutter("skip control directory %r" % subp)
143
76
elif tree.is_ignored(subp):
144
mutter("skip ignored sub-file %r", subp)
77
mutter("skip ignored sub-file %r" % subp)
146
mutter("queue to add sub-file %r", subp)
147
file_list.append(tree.abspath(subp))
150
mutter('added %d entries', count)
79
mutter("queue to add sub-file %r" % subp)
80
file_list.append(b.abspath(subp))
153
tree._write_inventory(inv)
157
def __add_one(tree, 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 tree root is
163
if inv.path2id(path) != None:
167
count = __add_one(tree, 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)
84
note('added %d' % count)
85
b._write_inventory(inv)
added
removed
bzrlib/add.py
