Commit 77032638 authored by Sean McGivern's avatar Sean McGivern

Merge branch 'gitaly-1215-ca-count-commits' into 'master'

Migrate CycleAnalytics::CommitCount to Gitaly

Closes gitaly#1215

See merge request gitlab-org/gitlab-ce!19481
parents a20d3ff2 1d50b6a4
......@@ -7,9 +7,7 @@ module Gitlab
end
def value
Gitlab::GitalyClient::StorageSettings.allow_disk_access do
@value ||= count_commits
end
@value ||= count_commits
end
private
......@@ -21,19 +19,11 @@ module Gitlab
def count_commits
return unless ref
repository = @project.repository.raw_repository
sha = @project.repository.commit(ref).sha
cmd = %W(git --git-dir=#{repository.path} log)
cmd << '--format=%H'
cmd << "--after=#{@from.iso8601}"
cmd << sha
output, status = Gitlab::Popen.popen(cmd)
raise IOError, output unless status.zero?
gitaly_commit_client.commit_count(ref, after: @from)
end
output.lines.count
def gitaly_commit_client
Gitlab::GitalyClient::CommitService.new(@project.repository.raw_repository)
end
def ref
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment