Commit 4ef809c7 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Gitlab::Diff classes added

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 205358b1
module Gitlab
module Diff
class File
attr_reader :diff, :blob
delegate :new_file, :deleted_file, :renamed_file,
:old_path, :new_path, to: :diff, prefix: false
def initialize(project, commit, diff)
@diff = diff
@blob = project.repository.blob_for_diff(commit, diff)
end
# Array of Gitlab::DIff::Line objects
def diff_lines
@lines ||= parser.parse(diff.diff.lines, old_path, new_path)
end
def blob_exists?
!@blob.nil?
end
def mode_changed?
diff.a_mode && diff.b_mode && diff.a_mode != diff.b_mode
end
def parser
Gitlab::Diff::Parser.new
end
def next_line(index)
diff_lines[index + 1]
end
def prev_line(index)
if index > 0
diff_lines[index - 1]
end
end
end
end
end
module Gitlab
module Diff
class Line
attr_reader :type, :text, :index, :code, :old_pos, :new_pos
def initialize(text, type, index, old_pos, new_pos, code = nil)
@text, @type, @index, @code = text, type, index, code
@old_pos, @new_pos = old_pos, new_pos
end
end
end
end
module Gitlab
module Diff
class Parser
include Enumerable
def parse(lines, old_path, new_path)
@lines = lines,
lines_obj = []
line_obj_index = 0
line_old = 1
line_new = 1
type = nil
lines_arr = ::Gitlab::InlineDiff.processing lines
lines_arr.each do |line|
raw_line = line.dup
next if filename?(line)
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
lines_obj << Gitlab::Diff::Line.new(full_line, type, line_obj_index, line_old, line_new)
line_obj_index += 1
next
else
type = identification_type(line)
line_code = generate_line_code(new_path, line_new, line_old)
lines_obj << Gitlab::Diff::Line.new(full_line, type, line_obj_index, line_old, line_new, line_code)
line_obj_index += 1
end
if line[0] == "+"
line_new += 1
elsif line[0] == "-"
line_old += 1
else
line_new += 1
line_old += 1
end
end
lines_obj
end
def empty?
@lines.empty?
end
private
def filename?(line)
line.start_with?('--- /dev/null', '+++ /dev/null', '--- a', '+++ b',
'--- /tmp/diffy', '+++ /tmp/diffy')
end
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 = { '&' => '&amp;', '>' => '&gt;', '<' => '&lt;', '"' => '&quot;', "'" => '&#39;' }
str.gsub(/[&"'><]/, replacements)
end
end
end
end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment