root/docs/shyouhei/ruby development/merger.rb @ 13582

#! /bin/ruby

require 'date'
require 'tempfile'

d = Date.today
v = nil
p = nil
system *%w'svn revert version.h'
open 'version.h', 'rb' do |f|
  f.each_line do |l|
    case l
    when /^#define RUBY_VERSION "(\d)\.(\d)\.(\d)"$/
      v = $~.captures
    when /^#define RUBY_PATCHLEVEL (\d+)$/
      p = $1
    end
  end
end

version_h = <<end
#define RUBY_VERSION "#{v.join '.'}"
#define RUBY_RELEASE_DATE "#{d.strftime '%Y-%m-%d'}"
#define RUBY_VERSION_CODE #{v.join ''}
#define RUBY_RELEASE_CODE #{d.strftime '%Y%m%d'}
#define RUBY_PATCHLEVEL #{p.to_i.succ.to_s}

#define RUBY_VERSION_MAJOR #{v[0]}
#define RUBY_VERSION_MINOR #{v[1]}
#define RUBY_VERSION_TEENY #{v[2]}
#define RUBY_RELEASE_YEAR #{d.year}
#define RUBY_RELEASE_MONTH #{d.month}
#define RUBY_RELEASE_DAY #{d.day}

#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];
RUBY_EXTERN const char ruby_release_date[];
RUBY_EXTERN const char ruby_platform[];
RUBY_EXTERN const int ruby_patchlevel;
#endif
end

case ARGV[0]
when /\A\d+:\d+\z/
  r = ['-r', ARGV[0]]
when /\A\d+\z/
  r = ['-c', ARGV[0]]
when nil then
  puts "#$0 revision"
  exit
end

repos = 'svn+ssh://svn@ci.ruby-lang.org/ruby/'
q = repos + (ARGV[1] || 'branches/ruby_1_8')

log = IO.popen %w'svn diff' + r + %w'--diff-cmd=diff -x -pU0' + [File.join(q, 'ChangeLog')] do |f|
  f.read
end

log_svn = log.lines.grep(/^\+\t/).join.gsub(/^\+/, '')

a = %w'svn merge' + r + [q]
STDERR.puts a.join(' ')
STDERR.puts log_svn

system(*a)
if /^\+/ =~ log
  system *%w'svn revert ChangeLog'
  IO.popen %w'patch -p 0', 'wb' do |f|
    f.write log.sub(/\+(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...
else
  STDERR.puts '*** You should write ChangeLog NOW!!! ***'
end
open 'version.h', 'wb' do |f| f.write version_h end
system *%w'svn resolved version.h'

f = Tempfile.new 'merger.rb'
f.printf "merge revision(s) %s:\n", ARGV[0]
f.write log_svn
f.flush
f.close
f.open # avoid gc

loop do
  system 'svn diff | lv' # explicitly invoke shell
  STDERR.puts 'conflicts resolved? (y:yes, a:abort, r:retry, otherwise abort)'
  case STDIN.gets
  when /\Aa/i then exit
  when /\Ar/i then redo
  when /\Ay/i then break
  else exit
  end
end

if system *%w'svn ci -F' + [f.path]
  x = v.join('_')
  y = repos + '/branches/ruby_' + x
  z = 'v' + x + '_' + p.to_i.succ.to_s
  w = repos + '/tags/' + z
  system *%w'svn cp -m' + ["add tag #{z}"] + [y, w]
  system 'rm -f subversion.commitlog'
else
  echo 'commit failed; try again.'
end