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

D
Dmitriy Zaporozhets 已提交
3 4 5 6
class MergeRequest < ActiveRecord::Base
  belongs_to :project
  belongs_to :author, :class_name => "User"
  belongs_to :assignee, :class_name => "User"
7
  has_many :notes, :as => :noteable, :dependent => :destroy
D
Dmitriy Zaporozhets 已提交
8

9 10 11
  serialize :st_commits
  serialize :st_diffs

D
Dmitriy Zaporozhets 已提交
12
  attr_protected :author, :author_id, :project, :project_id
13
  attr_accessor :author_id_of_changes
D
Dmitriy Zaporozhets 已提交
14 15 16 17 18 19

  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
20
  validate :validate_branches
D
Dmitriy Zaporozhets 已提交
21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39

  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)}

40 41 42 43
  def self.search query
    where("title like :query", :query => "%#{query}%")
  end

44 45 46 47
  def self.find_all_by_branch(branch_name)
    where("source_branch like :branch or target_branch like :branch", :branch => branch_name)
  end

48
  def validate_branches
49
    if target_branch == source_branch
50 51 52 53
      errors.add :base, "You can not use same branch for source and target branches"
    end
  end

54 55 56 57 58
  def reload_code
    self.reloaded_commits
    self.reloaded_diffs
  end

59 60 61 62
  def can_be_merged?
    auto_merge
  end

D
Dmitriy Zaporozhets 已提交
63 64 65
  def new?
    today? && created_at == updated_at
  end
D
Dmitriy Zaporozhets 已提交
66 67

  def diffs
68 69 70 71 72 73 74 75 76 77 78 79
    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 已提交
80
    commits = project.repo.commits_between(target_branch, source_branch).map {|c| Commit.new(c)}
81
    diffs = project.repo.diff(commits.first.prev_commit.id, commits.last.id) rescue []
D
Dmitriy Zaporozhets 已提交
82 83 84
  end

  def last_commit
85
    commits.first
D
Dmitriy Zaporozhets 已提交
86
  end
87

88 89 90 91
  def merged? 
    merged && merge_event
  end

D
Dmitriy Zaporozhets 已提交
92 93 94 95
  def merge_event
    self.project.events.where(:target_id => self.id, :target_type => "MergeRequest", :action => Event::Merged).last
  end

96 97 98 99 100
  def closed_event
    self.project.events.where(:target_id => self.id, :target_type => "MergeRequest", :action => Event::Closed).last
  end


101 102 103 104
  # Return the number of +1 comments (upvotes)
  def upvotes
    notes.select(&:upvote?).size
  end
105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122

  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
123 124 125 126 127
  end

  def mark_as_unmergable
    self.auto_merge = false
    save
128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144
  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
145 146 147 148 149 150 151 152 153 154 155

  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
D
Dmitriy Zaporozhets 已提交
156
end
V
Valery Sizov 已提交
157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172
# == Schema Information
#
# Table name: merge_requests
#
#  id            :integer         not null, primary key
#  target_branch :string(255)     not null
#  source_branch :string(255)     not null
#  project_id    :integer         not null
#  author_id     :integer
#  assignee_id   :integer
#  title         :string(255)
#  closed        :boolean         default(FALSE), not null
#  created_at    :datetime
#  updated_at    :datetime
#