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

256 lines
6.3 KiB
Ruby
Raw Normal View History

2014-09-02 18:07:02 +05:30
class MergeRequestDiff < ActiveRecord::Base
2015-04-26 12:48:37 +05:30
include Sortable
2016-06-22 15:30:34 +05:30
include Importable
2016-08-24 12:49:21 +05:30
include EncodingHelper
2015-04-26 12:48:37 +05:30
2015-09-25 12:07:36 +05:30
# Prevent store of diff if commits amount more then 500
2016-06-02 11:05:42 +05:30
COMMITS_SAFE_SIZE = 100
2014-09-02 18:07:02 +05:30
belongs_to :merge_request
2016-08-24 12:49:21 +05:30
delegate :source_branch_sha, :target_branch_sha, :target_branch, :source_branch, to: :merge_request, prefix: nil
2014-09-02 18:07:02 +05:30
state_machine :state, initial: :empty do
state :collected
2016-06-02 11:05:42 +05:30
state :overflow
# Deprecated states: these are no longer used but these values may still occur
# in the database.
2014-09-02 18:07:02 +05:30
state :timeout
state :overflow_commits_safe_size
state :overflow_diff_files_limit
state :overflow_diff_lines_limit
end
serialize :st_commits
serialize :st_diffs
2016-06-22 15:30:34 +05:30
after_create :reload_content, unless: :importing?
2016-08-24 12:49:21 +05:30
after_save :keep_around_commits, unless: :importing?
2014-09-02 18:07:02 +05:30
def reload_content
reload_commits
reload_diffs
end
2016-06-02 11:05:42 +05:30
def size
2016-09-13 17:45:13 +05:30
real_size.presence || raw_diffs.size
2014-09-02 18:07:02 +05:30
end
2016-09-13 17:45:13 +05:30
def raw_diffs(options = {})
2016-06-02 11:05:42 +05:30
if options[:ignore_whitespace_change]
2016-09-13 17:45:13 +05:30
@raw_diffs_no_whitespace ||= begin
2016-06-02 11:05:42 +05:30
compare = Gitlab::Git::Compare.new(
2016-08-24 12:49:21 +05:30
repository.raw_repository,
self.start_commit_sha || self.target_branch_sha,
self.head_commit_sha || self.source_branch_sha,
2016-06-02 11:05:42 +05:30
)
compare.diffs(options)
end
else
2016-09-13 17:45:13 +05:30
@raw_diffs ||= {}
@raw_diffs[options] ||= load_diffs(st_diffs, options)
2016-06-02 11:05:42 +05:30
end
2015-11-26 14:37:03 +05:30
end
2014-09-02 18:07:02 +05:30
def commits
@commits ||= load_commits(st_commits || [])
end
def last_commit
commits.first
end
2015-10-24 18:46:33 +05:30
def first_commit
commits.last
end
2016-01-29 22:53:50 +05:30
def base_commit
2016-08-24 12:49:21 +05:30
return unless self.base_commit_sha
2016-01-29 22:53:50 +05:30
2016-08-24 12:49:21 +05:30
project.commit(self.base_commit_sha)
2016-01-29 22:53:50 +05:30
end
2016-08-24 12:49:21 +05:30
def start_commit
return unless self.start_commit_sha
2014-09-02 18:07:02 +05:30
2016-08-24 12:49:21 +05:30
project.commit(self.start_commit_sha)
2014-09-02 18:07:02 +05:30
end
2016-08-24 12:49:21 +05:30
def head_commit
return last_commit unless self.head_commit_sha
2014-09-02 18:07:02 +05:30
2016-08-24 12:49:21 +05:30
project.commit(self.head_commit_sha)
2014-09-02 18:07:02 +05:30
end
2016-09-13 17:45:13 +05:30
def diff_refs_by_sha?
base_commit_sha? && head_commit_sha? && start_commit_sha?
end
2016-08-24 12:49:21 +05:30
def compare
@compare ||=
begin
# Update ref for merge request
merge_request.fetch_ref
Gitlab::Git::Compare.new(
repository.raw_repository,
self.target_branch_sha,
self.source_branch_sha
)
end
2014-09-02 18:07:02 +05:30
end
2016-08-24 12:49:21 +05:30
private
2014-09-02 18:07:02 +05:30
# Collect array of Git::Commit objects
# between target and source branches
def unmerged_commits
2016-06-02 11:05:42 +05:30
commits = compare.commits
2014-09-02 18:07:02 +05:30
if commits.present?
2016-06-02 11:05:42 +05:30
commits = Commit.decorate(commits, merge_request.source_project).reverse
2014-09-02 18:07:02 +05:30
end
commits
end
2016-08-24 12:49:21 +05:30
def dump_commits(commits)
commits.map(&:to_hash)
end
def load_commits(array)
array.map { |hash| Commit.new(Gitlab::Git::Commit.new(hash), merge_request.source_project) }
end
2014-09-02 18:07:02 +05:30
# Reload all commits related to current merge request from repo
# and save it as array of hashes in st_commits db field
def reload_commits
2016-08-24 12:49:21 +05:30
new_attributes = {}
2014-09-02 18:07:02 +05:30
commit_objects = unmerged_commits
if commit_objects.present?
2016-08-24 12:49:21 +05:30
new_attributes[:st_commits] = dump_commits(commit_objects)
2014-09-02 18:07:02 +05:30
end
2016-08-24 12:49:21 +05:30
update_columns_serialized(new_attributes)
end
# Collect array of Git::Diff objects
# between target and source branches
def unmerged_diffs
compare.diffs(Commit.max_diff_options)
end
def dump_diffs(diffs)
if diffs.respond_to?(:map)
diffs.map(&:to_hash)
end
end
def load_diffs(raw, options)
if raw.respond_to?(:each)
if paths = options[:paths]
raw = raw.select do |diff|
paths.include?(diff[:old_path]) || paths.include?(diff[:new_path])
end
end
Gitlab::Git::DiffCollection.new(raw, options)
else
Gitlab::Git::DiffCollection.new([])
end
2014-09-02 18:07:02 +05:30
end
# Reload diffs between branches related to current merge request from repo
# and save it as array of hashes in st_diffs db field
def reload_diffs
2016-08-24 12:49:21 +05:30
new_attributes = {}
2014-09-02 18:07:02 +05:30
new_diffs = []
if commits.size.zero?
2016-08-24 12:49:21 +05:30
new_attributes[:state] = :empty
2014-09-02 18:07:02 +05:30
else
2016-06-02 11:05:42 +05:30
diff_collection = unmerged_diffs
2014-09-02 18:07:02 +05:30
2016-06-02 11:05:42 +05:30
if diff_collection.overflow?
# Set our state to 'overflow' to make the #empty? and #collected?
# methods (generated by StateMachine) return false.
2016-08-24 12:49:21 +05:30
new_attributes[:state] = :overflow
2014-09-02 18:07:02 +05:30
end
2016-08-24 12:49:21 +05:30
new_attributes[:real_size] = diff_collection.real_size
2014-09-02 18:07:02 +05:30
2016-06-02 11:05:42 +05:30
if diff_collection.any?
new_diffs = dump_diffs(diff_collection)
2016-08-24 12:49:21 +05:30
new_attributes[:state] = :collected
2016-06-02 11:05:42 +05:30
end
2014-09-02 18:07:02 +05:30
end
2016-08-24 12:49:21 +05:30
new_attributes[:st_diffs] = new_diffs
2016-01-29 22:53:50 +05:30
2016-08-24 12:49:21 +05:30
new_attributes[:start_commit_sha] = self.target_branch_sha
new_attributes[:head_commit_sha] = self.source_branch_sha
new_attributes[:base_commit_sha] = branch_base_sha
2016-01-29 22:53:50 +05:30
2016-08-24 12:49:21 +05:30
update_columns_serialized(new_attributes)
keep_around_commits
2014-09-02 18:07:02 +05:30
end
2016-08-24 12:49:21 +05:30
def project
merge_request.target_project
2014-09-02 18:07:02 +05:30
end
def repository
2016-08-24 12:49:21 +05:30
project.repository
2014-09-02 18:07:02 +05:30
end
2016-08-24 12:49:21 +05:30
def branch_base_commit
return unless self.source_branch_sha && self.target_branch_sha
2016-06-02 11:05:42 +05:30
2016-08-24 12:49:21 +05:30
project.merge_base_commit(self.source_branch_sha, self.target_branch_sha)
2016-02-05 20:25:01 +05:30
end
2014-09-02 18:07:02 +05:30
2016-08-24 12:49:21 +05:30
def branch_base_sha
branch_base_commit.try(:sha)
2016-06-02 11:05:42 +05:30
end
2016-08-24 12:49:21 +05:30
def utf8_st_diffs
st_diffs.map do |diff|
diff.each do |k, v|
diff[k] = encode_utf8(v) if v.respond_to?(:encoding)
end
end
2016-06-02 11:05:42 +05:30
end
2016-08-24 12:49:21 +05:30
#
# #save or #update_attributes providing changes on serialized attributes do a lot of
# serialization and deserialization calls resulting in bad performance.
# Using #update_columns solves the problem with just one YAML.dump per serialized attribute that we provide.
# As a tradeoff we need to reload the current instance to properly manage time objects on those serialized
# attributes. So to keep the same behaviour as the attribute assignment we reload the instance.
# The difference is in the usage of
# #write_attribute= (#update_attributes) and #raw_write_attribute= (#update_columns)
#
# Ex:
#
# new_attributes[:st_commits].first.slice(:committed_date)
# => {:committed_date=>2014-02-27 11:01:38 +0200}
# YAML.load(YAML.dump(new_attributes[:st_commits].first.slice(:committed_date)))
# => {:committed_date=>2014-02-27 10:01:38 +0100}
#
def update_columns_serialized(new_attributes)
return unless new_attributes.any?
update_columns(new_attributes.merge(updated_at: current_time_from_proper_timezone))
reload
end
def keep_around_commits
repository.keep_around(target_branch_sha)
repository.keep_around(source_branch_sha)
repository.keep_around(branch_base_sha)
2014-09-02 18:07:02 +05:30
end
end