merge_request.rb 4.3 KB
Newer Older
1 2
require File.join(Rails.root, "app/models/commit")

D
Dmitriy Zaporozhets 已提交
3
class MergeRequest < ActiveRecord::Base
4
  include IssueCommonality
5 6
  include Upvote

7 8
  BROKEN_DIFF = "--broken-diff"

9 10 11 12
  UNCHECKED = 1
  CAN_BE_MERGED = 2
  CANNOT_BE_MERGED = 3

13 14 15
  serialize :st_commits
  serialize :st_diffs

16
  attr_accessor :should_remove_source_branch
D
Dmitriy Zaporozhets 已提交
17 18 19

  validates_presence_of :source_branch
  validates_presence_of :target_branch
20
  validate :validate_branches
D
Dmitriy Zaporozhets 已提交
21

22 23 24 25
  def self.find_all_by_branch(branch_name)
    where("source_branch like :branch or target_branch like :branch", :branch => branch_name)
  end

V
Valery Sizov 已提交
26 27 28 29 30 31 32 33 34
  def human_state
    states = {
      CAN_BE_MERGED =>  "can_be_merged",
      CANNOT_BE_MERGED => "cannot_be_merged",
      UNCHECKED => "unchecked"
    }
    states[self.state]
  end

35
  def validate_branches
36
    if target_branch == source_branch
37 38 39 40
      errors.add :base, "You can not use same branch for source and target branches"
    end
  end

41 42 43 44 45
  def reload_code
    self.reloaded_commits
    self.reloaded_diffs
  end

46 47 48 49
  def unchecked?
    state == UNCHECKED
  end

50 51 52 53
  def mark_as_unchecked
    self.update_attributes(:state => UNCHECKED)
  end

54
  def can_be_merged?
55 56 57 58
    state == CAN_BE_MERGED
  end

  def check_if_can_be_merged
59
    self.state = if Gitlab::Merge.new(self, self.author).can_be_merged?
60 61 62 63 64
                   CAN_BE_MERGED
                 else
                   CANNOT_BE_MERGED
                 end
    self.save
65 66
  end

D
Dmitriy Zaporozhets 已提交
67
  def diffs
68 69 70 71 72 73
    st_diffs || []
  end

  def reloaded_diffs
    if open? && unmerged_diffs.any?
      self.st_diffs = unmerged_diffs
74
      self.save
75
    end
76 77 78 79 80 81 82 83 84 85 86 87

  rescue Grit::Git::GitTimeout
    self.st_diffs = [BROKEN_DIFF]
    self.save
  end

  def broken_diffs?
    diffs == [BROKEN_DIFF]
  end

  def valid_diffs?
    !broken_diffs?
88 89 90
  end

  def unmerged_diffs
D
Dmitriy Zaporozhets 已提交
91
    commits = project.repo.commits_between(target_branch, source_branch).map {|c| Commit.new(c)}
92
    diffs = project.repo.diff(commits.first.prev_commit.id, commits.last.id) rescue []
D
Dmitriy Zaporozhets 已提交
93 94 95
  end

  def last_commit
96
    commits.first
D
Dmitriy Zaporozhets 已提交
97
  end
98

99
  def merged?
100 101 102
    merged && merge_event
  end

D
Dmitriy Zaporozhets 已提交
103 104 105 106
  def merge_event
    self.project.events.where(:target_id => self.id, :target_type => "MergeRequest", :action => Event::Merged).last
  end

107 108 109 110
  def closed_event
    self.project.events.where(:target_id => self.id, :target_type => "MergeRequest", :action => Event::Closed).last
  end

111 112 113 114 115
  def commits
    st_commits || []
  end

  def probably_merged?
116
    unmerged_commits.empty? &&
117 118 119 120 121 122 123 124 125 126 127
      commits.any? && open?
  end

  def open?
    !closed
  end

  def mark_as_merged!
    self.merged = true
    self.closed = true
    save
128 129 130
  end

  def mark_as_unmergable
D
Dmitriy Zaporozhets 已提交
131
    self.update_attributes :state => CANNOT_BE_MERGED
132 133
  end

134 135
  def reloaded_commits
    if open? && unmerged_commits.any?
136 137 138 139 140 141 142 143 144 145 146 147 148
      self.st_commits = unmerged_commits
      save
    end
    commits
  end

  def unmerged_commits
    self.project.repo.
      commits_between(self.target_branch, self.source_branch).
      map {|c| Commit.new(c)}.
      sort_by(&:created_at).
      reverse
  end
149 150 151 152 153 154 155 156 157 158 159

  def merge!(user_id)
    self.mark_as_merged!
    Event.create(
      :project => self.project,
      :action => Event::Merged,
      :target_id => self.id,
      :target_type => "MergeRequest",
      :author_id => user_id
    )
  end
160

161
  def automerge!(current_user)
162
    if Gitlab::Merge.new(self, current_user).merge
163 164 165
      self.merge!(current_user.id)
      true
    end
Z
Zevs 已提交
166
  rescue
167 168 169
    self.mark_as_unmergable
    false
  end
R
randx 已提交
170 171 172 173 174 175 176 177 178 179 180 181

  def to_raw
    FileUtils.mkdir_p(Rails.root.join("tmp", "patches"))
    patch_path = Rails.root.join("tmp", "patches", "merge_request_#{self.id}.patch")

    from = commits.last.id
    to = source_branch

    project.repo.git.run('', "format-patch" , " > #{patch_path.to_s}", {}, ["#{from}..#{to}", "--stdout"])

    patch_path
  end
D
Dmitriy Zaporozhets 已提交
182
end
V
Valery Sizov 已提交
183 184 185 186
# == Schema Information
#
# Table name: merge_requests
#
R
randx 已提交
187
#  id            :integer(4)      not null, primary key
V
Valery Sizov 已提交
188 189
#  target_branch :string(255)     not null
#  source_branch :string(255)     not null
R
randx 已提交
190 191 192
#  project_id    :integer(4)      not null
#  author_id     :integer(4)
#  assignee_id   :integer(4)
V
Valery Sizov 已提交
193
#  title         :string(255)
R
randx 已提交
194 195 196 197 198 199 200
#  closed        :boolean(1)      default(FALSE), not null
#  created_at    :datetime        not null
#  updated_at    :datetime        not null
#  st_commits    :text(2147483647
#  st_diffs      :text(2147483647
#  merged        :boolean(1)      default(FALSE), not null
#  state         :integer(4)      default(1), not null
V
Valery Sizov 已提交
201 202
#