3f71c43e88
When reading conflicts:
1. Add a `type` field. `text` works as before, and has `sections`;
`text-editor` is a file with ambiguous conflict markers that can only
be resolved in an editor.
2. Add a `content_path` field pointing to a JSON representation of the
file's content for a single file.
3. Hitting `content_path` returns a similar datastructure to the `file`,
but without the `content_path` and `sections` fields, and with a
`content` field containing the full contents of the file (with
conflict markers).
When writing conflicts:
1. Instead of `sections` being at the top level, they are now in a
`files` array. This matches the read format better.
2. The `files` array contains file hashes, each of which must contain:
a. `new_path`
b. `old_path`
c. EITHER `sections` (which works as before) or `content` (with the
full content of the resolved file).
61 lines
1.7 KiB
Ruby
61 lines
1.7 KiB
Ruby
module Gitlab
|
|
module Conflict
|
|
class FileCollection
|
|
class ConflictSideMissing < StandardError
|
|
end
|
|
|
|
attr_reader :merge_request, :our_commit, :their_commit
|
|
|
|
def initialize(merge_request)
|
|
@merge_request = merge_request
|
|
@our_commit = merge_request.source_branch_head.raw.raw_commit
|
|
@their_commit = merge_request.target_branch_head.raw.raw_commit
|
|
end
|
|
|
|
def repository
|
|
merge_request.project.repository
|
|
end
|
|
|
|
def merge_index
|
|
@merge_index ||= repository.rugged.merge_commits(our_commit, their_commit)
|
|
end
|
|
|
|
def files
|
|
@files ||= merge_index.conflicts.map do |conflict|
|
|
raise ConflictSideMissing unless conflict[:theirs] && conflict[:ours]
|
|
|
|
Gitlab::Conflict::File.new(merge_index.merge_file(conflict[:ours][:path]),
|
|
conflict,
|
|
merge_request: merge_request)
|
|
end
|
|
end
|
|
|
|
def file_for_path(old_path, new_path)
|
|
files.find { |file| file.their_path == old_path && file.our_path == new_path }
|
|
end
|
|
|
|
def as_json(opts = nil)
|
|
{
|
|
target_branch: merge_request.target_branch,
|
|
source_branch: merge_request.source_branch,
|
|
commit_sha: merge_request.diff_head_sha,
|
|
commit_message: default_commit_message,
|
|
files: files
|
|
}
|
|
end
|
|
|
|
def default_commit_message
|
|
conflict_filenames = merge_index.conflicts.map do |conflict|
|
|
"# #{conflict[:ours][:path]}"
|
|
end
|
|
|
|
<<EOM.chomp
|
|
Merge branch '#{merge_request.target_branch}' into '#{merge_request.source_branch}'
|
|
|
|
# Conflicts:
|
|
#{conflict_filenames.join("\n")}
|
|
EOM
|
|
end
|
|
end
|
|
end
|
|
end
|