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

* tool/merger.rb: add --ticket option to add ticket number.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37023 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2012-09-24 02:23:48 +00:00
parent a7353f6924
commit 8ac52a95d5
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Mon Sep 24 11:22:36 2012 NARUSE, Yui <naruse@ruby-lang.org>
* tool/merger.rb: add --ticket option to add ticket number.
Sun Sep 23 21:51:59 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> Sun Sep 23 21:51:59 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (String#unspace): unescape with backslashes. normal * lib/mkmf.rb (String#unspace): unescape with backslashes. normal

7
tool/merger.rb
View file

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