2019-02-15 15:39:39 +05:30
|
|
|
# frozen_string_literal: true
|
|
|
|
|
2016-09-13 17:45:13 +05:30
|
|
|
module Gitlab
|
|
|
|
module Diff
|
|
|
|
module FileCollection
|
|
|
|
class Base
|
2018-12-05 23:21:45 +05:30
|
|
|
include Gitlab::Utils::StrongMemoize
|
|
|
|
|
2018-11-20 20:47:30 +05:30
|
|
|
attr_reader :project, :diff_options, :diff_refs, :fallback_diff_refs, :diffable
|
2016-09-13 17:45:13 +05:30
|
|
|
|
2020-01-01 13:55:28 +05:30
|
|
|
delegate :count, :size, :real_size, to: :raw_diff_files
|
2016-09-13 17:45:13 +05:30
|
|
|
|
|
|
|
def self.default_options
|
2018-12-05 23:21:45 +05:30
|
|
|
::Commit.max_diff_options.merge(ignore_whitespace_change: false, expanded: false, include_stats: true)
|
2016-09-13 17:45:13 +05:30
|
|
|
end
|
|
|
|
|
2017-09-10 17:25:29 +05:30
|
|
|
def initialize(diffable, project:, diff_options: nil, diff_refs: nil, fallback_diff_refs: nil)
|
2016-09-13 17:45:13 +05:30
|
|
|
diff_options = self.class.default_options.merge(diff_options || {})
|
|
|
|
|
2017-09-10 17:25:29 +05:30
|
|
|
@diffable = diffable
|
2018-12-05 23:21:45 +05:30
|
|
|
@include_stats = diff_options.delete(:include_stats)
|
2021-09-04 01:27:46 +05:30
|
|
|
@pagination_data = diff_options.delete(:pagination_data)
|
2017-09-10 17:25:29 +05:30
|
|
|
@project = project
|
2016-09-13 17:45:13 +05:30
|
|
|
@diff_options = diff_options
|
2017-09-10 17:25:29 +05:30
|
|
|
@diff_refs = diff_refs
|
|
|
|
@fallback_diff_refs = fallback_diff_refs
|
2018-12-05 23:21:45 +05:30
|
|
|
@repository = project.repository
|
2016-09-13 17:45:13 +05:30
|
|
|
end
|
|
|
|
|
2018-12-13 13:39:08 +05:30
|
|
|
def diffs
|
|
|
|
@diffs ||= diffable.raw_diffs(diff_options)
|
|
|
|
end
|
|
|
|
|
2021-02-22 17:27:13 +05:30
|
|
|
def diff_files(sorted: false)
|
|
|
|
raw_diff_files(sorted: sorted)
|
2020-01-01 13:55:28 +05:30
|
|
|
end
|
|
|
|
|
2021-02-22 17:27:13 +05:30
|
|
|
def raw_diff_files(sorted: false)
|
|
|
|
strong_memoize(:"raw_diff_files_#{sorted}") do
|
|
|
|
collection = diffs.decorate! { |diff| decorate_diff!(diff) }
|
|
|
|
collection = sort_diffs(collection) if sorted
|
|
|
|
collection
|
|
|
|
end
|
2020-01-01 13:55:28 +05:30
|
|
|
end
|
|
|
|
|
|
|
|
def diff_file_paths
|
|
|
|
diff_files.map(&:file_path)
|
|
|
|
end
|
|
|
|
|
|
|
|
def pagination_data
|
2021-09-04 01:27:46 +05:30
|
|
|
@pagination_data || empty_pagination_data
|
2016-09-13 17:45:13 +05:30
|
|
|
end
|
|
|
|
|
2019-02-15 15:39:39 +05:30
|
|
|
# This mutates `diff_files` lines.
|
|
|
|
def unfold_diff_files(positions)
|
|
|
|
positions_grouped_by_path = positions.group_by { |position| position.file_path }
|
|
|
|
|
|
|
|
diff_files.each do |diff_file|
|
|
|
|
positions = positions_grouped_by_path.fetch(diff_file.file_path, [])
|
|
|
|
positions.each { |position| diff_file.unfold_diff_lines(position) }
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2020-07-28 23:09:34 +05:30
|
|
|
def diff_file_with_old_path(old_path, a_mode = nil)
|
|
|
|
if Feature.enabled?(:file_identifier_hash) && a_mode.present?
|
|
|
|
diff_files.find { |diff_file| diff_file.old_path == old_path && diff_file.a_mode == a_mode }
|
|
|
|
else
|
|
|
|
diff_files.find { |diff_file| diff_file.old_path == old_path }
|
|
|
|
end
|
2017-09-10 17:25:29 +05:30
|
|
|
end
|
|
|
|
|
2020-07-28 23:09:34 +05:30
|
|
|
def diff_file_with_new_path(new_path, b_mode = nil)
|
|
|
|
if Feature.enabled?(:file_identifier_hash) && b_mode.present?
|
|
|
|
diff_files.find { |diff_file| diff_file.new_path == new_path && diff_file.b_mode == b_mode }
|
|
|
|
else
|
|
|
|
diff_files.find { |diff_file| diff_file.new_path == new_path }
|
|
|
|
end
|
2017-09-10 17:25:29 +05:30
|
|
|
end
|
|
|
|
|
2018-11-20 20:47:30 +05:30
|
|
|
def clear_cache
|
|
|
|
# No-op
|
|
|
|
end
|
|
|
|
|
|
|
|
def write_cache
|
|
|
|
# No-op
|
|
|
|
end
|
|
|
|
|
2016-09-13 17:45:13 +05:30
|
|
|
private
|
|
|
|
|
2021-09-04 01:27:46 +05:30
|
|
|
def empty_pagination_data
|
|
|
|
{
|
|
|
|
current_page: nil,
|
|
|
|
next_page: nil,
|
|
|
|
total_pages: nil
|
|
|
|
}
|
|
|
|
end
|
|
|
|
|
2018-12-05 23:21:45 +05:30
|
|
|
def diff_stats_collection
|
|
|
|
strong_memoize(:diff_stats) do
|
2020-07-28 23:09:34 +05:30
|
|
|
next unless fetch_diff_stats?
|
2018-12-05 23:21:45 +05:30
|
|
|
|
|
|
|
@repository.diff_stats(diff_refs.base_sha, diff_refs.head_sha)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2020-07-28 23:09:34 +05:30
|
|
|
def fetch_diff_stats?
|
|
|
|
# There are scenarios where we don't need to request Diff Stats,
|
|
|
|
# when caching for instance.
|
|
|
|
@include_stats && diff_refs
|
|
|
|
end
|
|
|
|
|
2016-09-13 17:45:13 +05:30
|
|
|
def decorate_diff!(diff)
|
2018-10-15 14:42:47 +05:30
|
|
|
return diff if diff.is_a?(File)
|
|
|
|
|
2018-12-05 23:21:45 +05:30
|
|
|
stats = diff_stats_collection&.find_by_path(diff.new_path)
|
|
|
|
|
|
|
|
Gitlab::Diff::File.new(diff,
|
|
|
|
repository: project.repository,
|
|
|
|
diff_refs: diff_refs,
|
|
|
|
fallback_diff_refs: fallback_diff_refs,
|
|
|
|
stats: stats)
|
2016-09-13 17:45:13 +05:30
|
|
|
end
|
2021-02-22 17:27:13 +05:30
|
|
|
|
|
|
|
def sort_diffs(diffs)
|
|
|
|
Gitlab::Diff::FileCollectionSorter.new(diffs).sort
|
|
|
|
end
|
2016-09-13 17:45:13 +05:30
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|