deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed commit diff: content of removed files displayed

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-02-14 20:00:25 +02:00
parent ae416a76ff
commit c062e56b4c
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/helpers/commits_helper.rb
View file

@ -53,11 +53,13 @@ module CommitsHelper
lines_arr = diff_arr lines_arr = diff_arr
lines_arr.each do |line| 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/, '')) full_line = html_escape(line.gsub(/\n/, ''))
next if line.match(/^--- \/dev\/null/)
next if line.match(/^--- a/)
next if line.match(/^\+\+\+ b/)
if line.match(/^@@ -/) if line.match(/^@@ -/)
next if line_old == 1 && line_new == 1 next if line_old == 1 && line_new == 1
type = "match" type = "match"

3
app/views/commits/_diffs.html.haml
View file

@ -4,11 +4,12 @@
- diffs.each_with_index do |diff, i| - diffs.each_with_index do |diff, i|
- next if diff.diff.empty? - next if diff.diff.empty?
- file = (@commit.tree / diff.b_path) - file = (@commit.tree / diff.b_path)
- file = (@commit.prev_commit.tree / diff.a_path) unless file
- next unless file - next unless file
.diff_file .diff_file
.diff_file_header .diff_file_header
- if diff.deleted_file - if diff.deleted_file
%strong{:id => "#{diff.b_path}"}= diff.a_path %strong{:id => "#{diff.a_path}"}= diff.a_path
- else - else
= link_to tree_file_project_ref_path(@project, @commit.id, diff.b_path) do = link_to tree_file_project_ref_path(@project, @commit.id, diff.b_path) do
%strong{:id => "#{diff.b_path}"}= diff.b_path %strong{:id => "#{diff.b_path}"}= diff.b_path