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

I
Izaak Alpert 已提交
29 30 31 32 33 34 35
  belongs_to :target_project,:foreign_key => :target_project_id, class_name: "Project"
  belongs_to :source_project, :foreign_key => :source_project_id,class_name: "Project"

  BROKEN_DIFF = "--broken-diff"

  attr_accessible :title, :assignee_id, :source_project_id, :source_branch, :target_project_id, :target_branch,  :milestone_id,:author_id_of_changes, :state_event

36

A
Andrey Kumanyaev 已提交
37 38
  attr_accessor :should_remove_source_branch

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

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

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

    state :opened

    state :reopened

    state :closed

    state :merged
  end

61 62 63 64 65 66 67 68 69 70 71 72 73
  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

74
    state :unchecked
75

76 77 78 79
    state :can_be_merged

    state :cannot_be_merged
  end
80

81 82 83
  serialize :st_commits
  serialize :st_diffs

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

I
Izaak Alpert 已提交
90 91 92 93
  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) }
  scope :opened, -> { with_state(:opened) }
  scope :closed, -> { with_state(:closed) }
A
Andrew8xx8 已提交
94
  scope :merged, -> { with_state(:merged) }
I
Izaak Alpert 已提交
95
  scope :by_branch, ->(branch_name) { where("(source_branch LIKE :branch) OR (target_branch LIKE :branch)", branch: branch_name) }
A
Andrew8xx8 已提交
96
  scope :cared, ->(user) { where('assignee_id = :user OR author_id = :user', user: user.id) }
97
  scope :by_milestone, ->(milestone) { where(milestone_id: milestone) }
I
Izaak Alpert 已提交
98 99
  scope :by_project, ->(project_id) { where("source_project_id = :project_id OR target_project_id = :project_id", project_id: project_id) }
  scope :in_projects, ->(project_ids) { where("source_project_id in (:project_ids) OR target_project_id in (:project_ids)", project_ids: project_ids) }
100 101 102 103
  # Closed scope for merge request should return
  # both merged and closed mr's
  scope :closed, -> { with_states(:closed, :merged) }

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

109 110 111
    if opened? || reopened?
      similar_mrs = self.project.merge_requests.where(source_branch: source_branch, target_branch: target_branch).opened
      similar_mrs = similar_mrs.where('id not in (?)', self.id) if self.id
112

113 114 115
      if similar_mrs.any?
        errors.add :base, "There is already an open merge request for this branches"
      end
116
    end
117 118
  end

119 120 121 122 123
  def reload_code
    self.reloaded_commits
    self.reloaded_diffs
  end

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

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

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

  def broken_diffs?
144
    diffs == broken_diffs
145 146
  rescue
    true
147 148 149 150
  end

  def valid_diffs?
    !broken_diffs?
151 152 153
  end

  def unmerged_diffs
I
Izaak Alpert 已提交
154 155 156 157 158 159 160 161
    #TODO:[IA-8] this needs to be handled better -- logged etc
     diffs = Gitlab::Satellite::MergeAction.new(author, self).diffs_between_satellite
     if diffs
      diffs = diffs.map { |diff| Gitlab::Git::Diff.new(diff) }
     else
       diffs = []
     end
    diffs
D
Dmitriy Zaporozhets 已提交
162 163 164
  end

  def last_commit
165
    commits.first
D
Dmitriy Zaporozhets 已提交
166
  end
167

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

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

176
  def commits
177
    load_commits(st_commits || [])
178 179 180
  end

  def probably_merged?
181
    unmerged_commits.empty? &&
I
Izaak Alpert 已提交
182
        commits.any? && opened?
183 184
  end

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

190 191 192 193 194
    end
    commits
  end

  def unmerged_commits
I
Izaak Alpert 已提交
195 196 197 198 199 200 201 202
    commits = Gitlab::Satellite::MergeAction.new(self.author,self).commits_between
    commits = commits.map{ |commit| Gitlab::Git::Commit.new(commit, nil) }
    if commits.present?
      commits = Commit.decorate(commits).
        sort_by(&:created_at).
        reverse
    end
    commits
203
  end
204

I
Izaak Alpert 已提交
205

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

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

221 222
  def mr_and_commit_notes
    commit_ids = commits.map(&:id)
223
    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)
224
  end
225 226 227
  # Returns the raw diff for this merge request
  #
  # see "git diff"
I
Izaak Alpert 已提交
228 229
  def to_diff(current_user)
    Gitlab::Satellite::MergeAction.new(current_user, self).diff_in_satellite
230 231
  end

I
Izaak Alpert 已提交
232

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

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

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

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

252 253 254 255 256 257 258 259 260
  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
261 262

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

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

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