summaryrefslogtreecommitdiff
path: root/gitlab/objects.py
diff options
context:
space:
mode:
authorGauvain Pocentek <gauvain@pocentek.net>2016-08-07 09:46:12 +0200
committerGauvain Pocentek <gauvain@pocentek.net>2016-08-07 09:46:12 +0200
commit92edb9922b178783f9307c84147352ae31f32d0b (patch)
tree31ea8a0a186bbcb1356576a86f9657c251b81b37 /gitlab/objects.py
parent4540614a38067944c628505225bb15928d8e3c93 (diff)
downloadgitlab-92edb9922b178783f9307c84147352ae31f32d0b.tar.gz
MR: get list of changes and commits
Diffstat (limited to 'gitlab/objects.py')
-rw-r--r--gitlab/objects.py30
1 files changed, 30 insertions, 0 deletions
diff --git a/gitlab/objects.py b/gitlab/objects.py
index 04f9e47..5b607e0 100644
--- a/gitlab/objects.py
+++ b/gitlab/objects.py
@@ -1415,6 +1415,36 @@ class ProjectMergeRequest(GitlabObject):
(self.project_id, self.id))
return self.gitlab._raw_list(url, ProjectIssue, **kwargs)
+ def commits(self, **kwargs):
+ """List the merge request commits.
+
+ Returns:
+ list (ProjectCommit): List of commits
+
+ Raises:
+ GitlabConnectionError: If the server cannot be reached.
+ GitlabListError: If the server fails to perform the request.
+ """
+ url = ('/projects/%s/merge_requests/%s/commits' %
+ (self.project_id, self.id))
+ return self.gitlab._raw_list(url, ProjectCommit, **kwargs)
+
+ def changes(self, **kwargs):
+ """List the merge request changes.
+
+ Returns:
+ list (dict): List of changes
+
+ Raises:
+ GitlabConnectionError: If the server cannot be reached.
+ GitlabListError: If the server fails to perform the request.
+ """
+ url = ('/projects/%s/merge_requests/%s/commits' %
+ (self.project_id, self.id))
+ r = self.gitlab._raw_get(url, **kwargs)
+ raise_error_from_response(r, GitlabListError)
+ return r.json()
+
def merge(self, merge_commit_message=None,
should_remove_source_branch=False,
merged_when_build_succeeds=False,