debian-mirror-gitlab/app/helpers/diff_helper.rb

177 lines
5.1 KiB
Ruby
Raw Normal View History

2014-09-02 18:07:02 +05:30
module DiffHelper
2016-04-02 18:10:28 +05:30
def mark_inline_diffs(old_line, new_line)
old_diffs, new_diffs = Gitlab::Diff::InlineDiff.new(old_line, new_line).inline_diffs
2016-06-02 11:05:42 +05:30
marked_old_line = Gitlab::Diff::InlineDiffMarker.new(old_line).mark(old_diffs, mode: :deletion)
marked_new_line = Gitlab::Diff::InlineDiffMarker.new(new_line).mark(new_diffs, mode: :addition)
2016-04-02 18:10:28 +05:30
[marked_old_line, marked_new_line]
end
2016-08-24 12:49:21 +05:30
def expand_all_diffs?
params[:expand_all_diffs].present?
end
2015-11-26 14:37:03 +05:30
def diff_view
2016-09-13 17:45:13 +05:30
@diff_view ||= begin
diff_views = %w(inline parallel)
diff_view = cookies[:diff_view]
diff_view = diff_views.first unless diff_views.include?(diff_view)
diff_view.to_sym
2015-04-26 12:48:37 +05:30
end
end
2016-06-02 11:05:42 +05:30
def diff_options
2016-08-24 12:49:21 +05:30
options = { ignore_whitespace_change: hide_whitespace?, no_collapse: expand_all_diffs? }
if action_name == 'diff_for_path'
options[:no_collapse] = true
options[:paths] = params.values_at(:old_path, :new_path)
2015-09-11 14:41:01 +05:30
end
2014-09-02 18:07:02 +05:30
2016-09-13 17:45:13 +05:30
options
2014-09-02 18:07:02 +05:30
end
2015-04-26 12:48:37 +05:30
2016-09-13 17:45:13 +05:30
def diff_match_line(old_pos, new_pos, text: '', view: :inline, bottom: false)
content = content_tag :td, text, class: "line_content match #{view == :inline ? '' : view}"
cls = ['diff-line-num', 'unfold', 'js-unfold']
cls << 'js-unfold-bottom' if bottom
2015-04-26 12:48:37 +05:30
2016-09-13 17:45:13 +05:30
html = ''
if old_pos
html << content_tag(:td, '...', class: cls + ['old_line'], data: { linenumber: old_pos })
html << content unless view == :inline
end
2015-04-26 12:48:37 +05:30
2016-09-13 17:45:13 +05:30
if new_pos
html << content_tag(:td, '...', class: cls + ['new_line'], data: { linenumber: new_pos })
html << content
end
html.html_safe
2015-09-11 14:41:01 +05:30
end
2017-08-17 22:00:37 +05:30
def diff_line_content(line)
2015-04-26 12:48:37 +05:30
if line.blank?
2017-08-17 22:00:37 +05:30
"&nbsp;".html_safe
2015-04-26 12:48:37 +05:30
else
2017-08-17 22:00:37 +05:30
# We can't use `sub` because the HTML-safeness of `line` will not survive.
line[0] = '' if line.start_with?('+', '-', ' ')
2016-04-02 18:10:28 +05:30
line
2015-04-26 12:48:37 +05:30
end
end
2016-09-13 17:45:13 +05:30
def parallel_diff_discussions(left, right, diff_file)
2017-08-17 22:00:37 +05:30
return unless @grouped_diff_discussions
discussions_left = discussions_right = nil
2015-04-26 12:48:37 +05:30
2016-09-13 17:45:13 +05:30
if left && (left.unchanged? || left.removed?)
line_code = diff_file.line_code(left)
2017-08-17 22:00:37 +05:30
discussions_left = @grouped_diff_discussions[line_code]
2015-04-26 12:48:37 +05:30
end
2016-09-13 17:45:13 +05:30
if right && right.added?
line_code = diff_file.line_code(right)
2017-08-17 22:00:37 +05:30
discussions_right = @grouped_diff_discussions[line_code]
2015-04-26 12:48:37 +05:30
end
2017-08-17 22:00:37 +05:30
[discussions_left, discussions_right]
2015-04-26 12:48:37 +05:30
end
def inline_diff_btn
2016-09-13 17:45:13 +05:30
diff_btn('Inline', 'inline', diff_view == :inline)
2015-04-26 12:48:37 +05:30
end
def parallel_diff_btn
2016-09-13 17:45:13 +05:30
diff_btn('Side-by-side', 'parallel', diff_view == :parallel)
2015-04-26 12:48:37 +05:30
end
2015-09-11 14:41:01 +05:30
def submodule_link(blob, ref, repository = @repository)
tree, commit = submodule_links(blob, ref, repository)
2015-04-26 12:48:37 +05:30
commit_id = if commit.nil?
2015-12-23 02:04:40 +05:30
Commit.truncate_sha(blob.id)
2015-04-26 12:48:37 +05:30
else
2015-12-23 02:04:40 +05:30
link_to Commit.truncate_sha(blob.id), commit
2015-04-26 12:48:37 +05:30
end
[
content_tag(:span, link_to(truncate(blob.name, length: 40), tree)),
'@',
content_tag(:span, commit_id, class: 'monospace'),
].join(' ').html_safe
end
2015-10-24 18:46:33 +05:30
2016-06-02 11:05:42 +05:30
def commit_for_diff(diff_file)
2016-08-24 12:49:21 +05:30
return diff_file.content_commit if diff_file.content_commit
2016-06-02 11:05:42 +05:30
if diff_file.deleted_file
2016-01-29 22:53:50 +05:30
@base_commit || @commit.parent || @commit
2015-10-24 18:46:33 +05:30
else
@commit
end
end
2016-09-13 17:45:13 +05:30
def diff_file_html_data(project, diff_file_path, diff_commit_id)
2015-10-24 18:46:33 +05:30
{
blob_diff_path: namespace_project_blob_diff_path(project.namespace, project,
2016-09-13 17:45:13 +05:30
tree_join(diff_commit_id, diff_file_path)),
view: diff_view
2015-10-24 18:46:33 +05:30
}
end
def editable_diff?(diff)
!diff.deleted_file && @merge_request && @merge_request.source_project
end
2015-12-23 02:04:40 +05:30
private
def diff_btn(title, name, selected)
params_copy = params.dup
params_copy[:view] = name
# Always use HTML to handle case where JSON diff rendered this button
params_copy.delete(:format)
2016-04-02 18:10:28 +05:30
link_to url_for(params_copy), id: "#{name}-diff-btn", class: (selected ? 'btn active' : 'btn'), data: { view_type: name } do
2015-12-23 02:04:40 +05:30
title
end
end
2016-06-02 11:05:42 +05:30
def commit_diff_whitespace_link(project, commit, options)
url = namespace_project_commit_path(project.namespace, project, commit.id, params_with_whitespace)
toggle_whitespace_link(url, options)
end
def diff_merge_request_whitespace_link(project, merge_request, options)
url = diffs_namespace_project_merge_request_path(project.namespace, project, merge_request, params_with_whitespace)
toggle_whitespace_link(url, options)
end
2016-06-22 15:30:34 +05:30
def diff_compare_whitespace_link(project, from, to, options)
url = namespace_project_compare_path(project.namespace, project, from, to, params_with_whitespace)
toggle_whitespace_link(url, options)
end
2016-06-02 11:05:42 +05:30
def hide_whitespace?
params[:w] == '1'
end
def params_with_whitespace
hide_whitespace? ? request.query_parameters.except(:w) : request.query_parameters.merge(w: 1)
end
def toggle_whitespace_link(url, options)
options[:class] ||= ''
options[:class] << ' btn btn-default'
link_to "#{hide_whitespace? ? 'Show' : 'Hide'} whitespace changes", url, class: options[:class]
end
2017-08-17 22:00:37 +05:30
def render_overflow_warning?(diff_files)
diffs = @merge_request_diff.presence || diff_files
diffs.overflow?
end
2014-09-02 18:07:02 +05:30
end