1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
|
# Copyright (C) 2009, 2010 Canonical Ltd
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
import time
from bzrlib import (
bzrdir,
errors,
osutils,
registry,
trace,
)
from bzrlib.branch import (
Branch,
)
from bzrlib.revision import (
NULL_REVISION,
)
format_registry = registry.Registry()
def send(submit_branch, revision, public_branch, remember, format,
no_bundle, no_patch, output, from_, mail_to, message, body,
to_file, strict=None):
tree, branch = bzrdir.BzrDir.open_containing_tree_or_branch(from_)[:2]
# we may need to write data into branch's repository to calculate
# the data to send.
branch.lock_write()
try:
if output is None:
config = branch.get_config()
if mail_to is None:
mail_to = config.get_user_option('submit_to')
mail_client = config.get_mail_client()
if (not getattr(mail_client, 'supports_body', False)
and body is not None):
raise errors.BzrCommandError(
'Mail client "%s" does not support specifying body' %
mail_client.__class__.__name__)
if remember and submit_branch is None:
raise errors.BzrCommandError(
'--remember requires a branch to be specified.')
stored_submit_branch = branch.get_submit_branch()
remembered_submit_branch = None
if submit_branch is None:
submit_branch = stored_submit_branch
remembered_submit_branch = "submit"
else:
if stored_submit_branch is None or remember:
branch.set_submit_branch(submit_branch)
if submit_branch is None:
submit_branch = branch.get_parent()
remembered_submit_branch = "parent"
if submit_branch is None:
raise errors.BzrCommandError('No submit branch known or'
' specified')
if remembered_submit_branch is not None:
trace.note('Using saved %s location "%s" to determine what '
'changes to submit.', remembered_submit_branch,
submit_branch)
if mail_to is None or format is None:
# TODO: jam 20090716 we open the submit_branch here, but we *don't*
# pass it down into the format creation, so it will have to
# open it again
submit_br = Branch.open(submit_branch)
submit_config = submit_br.get_config()
if mail_to is None:
mail_to = submit_config.get_user_option("child_submit_to")
if format is None:
formatname = submit_br.get_child_submit_format()
try:
format = format_registry.get(formatname)
except KeyError:
raise errors.BzrCommandError("No such send format '%s'." %
formatname)
stored_public_branch = branch.get_public_branch()
if public_branch is None:
public_branch = stored_public_branch
elif stored_public_branch is None or remember:
branch.set_public_branch(public_branch)
if no_bundle and public_branch is None:
raise errors.BzrCommandError('No public branch specified or'
' known')
base_revision_id = None
revision_id = None
if revision is not None:
if len(revision) > 2:
raise errors.BzrCommandError('bzr send takes '
'at most two one revision identifiers')
revision_id = revision[-1].as_revision_id(branch)
if len(revision) == 2:
base_revision_id = revision[0].as_revision_id(branch)
if revision_id is None:
if strict is None:
strict = branch.get_config(
).get_user_option_as_bool('send_strict')
if strict is None: strict = True # default value
if strict and tree is not None:
if (tree.has_changes()):
raise errors.UncommittedChanges(
tree, more='Use --no-strict to force the send.')
if tree.last_revision() != tree.branch.last_revision():
# The tree has lost sync with its branch, there is little
# chance that the user is aware of it but he can still force
# the send with --no-strict
raise errors.OutOfDateTree(
tree, more='Use --no-strict to force the send.')
revision_id = branch.last_revision()
if revision_id == NULL_REVISION:
raise errors.BzrCommandError('No revisions to submit.')
if format is None:
format = format_registry.get()
directive = format(branch, revision_id, submit_branch,
public_branch, no_patch, no_bundle, message, base_revision_id)
if output is None:
directive.compose_merge_request(mail_client, mail_to, body,
branch, tree)
else:
if output == '-':
outfile = to_file
else:
outfile = open(output, 'wb')
try:
outfile.writelines(directive.to_lines())
finally:
if outfile is not to_file:
outfile.close()
finally:
branch.unlock()
def _send_4(branch, revision_id, submit_branch, public_branch,
no_patch, no_bundle, message, base_revision_id):
from bzrlib import merge_directive
return merge_directive.MergeDirective2.from_objects(
branch.repository, revision_id, time.time(),
osutils.local_time_offset(), submit_branch,
public_branch=public_branch, include_patch=not no_patch,
include_bundle=not no_bundle, message=message,
base_revision_id=base_revision_id)
def _send_0_9(branch, revision_id, submit_branch, public_branch,
no_patch, no_bundle, message, base_revision_id):
if not no_bundle:
if not no_patch:
patch_type = 'bundle'
else:
raise errors.BzrCommandError('Format 0.9 does not'
' permit bundle with no patch')
else:
if not no_patch:
patch_type = 'diff'
else:
patch_type = None
from bzrlib import merge_directive
return merge_directive.MergeDirective.from_objects(
branch.repository, revision_id, time.time(),
osutils.local_time_offset(), submit_branch,
public_branch=public_branch, patch_type=patch_type,
message=message)
format_registry.register('4',
_send_4, 'Bundle format 4, Merge Directive 2 (default)')
format_registry.register('0.9',
_send_0_9, 'Bundle format 0.9, Merge Directive 1')
format_registry.default_key = '4'
|