← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/plugins/launchpad/lp_propose.py

  • Committer: Martin
  • Date: 2010-05-03 20:57:39 UTC
  • mto: This revision was merged to the branch mainline in revision 5204.
  • Revision ID: gzlist@googlemail.com-20100503205739-n326zdvevv0rmruh
Retain original stack and error message when translating to ValueError in bencode

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/launchpad/lp_propose.py
1
 
# Copyright (C) 2010, 2011 Canonical Ltd
 
1
# Copyright (C) 2010 Canonical Ltd
2
2
#
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
16
16
 
17
 
from __future__ import absolute_import
 
17
 
 
18
import urlparse
 
19
import webbrowser
18
20
 
19
21
from bzrlib import (
20
22
    errors,
21
23
    hooks,
22
 
    )
23
 
from bzrlib.lazy_import import lazy_import
24
 
lazy_import(globals(), """
25
 
import webbrowser
26
 
 
27
 
from bzrlib import (
28
24
    msgeditor,
29
 
    )
30
 
from bzrlib.i18n import gettext
 
25
)
31
26
from bzrlib.plugins.launchpad import (
32
27
    lp_api,
33
28
    lp_registration,
34
 
    )
35
 
""")
 
29
)
 
30
 
 
31
from lazr.restfulclient import errors as restful_errors
36
32
 
37
33
 
38
34
class ProposeMergeHooks(hooks.Hooks):
39
35
    """Hooks for proposing a merge on Launchpad."""
40
36
 
41
37
    def __init__(self):
42
 
        hooks.Hooks.__init__(self, "bzrlib.plugins.launchpad.lp_propose",
43
 
            "Proposer.hooks")
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))
 
38
        hooks.Hooks.__init__(self)
 
39
        self.create_hook(
 
40
            hooks.HookPoint(
 
41
                'get_prerequisite',
 
42
                "Return the prerequisite branch for proposing as merge.",
 
43
                (2, 1), None),
 
44
        )
 
45
        self.create_hook(
 
46
            hooks.HookPoint(
 
47
                'merge_proposal_body',
 
48
                "Return an initial body for the merge proposal message.",
 
49
                (2, 1), None),
 
50
        )
48
51
 
49
52
 
50
53
class Proposer(object):
52
55
    hooks = ProposeMergeHooks()
53
56
 
54
57
    def __init__(self, tree, source_branch, target_branch, message, reviews,
55
 
                 staging=False, approve=False, fixes=None):
 
58
                 staging=False):
56
59
        """Constructor.
57
60
 
58
61
        :param tree: The working tree for the source branch.
62
65
        :param reviews: A list of tuples of reviewer, review type.
63
66
        :param staging: If True, propose the merge against staging instead of
64
67
            production.
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
68
 
            branches).
69
68
        """
70
69
        self.tree = tree
71
70
        if staging:
72
71
            lp_instance = 'staging'
73
72
        else:
74
 
            lp_instance = 'production'
 
73
            lp_instance = 'edge'
75
74
        service = lp_registration.LaunchpadService(lp_instance=lp_instance)
76
75
        self.launchpad = lp_api.login(service)
77
76
        self.source_branch = lp_api.LaunchpadBranch.from_bzr(
78
77
            self.launchpad, source_branch)
79
78
        if target_branch is None:
80
 
            self.target_branch = self.source_branch.get_target()
 
79
            self.target_branch = self.source_branch.get_dev_focus()
81
80
        else:
82
81
            self.target_branch = lp_api.LaunchpadBranch.from_bzr(
83
82
                self.launchpad, target_branch)
84
83
        self.commit_message = message
85
 
        # XXX: this is where bug lp:583638 could be tackled.
86
84
        if reviews == []:
87
 
            self.reviews = []
 
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, '')]
88
89
        else:
89
90
            self.reviews = [(self.launchpad.people[reviewer], review_type)
90
91
                            for reviewer, review_type in
91
92
                            reviews]
92
 
        self.approve = approve
93
 
        self.fixes = fixes
94
93
 
95
94
    def get_comment(self, prerequisite_branch):
96
95
        """Determine the initial comment for the merge proposal."""
137
136
            })
138
137
        return body
139
138
 
140
 
    def get_source_revid(self):
141
 
        """Get the revision ID of the source branch."""
142
 
        source_branch = self.source_branch.bzr
143
 
        source_branch.lock_read()
144
 
        try:
145
 
            return source_branch.last_revision()
146
 
        finally:
147
 
            source_branch.unlock()
148
 
 
149
139
    def check_proposal(self):
150
140
        """Check that the submission is sensible."""
151
141
        if self.source_branch.lp.self_link == self.target_branch.lp.self_link:
155
145
            if mp.queue_status in ('Merged', 'Rejected'):
156
146
                continue
157
147
            if mp.target_branch.self_link == self.target_branch.lp.self_link:
158
 
                raise errors.BzrCommandError(gettext(
159
 
                    'There is already a branch merge proposal: %s') %
160
 
                    lp_api.canonical_url(mp))
 
148
                raise errors.BzrCommandError(
 
149
                    'There is already a branch merge proposal: %s' %
 
150
                    canonical_url(mp))
161
151
 
162
152
    def _get_prerequisite_branch(self):
163
153
        hooks = self.hooks['get_prerequisite']
170
160
                 'prerequisite_branch': prerequisite_branch})
171
161
        return prerequisite_branch
172
162
 
173
 
    def call_webservice(self, call, *args, **kwargs):
174
 
        """Make a call to the webservice, wrapping failures.
175
 
        
176
 
        :param call: The call to make.
177
 
        :param *args: *args for the call.
178
 
        :param **kwargs: **kwargs for the call.
179
 
        :return: The result of calling call(*args, *kwargs).
180
 
        """
181
 
        from lazr.restfulclient import errors as restful_errors
182
 
        try:
183
 
            return call(*args, **kwargs)
184
 
        except restful_errors.HTTPError, e:
185
 
            error_lines = []
186
 
            for line in e.content.splitlines():
187
 
                if line.startswith('Traceback (most recent call last):'):
188
 
                    break
189
 
                error_lines.append(line)
190
 
            raise Exception(''.join(error_lines))
191
 
 
192
 
    def approve_proposal(self, mp):
193
 
        revid = self.get_source_revid()
194
 
        self.call_webservice(
195
 
            mp.createComment,
196
 
            vote=u'Approve',
197
 
            subject='', # Use the default subject.
198
 
            content=u"Rubberstamp! Proposer approves of own proposal.")
199
 
        self.call_webservice(mp.setStatus, status=u'Approved', revid=revid)
200
 
 
201
163
    def create_proposal(self):
202
164
        """Perform the submission."""
203
165
        prerequisite_branch = self._get_prerequisite_branch()
213
175
            review_types.append(review_type)
214
176
            reviewers.append(reviewer.self_link)
215
177
        initial_comment = self.get_comment(prerequisite_branch)
216
 
        mp = self.call_webservice(
217
 
            self.source_branch.lp.createMergeProposal,
218
 
            target_branch=self.target_branch.lp,
219
 
            prerequisite_branch=prereq,
220
 
            initial_comment=initial_comment,
221
 
            commit_message=self.commit_message, reviewers=reviewers,
222
 
            review_types=review_types)
223
 
        if self.approve:
224
 
            self.approve_proposal(mp)
225
 
        if self.fixes:
226
 
            if self.fixes.startswith('lp:'):
227
 
                self.fixes = self.fixes[3:]
228
 
            self.call_webservice(
229
 
                self.source_branch.lp.linkBug,
230
 
                bug=self.launchpad.bugs[int(self.fixes)])
231
 
        webbrowser.open(lp_api.canonical_url(mp))
 
178
        try:
 
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:
 
186
            error_lines = []
 
187
            for line in e.content.splitlines():
 
188
                if line.startswith('Traceback (most recent call last):'):
 
189
                    break
 
190
                error_lines.append(line)
 
191
            raise Exception(''.join(error_lines))
 
192
        else:
 
193
            webbrowser.open(canonical_url(mp))
232
194
 
233
195
 
234
196
def modified_files(old_tree, new_tree):
237
199
        old_tree):
238
200
        if c and k == 'file':
239
201
            yield str(path)
 
202
 
 
203
 
 
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,
 
211
                                fragment))