kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Drop SVN-specific method from Merger module

Browse source 
to clarify it's not needed for Git support.
This commit is contained in:
Takashi Kokubun 2019-04-28 21:40:37 +09:00
parent fcb1875513
commit 14965c5f4b
No known key found for this signature in database
GPG key ID: 6FFC433B12EE23DD
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
tool/merger.rb
View file

@ -169,10 +169,6 @@ def remove_tag intv_p = false, relname
system(*%w'svn rm -m', "remove tag #{tagname}", tag_url)
end
def default_merge_branch
%r{^URL: .*/branches/ruby_1_8_} =~ `svn info` ? 'branches/ruby_1_8' : 'trunk'
end
private
# Prints the version of Ruby found in version.h
@ -235,7 +231,6 @@ else
tickets = ''
end
q = $repos + (ARGV[1] || Merger.default_merge_branch)
revstr = ARGV[0].delete('^, :\-0-9a-fA-F')
revs = revstr.split(/[,\s]+/)
commit_message = ''
@ -268,9 +263,11 @@ else
puts "+ git apply"
IO.popen(['git', 'apply'], 'w') { |f| f.write(patch) }
else
message = IO.popen(['svn', 'log', '-r', svn_rev, q], &:read)
default_merge_branch = (%r{^URL: .*/branches/ruby_1_8_} =~ `svn info` ? 'branches/ruby_1_8' : 'trunk')
svn_src = "#{$repos}#{ARGV[1] || default_merge_branch}"
message = IO.popen(['svn', 'log', '-r', svn_rev, svn_src], &:read)
cmd = ['svn', 'merge', '--accept=postpone', '-r', svn_rev, q]
cmd = ['svn', 'merge', '--accept=postpone', '-r', svn_rev, svn_src]
puts "+ #{cmd.join(' ')}"
system(*cmd)
end