diffs_controller.rb 2.3 KB
Newer Older
D
Douwe Maan 已提交
1 2 3 4 5 6
class Projects::MergeRequests::DiffsController < Projects::MergeRequests::ApplicationController
  include DiffForPath
  include DiffHelper
  include RendersNotes

  before_action :apply_diff_view_cookie!
M
micael.bergeron 已提交
7
  before_action :commit
D
Douwe Maan 已提交
8 9 10 11 12 13
  before_action :define_diff_vars
  before_action :define_diff_comment_vars

  def show
    @environment = @merge_request.environments_for(current_user).last

14
    render json: { html: view_to_html_string("projects/merge_requests/diffs/_diffs") }
D
Douwe Maan 已提交
15 16 17 18 19 20 21 22 23
  end

  def diff_for_path
    render_diff_for_path(@diffs)
  end

  private

  def define_diff_vars
24 25
    @merge_request_diffs = @merge_request.merge_request_diffs.viewable.select_without_diff.order_id_desc

26
    @compare = commit || find_merge_request_diff_compare
27 28 29 30 31
    return render_404 unless @compare

    @diffs = @compare.diffs(diff_options)
  end

M
micael.bergeron 已提交
32 33 34 35 36 37 38
  def commit
    return nil unless commit_id = params[:commit_id].presence
    return nil unless @merge_request.all_commit_shas.include?(commit_id)

    @commit ||= @project.commit(commit_id)
  end

39
  def find_merge_request_diff_compare
D
Douwe Maan 已提交
40
    @merge_request_diff =
41 42
      if diff_id = params[:diff_id].presence
        @merge_request.merge_request_diffs.viewable.find_by(id: diff_id)
D
Douwe Maan 已提交
43 44 45 46
      else
        @merge_request.merge_request_diff
      end

47 48
    return unless @merge_request_diff

D
Douwe Maan 已提交
49 50
    @comparable_diffs = @merge_request_diffs.select { |diff| diff.id < @merge_request_diff.id }

51
    if @start_sha = params[:start_sha].presence
D
Douwe Maan 已提交
52 53 54 55 56 57 58 59
      @start_version = @comparable_diffs.find { |diff| diff.head_commit_sha == @start_sha }

      unless @start_version
        @start_sha = @merge_request_diff.head_commit_sha
        @start_version = @merge_request_diff
      end
    end

60 61 62 63 64
    if @start_sha
      @merge_request_diff.compare_with(@start_sha)
    else
      @merge_request_diff
    end
D
Douwe Maan 已提交
65 66 67 68 69
  end

  def define_diff_comment_vars
    @new_diff_note_attrs = {
      noteable_type: 'MergeRequest',
70 71
      noteable_id: @merge_request.id,
      commit_id: @commit&.id
D
Douwe Maan 已提交
72 73 74 75 76 77 78
    }

    @diff_notes_disabled = false

    @use_legacy_diff_notes = !@merge_request.has_complete_diff_refs?

    @grouped_diff_discussions = @merge_request.grouped_diff_discussions(@compare.diff_refs)
79
    @notes = prepare_notes_for_rendering(@grouped_diff_discussions.values.flatten.flat_map(&:notes), @merge_request)
D
Douwe Maan 已提交
80 81
  end
end