1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* tool/merger.rb: support to backport header as backport identifier.

Browse Source 
Now you can specify by 'merge revision(s) 49254: [Backport #10738]'.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54389 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2016-03-29 09:59:26 +00:00
parent 78f540019a
commit 33a8940855
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tool/merger.rb
View File

@ -168,11 +168,15 @@ when nil, "-h", "--help"
else else
system 'svn up' system 'svn up'
if /--ticket=(.*)/ =~ ARGV[0] case ARGV[0]
tickets = $1.split(/,/).map{|num| " [Backport ##{num}]"} when /--ticket=(.*)/
tickets = $1.split(/,/).map{|num| " [Backport ##{num}]"}.join
ARGV.shift ARGV.shift
when /merge revision\(s\) ([\d,\-]+):( \[.*)/
tickets = $2
ARGV[0] = $1
else else
tickets = [] tickets = ''
end end
q = $repos + (ARGV[1] || default_merge_branch) q = $repos + (ARGV[1] || default_merge_branch)
@ -237,7 +241,7 @@ else
version_up version_up
f = Tempfile.new 'merger.rb' f = Tempfile.new 'merger.rb'
f.printf "merge revision(s) %s:%s\n", revstr, tickets.join f.printf "merge revision(s) %s:%s\n", revstr, tickets
f.write log_svn f.write log_svn
f.flush f.flush
f.close f.close