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

tool/merger.rb: normalize the merged revision string

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45189 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2014-02-27 04:10:03 +00:00
parent 295e4bfd04
commit 1ebf8916b2
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tool/merger.rb
View File

@ -170,19 +170,25 @@ else
end end
q = $repos + (ARGV[1] || default_merge_branch) q = $repos + (ARGV[1] || default_merge_branch)
revs = ARGV[0].split(/,\s*/) revstr = ARGV[0].delete('^, :\-0-9')
revs = revstr.split(/[,\s]+/)
log = '' log = ''
log_svn = '' log_svn = ''
revs.each do |rev| revs.each do |rev|
case rev case rev
when /\Ar?\d+:r?\d+\z/ when /\A\d+:\d+\z/
r = ['-r', rev] r = ['-r', rev]
when /\Ar?\d+\z/ when /\A(\d+)-(\d+)\z/
r = ['-r', rev]
when /\A\d+\z/
r = ['-c', rev] r = ['-c', rev]
when nil then when nil then
puts "#$0 revision" puts "#$0 revision"
exit exit
else
puts "invalid revision part '#{rev}' in '#{ARGV[0]}'"
exit
end end
l = IO.popen %w'svn diff' + r + %w'--diff-cmd=diff -x -pU0' + [File.join(q, 'ChangeLog')] do |f| l = IO.popen %w'svn diff' + r + %w'--diff-cmd=diff -x -pU0' + [File.join(q, 'ChangeLog')] do |f|
@ -224,7 +230,7 @@ else
version_up version_up
f = Tempfile.new 'merger.rb' f = Tempfile.new 'merger.rb'
f.printf "merge revision(s) %s:%s\n", ARGV[0], tickets.join f.printf "merge revision(s) %s:%s\n", revstr, tickets.join
f.write log_svn f.write log_svn
f.flush f.flush
f.close f.close