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

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37023 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
ruby · Sep 24, 2012 · 8ac52a9 · 8ac52a9
1 parent a7353f6
commit 8ac52a9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -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>
 
 	* lib/mkmf.rb (String#unspace): unescape with backslashes.  normal

diff --git a/tool/merger.rb b/tool/merger.rb
@@ -128,6 +128,11 @@ def default_merge_branch
 else
   system 'svn up'
 
+  if /--ticket=(.*)/ =~ ARGV[0]
+    tickets = $1.split(/,/).map{|num| " [Backport ##{num}]"}
+    ARGV.shift
+  end
+
   q = $repos + (ARGV[1] || default_merge_branch)
   revs = ARGV[0].split /,\s*/
   log = ''
@@ -178,7 +183,7 @@ def default_merge_branch
 
   version_up
   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.flush
   f.close