diff options
Diffstat (limited to 'app/services/compare_service.rb')
| -rw-r--r-- | app/services/compare_service.rb | 35 |
1 files changed, 11 insertions, 24 deletions
diff --git a/app/services/compare_service.rb b/app/services/compare_service.rb index a5ae4927412..2a69a205629 100644 --- a/app/services/compare_service.rb +++ b/app/services/compare_service.rb @@ -1,36 +1,23 @@ require 'securerandom' -# Compare 2 branches for one repo or between repositories +# Compare 2 refs for one repo or between repositories # and return Gitlab::Git::Compare object that responds to commits and diffs class CompareService - attr_reader :start_project, :start_branch_name + attr_reader :start_project, :start_ref_name - def initialize(new_start_project, new_start_branch_name) + def initialize(new_start_project, new_start_ref_name) @start_project = new_start_project - @start_branch_name = new_start_branch_name + @start_ref_name = new_start_ref_name end - def execute(target_project, target_branch, straight: false) - # If compare with other project we need to fetch ref first - target_project.repository.with_repo_branch_commit( - start_project.repository, - start_branch_name) do |commit| - break unless commit + def execute(target_project, target_ref, base_sha: nil, straight: false) + raw_compare = target_project.repository.compare_source_branch(target_ref, start_project.repository, start_ref_name, straight: straight) - compare(commit.sha, target_project, target_branch, straight: straight) - end - end - - private - - def compare(source_sha, target_project, target_branch, straight:) - raw_compare = Gitlab::Git::Compare.new( - target_project.repository.raw_repository, - target_branch, - source_sha, - straight: straight - ) + return unless raw_compare - Compare.new(raw_compare, target_project, straight: straight) + Compare.new(raw_compare, + target_project, + base_sha: base_sha, + straight: straight) end end |