nagachika	2013-03-09 22:54:25 +0900 (Sat, 09 Mar 2013)

  New Revision: 39667

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=39667

  Log:
    merge revision(s) 39424:
    
    merger.rb: suppress warnings
    
    * tool/merger.rb (version_up, tag, default_merge_branch): suppress
      syntax warnings.

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/tool/merger.rb
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 39666)
+++ ruby_2_0_0/version.h	(revision 39667)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-03-09"
-#define RUBY_PATCHLEVEL 36
+#define RUBY_PATCHLEVEL 37
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 3
Index: ruby_2_0_0/tool/merger.rb
===================================================================
--- ruby_2_0_0/tool/merger.rb	(revision 39666)
+++ ruby_2_0_0/tool/merger.rb	(revision 39667)
@@ -64,7 +64,7 @@ end https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/tool/merger.rb#L64
 def version_up
   d = DateTime.now
   d = d.new_offset(Rational(9,24)) # we need server locale (i.e. japanese) time
-  system *%w'svn revert version.h'
+  system(*%w'svn revert version.h')
   v, p = version
 
   teeny = v[2]
@@ -91,9 +91,9 @@ def version_up https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/tool/merger.rb#L91
    %W[RUBY_RELEASE_MONTH #{d.month}],
    %W[RUBY_RELEASE_DAY   #{d.day}],
   ].each do |(k, i)|
-    str.sub! /^(#define\s+#{k}\s+).*$/, "\\1#{i}"
+    str.sub!(/^(#define\s+#{k}\s+).*$/, "\\1#{i}")
   end
-  str.sub! /\s+\z/m, ''
+  str.sub!(/\s+\z/m, '')
   fn = sprintf 'version.h.tmp.%032b', rand(1 << 31)
   File.rename 'version.h', fn
   open 'version.h', 'wb' do |f|
@@ -130,7 +130,7 @@ def tag intv_p = false, relname=nil https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/tool/merger.rb#L130
     interactive "OK? svn cp -m \"add tag #{tagname}\" #{branch_url} #{tag_url}" do
     end
   end
-  system *%w'svn cp -m' + ["add tag #{tagname}"] + [branch_url, tag_url]
+  system(*%w'svn cp -m', "add tag #{tagname}", branch_url, tag_url)
 end
 
 def default_merge_branch
@@ -157,7 +157,7 @@ else https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/tool/merger.rb#L157
   end
 
   q = $repos + (ARGV[1] || default_merge_branch)
-  revs = ARGV[0].split /,\s*/
+  revs = ARGV[0].split(/,\s*/)
   log = ''
   log_svn = ''
 
@@ -189,7 +189,7 @@ else https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/tool/merger.rb#L189
     STDERR.puts a.join(' ')
 
     system(*a)
-    system *%w'svn revert ChangeLog' if /^\+/ =~ l
+    system(*%w'svn revert ChangeLog') if /^\+/ =~ l
   end
 
   if `svn diff --diff-cmd=diff -x -upw`.empty?
@@ -198,13 +198,13 @@ else https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/tool/merger.rb#L198
   end
 
   if /^\+/ =~ log
-    system *%w'svn revert ChangeLog'
+    system(*%w'svn revert ChangeLog')
     IO.popen %w'patch -p0', 'wb' do |f|
       f.write log.gsub(/\+(Mon|Tue|Wed|Thu|Fri|Sat|Sun) (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec) [ 123][0-9] [012][0-9]:[0-5][0-9]:[0-5][0-9] \d\d\d\d/,
                        # this format-time-string was from the file local variables of ChangeLog
                        '+'+Time.now.strftime('%a %b %e %H:%M:%S %Y'))
     end
-    system *%w'touch ChangeLog' # needed somehow, don't know why...
+    system(*%w'touch ChangeLog') # needed somehow, don't know why...
   else
     STDERR.puts '*** You should write ChangeLog NOW!!! ***'
   end
@@ -228,7 +228,7 @@ else https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/tool/merger.rb#L228
     end
   end
 
-  if system *%w'svn ci -F' + [f.path]
+  if system(*%w'svn ci -F', f.path)
     # tag :interactive # no longer needed.
     system 'rm -f subversion.commitlog'
   else

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r39424


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/