merge_request.rb 5.3 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
  BROKEN_DIFF = "--broken-diff"

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

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

17 18 19
  serialize :st_commits
  serialize :st_diffs

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

  validates_presence_of :project_id
  validates_presence_of :author_id
  validates_presence_of :source_branch
  validates_presence_of :target_branch
28
  validate :validate_branches
D
Dmitriy Zaporozhets 已提交
29 30 31 32 33 34 35 36 37

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

  delegate :name,
           :email,
           :to => :assignee,
38
           :allow_nil => true,
D
Dmitriy Zaporozhets 已提交
39 40 41 42 43 44 45 46 47 48
           :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)}

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

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

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

72 73 74 75 76
  def reload_code
    self.reloaded_commits
    self.reloaded_diffs
  end

77 78 79 80
  def unchecked?
    state == UNCHECKED
  end

81 82 83 84
  def mark_as_unchecked
    self.update_attributes(:state => UNCHECKED)
  end

85
  def can_be_merged?
86 87 88 89
    state == CAN_BE_MERGED
  end

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

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

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

  def diffs
107 108 109 110 111 112
    st_diffs || []
  end

  def reloaded_diffs
    if open? && unmerged_diffs.any?
      self.st_diffs = unmerged_diffs
113
      self.save
114
    end
115 116 117 118 119 120 121 122 123 124 125 126

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

  def broken_diffs?
    diffs == [BROKEN_DIFF]
  end

  def valid_diffs?
    !broken_diffs?
127 128 129
  end

  def unmerged_diffs
D
Dmitriy Zaporozhets 已提交
130
    commits = project.repo.commits_between(target_branch, source_branch).map {|c| Commit.new(c)}
131
    diffs = project.repo.diff(commits.first.prev_commit.id, commits.last.id) rescue []
D
Dmitriy Zaporozhets 已提交
132 133 134
  end

  def last_commit
135
    commits.first
D
Dmitriy Zaporozhets 已提交
136
  end
137

138 139 140 141
  def merged? 
    merged && merge_event
  end

D
Dmitriy Zaporozhets 已提交
142 143 144 145
  def merge_event
    self.project.events.where(:target_id => self.id, :target_type => "MergeRequest", :action => Event::Merged).last
  end

146 147 148 149
  def closed_event
    self.project.events.where(:target_id => self.id, :target_type => "MergeRequest", :action => Event::Closed).last
  end

150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166
  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
167 168 169
  end

  def mark_as_unmergable
D
Dmitriy Zaporozhets 已提交
170
    self.update_attributes :state => CANNOT_BE_MERGED
171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187
  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
188 189 190 191 192 193 194 195 196 197 198

  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
199

200
  def automerge!(current_user)
201
    if Gitlab::Merge.new(self, current_user).merge
202 203 204
      self.merge!(current_user.id)
      true
    end
Z
Zevs 已提交
205
  rescue
206 207 208
    self.mark_as_unmergable
    false
  end
R
randx 已提交
209 210 211 212 213 214 215 216 217 218 219 220

  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 已提交
221
end
V
Valery Sizov 已提交
222 223 224 225
# == Schema Information
#
# Table name: merge_requests
#
R
randx 已提交
226
#  id            :integer(4)      not null, primary key
V
Valery Sizov 已提交
227 228
#  target_branch :string(255)     not null
#  source_branch :string(255)     not null
R
randx 已提交
229 230 231
#  project_id    :integer(4)      not null
#  author_id     :integer(4)
#  assignee_id   :integer(4)
V
Valery Sizov 已提交
232
#  title         :string(255)
R
randx 已提交
233 234 235 236 237 238 239
#  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 已提交
240 241
#