38
36
format_registry = registry.Registry()
41
def send(target_branch, revision, public_branch, remember,
42
format, no_bundle, no_patch, output, from_, mail_to, message, body,
39
def send(submit_branch, revision, public_branch, remember, format,
40
no_bundle, no_patch, output, from_, mail_to, message, body,
43
41
to_file, strict=None):
44
tree, branch = controldir.ControlDir.open_containing_tree_or_branch(
46
possible_transports = [tree.bzrdir.transport, branch.bzrdir.transport]
42
tree, branch = bzrdir.BzrDir.open_containing_tree_or_branch(from_)[:2]
47
43
# we may need to write data into branch's repository to calculate
48
44
# the data to send.
49
45
branch.lock_write()
48
config = branch.get_config()
52
49
if mail_to is None:
53
mail_to = branch.get_config_stack().get('submit_to')
54
mail_client = branch.get_config().get_mail_client()
50
mail_to = config.get_user_option('submit_to')
51
mail_client = config.get_mail_client()
55
52
if (not getattr(mail_client, 'supports_body', False)
56
53
and body is not None):
57
raise errors.BzrCommandError(gettext(
58
'Mail client "%s" does not support specifying body') %
54
raise errors.BzrCommandError(
55
'Mail client "%s" does not support specifying body' %
59
56
mail_client.__class__.__name__)
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"
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"
69
# Remembers if asked explicitly or no previous location is set
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,
66
if stored_submit_branch is None or remember:
67
branch.set_submit_branch(submit_branch)
68
if submit_branch is None:
69
submit_branch = branch.get_parent()
70
remembered_submit_branch = "parent"
71
if submit_branch is None:
72
raise errors.BzrCommandError('No submit branch known or'
74
if remembered_submit_branch is not None:
75
trace.note('Using saved %s location "%s" to determine what '
76
'changes to submit.', remembered_submit_branch,
85
submit_branch = Branch.open(target_branch,
86
possible_transports=possible_transports)
87
possible_transports.append(submit_branch.bzrdir.root_transport)
88
79
if mail_to is None or format is None:
80
# TODO: jam 20090716 we open the submit_branch here, but we *don't*
81
# pass it down into the format creation, so it will have to
83
submit_br = Branch.open(submit_branch)
84
submit_config = submit_br.get_config()
89
85
if mail_to is None:
90
mail_to = submit_branch.get_config_stack().get(
86
mail_to = submit_config.get_user_option("child_submit_to")
93
formatname = submit_branch.get_child_submit_format()
88
formatname = submit_br.get_child_submit_format()
95
90
format = format_registry.get(formatname)
97
raise errors.BzrCommandError(
98
gettext("No such send format '%s'.") % formatname)
92
raise errors.BzrCommandError("No such send format '%s'." %
100
95
stored_public_branch = branch.get_public_branch()
101
96
if public_branch is None:
102
97
public_branch = stored_public_branch
103
# Remembers if asked explicitly or no previous location is set
105
or (remember is None and stored_public_branch is None)):
98
elif stored_public_branch is None or remember:
106
99
branch.set_public_branch(public_branch)
107
100
if no_bundle and public_branch is None:
108
raise errors.BzrCommandError(gettext('No public branch specified or'
101
raise errors.BzrCommandError('No public branch specified or'
110
103
base_revision_id = None
111
104
revision_id = None
112
105
if revision is not None:
113
106
if len(revision) > 2:
114
raise errors.BzrCommandError(gettext('bzr send takes '
115
'at most two one revision identifiers'))
107
raise errors.BzrCommandError('bzr send takes '
108
'at most two one revision identifiers')
116
109
revision_id = revision[-1].as_revision_id(branch)
117
110
if len(revision) == 2:
118
111
base_revision_id = revision[0].as_revision_id(branch)
124
117
more_warning='Uncommitted changes will not be sent.')
125
118
revision_id = branch.last_revision()
126
119
if revision_id == NULL_REVISION:
127
raise errors.BzrCommandError(gettext('No revisions to submit.'))
120
raise errors.BzrCommandError('No revisions to submit.')
128
121
if format is None:
129
122
format = format_registry.get()
130
directive = format(branch, revision_id, target_branch,
131
public_branch, no_patch, no_bundle, message, base_revision_id,
123
directive = format(branch, revision_id, submit_branch,
124
public_branch, no_patch, no_bundle, message, base_revision_id)
133
125
if output is None:
134
126
directive.compose_merge_request(mail_client, mail_to, body,
137
129
if directive.multiple_output_files:
138
130
if output == '-':
139
raise errors.BzrCommandError(gettext('- not supported for '
140
'merge directives that use more than one output file.'))
131
raise errors.BzrCommandError('- not supported for '
132
'merge directives that use more than one output file.')
141
133
if not os.path.exists(output):
142
134
os.mkdir(output, 0755)
143
135
for (filename, lines) in directive.to_files():
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):
156
def _send_4(branch, revision_id, submit_branch, public_branch,
157
no_patch, no_bundle, message, base_revision_id):
167
158
from bzrlib import merge_directive
168
159
return merge_directive.MergeDirective2.from_objects(
169
160
branch.repository, revision_id, time.time(),
170
osutils.local_time_offset(), target_branch,
171
public_branch=public_branch,
172
include_patch=not no_patch,
161
osutils.local_time_offset(), submit_branch,
162
public_branch=public_branch, include_patch=not no_patch,
173
163
include_bundle=not no_bundle, message=message,
174
base_revision_id=base_revision_id,
175
local_target_branch=local_target_branch)
164
base_revision_id=base_revision_id)
178
167
def _send_0_9(branch, revision_id, submit_branch, public_branch,
179
no_patch, no_bundle, message,
180
base_revision_id, local_target_branch=None):
168
no_patch, no_bundle, message, base_revision_id):
181
169
if not no_bundle:
183
171
patch_type = 'bundle'
185
raise errors.BzrCommandError(gettext('Format 0.9 does not'
186
' permit bundle with no patch'))
173
raise errors.BzrCommandError('Format 0.9 does not'
174
' permit bundle with no patch')
189
177
patch_type = 'diff'
added
removed
bzrlib/send.py
