← 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

(vila) Fix bzrlib.tests.test_gpg.TestVerify.test_verify_revoked_signature
 with recent versions of gpg. (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/launchpad/lp_propose.py
1
 
# Copyright (C) 2010 Canonical Ltd
 
1
# Copyright (C) 2010, 2011 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
 
 
18
 
import urlparse
19
 
import webbrowser
 
17
from __future__ import absolute_import
20
18
 
21
19
from bzrlib import (
22
20
    errors,
23
21
    hooks,
 
22
    )
 
23
from bzrlib.lazy_import import lazy_import
 
24
lazy_import(globals(), """
 
25
import webbrowser
 
26
 
 
27
from bzrlib import (
24
28
    msgeditor,
25
 
)
 
29
    )
 
30
from bzrlib.i18n import gettext
26
31
from bzrlib.plugins.launchpad import (
27
32
    lp_api,
28
33
    lp_registration,
29
 
)
30
 
 
31
 
from lazr.restfulclient import errors as restful_errors
 
34
    )
 
35
""")
32
36
 
33
37
 
34
38
class ProposeMergeHooks(hooks.Hooks):
35
39
    """Hooks for proposing a merge on Launchpad."""
36
40
 
37
41
    def __init__(self):
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
 
        )
 
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))
51
48
 
52
49
 
53
50
class Proposer(object):
55
52
    hooks = ProposeMergeHooks()
56
53
 
57
54
    def __init__(self, tree, source_branch, target_branch, message, reviews,
58
 
                 staging=False, approve=False):
 
55
                 staging=False, approve=False, fixes=None):
59
56
        """Constructor.
60
57
 
61
58
        :param tree: The working tree for the source branch.
74
71
        if staging:
75
72
            lp_instance = 'staging'
76
73
        else:
77
 
            lp_instance = 'edge'
 
74
            lp_instance = 'production'
78
75
        service = lp_registration.LaunchpadService(lp_instance=lp_instance)
79
76
        self.launchpad = lp_api.login(service)
80
77
        self.source_branch = lp_api.LaunchpadBranch.from_bzr(
81
78
            self.launchpad, source_branch)
82
79
        if target_branch is None:
83
 
            self.target_branch = self.source_branch.get_dev_focus()
 
80
            self.target_branch = self.source_branch.get_target()
84
81
        else:
85
82
            self.target_branch = lp_api.LaunchpadBranch.from_bzr(
86
83
                self.launchpad, target_branch)
87
84
        self.commit_message = message
88
85
        # XXX: this is where bug lp:583638 could be tackled.
89
86
        if reviews == []:
90
 
            target_reviewer = self.target_branch.lp.reviewer
91
 
            if target_reviewer is None:
92
 
                raise errors.BzrCommandError('No reviewer specified')
93
 
            self.reviews = [(target_reviewer, '')]
 
87
            self.reviews = []
94
88
        else:
95
89
            self.reviews = [(self.launchpad.people[reviewer], review_type)
96
90
                            for reviewer, review_type in
97
91
                            reviews]
98
92
        self.approve = approve
 
93
        self.fixes = fixes
99
94
 
100
95
    def get_comment(self, prerequisite_branch):
101
96
        """Determine the initial comment for the merge proposal."""
142
137
            })
143
138
        return body
144
139
 
 
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
 
145
149
    def check_proposal(self):
146
150
        """Check that the submission is sensible."""
147
151
        if self.source_branch.lp.self_link == self.target_branch.lp.self_link:
151
155
            if mp.queue_status in ('Merged', 'Rejected'):
152
156
                continue
153
157
            if mp.target_branch.self_link == self.target_branch.lp.self_link:
154
 
                raise errors.BzrCommandError(
155
 
                    'There is already a branch merge proposal: %s' %
156
 
                    canonical_url(mp))
 
158
                raise errors.BzrCommandError(gettext(
 
159
                    'There is already a branch merge proposal: %s') %
 
160
                    lp_api.canonical_url(mp))
157
161
 
158
162
    def _get_prerequisite_branch(self):
159
163
        hooks = self.hooks['get_prerequisite']
174
178
        :param **kwargs: **kwargs for the call.
175
179
        :return: The result of calling call(*args, *kwargs).
176
180
        """
 
181
        from lazr.restfulclient import errors as restful_errors
177
182
        try:
178
183
            return call(*args, **kwargs)
179
184
        except restful_errors.HTTPError, e:
184
189
                error_lines.append(line)
185
190
            raise Exception(''.join(error_lines))
186
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
 
187
201
    def create_proposal(self):
188
202
        """Perform the submission."""
189
203
        prerequisite_branch = self._get_prerequisite_branch()
207
221
            commit_message=self.commit_message, reviewers=reviewers,
208
222
            review_types=review_types)
209
223
        if self.approve:
210
 
            self.call_webservice(mp.setStatus, status='Approved')
211
 
        webbrowser.open(canonical_url(mp))
 
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))
212
232
 
213
233
 
214
234
def modified_files(old_tree, new_tree):
217
237
        old_tree):
218
238
        if c and k == 'file':
219
239
            yield str(path)
220
 
 
221
 
 
222
 
def canonical_url(object):
223
 
    """Return the canonical URL for a branch."""
224
 
    scheme, netloc, path, params, query, fragment = urlparse.urlparse(
225
 
        str(object.self_link))
226
 
    path = '/'.join(path.split('/')[2:])
227
 
    netloc = netloc.replace('api.', 'code.')
228
 
    return urlparse.urlunparse((scheme, netloc, path, params, query,
229
 
                                fragment))