2019-02-15 15:39:39 +05:30
|
|
|
# frozen_string_literal: true
|
|
|
|
|
2016-08-24 12:49:21 +05:30
|
|
|
# Finds the diff position in the new diff that corresponds to the same location
|
|
|
|
# specified by the provided position in the old diff.
|
|
|
|
module Gitlab
|
|
|
|
module Diff
|
|
|
|
class PositionTracer
|
2017-09-10 17:25:29 +05:30
|
|
|
attr_accessor :project
|
2016-08-24 12:49:21 +05:30
|
|
|
attr_accessor :old_diff_refs
|
|
|
|
attr_accessor :new_diff_refs
|
|
|
|
attr_accessor :paths
|
|
|
|
|
2017-09-10 17:25:29 +05:30
|
|
|
def initialize(project:, old_diff_refs:, new_diff_refs:, paths: nil)
|
|
|
|
@project = project
|
2016-08-24 12:49:21 +05:30
|
|
|
@old_diff_refs = old_diff_refs
|
|
|
|
@new_diff_refs = new_diff_refs
|
|
|
|
@paths = paths
|
|
|
|
end
|
|
|
|
|
2019-09-30 21:07:59 +05:30
|
|
|
def trace(old_position)
|
2017-08-17 22:00:37 +05:30
|
|
|
return unless old_diff_refs&.complete? && new_diff_refs&.complete?
|
2019-09-30 21:07:59 +05:30
|
|
|
return unless old_position.diff_refs == old_diff_refs
|
2016-08-24 12:49:21 +05:30
|
|
|
|
2019-09-30 21:07:59 +05:30
|
|
|
strategy = old_position.on_text? ? LineStrategy : ImageStrategy
|
2016-08-24 12:49:21 +05:30
|
|
|
|
2019-09-30 21:07:59 +05:30
|
|
|
strategy.new(self).trace(old_position)
|
2016-08-24 12:49:21 +05:30
|
|
|
end
|
|
|
|
|
2017-09-10 17:25:29 +05:30
|
|
|
def ac_diffs
|
|
|
|
@ac_diffs ||= compare(
|
|
|
|
old_diff_refs.base_sha || old_diff_refs.start_sha,
|
|
|
|
new_diff_refs.base_sha || new_diff_refs.start_sha,
|
|
|
|
straight: true
|
|
|
|
)
|
2016-08-24 12:49:21 +05:30
|
|
|
end
|
|
|
|
|
2017-09-10 17:25:29 +05:30
|
|
|
def bd_diffs
|
|
|
|
@bd_diffs ||= compare(old_diff_refs.head_sha, new_diff_refs.head_sha, straight: true)
|
2016-08-24 12:49:21 +05:30
|
|
|
end
|
|
|
|
|
2017-09-10 17:25:29 +05:30
|
|
|
def cd_diffs
|
|
|
|
@cd_diffs ||= compare(new_diff_refs.start_sha, new_diff_refs.head_sha)
|
2016-08-24 12:49:21 +05:30
|
|
|
end
|
|
|
|
|
2019-09-30 21:07:59 +05:30
|
|
|
private
|
|
|
|
|
2017-09-10 17:25:29 +05:30
|
|
|
def compare(start_sha, head_sha, straight: false)
|
|
|
|
compare = CompareService.new(project, head_sha).execute(project, start_sha, straight: straight)
|
|
|
|
compare.diffs(paths: paths, expanded: true)
|
|
|
|
end
|
2016-08-24 12:49:21 +05:30
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|