diff options
19 files changed, 131 insertions, 130 deletions
diff --git a/app/controllers/projects/edit_tree_controller.rb b/app/controllers/projects/edit_tree_controller.rb index baae12d92df..72a41f771c0 100644 --- a/app/controllers/projects/edit_tree_controller.rb +++ b/app/controllers/projects/edit_tree_controller.rb @@ -31,7 +31,7 @@ class Projects::EditTreeController < Projects::BaseTreeController diffy = Diffy::Diff.new(@blob.data, @content, diff: '-U 3', include_diff_info: true) - @diff_lines = Gitlab::Diff::Parser.new.parse(diffy.diff.scan(/.*\n/), @path, @path) + @diff_lines = Gitlab::Diff::Parser.new.parse(diffy.diff.scan(/.*\n/)) render layout: false end diff --git a/app/helpers/commits_helper.rb b/app/helpers/commits_helper.rb index 49226a37d08..90829963e84 100644 --- a/app/helpers/commits_helper.rb +++ b/app/helpers/commits_helper.rb @@ -16,62 +16,6 @@ module CommitsHelper commit_person_link(commit, options.merge(source: :committer)) end - def parallel_diff(diff_file, index) - lines = [] - skip_next = false - - # Building array of lines - # - # [left_type, left_line_number, left_line_content, right_line_type, right_line_number, right_line_content] - # - diff_file.diff_lines.each do |line| - - full_line = line.text - type = line.type - line_code = line.code - line_new = line.new_pos - line_old = line.old_pos - - next_line = diff_file.next_line(line.index) - - if next_line - next_type = next_line.type - next_line = next_line.text - end - - line = [type, line_old, full_line, next_type, line_new] - if type == 'match' || type.nil? - # line in the right panel is the same as in the left one - line = [type, line_old, full_line, type, line_new, full_line] - lines.push(line) - elsif type == 'old' - if next_type == 'new' - # Left side has text removed, right side has text added - line.push(next_line) - lines.push(line) - skip_next = true - elsif next_type == 'old' || next_type.nil? - # Left side has text removed, right side doesn't have any change - line.pop # remove the newline - line.push(nil) # no line number on the right panel - line.push(" ") # empty line on the right panel - lines.push(line) - end - elsif type == 'new' - if skip_next - # Change has been already included in previous line so no need to do it again - skip_next = false - next - else - # Change is only on the right side, left side has no change - line = [nil, nil, " ", type, line_new, full_line] - lines.push(line) - end - end - end - lines - end - def image_diff_class(diff) if diff.deleted_file "deleted" diff --git a/app/helpers/diff_helper.rb b/app/helpers/diff_helper.rb index 7feb07eeb3b..c2a19e4ac10 100644 --- a/app/helpers/diff_helper.rb +++ b/app/helpers/diff_helper.rb @@ -1,16 +1,16 @@ module DiffHelper - def safe_diff_files(project, diffs) + def safe_diff_files(diffs) if diff_hard_limit_enabled? diffs.first(Commit::DIFF_HARD_LIMIT_FILES) else diffs.first(Commit::DIFF_SAFE_FILES) end.map do |diff| - Gitlab::Diff::File.new(project, @commit, diff) + Gitlab::Diff::File.new(diff) end end - def show_diff_size_warninig?(project, diffs) - safe_diff_files(project, diffs).size < diffs.size + def show_diff_size_warninig?(diffs) + safe_diff_files(diffs).size < diffs.size end def diff_hard_limit_enabled? @@ -21,4 +21,65 @@ module DiffHelper false end end + + def generate_line_code(file_path, line) + Gitlab::Diff::LineCode.generate(file_path, line.new_pos, line.old_pos) + end + + def parallel_diff(diff_file, index) + lines = [] + skip_next = false + + # Building array of lines + # + # [left_type, left_line_number, left_line_content, right_line_type, right_line_number, right_line_content] + # + diff_file.diff_lines.each do |line| + + full_line = line.text + type = line.type + line_code = generate_line_code(diff_file.file_path, line) + line_new = line.new_pos + line_old = line.old_pos + + next_line = diff_file.next_line(line.index) + + if next_line + next_type = next_line.type + next_line = next_line.text + end + + line = [type, line_old, full_line, next_type, line_new] + if type == 'match' || type.nil? + # line in the right panel is the same as in the left one + line = [type, line_old, full_line, type, line_new, full_line] + lines.push(line) + elsif type == 'old' + if next_type == 'new' + # Left side has text removed, right side has text added + line.push(next_line) + lines.push(line) + skip_next = true + elsif next_type == 'old' || next_type.nil? + # Left side has text removed, right side doesn't have any change + line.pop # remove the newline + line.push(nil) # no line number on the right panel + line.push(" ") # empty line on the right panel + lines.push(line) + end + elsif type == 'new' + if skip_next + # Change has been already included in previous line so no need to do it again + skip_next = false + next + else + # Change is only on the right side, left side has no change + line = [nil, nil, " ", type, line_new, full_line] + lines.push(line) + end + end + end + lines + end + end diff --git a/app/models/note.rb b/app/models/note.rb index 77e3a528f96..fa5fdea4eb0 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -209,7 +209,7 @@ class Note < ActiveRecord::Base noteable.diffs.each do |mr_diff| next unless mr_diff.new_path == self.diff.new_path - lines = Gitlab::Diff::Parser.new.parse(mr_diff.diff.lines.to_a, mr_diff.old_path, mr_diff.new_path) + lines = Gitlab::Diff::Parser.new.parse(mr_diff.diff.lines.to_a) lines.each do |line| if line.text == diff_line @@ -233,6 +233,14 @@ class Note < ActiveRecord::Base diff.new_path if diff end + def file_path + if diff.new_path.present? + diff.new_path + elsif diff.old_path.present? + diff.old_path + end + end + def diff_old_line line_code.split('_')[1].to_i end @@ -241,12 +249,18 @@ class Note < ActiveRecord::Base line_code.split('_')[2].to_i end + def generate_line_code(line) + Gitlab::Diff::LineCode.generate(file_path, line.new_pos, line.old_pos) + end + def diff_line return @diff_line if @diff_line if diff diff_lines.each do |line| - @diff_line = line.text if line.code == self.line_code + if generate_line_code(line) == self.line_code + @diff_line = line.text + end end end @@ -259,7 +273,7 @@ class Note < ActiveRecord::Base prev_lines = [] diff_lines.each do |line| - if line.code != self.line_code + if generate_line_code(line) != self.line_code if line.type == "match" prev_lines.clear prev_match_line = line @@ -275,7 +289,7 @@ class Note < ActiveRecord::Base end def diff_lines - @diff_lines ||= Gitlab::Diff::Parser.new.parse(diff.diff.lines.to_a, diff.old_path, diff.new_path) + @diff_lines ||= Gitlab::Diff::Parser.new.parse(diff.diff.lines.to_a) end def discussion_id diff --git a/app/views/projects/diffs/_diffs.html.haml b/app/views/projects/diffs/_diffs.html.haml index 80a6d8a5691..c4eb7815866 100644 --- a/app/views/projects/diffs/_diffs.html.haml +++ b/app/views/projects/diffs/_diffs.html.haml @@ -1,6 +1,6 @@ .row .col-md-8 - = render 'projects/diffs/diff_stats', diffs: diffs + = render 'projects/diffs/stats', diffs: diffs .col-md-4 %ul.nav.nav-tabs %li.pull-right{class: params[:view] == 'parallel' ? 'active' : ''} @@ -11,12 +11,12 @@ - params_copy[:view] = 'inline' = link_to "Inline Diff", url_for(params_copy), {id: "commit-diff-viewtype"} -- if show_diff_size_warninig?(project, diffs) - = render 'projects/diffs/diff_warning', diffs: diffs +- if show_diff_size_warninig?(diffs) + = render 'projects/diffs/warning', diffs: diffs .files - - safe_diff_files(project, diffs).each_with_index do |diff_file, i| - = render 'projects/diffs/diff_file', diff_file: diff_file, i: i, project: project + - safe_diff_files(diffs).each_with_index do |diff_file, index| + = render 'projects/diffs/file', diff_file: diff_file, i: index, project: project - if @diff_timeout .alert.alert-danger diff --git a/app/views/projects/diffs/_diff_file.html.haml b/app/views/projects/diffs/_file.html.haml index aa68becc4dd..be0301e75f8 100644 --- a/app/views/projects/diffs/_diff_file.html.haml +++ b/app/views/projects/diffs/_file.html.haml @@ -1,6 +1,6 @@ -- return unless diff_file.blob_exists? -- blob = diff_file.blob -- blob_diff_path = diff_project_blob_path(project, tree_join(@commit.id, diff_file.new_path)) +- blob = project.repository.blob_for_diff(@commit, diff_file.diff) +- return unless blob +- blob_diff_path = diff_project_blob_path(project, tree_join(@commit.id, diff_file.file_path)) .diff-file{id: "diff-#{i}", data: {blob_diff_path: blob_diff_path }} .diff-header{id: "file-path-#{hexdigest(diff_file.new_path || diff_file.old_path)}"} - if diff_file.deleted_file diff --git a/app/views/projects/diffs/_diff_stats.html.haml b/app/views/projects/diffs/_stats.html.haml index 8ef7cc6e086..8ef7cc6e086 100644 --- a/app/views/projects/diffs/_diff_stats.html.haml +++ b/app/views/projects/diffs/_stats.html.haml diff --git a/app/views/projects/diffs/_text_file.html.haml b/app/views/projects/diffs/_text_file.html.haml index 43be43cc6e9..81f726c8e4f 100644 --- a/app/views/projects/diffs/_text_file.html.haml +++ b/app/views/projects/diffs/_text_file.html.haml @@ -7,7 +7,7 @@ - diff_file.diff_lines.each_with_index do |line, index| - type = line.type - last_line = line.new_pos - - line_code = line.code + - line_code = generate_line_code(diff_file.file_path, line) - line_old = line.old_pos %tr.line_holder{ id: line_code, class: "#{type}" } - if type == "match" diff --git a/app/views/projects/diffs/_diff_warning.html.haml b/app/views/projects/diffs/_warning.html.haml index ee85956d876..ee85956d876 100644 --- a/app/views/projects/diffs/_diff_warning.html.haml +++ b/app/views/projects/diffs/_warning.html.haml diff --git a/app/views/projects/edit_tree/_diff.html.haml b/app/views/projects/edit_tree/_diff.html.haml deleted file mode 100644 index cf044feb9a4..00000000000 --- a/app/views/projects/edit_tree/_diff.html.haml +++ /dev/null @@ -1,13 +0,0 @@ -%table.text-file - - each_diff_line(diff, 1) do |line, type, line_code, line_new, line_old, raw_line| - %tr.line_holder{ id: line_code, class: "#{type}" } - - if type == "match" - %td.old_line= "..." - %td.new_line= "..." - %td.line_content.matched= line - - else - %td.old_line - = link_to raw(type == "new" ? " " : line_old), "##{line_code}", id: line_code - %td.new_line= link_to raw(type == "old" ? " " : line_new) , "##{line_code}", id: line_code - %td.line_content{class: "noteable_line #{type} #{line_code}", "line_code" => line_code}= raw diff_line_content(line) - diff --git a/app/views/projects/edit_tree/preview.html.haml b/app/views/projects/edit_tree/preview.html.haml index f3fd94b0a3f..e7c3460ad78 100644 --- a/app/views/projects/edit_tree/preview.html.haml +++ b/app/views/projects/edit_tree/preview.html.haml @@ -12,15 +12,14 @@ - unless @diff_lines.empty? %table.text-file - @diff_lines.each do |line| - %tr.line_holder{ id: line.code, class: "#{line.type}" } + %tr.line_holder{ class: "#{line.type}" } - if line.type == "match" %td.old_line= "..." %td.new_line= "..." %td.line_content.matched= line.text - else %td.old_line - = link_to raw(line.type == "new" ? " " : line.old_pos), "##{line.code}", id: line.code - %td.new_line= link_to raw(line.type == "old" ? " " : line.new_pos) , "##{line.code}", id: line.code - %td.line_content{class: "noteable_line #{line.type} #{line.code}", "line.code" => line.code}= raw diff_line_content(line.text) + %td.new_line + %td.line_content{class: "#{line.type}"}= raw diff_line_content(line.text) - else .nothing-here-block No changes. diff --git a/app/views/projects/notes/_diff_note_link.html.haml b/app/views/projects/notes/_diff_note_link.html.haml deleted file mode 100644 index 377c926a204..00000000000 --- a/app/views/projects/notes/_diff_note_link.html.haml +++ /dev/null @@ -1,10 +0,0 @@ -- note = @project.notes.new(@comments_target.merge({ line_code: line_code })) -= link_to "", - "javascript:;", - class: "add-diff-note js-add-diff-note-button", - data: { noteable_type: note.noteable_type, - noteable_id: note.noteable_id, - commit_id: note.commit_id, - line_code: note.line_code, - discussion_id: note.discussion_id }, - title: "Add a comment to this line" diff --git a/app/views/projects/notes/discussions/_diff.html.haml b/app/views/projects/notes/discussions/_diff.html.haml index 228af785f73..da71220af17 100644 --- a/app/views/projects/notes/discussions/_diff.html.haml +++ b/app/views/projects/notes/discussions/_diff.html.haml @@ -12,7 +12,8 @@ .diff-content %table - note.truncated_diff_lines.each do |line| - %tr.line_holder{ id: line.code } + - line_code = generate_line_code(note.file_path, line) + %tr.line_holder{ id: line_code } - if line.type == "match" %td.old_line= "..." %td.new_line= "..." @@ -20,7 +21,7 @@ - else %td.old_line= raw(line.type == "new" ? " " : line.old_pos) %td.new_line= raw(line.type == "old" ? " " : line.new_pos) - %td.line_content{class: "noteable_line #{line.type} #{line.code}", "line_code" => line.code}= raw "#{line.text} " + %td.line_content{class: "noteable_line #{line.type} #{line_code}", "line_code" => line_code}= raw "#{line.text} " - - if line.code == note.line_code + - if line_code == note.line_code = render "projects/notes/diff_notes_with_reply", notes: discussion_notes diff --git a/lib/gitlab/diff/file.rb b/lib/gitlab/diff/file.rb index 62c0d38884a..19a1198c68c 100644 --- a/lib/gitlab/diff/file.rb +++ b/lib/gitlab/diff/file.rb @@ -1,23 +1,18 @@ module Gitlab module Diff class File - attr_reader :diff, :blob + attr_reader :diff delegate :new_file, :deleted_file, :renamed_file, :old_path, :new_path, to: :diff, prefix: false - def initialize(project, commit, diff) + def initialize(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? + @lines ||= parser.parse(raw_diff.lines) end def mode_changed? @@ -28,6 +23,10 @@ module Gitlab Gitlab::Diff::Parser.new end + def raw_diff + diff.diff + end + def next_line(index) diff_lines[index + 1] end @@ -37,6 +36,14 @@ module Gitlab diff_lines[index - 1] end end + + def file_path + if diff.new_path.present? + diff.new_path + elsif diff.old_path.present? + diff.old_path + end + end end end end diff --git a/lib/gitlab/diff/line.rb b/lib/gitlab/diff/line.rb index e8b9c980a1a..8ac1b15e88a 100644 --- a/lib/gitlab/diff/line.rb +++ b/lib/gitlab/diff/line.rb @@ -1,10 +1,10 @@ module Gitlab module Diff class Line - attr_reader :type, :text, :index, :code, :old_pos, :new_pos + attr_reader :type, :text, :index, :old_pos, :new_pos - def initialize(text, type, index, old_pos, new_pos, code = nil) - @text, @type, @index, @code = text, type, index, code + def initialize(text, type, index, old_pos, new_pos) + @text, @type, @index = text, type, index @old_pos, @new_pos = old_pos, new_pos end end diff --git a/lib/gitlab/diff/line_code.rb b/lib/gitlab/diff/line_code.rb new file mode 100644 index 00000000000..f3578ab3d35 --- /dev/null +++ b/lib/gitlab/diff/line_code.rb @@ -0,0 +1,9 @@ +module Gitlab + module Diff + class LineCode + def self.generate(file_path, new_line_position, old_line_position) + "#{Digest::SHA1.hexdigest(file_path)}_#{old_line_position}_#{new_line_position}" + end + end + end +end diff --git a/lib/gitlab/diff/parser.rb b/lib/gitlab/diff/parser.rb index 0fd11c69a59..9d6309954a4 100644 --- a/lib/gitlab/diff/parser.rb +++ b/lib/gitlab/diff/parser.rb @@ -3,7 +3,7 @@ module Gitlab class Parser include Enumerable - def parse(lines, old_path, new_path) + def parse(lines) @lines = lines, lines_obj = [] line_obj_index = 0 @@ -33,8 +33,7 @@ module Gitlab 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) + lines_obj << Gitlab::Diff::Line.new(full_line, type, line_obj_index, line_old, line_new) line_obj_index += 1 end @@ -73,10 +72,6 @@ module Gitlab 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 = { '&' => '&', '>' => '>', '<' => '<', '"' => '"', "'" => ''' } str.gsub(/[&"'><]/, replacements) diff --git a/spec/lib/gitlab/diff/file_spec.rb b/spec/lib/gitlab/diff/file_spec.rb index 074c1255930..cf0b5c282c1 100644 --- a/spec/lib/gitlab/diff/file_spec.rb +++ b/spec/lib/gitlab/diff/file_spec.rb @@ -6,7 +6,7 @@ describe Gitlab::Diff::File do let(:project) { create(:project) } let(:commit) { project.repository.commit(sample_commit.id) } let(:diff) { commit.diffs.first } - let(:diff_file) { Gitlab::Diff::File.new(project, commit, diff) } + let(:diff_file) { Gitlab::Diff::File.new(diff) } describe :diff_lines do let(:diff_lines) { diff_file.diff_lines } @@ -15,10 +15,6 @@ describe Gitlab::Diff::File do it { diff_lines.first.should be_kind_of(Gitlab::Diff::Line) } end - describe :blob_exists? do - it { diff_file.blob_exists?.should be_true } - end - describe :mode_changed? do it { diff_file.mode_changed?.should be_false } end diff --git a/spec/lib/gitlab/diff/parser_spec.rb b/spec/lib/gitlab/diff/parser_spec.rb index 9ec906e4f9a..35b78260acd 100644 --- a/spec/lib/gitlab/diff/parser_spec.rb +++ b/spec/lib/gitlab/diff/parser_spec.rb @@ -46,10 +46,8 @@ describe Gitlab::Diff::Parser do eos end - let(:path) { 'files/ruby/popen.rb' } - before do - @lines = parser.parse(diff.lines, path, path) + @lines = parser.parse(diff.lines) end it { @lines.size.should == 30 } |