← 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: Jelmer Vernooij
  • Date: 2011-12-16 19:18:39 UTC
  • mto: This revision was merged to the branch mainline in revision 6391.
  • Revision ID: jelmer@samba.org-20111216191839-eg681lxqibi1qxu1
Fix remaining tests.

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
    )
 
28
from bzrlib.i18n import gettext
26
29
from bzrlib.plugins.launchpad import (
27
30
    lp_api,
28
31
    lp_registration,
29
 
)
30
 
 
31
 
from lazr.restfulclient import errors as restful_errors
 
32
    )
 
33
""")
32
34
 
33
35
 
34
36
class ProposeMergeHooks(hooks.Hooks):
35
37
    """Hooks for proposing a merge on Launchpad."""
36
38
 
37
39
    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
 
        )
 
40
        hooks.Hooks.__init__(self, "bzrlib.plugins.launchpad.lp_propose",
 
41
            "Proposer.hooks")
 
42
        self.add_hook('get_prerequisite',
 
43
            "Return the prerequisite branch for proposing as merge.", (2, 1))
 
44
        self.add_hook('merge_proposal_body',
 
45
            "Return an initial body for the merge proposal message.", (2, 1))
51
46
 
52
47
 
53
48
class Proposer(object):
74
69
        if staging:
75
70
            lp_instance = 'staging'
76
71
        else:
77
 
            lp_instance = 'edge'
 
72
            lp_instance = 'production'
78
73
        service = lp_registration.LaunchpadService(lp_instance=lp_instance)
79
74
        self.launchpad = lp_api.login(service)
80
75
        self.source_branch = lp_api.LaunchpadBranch.from_bzr(
81
76
            self.launchpad, source_branch)
82
77
        if target_branch is None:
83
 
            self.target_branch = self.source_branch.get_dev_focus()
 
78
            self.target_branch = self.source_branch.get_target()
84
79
        else:
85
80
            self.target_branch = lp_api.LaunchpadBranch.from_bzr(
86
81
                self.launchpad, target_branch)
87
82
        self.commit_message = message
88
83
        # XXX: this is where bug lp:583638 could be tackled.
89
84
        if 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, '')]
 
85
            self.reviews = []
94
86
        else:
95
87
            self.reviews = [(self.launchpad.people[reviewer], review_type)
96
88
                            for reviewer, review_type in
151
143
            if mp.queue_status in ('Merged', 'Rejected'):
152
144
                continue
153
145
            if mp.target_branch.self_link == self.target_branch.lp.self_link:
154
 
                raise errors.BzrCommandError(
155
 
                    'There is already a branch merge proposal: %s' %
156
 
                    canonical_url(mp))
 
146
                raise errors.BzrCommandError(gettext(
 
147
                    'There is already a branch merge proposal: %s') %
 
148
                    lp_api.canonical_url(mp))
157
149
 
158
150
    def _get_prerequisite_branch(self):
159
151
        hooks = self.hooks['get_prerequisite']
174
166
        :param **kwargs: **kwargs for the call.
175
167
        :return: The result of calling call(*args, *kwargs).
176
168
        """
 
169
        from lazr.restfulclient import errors as restful_errors
177
170
        try:
178
171
            return call(*args, **kwargs)
179
172
        except restful_errors.HTTPError, e:
208
201
            review_types=review_types)
209
202
        if self.approve:
210
203
            self.call_webservice(mp.setStatus, status='Approved')
211
 
        webbrowser.open(canonical_url(mp))
 
204
        webbrowser.open(lp_api.canonical_url(mp))
212
205
 
213
206
 
214
207
def modified_files(old_tree, new_tree):
217
210
        old_tree):
218
211
        if c and k == 'file':
219
212
            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))