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

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

6 7 8 9
  UNCHECKED = 1
  CAN_BE_MERGED = 2
  CANNOT_BE_MERGED = 3

D
Dmitriy Zaporozhets 已提交
10 11 12
  belongs_to :project
  belongs_to :author, :class_name => "User"
  belongs_to :assignee, :class_name => "User"
13
  has_many :notes, :as => :noteable, :dependent => :destroy
D
Dmitriy Zaporozhets 已提交
14

15 16 17
  serialize :st_commits
  serialize :st_diffs

D
Dmitriy Zaporozhets 已提交
18
  attr_protected :author, :author_id, :project, :project_id
19 20
  attr_accessor :author_id_of_changes,
                :should_remove_source_branch
D
Dmitriy Zaporozhets 已提交
21 22 23 24 25 26

  validates_presence_of :project_id
  validates_presence_of :assignee_id
  validates_presence_of :author_id
  validates_presence_of :source_branch
  validates_presence_of :target_branch
27
  validate :validate_branches
D
Dmitriy Zaporozhets 已提交
28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46

  delegate :name,
           :email,
           :to => :author,
           :prefix => true

  delegate :name,
           :email,
           :to => :assignee,
           :prefix => true

  validates :title,
            :presence => true,
            :length   => { :within => 0..255 }

  scope :opened, where(:closed => false)
  scope :closed, where(:closed => true)
  scope :assigned, lambda { |u| where(:assignee_id => u.id)}

47 48 49 50
  def self.search query
    where("title like :query", :query => "%#{query}%")
  end

51 52 53 54
  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 已提交
55 56 57 58 59 60 61 62 63
  def human_state
    states = {
      CAN_BE_MERGED =>  "can_be_merged",
      CANNOT_BE_MERGED => "cannot_be_merged",
      UNCHECKED => "unchecked"
    }
    states[self.state]
  end

64
  def validate_branches
65
    if target_branch == source_branch
66 67 68 69
      errors.add :base, "You can not use same branch for source and target branches"
    end
  end

70 71 72 73 74
  def reload_code
    self.reloaded_commits
    self.reloaded_diffs
  end

75 76 77 78
  def unchecked?
    state == UNCHECKED
  end

79 80 81 82
  def mark_as_unchecked
    self.update_attributes(:state => UNCHECKED)
  end

83
  def can_be_merged?
84 85 86 87
    state == CAN_BE_MERGED
  end

  def check_if_can_be_merged
88
    self.state = if Gitlab::Merge.new(self, self.author).can_be_merged?
89 90 91 92 93
                   CAN_BE_MERGED
                 else
                   CANNOT_BE_MERGED
                 end
    self.save
94 95
  end

D
Dmitriy Zaporozhets 已提交
96 97 98 99
  def today?
    Date.today == created_at.to_date
  end

D
Dmitriy Zaporozhets 已提交
100 101 102
  def new?
    today? && created_at == updated_at
  end
D
Dmitriy Zaporozhets 已提交
103 104

  def diffs
105 106 107 108 109 110 111 112 113 114 115 116
    st_diffs || []
  end

  def reloaded_diffs
    if open? && unmerged_diffs.any?
      self.st_diffs = unmerged_diffs
      save
    end
    diffs
  end

  def unmerged_diffs
D
Dmitriy Zaporozhets 已提交
117
    commits = project.repo.commits_between(target_branch, source_branch).map {|c| Commit.new(c)}
118
    diffs = project.repo.diff(commits.first.prev_commit.id, commits.last.id) rescue []
D
Dmitriy Zaporozhets 已提交
119 120 121
  end

  def last_commit
122
    commits.first
D
Dmitriy Zaporozhets 已提交
123
  end
124

125 126 127 128
  def merged? 
    merged && merge_event
  end

D
Dmitriy Zaporozhets 已提交
129 130 131 132
  def merge_event
    self.project.events.where(:target_id => self.id, :target_type => "MergeRequest", :action => Event::Merged).last
  end

133 134 135 136
  def closed_event
    self.project.events.where(:target_id => self.id, :target_type => "MergeRequest", :action => Event::Closed).last
  end

137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153
  def commits
    st_commits || []
  end

  def probably_merged?
    unmerged_commits.empty? && 
      commits.any? && open?
  end

  def open?
    !closed
  end

  def mark_as_merged!
    self.merged = true
    self.closed = true
    save
154 155 156
  end

  def mark_as_unmergable
D
Dmitriy Zaporozhets 已提交
157
    self.update_attributes :state => CANNOT_BE_MERGED
158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174
  end

  def reloaded_commits 
    if open? && unmerged_commits.any? 
      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
175 176 177 178 179 180 181 182 183 184 185

  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
186

187
  def automerge!(current_user)
188
    if Gitlab::Merge.new(self, current_user).merge
189 190 191
      self.merge!(current_user.id)
      true
    end
Z
Zevs 已提交
192
  rescue
193 194 195
    self.mark_as_unmergable
    false
  end
D
Dmitriy Zaporozhets 已提交
196
end
V
Valery Sizov 已提交
197 198 199 200
# == Schema Information
#
# Table name: merge_requests
#
R
randx 已提交
201
#  id            :integer(4)      not null, primary key
V
Valery Sizov 已提交
202 203
#  target_branch :string(255)     not null
#  source_branch :string(255)     not null
R
randx 已提交
204 205 206
#  project_id    :integer(4)      not null
#  author_id     :integer(4)
#  assignee_id   :integer(4)
V
Valery Sizov 已提交
207
#  title         :string(255)
R
randx 已提交
208 209 210 211 212 213 214
#  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 已提交
215 216
#