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

160 lines
4.3 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
2015-11-26 14:37:03 +05:30
def diff_view
2016-06-02 11:05:42 +05:30
diff_views = %w(inline parallel)
2015-11-26 14:37:03 +05:30
2016-06-02 11:05:42 +05:30
if diff_views.include?(cookies[:diff_view])
cookies[:diff_view]
2014-09-02 18:07:02 +05:30
else
2016-06-02 11:05:42 +05:30
diff_views.first
2015-04-26 12:48:37 +05:30
end
end
2016-06-02 11:05:42 +05:30
def diff_hard_limit_enabled?
params[:force_show_diff].present?
2014-09-02 18:07:02 +05:30
end
2016-06-02 11:05:42 +05:30
def diff_options
options = { ignore_whitespace_change: hide_whitespace? }
if diff_hard_limit_enabled?
options.merge!(Commit.max_diff_options)
2015-09-11 14:41:01 +05:30
end
2016-06-02 11:05:42 +05:30
options
2014-09-02 18:07:02 +05:30
end
2016-06-02 11:05:42 +05:30
def safe_diff_files(diffs, diff_refs)
diffs.decorate! { |diff| Gitlab::Diff::File.new(diff, diff_refs) }
2014-09-02 18:07:02 +05:30
end
2015-04-26 12:48:37 +05:30
def generate_line_code(file_path, line)
Gitlab::Diff::LineCode.generate(file_path, line.new_pos, line.old_pos)
end
def unfold_bottom_class(bottom)
bottom ? 'js-unfold-bottom' : ''
2015-04-26 12:48:37 +05:30
end
2015-09-11 14:41:01 +05:30
def unfold_class(unfold)
unfold ? 'unfold js-unfold' : ''
2015-09-11 14:41:01 +05:30
end
2016-06-02 11:05:42 +05:30
def diff_line_content(line, line_type = nil)
2015-04-26 12:48:37 +05:30
if line.blank?
2016-01-29 22:53:50 +05:30
"  ".html_safe
2015-04-26 12:48:37 +05:30
else
2016-06-02 11:05:42 +05:30
line[0] = ' ' if %w[new old].include?(line_type)
2016-04-02 18:10:28 +05:30
line
2015-04-26 12:48:37 +05:30
end
end
2016-06-02 11:05:42 +05:30
def organize_comments(left, right)
notes_left = notes_right = nil
2015-04-26 12:48:37 +05:30
2016-06-02 11:05:42 +05:30
unless left[:type].nil? && right[:type] == 'new'
notes_left = @grouped_diff_notes[left[:line_code]]
2015-04-26 12:48:37 +05:30
end
2016-06-02 11:05:42 +05:30
unless left[:type].nil? && right[:type].nil?
notes_right = @grouped_diff_notes[right[:line_code]]
2015-04-26 12:48:37 +05:30
end
2016-06-02 11:05:42 +05:30
[notes_left, notes_right]
2015-04-26 12:48:37 +05:30
end
def inline_diff_btn
2015-12-23 02:04:40 +05:30
diff_btn('Inline', 'inline', diff_view == 'inline')
2015-04-26 12:48:37 +05:30
end
def parallel_diff_btn
2015-12-23 02:04:40 +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)
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
def diff_file_html_data(project, diff_commit, diff_file)
{
blob_diff_path: namespace_project_blob_diff_path(project.namespace, project,
tree_join(diff_commit.id, diff_file.file_path))
}
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
private
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
2014-09-02 18:07:02 +05:30
end