##// END OF EJS Templates
api: fixed creation of pull request with custom rules of reviewers + proper diff creation.
marcink -
r2859:2c7ccc1c stable
parent child Browse files
Show More
@@ -1,903 +1,917 b''
1 # -*- coding: utf-8 -*-
1 # -*- coding: utf-8 -*-
2
2
3 # Copyright (C) 2011-2018 RhodeCode GmbH
3 # Copyright (C) 2011-2018 RhodeCode GmbH
4 #
4 #
5 # This program is free software: you can redistribute it and/or modify
5 # This program is free software: you can redistribute it and/or modify
6 # it under the terms of the GNU Affero General Public License, version 3
6 # it under the terms of the GNU Affero General Public License, version 3
7 # (only), as published by the Free Software Foundation.
7 # (only), as published by the Free Software Foundation.
8 #
8 #
9 # This program is distributed in the hope that it will be useful,
9 # This program is distributed in the hope that it will be useful,
10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 # GNU General Public License for more details.
12 # GNU General Public License for more details.
13 #
13 #
14 # You should have received a copy of the GNU Affero General Public License
14 # You should have received a copy of the GNU Affero General Public License
15 # along with this program. If not, see <http://www.gnu.org/licenses/>.
15 # along with this program. If not, see <http://www.gnu.org/licenses/>.
16 #
16 #
17 # This program is dual-licensed. If you wish to learn more about the
17 # This program is dual-licensed. If you wish to learn more about the
18 # RhodeCode Enterprise Edition, including its added features, Support services,
18 # RhodeCode Enterprise Edition, including its added features, Support services,
19 # and proprietary license terms, please see https://rhodecode.com/licenses/
19 # and proprietary license terms, please see https://rhodecode.com/licenses/
20
20
21
21
22 import logging
22 import logging
23
23
24 from rhodecode import events
24 from rhodecode import events
25 from rhodecode.api import jsonrpc_method, JSONRPCError, JSONRPCValidationError
25 from rhodecode.api import jsonrpc_method, JSONRPCError, JSONRPCValidationError
26 from rhodecode.api.utils import (
26 from rhodecode.api.utils import (
27 has_superadmin_permission, Optional, OAttr, get_repo_or_error,
27 has_superadmin_permission, Optional, OAttr, get_repo_or_error,
28 get_pull_request_or_error, get_commit_or_error, get_user_or_error,
28 get_pull_request_or_error, get_commit_or_error, get_user_or_error,
29 validate_repo_permissions, resolve_ref_or_error)
29 validate_repo_permissions, resolve_ref_or_error)
30 from rhodecode.lib.auth import (HasRepoPermissionAnyApi)
30 from rhodecode.lib.auth import (HasRepoPermissionAnyApi)
31 from rhodecode.lib.base import vcs_operation_context
31 from rhodecode.lib.base import vcs_operation_context
32 from rhodecode.lib.utils2 import str2bool
32 from rhodecode.lib.utils2 import str2bool
33 from rhodecode.model.changeset_status import ChangesetStatusModel
33 from rhodecode.model.changeset_status import ChangesetStatusModel
34 from rhodecode.model.comment import CommentsModel
34 from rhodecode.model.comment import CommentsModel
35 from rhodecode.model.db import Session, ChangesetStatus, ChangesetComment
35 from rhodecode.model.db import Session, ChangesetStatus, ChangesetComment
36 from rhodecode.model.pull_request import PullRequestModel, MergeCheck
36 from rhodecode.model.pull_request import PullRequestModel, MergeCheck
37 from rhodecode.model.settings import SettingsModel
37 from rhodecode.model.settings import SettingsModel
38 from rhodecode.model.validation_schema import Invalid
38 from rhodecode.model.validation_schema import Invalid
39 from rhodecode.model.validation_schema.schemas.reviewer_schema import(
39 from rhodecode.model.validation_schema.schemas.reviewer_schema import(
40 ReviewerListSchema)
40 ReviewerListSchema)
41
41
42 log = logging.getLogger(__name__)
42 log = logging.getLogger(__name__)
43
43
44
44
45 @jsonrpc_method()
45 @jsonrpc_method()
46 def get_pull_request(request, apiuser, pullrequestid, repoid=Optional(None)):
46 def get_pull_request(request, apiuser, pullrequestid, repoid=Optional(None)):
47 """
47 """
48 Get a pull request based on the given ID.
48 Get a pull request based on the given ID.
49
49
50 :param apiuser: This is filled automatically from the |authtoken|.
50 :param apiuser: This is filled automatically from the |authtoken|.
51 :type apiuser: AuthUser
51 :type apiuser: AuthUser
52 :param repoid: Optional, repository name or repository ID from where
52 :param repoid: Optional, repository name or repository ID from where
53 the pull request was opened.
53 the pull request was opened.
54 :type repoid: str or int
54 :type repoid: str or int
55 :param pullrequestid: ID of the requested pull request.
55 :param pullrequestid: ID of the requested pull request.
56 :type pullrequestid: int
56 :type pullrequestid: int
57
57
58 Example output:
58 Example output:
59
59
60 .. code-block:: bash
60 .. code-block:: bash
61
61
62 "id": <id_given_in_input>,
62 "id": <id_given_in_input>,
63 "result":
63 "result":
64 {
64 {
65 "pull_request_id": "<pull_request_id>",
65 "pull_request_id": "<pull_request_id>",
66 "url": "<url>",
66 "url": "<url>",
67 "title": "<title>",
67 "title": "<title>",
68 "description": "<description>",
68 "description": "<description>",
69 "status" : "<status>",
69 "status" : "<status>",
70 "created_on": "<date_time_created>",
70 "created_on": "<date_time_created>",
71 "updated_on": "<date_time_updated>",
71 "updated_on": "<date_time_updated>",
72 "commit_ids": [
72 "commit_ids": [
73 ...
73 ...
74 "<commit_id>",
74 "<commit_id>",
75 "<commit_id>",
75 "<commit_id>",
76 ...
76 ...
77 ],
77 ],
78 "review_status": "<review_status>",
78 "review_status": "<review_status>",
79 "mergeable": {
79 "mergeable": {
80 "status": "<bool>",
80 "status": "<bool>",
81 "message": "<message>",
81 "message": "<message>",
82 },
82 },
83 "source": {
83 "source": {
84 "clone_url": "<clone_url>",
84 "clone_url": "<clone_url>",
85 "repository": "<repository_name>",
85 "repository": "<repository_name>",
86 "reference":
86 "reference":
87 {
87 {
88 "name": "<name>",
88 "name": "<name>",
89 "type": "<type>",
89 "type": "<type>",
90 "commit_id": "<commit_id>",
90 "commit_id": "<commit_id>",
91 }
91 }
92 },
92 },
93 "target": {
93 "target": {
94 "clone_url": "<clone_url>",
94 "clone_url": "<clone_url>",
95 "repository": "<repository_name>",
95 "repository": "<repository_name>",
96 "reference":
96 "reference":
97 {
97 {
98 "name": "<name>",
98 "name": "<name>",
99 "type": "<type>",
99 "type": "<type>",
100 "commit_id": "<commit_id>",
100 "commit_id": "<commit_id>",
101 }
101 }
102 },
102 },
103 "merge": {
103 "merge": {
104 "clone_url": "<clone_url>",
104 "clone_url": "<clone_url>",
105 "reference":
105 "reference":
106 {
106 {
107 "name": "<name>",
107 "name": "<name>",
108 "type": "<type>",
108 "type": "<type>",
109 "commit_id": "<commit_id>",
109 "commit_id": "<commit_id>",
110 }
110 }
111 },
111 },
112 "author": <user_obj>,
112 "author": <user_obj>,
113 "reviewers": [
113 "reviewers": [
114 ...
114 ...
115 {
115 {
116 "user": "<user_obj>",
116 "user": "<user_obj>",
117 "review_status": "<review_status>",
117 "review_status": "<review_status>",
118 }
118 }
119 ...
119 ...
120 ]
120 ]
121 },
121 },
122 "error": null
122 "error": null
123 """
123 """
124
124
125 pull_request = get_pull_request_or_error(pullrequestid)
125 pull_request = get_pull_request_or_error(pullrequestid)
126 if Optional.extract(repoid):
126 if Optional.extract(repoid):
127 repo = get_repo_or_error(repoid)
127 repo = get_repo_or_error(repoid)
128 else:
128 else:
129 repo = pull_request.target_repo
129 repo = pull_request.target_repo
130
130
131 if not PullRequestModel().check_user_read(
131 if not PullRequestModel().check_user_read(
132 pull_request, apiuser, api=True):
132 pull_request, apiuser, api=True):
133 raise JSONRPCError('repository `%s` or pull request `%s` '
133 raise JSONRPCError('repository `%s` or pull request `%s` '
134 'does not exist' % (repoid, pullrequestid))
134 'does not exist' % (repoid, pullrequestid))
135 data = pull_request.get_api_data()
135 data = pull_request.get_api_data()
136 return data
136 return data
137
137
138
138
139 @jsonrpc_method()
139 @jsonrpc_method()
140 def get_pull_requests(request, apiuser, repoid, status=Optional('new')):
140 def get_pull_requests(request, apiuser, repoid, status=Optional('new')):
141 """
141 """
142 Get all pull requests from the repository specified in `repoid`.
142 Get all pull requests from the repository specified in `repoid`.
143
143
144 :param apiuser: This is filled automatically from the |authtoken|.
144 :param apiuser: This is filled automatically from the |authtoken|.
145 :type apiuser: AuthUser
145 :type apiuser: AuthUser
146 :param repoid: Optional repository name or repository ID.
146 :param repoid: Optional repository name or repository ID.
147 :type repoid: str or int
147 :type repoid: str or int
148 :param status: Only return pull requests with the specified status.
148 :param status: Only return pull requests with the specified status.
149 Valid options are.
149 Valid options are.
150 * ``new`` (default)
150 * ``new`` (default)
151 * ``open``
151 * ``open``
152 * ``closed``
152 * ``closed``
153 :type status: str
153 :type status: str
154
154
155 Example output:
155 Example output:
156
156
157 .. code-block:: bash
157 .. code-block:: bash
158
158
159 "id": <id_given_in_input>,
159 "id": <id_given_in_input>,
160 "result":
160 "result":
161 [
161 [
162 ...
162 ...
163 {
163 {
164 "pull_request_id": "<pull_request_id>",
164 "pull_request_id": "<pull_request_id>",
165 "url": "<url>",
165 "url": "<url>",
166 "title" : "<title>",
166 "title" : "<title>",
167 "description": "<description>",
167 "description": "<description>",
168 "status": "<status>",
168 "status": "<status>",
169 "created_on": "<date_time_created>",
169 "created_on": "<date_time_created>",
170 "updated_on": "<date_time_updated>",
170 "updated_on": "<date_time_updated>",
171 "commit_ids": [
171 "commit_ids": [
172 ...
172 ...
173 "<commit_id>",
173 "<commit_id>",
174 "<commit_id>",
174 "<commit_id>",
175 ...
175 ...
176 ],
176 ],
177 "review_status": "<review_status>",
177 "review_status": "<review_status>",
178 "mergeable": {
178 "mergeable": {
179 "status": "<bool>",
179 "status": "<bool>",
180 "message: "<message>",
180 "message: "<message>",
181 },
181 },
182 "source": {
182 "source": {
183 "clone_url": "<clone_url>",
183 "clone_url": "<clone_url>",
184 "reference":
184 "reference":
185 {
185 {
186 "name": "<name>",
186 "name": "<name>",
187 "type": "<type>",
187 "type": "<type>",
188 "commit_id": "<commit_id>",
188 "commit_id": "<commit_id>",
189 }
189 }
190 },
190 },
191 "target": {
191 "target": {
192 "clone_url": "<clone_url>",
192 "clone_url": "<clone_url>",
193 "reference":
193 "reference":
194 {
194 {
195 "name": "<name>",
195 "name": "<name>",
196 "type": "<type>",
196 "type": "<type>",
197 "commit_id": "<commit_id>",
197 "commit_id": "<commit_id>",
198 }
198 }
199 },
199 },
200 "merge": {
200 "merge": {
201 "clone_url": "<clone_url>",
201 "clone_url": "<clone_url>",
202 "reference":
202 "reference":
203 {
203 {
204 "name": "<name>",
204 "name": "<name>",
205 "type": "<type>",
205 "type": "<type>",
206 "commit_id": "<commit_id>",
206 "commit_id": "<commit_id>",
207 }
207 }
208 },
208 },
209 "author": <user_obj>,
209 "author": <user_obj>,
210 "reviewers": [
210 "reviewers": [
211 ...
211 ...
212 {
212 {
213 "user": "<user_obj>",
213 "user": "<user_obj>",
214 "review_status": "<review_status>",
214 "review_status": "<review_status>",
215 }
215 }
216 ...
216 ...
217 ]
217 ]
218 }
218 }
219 ...
219 ...
220 ],
220 ],
221 "error": null
221 "error": null
222
222
223 """
223 """
224 repo = get_repo_or_error(repoid)
224 repo = get_repo_or_error(repoid)
225 if not has_superadmin_permission(apiuser):
225 if not has_superadmin_permission(apiuser):
226 _perms = (
226 _perms = (
227 'repository.admin', 'repository.write', 'repository.read',)
227 'repository.admin', 'repository.write', 'repository.read',)
228 validate_repo_permissions(apiuser, repoid, repo, _perms)
228 validate_repo_permissions(apiuser, repoid, repo, _perms)
229
229
230 status = Optional.extract(status)
230 status = Optional.extract(status)
231 pull_requests = PullRequestModel().get_all(repo, statuses=[status])
231 pull_requests = PullRequestModel().get_all(repo, statuses=[status])
232 data = [pr.get_api_data() for pr in pull_requests]
232 data = [pr.get_api_data() for pr in pull_requests]
233 return data
233 return data
234
234
235
235
236 @jsonrpc_method()
236 @jsonrpc_method()
237 def merge_pull_request(
237 def merge_pull_request(
238 request, apiuser, pullrequestid, repoid=Optional(None),
238 request, apiuser, pullrequestid, repoid=Optional(None),
239 userid=Optional(OAttr('apiuser'))):
239 userid=Optional(OAttr('apiuser'))):
240 """
240 """
241 Merge the pull request specified by `pullrequestid` into its target
241 Merge the pull request specified by `pullrequestid` into its target
242 repository.
242 repository.
243
243
244 :param apiuser: This is filled automatically from the |authtoken|.
244 :param apiuser: This is filled automatically from the |authtoken|.
245 :type apiuser: AuthUser
245 :type apiuser: AuthUser
246 :param repoid: Optional, repository name or repository ID of the
246 :param repoid: Optional, repository name or repository ID of the
247 target repository to which the |pr| is to be merged.
247 target repository to which the |pr| is to be merged.
248 :type repoid: str or int
248 :type repoid: str or int
249 :param pullrequestid: ID of the pull request which shall be merged.
249 :param pullrequestid: ID of the pull request which shall be merged.
250 :type pullrequestid: int
250 :type pullrequestid: int
251 :param userid: Merge the pull request as this user.
251 :param userid: Merge the pull request as this user.
252 :type userid: Optional(str or int)
252 :type userid: Optional(str or int)
253
253
254 Example output:
254 Example output:
255
255
256 .. code-block:: bash
256 .. code-block:: bash
257
257
258 "id": <id_given_in_input>,
258 "id": <id_given_in_input>,
259 "result": {
259 "result": {
260 "executed": "<bool>",
260 "executed": "<bool>",
261 "failure_reason": "<int>",
261 "failure_reason": "<int>",
262 "merge_commit_id": "<merge_commit_id>",
262 "merge_commit_id": "<merge_commit_id>",
263 "possible": "<bool>",
263 "possible": "<bool>",
264 "merge_ref": {
264 "merge_ref": {
265 "commit_id": "<commit_id>",
265 "commit_id": "<commit_id>",
266 "type": "<type>",
266 "type": "<type>",
267 "name": "<name>"
267 "name": "<name>"
268 }
268 }
269 },
269 },
270 "error": null
270 "error": null
271 """
271 """
272 pull_request = get_pull_request_or_error(pullrequestid)
272 pull_request = get_pull_request_or_error(pullrequestid)
273 if Optional.extract(repoid):
273 if Optional.extract(repoid):
274 repo = get_repo_or_error(repoid)
274 repo = get_repo_or_error(repoid)
275 else:
275 else:
276 repo = pull_request.target_repo
276 repo = pull_request.target_repo
277
277
278 if not isinstance(userid, Optional):
278 if not isinstance(userid, Optional):
279 if (has_superadmin_permission(apiuser) or
279 if (has_superadmin_permission(apiuser) or
280 HasRepoPermissionAnyApi('repository.admin')(
280 HasRepoPermissionAnyApi('repository.admin')(
281 user=apiuser, repo_name=repo.repo_name)):
281 user=apiuser, repo_name=repo.repo_name)):
282 apiuser = get_user_or_error(userid)
282 apiuser = get_user_or_error(userid)
283 else:
283 else:
284 raise JSONRPCError('userid is not the same as your user')
284 raise JSONRPCError('userid is not the same as your user')
285
285
286 check = MergeCheck.validate(
286 check = MergeCheck.validate(
287 pull_request, user=apiuser, translator=request.translate)
287 pull_request, user=apiuser, translator=request.translate)
288 merge_possible = not check.failed
288 merge_possible = not check.failed
289
289
290 if not merge_possible:
290 if not merge_possible:
291 error_messages = []
291 error_messages = []
292 for err_type, error_msg in check.errors:
292 for err_type, error_msg in check.errors:
293 error_msg = request.translate(error_msg)
293 error_msg = request.translate(error_msg)
294 error_messages.append(error_msg)
294 error_messages.append(error_msg)
295
295
296 reasons = ','.join(error_messages)
296 reasons = ','.join(error_messages)
297 raise JSONRPCError(
297 raise JSONRPCError(
298 'merge not possible for following reasons: {}'.format(reasons))
298 'merge not possible for following reasons: {}'.format(reasons))
299
299
300 target_repo = pull_request.target_repo
300 target_repo = pull_request.target_repo
301 extras = vcs_operation_context(
301 extras = vcs_operation_context(
302 request.environ, repo_name=target_repo.repo_name,
302 request.environ, repo_name=target_repo.repo_name,
303 username=apiuser.username, action='push',
303 username=apiuser.username, action='push',
304 scm=target_repo.repo_type)
304 scm=target_repo.repo_type)
305 merge_response = PullRequestModel().merge(
305 merge_response = PullRequestModel().merge(
306 pull_request, apiuser, extras=extras)
306 pull_request, apiuser, extras=extras)
307 if merge_response.executed:
307 if merge_response.executed:
308 PullRequestModel().close_pull_request(
308 PullRequestModel().close_pull_request(
309 pull_request.pull_request_id, apiuser)
309 pull_request.pull_request_id, apiuser)
310
310
311 Session().commit()
311 Session().commit()
312
312
313 # In previous versions the merge response directly contained the merge
313 # In previous versions the merge response directly contained the merge
314 # commit id. It is now contained in the merge reference object. To be
314 # commit id. It is now contained in the merge reference object. To be
315 # backwards compatible we have to extract it again.
315 # backwards compatible we have to extract it again.
316 merge_response = merge_response._asdict()
316 merge_response = merge_response._asdict()
317 merge_response['merge_commit_id'] = merge_response['merge_ref'].commit_id
317 merge_response['merge_commit_id'] = merge_response['merge_ref'].commit_id
318
318
319 return merge_response
319 return merge_response
320
320
321
321
322 @jsonrpc_method()
322 @jsonrpc_method()
323 def get_pull_request_comments(
323 def get_pull_request_comments(
324 request, apiuser, pullrequestid, repoid=Optional(None)):
324 request, apiuser, pullrequestid, repoid=Optional(None)):
325 """
325 """
326 Get all comments of pull request specified with the `pullrequestid`
326 Get all comments of pull request specified with the `pullrequestid`
327
327
328 :param apiuser: This is filled automatically from the |authtoken|.
328 :param apiuser: This is filled automatically from the |authtoken|.
329 :type apiuser: AuthUser
329 :type apiuser: AuthUser
330 :param repoid: Optional repository name or repository ID.
330 :param repoid: Optional repository name or repository ID.
331 :type repoid: str or int
331 :type repoid: str or int
332 :param pullrequestid: The pull request ID.
332 :param pullrequestid: The pull request ID.
333 :type pullrequestid: int
333 :type pullrequestid: int
334
334
335 Example output:
335 Example output:
336
336
337 .. code-block:: bash
337 .. code-block:: bash
338
338
339 id : <id_given_in_input>
339 id : <id_given_in_input>
340 result : [
340 result : [
341 {
341 {
342 "comment_author": {
342 "comment_author": {
343 "active": true,
343 "active": true,
344 "full_name_or_username": "Tom Gore",
344 "full_name_or_username": "Tom Gore",
345 "username": "admin"
345 "username": "admin"
346 },
346 },
347 "comment_created_on": "2017-01-02T18:43:45.533",
347 "comment_created_on": "2017-01-02T18:43:45.533",
348 "comment_f_path": null,
348 "comment_f_path": null,
349 "comment_id": 25,
349 "comment_id": 25,
350 "comment_lineno": null,
350 "comment_lineno": null,
351 "comment_status": {
351 "comment_status": {
352 "status": "under_review",
352 "status": "under_review",
353 "status_lbl": "Under Review"
353 "status_lbl": "Under Review"
354 },
354 },
355 "comment_text": "Example text",
355 "comment_text": "Example text",
356 "comment_type": null,
356 "comment_type": null,
357 "pull_request_version": null
357 "pull_request_version": null
358 }
358 }
359 ],
359 ],
360 error : null
360 error : null
361 """
361 """
362
362
363 pull_request = get_pull_request_or_error(pullrequestid)
363 pull_request = get_pull_request_or_error(pullrequestid)
364 if Optional.extract(repoid):
364 if Optional.extract(repoid):
365 repo = get_repo_or_error(repoid)
365 repo = get_repo_or_error(repoid)
366 else:
366 else:
367 repo = pull_request.target_repo
367 repo = pull_request.target_repo
368
368
369 if not PullRequestModel().check_user_read(
369 if not PullRequestModel().check_user_read(
370 pull_request, apiuser, api=True):
370 pull_request, apiuser, api=True):
371 raise JSONRPCError('repository `%s` or pull request `%s` '
371 raise JSONRPCError('repository `%s` or pull request `%s` '
372 'does not exist' % (repoid, pullrequestid))
372 'does not exist' % (repoid, pullrequestid))
373
373
374 (pull_request_latest,
374 (pull_request_latest,
375 pull_request_at_ver,
375 pull_request_at_ver,
376 pull_request_display_obj,
376 pull_request_display_obj,
377 at_version) = PullRequestModel().get_pr_version(
377 at_version) = PullRequestModel().get_pr_version(
378 pull_request.pull_request_id, version=None)
378 pull_request.pull_request_id, version=None)
379
379
380 versions = pull_request_display_obj.versions()
380 versions = pull_request_display_obj.versions()
381 ver_map = {
381 ver_map = {
382 ver.pull_request_version_id: cnt
382 ver.pull_request_version_id: cnt
383 for cnt, ver in enumerate(versions, 1)
383 for cnt, ver in enumerate(versions, 1)
384 }
384 }
385
385
386 # GENERAL COMMENTS with versions #
386 # GENERAL COMMENTS with versions #
387 q = CommentsModel()._all_general_comments_of_pull_request(pull_request)
387 q = CommentsModel()._all_general_comments_of_pull_request(pull_request)
388 q = q.order_by(ChangesetComment.comment_id.asc())
388 q = q.order_by(ChangesetComment.comment_id.asc())
389 general_comments = q.all()
389 general_comments = q.all()
390
390
391 # INLINE COMMENTS with versions #
391 # INLINE COMMENTS with versions #
392 q = CommentsModel()._all_inline_comments_of_pull_request(pull_request)
392 q = CommentsModel()._all_inline_comments_of_pull_request(pull_request)
393 q = q.order_by(ChangesetComment.comment_id.asc())
393 q = q.order_by(ChangesetComment.comment_id.asc())
394 inline_comments = q.all()
394 inline_comments = q.all()
395
395
396 data = []
396 data = []
397 for comment in inline_comments + general_comments:
397 for comment in inline_comments + general_comments:
398 full_data = comment.get_api_data()
398 full_data = comment.get_api_data()
399 pr_version_id = None
399 pr_version_id = None
400 if comment.pull_request_version_id:
400 if comment.pull_request_version_id:
401 pr_version_id = 'v{}'.format(
401 pr_version_id = 'v{}'.format(
402 ver_map[comment.pull_request_version_id])
402 ver_map[comment.pull_request_version_id])
403
403
404 # sanitize some entries
404 # sanitize some entries
405
405
406 full_data['pull_request_version'] = pr_version_id
406 full_data['pull_request_version'] = pr_version_id
407 full_data['comment_author'] = {
407 full_data['comment_author'] = {
408 'username': full_data['comment_author'].username,
408 'username': full_data['comment_author'].username,
409 'full_name_or_username': full_data['comment_author'].full_name_or_username,
409 'full_name_or_username': full_data['comment_author'].full_name_or_username,
410 'active': full_data['comment_author'].active,
410 'active': full_data['comment_author'].active,
411 }
411 }
412
412
413 if full_data['comment_status']:
413 if full_data['comment_status']:
414 full_data['comment_status'] = {
414 full_data['comment_status'] = {
415 'status': full_data['comment_status'][0].status,
415 'status': full_data['comment_status'][0].status,
416 'status_lbl': full_data['comment_status'][0].status_lbl,
416 'status_lbl': full_data['comment_status'][0].status_lbl,
417 }
417 }
418 else:
418 else:
419 full_data['comment_status'] = {}
419 full_data['comment_status'] = {}
420
420
421 data.append(full_data)
421 data.append(full_data)
422 return data
422 return data
423
423
424
424
425 @jsonrpc_method()
425 @jsonrpc_method()
426 def comment_pull_request(
426 def comment_pull_request(
427 request, apiuser, pullrequestid, repoid=Optional(None),
427 request, apiuser, pullrequestid, repoid=Optional(None),
428 message=Optional(None), commit_id=Optional(None), status=Optional(None),
428 message=Optional(None), commit_id=Optional(None), status=Optional(None),
429 comment_type=Optional(ChangesetComment.COMMENT_TYPE_NOTE),
429 comment_type=Optional(ChangesetComment.COMMENT_TYPE_NOTE),
430 resolves_comment_id=Optional(None),
430 resolves_comment_id=Optional(None),
431 userid=Optional(OAttr('apiuser'))):
431 userid=Optional(OAttr('apiuser'))):
432 """
432 """
433 Comment on the pull request specified with the `pullrequestid`,
433 Comment on the pull request specified with the `pullrequestid`,
434 in the |repo| specified by the `repoid`, and optionally change the
434 in the |repo| specified by the `repoid`, and optionally change the
435 review status.
435 review status.
436
436
437 :param apiuser: This is filled automatically from the |authtoken|.
437 :param apiuser: This is filled automatically from the |authtoken|.
438 :type apiuser: AuthUser
438 :type apiuser: AuthUser
439 :param repoid: Optional repository name or repository ID.
439 :param repoid: Optional repository name or repository ID.
440 :type repoid: str or int
440 :type repoid: str or int
441 :param pullrequestid: The pull request ID.
441 :param pullrequestid: The pull request ID.
442 :type pullrequestid: int
442 :type pullrequestid: int
443 :param commit_id: Specify the commit_id for which to set a comment. If
443 :param commit_id: Specify the commit_id for which to set a comment. If
444 given commit_id is different than latest in the PR status
444 given commit_id is different than latest in the PR status
445 change won't be performed.
445 change won't be performed.
446 :type commit_id: str
446 :type commit_id: str
447 :param message: The text content of the comment.
447 :param message: The text content of the comment.
448 :type message: str
448 :type message: str
449 :param status: (**Optional**) Set the approval status of the pull
449 :param status: (**Optional**) Set the approval status of the pull
450 request. One of: 'not_reviewed', 'approved', 'rejected',
450 request. One of: 'not_reviewed', 'approved', 'rejected',
451 'under_review'
451 'under_review'
452 :type status: str
452 :type status: str
453 :param comment_type: Comment type, one of: 'note', 'todo'
453 :param comment_type: Comment type, one of: 'note', 'todo'
454 :type comment_type: Optional(str), default: 'note'
454 :type comment_type: Optional(str), default: 'note'
455 :param userid: Comment on the pull request as this user
455 :param userid: Comment on the pull request as this user
456 :type userid: Optional(str or int)
456 :type userid: Optional(str or int)
457
457
458 Example output:
458 Example output:
459
459
460 .. code-block:: bash
460 .. code-block:: bash
461
461
462 id : <id_given_in_input>
462 id : <id_given_in_input>
463 result : {
463 result : {
464 "pull_request_id": "<Integer>",
464 "pull_request_id": "<Integer>",
465 "comment_id": "<Integer>",
465 "comment_id": "<Integer>",
466 "status": {"given": <given_status>,
466 "status": {"given": <given_status>,
467 "was_changed": <bool status_was_actually_changed> },
467 "was_changed": <bool status_was_actually_changed> },
468 },
468 },
469 error : null
469 error : null
470 """
470 """
471 pull_request = get_pull_request_or_error(pullrequestid)
471 pull_request = get_pull_request_or_error(pullrequestid)
472 if Optional.extract(repoid):
472 if Optional.extract(repoid):
473 repo = get_repo_or_error(repoid)
473 repo = get_repo_or_error(repoid)
474 else:
474 else:
475 repo = pull_request.target_repo
475 repo = pull_request.target_repo
476
476
477 if not isinstance(userid, Optional):
477 if not isinstance(userid, Optional):
478 if (has_superadmin_permission(apiuser) or
478 if (has_superadmin_permission(apiuser) or
479 HasRepoPermissionAnyApi('repository.admin')(
479 HasRepoPermissionAnyApi('repository.admin')(
480 user=apiuser, repo_name=repo.repo_name)):
480 user=apiuser, repo_name=repo.repo_name)):
481 apiuser = get_user_or_error(userid)
481 apiuser = get_user_or_error(userid)
482 else:
482 else:
483 raise JSONRPCError('userid is not the same as your user')
483 raise JSONRPCError('userid is not the same as your user')
484
484
485 if not PullRequestModel().check_user_read(
485 if not PullRequestModel().check_user_read(
486 pull_request, apiuser, api=True):
486 pull_request, apiuser, api=True):
487 raise JSONRPCError('repository `%s` does not exist' % (repoid,))
487 raise JSONRPCError('repository `%s` does not exist' % (repoid,))
488 message = Optional.extract(message)
488 message = Optional.extract(message)
489 status = Optional.extract(status)
489 status = Optional.extract(status)
490 commit_id = Optional.extract(commit_id)
490 commit_id = Optional.extract(commit_id)
491 comment_type = Optional.extract(comment_type)
491 comment_type = Optional.extract(comment_type)
492 resolves_comment_id = Optional.extract(resolves_comment_id)
492 resolves_comment_id = Optional.extract(resolves_comment_id)
493
493
494 if not message and not status:
494 if not message and not status:
495 raise JSONRPCError(
495 raise JSONRPCError(
496 'Both message and status parameters are missing. '
496 'Both message and status parameters are missing. '
497 'At least one is required.')
497 'At least one is required.')
498
498
499 if (status not in (st[0] for st in ChangesetStatus.STATUSES) and
499 if (status not in (st[0] for st in ChangesetStatus.STATUSES) and
500 status is not None):
500 status is not None):
501 raise JSONRPCError('Unknown comment status: `%s`' % status)
501 raise JSONRPCError('Unknown comment status: `%s`' % status)
502
502
503 if commit_id and commit_id not in pull_request.revisions:
503 if commit_id and commit_id not in pull_request.revisions:
504 raise JSONRPCError(
504 raise JSONRPCError(
505 'Invalid commit_id `%s` for this pull request.' % commit_id)
505 'Invalid commit_id `%s` for this pull request.' % commit_id)
506
506
507 allowed_to_change_status = PullRequestModel().check_user_change_status(
507 allowed_to_change_status = PullRequestModel().check_user_change_status(
508 pull_request, apiuser)
508 pull_request, apiuser)
509
509
510 # if commit_id is passed re-validated if user is allowed to change status
510 # if commit_id is passed re-validated if user is allowed to change status
511 # based on latest commit_id from the PR
511 # based on latest commit_id from the PR
512 if commit_id:
512 if commit_id:
513 commit_idx = pull_request.revisions.index(commit_id)
513 commit_idx = pull_request.revisions.index(commit_id)
514 if commit_idx != 0:
514 if commit_idx != 0:
515 allowed_to_change_status = False
515 allowed_to_change_status = False
516
516
517 if resolves_comment_id:
517 if resolves_comment_id:
518 comment = ChangesetComment.get(resolves_comment_id)
518 comment = ChangesetComment.get(resolves_comment_id)
519 if not comment:
519 if not comment:
520 raise JSONRPCError(
520 raise JSONRPCError(
521 'Invalid resolves_comment_id `%s` for this pull request.'
521 'Invalid resolves_comment_id `%s` for this pull request.'
522 % resolves_comment_id)
522 % resolves_comment_id)
523 if comment.comment_type != ChangesetComment.COMMENT_TYPE_TODO:
523 if comment.comment_type != ChangesetComment.COMMENT_TYPE_TODO:
524 raise JSONRPCError(
524 raise JSONRPCError(
525 'Comment `%s` is wrong type for setting status to resolved.'
525 'Comment `%s` is wrong type for setting status to resolved.'
526 % resolves_comment_id)
526 % resolves_comment_id)
527
527
528 text = message
528 text = message
529 status_label = ChangesetStatus.get_status_lbl(status)
529 status_label = ChangesetStatus.get_status_lbl(status)
530 if status and allowed_to_change_status:
530 if status and allowed_to_change_status:
531 st_message = ('Status change %(transition_icon)s %(status)s'
531 st_message = ('Status change %(transition_icon)s %(status)s'
532 % {'transition_icon': '>', 'status': status_label})
532 % {'transition_icon': '>', 'status': status_label})
533 text = message or st_message
533 text = message or st_message
534
534
535 rc_config = SettingsModel().get_all_settings()
535 rc_config = SettingsModel().get_all_settings()
536 renderer = rc_config.get('rhodecode_markup_renderer', 'rst')
536 renderer = rc_config.get('rhodecode_markup_renderer', 'rst')
537
537
538 status_change = status and allowed_to_change_status
538 status_change = status and allowed_to_change_status
539 comment = CommentsModel().create(
539 comment = CommentsModel().create(
540 text=text,
540 text=text,
541 repo=pull_request.target_repo.repo_id,
541 repo=pull_request.target_repo.repo_id,
542 user=apiuser.user_id,
542 user=apiuser.user_id,
543 pull_request=pull_request.pull_request_id,
543 pull_request=pull_request.pull_request_id,
544 f_path=None,
544 f_path=None,
545 line_no=None,
545 line_no=None,
546 status_change=(status_label if status_change else None),
546 status_change=(status_label if status_change else None),
547 status_change_type=(status if status_change else None),
547 status_change_type=(status if status_change else None),
548 closing_pr=False,
548 closing_pr=False,
549 renderer=renderer,
549 renderer=renderer,
550 comment_type=comment_type,
550 comment_type=comment_type,
551 resolves_comment_id=resolves_comment_id
551 resolves_comment_id=resolves_comment_id
552 )
552 )
553
553
554 if allowed_to_change_status and status:
554 if allowed_to_change_status and status:
555 ChangesetStatusModel().set_status(
555 ChangesetStatusModel().set_status(
556 pull_request.target_repo.repo_id,
556 pull_request.target_repo.repo_id,
557 status,
557 status,
558 apiuser.user_id,
558 apiuser.user_id,
559 comment,
559 comment,
560 pull_request=pull_request.pull_request_id
560 pull_request=pull_request.pull_request_id
561 )
561 )
562 Session().flush()
562 Session().flush()
563
563
564 Session().commit()
564 Session().commit()
565 data = {
565 data = {
566 'pull_request_id': pull_request.pull_request_id,
566 'pull_request_id': pull_request.pull_request_id,
567 'comment_id': comment.comment_id if comment else None,
567 'comment_id': comment.comment_id if comment else None,
568 'status': {'given': status, 'was_changed': status_change},
568 'status': {'given': status, 'was_changed': status_change},
569 }
569 }
570 return data
570 return data
571
571
572
572
573 @jsonrpc_method()
573 @jsonrpc_method()
574 def create_pull_request(
574 def create_pull_request(
575 request, apiuser, source_repo, target_repo, source_ref, target_ref,
575 request, apiuser, source_repo, target_repo, source_ref, target_ref,
576 title, description=Optional(''), reviewers=Optional(None)):
576 title=Optional(''), description=Optional(''), reviewers=Optional(None)):
577 """
577 """
578 Creates a new pull request.
578 Creates a new pull request.
579
579
580 Accepts refs in the following formats:
580 Accepts refs in the following formats:
581
581
582 * branch:<branch_name>:<sha>
582 * branch:<branch_name>:<sha>
583 * branch:<branch_name>
583 * branch:<branch_name>
584 * bookmark:<bookmark_name>:<sha> (Mercurial only)
584 * bookmark:<bookmark_name>:<sha> (Mercurial only)
585 * bookmark:<bookmark_name> (Mercurial only)
585 * bookmark:<bookmark_name> (Mercurial only)
586
586
587 :param apiuser: This is filled automatically from the |authtoken|.
587 :param apiuser: This is filled automatically from the |authtoken|.
588 :type apiuser: AuthUser
588 :type apiuser: AuthUser
589 :param source_repo: Set the source repository name.
589 :param source_repo: Set the source repository name.
590 :type source_repo: str
590 :type source_repo: str
591 :param target_repo: Set the target repository name.
591 :param target_repo: Set the target repository name.
592 :type target_repo: str
592 :type target_repo: str
593 :param source_ref: Set the source ref name.
593 :param source_ref: Set the source ref name.
594 :type source_ref: str
594 :type source_ref: str
595 :param target_ref: Set the target ref name.
595 :param target_ref: Set the target ref name.
596 :type target_ref: str
596 :type target_ref: str
597 :param title: Set the pull request title.
597 :param title: Optionally Set the pull request title, it's generated otherwise
598 :type title: str
598 :type title: str
599 :param description: Set the pull request description.
599 :param description: Set the pull request description.
600 :type description: Optional(str)
600 :type description: Optional(str)
601 :param reviewers: Set the new pull request reviewers list.
601 :param reviewers: Set the new pull request reviewers list.
602 Reviewer defined by review rules will be added automatically to the
602 Reviewer defined by review rules will be added automatically to the
603 defined list.
603 defined list.
604 :type reviewers: Optional(list)
604 :type reviewers: Optional(list)
605 Accepts username strings or objects of the format:
605 Accepts username strings or objects of the format:
606
606
607 [{'username': 'nick', 'reasons': ['original author'], 'mandatory': <bool>}]
607 [{'username': 'nick', 'reasons': ['original author'], 'mandatory': <bool>}]
608 """
608 """
609
609
610 source_db_repo = get_repo_or_error(source_repo)
610 source_db_repo = get_repo_or_error(source_repo)
611 target_db_repo = get_repo_or_error(target_repo)
611 target_db_repo = get_repo_or_error(target_repo)
612 if not has_superadmin_permission(apiuser):
612 if not has_superadmin_permission(apiuser):
613 _perms = ('repository.admin', 'repository.write', 'repository.read',)
613 _perms = ('repository.admin', 'repository.write', 'repository.read',)
614 validate_repo_permissions(apiuser, source_repo, source_db_repo, _perms)
614 validate_repo_permissions(apiuser, source_repo, source_db_repo, _perms)
615
615
616 full_source_ref = resolve_ref_or_error(source_ref, source_db_repo)
616 full_source_ref = resolve_ref_or_error(source_ref, source_db_repo)
617 full_target_ref = resolve_ref_or_error(target_ref, target_db_repo)
617 full_target_ref = resolve_ref_or_error(target_ref, target_db_repo)
618
619 source_scm = source_db_repo.scm_instance()
620 target_scm = target_db_repo.scm_instance()
621
618 source_commit = get_commit_or_error(full_source_ref, source_db_repo)
622 source_commit = get_commit_or_error(full_source_ref, source_db_repo)
619 target_commit = get_commit_or_error(full_target_ref, target_db_repo)
623 target_commit = get_commit_or_error(full_target_ref, target_db_repo)
620 source_scm = source_db_repo.scm_instance()
624
621 target_scm = target_db_repo.scm_instance()
625 ancestor = source_scm.get_common_ancestor(
626 source_commit.raw_id, target_commit.raw_id, target_scm)
627 if not ancestor:
628 raise JSONRPCError('no common ancestor found')
629
630 # recalculate target ref based on ancestor
631 target_ref_type, target_ref_name, __ = full_target_ref.split(':')
632 full_target_ref = ':'.join((target_ref_type, target_ref_name, ancestor))
622
633
623 commit_ranges = target_scm.compare(
634 commit_ranges = target_scm.compare(
624 target_commit.raw_id, source_commit.raw_id, source_scm,
635 target_commit.raw_id, source_commit.raw_id, source_scm,
625 merge=True, pre_load=[])
636 merge=True, pre_load=[])
626
637
627 ancestor = target_scm.get_common_ancestor(
628 target_commit.raw_id, source_commit.raw_id, source_scm)
629
630 if not commit_ranges:
638 if not commit_ranges:
631 raise JSONRPCError('no commits found')
639 raise JSONRPCError('no commits found')
632
640
633 if not ancestor:
634 raise JSONRPCError('no common ancestor found')
635
636 reviewer_objects = Optional.extract(reviewers) or []
641 reviewer_objects = Optional.extract(reviewers) or []
637
642
643 # serialize and validate passed in given reviewers
638 if reviewer_objects:
644 if reviewer_objects:
639 schema = ReviewerListSchema()
645 schema = ReviewerListSchema()
640 try:
646 try:
641 reviewer_objects = schema.deserialize(reviewer_objects)
647 reviewer_objects = schema.deserialize(reviewer_objects)
642 except Invalid as err:
648 except Invalid as err:
643 raise JSONRPCValidationError(colander_exc=err)
649 raise JSONRPCValidationError(colander_exc=err)
644
650
645 # validate users
651 # validate users
646 for reviewer_object in reviewer_objects:
652 for reviewer_object in reviewer_objects:
647 user = get_user_or_error(reviewer_object['username'])
653 user = get_user_or_error(reviewer_object['username'])
648 reviewer_object['user_id'] = user.user_id
654 reviewer_object['user_id'] = user.user_id
649
655
650 get_default_reviewers_data, get_validated_reviewers = \
656 get_default_reviewers_data, validate_default_reviewers = \
651 PullRequestModel().get_reviewer_functions()
657 PullRequestModel().get_reviewer_functions()
652
658
659 # recalculate reviewers logic, to make sure we can validate this
653 reviewer_rules = get_default_reviewers_data(
660 reviewer_rules = get_default_reviewers_data(
654 apiuser.get_instance(), source_db_repo,
661 apiuser.get_instance(), source_db_repo,
655 source_commit, target_db_repo, target_commit)
662 source_commit, target_db_repo, target_commit)
656
663
657 # specified rules are later re-validated, thus we can assume users will
664 # now MERGE our given with the calculated
658 # eventually provide those that meet the reviewer criteria.
665 reviewer_objects = reviewer_rules['reviewers'] + reviewer_objects
659 if not reviewer_objects:
660 reviewer_objects = reviewer_rules['reviewers']
661
666
662 try:
667 try:
663 reviewers = get_validated_reviewers(
668 reviewers = validate_default_reviewers(
664 reviewer_objects, reviewer_rules)
669 reviewer_objects, reviewer_rules)
665 except ValueError as e:
670 except ValueError as e:
666 raise JSONRPCError('Reviewers Validation: {}'.format(e))
671 raise JSONRPCError('Reviewers Validation: {}'.format(e))
667
672
668 pull_request_model = PullRequestModel()
673 title = Optional.extract(title)
669 pull_request = pull_request_model.create(
674 if not title:
675 title_source_ref = source_ref.split(':', 2)[1]
676 title = PullRequestModel().generate_pullrequest_title(
677 source=source_repo,
678 source_ref=title_source_ref,
679 target=target_repo
680 )
681 description = Optional.extract(description)
682
683 pull_request = PullRequestModel().create(
670 created_by=apiuser.user_id,
684 created_by=apiuser.user_id,
671 source_repo=source_repo,
685 source_repo=source_repo,
672 source_ref=full_source_ref,
686 source_ref=full_source_ref,
673 target_repo=target_repo,
687 target_repo=target_repo,
674 target_ref=full_target_ref,
688 target_ref=full_target_ref,
675 revisions=reversed(
689 revisions=[commit.raw_id for commit in reversed(commit_ranges)],
676 [commit.raw_id for commit in reversed(commit_ranges)]),
677 reviewers=reviewers,
690 reviewers=reviewers,
678 title=title,
691 title=title,
679 description=Optional.extract(description)
692 description=description,
693 reviewer_data=reviewer_rules,
680 )
694 )
681
695
682 Session().commit()
696 Session().commit()
683 data = {
697 data = {
684 'msg': 'Created new pull request `{}`'.format(title),
698 'msg': 'Created new pull request `{}`'.format(title),
685 'pull_request_id': pull_request.pull_request_id,
699 'pull_request_id': pull_request.pull_request_id,
686 }
700 }
687 return data
701 return data
688
702
689
703
690 @jsonrpc_method()
704 @jsonrpc_method()
691 def update_pull_request(
705 def update_pull_request(
692 request, apiuser, pullrequestid, repoid=Optional(None),
706 request, apiuser, pullrequestid, repoid=Optional(None),
693 title=Optional(''), description=Optional(''), reviewers=Optional(None),
707 title=Optional(''), description=Optional(''), reviewers=Optional(None),
694 update_commits=Optional(None)):
708 update_commits=Optional(None)):
695 """
709 """
696 Updates a pull request.
710 Updates a pull request.
697
711
698 :param apiuser: This is filled automatically from the |authtoken|.
712 :param apiuser: This is filled automatically from the |authtoken|.
699 :type apiuser: AuthUser
713 :type apiuser: AuthUser
700 :param repoid: Optional repository name or repository ID.
714 :param repoid: Optional repository name or repository ID.
701 :type repoid: str or int
715 :type repoid: str or int
702 :param pullrequestid: The pull request ID.
716 :param pullrequestid: The pull request ID.
703 :type pullrequestid: int
717 :type pullrequestid: int
704 :param title: Set the pull request title.
718 :param title: Set the pull request title.
705 :type title: str
719 :type title: str
706 :param description: Update pull request description.
720 :param description: Update pull request description.
707 :type description: Optional(str)
721 :type description: Optional(str)
708 :param reviewers: Update pull request reviewers list with new value.
722 :param reviewers: Update pull request reviewers list with new value.
709 :type reviewers: Optional(list)
723 :type reviewers: Optional(list)
710 Accepts username strings or objects of the format:
724 Accepts username strings or objects of the format:
711
725
712 [{'username': 'nick', 'reasons': ['original author'], 'mandatory': <bool>}]
726 [{'username': 'nick', 'reasons': ['original author'], 'mandatory': <bool>}]
713
727
714 :param update_commits: Trigger update of commits for this pull request
728 :param update_commits: Trigger update of commits for this pull request
715 :type: update_commits: Optional(bool)
729 :type: update_commits: Optional(bool)
716
730
717 Example output:
731 Example output:
718
732
719 .. code-block:: bash
733 .. code-block:: bash
720
734
721 id : <id_given_in_input>
735 id : <id_given_in_input>
722 result : {
736 result : {
723 "msg": "Updated pull request `63`",
737 "msg": "Updated pull request `63`",
724 "pull_request": <pull_request_object>,
738 "pull_request": <pull_request_object>,
725 "updated_reviewers": {
739 "updated_reviewers": {
726 "added": [
740 "added": [
727 "username"
741 "username"
728 ],
742 ],
729 "removed": []
743 "removed": []
730 },
744 },
731 "updated_commits": {
745 "updated_commits": {
732 "added": [
746 "added": [
733 "<sha1_hash>"
747 "<sha1_hash>"
734 ],
748 ],
735 "common": [
749 "common": [
736 "<sha1_hash>",
750 "<sha1_hash>",
737 "<sha1_hash>",
751 "<sha1_hash>",
738 ],
752 ],
739 "removed": []
753 "removed": []
740 }
754 }
741 }
755 }
742 error : null
756 error : null
743 """
757 """
744
758
745 pull_request = get_pull_request_or_error(pullrequestid)
759 pull_request = get_pull_request_or_error(pullrequestid)
746 if Optional.extract(repoid):
760 if Optional.extract(repoid):
747 repo = get_repo_or_error(repoid)
761 repo = get_repo_or_error(repoid)
748 else:
762 else:
749 repo = pull_request.target_repo
763 repo = pull_request.target_repo
750
764
751 if not PullRequestModel().check_user_update(
765 if not PullRequestModel().check_user_update(
752 pull_request, apiuser, api=True):
766 pull_request, apiuser, api=True):
753 raise JSONRPCError(
767 raise JSONRPCError(
754 'pull request `%s` update failed, no permission to update.' % (
768 'pull request `%s` update failed, no permission to update.' % (
755 pullrequestid,))
769 pullrequestid,))
756 if pull_request.is_closed():
770 if pull_request.is_closed():
757 raise JSONRPCError(
771 raise JSONRPCError(
758 'pull request `%s` update failed, pull request is closed' % (
772 'pull request `%s` update failed, pull request is closed' % (
759 pullrequestid,))
773 pullrequestid,))
760
774
761 reviewer_objects = Optional.extract(reviewers) or []
775 reviewer_objects = Optional.extract(reviewers) or []
762
776
763 if reviewer_objects:
777 if reviewer_objects:
764 schema = ReviewerListSchema()
778 schema = ReviewerListSchema()
765 try:
779 try:
766 reviewer_objects = schema.deserialize(reviewer_objects)
780 reviewer_objects = schema.deserialize(reviewer_objects)
767 except Invalid as err:
781 except Invalid as err:
768 raise JSONRPCValidationError(colander_exc=err)
782 raise JSONRPCValidationError(colander_exc=err)
769
783
770 # validate users
784 # validate users
771 for reviewer_object in reviewer_objects:
785 for reviewer_object in reviewer_objects:
772 user = get_user_or_error(reviewer_object['username'])
786 user = get_user_or_error(reviewer_object['username'])
773 reviewer_object['user_id'] = user.user_id
787 reviewer_object['user_id'] = user.user_id
774
788
775 get_default_reviewers_data, get_validated_reviewers = \
789 get_default_reviewers_data, get_validated_reviewers = \
776 PullRequestModel().get_reviewer_functions()
790 PullRequestModel().get_reviewer_functions()
777
791
778 # re-use stored rules
792 # re-use stored rules
779 reviewer_rules = pull_request.reviewer_data
793 reviewer_rules = pull_request.reviewer_data
780 try:
794 try:
781 reviewers = get_validated_reviewers(
795 reviewers = get_validated_reviewers(
782 reviewer_objects, reviewer_rules)
796 reviewer_objects, reviewer_rules)
783 except ValueError as e:
797 except ValueError as e:
784 raise JSONRPCError('Reviewers Validation: {}'.format(e))
798 raise JSONRPCError('Reviewers Validation: {}'.format(e))
785 else:
799 else:
786 reviewers = []
800 reviewers = []
787
801
788 title = Optional.extract(title)
802 title = Optional.extract(title)
789 description = Optional.extract(description)
803 description = Optional.extract(description)
790 if title or description:
804 if title or description:
791 PullRequestModel().edit(
805 PullRequestModel().edit(
792 pull_request, title or pull_request.title,
806 pull_request, title or pull_request.title,
793 description or pull_request.description, apiuser)
807 description or pull_request.description, apiuser)
794 Session().commit()
808 Session().commit()
795
809
796 commit_changes = {"added": [], "common": [], "removed": []}
810 commit_changes = {"added": [], "common": [], "removed": []}
797 if str2bool(Optional.extract(update_commits)):
811 if str2bool(Optional.extract(update_commits)):
798 if PullRequestModel().has_valid_update_type(pull_request):
812 if PullRequestModel().has_valid_update_type(pull_request):
799 update_response = PullRequestModel().update_commits(
813 update_response = PullRequestModel().update_commits(
800 pull_request)
814 pull_request)
801 commit_changes = update_response.changes or commit_changes
815 commit_changes = update_response.changes or commit_changes
802 Session().commit()
816 Session().commit()
803
817
804 reviewers_changes = {"added": [], "removed": []}
818 reviewers_changes = {"added": [], "removed": []}
805 if reviewers:
819 if reviewers:
806 added_reviewers, removed_reviewers = \
820 added_reviewers, removed_reviewers = \
807 PullRequestModel().update_reviewers(pull_request, reviewers, apiuser)
821 PullRequestModel().update_reviewers(pull_request, reviewers, apiuser)
808
822
809 reviewers_changes['added'] = sorted(
823 reviewers_changes['added'] = sorted(
810 [get_user_or_error(n).username for n in added_reviewers])
824 [get_user_or_error(n).username for n in added_reviewers])
811 reviewers_changes['removed'] = sorted(
825 reviewers_changes['removed'] = sorted(
812 [get_user_or_error(n).username for n in removed_reviewers])
826 [get_user_or_error(n).username for n in removed_reviewers])
813 Session().commit()
827 Session().commit()
814
828
815 data = {
829 data = {
816 'msg': 'Updated pull request `{}`'.format(
830 'msg': 'Updated pull request `{}`'.format(
817 pull_request.pull_request_id),
831 pull_request.pull_request_id),
818 'pull_request': pull_request.get_api_data(),
832 'pull_request': pull_request.get_api_data(),
819 'updated_commits': commit_changes,
833 'updated_commits': commit_changes,
820 'updated_reviewers': reviewers_changes
834 'updated_reviewers': reviewers_changes
821 }
835 }
822
836
823 return data
837 return data
824
838
825
839
826 @jsonrpc_method()
840 @jsonrpc_method()
827 def close_pull_request(
841 def close_pull_request(
828 request, apiuser, pullrequestid, repoid=Optional(None),
842 request, apiuser, pullrequestid, repoid=Optional(None),
829 userid=Optional(OAttr('apiuser')), message=Optional('')):
843 userid=Optional(OAttr('apiuser')), message=Optional('')):
830 """
844 """
831 Close the pull request specified by `pullrequestid`.
845 Close the pull request specified by `pullrequestid`.
832
846
833 :param apiuser: This is filled automatically from the |authtoken|.
847 :param apiuser: This is filled automatically from the |authtoken|.
834 :type apiuser: AuthUser
848 :type apiuser: AuthUser
835 :param repoid: Repository name or repository ID to which the pull
849 :param repoid: Repository name or repository ID to which the pull
836 request belongs.
850 request belongs.
837 :type repoid: str or int
851 :type repoid: str or int
838 :param pullrequestid: ID of the pull request to be closed.
852 :param pullrequestid: ID of the pull request to be closed.
839 :type pullrequestid: int
853 :type pullrequestid: int
840 :param userid: Close the pull request as this user.
854 :param userid: Close the pull request as this user.
841 :type userid: Optional(str or int)
855 :type userid: Optional(str or int)
842 :param message: Optional message to close the Pull Request with. If not
856 :param message: Optional message to close the Pull Request with. If not
843 specified it will be generated automatically.
857 specified it will be generated automatically.
844 :type message: Optional(str)
858 :type message: Optional(str)
845
859
846 Example output:
860 Example output:
847
861
848 .. code-block:: bash
862 .. code-block:: bash
849
863
850 "id": <id_given_in_input>,
864 "id": <id_given_in_input>,
851 "result": {
865 "result": {
852 "pull_request_id": "<int>",
866 "pull_request_id": "<int>",
853 "close_status": "<str:status_lbl>,
867 "close_status": "<str:status_lbl>,
854 "closed": "<bool>"
868 "closed": "<bool>"
855 },
869 },
856 "error": null
870 "error": null
857
871
858 """
872 """
859 _ = request.translate
873 _ = request.translate
860
874
861 pull_request = get_pull_request_or_error(pullrequestid)
875 pull_request = get_pull_request_or_error(pullrequestid)
862 if Optional.extract(repoid):
876 if Optional.extract(repoid):
863 repo = get_repo_or_error(repoid)
877 repo = get_repo_or_error(repoid)
864 else:
878 else:
865 repo = pull_request.target_repo
879 repo = pull_request.target_repo
866
880
867 if not isinstance(userid, Optional):
881 if not isinstance(userid, Optional):
868 if (has_superadmin_permission(apiuser) or
882 if (has_superadmin_permission(apiuser) or
869 HasRepoPermissionAnyApi('repository.admin')(
883 HasRepoPermissionAnyApi('repository.admin')(
870 user=apiuser, repo_name=repo.repo_name)):
884 user=apiuser, repo_name=repo.repo_name)):
871 apiuser = get_user_or_error(userid)
885 apiuser = get_user_or_error(userid)
872 else:
886 else:
873 raise JSONRPCError('userid is not the same as your user')
887 raise JSONRPCError('userid is not the same as your user')
874
888
875 if pull_request.is_closed():
889 if pull_request.is_closed():
876 raise JSONRPCError(
890 raise JSONRPCError(
877 'pull request `%s` is already closed' % (pullrequestid,))
891 'pull request `%s` is already closed' % (pullrequestid,))
878
892
879 # only owner or admin or person with write permissions
893 # only owner or admin or person with write permissions
880 allowed_to_close = PullRequestModel().check_user_update(
894 allowed_to_close = PullRequestModel().check_user_update(
881 pull_request, apiuser, api=True)
895 pull_request, apiuser, api=True)
882
896
883 if not allowed_to_close:
897 if not allowed_to_close:
884 raise JSONRPCError(
898 raise JSONRPCError(
885 'pull request `%s` close failed, no permission to close.' % (
899 'pull request `%s` close failed, no permission to close.' % (
886 pullrequestid,))
900 pullrequestid,))
887
901
888 # message we're using to close the PR, else it's automatically generated
902 # message we're using to close the PR, else it's automatically generated
889 message = Optional.extract(message)
903 message = Optional.extract(message)
890
904
891 # finally close the PR, with proper message comment
905 # finally close the PR, with proper message comment
892 comment, status = PullRequestModel().close_pull_request_with_comment(
906 comment, status = PullRequestModel().close_pull_request_with_comment(
893 pull_request, apiuser, repo, message=message)
907 pull_request, apiuser, repo, message=message)
894 status_lbl = ChangesetStatus.get_status_lbl(status)
908 status_lbl = ChangesetStatus.get_status_lbl(status)
895
909
896 Session().commit()
910 Session().commit()
897
911
898 data = {
912 data = {
899 'pull_request_id': pull_request.pull_request_id,
913 'pull_request_id': pull_request.pull_request_id,
900 'close_status': status_lbl,
914 'close_status': status_lbl,
901 'closed': True,
915 'closed': True,
902 }
916 }
903 return data
917 return data
General Comments 0
You need to be logged in to leave comments. Login now