245 lines
8.2 KiB
Ruby
245 lines
8.2 KiB
Ruby
module Gitlab
|
|
module Conflict
|
|
class File
|
|
include Gitlab::Routing.url_helpers
|
|
include IconsHelper
|
|
|
|
class MissingResolution < ResolutionError
|
|
end
|
|
|
|
CONTEXT_LINES = 3
|
|
|
|
attr_reader :merge_file_result, :their_path, :our_path, :our_mode, :merge_request, :repository
|
|
|
|
def initialize(merge_file_result, conflict, merge_request:)
|
|
@merge_file_result = merge_file_result
|
|
@their_path = conflict[:theirs][:path]
|
|
@our_path = conflict[:ours][:path]
|
|
@our_mode = conflict[:ours][:mode]
|
|
@merge_request = merge_request
|
|
@repository = merge_request.project.repository
|
|
@match_line_headers = {}
|
|
end
|
|
|
|
def content
|
|
merge_file_result[:data]
|
|
end
|
|
|
|
def our_blob
|
|
@our_blob ||= repository.blob_at(merge_request.diff_refs.head_sha, our_path)
|
|
end
|
|
|
|
def type
|
|
lines unless @type
|
|
|
|
@type.inquiry
|
|
end
|
|
|
|
# Array of Gitlab::Diff::Line objects
|
|
def lines
|
|
return @lines if defined?(@lines)
|
|
|
|
begin
|
|
@type = 'text'
|
|
@lines = Gitlab::Conflict::Parser.new.parse(content,
|
|
our_path: our_path,
|
|
their_path: their_path,
|
|
parent_file: self)
|
|
rescue Gitlab::Conflict::Parser::ParserError
|
|
@type = 'text-editor'
|
|
@lines = nil
|
|
end
|
|
end
|
|
|
|
def resolve_lines(resolution)
|
|
section_id = nil
|
|
|
|
lines.map do |line|
|
|
unless line.type
|
|
section_id = nil
|
|
next line
|
|
end
|
|
|
|
section_id ||= line_code(line)
|
|
|
|
case resolution[section_id]
|
|
when 'head'
|
|
next unless line.type == 'new'
|
|
when 'origin'
|
|
next unless line.type == 'old'
|
|
else
|
|
raise MissingResolution, "Missing resolution for section ID: #{section_id}"
|
|
end
|
|
|
|
line
|
|
end.compact
|
|
end
|
|
|
|
def resolve_content(resolution)
|
|
if resolution == content
|
|
raise MissingResolution, "Resolved content has no changes for file #{our_path}"
|
|
end
|
|
|
|
resolution
|
|
end
|
|
|
|
def highlight_lines!
|
|
their_file = lines.reject { |line| line.type == 'new' }.map(&:text).join("\n")
|
|
our_file = lines.reject { |line| line.type == 'old' }.map(&:text).join("\n")
|
|
|
|
their_highlight = Gitlab::Highlight.highlight(their_path, their_file, repository: repository).lines
|
|
our_highlight = Gitlab::Highlight.highlight(our_path, our_file, repository: repository).lines
|
|
|
|
lines.each do |line|
|
|
if line.type == 'old'
|
|
line.rich_text = their_highlight[line.old_line - 1].try(:html_safe)
|
|
else
|
|
line.rich_text = our_highlight[line.new_line - 1].try(:html_safe)
|
|
end
|
|
end
|
|
end
|
|
|
|
def sections
|
|
return @sections if @sections
|
|
|
|
chunked_lines = lines.chunk { |line| line.type.nil? }.to_a
|
|
match_line = nil
|
|
|
|
sections_count = chunked_lines.size
|
|
|
|
@sections = chunked_lines.flat_map.with_index do |(no_conflict, lines), i|
|
|
section = nil
|
|
|
|
# We need to reduce context sections to CONTEXT_LINES. Conflict sections are
|
|
# always shown in full.
|
|
if no_conflict
|
|
conflict_before = i > 0
|
|
conflict_after = (sections_count - i) > 1
|
|
|
|
if conflict_before && conflict_after
|
|
# Create a gap in a long context section.
|
|
if lines.length > CONTEXT_LINES * 2
|
|
head_lines = lines.first(CONTEXT_LINES)
|
|
tail_lines = lines.last(CONTEXT_LINES)
|
|
|
|
# Ensure any existing match line has text for all lines up to the last
|
|
# line of its context.
|
|
update_match_line_text(match_line, head_lines.last)
|
|
|
|
# Insert a new match line after the created gap.
|
|
match_line = create_match_line(tail_lines.first)
|
|
|
|
section = [
|
|
{ conflict: false, lines: head_lines },
|
|
{ conflict: false, lines: tail_lines.unshift(match_line) }
|
|
]
|
|
end
|
|
elsif conflict_after
|
|
tail_lines = lines.last(CONTEXT_LINES)
|
|
|
|
# Create a gap and insert a match line at the start.
|
|
if lines.length > tail_lines.length
|
|
match_line = create_match_line(tail_lines.first)
|
|
|
|
tail_lines.unshift(match_line)
|
|
end
|
|
|
|
lines = tail_lines
|
|
elsif conflict_before
|
|
# We're at the end of the file (no conflicts after), so just remove extra
|
|
# trailing lines.
|
|
lines = lines.first(CONTEXT_LINES)
|
|
end
|
|
end
|
|
|
|
# We want to update the match line's text every time unless we've already
|
|
# created a gap and its corresponding match line.
|
|
update_match_line_text(match_line, lines.last) unless section
|
|
|
|
section ||= { conflict: !no_conflict, lines: lines }
|
|
section[:id] = line_code(lines.first) unless no_conflict
|
|
section
|
|
end
|
|
end
|
|
|
|
def line_code(line)
|
|
Gitlab::Diff::LineCode.generate(our_path, line.new_pos, line.old_pos)
|
|
end
|
|
|
|
def create_match_line(line)
|
|
Gitlab::Diff::Line.new('', 'match', line.index, line.old_pos, line.new_pos)
|
|
end
|
|
|
|
# Any line beginning with a letter, an underscore, or a dollar can be used in a
|
|
# match line header. Only context sections can contain match lines, as match lines
|
|
# have to exist in both versions of the file.
|
|
def find_match_line_header(index)
|
|
return @match_line_headers[index] if @match_line_headers.key?(index)
|
|
|
|
@match_line_headers[index] = begin
|
|
if index >= 0
|
|
line = lines[index]
|
|
|
|
if line.type.nil? && line.text.match(/\A[A-Za-z$_]/)
|
|
" #{line.text}"
|
|
else
|
|
find_match_line_header(index - 1)
|
|
end
|
|
end
|
|
end
|
|
end
|
|
|
|
# Set the match line's text for the current line. A match line takes its start
|
|
# position and context header (where present) from itself, and its end position from
|
|
# the line passed in.
|
|
def update_match_line_text(match_line, line)
|
|
return unless match_line
|
|
|
|
header = find_match_line_header(match_line.index - 1)
|
|
|
|
match_line.text = "@@ -#{match_line.old_pos},#{line.old_pos} +#{match_line.new_pos},#{line.new_pos} @@#{header}"
|
|
end
|
|
|
|
def as_json(opts = {})
|
|
json_hash = {
|
|
old_path: their_path,
|
|
new_path: our_path,
|
|
blob_icon: file_type_icon_class('file', our_mode, our_path),
|
|
blob_path: namespace_project_blob_path(merge_request.project.namespace,
|
|
merge_request.project,
|
|
::File.join(merge_request.diff_refs.head_sha, our_path))
|
|
}
|
|
|
|
json_hash.tap do |json_hash|
|
|
if opts[:full_content]
|
|
json_hash[:content] = content
|
|
json_hash[:blob_ace_mode] = our_blob && our_blob.language.try(:ace_mode)
|
|
else
|
|
json_hash[:sections] = sections if type.text?
|
|
json_hash[:type] = type
|
|
json_hash[:content_path] = content_path
|
|
end
|
|
end
|
|
end
|
|
|
|
def content_path
|
|
conflict_for_path_namespace_project_merge_request_path(merge_request.project.namespace,
|
|
merge_request.project,
|
|
merge_request,
|
|
old_path: their_path,
|
|
new_path: our_path)
|
|
end
|
|
|
|
# Don't try to print merge_request or repository.
|
|
def inspect
|
|
instance_variables = [:merge_file_result, :their_path, :our_path, :our_mode, :type].map do |instance_variable|
|
|
value = instance_variable_get("@#{instance_variable}")
|
|
|
|
"#{instance_variable}=\"#{value}\""
|
|
end
|
|
|
|
"#<#{self.class} #{instance_variables.join(' ')}>"
|
|
end
|
|
end
|
|
end
|
|
end
|