← 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: John Arbash Meinel
  • Date: 2011-01-12 21:27:00 UTC
  • mto: This revision was merged to the branch mainline in revision 5605.
  • Revision ID: john@arbash-meinel.com-20110112212700-esqmtrmevddxrsq2
Clean up the test slightly, hoping to avoid race conditions, update 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
 
 
18
import webbrowser
 
19
 
17
20
from bzrlib import (
18
21
    errors,
19
22
    hooks,
20
 
    )
21
 
from bzrlib.lazy_import import lazy_import
22
 
lazy_import(globals(), """
23
 
import webbrowser
24
 
 
25
 
from bzrlib import (
26
23
    msgeditor,
27
 
    )
 
24
)
28
25
from bzrlib.plugins.launchpad import (
29
26
    lp_api,
30
27
    lp_registration,
31
 
    )
32
 
""")
 
28
)
 
29
from bzrlib.plugins.launchpad.lp_api import canonical_url
 
30
 
 
31
from lazr.restfulclient import errors as restful_errors
33
32
 
34
33
 
35
34
class ProposeMergeHooks(hooks.Hooks):
36
35
    """Hooks for proposing a merge on Launchpad."""
37
36
 
38
37
    def __init__(self):
39
 
        hooks.Hooks.__init__(self, "bzrlib.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))
 
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
        )
45
51
 
46
52
 
47
53
class Proposer(object):
74
80
        self.source_branch = lp_api.LaunchpadBranch.from_bzr(
75
81
            self.launchpad, source_branch)
76
82
        if target_branch is None:
77
 
            self.target_branch = self.source_branch.get_target()
 
83
            self.target_branch = self.source_branch.get_dev_focus()
78
84
        else:
79
85
            self.target_branch = lp_api.LaunchpadBranch.from_bzr(
80
86
                self.launchpad, target_branch)
81
87
        self.commit_message = message
82
88
        # XXX: this is where bug lp:583638 could be tackled.
83
89
        if reviews == []:
84
 
            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, '')]
85
94
        else:
86
95
            self.reviews = [(self.launchpad.people[reviewer], review_type)
87
96
                            for reviewer, review_type in
144
153
            if mp.target_branch.self_link == self.target_branch.lp.self_link:
145
154
                raise errors.BzrCommandError(
146
155
                    'There is already a branch merge proposal: %s' %
147
 
                    lp_api.canonical_url(mp))
 
156
                    canonical_url(mp))
148
157
 
149
158
    def _get_prerequisite_branch(self):
150
159
        hooks = self.hooks['get_prerequisite']
165
174
        :param **kwargs: **kwargs for the call.
166
175
        :return: The result of calling call(*args, *kwargs).
167
176
        """
168
 
        from lazr.restfulclient import errors as restful_errors
169
177
        try:
170
178
            return call(*args, **kwargs)
171
179
        except restful_errors.HTTPError, e:
200
208
            review_types=review_types)
201
209
        if self.approve:
202
210
            self.call_webservice(mp.setStatus, status='Approved')
203
 
        webbrowser.open(lp_api.canonical_url(mp))
 
211
        webbrowser.open(canonical_url(mp))
204
212
 
205
213
 
206
214
def modified_files(old_tree, new_tree):