← 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: Patch Queue Manager
  • Date: 2015-09-30 16:43:21 UTC
  • mfrom: (6603.2.2 fix-keep-dirty)
  • Revision ID: pqm@pqm.ubuntu.com-20150930164321-ct2v2qnmvimqt8qf
(vila) Avoid associating dirty patch headers with the previous file in the
 patch. (Colin Watson)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/launchpad/lp_propose.py
1
 
# Copyright (C) 2009, 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
from __future__ import absolute_import
17
18
 
 
19
from bzrlib import (
 
20
    errors,
 
21
    hooks,
 
22
    )
 
23
from bzrlib.lazy_import import lazy_import
 
24
lazy_import(globals(), """
18
25
import webbrowser
19
26
 
20
27
from bzrlib import (
21
 
    errors,
22
28
    msgeditor,
23
 
)
24
 
from bzrlib.hooks import HookPoint, Hooks
 
29
    )
 
30
from bzrlib.i18n import gettext
25
31
from bzrlib.plugins.launchpad import (
26
32
    lp_api,
27
33
    lp_registration,
28
 
)
29
 
 
30
 
from lazr.restfulclient import errors as restful_errors
31
 
 
32
 
 
33
 
class ProposeMergeHooks(Hooks):
 
34
    )
 
35
""")
 
36
 
 
37
 
 
38
class ProposeMergeHooks(hooks.Hooks):
34
39
    """Hooks for proposing a merge on Launchpad."""
35
40
 
36
41
    def __init__(self):
37
 
        Hooks.__init__(self)
38
 
        self.create_hook(
39
 
            HookPoint(
40
 
                'get_prerequisite',
41
 
                "Return the prerequisite branch for proposing as merge.",
42
 
                (2, 1), None),
43
 
        )
44
 
        self.create_hook(
45
 
            HookPoint(
46
 
                'merge_proposal_body',
47
 
                "Return an initial body for the merge proposal message.",
48
 
                (2, 1), None),
49
 
        )
 
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))
50
48
 
51
49
 
52
50
class Proposer(object):
54
52
    hooks = ProposeMergeHooks()
55
53
 
56
54
    def __init__(self, tree, source_branch, target_branch, message, reviews,
57
 
                 staging=False):
 
55
                 staging=False, approve=False, fixes=None):
58
56
        """Constructor.
59
57
 
60
58
        :param tree: The working tree for the source branch.
64
62
        :param reviews: A list of tuples of reviewer, review type.
65
63
        :param staging: If True, propose the merge against staging instead of
66
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).
67
69
        """
68
70
        self.tree = tree
69
71
        if staging:
70
72
            lp_instance = 'staging'
71
73
        else:
72
 
            lp_instance = 'edge'
 
74
            lp_instance = 'production'
73
75
        service = lp_registration.LaunchpadService(lp_instance=lp_instance)
74
76
        self.launchpad = lp_api.login(service)
75
77
        self.source_branch = lp_api.LaunchpadBranch.from_bzr(
76
78
            self.launchpad, source_branch)
77
79
        if target_branch is None:
78
 
            self.target_branch = self.source_branch.get_dev_focus()
 
80
            self.target_branch = self.source_branch.get_target()
79
81
        else:
80
82
            self.target_branch = lp_api.LaunchpadBranch.from_bzr(
81
83
                self.launchpad, target_branch)
82
84
        self.commit_message = message
 
85
        # XXX: this is where bug lp:583638 could be tackled.
83
86
        if reviews == []:
84
 
            target_reviewer = self.target_branch.lp.reviewer
85
 
            if target_reviewer is None:
86
 
                raise errors.BzrCommandError('No reviewer specified')
87
 
            self.reviews = [(target_reviewer, '')]
 
87
            self.reviews = []
88
88
        else:
89
89
            self.reviews = [(self.launchpad.people[reviewer], review_type)
90
90
                            for reviewer, review_type in
91
91
                            reviews]
 
92
        self.approve = approve
 
93
        self.fixes = fixes
92
94
 
93
95
    def get_comment(self, prerequisite_branch):
94
96
        """Determine the initial comment for the merge proposal."""
135
137
            })
136
138
        return body
137
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
 
138
149
    def check_proposal(self):
139
150
        """Check that the submission is sensible."""
140
151
        if self.source_branch.lp.self_link == self.target_branch.lp.self_link:
144
155
            if mp.queue_status in ('Merged', 'Rejected'):
145
156
                continue
146
157
            if mp.target_branch.self_link == self.target_branch.lp.self_link:
147
 
                raise errors.BzrCommandError(
148
 
                    'There is already a branch merge proposal: %s' %
149
 
                    canonical_url(mp))
 
158
                raise errors.BzrCommandError(gettext(
 
159
                    'There is already a branch merge proposal: %s') %
 
160
                    lp_api.canonical_url(mp))
150
161
 
151
162
    def _get_prerequisite_branch(self):
152
163
        hooks = self.hooks['get_prerequisite']
159
170
                 'prerequisite_branch': prerequisite_branch})
160
171
        return prerequisite_branch
161
172
 
 
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
 
162
201
    def create_proposal(self):
163
202
        """Perform the submission."""
164
203
        prerequisite_branch = self._get_prerequisite_branch()
174
213
            review_types.append(review_type)
175
214
            reviewers.append(reviewer.self_link)
176
215
        initial_comment = self.get_comment(prerequisite_branch)
177
 
        try:
178
 
            mp = self.source_branch.lp.createMergeProposal(
179
 
                target_branch=self.target_branch.lp,
180
 
                prerequisite_branch=prereq,
181
 
                initial_comment=initial_comment,
182
 
                commit_message=self.commit_message, reviewers=reviewers,
183
 
                review_types=review_types)
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
 
        else:
192
 
            webbrowser.open(canonical_url(mp))
 
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))
193
232
 
194
233
 
195
234
def modified_files(old_tree, new_tree):
198
237
        old_tree):
199
238
        if c and k == 'file':
200
239
            yield str(path)
201
 
 
202
 
 
203
 
def canonical_url(object):
204
 
    """Return the canonical URL for a branch."""
205
 
    url = object.self_link.replace('https://api.', 'https://code.')
206
 
    return url.replace('/beta/', '/')