Skip to content

fix(merge_requests): collect payload arguments from custom action for merge() #1985

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

fix(merge_requests): collect payload arguments from custom action for merge() #1985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2a4493c
chore(cli): expose custom arguments in current function
nejch Apr 26, 2022
c4bfbb4
refactor(merge_requests): collect payload arguments from custom action
nejch Apr 26, 2022
08f23c3
fix(merge_requests): add missing parameters for merge()
nejch Apr 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions gitlab/cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ def wrapped_f(*args: Any, **kwargs: Any) -> Any:
action = custom_action or f.__name__.replace("_", "-")
custom_actions[final_name][action] = (mandatory, optional, in_obj)

wrapped_f._custom_args = mandatory + optional
return cast(__F, wrapped_f)

return wrap
Expand Down
30 changes: 13 additions & 17 deletions gitlab/v4/objects/merge_requests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,18 +350,15 @@ def merge_ref(self, **kwargs: Any) -> Union[Dict[str, Any], requests.Response]:
(),
(
"merge_commit_message",
"should_remove_source_branch",
"merge_when_pipeline_succeeds",
"sha",
"should_remove_source_branch",
"squash_commit_message",
"squash",
),
)
@exc.on_http_error(exc.GitlabMRClosedError)
def merge(
self,
merge_commit_message: Optional[str] = None,
should_remove_source_branch: Optional[bool] = None,
merge_when_pipeline_succeeds: Optional[bool] = None,
**kwargs: Any,
) -> Dict[str, Any]:
def merge(self, **kwargs: Any) -> Dict[str, Any]:
"""Accept the merge request.

Args:
Expand All @@ -377,15 +374,14 @@ def merge(
GitlabMRClosedError: If the merge failed
"""
path = f"{self.manager.path}/{self.encoded_id}/merge"
data: Dict[str, Any] = {}
if merge_commit_message:
data["merge_commit_message"] = merge_commit_message
if should_remove_source_branch is not None:
data["should_remove_source_branch"] = should_remove_source_branch
if merge_when_pipeline_succeeds is not None:
data["merge_when_pipeline_succeeds"] = merge_when_pipeline_succeeds

server_data = self.manager.gitlab.http_put(path, post_data=data, **kwargs)
post_data: Dict[str, Any] = {}
data = kwargs.copy()

for key in kwargs.keys():
if key in self.merge._custom_args:
post_data[key] = data.pop(key)

server_data = self.manager.gitlab.http_put(path, post_data=post_data, **data)
if TYPE_CHECKING:
assert isinstance(server_data, dict)
self._update_attrs(server_data)
Expand Down