/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: Jelmer Vernooij
  • Date: 2011-01-18 22:30:23 UTC
  • mto: This revision was merged to the branch mainline in revision 5620.
  • Revision ID: jelmer@samba.org-20110118223023-sje5l7ap3nebwnyh
https://launchpad.net/bugs/680449
Print error if both --email and a new identity were specified.

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 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
)
26
28
from bzrlib.plugins.launchpad import (
27
29
    lp_api,
28
30
    lp_registration,
29
31
)
30
 
 
31
 
from lazr.restfulclient import errors as restful_errors
 
32
""")
32
33
 
33
34
 
34
35
class ProposeMergeHooks(hooks.Hooks):
55
56
    hooks = ProposeMergeHooks()
56
57
 
57
58
    def __init__(self, tree, source_branch, target_branch, message, reviews,
58
 
                 staging=False):
 
59
                 staging=False, approve=False):
59
60
        """Constructor.
60
61
 
61
62
        :param tree: The working tree for the source branch.
65
66
        :param reviews: A list of tuples of reviewer, review type.
66
67
        :param staging: If True, propose the merge against staging instead of
67
68
            production.
 
69
        :param approve: If True, mark the new proposal as approved immediately.
 
70
            This is useful when a project permits some things to be approved
 
71
            by the submitter (e.g. merges between release and deployment
 
72
            branches).
68
73
        """
69
74
        self.tree = tree
70
75
        if staging:
71
76
            lp_instance = 'staging'
72
77
        else:
73
 
            lp_instance = 'edge'
 
78
            lp_instance = 'production'
74
79
        service = lp_registration.LaunchpadService(lp_instance=lp_instance)
75
80
        self.launchpad = lp_api.login(service)
76
81
        self.source_branch = lp_api.LaunchpadBranch.from_bzr(
81
86
            self.target_branch = lp_api.LaunchpadBranch.from_bzr(
82
87
                self.launchpad, target_branch)
83
88
        self.commit_message = message
 
89
        # XXX: this is where bug lp:583638 could be tackled.
84
90
        if reviews == []:
85
91
            target_reviewer = self.target_branch.lp.reviewer
86
92
            if target_reviewer is None:
90
96
            self.reviews = [(self.launchpad.people[reviewer], review_type)
91
97
                            for reviewer, review_type in
92
98
                            reviews]
 
99
        self.approve = approve
93
100
 
94
101
    def get_comment(self, prerequisite_branch):
95
102
        """Determine the initial comment for the merge proposal."""
147
154
            if mp.target_branch.self_link == self.target_branch.lp.self_link:
148
155
                raise errors.BzrCommandError(
149
156
                    'There is already a branch merge proposal: %s' %
150
 
                    canonical_url(mp))
 
157
                    lp_api.canonical_url(mp))
151
158
 
152
159
    def _get_prerequisite_branch(self):
153
160
        hooks = self.hooks['get_prerequisite']
160
167
                 'prerequisite_branch': prerequisite_branch})
161
168
        return prerequisite_branch
162
169
 
 
170
    def call_webservice(self, call, *args, **kwargs):
 
171
        """Make a call to the webservice, wrapping failures.
 
172
        
 
173
        :param call: The call to make.
 
174
        :param *args: *args for the call.
 
175
        :param **kwargs: **kwargs for the call.
 
176
        :return: The result of calling call(*args, *kwargs).
 
177
        """
 
178
        from lazr.restfulclient import errors as restful_errors
 
179
        try:
 
180
            return call(*args, **kwargs)
 
181
        except restful_errors.HTTPError, e:
 
182
            error_lines = []
 
183
            for line in e.content.splitlines():
 
184
                if line.startswith('Traceback (most recent call last):'):
 
185
                    break
 
186
                error_lines.append(line)
 
187
            raise Exception(''.join(error_lines))
 
188
 
163
189
    def create_proposal(self):
164
190
        """Perform the submission."""
165
191
        prerequisite_branch = self._get_prerequisite_branch()
175
201
            review_types.append(review_type)
176
202
            reviewers.append(reviewer.self_link)
177
203
        initial_comment = self.get_comment(prerequisite_branch)
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))
 
204
        mp = self.call_webservice(
 
205
            self.source_branch.lp.createMergeProposal,
 
206
            target_branch=self.target_branch.lp,
 
207
            prerequisite_branch=prereq,
 
208
            initial_comment=initial_comment,
 
209
            commit_message=self.commit_message, reviewers=reviewers,
 
210
            review_types=review_types)
 
211
        if self.approve:
 
212
            self.call_webservice(mp.setStatus, status='Approved')
 
213
        webbrowser.open(lp_api.canonical_url(mp))
194
214
 
195
215
 
196
216
def modified_files(old_tree, new_tree):
199
219
        old_tree):
200
220
        if c and k == 'file':
201
221
            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))