gitlabhq/app/helpers/commits_helper.rb

74 lines
1.6 KiB
Ruby
Raw Normal View History

2011-10-08 23:36:38 +02:00
module CommitsHelper
2012-06-24 00:14:45 +02:00
def identification_type(line)
if line[0] == "+"
"new"
elsif line[0] == "-"
"old"
else
nil
end
end
2012-06-24 00:14:45 +02:00
def build_line_anchor(index, line_new, line_old)
"#{index}_#{line_old}_#{line_new}"
end
def each_diff_line(diff_arr, index)
line_old = 1
line_new = 1
type = nil
2012-10-09 02:10:04 +02:00
2012-07-02 22:34:25 +02:00
lines_arr = ::Gitlab::InlineDiff.processing diff_arr
lines_arr.each do |line|
next if line.match(/^\-\-\- \/dev\/null/)
next if line.match(/^\+\+\+ \/dev\/null/)
next if line.match(/^\-\-\- a/)
next if line.match(/^\+\+\+ b/)
full_line = html_escape(line.gsub(/\n/, ''))
2012-07-02 22:34:25 +02:00
full_line = ::Gitlab::InlineDiff.replace_markers full_line
2012-07-02 22:08:07 +02:00
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
2012-06-24 00:14:45 +02:00
next if line_old == 1 && line_new == 1 #top of file
yield(full_line, type, nil, nil, nil)
next
else
2012-06-24 00:14:45 +02:00
type = identification_type(line)
line_code = build_line_anchor(index, line_new, line_old)
yield(full_line, type, line_code, line_new, line_old)
end
if line[0] == "+"
line_new += 1
elsif line[0] == "-"
line_old += 1
else
line_new += 1
line_old += 1
end
end
end
def image_diff_class(diff)
if diff.deleted_file
"diff_removed"
elsif diff.new_file
"diff_added"
else
nil
end
end
2012-07-02 22:08:07 +02:00
2012-10-31 13:29:42 +01:00
def commit_to_html commit
if commit.model
escape_javascript(render 'commits/commit', commit: commit)
end
end
2011-10-08 23:36:38 +02:00
end