2014-07-15 11:28:21 -04:00
|
|
|
module DiffHelper
|
2016-01-29 13:37:17 -05:00
|
|
|
def mark_inline_diffs(old_line, new_line)
|
|
|
|
old_diffs, new_diffs = Gitlab::Diff::InlineDiff.new(old_line, new_line).inline_diffs
|
|
|
|
|
2016-04-06 15:37:09 -04:00
|
|
|
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-01-29 13:37:17 -05:00
|
|
|
|
|
|
|
[marked_old_line, marked_new_line]
|
|
|
|
end
|
|
|
|
|
2016-07-06 13:35:55 -04:00
|
|
|
def expand_all_diffs?
|
2016-07-15 03:04:18 -04:00
|
|
|
params[:expand_all_diffs].present?
|
2016-07-06 08:04:52 -04:00
|
|
|
end
|
|
|
|
|
2015-11-17 10:08:58 -05:00
|
|
|
def diff_view
|
2016-07-21 14:44:12 -04:00
|
|
|
@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
|
2016-04-14 17:32:46 -04:00
|
|
|
end
|
2015-11-17 10:08:58 -05:00
|
|
|
end
|
|
|
|
|
2016-03-03 12:38:44 -05:00
|
|
|
def diff_options
|
2016-07-27 13:00:34 -04:00
|
|
|
options = { ignore_whitespace_change: hide_whitespace?, no_collapse: expand_all_diffs? }
|
2016-07-08 17:50:06 -04:00
|
|
|
|
|
|
|
if action_name == 'diff_for_path'
|
2016-07-15 03:04:18 -04:00
|
|
|
options[:no_collapse] = true
|
|
|
|
options[:paths] = params.values_at(:old_path, :new_path)
|
2014-07-15 11:28:21 -04:00
|
|
|
end
|
2016-07-08 17:50:06 -04:00
|
|
|
|
2016-07-20 12:25:36 -04:00
|
|
|
options
|
2016-01-20 08:59:14 -05:00
|
|
|
end
|
|
|
|
|
2016-07-21 14:44:12 -04:00
|
|
|
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
|
|
|
|
|
|
|
|
html = ''
|
|
|
|
if old_pos
|
|
|
|
html << content_tag(:td, '...', class: cls + ['old_line'], data: { linenumber: old_pos })
|
|
|
|
html << content unless view == :inline
|
|
|
|
end
|
|
|
|
|
|
|
|
if new_pos
|
|
|
|
html << content_tag(:td, '...', class: cls + ['new_line'], data: { linenumber: new_pos })
|
|
|
|
html << content
|
|
|
|
end
|
2014-09-09 05:10:40 -04:00
|
|
|
|
2016-07-21 14:44:12 -04:00
|
|
|
html.html_safe
|
2015-02-08 18:12:44 -05:00
|
|
|
end
|
|
|
|
|
2016-10-26 21:47:14 -04:00
|
|
|
def diff_line_content(line)
|
2014-09-09 05:10:40 -04:00
|
|
|
if line.blank?
|
2016-10-26 21:47:14 -04:00
|
|
|
" ".html_safe
|
2014-09-09 05:10:40 -04:00
|
|
|
else
|
2016-12-02 03:48:32 -05:00
|
|
|
# We can't use `sub` because the HTML-safeness of `line` will not survive.
|
|
|
|
line[0] = '' if line.start_with?('+', '-', ' ')
|
|
|
|
line
|
2014-09-09 05:10:40 -04:00
|
|
|
end
|
|
|
|
end
|
2014-09-12 12:43:44 -04:00
|
|
|
|
2016-07-20 18:18:18 -04:00
|
|
|
def parallel_diff_discussions(left, right, diff_file)
|
2017-03-30 22:34:14 -04:00
|
|
|
discussions_left = discussions_right = nil
|
2014-09-12 13:51:44 -04:00
|
|
|
|
2016-07-20 18:18:18 -04:00
|
|
|
if left && (left.unchanged? || left.removed?)
|
|
|
|
line_code = diff_file.line_code(left)
|
2017-03-30 22:34:14 -04:00
|
|
|
discussions_left = @grouped_diff_discussions[line_code]
|
2014-09-12 13:51:44 -04:00
|
|
|
end
|
|
|
|
|
2016-07-20 18:18:18 -04:00
|
|
|
if right && right.added?
|
|
|
|
line_code = diff_file.line_code(right)
|
2017-03-30 22:34:14 -04:00
|
|
|
discussions_right = @grouped_diff_discussions[line_code]
|
2014-09-12 13:51:44 -04:00
|
|
|
end
|
|
|
|
|
2017-03-30 22:34:14 -04:00
|
|
|
[discussions_left, discussions_right]
|
2014-09-12 13:51:44 -04:00
|
|
|
end
|
2014-12-25 07:32:49 -05:00
|
|
|
|
|
|
|
def inline_diff_btn
|
2016-07-21 14:44:12 -04:00
|
|
|
diff_btn('Inline', 'inline', diff_view == :inline)
|
2014-12-25 07:32:49 -05:00
|
|
|
end
|
|
|
|
|
|
|
|
def parallel_diff_btn
|
2016-07-21 14:44:12 -04:00
|
|
|
diff_btn('Side-by-side', 'parallel', diff_view == :parallel)
|
2014-12-25 07:32:49 -05:00
|
|
|
end
|
2015-01-19 08:07:37 -05:00
|
|
|
|
2015-04-13 01:27:45 -04:00
|
|
|
def submodule_link(blob, ref, repository = @repository)
|
|
|
|
tree, commit = submodule_links(blob, ref, repository)
|
2015-01-19 08:07:37 -05:00
|
|
|
commit_id = if commit.nil?
|
2015-12-02 08:53:20 -05:00
|
|
|
Commit.truncate_sha(blob.id)
|
2015-01-19 08:07:37 -05:00
|
|
|
else
|
2015-12-02 08:53:20 -05:00
|
|
|
link_to Commit.truncate_sha(blob.id), commit
|
2015-01-19 08:07:37 -05:00
|
|
|
end
|
|
|
|
|
|
|
|
[
|
|
|
|
content_tag(:span, link_to(truncate(blob.name, length: 40), tree)),
|
|
|
|
'@',
|
|
|
|
content_tag(:span, commit_id, class: 'monospace'),
|
|
|
|
].join(' ').html_safe
|
|
|
|
end
|
2015-09-30 06:31:02 -04:00
|
|
|
|
2016-05-10 18:41:46 -04:00
|
|
|
def commit_for_diff(diff_file)
|
2016-07-06 19:29:41 -04:00
|
|
|
return diff_file.content_commit if diff_file.content_commit
|
2016-07-08 17:50:06 -04:00
|
|
|
|
2016-05-10 18:41:46 -04:00
|
|
|
if diff_file.deleted_file
|
2016-01-20 12:44:27 -05:00
|
|
|
@base_commit || @commit.parent || @commit
|
2015-09-30 06:31:02 -04:00
|
|
|
else
|
|
|
|
@commit
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-08-10 05:28:42 -04:00
|
|
|
def diff_file_html_data(project, diff_file_path, diff_commit_id)
|
2015-09-30 06:31:02 -04:00
|
|
|
{
|
|
|
|
blob_diff_path: namespace_project_blob_diff_path(project.namespace, project,
|
2016-08-10 05:28:42 -04:00
|
|
|
tree_join(diff_commit_id, diff_file_path)),
|
2016-07-21 14:44:12 -04:00
|
|
|
view: diff_view
|
2015-09-30 06:31:02 -04:00
|
|
|
}
|
|
|
|
end
|
|
|
|
|
|
|
|
def editable_diff?(diff)
|
|
|
|
!diff.deleted_file && @merge_request && @merge_request.source_project
|
|
|
|
end
|
2015-11-17 04:49:23 -05:00
|
|
|
|
|
|
|
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-02-19 17:20:39 -05:00
|
|
|
link_to url_for(params_copy), id: "#{name}-diff-btn", class: (selected ? 'btn active' : 'btn'), data: { view_type: name } do
|
2015-11-17 04:49:23 -05:00
|
|
|
title
|
|
|
|
end
|
|
|
|
end
|
2016-03-23 12:10:17 -04:00
|
|
|
|
2016-04-18 17:51:30 -04:00
|
|
|
def commit_diff_whitespace_link(project, commit, options)
|
2016-04-12 13:49:34 -04:00
|
|
|
url = namespace_project_commit_path(project.namespace, project, commit.id, params_with_whitespace)
|
2016-04-18 17:51:30 -04:00
|
|
|
toggle_whitespace_link(url, options)
|
2016-04-12 13:49:34 -04:00
|
|
|
end
|
|
|
|
|
2016-04-18 17:51:30 -04:00
|
|
|
def diff_merge_request_whitespace_link(project, merge_request, options)
|
2016-04-12 13:49:34 -04:00
|
|
|
url = diffs_namespace_project_merge_request_path(project.namespace, project, merge_request, params_with_whitespace)
|
2016-04-18 17:51:30 -04:00
|
|
|
toggle_whitespace_link(url, options)
|
2016-04-12 13:49:34 -04:00
|
|
|
end
|
|
|
|
|
2016-06-09 13:26:14 -04:00
|
|
|
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-04-04 13:01:59 -04:00
|
|
|
def hide_whitespace?
|
2016-03-23 12:10:17 -04:00
|
|
|
params[:w] == '1'
|
|
|
|
end
|
|
|
|
|
|
|
|
def params_with_whitespace
|
2016-04-04 13:01:59 -04:00
|
|
|
hide_whitespace? ? request.query_parameters.except(:w) : request.query_parameters.merge(w: 1)
|
2016-03-23 12:10:17 -04:00
|
|
|
end
|
|
|
|
|
2016-04-18 17:51:30 -04:00
|
|
|
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]
|
2016-03-23 12:10:17 -04:00
|
|
|
end
|
2016-12-30 14:16:25 -05:00
|
|
|
|
|
|
|
def render_overflow_warning?(diff_files)
|
|
|
|
diffs = @merge_request_diff.presence || diff_files
|
|
|
|
|
|
|
|
diffs.overflow?
|
|
|
|
end
|
2014-07-15 11:28:21 -04:00
|
|
|
end
|