/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 bzrlib/plugins/launchpad/lp_propose.py

  • Committer: Robert Collins
  • Date: 2010-05-06 23:41:35 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100506234135-yivbzczw1sejxnxc
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
expected to return an object which can be used to unlock them. This reduces
duplicate code when using cleanups. The previous 'tokens's returned by
``Branch.lock_write`` and ``Repository.lock_write`` are now attributes
on the result of the lock_write. ``repository.RepositoryWriteLockResult``
and ``branch.BranchWriteLockResult`` document this. (Robert Collins)

``log._get_info_for_log_files`` now takes an add_cleanup callable.
(Robert Collins)

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
18
 
 
19
 
from ... import (
 
17
 
 
18
import urlparse
 
19
import webbrowser
 
20
 
 
21
from bzrlib import (
20
22
    errors,
21
23
    hooks,
22
 
    )
23
 
from ...lazy_import import lazy_import
24
 
lazy_import(globals(), """
25
 
import webbrowser
26
 
 
27
 
from breezy import (
28
24
    msgeditor,
29
 
    )
30
 
from breezy.i18n import gettext
31
 
from breezy.plugins.launchpad import (
 
25
)
 
26
from bzrlib.plugins.launchpad import (
32
27
    lp_api,
33
 
    )
34
 
""")
 
28
    lp_registration,
 
29
)
 
30
 
 
31
from lazr.restfulclient import errors as restful_errors
35
32
 
36
33
 
37
34
class ProposeMergeHooks(hooks.Hooks):
38
35
    """Hooks for proposing a merge on Launchpad."""
39
36
 
40
37
    def __init__(self):
41
 
        hooks.Hooks.__init__(self, "breezy.plugins.launchpad.lp_propose",
42
 
                             "Proposer.hooks")
43
 
        self.add_hook('get_prerequisite',
44
 
                      "Return the prerequisite branch for proposing as merge.", (2, 1))
45
 
        self.add_hook('merge_proposal_body',
46
 
                      "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
        )
47
51
 
48
52
 
49
53
class Proposer(object):
51
55
    hooks = ProposeMergeHooks()
52
56
 
53
57
    def __init__(self, tree, source_branch, target_branch, message, reviews,
54
 
                 staging=False, approve=False, fixes=None):
 
58
                 staging=False):
55
59
        """Constructor.
56
60
 
57
61
        :param tree: The working tree for the source branch.
61
65
        :param reviews: A list of tuples of reviewer, review type.
62
66
        :param staging: If True, propose the merge against staging instead of
63
67
            production.
64
 
        :param approve: If True, mark the new proposal as approved immediately.
65
 
            This is useful when a project permits some things to be approved
66
 
            by the submitter (e.g. merges between release and deployment
67
 
            branches).
68
68
        """
69
69
        self.tree = tree
70
70
        if staging:
71
 
            lp_base_url = lp_api.uris.STAGING_SERVICE_ROOT
 
71
            lp_instance = 'staging'
72
72
        else:
73
 
            lp_base_url = lp_api.uris.LPNET_SERVICE_ROOT
74
 
        self.launchpad = lp_api.connect_launchpad(lp_base_url)
 
73
            lp_instance = 'edge'
 
74
        service = lp_registration.LaunchpadService(lp_instance=lp_instance)
 
75
        self.launchpad = lp_api.login(service)
75
76
        self.source_branch = lp_api.LaunchpadBranch.from_bzr(
76
77
            self.launchpad, source_branch)
77
78
        if target_branch is None:
78
 
            self.target_branch = self.source_branch.get_target()
 
79
            self.target_branch = self.source_branch.get_dev_focus()
79
80
        else:
80
81
            self.target_branch = lp_api.LaunchpadBranch.from_bzr(
81
82
                self.launchpad, target_branch)
82
83
        self.commit_message = message
83
 
        # XXX: this is where bug lp:583638 could be tackled.
84
84
        if reviews == []:
85
 
            self.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, '')]
86
89
        else:
87
90
            self.reviews = [(self.launchpad.people[reviewer], review_type)
88
91
                            for reviewer, review_type in
89
92
                            reviews]
90
 
        self.approve = approve
91
 
        self.fixes = fixes
92
93
 
93
94
    def get_comment(self, prerequisite_branch):
94
95
        """Determine the initial comment for the merge proposal."""
95
 
        if self.commit_message is not None:
96
 
            return self.commit_message.strip().encode('utf-8')
97
96
        info = ["Source: %s\n" % self.source_branch.lp.bzr_identity]
98
97
        info.append("Target: %s\n" % self.target_branch.lp.bzr_identity)
99
98
        if prerequisite_branch is not None:
101
100
        for rdata in self.reviews:
102
101
            uniquename = "%s (%s)" % (rdata[0].display_name, rdata[0].name)
103
102
            info.append('Reviewer: %s, type "%s"\n' % (uniquename, rdata[1]))
104
 
        with self.source_branch.bzr.lock_read(), \
105
 
                self.target_branch.bzr.lock_read():
106
 
            body = self.get_initial_body()
 
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()
107
112
        initial_comment = msgeditor.edit_commit_message(''.join(info),
108
113
                                                        start_message=body)
109
114
        return initial_comment.strip().encode('utf-8')
120
125
            files = modified_files(lca_tree, source_tree)
121
126
            return list(files)
122
127
        target_loc = ('bzr+ssh://bazaar.launchpad.net/%s' %
123
 
                      self.target_branch.lp.unique_name)
 
128
                       self.target_branch.lp.unique_name)
124
129
        body = None
125
130
        for hook in self.hooks['merge_proposal_body']:
126
131
            body = hook({
131
136
            })
132
137
        return body
133
138
 
134
 
    def get_source_revid(self):
135
 
        """Get the revision ID of the source branch."""
136
 
        source_branch = self.source_branch.bzr
137
 
        with source_branch.lock_read():
138
 
            return source_branch.last_revision()
139
 
 
140
139
    def check_proposal(self):
141
140
        """Check that the submission is sensible."""
142
141
        if self.source_branch.lp.self_link == self.target_branch.lp.self_link:
146
145
            if mp.queue_status in ('Merged', 'Rejected'):
147
146
                continue
148
147
            if mp.target_branch.self_link == self.target_branch.lp.self_link:
149
 
                raise errors.BzrCommandError(gettext(
150
 
                    'There is already a branch merge proposal: %s') %
151
 
                    lp_api.canonical_url(mp))
 
148
                raise errors.BzrCommandError(
 
149
                    'There is already a branch merge proposal: %s' %
 
150
                    canonical_url(mp))
152
151
 
153
152
    def _get_prerequisite_branch(self):
154
153
        hooks = self.hooks['get_prerequisite']
161
160
                 'prerequisite_branch': prerequisite_branch})
162
161
        return prerequisite_branch
163
162
 
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 as 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
 
 
183
 
    def approve_proposal(self, mp):
184
 
        revid = self.get_source_revid()
185
 
        self.call_webservice(
186
 
            mp.createComment,
187
 
            vote=u'Approve',
188
 
            subject='',  # Use the default subject.
189
 
            content=u"Rubberstamp! Proposer approves of own proposal.")
190
 
        self.call_webservice(mp.setStatus, status=u'Approved', revid=revid)
191
 
 
192
163
    def create_proposal(self):
193
164
        """Perform the submission."""
194
165
        prerequisite_branch = self._get_prerequisite_branch()
204
175
            review_types.append(review_type)
205
176
            reviewers.append(reviewer.self_link)
206
177
        initial_comment = self.get_comment(prerequisite_branch)
207
 
        mp = self.call_webservice(
208
 
            self.source_branch.lp.createMergeProposal,
209
 
            target_branch=self.target_branch.lp,
210
 
            prerequisite_branch=prereq,
211
 
            initial_comment=initial_comment,
212
 
            commit_message=self.commit_message, reviewers=reviewers,
213
 
            review_types=review_types)
214
 
        if self.approve:
215
 
            self.approve_proposal(mp)
216
 
        if self.fixes:
217
 
            if self.fixes.startswith('lp:'):
218
 
                self.fixes = self.fixes[3:]
219
 
            self.call_webservice(
220
 
                self.source_branch.lp.linkBug,
221
 
                bug=self.launchpad.bugs[int(self.fixes)])
222
 
        webbrowser.open(lp_api.canonical_url(mp))
 
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))
223
194
 
224
195
 
225
196
def modified_files(old_tree, new_tree):
226
197
    """Return a list of paths in the new tree with modified contents."""
227
 
    for change in new_tree.iter_changes(old_tree):
228
 
        if change.changed_content and change.kind[1] == 'file':
 
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':
229
201
            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))