1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242
|
#!/bin/sh
# -*- ruby -*-
exec "${RUBY-ruby}" "-x" "$0" "$@" && [ ] if false
#!ruby
# This needs ruby 1.9 and subversion.
# run this in a repository to commit.
require 'date'
require 'tempfile'
$repos = 'svn+ssh://svn@ci.ruby-lang.org/ruby/'
ENV['LC_ALL'] = 'C'
def help
puts <<-end
simple backport
ruby #$0 1234
range backport
ruby #$0 1234:5678
backport from other branch
ruby #$0 17502 mvm
revision increment
ruby #$0 revisionup
tagging patch release
ruby #$0 tag
tagging preview/RC
ruby #$0 tag 2.0.0-preview1
* all operations shall be applied to the working directory.
end
end
def version
v = p = nil
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
return v, p
end
def interactive str, editfile = nil
loop do
yield
STDERR.puts "#{str} ([y]es|[a]bort|[r]etry#{'|[e]dit' if editfile})"
case STDIN.gets
when /\Aa/i then exit
when /\Ar/i then redo
when /\Ay/i then break
when /\Ae/i then system(ENV["EDITOR"], editfile)
else exit
end
end
end
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')
v, p = version
teeny = v[2]
case v
when %w/1 9 2/
teeny = 1
end
p = p.to_i
if p != -1
p += 1
end
str = open 'version.h', 'rb' do |f| f.read end
[%W[RUBY_VERSION "#{v.join '.'}"],
%W[RUBY_VERSION_CODE #{v.join ''}],
%W[RUBY_VERSION_MAJOR #{v[0]}],
%W[RUBY_VERSION_MINOR #{v[1]}],
%W[RUBY_VERSION_TEENY #{teeny}],
%W[RUBY_RELEASE_DATE "#{d.strftime '%Y-%m-%d'}"],
%W[RUBY_RELEASE_CODE #{d.strftime '%Y%m%d'}],
%W[RUBY_PATCHLEVEL #{p}],
%W[RUBY_RELEASE_YEAR #{d.year}],
%W[RUBY_RELEASE_MONTH #{d.month}],
%W[RUBY_RELEASE_DAY #{d.day}],
].each do |(k, i)|
str.sub!(/^(#define\s+#{k}\s+).*$/, "\\1#{i}")
end
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|
f.puts str
end
File.unlink fn
end
def tag intv_p = false, relname=nil
# relname:
# * 2.0.0-preview1
# * 2.0.0-rc1
# * 2.0.0-p0
# * 2.0.0-p100
v, pl = version
x = v.join('_')
if relname
abort "patch level is not -1 but '#{pl}' even if this is new release" if pl != '-1'
pl = relname[/-(.*)\z/, 1]
curver = v.join('.') + '-' + pl
if relname != curver
abort "geiven relname '#{relname}' conflicts current version '#{curver}'"
end
branch_url = `svn info`[/URL: (.*)/, 1]
else
if pl == '-1'
abort "no relname is given and not in a release branch even if this is patch release"
end
branch_url = $repos + 'branches/ruby_' + x
end
tagname = 'v' + x + '_' + pl
tag_url = $repos + 'tags/' + tagname
if intv_p
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)
end
def default_merge_branch
%r{^URL: .*/branches/ruby_1_8_} =~ `svn info` ? 'branches/ruby_1_8' : 'trunk'
end
case ARGV[0]
when "up", /\A(ver|version|rev|revision|lv|level|patch\s*level)\s*up/
version_up
system 'svn diff version.h'
when "tag"
tag :interactive, ARGV[1]
when nil, "-h", "--help"
help
exit
else
system 'svn up'
if /--ticket=(.*)/ =~ ARGV[0]
tickets = $1.split(/,/).map{|num| " [Backport ##{num}]"}
ARGV.shift
else
tickets = []
end
q = $repos + (ARGV[1] || default_merge_branch)
revs = ARGV[0].split(/,\s*/)
log = ''
log_svn = ''
revs.each do |rev|
case rev
when /\Ar?\d+:r?\d+\z/
r = ['-r', rev]
when /\Ar?\d+\z/
r = ['-c', rev]
when nil then
puts "#$0 revision"
exit
end
l = IO.popen %w'svn diff' + r + %w'--diff-cmd=diff -x -pU0' + [File.join(q, 'ChangeLog')] do |f|
f.read
end
log << l
log_svn << l.lines.grep(/^\+\t/).join.gsub(/^\+/, '').gsub(/^\t\*/, "\n\t\*")
if log_svn.empty?
log_svn = IO.popen %w'svn log ' + r + [q] do |f|
f.read
end.sub(/\A-+\nr.*\n/, '').sub(/\n-+\n\z/, '').gsub(/^(?=\S)/, "\t")
end
a = %w'svn merge --accept=postpone' + r + [q]
STDERR.puts a.join(' ')
system(*a)
system(*%w'svn revert ChangeLog') if /^\+/ =~ l
end
if `svn diff --diff-cmd=diff -x -upw`.empty?
interactive 'Only ChangeLog is modified, right?' do
end
end
if /^\+/ =~ log
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...
else
STDERR.puts '*** You should write ChangeLog NOW!!! ***'
end
version_up
f = Tempfile.new 'merger.rb'
f.printf "merge revision(s) %s:%s\n", ARGV[0], tickets.join
f.write log_svn
f.flush
f.close
interactive 'conflicts resolved?', f.path do
IO.popen(ENV["PAGER"] || "less", "w") do |g|
g << `svn stat`
g << "\n\n"
f.open
g << f.read
f.close
g << "\n\n"
g << `svn diff --diff-cmd=diff -x -upw`
end
end
if system(*%w'svn ci -F', f.path)
# tag :interactive # no longer needed.
system 'rm -f subversion.commitlog'
else
puts 'commit failed; try again.'
end
f.close
end
|