1
- from typing import Any , cast , Dict , Optional , TYPE_CHECKING , Union
1
+ from typing import Any , cast , Dict , List , Optional , TYPE_CHECKING , Union
2
2
3
3
import requests
4
4
5
+ import gitlab
5
6
from gitlab import cli
6
7
from gitlab import exceptions as exc
7
8
from gitlab .base import RequiredOptional , RESTManager , RESTObject
@@ -28,7 +29,7 @@ class ProjectCommit(RESTObject):
28
29
29
30
@cli .register_custom_action ("ProjectCommit" )
30
31
@exc .on_http_error (exc .GitlabGetError )
31
- def diff (self , ** kwargs : Any ) -> Union [Dict [str , Any ], requests . Response ]:
32
+ def diff (self , ** kwargs : Any ) -> Union [gitlab . GitlabList , List [ Dict [str , Any ]] ]:
32
33
"""Generate the commit diff.
33
34
34
35
Args:
@@ -42,7 +43,7 @@ def diff(self, **kwargs: Any) -> Union[Dict[str, Any], requests.Response]:
42
43
The changes done in this commit
43
44
"""
44
45
path = f"{ self .manager .path } /{ self .get_id ()} /diff"
45
- return self .manager .gitlab .http_get (path , ** kwargs )
46
+ return self .manager .gitlab .http_list (path , ** kwargs )
46
47
47
48
@cli .register_custom_action ("ProjectCommit" , ("branch" ,))
48
49
@exc .on_http_error (exc .GitlabCherryPickError )
@@ -65,7 +66,7 @@ def cherry_pick(self, branch: str, **kwargs: Any) -> None:
65
66
@exc .on_http_error (exc .GitlabGetError )
66
67
def refs (
67
68
self , type : str = "all" , ** kwargs : Any
68
- ) -> Union [Dict [str , Any ], requests . Response ]:
69
+ ) -> Union [gitlab . GitlabList , List [ Dict [str , Any ]] ]:
69
70
"""List the references the commit is pushed to.
70
71
71
72
Args:
@@ -80,12 +81,14 @@ def refs(
80
81
The references the commit is pushed to.
81
82
"""
82
83
path = f"{ self .manager .path } /{ self .get_id ()} /refs"
83
- data = {"type" : type }
84
- return self .manager .gitlab .http_get (path , query_data = data , ** kwargs )
84
+ query_data = {"type" : type }
85
+ return self .manager .gitlab .http_list (path , query_data = query_data , ** kwargs )
85
86
86
87
@cli .register_custom_action ("ProjectCommit" )
87
88
@exc .on_http_error (exc .GitlabGetError )
88
- def merge_requests (self , ** kwargs : Any ) -> Union [Dict [str , Any ], requests .Response ]:
89
+ def merge_requests (
90
+ self , ** kwargs : Any
91
+ ) -> Union [gitlab .GitlabList , List [Dict [str , Any ]]]:
89
92
"""List the merge requests related to the commit.
90
93
91
94
Args:
@@ -99,7 +102,7 @@ def merge_requests(self, **kwargs: Any) -> Union[Dict[str, Any], requests.Respon
99
102
The merge requests related to the commit.
100
103
"""
101
104
path = f"{ self .manager .path } /{ self .get_id ()} /merge_requests"
102
- return self .manager .gitlab .http_get (path , ** kwargs )
105
+ return self .manager .gitlab .http_list (path , ** kwargs )
103
106
104
107
@cli .register_custom_action ("ProjectCommit" , ("branch" ,))
105
108
@exc .on_http_error (exc .GitlabRevertError )
0 commit comments