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
17
from bzrlib.trace import mutter, note, warning
22
18
from bzrlib.errors import NotBranchError
23
from bzrlib.branch import is_control_file
25
from bzrlib.workingtree import WorkingTree
19
from bzrlib.branch import Branch
20
from bzrlib.osutils import quotefn
21
from os.path import dirname
27
23
def glob_expand_for_win32(file_list):
31
25
expanded_file_list = []
32
26
for possible_glob in file_list:
71
63
Returns the number of files added.
73
65
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)
66
b = Branch.open_containing(file_list[0])
67
return smart_add_branch(b, file_list, recurse, reporter)
78
def smart_add_tree(tree, file_list, recurse=True, reporter=add_reporter_null):
70
def smart_add_branch(branch, file_list, recurse=True, reporter=add_reporter_null):
79
71
"""Add files to version, optionally recursing into directories.
81
73
This is designed more towards DWIM for humans than API simplicity.
82
74
For the specific behaviour see the help for cmd_add().
84
This calls reporter with each (path, kind, file_id) of added files.
76
This yields a sequence of (path, kind, file_id) for added files.
86
78
Returns the number of files added.
89
81
from bzrlib.errors import BadFileKindError, ForbiddenFileError
90
84
assert isinstance(recurse, bool)
92
86
file_list = _prepare_file_list(file_list)
93
87
user_list = file_list[:]
94
inv = tree.read_working_inventory()
88
inv = branch.read_working_inventory()
89
tree = branch.working_tree()
97
92
for f in file_list:
93
rf = branch.relpath(f)
94
af = branch.abspath(rf)
101
96
kind = bzrlib.osutils.file_kind(af)
103
if not InventoryEntry.versionable_kind(kind):
98
if kind != 'file' and kind != 'directory':
104
99
if f in user_list:
105
100
raise BadFileKindError("cannot add %s of type %s" % (f, kind))
107
102
warning("skipping %s (can't add file of kind '%s')", f, kind)
110
mutter("smart add of %r, abs=%r", f, af)
105
mutter("smart add of %r, abs=%r" % (f, af))
112
if is_control_file(af):
107
if bzrlib.branch.is_control_file(af):
113
108
raise ForbiddenFileError('cannot add control file %s' % f)
115
110
versioned = (inv.path2id(rf) != None)
117
112
if kind == 'directory':
119
sub_branch = WorkingTree(af)
114
sub_branch = Branch.open(af)
121
116
except NotBranchError:
123
except errors.UnsupportedFormatError:
129
mutter("tree root doesn't need to be added")
122
mutter("branch root doesn't need to be added")
132
mutter("%r is already versioned", f)
125
mutter("%r is already versioned" % f)
134
mutter("%r is a bzr tree", f)
127
mutter("%r is a bzr tree" %f)
136
count += __add_one(tree, inv, rf, kind, reporter)
129
count += __add_one(branch, inv, rf, kind, reporter)
138
131
if kind == 'directory' and recurse and not sub_tree:
139
132
for subf in os.listdir(af):
140
133
subp = os.path.join(rf, subf)
141
134
if subf == bzrlib.BZRDIR:
142
mutter("skip control directory %r", subp)
135
mutter("skip control directory %r" % subp)
143
136
elif tree.is_ignored(subp):
144
mutter("skip ignored sub-file %r", subp)
137
mutter("skip ignored sub-file %r" % subp)
146
mutter("queue to add sub-file %r", subp)
147
file_list.append(tree.abspath(subp))
139
mutter("queue to add sub-file %r" % subp)
140
file_list.append(branch.abspath(subp))
150
143
mutter('added %d entries', count)
153
tree._write_inventory(inv)
146
branch._write_inventory(inv)
157
def __add_one(tree, inv, path, kind, reporter):
150
def __add_one(branch, inv, path, kind, reporter):
158
151
"""Add a file or directory, automatically add unversioned parents."""
160
153
# Nothing to do if path is already versioned.
161
# This is safe from infinite recursion because the tree root is
154
# This is safe from infinite recursion because the branch root is
162
155
# always versioned.
163
156
if inv.path2id(path) != None:
167
count = __add_one(tree, inv, dirname(path), 'directory', reporter)
160
count = __add_one(branch, inv, dirname(path), 'directory', reporter)
169
162
entry = inv.add_path(path, kind=kind)
170
mutter("added %r kind %r file_id={%s}", path, kind, entry.file_id)
163
mutter("added %r kind %r file_id={%s}" % (path, kind, entry.file_id))
171
164
reporter(path, kind, entry)