37
38
format_registry = registry.Registry()
40
def send(submit_branch, revision, public_branch, remember, format,
41
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,
42
43
to_file, strict=None):
43
tree, branch = bzrdir.BzrDir.open_containing_tree_or_branch(from_)[:2]
44
possible_transports = []
45
tree, branch = controldir.ControlDir.open_containing_tree_or_branch(
46
from_, possible_transports=possible_transports)[:2]
44
47
# we may need to write data into branch's repository to calculate
45
48
# the data to send.
46
49
branch.lock_write()
49
config = branch.get_config()
52
config_stack = branch.get_config_stack()
50
53
if mail_to is None:
51
mail_to = config.get_user_option('submit_to')
52
mail_client = config.get_mail_client()
54
mail_to = config_stack.get('submit_to')
55
mail_client = config_stack.get('mail_client')(config_stack)
53
56
if (not getattr(mail_client, 'supports_body', False)
54
57
and body is not None):
55
58
raise errors.BzrCommandError(gettext(
56
59
'Mail client "%s" does not support specifying body') %
57
60
mail_client.__class__.__name__)
58
if remember and submit_branch is None:
61
if remember and target_branch is None:
59
62
raise errors.BzrCommandError(gettext(
60
63
'--remember requires a branch to be specified.'))
61
stored_submit_branch = branch.get_submit_branch()
62
remembered_submit_branch = None
63
if submit_branch is None:
64
submit_branch = stored_submit_branch
65
remembered_submit_branch = "submit"
64
stored_target_branch = branch.get_submit_branch()
65
remembered_target_branch = None
66
if target_branch is None:
67
target_branch = stored_target_branch
68
remembered_target_branch = "submit"
67
70
# Remembers if asked explicitly or no previous location is set
68
if remember or (remember is None and stored_submit_branch is None):
69
branch.set_submit_branch(submit_branch)
70
if submit_branch is None:
71
submit_branch = branch.get_parent()
72
remembered_submit_branch = "parent"
73
if submit_branch is None:
72
remember is None and stored_target_branch is None):
73
branch.set_submit_branch(target_branch)
74
if target_branch is None:
75
target_branch = branch.get_parent()
76
remembered_target_branch = "parent"
77
if target_branch is None:
74
78
raise errors.BzrCommandError(gettext('No submit branch known or'
76
if remembered_submit_branch is not None:
80
if remembered_target_branch is not None:
77
81
trace.note(gettext('Using saved {0} location "{1}" to determine '
78
82
'what changes to submit.').format(
79
remembered_submit_branch, submit_branch))
83
remembered_target_branch,
86
submit_branch = Branch.open(target_branch,
87
possible_transports=possible_transports)
88
possible_transports.append(submit_branch.bzrdir.root_transport)
81
89
if mail_to is None or format is None:
82
# TODO: jam 20090716 we open the submit_branch here, but we *don't*
83
# pass it down into the format creation, so it will have to
85
submit_br = Branch.open(submit_branch)
86
submit_config = submit_br.get_config()
87
90
if mail_to is None:
88
mail_to = submit_config.get_user_option("child_submit_to")
91
mail_to = submit_branch.get_config_stack().get(
90
formatname = submit_br.get_child_submit_format()
94
formatname = submit_branch.get_child_submit_format()
92
96
format = format_registry.get(formatname)
94
raise errors.BzrCommandError(gettext("No such send format '%s'.") %
98
raise errors.BzrCommandError(
99
gettext("No such send format '%s'.") % formatname)
97
101
stored_public_branch = branch.get_public_branch()
98
102
if public_branch is None:
124
128
raise errors.BzrCommandError(gettext('No revisions to submit.'))
125
129
if format is None:
126
130
format = format_registry.get()
127
directive = format(branch, revision_id, submit_branch,
128
public_branch, no_patch, no_bundle, message, base_revision_id)
131
directive = format(branch, revision_id, target_branch,
132
public_branch, no_patch, no_bundle, message, base_revision_id,
129
134
if output is None:
130
135
directive.compose_merge_request(mail_client, mail_to, body,
160
def _send_4(branch, revision_id, submit_branch, public_branch,
161
no_patch, no_bundle, message, base_revision_id):
165
def _send_4(branch, revision_id, target_branch, public_branch,
166
no_patch, no_bundle, message,
167
base_revision_id, local_target_branch=None):
162
168
from bzrlib import merge_directive
163
169
return merge_directive.MergeDirective2.from_objects(
164
170
branch.repository, revision_id, time.time(),
165
osutils.local_time_offset(), submit_branch,
166
public_branch=public_branch, include_patch=not no_patch,
171
osutils.local_time_offset(), target_branch,
172
public_branch=public_branch,
173
include_patch=not no_patch,
167
174
include_bundle=not no_bundle, message=message,
168
base_revision_id=base_revision_id)
175
base_revision_id=base_revision_id,
176
local_target_branch=local_target_branch)
171
179
def _send_0_9(branch, revision_id, submit_branch, public_branch,
172
no_patch, no_bundle, message, base_revision_id):
180
no_patch, no_bundle, message,
181
base_revision_id, local_target_branch=None):
173
182
if not no_bundle:
175
184
patch_type = 'bundle'
186
195
branch.repository, revision_id, time.time(),
187
196
osutils.local_time_offset(), submit_branch,
188
197
public_branch=public_branch, patch_type=patch_type,
192
format_registry.register('4',
198
message=message, local_target_branch=local_target_branch)
201
format_registry.register('4',
193
202
_send_4, 'Bundle format 4, Merge Directive 2 (default)')
194
203
format_registry.register('0.9',
195
204
_send_0_9, 'Bundle format 0.9, Merge Directive 1')