2014-09-02 18:07:02 +05:30
|
|
|
require 'mime/types'
|
|
|
|
|
|
|
|
module API
|
|
|
|
class Commits < Grape::API
|
2017-08-17 22:00:37 +05:30
|
|
|
include PaginationParams
|
|
|
|
|
2014-09-02 18:07:02 +05:30
|
|
|
before { authorize! :download_code, user_project }
|
|
|
|
|
2016-11-03 12:29:30 +05:30
|
|
|
params do
|
|
|
|
requires :id, type: String, desc: 'The ID of a project'
|
|
|
|
end
|
2017-09-10 17:25:29 +05:30
|
|
|
resource :projects, requirements: API::PROJECT_ENDPOINT_REQUIREMENTS do
|
2016-11-03 12:29:30 +05:30
|
|
|
desc 'Get a project repository commits' do
|
2018-03-17 18:26:18 +05:30
|
|
|
success Entities::Commit
|
2016-11-03 12:29:30 +05:30
|
|
|
end
|
|
|
|
params do
|
|
|
|
optional :ref_name, type: String, desc: 'The name of a repository branch or tag, if not given the default branch is used'
|
2017-08-17 22:00:37 +05:30
|
|
|
optional :since, type: DateTime, desc: 'Only commits after or on this date will be returned'
|
|
|
|
optional :until, type: DateTime, desc: 'Only commits before or on this date will be returned'
|
|
|
|
optional :path, type: String, desc: 'The file path'
|
2018-03-27 19:54:05 +05:30
|
|
|
optional :all, type: Boolean, desc: 'Every commit will be returned'
|
2017-08-17 22:00:37 +05:30
|
|
|
use :pagination
|
2016-11-03 12:29:30 +05:30
|
|
|
end
|
2017-09-10 17:25:29 +05:30
|
|
|
get ':id/repository/commits' do
|
2017-08-17 22:00:37 +05:30
|
|
|
path = params[:path]
|
|
|
|
before = params[:until]
|
|
|
|
after = params[:since]
|
2018-03-27 19:54:05 +05:30
|
|
|
ref = params[:ref_name] || user_project.try(:default_branch) || 'master' unless params[:all]
|
2017-08-17 22:00:37 +05:30
|
|
|
offset = (params[:page] - 1) * params[:per_page]
|
2018-03-27 19:54:05 +05:30
|
|
|
all = params[:all]
|
2016-11-03 12:29:30 +05:30
|
|
|
|
|
|
|
commits = user_project.repository.commits(ref,
|
2017-08-17 22:00:37 +05:30
|
|
|
path: path,
|
2016-11-03 12:29:30 +05:30
|
|
|
limit: params[:per_page],
|
|
|
|
offset: offset,
|
2017-08-17 22:00:37 +05:30
|
|
|
before: before,
|
2018-03-27 19:54:05 +05:30
|
|
|
after: after,
|
|
|
|
all: all)
|
2017-08-17 22:00:37 +05:30
|
|
|
|
|
|
|
commit_count =
|
2018-03-27 19:54:05 +05:30
|
|
|
if all || path || before || after
|
|
|
|
user_project.repository.count_commits(ref: ref, path: path, before: before, after: after, all: all)
|
2017-08-17 22:00:37 +05:30
|
|
|
else
|
|
|
|
# Cacheable commit count.
|
|
|
|
user_project.repository.commit_count_for_ref(ref)
|
|
|
|
end
|
2014-09-02 18:07:02 +05:30
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
paginated_commits = Kaminari.paginate_array(commits, total_count: commit_count)
|
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
present paginate(paginated_commits), with: Entities::Commit
|
2014-09-02 18:07:02 +05:30
|
|
|
end
|
|
|
|
|
2016-11-03 12:29:30 +05:30
|
|
|
desc 'Commit multiple file changes as one commit' do
|
2018-03-17 18:26:18 +05:30
|
|
|
success Entities::CommitDetail
|
2016-11-03 12:29:30 +05:30
|
|
|
detail 'This feature was introduced in GitLab 8.13'
|
|
|
|
end
|
|
|
|
params do
|
2017-09-10 17:25:29 +05:30
|
|
|
requires :branch, type: String, desc: 'Name of the branch to commit into. To create a new branch, also provide `start_branch`.'
|
2016-11-03 12:29:30 +05:30
|
|
|
requires :commit_message, type: String, desc: 'Commit message'
|
2017-08-17 22:00:37 +05:30
|
|
|
requires :actions, type: Array[Hash], desc: 'Actions to perform in commit'
|
2017-09-10 17:25:29 +05:30
|
|
|
optional :start_branch, type: String, desc: 'Name of the branch to start the new commit from'
|
2016-11-03 12:29:30 +05:30
|
|
|
optional :author_email, type: String, desc: 'Author email for commit'
|
|
|
|
optional :author_name, type: String, desc: 'Author name for commit'
|
|
|
|
end
|
2017-09-10 17:25:29 +05:30
|
|
|
post ':id/repository/commits' do
|
2016-11-03 12:29:30 +05:30
|
|
|
authorize! :push_code, user_project
|
|
|
|
|
2017-09-10 17:25:29 +05:30
|
|
|
attrs = declared_params
|
|
|
|
attrs[:branch_name] = attrs.delete(:branch)
|
|
|
|
attrs[:start_branch] ||= attrs[:branch_name]
|
2016-11-03 12:29:30 +05:30
|
|
|
|
|
|
|
result = ::Files::MultiService.new(user_project, current_user, attrs).execute
|
|
|
|
|
|
|
|
if result[:status] == :success
|
2017-09-10 17:25:29 +05:30
|
|
|
commit_detail = user_project.repository.commit(result[:result])
|
2018-03-17 18:26:18 +05:30
|
|
|
present commit_detail, with: Entities::CommitDetail
|
2016-11-03 12:29:30 +05:30
|
|
|
else
|
|
|
|
render_api_error!(result[:message], 400)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
desc 'Get a specific commit of a project' do
|
2018-03-17 18:26:18 +05:30
|
|
|
success Entities::CommitDetail
|
2017-09-10 17:25:29 +05:30
|
|
|
failure [[404, 'Commit Not Found']]
|
2016-11-03 12:29:30 +05:30
|
|
|
end
|
|
|
|
params do
|
|
|
|
requires :sha, type: String, desc: 'A commit sha, or the name of a branch or tag'
|
2018-03-17 18:26:18 +05:30
|
|
|
optional :stats, type: Boolean, default: true, desc: 'Include commit stats'
|
2016-11-03 12:29:30 +05:30
|
|
|
end
|
2018-03-17 18:26:18 +05:30
|
|
|
get ':id/repository/commits/:sha', requirements: API::COMMIT_ENDPOINT_REQUIREMENTS do
|
2016-11-03 12:29:30 +05:30
|
|
|
commit = user_project.commit(params[:sha])
|
|
|
|
|
2017-09-10 17:25:29 +05:30
|
|
|
not_found! 'Commit' unless commit
|
2016-11-03 12:29:30 +05:30
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
present commit, with: Entities::CommitDetail, stats: params[:stats]
|
2014-09-02 18:07:02 +05:30
|
|
|
end
|
|
|
|
|
2016-11-03 12:29:30 +05:30
|
|
|
desc 'Get the diff for a specific commit of a project' do
|
2017-09-10 17:25:29 +05:30
|
|
|
failure [[404, 'Commit Not Found']]
|
2016-11-03 12:29:30 +05:30
|
|
|
end
|
|
|
|
params do
|
|
|
|
requires :sha, type: String, desc: 'A commit sha, or the name of a branch or tag'
|
2018-03-27 19:54:05 +05:30
|
|
|
use :pagination
|
2016-11-03 12:29:30 +05:30
|
|
|
end
|
2018-03-17 18:26:18 +05:30
|
|
|
get ':id/repository/commits/:sha/diff', requirements: API::COMMIT_ENDPOINT_REQUIREMENTS do
|
2016-11-03 12:29:30 +05:30
|
|
|
commit = user_project.commit(params[:sha])
|
|
|
|
|
2017-09-10 17:25:29 +05:30
|
|
|
not_found! 'Commit' unless commit
|
2016-11-03 12:29:30 +05:30
|
|
|
|
2018-03-27 19:54:05 +05:30
|
|
|
raw_diffs = ::Kaminari.paginate_array(commit.raw_diffs.to_a)
|
|
|
|
|
|
|
|
present paginate(raw_diffs), with: Entities::Diff
|
2014-09-02 18:07:02 +05:30
|
|
|
end
|
2015-04-26 12:48:37 +05:30
|
|
|
|
2016-11-03 12:29:30 +05:30
|
|
|
desc "Get a commit's comments" do
|
|
|
|
success Entities::CommitNote
|
2017-09-10 17:25:29 +05:30
|
|
|
failure [[404, 'Commit Not Found']]
|
2016-11-03 12:29:30 +05:30
|
|
|
end
|
|
|
|
params do
|
2017-08-17 22:00:37 +05:30
|
|
|
use :pagination
|
2016-11-03 12:29:30 +05:30
|
|
|
requires :sha, type: String, desc: 'A commit sha, or the name of a branch or tag'
|
|
|
|
end
|
2018-03-17 18:26:18 +05:30
|
|
|
get ':id/repository/commits/:sha/comments', requirements: API::COMMIT_ENDPOINT_REQUIREMENTS do
|
2016-11-03 12:29:30 +05:30
|
|
|
commit = user_project.commit(params[:sha])
|
|
|
|
|
2015-04-26 12:48:37 +05:30
|
|
|
not_found! 'Commit' unless commit
|
2018-03-17 18:26:18 +05:30
|
|
|
notes = commit.notes.order(:created_at)
|
2016-11-03 12:29:30 +05:30
|
|
|
|
2015-04-26 12:48:37 +05:30
|
|
|
present paginate(notes), with: Entities::CommitNote
|
|
|
|
end
|
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
desc 'Cherry pick commit into a branch' do
|
|
|
|
detail 'This feature was introduced in GitLab 8.15'
|
2018-03-17 18:26:18 +05:30
|
|
|
success Entities::Commit
|
2017-08-17 22:00:37 +05:30
|
|
|
end
|
|
|
|
params do
|
2017-09-10 17:25:29 +05:30
|
|
|
requires :sha, type: String, desc: 'A commit sha, or the name of a branch or tag to be cherry picked'
|
2017-08-17 22:00:37 +05:30
|
|
|
requires :branch, type: String, desc: 'The name of the branch'
|
|
|
|
end
|
2018-03-17 18:26:18 +05:30
|
|
|
post ':id/repository/commits/:sha/cherry_pick', requirements: API::COMMIT_ENDPOINT_REQUIREMENTS do
|
2017-08-17 22:00:37 +05:30
|
|
|
authorize! :push_code, user_project
|
|
|
|
|
|
|
|
commit = user_project.commit(params[:sha])
|
|
|
|
not_found!('Commit') unless commit
|
|
|
|
|
|
|
|
branch = user_project.repository.find_branch(params[:branch])
|
|
|
|
not_found!('Branch') unless branch
|
|
|
|
|
|
|
|
commit_params = {
|
|
|
|
commit: commit,
|
|
|
|
start_branch: params[:branch],
|
|
|
|
branch_name: params[:branch]
|
|
|
|
}
|
|
|
|
|
|
|
|
result = ::Commits::CherryPickService.new(user_project, current_user, commit_params).execute
|
|
|
|
|
|
|
|
if result[:status] == :success
|
|
|
|
branch = user_project.repository.find_branch(params[:branch])
|
2018-03-17 18:26:18 +05:30
|
|
|
present user_project.repository.commit(branch.dereferenced_target), with: Entities::Commit
|
2017-08-17 22:00:37 +05:30
|
|
|
else
|
|
|
|
render_api_error!(result[:message], 400)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2018-03-27 19:54:05 +05:30
|
|
|
desc 'Get all references a commit is pushed to' do
|
|
|
|
detail 'This feature was introduced in GitLab 10.6'
|
|
|
|
success Entities::BasicRef
|
|
|
|
end
|
|
|
|
params do
|
|
|
|
requires :sha, type: String, desc: 'A commit sha'
|
|
|
|
optional :type, type: String, values: %w[branch tag all], default: 'all', desc: 'Scope'
|
|
|
|
use :pagination
|
|
|
|
end
|
|
|
|
get ':id/repository/commits/:sha/refs', requirements: API::COMMIT_ENDPOINT_REQUIREMENTS do
|
|
|
|
commit = user_project.commit(params[:sha])
|
|
|
|
not_found!('Commit') unless commit
|
|
|
|
|
|
|
|
refs = []
|
|
|
|
refs.concat(user_project.repository.branch_names_contains(commit.id).map {|name| { type: 'branch', name: name }}) unless params[:type] == 'tag'
|
|
|
|
refs.concat(user_project.repository.tag_names_contains(commit.id).map {|name| { type: 'tag', name: name }}) unless params[:type] == 'branch'
|
|
|
|
refs = Kaminari.paginate_array(refs)
|
|
|
|
|
|
|
|
present paginate(refs), with: Entities::BasicRef
|
|
|
|
end
|
|
|
|
|
2016-11-03 12:29:30 +05:30
|
|
|
desc 'Post comment to commit' do
|
|
|
|
success Entities::CommitNote
|
|
|
|
end
|
|
|
|
params do
|
2017-09-10 17:25:29 +05:30
|
|
|
requires :sha, type: String, desc: 'A commit sha, or the name of a branch or tag on which to post a comment'
|
2016-11-03 12:29:30 +05:30
|
|
|
requires :note, type: String, desc: 'The text of the comment'
|
|
|
|
optional :path, type: String, desc: 'The file path'
|
|
|
|
given :path do
|
|
|
|
requires :line, type: Integer, desc: 'The line number'
|
2018-03-27 19:54:05 +05:30
|
|
|
requires :line_type, type: String, values: %w[new old], default: 'new', desc: 'The type of the line'
|
2016-11-03 12:29:30 +05:30
|
|
|
end
|
|
|
|
end
|
2018-03-17 18:26:18 +05:30
|
|
|
post ':id/repository/commits/:sha/comments', requirements: API::COMMIT_ENDPOINT_REQUIREMENTS do
|
2016-11-03 12:29:30 +05:30
|
|
|
commit = user_project.commit(params[:sha])
|
2015-04-26 12:48:37 +05:30
|
|
|
not_found! 'Commit' unless commit
|
2016-11-03 12:29:30 +05:30
|
|
|
|
2015-04-26 12:48:37 +05:30
|
|
|
opts = {
|
|
|
|
note: params[:note],
|
|
|
|
noteable_type: 'Commit',
|
|
|
|
commit_id: commit.id
|
|
|
|
}
|
|
|
|
|
2016-11-03 12:29:30 +05:30
|
|
|
if params[:path]
|
2017-09-10 17:25:29 +05:30
|
|
|
commit.raw_diffs(limits: false).each do |diff|
|
2015-04-26 12:48:37 +05:30
|
|
|
next unless diff.new_path == params[:path]
|
2018-03-17 18:26:18 +05:30
|
|
|
|
2016-06-02 11:05:42 +05:30
|
|
|
lines = Gitlab::Diff::Parser.new.parse(diff.diff.each_line)
|
2015-04-26 12:48:37 +05:30
|
|
|
|
|
|
|
lines.each do |line|
|
2016-11-03 12:29:30 +05:30
|
|
|
next unless line.new_pos == params[:line] && line.type == params[:line_type]
|
2018-03-17 18:26:18 +05:30
|
|
|
|
|
|
|
break opts[:line_code] = Gitlab::Git.diff_line_code(diff.new_path, line.new_pos, line.old_pos)
|
2015-04-26 12:48:37 +05:30
|
|
|
end
|
|
|
|
|
|
|
|
break if opts[:line_code]
|
|
|
|
end
|
2016-06-02 11:05:42 +05:30
|
|
|
|
|
|
|
opts[:type] = LegacyDiffNote.name if opts[:line_code]
|
2015-04-26 12:48:37 +05:30
|
|
|
end
|
|
|
|
|
|
|
|
note = ::Notes::CreateService.new(user_project, current_user, opts).execute
|
|
|
|
|
|
|
|
if note.save
|
|
|
|
present note, with: Entities::CommitNote
|
|
|
|
else
|
|
|
|
render_api_error!("Failed to save note #{note.errors.messages}", 400)
|
|
|
|
end
|
|
|
|
end
|
2014-09-02 18:07:02 +05:30
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|