ebf98f27c4
Enables frozen string for the following: * lib/gitlab/fogbugz_import/**/*.rb * lib/gitlab/gfm/**/*.rb * lib/gitlab/git/**/*.rb * lib/gitlab/gitaly_client/**/*.rb * lib/gitlab/gitlab_import/**/*.rb * lib/gitlab/google_code_import/**/*.rb * lib/gitlab/gpg/**/*.rb * lib/gitlab/grape_logging/**/*.rb * lib/gitlab/graphql/**/*.rb * lib/gitlab/graphs/**/*.rb * lib/gitlab/hashed_storage/**/*.rb * lib/gitlab/health_checks/**/*.rb Partially address gitlab-org/gitlab-ce#47424.
47 lines
1.1 KiB
Ruby
47 lines
1.1 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
# Gitaly note: JV: no RPC's here.
|
|
|
|
module Gitlab
|
|
module Git
|
|
class Compare
|
|
attr_reader :head, :base, :straight
|
|
|
|
def initialize(repository, base, head, straight: false)
|
|
@repository = repository
|
|
@straight = straight
|
|
|
|
unless base && head
|
|
@commits = []
|
|
return
|
|
end
|
|
|
|
@base = Gitlab::Git::Commit.find(repository, base.try(:strip))
|
|
@head = Gitlab::Git::Commit.find(repository, head.try(:strip))
|
|
|
|
@commits = [] unless @base && @head
|
|
@commits = [] if same
|
|
end
|
|
|
|
def same
|
|
@base && @head && @base.id == @head.id
|
|
end
|
|
|
|
def commits
|
|
return @commits if defined?(@commits)
|
|
|
|
@commits = Gitlab::Git::Commit.between(@repository, @base.id, @head.id)
|
|
end
|
|
|
|
def diffs(options = {})
|
|
unless @head && @base
|
|
return Gitlab::Git::DiffCollection.new([])
|
|
end
|
|
|
|
paths = options.delete(:paths) || []
|
|
options[:straight] = @straight
|
|
Gitlab::Git::Diff.between(@repository, @head.id, @base.id, options, *paths)
|
|
end
|
|
end
|
|
end
|
|
end
|