← 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: Vincent Ladeuil
  • Date: 2012-07-10 12:19:23 UTC
  • mto: This revision was merged to the branch mainline in revision 6537.
  • Revision ID: v.ladeuil+lp@free.fr-20120710121923-e3d10dv70jlalt5t
Open 2.6b3

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):
 
55
                 staging=False, approve=False, fixes=None):
59
56
        """Constructor.
60
57
 
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
67
64
            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).
68
69
        """
69
70
        self.tree = tree
70
71
        if staging:
71
72
            lp_instance = 'staging'
72
73
        else:
73
 
            lp_instance = 'edge'
 
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()
80
81
        else:
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.
84
86
        if 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, '')]
 
87
            self.reviews = []
89
88
        else:
90
89
            self.reviews = [(self.launchpad.people[reviewer], review_type)
91
90
                            for reviewer, review_type in
92
91
                            reviews]
 
92
        self.approve = approve
 
93
        self.fixes = fixes
93
94
 
94
95
    def get_comment(self, prerequisite_branch):
95
96
        """Determine the initial comment for the merge proposal."""
145
146
            if mp.queue_status in ('Merged', 'Rejected'):
146
147
                continue
147
148
            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' %
150
 
                    canonical_url(mp))
 
149
                raise errors.BzrCommandError(gettext(
 
150
                    'There is already a branch merge proposal: %s') %
 
151
                    lp_api.canonical_url(mp))
151
152
 
152
153
    def _get_prerequisite_branch(self):
153
154
        hooks = self.hooks['get_prerequisite']
160
161
                 'prerequisite_branch': prerequisite_branch})
161
162
        return prerequisite_branch
162
163
 
 
164
    def call_webservice(self, call, *args, **kwargs):
 
165
        """Make a call to the webservice, wrapping failures.
 
166
        
 
167
        :param call: The call to make.
 
168
        :param *args: *args for the call.
 
169
        :param **kwargs: **kwargs for the call.
 
170
        :return: The result of calling call(*args, *kwargs).
 
171
        """
 
172
        from lazr.restfulclient import errors as restful_errors
 
173
        try:
 
174
            return call(*args, **kwargs)
 
175
        except restful_errors.HTTPError, e:
 
176
            error_lines = []
 
177
            for line in e.content.splitlines():
 
178
                if line.startswith('Traceback (most recent call last):'):
 
179
                    break
 
180
                error_lines.append(line)
 
181
            raise Exception(''.join(error_lines))
 
182
 
163
183
    def create_proposal(self):
164
184
        """Perform the submission."""
165
185
        prerequisite_branch = self._get_prerequisite_branch()
175
195
            review_types.append(review_type)
176
196
            reviewers.append(reviewer.self_link)
177
197
        initial_comment = self.get_comment(prerequisite_branch)
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))
 
198
        mp = self.call_webservice(
 
199
            self.source_branch.lp.createMergeProposal,
 
200
            target_branch=self.target_branch.lp,
 
201
            prerequisite_branch=prereq,
 
202
            initial_comment=initial_comment,
 
203
            commit_message=self.commit_message, reviewers=reviewers,
 
204
            review_types=review_types)
 
205
        if self.approve:
 
206
            self.call_webservice(mp.setStatus, status='Approved')
 
207
        if self.fixes:
 
208
            if self.fixes.startswith('lp:'):
 
209
                self.fixes = self.fixes[3:]
 
210
            self.call_webservice(
 
211
                self.source_branch.lp.linkBug,
 
212
                bug=self.launchpad.bugs[int(self.fixes)])
 
213
        webbrowser.open(lp_api.canonical_url(mp))
194
214
 
195
215
 
196
216
def modified_files(old_tree, new_tree):
199
219
        old_tree):
200
220
        if c and k == 'file':
201
221
            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))