2011-10-08 23:36:38 +02:00
|
|
|
module CommitsHelper
|
2011-12-01 00:51:04 +01:00
|
|
|
def old_line_number(line, i)
|
|
|
|
|
|
|
|
end
|
|
|
|
|
|
|
|
def new_line_number(line, i)
|
|
|
|
|
|
|
|
end
|
|
|
|
|
2011-10-08 23:36:38 +02:00
|
|
|
def more_commits_link
|
|
|
|
offset = params[:offset] || 0
|
|
|
|
limit = params[:limit] || 100
|
2011-12-27 00:39:42 +01:00
|
|
|
link_to "More", project_commits_path(@project, :offset => offset.to_i + limit.to_i, :limit => limit),
|
2011-10-08 23:36:38 +02:00
|
|
|
:remote => true, :class => "lite_button vm", :style => "text-align:center; width:930px; ", :id => "more-commits-link"
|
|
|
|
end
|
2011-12-26 21:35:25 +01:00
|
|
|
|
2011-12-26 23:22:15 +01:00
|
|
|
def commit_msg_with_link_to_issues(project, message)
|
|
|
|
return '' unless message
|
|
|
|
out = ''
|
|
|
|
message.split(/(#[0-9]+)/m).each do |m|
|
2011-12-26 21:35:25 +01:00
|
|
|
if m =~ /(#([0-9]+))/m
|
|
|
|
begin
|
2011-12-28 00:06:55 +01:00
|
|
|
issue = project.issues.find($2)
|
2011-12-26 23:22:15 +01:00
|
|
|
out += link_to($1, project_issue_path(project, $2))
|
2011-12-26 21:35:25 +01:00
|
|
|
rescue
|
2011-12-26 23:22:15 +01:00
|
|
|
out += $1
|
2011-12-26 21:35:25 +01:00
|
|
|
end
|
|
|
|
else
|
2011-12-26 23:22:15 +01:00
|
|
|
out += m
|
2011-12-26 21:35:25 +01:00
|
|
|
end
|
|
|
|
end
|
2011-12-26 23:22:15 +01:00
|
|
|
preserve out
|
2011-12-26 21:35:25 +01:00
|
|
|
end
|
|
|
|
|
2012-01-25 20:10:09 +01:00
|
|
|
def diff_line_class(line)
|
|
|
|
if line[0] == "+"
|
|
|
|
"new"
|
|
|
|
elsif line[0] == "-"
|
|
|
|
"old"
|
2012-01-11 23:26:01 +01:00
|
|
|
else
|
2012-01-25 20:10:09 +01:00
|
|
|
nil
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
def build_line_code(line, 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
|
|
|
|
|
|
|
|
lines_arr = diff_arr
|
|
|
|
lines_arr.each do |line|
|
2012-02-14 19:00:25 +01:00
|
|
|
next if line.match(/^\-\-\- \/dev\/null/)
|
|
|
|
next if line.match(/^\+\+\+ \/dev\/null/)
|
|
|
|
next if line.match(/^\-\-\- a/)
|
|
|
|
next if line.match(/^\+\+\+ b/)
|
|
|
|
|
2012-02-14 23:41:36 +01:00
|
|
|
full_line = html_escape(line.gsub(/\n/, '')).force_encoding("UTF-8")
|
2012-01-25 20:10:09 +01: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-02-22 16:04:41 +01:00
|
|
|
|
|
|
|
next if line_old == 1 && line_new == 1
|
2012-02-11 23:29:16 +01:00
|
|
|
yield(line, type, nil, nil, nil)
|
2012-01-25 20:10:09 +01:00
|
|
|
next
|
|
|
|
else
|
|
|
|
type = diff_line_class(line)
|
|
|
|
line_code = build_line_code(line, 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
|
2012-01-11 23:26:01 +01:00
|
|
|
end
|
|
|
|
end
|
2011-10-08 23:36:38 +02:00
|
|
|
end
|