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

Stop using global variable for repos

Browse source 
to avoid having impact from other places.
This commit is contained in:
Takashi Kokubun 2019-04-28 22:02:09 +09:00
parent 9426da83c6
commit 1c8cefca31
No known key found for this signature in database
GPG key ID: 6FFC433B12EE23DD
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
tool/merger.rb
View file

@ -11,10 +11,11 @@ require 'tempfile'
require 'net/http' require 'net/http'
require 'uri' require 'uri'
$repos = 'svn+ssh://svn@ci.ruby-lang.org/ruby/'
ENV['LC_ALL'] = 'C' ENV['LC_ALL'] = 'C'
module Merger module Merger
REPOS = 'svn+ssh://svn@ci.ruby-lang.org/ruby/'
class << self class << self
def help def help
puts <<-end puts <<-end
@ -119,7 +120,7 @@ def tag intv_p = false, relname=nil
if pl == '-1' if pl == '-1'
abort "no relname is given and not in a release branch even if this is patch release" abort "no relname is given and not in a release branch even if this is patch release"
end end
branch_url = $repos + 'branches/ruby_' branch_url = "#{REPOS}branches/ruby_"
if v[0] < "2" || (v[0] == "2" && v[1] < "1") if v[0] < "2" || (v[0] == "2" && v[1] < "1")
abort "patchlevel must be greater than 0 for patch release" if pl == "0" abort "patchlevel must be greater than 0 for patch release" if pl == "0"
branch_url << x branch_url << x
@ -129,7 +130,7 @@ def tag intv_p = false, relname=nil
end end
end end
tagname = 'v' + x + (v[0] < "2" || (v[0] == "2" && v[1] < "1") || /^(?:preview|rc)/ =~ pl ? '_' + pl : '') tagname = 'v' + x + (v[0] < "2" || (v[0] == "2" && v[1] < "1") || /^(?:preview|rc)/ =~ pl ? '_' + pl : '')
tag_url = $repos + 'tags/' + tagname tag_url = "#{REPOS}tags/#{tagname}"
system(*%w'svn info', tag_url, out: IO::NULL, err: IO::NULL) system(*%w'svn info', tag_url, out: IO::NULL, err: IO::NULL)
if $?.success? if $?.success?
abort "specfied tag already exists. check tag name and remove it if you want to force re-tagging" abort "specfied tag already exists. check tag name and remove it if you want to force re-tagging"
@ -160,7 +161,7 @@ def remove_tag intv_p = false, relname
else else
tagname = relname tagname = relname
end end
tag_url = $repos + 'tags/' + tagname tag_url = "#{REPOS}tags/#{tagname}"
if intv_p if intv_p
interactive "OK? svn rm -m \"remove tag #{tagname}\" #{tag_url}" do interactive "OK? svn rm -m \"remove tag #{tagname}\" #{tag_url}" do
# nothing to do here # nothing to do here
@ -264,7 +265,7 @@ else
IO.popen(['git', 'apply'], 'w') { |f| f.write(patch) } IO.popen(['git', 'apply'], 'w') { |f| f.write(patch) }
else else
default_merge_branch = (%r{^URL: .*/branches/ruby_1_8_} =~ `svn info` ? 'branches/ruby_1_8' : 'trunk') default_merge_branch = (%r{^URL: .*/branches/ruby_1_8_} =~ `svn info` ? 'branches/ruby_1_8' : 'trunk')
svn_src = "#{$repos}#{ARGV[1] || default_merge_branch}" svn_src = "#{Merger::REPOS}#{ARGV[1] || default_merge_branch}"
message = IO.popen(['svn', 'log', '-r', svn_rev, svn_src], &:read) message = IO.popen(['svn', 'log', '-r', svn_rev, svn_src], &:read)
cmd = ['svn', 'merge', '--accept=postpone', '-r', svn_rev, svn_src] cmd = ['svn', 'merge', '--accept=postpone', '-r', svn_rev, svn_src]