2016-09-13 17:45:13 +05:30
|
|
|
class Compare
|
|
|
|
delegate :same, :head, :base, to: :@compare
|
|
|
|
|
|
|
|
attr_reader :project
|
|
|
|
|
|
|
|
def self.decorate(compare, project)
|
|
|
|
if compare.is_a?(Compare)
|
|
|
|
compare
|
|
|
|
else
|
|
|
|
self.new(compare, project)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-11-03 12:29:30 +05:30
|
|
|
def initialize(compare, project, straight: false)
|
2016-09-13 17:45:13 +05:30
|
|
|
@compare = compare
|
|
|
|
@project = project
|
2016-11-03 12:29:30 +05:30
|
|
|
@straight = straight
|
2016-09-13 17:45:13 +05:30
|
|
|
end
|
|
|
|
|
|
|
|
def commits
|
|
|
|
@commits ||= Commit.decorate(@compare.commits, project)
|
|
|
|
end
|
|
|
|
|
|
|
|
def start_commit
|
|
|
|
return @start_commit if defined?(@start_commit)
|
|
|
|
|
|
|
|
commit = @compare.base
|
|
|
|
@start_commit = commit ? ::Commit.new(commit, project) : nil
|
|
|
|
end
|
|
|
|
|
|
|
|
def head_commit
|
|
|
|
return @head_commit if defined?(@head_commit)
|
|
|
|
|
|
|
|
commit = @compare.head
|
|
|
|
@head_commit = commit ? ::Commit.new(commit, project) : nil
|
|
|
|
end
|
|
|
|
alias_method :commit, :head_commit
|
|
|
|
|
|
|
|
def base_commit
|
|
|
|
return @base_commit if defined?(@base_commit)
|
|
|
|
|
|
|
|
@base_commit = if start_commit && head_commit
|
|
|
|
project.merge_base_commit(start_commit.id, head_commit.id)
|
|
|
|
else
|
|
|
|
nil
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-11-03 12:29:30 +05:30
|
|
|
def start_commit_sha
|
|
|
|
start_commit.try(:sha)
|
|
|
|
end
|
|
|
|
|
|
|
|
def base_commit_sha
|
|
|
|
base_commit.try(:sha)
|
|
|
|
end
|
|
|
|
|
|
|
|
def head_commit_sha
|
|
|
|
commit.try(:sha)
|
|
|
|
end
|
|
|
|
|
2016-09-13 17:45:13 +05:30
|
|
|
def raw_diffs(*args)
|
|
|
|
@compare.diffs(*args)
|
|
|
|
end
|
|
|
|
|
|
|
|
def diffs(diff_options = nil)
|
|
|
|
Gitlab::Diff::FileCollection::Compare.new(self,
|
|
|
|
project: project,
|
|
|
|
diff_options: diff_options,
|
|
|
|
diff_refs: diff_refs)
|
|
|
|
end
|
|
|
|
|
|
|
|
def diff_refs
|
|
|
|
Gitlab::Diff::DiffRefs.new(
|
2016-11-03 12:29:30 +05:30
|
|
|
base_sha: @straight ? start_commit_sha : base_commit_sha,
|
|
|
|
start_sha: start_commit_sha,
|
|
|
|
head_sha: head_commit_sha
|
2016-09-13 17:45:13 +05:30
|
|
|
)
|
|
|
|
end
|
|
|
|
end
|