2013-08-04 13:43:49 -04:00
|
|
|
module Gitlab
|
|
|
|
class DiffParser
|
|
|
|
include Enumerable
|
|
|
|
|
|
|
|
attr_reader :lines, :new_path
|
|
|
|
|
2014-04-15 11:02:02 -04:00
|
|
|
def initialize(lines, new_path = '')
|
|
|
|
@lines = lines
|
|
|
|
@new_path = new_path
|
2013-08-04 13:43:49 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
def each
|
|
|
|
line_old = 1
|
|
|
|
line_new = 1
|
|
|
|
type = nil
|
|
|
|
|
|
|
|
lines_arr = ::Gitlab::InlineDiff.processing lines
|
|
|
|
lines_arr.each do |line|
|
|
|
|
raw_line = line.dup
|
|
|
|
|
2014-04-15 11:02:02 -04:00
|
|
|
next if filename?(line)
|
2013-08-04 13:43:49 -04:00
|
|
|
|
|
|
|
full_line = html_escape(line.gsub(/\n/, ''))
|
|
|
|
full_line = ::Gitlab::InlineDiff.replace_markers full_line
|
|
|
|
|
|
|
|
if line.match(/^@@ -/)
|
|
|
|
type = "match"
|
|
|
|
|
|
|
|
line_old = line.match(/\-[0-9]*/)[0].to_i.abs rescue 0
|
|
|
|
line_new = line.match(/\+[0-9]*/)[0].to_i.abs rescue 0
|
|
|
|
|
|
|
|
next if line_old == 1 && line_new == 1 #top of file
|
2014-08-02 11:12:01 -04:00
|
|
|
yield(full_line, type, nil, line_new, line_old)
|
2013-08-04 13:43:49 -04:00
|
|
|
next
|
|
|
|
else
|
|
|
|
type = identification_type(line)
|
|
|
|
line_code = generate_line_code(new_path, line_new, line_old)
|
|
|
|
yield(full_line, type, line_code, line_new, line_old, raw_line)
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
if line[0] == "+"
|
|
|
|
line_new += 1
|
|
|
|
elsif line[0] == "-"
|
|
|
|
line_old += 1
|
|
|
|
else
|
|
|
|
line_new += 1
|
|
|
|
line_old += 1
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2014-04-15 11:02:02 -04:00
|
|
|
def empty?
|
|
|
|
@lines.empty?
|
|
|
|
end
|
|
|
|
|
2013-08-04 13:43:49 -04:00
|
|
|
private
|
|
|
|
|
2014-04-15 11:02:02 -04:00
|
|
|
def filename?(line)
|
|
|
|
line.start_with?('--- /dev/null', '+++ /dev/null', '--- a', '+++ b',
|
|
|
|
'--- /tmp/diffy', '+++ /tmp/diffy')
|
|
|
|
end
|
|
|
|
|
2013-08-04 13:43:49 -04:00
|
|
|
def identification_type(line)
|
|
|
|
if line[0] == "+"
|
|
|
|
"new"
|
|
|
|
elsif line[0] == "-"
|
|
|
|
"old"
|
|
|
|
else
|
|
|
|
nil
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
def generate_line_code(path, line_new, line_old)
|
|
|
|
"#{Digest::SHA1.hexdigest(path)}_#{line_old}_#{line_new}"
|
|
|
|
end
|
|
|
|
|
|
|
|
def html_escape str
|
|
|
|
replacements = { '&' => '&', '>' => '>', '<' => '<', '"' => '"', "'" => ''' }
|
|
|
|
str.gsub(/[&"'><]/, replacements)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|