Skip to content

Resolve #822, add mr rebase #823

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

Merged
max-wittig merged 1 commit into from
Jul 21, 2019
Merged

Resolve #822, add mr rebase #823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions docs/gl_objects/mrs.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,3 +181,7 @@ Reset spent time for a merge request::
Get user agent detail for the issue (admin only)::

detail = issue.user_agent_detail()

Attempt to rebase an MR::

mr.rebase()
4 changes: 4 additions & 0 deletions gitlab/exceptions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,10 @@ class GitlabMRApprovalError(GitlabOperationError):
pass


class GitlabMRRebaseError(GitlabOperationError):
pass


class GitlabMRClosedError(GitlabOperationError):
pass

Expand Down
16 changes: 16 additions & 0 deletions gitlab/v4/objects.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2712,6 +2712,22 @@ def unapprove(self, **kwargs):
server_data = self.manager.gitlab.http_post(path, post_data=data, **kwargs)
self._update_attrs(server_data)

@cli.register_custom_action("ProjectMergeRequest")
@exc.on_http_error(exc.GitlabMRRebaseError)
def rebase(self, **kwargs):
"""Attempt to rebase the source branch onto the target branch

Args:
**kwargs: Extra options to send to the server (e.g. sudo)

Raises:
GitlabAuthenticationError: If authentication is not correct
GitlabMRRebaseError: If rebasing failed
"""
path = "%s/%s/rebase" % (self.manager.path, self.get_id())
data = {}
return self.manager.gitlab.http_put(path, post_data=data, **kwargs)

@cli.register_custom_action(
"ProjectMergeRequest",
tuple(),
Expand Down
3 changes: 3 additions & 0 deletions tools/python_test_v4.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -686,6 +686,9 @@
event = mr.resourcelabelevents.get(events[0].id)
assert event

# rebasing
assert mr.rebase()

# basic testing: only make sure that the methods exist
mr.commits()
mr.changes()
Expand Down