diff options
author | Jan Provaznik <jprovaznik@gitlab.com> | 2019-07-03 10:59:32 +0000 |
---|---|---|
committer | Jan Provaznik <jprovaznik@gitlab.com> | 2019-07-03 10:59:32 +0000 |
commit | 792af55fd455a4b1eb3f63d582925c40ab2b141d (patch) | |
tree | fc95200618b738734c3379c35f597385d1b747c6 /app/services | |
parent | f7d19f8b624de265761f28af4e3bd86641a86759 (diff) | |
parent | 2ceffce190165321a1818801e245456870c4708a (diff) | |
download | gitlab-ce-792af55fd455a4b1eb3f63d582925c40ab2b141d.tar.gz |
Merge branch 'jc-deprecate-diverging-count-with-max' into 'master'
Deprecate diverging commit count with max parameter
Closes gitaly#1702
See merge request gitlab-org/gitlab-ce!30275
Diffstat (limited to 'app/services')
-rw-r--r-- | app/services/branches/diverging_commit_counts_service.rb | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/app/services/branches/diverging_commit_counts_service.rb b/app/services/branches/diverging_commit_counts_service.rb index f947cec1663..a3404caf2d7 100644 --- a/app/services/branches/diverging_commit_counts_service.rb +++ b/app/services/branches/diverging_commit_counts_service.rb @@ -8,11 +8,7 @@ module Branches end def call(branch) - if Feature.enabled?('gitaly_count_diverging_commits_no_max') - diverging_commit_counts_without_max(branch) - else - diverging_commit_counts(branch) - end + diverging_commit_counts(branch) end private @@ -22,27 +18,9 @@ module Branches delegate :raw_repository, to: :repository def diverging_commit_counts(branch) - ## TODO: deprecate the below code after 12.0 @root_ref_hash ||= raw_repository.commit(repository.root_ref).id cache.fetch(:"diverging_commit_counts_#{branch.name}") do number_commits_behind, number_commits_ahead = - repository.raw_repository.diverging_commit_count( - @root_ref_hash, - branch.dereferenced_target.sha, - max_count: Repository::MAX_DIVERGING_COUNT) - - if number_commits_behind + number_commits_ahead >= Repository::MAX_DIVERGING_COUNT - { distance: Repository::MAX_DIVERGING_COUNT } - else - { behind: number_commits_behind, ahead: number_commits_ahead } - end - end - end - - def diverging_commit_counts_without_max(branch) - @root_ref_hash ||= raw_repository.commit(repository.root_ref).id - cache.fetch(:"diverging_commit_counts_without_max_#{branch.name}") do - number_commits_behind, number_commits_ahead = raw_repository.diverging_commit_count( @root_ref_hash, branch.dereferenced_target.sha) |