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
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
|
# encoding: utf-8
#--
# Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)
# Copyright (C) 2008 Johan Sørensen <johan@johansorensen.com>
# Copyright (C) 2008 David A. Cuadrado <krawek@gmail.com>
# Copyright (C) 2008 Tor Arne Vestbø <tavestbo@trolltech.com>
# Copyright (C) 2009 Fabio Akita <fabio.akita@gmail.com>
#
# 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 MergeRequest < ActiveRecord::Base
include ActiveMessaging::MessageSender
belongs_to :user
belongs_to :source_repository, :class_name => 'Repository'
belongs_to :target_repository, :class_name => 'Repository'
has_many :events, :as => :target, :dependent => :destroy
has_many :messages, :as => :notifiable
has_many :comments, :as => :target, :dependent => :destroy
has_many :versions, :class_name => 'MergeRequestVersion', :order => 'version'
before_destroy :nullify_messages
is_indexed :fields => ["proposal", {:field => "status_tag", :as => "status"}],
:include => [{
:association_name => "user",
:field => "login",
:as => "proposed_by"
}], :conditions => "status != 0"
attr_protected :user_id, :status, :merge_requests_need_signoff, :oauth_path_prefix,
:oauth_signoff_key, :oauth_signoff_secret, :oauth_signoff_site
validates_presence_of :user, :source_repository, :target_repository
validates_presence_of :ending_commit, :on => :create
STATUS_PENDING_ACCEPTANCE_OF_TERMS = 0
STATUS_OPEN = 1
STATUS_MERGED = 2
STATUS_REJECTED = 3
STATUS_VERIFYING = 4
state_machine :status, :initial => :pending do
state :pending, :value => ::MergeRequest::STATUS_PENDING_ACCEPTANCE_OF_TERMS
state :open, :value => ::MergeRequest::STATUS_OPEN
state :merged, :value => ::MergeRequest::STATUS_MERGED
state :rejected, :value => ::MergeRequest::STATUS_REJECTED
state :verifying, :value => ::MergeRequest::STATUS_VERIFYING
event :open do
transition :pending => :open
end
event :in_verification do
transition :open => :verifying
end
event :reject do
transition [:open, :verifying] => :rejected
end
event :merge do
transition [:open, :verifying] => :merged
end
event :reopen do
transition [:merged, :rejected] => :open
end
end
named_scope :open, :conditions => ['LCASE(status_tag) in (?) OR status_tag IS NULL', ['open','verifying']]
named_scope :closed, :conditions => ["LCASE(status_tag) in (?)", ['merged','rejected']]
named_scope :merged, :conditions => ["LCASE(status_tag) = ?", 'merged']
named_scope :rejected, :conditions => ["LCASE(status_tag) = ?", 'rejected']
named_scope :by_status, lambda {|state|
{:conditions => ["LCASE(status_tag) = ?", state ] }
}
def reopen_with_user(a_user)
if can_be_reopened_by?(a_user)
return reopen
end
end
def can_be_reopened_by?(a_user)
return can_reopen? && resolvable_by?(a_user)
end
def self.human_name
I18n.t("activerecord.models.merge_request")
end
def self.count_open
count(:all, :conditions => {:status => STATUS_OPEN})
end
def self.statuses
@statuses ||= state_machines[:status].states.inject({}){ |result, state |
result[state.name.to_s.capitalize] = state.value
result
}
end
def self.from_filter(filter_name = nil)
case filter_name
when "open"
open
when "merged"
merged
when "rejected"
rejected
when String
by_status(filter_name)
else
open
end
end
def status_string
self.class.status_string(status)
end
def self.status_string(status_code)
statuses.invert[status_code.to_i].downcase
end
def pending_acceptance_of_terms?
pending?
end
def open_or_in_verification?
open? || verifying?
end
def possible_next_states
result = if status == STATUS_OPEN
[STATUS_MERGED, STATUS_REJECTED, STATUS_VERIFYING]
elsif status == STATUS_VERIFYING
[STATUS_MERGED, STATUS_REJECTED]
elsif status == STATUS_PENDING_ACCEPTANCE_OF_TERMS
[STATUS_OPEN]
else
[]
end
return result
end
def updated_by=(user)
self.updated_by_user_id = user.id
end
def updated_by
if updated_by_user_id.blank?
user
else
User.find(updated_by_user_id)
end
end
def with_user(a_user)
@current_user = a_user
yield
@current_user = nil
end
def status_tag=(s)
case s.downcase
when 'merged'
self.status = STATUS_MERGED
when 'rejected'
self.status = STATUS_REJECTED
when 'in_verification'
self.status = STATUS_VERIFYING
end
@previous_state = status_tag
write_attribute(:status_tag, s)
save
end
def create_status_change_event(comment)
if @current_user
message = "State changed "
message << "from <span class=\"changed\">#{@previous_state}</span> " if @previous_state
message << "to <span class=\"changed\">#{status_tag}</span>"
target_repository.project.create_event(Action::UPDATE_MERGE_REQUEST, self,
@current_user, message, comment)
end
end
# Returns a hash (for the view) of labels and event names for next states
# TODO: Obviously, putting the states and transitions inside a map is not all that DRY,
# but the state machine does not have a one-to-one relationship between states and events
def possible_next_states_hash
map = {
STATUS_OPEN => ['Open', 'open'],
STATUS_VERIFYING => ['Verifying', 'in_verification'],
STATUS_REJECTED => ['Rejected', 'reject'],
STATUS_MERGED => ['Merged', 'merge']
}
result = {}
possible_next_states.each do |s|
label, value = map[s]
result[label] = value
end
return result
end
def can_transition_to?(new_state)
send("can_#{new_state}?")
end
def transition_to(status)
if can_transition_to?(status)
send(status)
yield
return true
end
end
def source_branch
super || "master"
end
def target_branch
super || "master"
end
def deliver_status_update(a_user)
message = Message.new({
:sender => a_user,
:recipient => user,
:subject => "Your merge request was updated",
:body => "The merge request is now #{status_tag}.",
:notifiable => self,
})
message.save
end
def source_name
if source_repository
"#{source_repository.name}:#{source_branch}"
end
end
def target_name
if target_repository
"#{target_repository.name}:#{target_branch}"
end
end
def resolvable_by?(candidate)
return false unless candidate.is_a?(User)
candidate.can_write_to?(target_repository)
end
def commits_for_selection
return [] if !target_repository
@commits_for_selection ||= target_repository.git.commit_deltas_from(source_repository.git, target_branch, source_branch)
end
def applies_to_specific_commits?
!ending_commit.blank?
end
def commits_to_be_merged
if ready?
commit_diff_from_tracking_repo
else
commits_to_be_merged_when_no_version
end
end
def commits_to_be_merged_when_no_version
idx = commits_for_selection.index(commits_for_selection.find{|c| c.id == ending_commit})
return idx ? commits_for_selection[idx..-1] : []
end
def ready?
!versions.blank?
end
# Returns the name for the merge request branch. version can be:
# - the number of a version,
# - :current for the latest version
# - nil for no version
def merge_branch_name(version=false)
result = ["refs","merge-requests",id]
case version
when :current
result << versions.last.version
when Fixnum
result << version
end
result.join("/")
end
def commit_diff_from_tracking_repo(which_version=nil)
RAILS_DEFAULT_LOGGER.debug "Merge request looking for version #{which_version} in #{versions.collect(&:version)}"
version = if which_version
version_number(which_version)
else
versions.last
end
version.affected_commits
end
def potential_commits
if applies_to_specific_commits?
idx = commits_for_selection.index(commits_for_selection.find{|c| c.id == ending_commit})
return idx ? commits_for_selection[idx..-1] : []
else
return commits_for_selection
end
end
def target_branches_for_selection
return [] unless target_repository
target_repository.git.branches || []
end
def breadcrumb_parent
Breadcrumb::MergeRequests.new(target_repository)
end
def breadcrumb_css_class
"merge_request"
end
def title
source_repository.name
end
def acceptance_of_terms_required?
target_repository.requires_signoff_on_merge_requests?
end
# Publishes a notification, causing a new tracking branch (and version) to be created in the background
def publish_notification
publish :mirror_merge_request, {:merge_request_id => to_param}.to_json
end
def confirmed_by_user
self.status = STATUS_OPEN
self.status_tag = "open"
save
publish_notification
target_repository.committers.uniq.reject{|c|c == user}.each do |committer|
message = messages.build(
:sender => user,
:recipient => committer,
:subject => I18n.t("mailer.request_notification",
:login => user.login,
:title => target_repository.project.title),
:body => proposal,
:notifiable => self)
message.save
end
end
def oauth_request_token=(token)
self.oauth_token = token.token
self.oauth_secret = token.secret
end
def terms_accepted
validate_through_oauth do
confirmed_by_user
callback_response = access_token.post(target_repository.project.oauth_path_prefix, oauth_signoff_parameters)
if Net::HTTPAccepted === callback_response
self.contribution_notice = callback_response.body
end
contribution_agreement_version = callback_response['X-Contribution-Agreement-Version']
update_attributes(:contribution_agreement_version => contribution_agreement_version)
end
end
# If the contribution agreement site wants to remind the user of the current contribution license,
# they respond with a Net::HTTPAccepted header along with a response body containing the notice
def contribution_notice=(notice)
@contribution_notice = notice
end
def has_contribution_notice?
!contribution_notice.blank?
end
def contribution_notice
@contribution_notice
end
# Returns the parameters that are passed on to the contribution agreement site
def oauth_signoff_parameters
{
'commit_id' => ending_commit,
'user_email' => user.email,
'user_login' => user.login,
'user_name' => URI.escape(user.title),
'commit_shas' => commits_to_be_merged.collect(&:id).join(","),
'proposal' => URI.escape(proposal),
'project_name' => source_repository.project.slug,
'repository_name' => source_repository.name,
'merge_request_id' => id
}
end
def validate_through_oauth
yield if valid_oauth_credentials?
end
def access_token
@access_token ||= oauth_consumer.build_access_token(oauth_token, oauth_secret)
end
def oauth_consumer
target_repository.project.oauth_consumer
end
def ending_commit_exists?
!source_repository.git.commit(ending_commit).nil?
end
def to_xml(opts = {})
info_proc = Proc.new do |options|
builder = options[:builder]
builder.status(status_string)
builder.username(user.to_param_with_prefix)
builder.source_repository do |source|
source.name(source_repository.name)
source.branch(source_branch)
end
builder.target_repository do |source|
source.name(target_repository.name)
source.branch(target_branch)
end
end
super({
:procs => [info_proc],
:only => [:proposal, :created_at, :updated_at, :id, :ending_commit],
:methods => []
}.merge(opts))
end
def update_from_push!
push_new_branch_to_tracking_repo
save
end
def valid_oauth_credentials?
response = access_token.get("/")
return Net::HTTPSuccess === response
end
def nullify_messages
messages.update_all({:notifiable_id => nil, :notifiable_type => nil})
end
def recently_created?
!ready? && created_at > 2.minutes.ago
end
def push_to_tracking_repository!(force = false)
options = {:timeout => false}
options[:force] = true if force
branch_spec = "#{ending_commit}:#{merge_branch_name}"
source_repository.git.git.push(options,
target_repository.full_repository_path, branch_spec)
push_new_branch_to_tracking_repo
end
def push_new_branch_to_tracking_repo
branch_spec = [merge_branch_name, merge_branch_name(next_version_number)].join(":")
raise "No tracking repository exists for merge request #{id}" unless tracking_repository
target_repository.git.git.push({:timeout => false},
tracking_repository.full_repository_path, branch_spec)
create_new_version
target_repository.project.create_event(Action::UPDATE_MERGE_REQUEST, self,
user, "new version #{current_version_number}")
end
def delete_target_repository_ref
source_repository.git.git.push({},target_repository.full_repository_path, ":#{merge_branch_name}")
end
# Since we'll be deleting the ref in the backend, this will be handled in the message queue
def soft_delete
msg = {:merge_request_id => to_param, :action => "delete"}
publish :merge_request_backend_updates, msg.to_json
end
def tracking_repository
target_repository.create_tracking_repository unless target_repository.has_tracking_repository?
target_repository.tracking_repository
end
# Returns the version with version number +n+
def version_number(n)
versions.inject({}){|result,v|result[v.version]=v;result}[n]
end
def current_version_number
versions.blank? ? nil : versions.last.version
end
# Verify that +a_commit+ exists in target branch. Git cherry would
# return a list of commits if this is not the case
def commit_merged?(a_commit)
# FIXME: could fetch them all in one target_branch..this_branch operation
key = "merge_status_for_commit_#{a_commit}_in_repository_#{target_repository.id}"
result = Rails.cache.fetch(key, :expires_in => 60.minutes) do
output = target_repository.git.git.cherry({},target_branch, a_commit)
output.blank? ? :true : :false # Storing false in the cache would make it miss each time
end
result == :true
end
def create_new_version
result = build_new_version
result.merge_base_sha = calculate_merge_base
result.save
return result
end
def calculate_merge_base
target_repository.git.git.merge_base({:timeout => false},
target_branch, merge_branch_name).strip
end
def build_new_version
versions.build(:version => next_version_number)
end
def next_version_number
highest_version = versions.last
highest_version_number = highest_version ? highest_version.version : 0
highest_version_number + 1
end
# Migrate repositories from the old regime with reasons:
# If a reason exists: create a comment from the user who last updated us, provide the state to have it look right
# If no reason exists: simply set the status tag directly from whatever status_string is
def migrate_to_status_tag
if reason.blank?
self.status_tag = status_string
save
else
comment = comments.create!(:user => updated_by, :body => reason, :project => target_repository.project)
comment.state = status_string
comment.save!
end
end
end
|