/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/plugins/launchpad/lp_propose.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-08-23 01:15:41 UTC
  • mfrom: (7520.1.4 merge-3.1)
  • Revision ID: breezy.the.bot@gmail.com-20200823011541-nv0oh7nzaganx2qy
Merge lp:brz/3.1.

Merged from https://code.launchpad.net/~jelmer/brz/merge-3.1/+merge/389690

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/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
 
from bzrlib import (
 
17
from ... import (
22
18
    errors,
23
19
    hooks,
 
20
    )
 
21
from ...lazy_import import lazy_import
 
22
lazy_import(globals(), """
 
23
import webbrowser
 
24
 
 
25
from breezy import (
24
26
    msgeditor,
25
 
)
26
 
from bzrlib.plugins.launchpad import (
 
27
    )
 
28
from breezy.i18n import gettext
 
29
from breezy.plugins.launchpad import (
27
30
    lp_api,
28
 
    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, "breezy.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, fixes=None):
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
 
            lp_instance = 'staging'
 
69
            lp_base_url = lp_api.uris.STAGING_SERVICE_ROOT
72
70
        else:
73
 
            lp_instance = 'edge'
74
 
        service = lp_registration.LaunchpadService(lp_instance=lp_instance)
75
 
        self.launchpad = lp_api.login(service)
 
71
            lp_base_url = lp_api.uris.LPNET_SERVICE_ROOT
 
72
        self.launchpad = lp_api.connect_launchpad(lp_base_url)
76
73
        self.source_branch = lp_api.LaunchpadBranch.from_bzr(
77
74
            self.launchpad, source_branch)
78
75
        if target_branch is None:
79
 
            self.target_branch = self.source_branch.get_dev_focus()
 
76
            self.target_branch = self.source_branch.get_target()
80
77
        else:
81
78
            self.target_branch = lp_api.LaunchpadBranch.from_bzr(
82
79
                self.launchpad, target_branch)
83
80
        self.commit_message = message
 
81
        # XXX: this is where bug lp:583638 could be tackled.
84
82
        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, '')]
 
83
            self.reviews = []
89
84
        else:
90
85
            self.reviews = [(self.launchpad.people[reviewer], review_type)
91
86
                            for reviewer, review_type in
92
87
                            reviews]
 
88
        self.approve = approve
 
89
        self.fixes = fixes
93
90
 
94
91
    def get_comment(self, prerequisite_branch):
95
92
        """Determine the initial comment for the merge proposal."""
 
93
        if self.commit_message is not None:
 
94
            return self.commit_message.strip().encode('utf-8')
96
95
        info = ["Source: %s\n" % self.source_branch.lp.bzr_identity]
97
96
        info.append("Target: %s\n" % self.target_branch.lp.bzr_identity)
98
97
        if prerequisite_branch is not None:
100
99
        for rdata in self.reviews:
101
100
            uniquename = "%s (%s)" % (rdata[0].display_name, rdata[0].name)
102
101
            info.append('Reviewer: %s, type "%s"\n' % (uniquename, rdata[1]))
103
 
        self.source_branch.bzr.lock_read()
104
 
        try:
105
 
            self.target_branch.bzr.lock_read()
106
 
            try:
107
 
                body = self.get_initial_body()
108
 
            finally:
109
 
                self.target_branch.bzr.unlock()
110
 
        finally:
111
 
            self.source_branch.bzr.unlock()
 
102
        with self.source_branch.bzr.lock_read(), \
 
103
                self.target_branch.bzr.lock_read():
 
104
            body = self.get_initial_body()
112
105
        initial_comment = msgeditor.edit_commit_message(''.join(info),
113
106
                                                        start_message=body)
114
107
        return initial_comment.strip().encode('utf-8')
125
118
            files = modified_files(lca_tree, source_tree)
126
119
            return list(files)
127
120
        target_loc = ('bzr+ssh://bazaar.launchpad.net/%s' %
128
 
                       self.target_branch.lp.unique_name)
 
121
                      self.target_branch.lp.unique_name)
129
122
        body = None
130
123
        for hook in self.hooks['merge_proposal_body']:
131
124
            body = hook({
136
129
            })
137
130
        return body
138
131
 
 
132
    def get_source_revid(self):
 
133
        """Get the revision ID of the source branch."""
 
134
        source_branch = self.source_branch.bzr
 
135
        with source_branch.lock_read():
 
136
            return source_branch.last_revision()
 
137
 
139
138
    def check_proposal(self):
140
139
        """Check that the submission is sensible."""
141
140
        if self.source_branch.lp.self_link == self.target_branch.lp.self_link:
142
 
            raise errors.BzrCommandError(
 
141
            raise errors.CommandError(
143
142
                'Source and target branches must be different.')
144
143
        for mp in self.source_branch.lp.landing_targets:
145
144
            if mp.queue_status in ('Merged', 'Rejected'):
146
145
                continue
147
146
            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))
 
147
                raise errors.CommandError(gettext(
 
148
                    'There is already a branch merge proposal: %s') %
 
149
                    lp_api.canonical_url(mp))
151
150
 
152
151
    def _get_prerequisite_branch(self):
153
152
        hooks = self.hooks['get_prerequisite']
160
159
                 'prerequisite_branch': prerequisite_branch})
161
160
        return prerequisite_branch
162
161
 
 
162
    def call_webservice(self, call, *args, **kwargs):
 
163
        """Make a call to the webservice, wrapping failures.
 
164
 
 
165
        :param call: The call to make.
 
166
        :param *args: *args for the call.
 
167
        :param **kwargs: **kwargs for the call.
 
168
        :return: The result of calling call(*args, *kwargs).
 
169
        """
 
170
        from lazr.restfulclient import errors as restful_errors
 
171
        try:
 
172
            return call(*args, **kwargs)
 
173
        except restful_errors.HTTPError as e:
 
174
            error_lines = []
 
175
            for line in e.content.splitlines():
 
176
                if line.startswith('Traceback (most recent call last):'):
 
177
                    break
 
178
                error_lines.append(line)
 
179
            raise Exception(''.join(error_lines))
 
180
 
 
181
    def approve_proposal(self, mp):
 
182
        revid = self.get_source_revid()
 
183
        self.call_webservice(
 
184
            mp.createComment,
 
185
            vote=u'Approve',
 
186
            subject='',  # Use the default subject.
 
187
            content=u"Rubberstamp! Proposer approves of own proposal.")
 
188
        self.call_webservice(mp.setStatus, status=u'Approved', revid=revid)
 
189
 
163
190
    def create_proposal(self):
164
191
        """Perform the submission."""
165
192
        prerequisite_branch = self._get_prerequisite_branch()
175
202
            review_types.append(review_type)
176
203
            reviewers.append(reviewer.self_link)
177
204
        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))
 
205
        mp = self.call_webservice(
 
206
            self.source_branch.lp.createMergeProposal,
 
207
            target_branch=self.target_branch.lp,
 
208
            prerequisite_branch=prereq,
 
209
            initial_comment=initial_comment,
 
210
            commit_message=self.commit_message, reviewers=reviewers,
 
211
            review_types=review_types)
 
212
        if self.approve:
 
213
            self.approve_proposal(mp)
 
214
        if self.fixes:
 
215
            if self.fixes.startswith('lp:'):
 
216
                self.fixes = self.fixes[3:]
 
217
            self.call_webservice(
 
218
                self.source_branch.lp.linkBug,
 
219
                bug=self.launchpad.bugs[int(self.fixes)])
 
220
        webbrowser.open(lp_api.canonical_url(mp))
194
221
 
195
222
 
196
223
def modified_files(old_tree, new_tree):
197
224
    """Return a list of paths in the new tree with modified contents."""
198
 
    for f, (op, path), c, v, p, n, (ok, k), e in new_tree.iter_changes(
199
 
        old_tree):
200
 
        if c and k == 'file':
 
225
    for change in new_tree.iter_changes(old_tree):
 
226
        if change.changed_content and change.kind[1] == 'file':
201
227
            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))