1
# Copyright (C) 2010 Canonical Ltd
1
# Copyright (C) 2010, 2011 Canonical Ltd
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
from __future__ import absolute_import
21
19
from bzrlib import (
23
from bzrlib.lazy_import import lazy_import
24
lazy_import(globals(), """
30
from bzrlib.i18n import gettext
26
31
from bzrlib.plugins.launchpad import (
31
from lazr.restfulclient import errors as restful_errors
34
38
class ProposeMergeHooks(hooks.Hooks):
35
39
"""Hooks for proposing a merge on Launchpad."""
37
41
def __init__(self):
38
hooks.Hooks.__init__(self)
42
"Return the prerequisite branch for proposing as merge.",
47
'merge_proposal_body',
48
"Return an initial body for the merge proposal message.",
42
hooks.Hooks.__init__(self, "bzrlib.plugins.launchpad.lp_propose",
44
self.add_hook('get_prerequisite',
45
"Return the prerequisite branch for proposing as merge.", (2, 1))
46
self.add_hook('merge_proposal_body',
47
"Return an initial body for the merge proposal message.", (2, 1))
53
50
class Proposer(object):
55
52
hooks = ProposeMergeHooks()
57
54
def __init__(self, tree, source_branch, target_branch, message, reviews,
55
staging=False, approve=False):
61
58
:param tree: The working tree for the source branch.
65
62
:param reviews: A list of tuples of reviewer, review type.
66
63
:param staging: If True, propose the merge against staging instead of
65
:param approve: If True, mark the new proposal as approved immediately.
66
This is useful when a project permits some things to be approved
67
by the submitter (e.g. merges between release and deployment
71
72
lp_instance = 'staging'
74
lp_instance = 'production'
74
75
service = lp_registration.LaunchpadService(lp_instance=lp_instance)
75
76
self.launchpad = lp_api.login(service)
76
77
self.source_branch = lp_api.LaunchpadBranch.from_bzr(
77
78
self.launchpad, source_branch)
78
79
if target_branch is None:
79
self.target_branch = self.source_branch.get_dev_focus()
80
self.target_branch = self.source_branch.get_target()
81
82
self.target_branch = lp_api.LaunchpadBranch.from_bzr(
82
83
self.launchpad, target_branch)
83
84
self.commit_message = message
85
# XXX: this is where bug lp:583638 could be tackled.
85
target_reviewer = self.target_branch.lp.reviewer
86
if target_reviewer is None:
87
raise errors.BzrCommandError('No reviewer specified')
88
self.reviews = [(target_reviewer, '')]
90
89
self.reviews = [(self.launchpad.people[reviewer], review_type)
91
90
for reviewer, review_type in
92
self.approve = approve
94
94
def get_comment(self, prerequisite_branch):
95
95
"""Determine the initial comment for the merge proposal."""
145
145
if mp.queue_status in ('Merged', 'Rejected'):
147
147
if mp.target_branch.self_link == self.target_branch.lp.self_link:
148
raise errors.BzrCommandError(
149
'There is already a branch merge proposal: %s' %
148
raise errors.BzrCommandError(gettext(
149
'There is already a branch merge proposal: %s') %
150
lp_api.canonical_url(mp))
152
152
def _get_prerequisite_branch(self):
153
153
hooks = self.hooks['get_prerequisite']
160
160
'prerequisite_branch': prerequisite_branch})
161
161
return prerequisite_branch
163
def call_webservice(self, call, *args, **kwargs):
164
"""Make a call to the webservice, wrapping failures.
166
:param call: The call to make.
167
:param *args: *args for the call.
168
:param **kwargs: **kwargs for the call.
169
:return: The result of calling call(*args, *kwargs).
171
from lazr.restfulclient import errors as restful_errors
173
return call(*args, **kwargs)
174
except restful_errors.HTTPError, e:
176
for line in e.content.splitlines():
177
if line.startswith('Traceback (most recent call last):'):
179
error_lines.append(line)
180
raise Exception(''.join(error_lines))
163
182
def create_proposal(self):
164
183
"""Perform the submission."""
165
184
prerequisite_branch = self._get_prerequisite_branch()
175
194
review_types.append(review_type)
176
195
reviewers.append(reviewer.self_link)
177
196
initial_comment = self.get_comment(prerequisite_branch)
179
mp = self.source_branch.lp.createMergeProposal(
180
target_branch=self.target_branch.lp,
181
prerequisite_branch=prereq,
182
initial_comment=initial_comment,
183
commit_message=self.commit_message, reviewers=reviewers,
184
review_types=review_types)
185
except restful_errors.HTTPError, e:
187
for line in e.content.splitlines():
188
if line.startswith('Traceback (most recent call last):'):
190
error_lines.append(line)
191
raise Exception(''.join(error_lines))
193
webbrowser.open(canonical_url(mp))
197
mp = self.call_webservice(
198
self.source_branch.lp.createMergeProposal,
199
target_branch=self.target_branch.lp,
200
prerequisite_branch=prereq,
201
initial_comment=initial_comment,
202
commit_message=self.commit_message, reviewers=reviewers,
203
review_types=review_types)
205
self.call_webservice(mp.setStatus, status='Approved')
206
webbrowser.open(lp_api.canonical_url(mp))
196
209
def modified_files(old_tree, new_tree):
200
213
if c and k == 'file':
204
def canonical_url(object):
205
"""Return the canonical URL for a branch."""
206
scheme, netloc, path, params, query, fragment = urlparse.urlparse(
207
str(object.self_link))
208
path = '/'.join(path.split('/')[2:])
209
netloc = netloc.replace('api.', 'code.')
210
return urlparse.urlunparse((scheme, netloc, path, params, query,
added
removed
bzrlib/plugins/launchpad/lp_propose.py
