##// END OF EJS Templates
api: comment_pull_request, added commit_id parameter to validate status changed on particular commit....
marcink -
r1269:26e59d48 default
parent child Browse files
Show More
@@ -1,146 +1,209 b''
1 1 # -*- coding: utf-8 -*-
2 2
3 3 # Copyright (C) 2010-2016 RhodeCode GmbH
4 4 #
5 5 # This program is free software: you can redistribute it and/or modify
6 6 # it under the terms of the GNU Affero General Public License, version 3
7 7 # (only), as published by the Free Software Foundation.
8 8 #
9 9 # This program is distributed in the hope that it will be useful,
10 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 12 # GNU General Public License for more details.
13 13 #
14 14 # You should have received a copy of the GNU Affero General Public License
15 15 # along with this program. If not, see <http://www.gnu.org/licenses/>.
16 16 #
17 17 # This program is dual-licensed. If you wish to learn more about the
18 18 # RhodeCode Enterprise Edition, including its added features, Support services,
19 19 # and proprietary license terms, please see https://rhodecode.com/licenses/
20 20
21 21 import pytest
22 22
23 23 from rhodecode.model.comment import ChangesetCommentsModel
24 24 from rhodecode.model.db import UserLog
25 25 from rhodecode.model.pull_request import PullRequestModel
26 26 from rhodecode.tests import TEST_USER_ADMIN_LOGIN
27 27 from rhodecode.api.tests.utils import (
28 28 build_data, api_call, assert_error, assert_ok)
29 29
30 30
31 31 @pytest.mark.usefixtures("testuser_api", "app")
32 32 class TestCommentPullRequest(object):
33 33 finalizers = []
34 34
35 35 def teardown_method(self, method):
36 36 if self.finalizers:
37 37 for finalizer in self.finalizers:
38 38 finalizer()
39 39 self.finalizers = []
40 40
41 41 @pytest.mark.backends("git", "hg")
42 42 def test_api_comment_pull_request(self, pr_util, no_notifications):
43 43 pull_request = pr_util.create_pull_request()
44 44 pull_request_id = pull_request.pull_request_id
45 45 author = pull_request.user_id
46 46 repo = pull_request.target_repo.repo_id
47 47 id_, params = build_data(
48 48 self.apikey, 'comment_pull_request',
49 49 repoid=pull_request.target_repo.repo_name,
50 50 pullrequestid=pull_request.pull_request_id,
51 51 message='test message')
52 52 response = api_call(self.app, params)
53 53 pull_request = PullRequestModel().get(pull_request.pull_request_id)
54 54
55 55 comments = ChangesetCommentsModel().get_comments(
56 56 pull_request.target_repo.repo_id, pull_request=pull_request)
57 57
58 58 expected = {
59 59 'pull_request_id': pull_request.pull_request_id,
60 60 'comment_id': comments[-1].comment_id,
61 'status': None
61 'status': {'given': None, 'was_changed': None}
62 62 }
63 63 assert_ok(id_, expected, response.body)
64 64
65 65 action = 'user_commented_pull_request:%d' % pull_request_id
66 66 journal = UserLog.query()\
67 67 .filter(UserLog.user_id == author)\
68 68 .filter(UserLog.repository_id == repo)\
69 69 .filter(UserLog.action == action)\
70 70 .all()
71 71 assert len(journal) == 2
72 72
73 73 @pytest.mark.backends("git", "hg")
74 74 def test_api_comment_pull_request_change_status(
75 75 self, pr_util, no_notifications):
76 76 pull_request = pr_util.create_pull_request()
77 77 pull_request_id = pull_request.pull_request_id
78 78 id_, params = build_data(
79 79 self.apikey, 'comment_pull_request',
80 80 repoid=pull_request.target_repo.repo_name,
81 81 pullrequestid=pull_request.pull_request_id,
82 82 status='rejected')
83 83 response = api_call(self.app, params)
84 84 pull_request = PullRequestModel().get(pull_request_id)
85 85
86 86 comments = ChangesetCommentsModel().get_comments(
87 87 pull_request.target_repo.repo_id, pull_request=pull_request)
88 88 expected = {
89 89 'pull_request_id': pull_request.pull_request_id,
90 90 'comment_id': comments[-1].comment_id,
91 'status': 'rejected'
91 'status': {'given': 'rejected', 'was_changed': True}
92 }
93 assert_ok(id_, expected, response.body)
94
95 @pytest.mark.backends("git", "hg")
96 def test_api_comment_pull_request_change_status_with_specific_commit_id(
97 self, pr_util, no_notifications):
98 pull_request = pr_util.create_pull_request()
99 pull_request_id = pull_request.pull_request_id
100 latest_commit_id = 'test_commit'
101 # inject additional revision, to fail test the status change on
102 # non-latest commit
103 pull_request.revisions = pull_request.revisions + ['test_commit']
104
105 id_, params = build_data(
106 self.apikey, 'comment_pull_request',
107 repoid=pull_request.target_repo.repo_name,
108 pullrequestid=pull_request.pull_request_id,
109 status='approved', commit_id=latest_commit_id)
110 response = api_call(self.app, params)
111 pull_request = PullRequestModel().get(pull_request_id)
112
113 expected = {
114 'pull_request_id': pull_request.pull_request_id,
115 'comment_id': None,
116 'status': {'given': 'approved', 'was_changed': False}
117 }
118 assert_ok(id_, expected, response.body)
119
120 @pytest.mark.backends("git", "hg")
121 def test_api_comment_pull_request_change_status_with_specific_commit_id(
122 self, pr_util, no_notifications):
123 pull_request = pr_util.create_pull_request()
124 pull_request_id = pull_request.pull_request_id
125 latest_commit_id = pull_request.revisions[0]
126
127 id_, params = build_data(
128 self.apikey, 'comment_pull_request',
129 repoid=pull_request.target_repo.repo_name,
130 pullrequestid=pull_request.pull_request_id,
131 status='approved', commit_id=latest_commit_id)
132 response = api_call(self.app, params)
133 pull_request = PullRequestModel().get(pull_request_id)
134
135 comments = ChangesetCommentsModel().get_comments(
136 pull_request.target_repo.repo_id, pull_request=pull_request)
137 expected = {
138 'pull_request_id': pull_request.pull_request_id,
139 'comment_id': comments[-1].comment_id,
140 'status': {'given': 'approved', 'was_changed': True}
92 141 }
93 142 assert_ok(id_, expected, response.body)
94 143
95 144 @pytest.mark.backends("git", "hg")
96 145 def test_api_comment_pull_request_missing_params_error(self, pr_util):
97 146 pull_request = pr_util.create_pull_request()
98 147 pull_request_id = pull_request.pull_request_id
99 148 pull_request_repo = pull_request.target_repo.repo_name
100 149 id_, params = build_data(
101 150 self.apikey, 'comment_pull_request',
102 151 repoid=pull_request_repo,
103 152 pullrequestid=pull_request_id)
104 153 response = api_call(self.app, params)
105 154
106 expected = 'message and status parameter missing'
155 expected = 'Both message and status parameters are missing. At least one is required.'
107 156 assert_error(id_, expected, given=response.body)
108 157
109 158 @pytest.mark.backends("git", "hg")
110 159 def test_api_comment_pull_request_unknown_status_error(self, pr_util):
111 160 pull_request = pr_util.create_pull_request()
112 161 pull_request_id = pull_request.pull_request_id
113 162 pull_request_repo = pull_request.target_repo.repo_name
114 163 id_, params = build_data(
115 164 self.apikey, 'comment_pull_request',
116 165 repoid=pull_request_repo,
117 166 pullrequestid=pull_request_id,
118 167 status='42')
119 168 response = api_call(self.app, params)
120 169
121 expected = 'unknown comment status`42`'
170 expected = 'Unknown comment status: `42`'
122 171 assert_error(id_, expected, given=response.body)
123 172
124 173 @pytest.mark.backends("git", "hg")
125 174 def test_api_comment_pull_request_repo_error(self):
126 175 id_, params = build_data(
127 176 self.apikey, 'comment_pull_request',
128 177 repoid=666, pullrequestid=1)
129 178 response = api_call(self.app, params)
130 179
131 180 expected = 'repository `666` does not exist'
132 181 assert_error(id_, expected, given=response.body)
133 182
134 183 @pytest.mark.backends("git", "hg")
135 184 def test_api_comment_pull_request_non_admin_with_userid_error(
136 185 self, pr_util):
137 186 pull_request = pr_util.create_pull_request()
138 187 id_, params = build_data(
139 188 self.apikey_regular, 'comment_pull_request',
140 189 repoid=pull_request.target_repo.repo_name,
141 190 pullrequestid=pull_request.pull_request_id,
142 191 userid=TEST_USER_ADMIN_LOGIN)
143 192 response = api_call(self.app, params)
144 193
145 194 expected = 'userid is not the same as your user'
146 195 assert_error(id_, expected, given=response.body)
196
197 @pytest.mark.backends("git", "hg")
198 def test_api_comment_pull_request_wrong_commit_id_error(self, pr_util):
199 pull_request = pr_util.create_pull_request()
200 id_, params = build_data(
201 self.apikey_regular, 'comment_pull_request',
202 repoid=pull_request.target_repo.repo_name,
203 status='approved',
204 pullrequestid=pull_request.pull_request_id,
205 commit_id='XXX')
206 response = api_call(self.app, params)
207
208 expected = 'Invalid commit_id `XXX` for this pull request.'
209 assert_error(id_, expected, given=response.body)
@@ -1,691 +1,714 b''
1 1 # -*- coding: utf-8 -*-
2 2
3 3 # Copyright (C) 2011-2016 RhodeCode GmbH
4 4 #
5 5 # This program is free software: you can redistribute it and/or modify
6 6 # it under the terms of the GNU Affero General Public License, version 3
7 7 # (only), as published by the Free Software Foundation.
8 8 #
9 9 # This program is distributed in the hope that it will be useful,
10 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 12 # GNU General Public License for more details.
13 13 #
14 14 # You should have received a copy of the GNU Affero General Public License
15 15 # along with this program. If not, see <http://www.gnu.org/licenses/>.
16 16 #
17 17 # This program is dual-licensed. If you wish to learn more about the
18 18 # RhodeCode Enterprise Edition, including its added features, Support services,
19 19 # and proprietary license terms, please see https://rhodecode.com/licenses/
20 20
21 21
22 22 import logging
23 23
24 24 from rhodecode.api import jsonrpc_method, JSONRPCError
25 25 from rhodecode.api.utils import (
26 26 has_superadmin_permission, Optional, OAttr, get_repo_or_error,
27 27 get_pull_request_or_error, get_commit_or_error, get_user_or_error,
28 28 validate_repo_permissions, resolve_ref_or_error)
29 29 from rhodecode.lib.auth import (HasRepoPermissionAnyApi)
30 30 from rhodecode.lib.base import vcs_operation_context
31 31 from rhodecode.lib.utils2 import str2bool
32 32 from rhodecode.model.changeset_status import ChangesetStatusModel
33 33 from rhodecode.model.comment import ChangesetCommentsModel
34 34 from rhodecode.model.db import Session, ChangesetStatus
35 35 from rhodecode.model.pull_request import PullRequestModel
36 36 from rhodecode.model.settings import SettingsModel
37 37
38 38 log = logging.getLogger(__name__)
39 39
40 40
41 41 @jsonrpc_method()
42 42 def get_pull_request(request, apiuser, repoid, pullrequestid):
43 43 """
44 44 Get a pull request based on the given ID.
45 45
46 46 :param apiuser: This is filled automatically from the |authtoken|.
47 47 :type apiuser: AuthUser
48 48 :param repoid: Repository name or repository ID from where the pull
49 49 request was opened.
50 50 :type repoid: str or int
51 51 :param pullrequestid: ID of the requested pull request.
52 52 :type pullrequestid: int
53 53
54 54 Example output:
55 55
56 56 .. code-block:: bash
57 57
58 58 "id": <id_given_in_input>,
59 59 "result":
60 60 {
61 61 "pull_request_id": "<pull_request_id>",
62 62 "url": "<url>",
63 63 "title": "<title>",
64 64 "description": "<description>",
65 65 "status" : "<status>",
66 66 "created_on": "<date_time_created>",
67 67 "updated_on": "<date_time_updated>",
68 68 "commit_ids": [
69 69 ...
70 70 "<commit_id>",
71 71 "<commit_id>",
72 72 ...
73 73 ],
74 74 "review_status": "<review_status>",
75 75 "mergeable": {
76 76 "status": "<bool>",
77 77 "message": "<message>",
78 78 },
79 79 "source": {
80 80 "clone_url": "<clone_url>",
81 81 "repository": "<repository_name>",
82 82 "reference":
83 83 {
84 84 "name": "<name>",
85 85 "type": "<type>",
86 86 "commit_id": "<commit_id>",
87 87 }
88 88 },
89 89 "target": {
90 90 "clone_url": "<clone_url>",
91 91 "repository": "<repository_name>",
92 92 "reference":
93 93 {
94 94 "name": "<name>",
95 95 "type": "<type>",
96 96 "commit_id": "<commit_id>",
97 97 }
98 98 },
99 99 "merge": {
100 100 "clone_url": "<clone_url>",
101 101 "reference":
102 102 {
103 103 "name": "<name>",
104 104 "type": "<type>",
105 105 "commit_id": "<commit_id>",
106 106 }
107 107 },
108 108 "author": <user_obj>,
109 109 "reviewers": [
110 110 ...
111 111 {
112 112 "user": "<user_obj>",
113 113 "review_status": "<review_status>",
114 114 }
115 115 ...
116 116 ]
117 117 },
118 118 "error": null
119 119 """
120 120 get_repo_or_error(repoid)
121 121 pull_request = get_pull_request_or_error(pullrequestid)
122 122 if not PullRequestModel().check_user_read(
123 123 pull_request, apiuser, api=True):
124 124 raise JSONRPCError('repository `%s` does not exist' % (repoid,))
125 125 data = pull_request.get_api_data()
126 126 return data
127 127
128 128
129 129 @jsonrpc_method()
130 130 def get_pull_requests(request, apiuser, repoid, status=Optional('new')):
131 131 """
132 132 Get all pull requests from the repository specified in `repoid`.
133 133
134 134 :param apiuser: This is filled automatically from the |authtoken|.
135 135 :type apiuser: AuthUser
136 136 :param repoid: Repository name or repository ID.
137 137 :type repoid: str or int
138 138 :param status: Only return pull requests with the specified status.
139 139 Valid options are.
140 140 * ``new`` (default)
141 141 * ``open``
142 142 * ``closed``
143 143 :type status: str
144 144
145 145 Example output:
146 146
147 147 .. code-block:: bash
148 148
149 149 "id": <id_given_in_input>,
150 150 "result":
151 151 [
152 152 ...
153 153 {
154 154 "pull_request_id": "<pull_request_id>",
155 155 "url": "<url>",
156 156 "title" : "<title>",
157 157 "description": "<description>",
158 158 "status": "<status>",
159 159 "created_on": "<date_time_created>",
160 160 "updated_on": "<date_time_updated>",
161 161 "commit_ids": [
162 162 ...
163 163 "<commit_id>",
164 164 "<commit_id>",
165 165 ...
166 166 ],
167 167 "review_status": "<review_status>",
168 168 "mergeable": {
169 169 "status": "<bool>",
170 170 "message: "<message>",
171 171 },
172 172 "source": {
173 173 "clone_url": "<clone_url>",
174 174 "reference":
175 175 {
176 176 "name": "<name>",
177 177 "type": "<type>",
178 178 "commit_id": "<commit_id>",
179 179 }
180 180 },
181 181 "target": {
182 182 "clone_url": "<clone_url>",
183 183 "reference":
184 184 {
185 185 "name": "<name>",
186 186 "type": "<type>",
187 187 "commit_id": "<commit_id>",
188 188 }
189 189 },
190 190 "merge": {
191 191 "clone_url": "<clone_url>",
192 192 "reference":
193 193 {
194 194 "name": "<name>",
195 195 "type": "<type>",
196 196 "commit_id": "<commit_id>",
197 197 }
198 198 },
199 199 "author": <user_obj>,
200 200 "reviewers": [
201 201 ...
202 202 {
203 203 "user": "<user_obj>",
204 204 "review_status": "<review_status>",
205 205 }
206 206 ...
207 207 ]
208 208 }
209 209 ...
210 210 ],
211 211 "error": null
212 212
213 213 """
214 214 repo = get_repo_or_error(repoid)
215 215 if not has_superadmin_permission(apiuser):
216 216 _perms = (
217 217 'repository.admin', 'repository.write', 'repository.read',)
218 218 validate_repo_permissions(apiuser, repoid, repo, _perms)
219 219
220 220 status = Optional.extract(status)
221 221 pull_requests = PullRequestModel().get_all(repo, statuses=[status])
222 222 data = [pr.get_api_data() for pr in pull_requests]
223 223 return data
224 224
225 225
226 226 @jsonrpc_method()
227 227 def merge_pull_request(request, apiuser, repoid, pullrequestid,
228 228 userid=Optional(OAttr('apiuser'))):
229 229 """
230 230 Merge the pull request specified by `pullrequestid` into its target
231 231 repository.
232 232
233 233 :param apiuser: This is filled automatically from the |authtoken|.
234 234 :type apiuser: AuthUser
235 235 :param repoid: The Repository name or repository ID of the
236 236 target repository to which the |pr| is to be merged.
237 237 :type repoid: str or int
238 238 :param pullrequestid: ID of the pull request which shall be merged.
239 239 :type pullrequestid: int
240 240 :param userid: Merge the pull request as this user.
241 241 :type userid: Optional(str or int)
242 242
243 243 Example output:
244 244
245 245 .. code-block:: bash
246 246
247 247 "id": <id_given_in_input>,
248 248 "result":
249 249 {
250 250 "executed": "<bool>",
251 251 "failure_reason": "<int>",
252 252 "merge_commit_id": "<merge_commit_id>",
253 253 "possible": "<bool>",
254 254 "merge_ref": {
255 255 "commit_id": "<commit_id>",
256 256 "type": "<type>",
257 257 "name": "<name>"
258 258 }
259 259 },
260 260 "error": null
261 261
262 262 """
263 263 repo = get_repo_or_error(repoid)
264 264 if not isinstance(userid, Optional):
265 265 if (has_superadmin_permission(apiuser) or
266 266 HasRepoPermissionAnyApi('repository.admin')(
267 267 user=apiuser, repo_name=repo.repo_name)):
268 268 apiuser = get_user_or_error(userid)
269 269 else:
270 270 raise JSONRPCError('userid is not the same as your user')
271 271
272 272 pull_request = get_pull_request_or_error(pullrequestid)
273 273 if not PullRequestModel().check_user_merge(
274 274 pull_request, apiuser, api=True):
275 275 raise JSONRPCError('repository `%s` does not exist' % (repoid,))
276 276 if pull_request.is_closed():
277 277 raise JSONRPCError(
278 278 'pull request `%s` merge failed, pull request is closed' % (
279 279 pullrequestid,))
280 280
281 281 target_repo = pull_request.target_repo
282 282 extras = vcs_operation_context(
283 283 request.environ, repo_name=target_repo.repo_name,
284 284 username=apiuser.username, action='push',
285 285 scm=target_repo.repo_type)
286 286 merge_response = PullRequestModel().merge(
287 287 pull_request, apiuser, extras=extras)
288 288 if merge_response.executed:
289 289 PullRequestModel().close_pull_request(
290 290 pull_request.pull_request_id, apiuser)
291 291
292 292 Session().commit()
293 293
294 294 # In previous versions the merge response directly contained the merge
295 295 # commit id. It is now contained in the merge reference object. To be
296 296 # backwards compatible we have to extract it again.
297 297 merge_response = merge_response._asdict()
298 298 merge_response['merge_commit_id'] = merge_response['merge_ref'].commit_id
299 299
300 300 return merge_response
301 301
302 302
303 303 @jsonrpc_method()
304 304 def close_pull_request(request, apiuser, repoid, pullrequestid,
305 305 userid=Optional(OAttr('apiuser'))):
306 306 """
307 307 Close the pull request specified by `pullrequestid`.
308 308
309 309 :param apiuser: This is filled automatically from the |authtoken|.
310 310 :type apiuser: AuthUser
311 311 :param repoid: Repository name or repository ID to which the pull
312 312 request belongs.
313 313 :type repoid: str or int
314 314 :param pullrequestid: ID of the pull request to be closed.
315 315 :type pullrequestid: int
316 316 :param userid: Close the pull request as this user.
317 317 :type userid: Optional(str or int)
318 318
319 319 Example output:
320 320
321 321 .. code-block:: bash
322 322
323 323 "id": <id_given_in_input>,
324 324 "result":
325 325 {
326 326 "pull_request_id": "<int>",
327 327 "closed": "<bool>"
328 328 },
329 329 "error": null
330 330
331 331 """
332 332 repo = get_repo_or_error(repoid)
333 333 if not isinstance(userid, Optional):
334 334 if (has_superadmin_permission(apiuser) or
335 335 HasRepoPermissionAnyApi('repository.admin')(
336 336 user=apiuser, repo_name=repo.repo_name)):
337 337 apiuser = get_user_or_error(userid)
338 338 else:
339 339 raise JSONRPCError('userid is not the same as your user')
340 340
341 341 pull_request = get_pull_request_or_error(pullrequestid)
342 342 if not PullRequestModel().check_user_update(
343 343 pull_request, apiuser, api=True):
344 344 raise JSONRPCError(
345 345 'pull request `%s` close failed, no permission to close.' % (
346 346 pullrequestid,))
347 347 if pull_request.is_closed():
348 348 raise JSONRPCError(
349 349 'pull request `%s` is already closed' % (pullrequestid,))
350 350
351 351 PullRequestModel().close_pull_request(
352 352 pull_request.pull_request_id, apiuser)
353 353 Session().commit()
354 354 data = {
355 355 'pull_request_id': pull_request.pull_request_id,
356 356 'closed': True,
357 357 }
358 358 return data
359 359
360 360
361 361 @jsonrpc_method()
362 362 def comment_pull_request(request, apiuser, repoid, pullrequestid,
363 363 message=Optional(None), status=Optional(None),
364 commit_id=Optional(None),
364 365 userid=Optional(OAttr('apiuser'))):
365 366 """
366 367 Comment on the pull request specified with the `pullrequestid`,
367 368 in the |repo| specified by the `repoid`, and optionally change the
368 369 review status.
369 370
370 371 :param apiuser: This is filled automatically from the |authtoken|.
371 372 :type apiuser: AuthUser
372 373 :param repoid: The repository name or repository ID.
373 374 :type repoid: str or int
374 375 :param pullrequestid: The pull request ID.
375 376 :type pullrequestid: int
376 377 :param message: The text content of the comment.
377 378 :type message: str
378 379 :param status: (**Optional**) Set the approval status of the pull
379 380 request. Valid options are:
380 381 * not_reviewed
381 382 * approved
382 383 * rejected
383 384 * under_review
384 385 :type status: str
386 :param commit_id: Specify the commit_id for which to set a comment. If
387 given commit_id is different than latest in the PR status
388 change won't be performed.
389 :type commit_id: str
385 390 :param userid: Comment on the pull request as this user
386 391 :type userid: Optional(str or int)
387 392
388 393 Example output:
389 394
390 395 .. code-block:: bash
391 396
392 397 id : <id_given_in_input>
393 398 result :
394 399 {
395 400 "pull_request_id": "<Integer>",
396 "comment_id": "<Integer>"
401 "comment_id": "<Integer>",
402 "status": {"given": <given_status>,
403 "was_changed": <bool status_was_actually_changed> },
397 404 }
398 405 error : null
399 406 """
400 407 repo = get_repo_or_error(repoid)
401 408 if not isinstance(userid, Optional):
402 409 if (has_superadmin_permission(apiuser) or
403 410 HasRepoPermissionAnyApi('repository.admin')(
404 411 user=apiuser, repo_name=repo.repo_name)):
405 412 apiuser = get_user_or_error(userid)
406 413 else:
407 414 raise JSONRPCError('userid is not the same as your user')
408 415
409 416 pull_request = get_pull_request_or_error(pullrequestid)
410 417 if not PullRequestModel().check_user_read(
411 418 pull_request, apiuser, api=True):
412 419 raise JSONRPCError('repository `%s` does not exist' % (repoid,))
413 420 message = Optional.extract(message)
414 421 status = Optional.extract(status)
422 commit_id = Optional.extract(commit_id)
423
415 424 if not message and not status:
416 raise JSONRPCError('message and status parameter missing')
425 raise JSONRPCError(
426 'Both message and status parameters are missing. '
427 'At least one is required.')
417 428
418 429 if (status not in (st[0] for st in ChangesetStatus.STATUSES) and
419 430 status is not None):
420 raise JSONRPCError('unknown comment status`%s`' % status)
431 raise JSONRPCError('Unknown comment status: `%s`' % status)
432
433 if commit_id and commit_id not in pull_request.revisions:
434 raise JSONRPCError(
435 'Invalid commit_id `%s` for this pull request.' % commit_id)
421 436
422 437 allowed_to_change_status = PullRequestModel().check_user_change_status(
423 438 pull_request, apiuser)
439
440 # if commit_id is passed re-validated if user is allowed to change status
441 # based on latest commit_id from the PR
442 if commit_id:
443 commit_idx = pull_request.revisions.index(commit_id)
444 if commit_idx != 0:
445 allowed_to_change_status = False
446
424 447 text = message
448 status_label = ChangesetStatus.get_status_lbl(status)
425 449 if status and allowed_to_change_status:
426 st_message = (('Status change %(transition_icon)s %(status)s')
427 % {'transition_icon': '>',
428 'status': ChangesetStatus.get_status_lbl(status)})
450 st_message = ('Status change %(transition_icon)s %(status)s'
451 % {'transition_icon': '>', 'status': status_label})
429 452 text = message or st_message
430 453
431 454 rc_config = SettingsModel().get_all_settings()
432 455 renderer = rc_config.get('rhodecode_markup_renderer', 'rst')
456
457 status_change = status and allowed_to_change_status
433 458 comment = ChangesetCommentsModel().create(
434 459 text=text,
435 460 repo=pull_request.target_repo.repo_id,
436 461 user=apiuser.user_id,
437 462 pull_request=pull_request.pull_request_id,
438 463 f_path=None,
439 464 line_no=None,
440 status_change=(ChangesetStatus.get_status_lbl(status)
441 if status and allowed_to_change_status else None),
442 status_change_type=(status
443 if status and allowed_to_change_status else None),
465 status_change=(status_label if status_change else None),
466 status_change_type=(status if status_change else None),
444 467 closing_pr=False,
445 468 renderer=renderer
446 469 )
447 470
448 471 if allowed_to_change_status and status:
449 472 ChangesetStatusModel().set_status(
450 473 pull_request.target_repo.repo_id,
451 474 status,
452 475 apiuser.user_id,
453 476 comment,
454 477 pull_request=pull_request.pull_request_id
455 478 )
456 479 Session().flush()
457 480
458 481 Session().commit()
459 482 data = {
460 483 'pull_request_id': pull_request.pull_request_id,
461 'comment_id': comment.comment_id,
462 'status': status
484 'comment_id': comment.comment_id if comment else None,
485 'status': {'given': status, 'was_changed': status_change},
463 486 }
464 487 return data
465 488
466 489
467 490 @jsonrpc_method()
468 491 def create_pull_request(
469 492 request, apiuser, source_repo, target_repo, source_ref, target_ref,
470 493 title, description=Optional(''), reviewers=Optional(None)):
471 494 """
472 495 Creates a new pull request.
473 496
474 497 Accepts refs in the following formats:
475 498
476 499 * branch:<branch_name>:<sha>
477 500 * branch:<branch_name>
478 501 * bookmark:<bookmark_name>:<sha> (Mercurial only)
479 502 * bookmark:<bookmark_name> (Mercurial only)
480 503
481 504 :param apiuser: This is filled automatically from the |authtoken|.
482 505 :type apiuser: AuthUser
483 506 :param source_repo: Set the source repository name.
484 507 :type source_repo: str
485 508 :param target_repo: Set the target repository name.
486 509 :type target_repo: str
487 510 :param source_ref: Set the source ref name.
488 511 :type source_ref: str
489 512 :param target_ref: Set the target ref name.
490 513 :type target_ref: str
491 514 :param title: Set the pull request title.
492 515 :type title: str
493 516 :param description: Set the pull request description.
494 517 :type description: Optional(str)
495 518 :param reviewers: Set the new pull request reviewers list.
496 519 :type reviewers: Optional(list)
497 520 Accepts username strings or objects of the format:
498 521 {
499 522 'username': 'nick', 'reasons': ['original author']
500 523 }
501 524 """
502 525
503 526 source = get_repo_or_error(source_repo)
504 527 target = get_repo_or_error(target_repo)
505 528 if not has_superadmin_permission(apiuser):
506 529 _perms = ('repository.admin', 'repository.write', 'repository.read',)
507 530 validate_repo_permissions(apiuser, source_repo, source, _perms)
508 531
509 532 full_source_ref = resolve_ref_or_error(source_ref, source)
510 533 full_target_ref = resolve_ref_or_error(target_ref, target)
511 534 source_commit = get_commit_or_error(full_source_ref, source)
512 535 target_commit = get_commit_or_error(full_target_ref, target)
513 536 source_scm = source.scm_instance()
514 537 target_scm = target.scm_instance()
515 538
516 539 commit_ranges = target_scm.compare(
517 540 target_commit.raw_id, source_commit.raw_id, source_scm,
518 541 merge=True, pre_load=[])
519 542
520 543 ancestor = target_scm.get_common_ancestor(
521 544 target_commit.raw_id, source_commit.raw_id, source_scm)
522 545
523 546 if not commit_ranges:
524 547 raise JSONRPCError('no commits found')
525 548
526 549 if not ancestor:
527 550 raise JSONRPCError('no common ancestor found')
528 551
529 552 reviewer_objects = Optional.extract(reviewers) or []
530 553 if not isinstance(reviewer_objects, list):
531 554 raise JSONRPCError('reviewers should be specified as a list')
532 555
533 556 reviewers_reasons = []
534 557 for reviewer_object in reviewer_objects:
535 558 reviewer_reasons = []
536 559 if isinstance(reviewer_object, (basestring, int)):
537 560 reviewer_username = reviewer_object
538 561 else:
539 562 reviewer_username = reviewer_object['username']
540 563 reviewer_reasons = reviewer_object.get('reasons', [])
541 564
542 565 user = get_user_or_error(reviewer_username)
543 566 reviewers_reasons.append((user.user_id, reviewer_reasons))
544 567
545 568 pull_request_model = PullRequestModel()
546 569 pull_request = pull_request_model.create(
547 570 created_by=apiuser.user_id,
548 571 source_repo=source_repo,
549 572 source_ref=full_source_ref,
550 573 target_repo=target_repo,
551 574 target_ref=full_target_ref,
552 575 revisions=reversed(
553 576 [commit.raw_id for commit in reversed(commit_ranges)]),
554 577 reviewers=reviewers_reasons,
555 578 title=title,
556 579 description=Optional.extract(description)
557 580 )
558 581
559 582 Session().commit()
560 583 data = {
561 584 'msg': 'Created new pull request `{}`'.format(title),
562 585 'pull_request_id': pull_request.pull_request_id,
563 586 }
564 587 return data
565 588
566 589
567 590 @jsonrpc_method()
568 591 def update_pull_request(
569 592 request, apiuser, repoid, pullrequestid, title=Optional(''),
570 593 description=Optional(''), reviewers=Optional(None),
571 594 update_commits=Optional(None), close_pull_request=Optional(None)):
572 595 """
573 596 Updates a pull request.
574 597
575 598 :param apiuser: This is filled automatically from the |authtoken|.
576 599 :type apiuser: AuthUser
577 600 :param repoid: The repository name or repository ID.
578 601 :type repoid: str or int
579 602 :param pullrequestid: The pull request ID.
580 603 :type pullrequestid: int
581 604 :param title: Set the pull request title.
582 605 :type title: str
583 606 :param description: Update pull request description.
584 607 :type description: Optional(str)
585 608 :param reviewers: Update pull request reviewers list with new value.
586 609 :type reviewers: Optional(list)
587 610 :param update_commits: Trigger update of commits for this pull request
588 611 :type: update_commits: Optional(bool)
589 612 :param close_pull_request: Close this pull request with rejected state
590 613 :type: close_pull_request: Optional(bool)
591 614
592 615 Example output:
593 616
594 617 .. code-block:: bash
595 618
596 619 id : <id_given_in_input>
597 620 result :
598 621 {
599 622 "msg": "Updated pull request `63`",
600 623 "pull_request": <pull_request_object>,
601 624 "updated_reviewers": {
602 625 "added": [
603 626 "username"
604 627 ],
605 628 "removed": []
606 629 },
607 630 "updated_commits": {
608 631 "added": [
609 632 "<sha1_hash>"
610 633 ],
611 634 "common": [
612 635 "<sha1_hash>",
613 636 "<sha1_hash>",
614 637 ],
615 638 "removed": []
616 639 }
617 640 }
618 641 error : null
619 642 """
620 643
621 644 repo = get_repo_or_error(repoid)
622 645 pull_request = get_pull_request_or_error(pullrequestid)
623 646 if not PullRequestModel().check_user_update(
624 647 pull_request, apiuser, api=True):
625 648 raise JSONRPCError(
626 649 'pull request `%s` update failed, no permission to update.' % (
627 650 pullrequestid,))
628 651 if pull_request.is_closed():
629 652 raise JSONRPCError(
630 653 'pull request `%s` update failed, pull request is closed' % (
631 654 pullrequestid,))
632 655
633 656 reviewer_objects = Optional.extract(reviewers) or []
634 657 if not isinstance(reviewer_objects, list):
635 658 raise JSONRPCError('reviewers should be specified as a list')
636 659
637 660 reviewers_reasons = []
638 661 reviewer_ids = set()
639 662 for reviewer_object in reviewer_objects:
640 663 reviewer_reasons = []
641 664 if isinstance(reviewer_object, (int, basestring)):
642 665 reviewer_username = reviewer_object
643 666 else:
644 667 reviewer_username = reviewer_object['username']
645 668 reviewer_reasons = reviewer_object.get('reasons', [])
646 669
647 670 user = get_user_or_error(reviewer_username)
648 671 reviewer_ids.add(user.user_id)
649 672 reviewers_reasons.append((user.user_id, reviewer_reasons))
650 673
651 674 title = Optional.extract(title)
652 675 description = Optional.extract(description)
653 676 if title or description:
654 677 PullRequestModel().edit(
655 678 pull_request, title or pull_request.title,
656 679 description or pull_request.description)
657 680 Session().commit()
658 681
659 682 commit_changes = {"added": [], "common": [], "removed": []}
660 683 if str2bool(Optional.extract(update_commits)):
661 684 if PullRequestModel().has_valid_update_type(pull_request):
662 685 update_response = PullRequestModel().update_commits(
663 686 pull_request)
664 687 commit_changes = update_response.changes or commit_changes
665 688 Session().commit()
666 689
667 690 reviewers_changes = {"added": [], "removed": []}
668 691 if reviewer_ids:
669 692 added_reviewers, removed_reviewers = \
670 693 PullRequestModel().update_reviewers(pull_request, reviewers_reasons)
671 694
672 695 reviewers_changes['added'] = sorted(
673 696 [get_user_or_error(n).username for n in added_reviewers])
674 697 reviewers_changes['removed'] = sorted(
675 698 [get_user_or_error(n).username for n in removed_reviewers])
676 699 Session().commit()
677 700
678 701 if str2bool(Optional.extract(close_pull_request)):
679 702 PullRequestModel().close_pull_request_with_comment(
680 703 pull_request, apiuser, repo)
681 704 Session().commit()
682 705
683 706 data = {
684 707 'msg': 'Updated pull request `{}`'.format(
685 708 pull_request.pull_request_id),
686 709 'pull_request': pull_request.get_api_data(),
687 710 'updated_commits': commit_changes,
688 711 'updated_reviewers': reviewers_changes
689 712 }
690 713
691 714 return data
General Comments 0
You need to be logged in to leave comments. Login now