36
38
format_registry = registry.Registry()
39
def send(submit_branch, revision, public_branch, remember, format,
40
no_bundle, no_patch, output, from_, mail_to, message, body,
41
def send(target_branch, revision, public_branch, remember,
42
format, no_bundle, no_patch, output, from_, mail_to, message, body,
41
43
to_file, strict=None):
42
tree, branch = bzrdir.BzrDir.open_containing_tree_or_branch(from_)[:2]
44
tree, branch = controldir.ControlDir.open_containing_tree_or_branch(
46
possible_transports = [tree.bzrdir.transport, branch.bzrdir.transport]
43
47
# we may need to write data into branch's repository to calculate
44
48
# the data to send.
45
49
branch.lock_write()
48
config = branch.get_config()
49
52
if mail_to is None:
50
mail_to = config.get_user_option('submit_to')
51
mail_client = config.get_mail_client()
53
mail_to = branch.get_config_stack().get('submit_to')
54
mail_client = branch.get_config().get_mail_client()
52
55
if (not getattr(mail_client, 'supports_body', False)
53
56
and body is not None):
54
raise errors.BzrCommandError(
55
'Mail client "%s" does not support specifying body' %
57
raise errors.BzrCommandError(gettext(
58
'Mail client "%s" does not support specifying body') %
56
59
mail_client.__class__.__name__)
57
if remember and submit_branch is None:
58
raise errors.BzrCommandError(
59
'--remember requires a branch to be specified.')
60
stored_submit_branch = branch.get_submit_branch()
61
remembered_submit_branch = None
62
if submit_branch is None:
63
submit_branch = stored_submit_branch
64
remembered_submit_branch = "submit"
60
if remember and target_branch is None:
61
raise errors.BzrCommandError(gettext(
62
'--remember requires a branch to be specified.'))
63
stored_target_branch = branch.get_submit_branch()
64
remembered_target_branch = None
65
if target_branch is None:
66
target_branch = stored_target_branch
67
remembered_target_branch = "submit"
66
69
# Remembers if asked explicitly or no previous location is set
67
if remember or (remember is None and stored_submit_branch is None):
68
branch.set_submit_branch(submit_branch)
69
if submit_branch is None:
70
submit_branch = branch.get_parent()
71
remembered_submit_branch = "parent"
72
if submit_branch is None:
73
raise errors.BzrCommandError('No submit branch known or'
75
if remembered_submit_branch is not None:
76
trace.note('Using saved %s location "%s" to determine what '
77
'changes to submit.', remembered_submit_branch,
71
remember is None and stored_target_branch is None):
72
branch.set_submit_branch(target_branch)
73
if target_branch is None:
74
target_branch = branch.get_parent()
75
remembered_target_branch = "parent"
76
if target_branch is None:
77
raise errors.BzrCommandError(gettext('No submit branch known or'
79
if remembered_target_branch is not None:
80
trace.note(gettext('Using saved {0} location "{1}" to determine '
81
'what changes to submit.').format(
82
remembered_target_branch,
85
submit_branch = Branch.open(target_branch,
86
possible_transports=possible_transports)
87
possible_transports.append(submit_branch.bzrdir.root_transport)
80
88
if mail_to is None or format is None:
81
# TODO: jam 20090716 we open the submit_branch here, but we *don't*
82
# pass it down into the format creation, so it will have to
84
submit_br = Branch.open(submit_branch)
85
submit_config = submit_br.get_config()
86
89
if mail_to is None:
87
mail_to = submit_config.get_user_option("child_submit_to")
90
mail_to = submit_branch.get_config_stack().get(
89
formatname = submit_br.get_child_submit_format()
93
formatname = submit_branch.get_child_submit_format()
91
95
format = format_registry.get(formatname)
93
raise errors.BzrCommandError("No such send format '%s'." %
97
raise errors.BzrCommandError(
98
gettext("No such send format '%s'.") % formatname)
96
100
stored_public_branch = branch.get_public_branch()
97
101
if public_branch is None:
120
124
more_warning='Uncommitted changes will not be sent.')
121
125
revision_id = branch.last_revision()
122
126
if revision_id == NULL_REVISION:
123
raise errors.BzrCommandError('No revisions to submit.')
127
raise errors.BzrCommandError(gettext('No revisions to submit.'))
124
128
if format is None:
125
129
format = format_registry.get()
126
directive = format(branch, revision_id, submit_branch,
127
public_branch, no_patch, no_bundle, message, base_revision_id)
130
directive = format(branch, revision_id, target_branch,
131
public_branch, no_patch, no_bundle, message, base_revision_id,
128
133
if output is None:
129
134
directive.compose_merge_request(mail_client, mail_to, body,
132
137
if directive.multiple_output_files:
133
138
if output == '-':
134
raise errors.BzrCommandError('- not supported for '
135
'merge directives that use more than one output file.')
139
raise errors.BzrCommandError(gettext('- not supported for '
140
'merge directives that use more than one output file.'))
136
141
if not os.path.exists(output):
137
142
os.mkdir(output, 0755)
138
143
for (filename, lines) in directive.to_files():
159
def _send_4(branch, revision_id, submit_branch, public_branch,
160
no_patch, no_bundle, message, base_revision_id):
164
def _send_4(branch, revision_id, target_branch, public_branch,
165
no_patch, no_bundle, message,
166
base_revision_id, local_target_branch=None):
161
167
from bzrlib import merge_directive
162
168
return merge_directive.MergeDirective2.from_objects(
163
169
branch.repository, revision_id, time.time(),
164
osutils.local_time_offset(), submit_branch,
165
public_branch=public_branch, include_patch=not no_patch,
170
osutils.local_time_offset(), target_branch,
171
public_branch=public_branch,
172
include_patch=not no_patch,
166
173
include_bundle=not no_bundle, message=message,
167
base_revision_id=base_revision_id)
174
base_revision_id=base_revision_id,
175
local_target_branch=local_target_branch)
170
178
def _send_0_9(branch, revision_id, submit_branch, public_branch,
171
no_patch, no_bundle, message, base_revision_id):
179
no_patch, no_bundle, message,
180
base_revision_id, local_target_branch=None):
172
181
if not no_bundle:
174
183
patch_type = 'bundle'
176
raise errors.BzrCommandError('Format 0.9 does not'
177
' permit bundle with no patch')
185
raise errors.BzrCommandError(gettext('Format 0.9 does not'
186
' permit bundle with no patch'))
180
189
patch_type = 'diff'
185
194
branch.repository, revision_id, time.time(),
186
195
osutils.local_time_offset(), submit_branch,
187
196
public_branch=public_branch, patch_type=patch_type,
191
format_registry.register('4',
197
message=message, local_target_branch=local_target_branch)
200
format_registry.register('4',
192
201
_send_4, 'Bundle format 4, Merge Directive 2 (default)')
193
202
format_registry.register('0.9',
194
203
_send_0_9, 'Bundle format 0.9, Merge Directive 1')