module DiffHelper include CommitHelper MAX_LINES_WITHOUT_COLLAPSE = 50 def render_diff_stats(options = {}) stats = options[:stats] diff = options[:diff] repo = options[:repo] commit = options[:commit] parent_commit = options[:common_ancestor] res = ["" wrap_diff_header_list(stats, res) end def wrap_diff_header_list(stats, list) is_stats_open = stats.count <= MAX_FILES_WITHOUT_COLLAPSE ? 'in' : '' res = ["
"] res << "
" res << "" res << "
" res << "
" res += list res << "
" res << "
" res << "
" res << "
" res.join("\n").html_safe end def diff_header_message(stats) total_additions = stats.inject(0) {|sum, n| sum + n.additions} total_deletions = stats.inject(0) {|sum, n| sum + n.deletions} I18n.t('layout.projects.diff_show_header', files: t('layout.projects.commit_files_count', count: stats.count), additions: t('layout.projects.commit_additions_count', count: total_additions), deletions: t('layout.projects.commit_deletions_count', count: total_deletions)) end #include Git::Diff::InlineCallback def render_diff(diff, args = {})#diff_counter, comments, opts = nil diffpath = nil) if diff.respond_to?(:diff) diff, filepath, in_discussion = diff.diff, diff.a_path, false comments = (args[:comments] || []).select{|c| c.data.try('[]', :path) == filepath} else filepath, in_discussion, comments = args[:diffpath], true, args[:comments] end diff_display ||= Diff::Display::Unified.new(diff) url = if @pull @pull.id ? polymorphic_path([@project, @pull]) : '' elsif @commit commit_path @project, @commit end prepare(args.merge({filepath: filepath, comments: comments, in_discussion: in_discussion})) res = '
' res << '' res << '' res << renderer(diff_display.data) #diff_display.render(Git::Diff::InlineCallback.new comments, path) res << tr_line_comments(comments) if in_discussion res << '' res << '
' res << '
' res.html_safe end ######################################################## # FIXME: Just to dev, remove to lib. Really need it? ######################################################## def prepare(args) @url, @diff_counter, @in_discussion = args[:url], args[:diff_counter], args[:in_discussion] @filepath, @line_comments = args[:filepath], args[:comments] @diff_prefix = args[:diff_prefix] || 'diff' @add_reply_id, @num_line = if @in_discussion [@line_comments[0].id, @line_comments[0].data[:line].to_i - @line_comments[0].data[:strings].lines.count.to_i-1] else [nil, -1] end @no_commit_comment = true if params[:controller] == 'projects/wiki' || (params[:action] == 'diff') end def headerline(line) set_line_number " ... ... #{line} " end def addline(line) set_line_number " #{td_line_link "#{@diff_prefix}-F#{@diff_counter}R#{line.new_number}", line.new_number} #{line_comment_icon}
#{render_line(line)}
#{render_line_comments}" end def remline(line) set_line_number " #{td_line_link "#{@diff_prefix}-F#{@diff_counter}L#{line.old_number}", line.old_number} #{line_comment_icon}
#{render_line(line)}
#{render_line_comments}" end def modline(line) set_line_number " #{td_line_link "#{@diff_prefix}-F#{@diff_counter}L#{line.old_number}", line.old_number} #{td_line_link "#{@diff_prefix}-F#{@diff_counter}R#{line.new_number}", line.new_number} #{line_comment_icon}
#{render_line(line)}
#{render_line_comments}" end def unmodline(line) set_line_number " #{td_line_link "#{@diff_prefix}-F#{@diff_counter}L#{line.old_number}", line.old_number} #{td_line_link "#{@diff_prefix}-F#{@diff_counter}R#{line.new_number}", line.new_number} #{line_comment_icon}
#{render_line(line)}
#{render_line_comments}" end def sepline(line) " … … " end def nonewlineline(line) set_line_number " #{td_line_link "#{@diff_prefix}-F#{@diff_counter}L#{line.old_number}", line.old_number} #{td_line_link "#{@diff_prefix}-F#{@diff_counter}R#{line.new_number}", line.new_number} #{line_comment_icon}
#{render_line(line)}
#{render_line_comments}" end def before_headerblock(block) end def after_headerblock(block) end def before_unmodblock(block) end def before_modblock(block) end def before_remblock(block) end def before_addblock(block) end def before_sepblock(block) end def before_nonewlineblock(block) end def after_unmodblock(block) end def after_modblock(block) end def after_remblock(block) end def after_addblock(block) end def after_sepblock(block) end def after_nonewlineblock(block) end def new_line "" end def renderer(data) result = [] data.each do |block| result << send("before_" + classify(block), block) result << block.map { |line| send(classify(line), line) } result << send("after_" + classify(block), block) end result.compact.join(new_line) end protected def classify(object) object.class.name[/\w+$/].downcase end def escape(str) str.to_s.gsub('&', '&').gsub('<', '<').gsub('>', '>').gsub('"', '"') end def render_line(line) res = '' if line.inline_changes? prefix, changed, postfix = line.segments.map{|segment| escape(segment) } res << "#{prefix}#{changed}#{postfix}" else res << escape(line) end res << '' res end def set_line_number @num_line = @num_line.succ end def line_comment_icon return if @no_commit_comment || (@in_discussion && @add_reply_id && @line_comments[0].data[:line].to_i != @num_line) if current_user link_to image_tag('line_comment.png', alt: t('layout.comments.new_header')), '#new_inline_comment', class: 'add_line-comment', 'ng-click' => "commentsCtrl.showInlineForm($event, #{new_inline_comment_params.to_json})" end end def render_line_comments unless @no_commit_comment || @in_discussion comments = @line_comments.select do |c| c.data.try('[]', :line).to_s == @num_line.to_s && c.actual_inline_comment? end tr_line_comments(comments) if comments.count > 0 end end def td_line_link id, num "#{num}" end def tr_line_comments comments return if @no_commit_comment res=" #{comments.count} " comments.each do |comment| res << "
#{render 'projects/comments/comment', comment: comment, data: {project: @project, commentable: @commentable, add_anchor: 'inline', in_discussion: @in_discussion}}
" end if current_user res << link_to( t('layout.comments.new_inline'), '#new_inline_comment', class: 'btn btn-primary', 'ng-click' => "commentsCtrl.showInlineForm($event, #{new_inline_comment_params.to_json})", 'ng-hide' => "commentsCtrl.hideInlineCommentButton(#{new_inline_comment_params.to_json})" ) end res << "" end # def new_comment_path # hash = {path: @filepath, line: @num_line} # if @commentable.is_a? Issue # project_new_line_pull_comment_path(@project, @commentable, hash.merge({in_reply: @add_reply_id})) # elsif @commentable.is_a? Grit::Commit # new_line_commit_comment_path(@project, @commentable, hash) # end # end def new_inline_comment_params { path: @filepath, line: @num_line, in_reply: @add_reply_id } end end