/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: Marius Kruger
  • Date: 2010-07-10 21:28:56 UTC
  • mto: (5384.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5385.
  • Revision ID: marius.kruger@enerweb.co.za-20100710212856-uq4ji3go0u5se7hx
* Update documentation
* add NEWS

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, approve=False):
55
59
        """Constructor.
56
60
 
57
61
        :param tree: The working tree for the source branch.
68
72
        """
69
73
        self.tree = tree
70
74
        if staging:
71
 
            lp_base_url = lp_api.uris.STAGING_SERVICE_ROOT
 
75
            lp_instance = 'staging'
72
76
        else:
73
 
            lp_base_url = lp_api.uris.LPNET_SERVICE_ROOT
74
 
        self.launchpad = lp_api.connect_launchpad(lp_base_url)
 
77
            lp_instance = 'edge'
 
78
        service = lp_registration.LaunchpadService(lp_instance=lp_instance)
 
79
        self.launchpad = lp_api.login(service)
75
80
        self.source_branch = lp_api.LaunchpadBranch.from_bzr(
76
81
            self.launchpad, source_branch)
77
82
        if target_branch is None:
78
 
            self.target_branch = self.source_branch.get_target()
 
83
            self.target_branch = self.source_branch.get_dev_focus()
79
84
        else:
80
85
            self.target_branch = lp_api.LaunchpadBranch.from_bzr(
81
86
                self.launchpad, target_branch)
82
87
        self.commit_message = message
83
88
        # XXX: this is where bug lp:583638 could be tackled.
84
89
        if reviews == []:
85
 
            self.reviews = []
 
90
            target_reviewer = self.target_branch.lp.reviewer
 
91
            if target_reviewer is None:
 
92
                raise errors.BzrCommandError('No reviewer specified')
 
93
            self.reviews = [(target_reviewer, '')]
86
94
        else:
87
95
            self.reviews = [(self.launchpad.people[reviewer], review_type)
88
96
                            for reviewer, review_type in
89
97
                            reviews]
90
98
        self.approve = approve
91
 
        self.fixes = fixes
92
99
 
93
100
    def get_comment(self, prerequisite_branch):
94
101
        """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
102
        info = ["Source: %s\n" % self.source_branch.lp.bzr_identity]
98
103
        info.append("Target: %s\n" % self.target_branch.lp.bzr_identity)
99
104
        if prerequisite_branch is not None:
101
106
        for rdata in self.reviews:
102
107
            uniquename = "%s (%s)" % (rdata[0].display_name, rdata[0].name)
103
108
            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()
 
109
        self.source_branch.bzr.lock_read()
 
110
        try:
 
111
            self.target_branch.bzr.lock_read()
 
112
            try:
 
113
                body = self.get_initial_body()
 
114
            finally:
 
115
                self.target_branch.bzr.unlock()
 
116
        finally:
 
117
            self.source_branch.bzr.unlock()
107
118
        initial_comment = msgeditor.edit_commit_message(''.join(info),
108
119
                                                        start_message=body)
109
120
        return initial_comment.strip().encode('utf-8')
120
131
            files = modified_files(lca_tree, source_tree)
121
132
            return list(files)
122
133
        target_loc = ('bzr+ssh://bazaar.launchpad.net/%s' %
123
 
                      self.target_branch.lp.unique_name)
 
134
                       self.target_branch.lp.unique_name)
124
135
        body = None
125
136
        for hook in self.hooks['merge_proposal_body']:
126
137
            body = hook({
131
142
            })
132
143
        return body
133
144
 
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
145
    def check_proposal(self):
141
146
        """Check that the submission is sensible."""
142
147
        if self.source_branch.lp.self_link == self.target_branch.lp.self_link:
146
151
            if mp.queue_status in ('Merged', 'Rejected'):
147
152
                continue
148
153
            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))
 
154
                raise errors.BzrCommandError(
 
155
                    'There is already a branch merge proposal: %s' %
 
156
                    canonical_url(mp))
152
157
 
153
158
    def _get_prerequisite_branch(self):
154
159
        hooks = self.hooks['get_prerequisite']
163
168
 
164
169
    def call_webservice(self, call, *args, **kwargs):
165
170
        """Make a call to the webservice, wrapping failures.
166
 
 
 
171
        
167
172
        :param call: The call to make.
168
173
        :param *args: *args for the call.
169
174
        :param **kwargs: **kwargs for the call.
170
175
        :return: The result of calling call(*args, *kwargs).
171
176
        """
172
 
        from lazr.restfulclient import errors as restful_errors
173
177
        try:
174
178
            return call(*args, **kwargs)
175
 
        except restful_errors.HTTPError as e:
 
179
        except restful_errors.HTTPError, e:
176
180
            error_lines = []
177
181
            for line in e.content.splitlines():
178
182
                if line.startswith('Traceback (most recent call last):'):
180
184
                error_lines.append(line)
181
185
            raise Exception(''.join(error_lines))
182
186
 
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
187
    def create_proposal(self):
193
188
        """Perform the submission."""
194
189
        prerequisite_branch = self._get_prerequisite_branch()
212
207
            commit_message=self.commit_message, reviewers=reviewers,
213
208
            review_types=review_types)
214
209
        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))
 
210
            self.call_webservice(mp.setStatus, status='Approved')
 
211
        webbrowser.open(canonical_url(mp))
223
212
 
224
213
 
225
214
def modified_files(old_tree, new_tree):
226
215
    """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':
 
216
    for f, (op, path), c, v, p, n, (ok, k), e in new_tree.iter_changes(
 
217
        old_tree):
 
218
        if c and k == 'file':
229
219
            yield str(path)
 
220
 
 
221
 
 
222
def canonical_url(object):
 
223
    """Return the canonical URL for a branch."""
 
224
    scheme, netloc, path, params, query, fragment = urlparse.urlparse(
 
225
        str(object.self_link))
 
226
    path = '/'.join(path.split('/')[2:])
 
227
    netloc = netloc.replace('api.', 'code.')
 
228
    return urlparse.urlunparse((scheme, netloc, path, params, query,
 
229
                                fragment))