gitlabhq/app/models/merge_request.rb

206 lines
4.6 KiB
Ruby
Raw Normal View History

require File.join(Rails.root, "app/models/commit")
2011-11-28 08:39:43 +01:00
class MergeRequest < ActiveRecord::Base
include IssueCommonality
2012-09-08 02:23:49 +02:00
include Votes
BROKEN_DIFF = "--broken-diff"
UNCHECKED = 1
CAN_BE_MERGED = 2
CANNOT_BE_MERGED = 3
serialize :st_commits
serialize :st_diffs
attr_accessor :should_remove_source_branch
2011-11-28 08:39:43 +01:00
validates_presence_of :source_branch
validates_presence_of :target_branch
validate :validate_branches
2011-11-28 08:39:43 +01:00
def self.find_all_by_branch(branch_name)
where("source_branch like :branch or target_branch like :branch", branch: branch_name)
end
2012-04-16 21:08:03 +02:00
def human_state
states = {
CAN_BE_MERGED => "can_be_merged",
CANNOT_BE_MERGED => "cannot_be_merged",
UNCHECKED => "unchecked"
}
states[self.state]
end
def validate_branches
if target_branch == source_branch
errors.add :base, "You can not use same branch for source and target branches"
end
end
def reload_code
self.reloaded_commits
self.reloaded_diffs
end
def unchecked?
state == UNCHECKED
end
def mark_as_unchecked
self.update_attributes(state: UNCHECKED)
end
2012-03-29 23:27:42 +02:00
def can_be_merged?
state == CAN_BE_MERGED
end
def check_if_can_be_merged
self.state = if Gitlab::Merge.new(self, self.author).can_be_merged?
CAN_BE_MERGED
else
CANNOT_BE_MERGED
end
self.save
2012-03-29 23:27:42 +02:00
end
2011-11-29 19:06:37 +01:00
def diffs
st_diffs || []
end
def reloaded_diffs
if open? && unmerged_diffs.any?
self.st_diffs = unmerged_diffs
self.save
end
rescue Grit::Git::GitTimeout
self.st_diffs = [BROKEN_DIFF]
self.save
end
def broken_diffs?
diffs == [BROKEN_DIFF]
end
def valid_diffs?
!broken_diffs?
end
def unmerged_diffs
# Only show what is new in the source branch compared to the target branch, not the other way around.
# The linex below with merge_base is equivalent to diff with three dots (git diff branch1...branch2)
# From the git documentation: "git diff A...B" is equivalent to "git diff $(git-merge-base A B) B"
common_commit = project.repo.git.native(:merge_base, {}, [target_branch, source_branch]).strip
diffs = project.repo.diff(common_commit, source_branch)
2011-11-29 19:06:37 +01:00
end
def last_commit
commits.first
2011-11-29 19:06:37 +01:00
end
def merged?
merged && merge_event
end
2012-03-15 22:32:00 +01:00
def merge_event
self.project.events.where(target_id: self.id, target_type: "MergeRequest", action: Event::Merged).last
2012-03-15 22:32:00 +01:00
end
def closed_event
self.project.events.where(target_id: self.id, target_type: "MergeRequest", action: Event::Closed).last
end
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
2012-03-29 23:27:42 +02:00
end
def mark_as_unmergable
self.update_attributes state: CANNOT_BE_MERGED
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
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
def automerge!(current_user)
2012-08-29 01:03:04 +02:00
if Gitlab::Merge.new(self, current_user).merge && self.unmerged_commits.empty?
self.merge!(current_user.id)
true
end
2012-06-04 23:08:41 +02:00
rescue
self.mark_as_unmergable
false
end
2012-07-05 00:26:23 +02:00
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
2011-11-28 08:39:43 +01:00
end
2011-12-18 15:09:16 +01:00
# == Schema Information
#
# Table name: merge_requests
#
2012-06-26 20:23:09 +02:00
# id :integer(4) not null, primary key
2011-12-18 15:09:16 +01:00
# target_branch :string(255) not null
# source_branch :string(255) not null
2012-06-26 20:23:09 +02:00
# project_id :integer(4) not null
# author_id :integer(4)
# assignee_id :integer(4)
2011-12-18 15:09:16 +01:00
# title :string(255)
2012-06-26 20:23:09 +02:00
# 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
2011-12-18 15:09:16 +01:00
#