debian-mirror-gitlab/app/models/diff_note.rb

166 lines
4.6 KiB
Ruby
Raw Normal View History

2017-08-17 22:00:37 +05:30
# A note on merge request or commit diffs
#
# A note of this type can be resolvable.
2016-08-24 12:49:21 +05:30
class DiffNote < Note
include NoteOnDiff
2017-08-17 22:00:37 +05:30
NOTEABLE_TYPES = %w(MergeRequest Commit).freeze
2017-09-10 17:25:29 +05:30
serialize :original_position, Gitlab::Diff::Position # rubocop:disable Cop/ActiveRecordSerialize
serialize :position, Gitlab::Diff::Position # rubocop:disable Cop/ActiveRecordSerialize
serialize :change_position, Gitlab::Diff::Position # rubocop:disable Cop/ActiveRecordSerialize
2016-08-24 12:49:21 +05:30
validates :original_position, presence: true
validates :position, presence: true
2018-03-17 18:26:18 +05:30
validates :diff_line, presence: true, if: :on_text?
validates :line_code, presence: true, line_code: true, if: :on_text?
2017-08-17 22:00:37 +05:30
validates :noteable_type, inclusion: { in: NOTEABLE_TYPES }
2016-08-24 12:49:21 +05:30
validate :positions_complete
validate :verify_supported
2018-03-17 18:26:18 +05:30
validate :diff_refs_match_commit, if: :for_commit?
2016-08-24 12:49:21 +05:30
2018-03-17 18:26:18 +05:30
before_validation :set_original_position, on: :create
before_validation :update_position, on: :create, if: :on_text?
before_validation :set_line_code, if: :on_text?
2016-08-24 12:49:21 +05:30
after_save :keep_around_commits
2017-08-17 22:00:37 +05:30
def discussion_class(*)
DiffDiscussion
2016-08-24 12:49:21 +05:30
end
2017-09-10 17:25:29 +05:30
%i(original_position position change_position).each do |meth|
2017-08-17 22:00:37 +05:30
define_method "#{meth}=" do |new_position|
if new_position.is_a?(String)
new_position = JSON.parse(new_position) rescue nil
end
2016-08-24 12:49:21 +05:30
2017-08-17 22:00:37 +05:30
if new_position.is_a?(Hash)
new_position = new_position.with_indifferent_access
new_position = Gitlab::Diff::Position.new(new_position)
end
2016-08-24 12:49:21 +05:30
2017-09-10 17:25:29 +05:30
return if new_position == read_attribute(meth)
2017-08-17 22:00:37 +05:30
super(new_position)
2016-08-24 12:49:21 +05:30
end
end
2018-03-17 18:26:18 +05:30
def on_text?
position.position_type == "text"
end
def on_image?
position.position_type == "image"
end
2016-08-24 12:49:21 +05:30
def diff_file
2018-10-15 14:42:47 +05:30
@diff_file ||=
begin
if created_at_diff?(noteable.diff_refs)
# We're able to use the already persisted diffs (Postgres) if we're
# presenting a "current version" of the MR discussion diff.
# So no need to make an extra Gitaly diff request for it.
# As an extra benefit, the returned `diff_file` already
# has `highlighted_diff_lines` data set from Redis on
# `Diff::FileCollection::MergeRequestDiff`.
noteable.diffs(paths: original_position.paths, expanded: true).diff_files.first
else
original_position.diff_file(self.project.repository)
end
end
2016-08-24 12:49:21 +05:30
end
def diff_line
2017-09-10 17:25:29 +05:30
@diff_line ||= diff_file&.line_for_position(self.original_position)
2016-08-24 12:49:21 +05:30
end
2016-09-13 17:45:13 +05:30
def original_line_code
2018-03-17 18:26:18 +05:30
return unless on_text?
2016-09-13 17:45:13 +05:30
self.diff_file.line_code(self.diff_line)
end
2016-08-24 12:49:21 +05:30
def active?(diff_refs = nil)
return false unless supported?
return true if for_commit?
2017-09-10 17:25:29 +05:30
diff_refs ||= noteable.diff_refs
2016-08-24 12:49:21 +05:30
self.position.diff_refs == diff_refs
end
2017-08-17 22:00:37 +05:30
def created_at_diff?(diff_refs)
return false unless supported?
return true if for_commit?
2016-09-13 17:45:13 +05:30
2017-08-17 22:00:37 +05:30
self.original_position.diff_refs == diff_refs
2016-09-13 17:45:13 +05:30
end
2016-08-24 12:49:21 +05:30
private
def supported?
2016-09-13 17:45:13 +05:30
for_commit? || self.noteable.has_complete_diff_refs?
end
2016-08-24 12:49:21 +05:30
def set_original_position
2017-08-17 22:00:37 +05:30
self.original_position = self.position.dup unless self.original_position&.complete?
2016-08-24 12:49:21 +05:30
end
def set_line_code
self.line_code = self.position.line_code(self.project.repository)
end
def update_position
return unless supported?
return if for_commit?
return if active?
2017-09-10 17:25:29 +05:30
tracer = Gitlab::Diff::PositionTracer.new(
project: self.project,
2016-08-24 12:49:21 +05:30
old_diff_refs: self.position.diff_refs,
2017-09-10 17:25:29 +05:30
new_diff_refs: self.noteable.diff_refs,
2016-08-24 12:49:21 +05:30
paths: self.position.paths
2017-09-10 17:25:29 +05:30
)
result = tracer.trace(self.position)
return unless result
if result[:outdated]
self.change_position = result[:position]
else
self.position = result[:position]
end
2016-08-24 12:49:21 +05:30
end
def verify_supported
return if supported?
errors.add(:noteable, "doesn't support new-style diff notes")
end
def positions_complete
return if self.original_position.complete? && self.position.complete?
errors.add(:position, "is invalid")
end
2018-03-17 18:26:18 +05:30
def diff_refs_match_commit
return if self.original_position.diff_refs == self.commit.diff_refs
errors.add(:commit_id, 'does not match the diff refs')
end
2016-08-24 12:49:21 +05:30
def keep_around_commits
project.repository.keep_around(self.original_position.base_sha)
project.repository.keep_around(self.original_position.start_sha)
project.repository.keep_around(self.original_position.head_sha)
if self.position != self.original_position
project.repository.keep_around(self.position.base_sha)
project.repository.keep_around(self.position.start_sha)
project.repository.keep_around(self.position.head_sha)
end
end
end