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
possible_transports = []
45
tree, branch = controldir.ControlDir.open_containing_tree_or_branch(
46
from_, possible_transports=possible_transports)[:2]
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()
52
config_stack = branch.get_config_stack()
48
config = branch.get_config()
53
49
if mail_to is None:
54
mail_to = config_stack.get('submit_to')
55
mail_client = config_stack.get('mail_client')(config_stack)
50
mail_to = config.get_user_option('submit_to')
51
mail_client = config.get_mail_client()
56
52
if (not getattr(mail_client, 'supports_body', False)
57
53
and body is not None):
58
raise errors.BzrCommandError(gettext(
59
'Mail client "%s" does not support specifying body') %
54
raise errors.BzrCommandError(
55
'Mail client "%s" does not support specifying body' %
60
56
mail_client.__class__.__name__)
61
if remember and target_branch is None:
62
raise errors.BzrCommandError(gettext(
63
'--remember requires a branch to be specified.'))
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"
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"
70
# Remembers if asked explicitly or no previous location is set
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:
78
raise errors.BzrCommandError(gettext('No submit branch known or'
80
if remembered_target_branch is not None:
81
trace.note(gettext('Using saved {0} location "{1}" to determine '
82
'what changes to submit.').format(
83
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,
86
submit_branch = Branch.open(target_branch,
87
possible_transports=possible_transports)
88
possible_transports.append(submit_branch.bzrdir.root_transport)
89
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()
90
85
if mail_to is None:
91
mail_to = submit_branch.get_config_stack().get(
86
mail_to = submit_config.get_user_option("child_submit_to")
94
formatname = submit_branch.get_child_submit_format()
88
formatname = submit_br.get_child_submit_format()
96
90
format = format_registry.get(formatname)
98
raise errors.BzrCommandError(
99
gettext("No such send format '%s'.") % formatname)
92
raise errors.BzrCommandError("No such send format '%s'." %
101
95
stored_public_branch = branch.get_public_branch()
102
96
if public_branch is None:
103
97
public_branch = stored_public_branch
104
# Remembers if asked explicitly or no previous location is set
106
or (remember is None and stored_public_branch is None)):
98
elif stored_public_branch is None or remember:
107
99
branch.set_public_branch(public_branch)
108
100
if no_bundle and public_branch is None:
109
raise errors.BzrCommandError(gettext('No public branch specified or'
101
raise errors.BzrCommandError('No public branch specified or'
111
103
base_revision_id = None
112
104
revision_id = None
113
105
if revision is not None:
114
106
if len(revision) > 2:
115
raise errors.BzrCommandError(gettext('bzr send takes '
116
'at most two one revision identifiers'))
107
raise errors.BzrCommandError('bzr send takes '
108
'at most two one revision identifiers')
117
109
revision_id = revision[-1].as_revision_id(branch)
118
110
if len(revision) == 2:
119
111
base_revision_id = revision[0].as_revision_id(branch)
120
112
if revision_id is None:
122
tree.check_changed_or_out_of_date(
123
strict, 'send_strict',
124
more_error='Use --no-strict to force the send.',
125
more_warning='Uncommitted changes will not be sent.')
114
strict = branch.get_config(
115
).get_user_option_as_bool('send_strict')
116
if strict is None: strict = True # default value
117
if strict and tree is not None:
118
if (tree.has_changes()):
119
raise errors.UncommittedChanges(
120
tree, more='Use --no-strict to force the send.')
121
if tree.last_revision() != tree.branch.last_revision():
122
# The tree has lost sync with its branch, there is little
123
# chance that the user is aware of it but he can still force
124
# the send with --no-strict
125
raise errors.OutOfDateTree(
126
tree, more='Use --no-strict to force the send.')
126
127
revision_id = branch.last_revision()
127
128
if revision_id == NULL_REVISION:
128
raise errors.BzrCommandError(gettext('No revisions to submit.'))
129
raise errors.BzrCommandError('No revisions to submit.')
129
130
if format is None:
130
131
format = format_registry.get()
131
directive = format(branch, revision_id, target_branch,
132
public_branch, no_patch, no_bundle, message, base_revision_id,
132
directive = format(branch, revision_id, submit_branch,
133
public_branch, no_patch, no_bundle, message, base_revision_id)
134
134
if output is None:
135
135
directive.compose_merge_request(mail_client, mail_to, body,
138
if directive.multiple_output_files:
140
raise errors.BzrCommandError(gettext('- not supported for '
141
'merge directives that use more than one output file.'))
142
if not os.path.exists(output):
143
os.mkdir(output, 0755)
144
for (filename, lines) in directive.to_files():
145
path = os.path.join(output, filename)
146
outfile = open(path, 'wb')
148
outfile.writelines(lines)
155
outfile = open(output, 'wb')
157
outfile.writelines(directive.to_lines())
159
if outfile is not to_file:
141
outfile = open(output, 'wb')
143
outfile.writelines(directive.to_lines())
145
if outfile is not to_file:
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):
168
from bzrlib import merge_directive
151
def _send_4(branch, revision_id, submit_branch, public_branch,
152
no_patch, no_bundle, message, base_revision_id):
169
153
return merge_directive.MergeDirective2.from_objects(
170
154
branch.repository, revision_id, time.time(),
171
osutils.local_time_offset(), target_branch,
172
public_branch=public_branch,
173
include_patch=not no_patch,
155
osutils.local_time_offset(), submit_branch,
156
public_branch=public_branch, include_patch=not no_patch,
174
157
include_bundle=not no_bundle, message=message,
175
base_revision_id=base_revision_id,
176
local_target_branch=local_target_branch)
158
base_revision_id=base_revision_id)
179
161
def _send_0_9(branch, revision_id, submit_branch, public_branch,
180
no_patch, no_bundle, message,
181
base_revision_id, local_target_branch=None):
162
no_patch, no_bundle, message, base_revision_id):
182
163
if not no_bundle:
184
165
patch_type = 'bundle'
186
raise errors.BzrCommandError(gettext('Format 0.9 does not'
187
' permit bundle with no patch'))
167
raise errors.BzrCommandError('Format 0.9 does not'
168
' permit bundle with no patch')
190
171
patch_type = 'diff'
192
173
patch_type = None
193
from bzrlib import merge_directive
194
174
return merge_directive.MergeDirective.from_objects(
195
175
branch.repository, revision_id, time.time(),
196
176
osutils.local_time_offset(), submit_branch,
197
177
public_branch=public_branch, patch_type=patch_type,
198
message=message, local_target_branch=local_target_branch)
201
format_registry.register('4',
181
format_registry.register('4',
202
182
_send_4, 'Bundle format 4, Merge Directive 2 (default)')
203
183
format_registry.register('0.9',
204
184
_send_0_9, 'Bundle format 0.9, Merge Directive 1')
added
removed
bzrlib/send.py
