Skip to content

Commit

Permalink
MR: add support for cancel_merge_when_build_succeeds
Browse files Browse the repository at this point in the history
  • Loading branch information
Gauvain Pocentek committed Mar 22, 2016
1 parent ccbea3f commit f6a51d6
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 0 deletions.
8 changes: 8 additions & 0 deletions gitlab/cli.py
Expand Up @@ -42,6 +42,7 @@
'filepath']},
'builds': {'required': ['id', 'project-id']}},
gitlab.ProjectMergeRequest: {
'cancel': {'required': ['id', 'project-id']},
'merge': {'required': ['id', 'project-id'],
'optional': ['merge-commit-message',
'should-remove-source-branch',
Expand Down Expand Up @@ -223,6 +224,13 @@ def do_project_build_retry(self, cls, gl, what, args):
except Exception as e:
_die("Impossible to retry project build (%s)" % str(e))

def do_project_merge_request_cancel(self, cls, gl, what, args):
try:
o = self.do_get(cls, gl, what, args)
return o.cancel_merge_when_build_succeeds()
except Exception as e:
_die("Impossible to cancel merge request (%s)" % str(e))

def do_project_merge_request_merge(self, cls, gl, what, args):
try:
o = self.do_get(cls, gl, what, args)
Expand Down
12 changes: 12 additions & 0 deletions gitlab/objects.py
Expand Up @@ -1085,6 +1085,18 @@ def Note(self, id=None, **kwargs):
self.gitlab, id, project_id=self.project_id,
merge_request_id=self.id, **kwargs)

def cancel_merge_when_build_succeeds(self, **kwargs):
"""Cancel merge when build succeeds."""

u = ('/projects/%s/merge_requests/%s/cancel_merge_when_build_succeeds'
% (self.project_id, self.id))
r = self.gitlab._raw_put(u, **kwargs)
errors = {401: GitlabMRForbiddenError,
405: GitlabMRClosedError,
406: GitlabMROnBuildSuccessError}
raise_error_from_response(r, errors)
return ProjectMergeRequest(self, r.json())

def merge(self, merge_commit_message=None,
should_remove_source_branch=False,
merged_when_build_succeeds=False,
Expand Down

0 comments on commit f6a51d6

Please sign in to comment.