app/services/merge_requests/rebase_service.rb


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40

module MergeRequests
  class RebaseService < MergeRequests::WorkingCopyBaseService
    REBASE_ERROR = 'Rebase failed. Please rebase locally'.freeze

    def execute(merge_request)
      @merge_request = merge_request

      if rebase
        success
      else
        error(REBASE_ERROR)
      end
    end

    def rebase
      if merge_request.rebase_in_progress?
        log_error('Rebase task canceled: Another rebase is already in progress', save_message_on_model: true)
        return false
      end

      log_prefix = "#{self.class.name} info (#{merge_request.to_reference(full: true)}):"

      Gitlab::GitLogger.info("#{log_prefix} rebase started")

      rebase_sha = repository.rebase(current_user, merge_request)

      Gitlab::GitLogger.info("#{log_prefix} rebased to #{rebase_sha}")

      merge_request.update(rebase_commit_sha: rebase_sha)

      Gitlab::GitLogger.info("#{log_prefix} rebase SHA saved: #{rebase_sha}")

      true
    rescue => e
      log_error(REBASE_ERROR, save_message_on_model: true)
      log_error(e.message)
      false
    end
  end
end