/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: Andrew Bennetts
  • Date: 2011-02-07 04:14:29 UTC
  • mfrom: (5535.4.26 fetch-all-tags-309682)
  • mto: This revision was merged to the branch mainline in revision 5648.
  • Revision ID: andrew.bennetts@canonical.com-20110207041429-3kc1blj34rvvxod9
Merge fetch-all-tags-309682.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/launchpad/lp_propose.py
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
 
 
20
17
from bzrlib import (
21
18
    errors,
22
19
    hooks,
 
20
    )
 
21
from bzrlib.lazy_import import lazy_import
 
22
lazy_import(globals(), """
 
23
import webbrowser
 
24
 
 
25
from bzrlib import (
23
26
    msgeditor,
24
27
)
25
28
from bzrlib.plugins.launchpad import (
26
29
    lp_api,
27
30
    lp_registration,
28
31
)
29
 
from bzrlib.plugins.launchpad.lp_api import canonical_url
30
 
 
31
 
from lazr.restfulclient import errors as restful_errors
 
32
""")
32
33
 
33
34
 
34
35
class ProposeMergeHooks(hooks.Hooks):
80
81
        self.source_branch = lp_api.LaunchpadBranch.from_bzr(
81
82
            self.launchpad, source_branch)
82
83
        if target_branch is None:
83
 
            self.target_branch = self.source_branch.get_dev_focus()
 
84
            self.target_branch = self.source_branch.get_target()
84
85
        else:
85
86
            self.target_branch = lp_api.LaunchpadBranch.from_bzr(
86
87
                self.launchpad, target_branch)
87
88
        self.commit_message = message
88
89
        # XXX: this is where bug lp:583638 could be tackled.
89
90
        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, '')]
 
91
            self.reviews = []
94
92
        else:
95
93
            self.reviews = [(self.launchpad.people[reviewer], review_type)
96
94
                            for reviewer, review_type in
153
151
            if mp.target_branch.self_link == self.target_branch.lp.self_link:
154
152
                raise errors.BzrCommandError(
155
153
                    'There is already a branch merge proposal: %s' %
156
 
                    canonical_url(mp))
 
154
                    lp_api.canonical_url(mp))
157
155
 
158
156
    def _get_prerequisite_branch(self):
159
157
        hooks = self.hooks['get_prerequisite']
174
172
        :param **kwargs: **kwargs for the call.
175
173
        :return: The result of calling call(*args, *kwargs).
176
174
        """
 
175
        from lazr.restfulclient import errors as restful_errors
177
176
        try:
178
177
            return call(*args, **kwargs)
179
178
        except restful_errors.HTTPError, e:
208
207
            review_types=review_types)
209
208
        if self.approve:
210
209
            self.call_webservice(mp.setStatus, status='Approved')
211
 
        webbrowser.open(canonical_url(mp))
 
210
        webbrowser.open(lp_api.canonical_url(mp))
212
211
 
213
212
 
214
213
def modified_files(old_tree, new_tree):