1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
|
# encoding: utf-8
#--
# Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#++
class MergeRequestVersion < ActiveRecord::Base
include ActiveMessaging::MessageSender
belongs_to :merge_request
has_many :comments, :as => :target, :include => :user
before_destroy :schedule_branch_deletion
def affected_commits
Rails.cache.fetch(cache_key + '/affected_commits') do
@affected_commits ||= merge_request.tracking_repository.git.commits_between(
merge_base_sha, merge_request.merge_branch_name(version)).reverse
end
end
def diffs(sha_or_range=nil)
case sha_or_range
when Range
diff_backend.commit_diff(sha_or_range.begin, sha_or_range.end, true)
when String
diff_backend.single_commit_diff(sha_or_range)
else
diff_backend.commit_diff(merge_base_sha, merge_request.ending_commit)
end
end
def comments_for_path_and_sha(path, sha)
comments.select{|c|(c.path == path && c.sha1 == sha_range_string(sha))}
end
def comments_for_sha(sha, options={})
result = comments.select{|c|c.sha1 == sha_range_string(sha)}
if options[:include_merge_request_comments]
result.concat(merge_request.comments)
end
result
end
def short_merge_base
merge_base_sha[0..6]
end
def sha_summary(format = :short)
if affected_commits.blank?
format == :short ? short_merge_base : merge_base_sha
else
meth = format == :short ? :id_abbrev : :id
[affected_commits.last, affected_commits.first].collect(&meth).join("-")
end
end
def diff_backend
@diff_backend ||= DiffBackend.new(merge_request.target_repository.git)
end
class DiffBackend
def initialize(repository)
@repository = repository
end
# Returns the sha of +sha+'s parent. If none, return +sha+
def parent_commit_sha(sha)
first_parent = commit = Grit::Commit.find_all(@repository, sha,
{:max_count => 1}).first.parents.first
if first_parent.nil?
sha
else
first_parent.id
end
end
def cache_key(first, last=nil)
["merge_request_diff_v1", first, last].compact.join("_")
end
def commit_diff(first, last, diff_with_previous=false)
Rails.cache.fetch(cache_key(first,last)) do
first_commit_sha = if diff_with_previous
parent_commit_sha(first)
else
first
end
diff_string = @repository.git.ruby_git.diff(first_commit_sha ,last)
Grit::Diff.list_from_string(@repository, diff_string)
end
end
def single_commit_diff(sha)
Rails.cache.fetch(cache_key(sha)) do
@repository.commit(sha).diffs
end
end
end
# The unserialized message that is sent to the message queue
# for deleting the tracking branch
def branch_deletion_message
{
:source_repository_path => merge_request.source_repository.full_repository_path,
:tracking_repository_path => merge_request.tracking_repository.full_repository_path,
:target_branch_name => merge_request.merge_branch_name(version),
:source_repository_id => merge_request.source_repository.id
}
end
def schedule_branch_deletion
message = branch_deletion_message.to_json
publish :merge_request_version_deletion, message
end
private
# Returns a string representation of a sha range
def sha_range_string(string_or_range)
if Range === string_or_range
string_or_range = [string_or_range.begin, string_or_range.end].join("-")
end
string_or_range
end
end
|
