merge_request.rb 7.4 KB
Newer Older
D
Dmitriy Zaporozhets 已提交
1 2 3 4
# == Schema Information
#
# Table name: merge_requests
#
I
Izaak Alpert 已提交
5 6 7 8 9 10 11 12 13 14 15 16 17 18 19
#  id             :integer          not null, primary key
#  target_project_id :integer       not null
#  target_branch  :string(255)      not null
#  source_project_id :integer       not null
#  source_branch  :string(255)      not null
#  author_id      :integer
#  assignee_id    :integer
#  title          :string(255)
#  created_at     :datetime
#  updated_at     :datetime
#  st_commits     :text(2147483647)
#  st_diffs       :text(2147483647)
#  milestone_id   :integer
#  state          :string(255)
#  merge_status   :string(255)
D
Dmitriy Zaporozhets 已提交
20
#
D
Dmitriy Zaporozhets 已提交
21

22
require Rails.root.join("app/models/commit")
23
require Rails.root.join("lib/static_model")
24

D
Dmitriy Zaporozhets 已提交
25
class MergeRequest < ActiveRecord::Base
I
Izaak Alpert 已提交
26

27
  include Issuable
28

29 30
  belongs_to :target_project, foreign_key: :target_project_id, class_name: "Project"
  belongs_to :source_project, foreign_key: :source_project_id, class_name: "Project"
I
Izaak Alpert 已提交
31

32
  attr_accessible :title, :assignee_id, :source_project_id, :source_branch, :target_project_id, :target_branch, :milestone_id, :author_id_of_changes, :state_event
I
Izaak Alpert 已提交
33

34

A
Andrey Kumanyaev 已提交
35 36
  attr_accessor :should_remove_source_branch

A
Andrew8xx8 已提交
37
  state_machine :state, initial: :opened do
A
Andrew8xx8 已提交
38 39 40 41 42 43 44 45 46
    event :close do
      transition [:reopened, :opened] => :closed
    end

    event :merge do
      transition [:reopened, :opened] => :merged
    end

    event :reopen do
A
Andrew8xx8 已提交
47
      transition closed: :reopened
A
Andrew8xx8 已提交
48 49 50 51 52 53 54 55 56 57 58
    end

    state :opened

    state :reopened

    state :closed

    state :merged
  end

59 60 61 62 63 64 65 66 67 68 69 70 71
  state_machine :merge_status, initial: :unchecked do
    event :mark_as_unchecked do
      transition [:can_be_merged, :cannot_be_merged] => :unchecked
    end

    event :mark_as_mergeable do
      transition unchecked: :can_be_merged
    end

    event :mark_as_unmergeable do
      transition unchecked: :cannot_be_merged
    end

72
    state :unchecked
73

74 75 76 77
    state :can_be_merged

    state :cannot_be_merged
  end
78

79 80 81
  serialize :st_commits
  serialize :st_diffs

I
Izaak Alpert 已提交
82
  validates :source_project, presence: true
A
Andrey Kumanyaev 已提交
83
  validates :source_branch, presence: true
I
Izaak Alpert 已提交
84
  validates :target_project, presence: true
A
Andrey Kumanyaev 已提交
85
  validates :target_branch, presence: true
I
Izaak Alpert 已提交
86
  validate :validate_branches
D
Dmitriy Zaporozhets 已提交
87

88 89
  scope :of_group, ->(group) { where("source_project_id in (:group_project_ids) OR target_project_id in (:group_project_ids)", group_project_ids: group.project_ids) }
  scope :of_user_team, ->(team) { where("(source_project_id in (:team_project_ids) OR target_project_id in (:team_project_ids) AND assignee_id in (:team_member_ids))", team_project_ids: team.project_ids, team_member_ids: team.member_ids) }
I
Izaak Alpert 已提交
90 91
  scope :opened, -> { with_state(:opened) }
  scope :closed, -> { with_state(:closed) }
A
Andrew8xx8 已提交
92
  scope :merged, -> { with_state(:merged) }
I
Izaak Alpert 已提交
93
  scope :by_branch, ->(branch_name) { where("(source_branch LIKE :branch) OR (target_branch LIKE :branch)", branch: branch_name) }
A
Andrew8xx8 已提交
94
  scope :cared, ->(user) { where('assignee_id = :user OR author_id = :user', user: user.id) }
95
  scope :by_milestone, ->(milestone) { where(milestone_id: milestone) }
I
Izaak Alpert 已提交
96
  scope :in_projects, ->(project_ids) { where("source_project_id in (:project_ids) OR target_project_id in (:project_ids)", project_ids: project_ids) }
97
  scope :of_projects, ->(ids) { where(target_project_id: ids) }
98 99 100 101
  # Closed scope for merge request should return
  # both merged and closed mr's
  scope :closed, -> { with_states(:closed, :merged) }

102
  def validate_branches
I
Izaak Alpert 已提交
103 104
    if target_project==source_project && target_branch == source_branch
      errors.add :branch_conflict, "You can not use same project/branch for source and target"
105
    end
106

107
    if opened? || reopened?
I
Izaak Alpert 已提交
108
      similar_mrs = self.target_project.merge_requests.where(source_branch: source_branch, target_branch: target_branch, source_project_id: source_project.id).opened
109
      similar_mrs = similar_mrs.where('id not in (?)', self.id) if self.id
110

111
      if similar_mrs.any?
I
Izaak Alpert 已提交
112
        errors.add :base, "Cannot Create: This merge request already exists: #{similar_mrs.pluck(:title)}"
113
      end
114
    end
115 116
  end

117 118 119 120 121
  def reload_code
    self.reloaded_commits
    self.reloaded_diffs
  end

122
  def check_if_can_be_merged
123 124 125 126 127
    if Gitlab::Satellite::MergeAction.new(self.author, self).can_be_merged?
      mark_as_mergeable
    else
      mark_as_unmergeable
    end
128 129
  end

D
Dmitriy Zaporozhets 已提交
130
  def diffs
131
    @diffs ||= (load_diffs(st_diffs) || [])
132 133 134
  end

  def reloaded_diffs
A
Andrew8xx8 已提交
135
    if opened? && unmerged_diffs.any?
136
      self.st_diffs = dump_diffs(unmerged_diffs)
137
      self.save
138
    end
139 140 141
  end

  def broken_diffs?
142
    diffs == broken_diffs
143 144
  rescue
    true
145 146 147 148
  end

  def valid_diffs?
    !broken_diffs?
149 150 151
  end

  def unmerged_diffs
152 153 154
    diffs = if for_fork?
              Gitlab::Satellite::MergeAction.new(author, self).diffs_between_satellite
            else
155
              Gitlab::Git::Diff.between(target_project.repository, source_branch, target_branch)
156 157
            end

158
    diffs ||= []
I
Izaak Alpert 已提交
159
    diffs
D
Dmitriy Zaporozhets 已提交
160 161 162
  end

  def last_commit
163
    commits.first
D
Dmitriy Zaporozhets 已提交
164
  end
165

D
Dmitriy Zaporozhets 已提交
166
  def merge_event
I
Izaak Alpert 已提交
167
    self.target_project.events.where(target_id: self.id, target_type: "MergeRequest", action: Event::MERGED).last
D
Dmitriy Zaporozhets 已提交
168 169
  end

170
  def closed_event
I
Izaak Alpert 已提交
171
    self.target_project.events.where(target_id: self.id, target_type: "MergeRequest", action: Event::CLOSED).last
172 173
  end

174
  def commits
175
    load_commits(st_commits || [])
176 177 178
  end

  def probably_merged?
179
    unmerged_commits.empty? &&
180
      commits.any? && opened?
181 182
  end

183
  def reloaded_commits
A
Andrew8xx8 已提交
184
    if opened? && unmerged_commits.any?
185
      self.st_commits = dump_commits(unmerged_commits)
186
      save
I
Izaak Alpert 已提交
187

188 189 190 191 192
    end
    commits
  end

  def unmerged_commits
193 194 195 196 197
    if for_fork?
      commits = Gitlab::Satellite::MergeAction.new(self.author, self).commits_between
    else
      commits = target_project.repository.commits_between(self.target_branch, self.source_branch)
    end
198

I
Izaak Alpert 已提交
199 200
    if commits.present?
      commits = Commit.decorate(commits).
201 202
      sort_by(&:created_at).
      reverse
I
Izaak Alpert 已提交
203 204
    end
    commits
205
  end
206 207

  def merge!(user_id)
208
    self.author_id_of_changes = user_id
A
Andrew8xx8 已提交
209
    self.merge
210
  end
211

212
  def automerge!(current_user)
213
    if Gitlab::Satellite::MergeAction.new(current_user, self).merge! && self.unmerged_commits.empty?
214 215 216
      self.merge!(current_user.id)
      true
    end
Z
Zevs 已提交
217
  rescue
218
    mark_as_unmergeable
219 220
    false
  end
R
randx 已提交
221

222 223
  def mr_and_commit_notes
    commit_ids = commits.map(&:id)
224
    Note.where("(noteable_type = 'MergeRequest' AND noteable_id = :mr_id) OR (noteable_type = 'Commit' AND commit_id IN (:commit_ids))", mr_id: id, commit_ids: commit_ids)
225
  end
226

227 228 229
  # Returns the raw diff for this merge request
  #
  # see "git diff"
I
Izaak Alpert 已提交
230 231
  def to_diff(current_user)
    Gitlab::Satellite::MergeAction.new(current_user, self).diff_in_satellite
232 233 234 235 236
  end

  # Returns the commit as a series of email patches.
  #
  # see "git format-patch"
I
Izaak Alpert 已提交
237 238
  def to_patch(current_user)
    Gitlab::Satellite::MergeAction.new(current_user, self).format_patch
239
  end
240 241 242 243

  def last_commit_short_sha
    @last_commit_short_sha ||= last_commit.sha[0..10]
  end
244

I
Izaak Alpert 已提交
245 246 247 248 249 250 251 252
  def for_fork?
    target_project != source_project
  end

  def disallow_source_branch_removal?
    (source_project.root_ref? source_branch) || for_fork?
  end

253 254 255 256 257 258 259 260 261
  private

  def dump_commits(commits)
    commits.map(&:to_hash)
  end

  def load_commits(array)
    array.map { |hash| Commit.new(Gitlab::Git::Commit.new(hash)) }
  end
262 263

  def dump_diffs(diffs)
264
    if diffs == broken_diffs
265
      broken_diffs
266
    elsif diffs.respond_to?(:map)
267 268 269 270 271 272 273
      diffs.map(&:to_hash)
    end
  end

  def load_diffs(raw)
    if raw == broken_diffs
      broken_diffs
274
    elsif raw.respond_to?(:map)
275 276
      raw.map { |hash| Gitlab::Git::Diff.new(hash) }
    end
277 278
  end

279 280
  def broken_diffs
    [Gitlab::Git::Diff::BROKEN_DIFF]
281
  end
D
Dmitriy Zaporozhets 已提交
282
end