Skip to content

Commit c01bcb2

Browse files
alexander-gluhovAlexander Gluhov
andauthored
[Bitbucket] Fixing work with Bitbucket Server and one new method (#637)
* fixing cloud checks * Adding method for deleting PR comment Co-authored-by: Alexander Gluhov <[email protected]>
1 parent 9f391a1 commit c01bcb2

File tree

1 file changed

+26
-6
lines changed

1 file changed

+26
-6
lines changed

atlassian/bitbucket/__init__.py

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -844,7 +844,7 @@ def repo_remove_group_permissions(self, project_key, repo_key, groupname, permis
844844
return self.delete(url, params=params)
845845

846846
def _url_repo_labels(self, project_key, repository_slug):
847-
if Cloud:
847+
if self.cloud:
848848
raise Exception("Not supported in Bitbucket Cloud")
849849

850850
return "{}/labels".format(self._url_repo(project_key, repository_slug))
@@ -1098,7 +1098,7 @@ def set_pull_request_settings(self, project_key, repository_slug, data):
10981098
return self.post(url, data=data)
10991099

11001100
def _url_pull_requests(self, project_key, repository_slug):
1101-
if Cloud:
1101+
if self.cloud:
11021102
return self.resource_url("repositories/{}/{}/pullrequests".format(project_key, repository_slug))
11031103
else:
11041104
return "{}/pull-requests".format(self._url_repo(project_key, repository_slug))
@@ -1402,6 +1402,26 @@ def update_pull_request_comment(
14021402
data = {"version": comment_version, "text": comment}
14031403
return self.put(url, data=data)
14041404

1405+
def delete_pull_reques_comment(
1406+
self,
1407+
project_key,
1408+
repository_slug,
1409+
pull_request_id,
1410+
comment_id,
1411+
comment_version,
1412+
):
1413+
"""
1414+
Delete a comment.
1415+
Only the repository admin or eser who created a comment may update it.
1416+
1417+
Note: the supplied supplied JSON object must contain a version
1418+
that must match the server's version of the comment
1419+
or the delete will fail.
1420+
"""
1421+
url = self._url_pull_request_comment(project_key, repository_slug, pull_request_id, comment_id)
1422+
data = {"version": comment_version}
1423+
return self.delete(url, params=data)
1424+
14051425
def decline_pull_request(self, project_key, repository_slug, pr_id, pr_version):
14061426
"""
14071427
Decline a pull request.
@@ -1416,7 +1436,7 @@ def decline_pull_request(self, project_key, repository_slug, pr_id, pr_version):
14161436
"""
14171437
url = self._url_pull_request(project_key, repository_slug, pr_id)
14181438
params = {}
1419-
if not Cloud:
1439+
if not self.cloud:
14201440
params["version"] = pr_version
14211441
return self.post(url, params=params)
14221442

@@ -1428,13 +1448,13 @@ def get_tasks(self, project_key, repository_slug, pull_request_id):
14281448
:param pull_request_id: the ID of the pull request within the repository
14291449
:return:
14301450
"""
1431-
if Cloud:
1451+
if self.cloud:
14321452
raise Exception("Not supported in Bitbucket Cloud")
14331453
url = "{}/tasks".format(self._url_pull_request(project_key, repository_slug, pull_request_id))
14341454
return self.get(url)
14351455

14361456
def _url_tasks(self):
1437-
if Cloud:
1457+
if self.cloud:
14381458
raise Exception("Not supported in Bitbucket Cloud")
14391459
return self.resource_url("tasks")
14401460

@@ -1517,7 +1537,7 @@ def merge_pull_request(self, project_key, repository_slug, pr_id, pr_version):
15171537
"""
15181538
url = "{}/merge".format(self._url_pull_request(project_key, repository_slug, pr_id))
15191539
params = {}
1520-
if not Cloud:
1540+
if not self.cloud:
15211541
params["version"] = pr_version
15221542
return self.post(url, params=params)
15231543

0 commit comments

Comments
 (0)