Skip to content

Commit b866ae7

Browse files
jorgegomzarJorge Gómez Zarzosa
andauthored
Bitbucket: fix merge_pull_request. POSTparams --> data (#1438)
* Bitbucket: update merge_pull_request method to add merge_message, close_source_branch and merge_strategy parameters * fix(bitbucket): merge_pull_request params should be data * fix(bitbucket): support Bitbucket server request --------- Co-authored-by: Jorge Gómez Zarzosa <[email protected]>
1 parent b76bcea commit b866ae7

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

atlassian/bitbucket/__init__.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2211,10 +2211,10 @@ def merge_pull_request(
22112211
project_key: str,
22122212
repository_slug: str,
22132213
pr_id: int,
2214-
pr_version: Optional[int],
22152214
merge_message: str,
22162215
close_source_branch: bool = False,
22172216
merge_strategy: Union[str, MergeStrategy] = MergeStrategy.MERGE_COMMIT,
2217+
pr_version: Optional[int] = None,
22182218
):
22192219
"""
22202220
Merge pull request
@@ -2224,21 +2224,23 @@ def merge_pull_request(
22242224
:param project_key: PROJECT
22252225
:param repository_slug: my_shiny_repo
22262226
:param pr_id: 2341
2227-
:param pr_version:
22282227
:param merge_message: "feat: add new file handler"
2228+
:param pr_version:
22292229
:param close_source_branch: True
22302230
:param merge_strategy: "squash"
22312231
:return:
22322232
"""
22332233
url = "{}/merge".format(self._url_pull_request(project_key, repository_slug, pr_id))
2234-
params = {
2234+
params = {}
2235+
data = {
2236+
"type": "pullrequest",
22352237
"message": merge_message,
22362238
"close_source_branch": close_source_branch,
22372239
"merge_strategy": MergeStrategy(merge_strategy).value,
22382240
}
22392241
if not self.cloud:
22402242
params["version"] = pr_version
2241-
return self.post(url, params=params)
2243+
return self.post(url, data=data, params=params)
22422244

22432245
def reopen_pull_request(self, project_key, repository_slug, pr_id, pr_version):
22442246
"""

0 commit comments

Comments
 (0)