Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Support cherry-pick dry runs, and add revert support #579

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
NARKOZ merged 2 commits into from
Aug 4, 2020
Merged

Support cherry-pick dry runs, and add revert support #579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
936ba89
Support additional parameters to Commits#cherry_pick
rspeicher Aug 3, 2020
5549113
Support the Commit revert API
rspeicher Aug 3, 2020
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
25 changes: 23 additions & 2 deletions lib/gitlab/client/commits.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,30 @@ def commit_refs(project, sha, options = {})
# @param [Integer, String] project The ID or name of a project.
# @param [String] sha The commit hash or name of a repository branch or tag
# @param [String] branch The name of the branch
# @param [Hash] options A customizable set of options.
# @option options [Boolean] :dry_run Don't commit any changes
# @return [Gitlab::ObjectifiedHash]
def cherry_pick_commit(project, sha, branch)
post("/projects/#{url_encode project}/repository/commits/#{sha}/cherry_pick", body: { branch: branch })
def cherry_pick_commit(project, sha, branch, options = {})
options[:branch] = branch

post("/projects/#{url_encode project}/repository/commits/#{sha}/cherry_pick", body: options)
end

# Reverts a commit in a given branch.
#
# @example
# Gitlab.revert_commit(42, '6104942438c14ec7bd21c6cd5bd995272b3faff6', 'master')
#
# @param [Integer, String] project The ID or name of a project.
# @param [String] sha The commit hash or name of a repository branch or tag
# @param [String] branch The name of the branch
# @param [Hash] options A customizable set of options.
# @option options [Boolean] :dry_run Don't commit any changes
# @return [Gitlab::ObjectifiedHash]
def revert_commit(project, sha, branch, options = {})
options[:branch] = branch

post("/projects/#{url_encode project}/repository/commits/#{sha}/revert", body: options)
end

# Get the diff of a commit in a project.
Expand Down
1 change: 1 addition & 0 deletions spec/fixtures/revert_commit_failure.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"message":"Sorry, we cannot revert this commit automatically. This commit may already have been reverted, or a more recent commit may have updated some of its content.","error_code":"empty"}
56 changes: 56 additions & 0 deletions spec/gitlab/client/commits_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,62 @@
end
end
end

context 'with additional options' do
it 'passes additional options' do
stub_post('/projects/3/repository/commits/6104942438c14ec7bd21c6cd5bd995272b3faff6/cherry_pick', 'project_commit')
.with(body: { branch: 'master', dry_run: true })

Gitlab.cherry_pick_commit(3, '6104942438c14ec7bd21c6cd5bd995272b3faff6', 'master', dry_run: true)

expect(a_post('/projects/3/repository/commits/6104942438c14ec7bd21c6cd5bd995272b3faff6/cherry_pick')
.with(body: { branch: 'master', dry_run: true }))
.to have_been_made
end
end
end

describe '.revert_commit' do
context 'on success' do
before do
stub_post('/projects/3/repository/commits/6104942438c14ec7bd21c6cd5bd995272b3faff6/revert', 'project_commit').with(body: { branch: 'master' })
@revert_commit = Gitlab.revert_commit(3, '6104942438c14ec7bd21c6cd5bd995272b3faff6', 'master')
end

it 'gets the correct resource' do
expect(a_post('/projects/3/repository/commits/6104942438c14ec7bd21c6cd5bd995272b3faff6/revert')
.with(body: { branch: 'master' }))
.to have_been_made
end

it 'returns the correct response' do
expect(@revert_commit).to be_a Gitlab::ObjectifiedHash
expect(@revert_commit.id).to eq('6104942438c14ec7bd21c6cd5bd995272b3faff6')
end
end

context 'on failure' do
it 'includes the error_code' do
stub_post('/projects/3/repository/commits/6104942438c14ec7bd21c6cd5bd995272b3faff6/revert', 'revert_commit_failure', 400)

expect { Gitlab.revert_commit(3, '6104942438c14ec7bd21c6cd5bd995272b3faff6', 'master') }.to raise_error(Gitlab::Error::BadRequest) do |ex|
expect(ex.error_code).to eq('empty')
end
end
end

context 'with additional options' do
it 'passes additional options' do
stub_post('/projects/3/repository/commits/6104942438c14ec7bd21c6cd5bd995272b3faff6/revert', 'project_commit')
.with(body: { branch: 'master', dry_run: true })

Gitlab.revert_commit(3, '6104942438c14ec7bd21c6cd5bd995272b3faff6', 'master', dry_run: true)

expect(a_post('/projects/3/repository/commits/6104942438c14ec7bd21c6cd5bd995272b3faff6/revert')
.with(body: { branch: 'master', dry_run: true }))
.to have_been_made
end
end
end

describe '.commit_diff' do
Expand Down