← 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: Canonical.com Patch Queue Manager
  • Date: 2010-09-01 08:02:42 UTC
  • mfrom: (5390.3.3 faster-revert-593560)
  • Revision ID: pqm@pqm.ubuntu.com-20100901080242-esg62ody4frwmy66
(spiv) Avoid repeatedly calling self.target.all_file_ids() in
 InterTree.iter_changes. (Andrew Bennetts)

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, approve=False):
56
59
        """Constructor.
57
60
 
58
61
        :param tree: The working tree for the source branch.
71
74
        if staging:
72
75
            lp_instance = 'staging'
73
76
        else:
74
 
            lp_instance = 'production'
 
77
            lp_instance = 'edge'
75
78
        service = lp_registration.LaunchpadService(lp_instance=lp_instance)
76
79
        self.launchpad = lp_api.login(service)
77
80
        self.source_branch = lp_api.LaunchpadBranch.from_bzr(
78
81
            self.launchpad, source_branch)
79
82
        if target_branch is None:
80
 
            self.target_branch = self.source_branch.get_target()
 
83
            self.target_branch = self.source_branch.get_dev_focus()
81
84
        else:
82
85
            self.target_branch = lp_api.LaunchpadBranch.from_bzr(
83
86
                self.launchpad, target_branch)
84
87
        self.commit_message = message
85
88
        # XXX: this is where bug lp:583638 could be tackled.
86
89
        if reviews == []:
87
 
            self.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, '')]
88
94
        else:
89
95
            self.reviews = [(self.launchpad.people[reviewer], review_type)
90
96
                            for reviewer, review_type in
91
97
                            reviews]
92
98
        self.approve = approve
93
 
        self.fixes = fixes
94
99
 
95
100
    def get_comment(self, prerequisite_branch):
96
101
        """Determine the initial comment for the merge proposal."""
137
142
            })
138
143
        return body
139
144
 
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
145
    def check_proposal(self):
150
146
        """Check that the submission is sensible."""
151
147
        if self.source_branch.lp.self_link == self.target_branch.lp.self_link:
155
151
            if mp.queue_status in ('Merged', 'Rejected'):
156
152
                continue
157
153
            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))
 
154
                raise errors.BzrCommandError(
 
155
                    'There is already a branch merge proposal: %s' %
 
156
                    canonical_url(mp))
161
157
 
162
158
    def _get_prerequisite_branch(self):
163
159
        hooks = self.hooks['get_prerequisite']
178
174
        :param **kwargs: **kwargs for the call.
179
175
        :return: The result of calling call(*args, *kwargs).
180
176
        """
181
 
        from lazr.restfulclient import errors as restful_errors
182
177
        try:
183
178
            return call(*args, **kwargs)
184
179
        except restful_errors.HTTPError, e:
189
184
                error_lines.append(line)
190
185
            raise Exception(''.join(error_lines))
191
186
 
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
187
    def create_proposal(self):
202
188
        """Perform the submission."""
203
189
        prerequisite_branch = self._get_prerequisite_branch()
221
207
            commit_message=self.commit_message, reviewers=reviewers,
222
208
            review_types=review_types)
223
209
        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))
 
210
            self.call_webservice(mp.setStatus, status='Approved')
 
211
        webbrowser.open(canonical_url(mp))
232
212
 
233
213
 
234
214
def modified_files(old_tree, new_tree):
237
217
        old_tree):
238
218
        if c and k == 'file':
239
219
            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))