Software
/
rosa-build
mirror of https://github.com/OpenMandrivaSoftware/rosa-build.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

update file_blob_in_diff method

This commit is contained in:
Alexander Machehin 2015-04-09 21:33:33 +05:00
parent a67f108572
commit 2c5f8ee065
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/helpers/commit_helper.rb
View File

@ -89,7 +89,8 @@ module CommitHelper
def file_blob_in_diff(repo, commit_id, diff) def file_blob_in_diff(repo, commit_id, diff)
tree = repo.tree(commit_id) tree = repo.tree(commit_id)
diff.renamed_file ? (tree / diff.b_path) : (tree / (diff.a_path.presence || diff.b_path)) blob = diff.renamed_file ? (tree / diff.b_path) : (tree / (diff.a_path.presence || diff.b_path))
blob || diff.a_blob || diff.b_blob
end end
def get_commit_id_for_file(diff, commit, parent_commit) def get_commit_id_for_file(diff, commit, parent_commit)

2
app/views/projects/git/commits/_diff.html.slim
View File

@ -32,6 +32,4 @@
== render 'file_removed_not_changed', blob: blob == render 'file_removed_not_changed', blob: blob
- elsif !blob.binary? - elsif !blob.binary?
- if (@project.repo.tree(commit_id) / diff.b_path).nil?
= "a_path=#{diff.a_path}; b_path=#{diff.b_path}"
== render_diff(diff, diff_counter: diff_counter, comments: @comments) == render_diff(diff, diff_counter: diff_counter, comments: @comments)