From 14965c5f4b0160d22febd94f258b2ba1491a585e Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Sun, 28 Apr 2019 21:40:37 +0900 Subject: Drop SVN-specific method from Merger module to clarify it's not needed for Git support. --- tool/merger.rb | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/tool/merger.rb b/tool/merger.rb index 60cb00013f..c78c21a2d3 100755 --- a/tool/merger.rb +++ b/tool/merger.rb @@ -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 -- cgit v1.2.3