gitlab-org--gitlab-foss/app/services/compare_service.rb

# frozen_string_literal: true

require 'securerandom'

# Compare 2 refs for one repo or between repositories
# and return Compare object that responds to commits and diffs
class CompareService
  attr_reader :start_project, :start_ref_name

  def initialize(new_start_project, new_start_ref_name)
    @start_project = new_start_project
    @start_ref_name = new_start_ref_name
  end

  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)

    return unless raw_compare && raw_compare.base && raw_compare.head

    Compare.new(raw_compare,
                start_project,
                base_sha: base_sha,
                straight: straight)
  end
end
Enable frozen string in apps/uploaders/*.rb Partially addresses #47424. 2018-07-05 06:18:17 -04:00			`# frozen_string_literal: true`

Revert "Merge branch 'revert-satellites' into 'master' " This reverts commit 5daf44b7c86e0e2641a902b1da8b01d91fa3dbfa, reversing changes made to 2f706fbd231cabe7a76a5d17ac44285aaaf8592c. 2015-08-11 08:33:31 -04:00			`require 'securerandom'`

Ensure MRs always use branch refs for comparison If a merge request was created with a branch name that also matched a tag name, we'd generate a comparison to or from the tag respectively, rather than the branch. Merging would still use the branch, of course. To avoid this, ensure that when we get the branch heads, we prepend the reference prefix for branches, which will ensure that we generate the correct comparison. 2017-11-24 06:58:05 -05:00			`# Compare 2 refs for one repo or between repositories`
Check that source and target branch exist This ensures the return value is consistent if the source and/or branch do not exist. 2019-04-14 10:26:03 -04:00			`# and return Compare object that responds to commits and diffs`
Refactor compare logic for MR. Use satellites only for forks for better performance Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> 2014-07-29 05:11:16 -04:00			`class CompareService`
Ensure MRs always use branch refs for comparison If a merge request was created with a branch name that also matched a tag name, we'd generate a comparison to or from the tag respectively, rather than the branch. Merging would still use the branch, of course. To avoid this, ensure that when we get the branch heads, we prepend the reference prefix for branches, which will ensure that we generate the correct comparison. 2017-11-24 06:58:05 -05:00			`attr_reader :start_project, :start_ref_name`
Fix Error 500 when comparing non-existing branches Closes #2593 2015-09-18 15:02:01 -04:00
Ensure MRs always use branch refs for comparison If a merge request was created with a branch name that also matched a tag name, we'd generate a comparison to or from the tag respectively, rather than the branch. Merging would still use the branch, of course. To avoid this, ensure that when we get the branch heads, we prepend the reference prefix for branches, which will ensure that we generate the correct comparison. 2017-11-24 06:58:05 -05:00			`def initialize(new_start_project, new_start_ref_name)`
Rename from base to start because base could mean merge base 2017-01-06 10:29:13 -05:00			`@start_project = new_start_project`
Ensure MRs always use branch refs for comparison If a merge request was created with a branch name that also matched a tag name, we'd generate a comparison to or from the tag respectively, rather than the branch. Merging would still use the branch, of course. To avoid this, ensure that when we get the branch heads, we prepend the reference prefix for branches, which will ensure that we generate the correct comparison. 2017-11-24 06:58:05 -05:00			`@start_ref_name = new_start_ref_name`
Introduce Repository#with_tmp_ref which we need commits from the other repository. We'll cleanup the tmp ref after we're done with our business. 2016-12-08 04:57:52 -05:00			`end`
Revert "Merge branch 'revert-satellites' into 'master' " This reverts commit 5daf44b7c86e0e2641a902b1da8b01d91fa3dbfa, reversing changes made to 2f706fbd231cabe7a76a5d17ac44285aaaf8592c. 2015-08-11 08:33:31 -04:00
Avoid re-fetching merge-base SHA from Gitaly unnecessarily 2018-03-07 20:29:12 -05:00			`def execute(target_project, target_ref, base_sha: nil, straight: false)`
Ensure MRs always use branch refs for comparison If a merge request was created with a branch name that also matched a tag name, we'd generate a comparison to or from the tag respectively, rather than the branch. Merging would still use the branch, of course. To avoid this, ensure that when we get the branch heads, we prepend the reference prefix for branches, which will ensure that we generate the correct comparison. 2017-11-24 06:58:05 -05:00			`raw_compare = target_project.repository.compare_source_branch(target_ref, start_project.repository, start_ref_name, straight: straight)`
Introduce Repository#with_repo_branch_commit We merge repository checks inside it so we don't have to check it on the call site, and we could also load the commit for the caller. This greatly reduce code duplication. Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7237#note_20572919 2017-01-04 12:52:21 -05:00
Check that source and target branch exist This ensures the return value is consistent if the source and/or branch do not exist. 2019-04-14 10:26:03 -04:00			`return unless raw_compare && raw_compare.base && raw_compare.head`
Avoid re-fetching merge-base SHA from Gitaly unnecessarily 2018-03-07 20:29:12 -05:00
			`Compare.new(raw_compare,`
Add latest changes from gitlab-org/gitlab@master 2020-01-30 16:08:47 -05:00			`start_project,`
Avoid re-fetching merge-base SHA from Gitaly unnecessarily 2018-03-07 20:29:12 -05:00			`base_sha: base_sha,`
			`straight: straight)`
Refactor compare logic for MR. Use satellites only for forks for better performance Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> 2014-07-29 05:11:16 -04:00			`end`
			`end`