diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/git/conflict/resolver.rb | 24 | ||||
| -rw-r--r-- | lib/gitlab/git/repository.rb | 4 | ||||
| -rw-r--r-- | lib/gitlab/gitaly_client/conflicts_service.rb | 60 | ||||
| -rw-r--r-- | lib/gitlab/gitaly_client/util.rb | 6 |
4 files changed, 89 insertions, 5 deletions
diff --git a/lib/gitlab/git/conflict/resolver.rb b/lib/gitlab/git/conflict/resolver.rb index 03e5c0fcd6f..6a7ce4e3490 100644 --- a/lib/gitlab/git/conflict/resolver.rb +++ b/lib/gitlab/git/conflict/resolver.rb @@ -13,12 +13,18 @@ module Gitlab def conflicts @conflicts ||= begin - target_index = @target_repository.rugged.merge_commits(@our_commit_oid, @their_commit_oid) - - # We don't need to do `with_repo_branch_commit` here, because the target - # project always fetches source refs when creating merge request diffs. - conflict_files(@target_repository, target_index) + @target_repository.gitaly_migrate(:conflicts_list_conflict_files) do |is_enabled| + if is_enabled + @target_repository.gitaly_conflicts_client.list_conflict_files(@our_commit_oid, @their_commit_oid) + else + rugged_list_conflict_files + end + end end + rescue GRPC::FailedPrecondition => e + raise Gitlab::Git::Conflict::Resolver::ConflictSideMissing.new(e.message) + rescue Rugged::OdbError, GRPC::BadStatus => e + raise Gitlab::Git::CommandError.new(e) end def resolve_conflicts(source_repository, user, files, source_branch:, target_branch:, commit_message:) @@ -84,6 +90,14 @@ module Gitlab index.add(path: our_path, oid: oid, mode: file.our_mode) index.conflict_remove(our_path) end + + def rugged_list_conflict_files + target_index = @target_repository.rugged.merge_commits(@our_commit_oid, @their_commit_oid) + + # We don't need to do `with_repo_branch_commit` here, because the target + # project always fetches source refs when creating merge request diffs. + conflict_files(@target_repository, target_index) + end end end end diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb index 36dc6b820ce..503f34a3ca5 100644 --- a/lib/gitlab/git/repository.rb +++ b/lib/gitlab/git/repository.rb @@ -1294,6 +1294,10 @@ module Gitlab @gitaly_remote_client ||= Gitlab::GitalyClient::RemoteService.new(self) end + def gitaly_conflicts_client + @gitaly_conflicts_client ||= Gitlab::GitalyClient::ConflictsService.new(self) + end + def gitaly_migrate(method, status: Gitlab::GitalyClient::MigrationStatus::OPT_IN, &block) Gitlab::GitalyClient.migrate(method, status: status, &block) rescue GRPC::NotFound => e diff --git a/lib/gitlab/gitaly_client/conflicts_service.rb b/lib/gitlab/gitaly_client/conflicts_service.rb new file mode 100644 index 00000000000..6508e436301 --- /dev/null +++ b/lib/gitlab/gitaly_client/conflicts_service.rb @@ -0,0 +1,60 @@ +module Gitlab + module GitalyClient + class ConflictsService + def initialize(repository) + @gitaly_repo = repository.gitaly_repository + @repository = repository + end + + def list_conflict_files(our_commit_oid, their_commit_oid) + request = Gitaly::ListConflictFilesRequest.new( + repository: @gitaly_repo, + our_commit_oid: our_commit_oid, + their_commit_oid: their_commit_oid + ) + response = GitalyClient.call(@repository.storage, :conflicts_service, :list_conflict_files, request) + files = [] + header = nil + content = nil + + response.each do |msg| + msg.files.each do |gitaly_file| + if gitaly_file.header + # Add previous file to the collection, except on first iteration + files << conflict_file_from_gitaly(header, content) if header + + header = gitaly_file.header + content = "" + else + # Append content to curret file + content << gitaly_file.content + end + end + end + + # Add leftover file, if any + files << conflict_file_from_gitaly(header, content) if header + + files + end + + private + + def conflict_file_from_gitaly(header, content) + Gitlab::Git::Conflict::File.new( + Gitlab::GitalyClient::Util.git_repository(header.repository), + header.commit_oid, + conflict_from_gitaly_file_header(header), + content + ) + end + + def conflict_from_gitaly_file_header(header) + { + ours: { path: header.our_path, mode: header.our_mode }, + theirs: { path: header.their_path } + } + end + end + end +end diff --git a/lib/gitlab/gitaly_client/util.rb b/lib/gitlab/gitaly_client/util.rb index b1a033280b4..7a3fffae9b6 100644 --- a/lib/gitlab/gitaly_client/util.rb +++ b/lib/gitlab/gitaly_client/util.rb @@ -18,6 +18,12 @@ module Gitlab ) end + def git_repository(gitaly_repository) + Gitlab::Git::Repository.new(gitaly_repository.storage_name, + gitaly_repository.relative_path, + gitaly_repository.gl_repository) + end + def gitlab_tag_from_gitaly_tag(repository, gitaly_tag) if gitaly_tag.target_commit.present? commit = Gitlab::Git::Commit.decorate(repository, gitaly_tag.target_commit) |