← 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: 2011-08-04 00:17:53 UTC
  • mto: This revision was merged to the branch mainline in revision 6055.
  • Revision ID: gzlist@googlemail.com-20110804001753-plgpwcpsxcum16yb
Make tests raising KnownFailure use the knownFailure method instead

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
20
 
 
21
17
from bzrlib import (
22
18
    errors,
23
19
    hooks,
 
20
    )
 
21
from bzrlib.lazy_import import lazy_import
 
22
lazy_import(globals(), """
 
23
import webbrowser
 
24
 
 
25
from bzrlib import (
24
26
    msgeditor,
25
 
)
 
27
    )
26
28
from bzrlib.plugins.launchpad import (
27
29
    lp_api,
28
30
    lp_registration,
29
 
)
30
 
 
31
 
from lazr.restfulclient import errors as restful_errors
 
31
    )
 
32
""")
32
33
 
33
34
 
34
35
class ProposeMergeHooks(hooks.Hooks):
35
36
    """Hooks for proposing a merge on Launchpad."""
36
37
 
37
38
    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
 
        )
 
39
        hooks.Hooks.__init__(self, "bzrlib.plugins.launchpad.lp_propose",
 
40
            "Proposer.hooks")
 
41
        self.add_hook('get_prerequisite',
 
42
            "Return the prerequisite branch for proposing as merge.", (2, 1))
 
43
        self.add_hook('merge_proposal_body',
 
44
            "Return an initial body for the merge proposal message.", (2, 1))
51
45
 
52
46
 
53
47
class Proposer(object):
55
49
    hooks = ProposeMergeHooks()
56
50
 
57
51
    def __init__(self, tree, source_branch, target_branch, message, reviews,
58
 
                 staging=False):
 
52
                 staging=False, approve=False):
59
53
        """Constructor.
60
54
 
61
55
        :param tree: The working tree for the source branch.
65
59
        :param reviews: A list of tuples of reviewer, review type.
66
60
        :param staging: If True, propose the merge against staging instead of
67
61
            production.
 
62
        :param approve: If True, mark the new proposal as approved immediately.
 
63
            This is useful when a project permits some things to be approved
 
64
            by the submitter (e.g. merges between release and deployment
 
65
            branches).
68
66
        """
69
67
        self.tree = tree
70
68
        if staging:
71
69
            lp_instance = 'staging'
72
70
        else:
73
 
            lp_instance = 'edge'
 
71
            lp_instance = 'production'
74
72
        service = lp_registration.LaunchpadService(lp_instance=lp_instance)
75
73
        self.launchpad = lp_api.login(service)
76
74
        self.source_branch = lp_api.LaunchpadBranch.from_bzr(
77
75
            self.launchpad, source_branch)
78
76
        if target_branch is None:
79
 
            self.target_branch = self.source_branch.get_dev_focus()
 
77
            self.target_branch = self.source_branch.get_target()
80
78
        else:
81
79
            self.target_branch = lp_api.LaunchpadBranch.from_bzr(
82
80
                self.launchpad, target_branch)
83
81
        self.commit_message = message
 
82
        # XXX: this is where bug lp:583638 could be tackled.
84
83
        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, '')]
 
84
            self.reviews = []
89
85
        else:
90
86
            self.reviews = [(self.launchpad.people[reviewer], review_type)
91
87
                            for reviewer, review_type in
92
88
                            reviews]
 
89
        self.approve = approve
93
90
 
94
91
    def get_comment(self, prerequisite_branch):
95
92
        """Determine the initial comment for the merge proposal."""
147
144
            if mp.target_branch.self_link == self.target_branch.lp.self_link:
148
145
                raise errors.BzrCommandError(
149
146
                    'There is already a branch merge proposal: %s' %
150
 
                    canonical_url(mp))
 
147
                    lp_api.canonical_url(mp))
151
148
 
152
149
    def _get_prerequisite_branch(self):
153
150
        hooks = self.hooks['get_prerequisite']
160
157
                 'prerequisite_branch': prerequisite_branch})
161
158
        return prerequisite_branch
162
159
 
 
160
    def call_webservice(self, call, *args, **kwargs):
 
161
        """Make a call to the webservice, wrapping failures.
 
162
        
 
163
        :param call: The call to make.
 
164
        :param *args: *args for the call.
 
165
        :param **kwargs: **kwargs for the call.
 
166
        :return: The result of calling call(*args, *kwargs).
 
167
        """
 
168
        from lazr.restfulclient import errors as restful_errors
 
169
        try:
 
170
            return call(*args, **kwargs)
 
171
        except restful_errors.HTTPError, e:
 
172
            error_lines = []
 
173
            for line in e.content.splitlines():
 
174
                if line.startswith('Traceback (most recent call last):'):
 
175
                    break
 
176
                error_lines.append(line)
 
177
            raise Exception(''.join(error_lines))
 
178
 
163
179
    def create_proposal(self):
164
180
        """Perform the submission."""
165
181
        prerequisite_branch = self._get_prerequisite_branch()
175
191
            review_types.append(review_type)
176
192
            reviewers.append(reviewer.self_link)
177
193
        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))
 
194
        mp = self.call_webservice(
 
195
            self.source_branch.lp.createMergeProposal,
 
196
            target_branch=self.target_branch.lp,
 
197
            prerequisite_branch=prereq,
 
198
            initial_comment=initial_comment,
 
199
            commit_message=self.commit_message, reviewers=reviewers,
 
200
            review_types=review_types)
 
201
        if self.approve:
 
202
            self.call_webservice(mp.setStatus, status='Approved')
 
203
        webbrowser.open(lp_api.canonical_url(mp))
194
204
 
195
205
 
196
206
def modified_files(old_tree, new_tree):
199
209
        old_tree):
200
210
        if c and k == 'file':
201
211
            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))