diff options
| -rwxr-xr-x | tool/make-snapshot | 2 | ||||
| -rw-r--r-- | tool/vcs.rb | 19 |
2 files changed, 12 insertions, 9 deletions
diff --git a/tool/make-snapshot b/tool/make-snapshot index f278286b70..d2f92f53c6 100755 --- a/tool/make-snapshot +++ b/tool/make-snapshot @@ -220,7 +220,7 @@ def package(vcs, rev, destdir, tmp = nil) unless /\Ar(\d+) / =~ f.readline abort "Cannot find revision from '#{last_ChangeLog}'" end - vcs.export_changelog($1.to_i+1, revision.to_i, "#{v}/ChangeLog") + vcs.export_changelog($1.to_i, revision.to_i, "#{v}/ChangeLog") end open("#{v}/revision.h", "wb") {|f| f.puts "#define RUBY_REVISION #{revision}"} diff --git a/tool/vcs.rb b/tool/vcs.rb index fd56b42eca..5ef77e424d 100644 --- a/tool/vcs.rb +++ b/tool/vcs.rb @@ -306,8 +306,9 @@ class VCS end def export_changelog(from, to, path) + range = [to, (from+1 if from)].compact.join(':') IO.popen({'TZ' => 'JST-9', 'LANG' => 'C', 'LC_ALL' => 'C'}, - %W"svn log -r#{to}:#{from} #{url}") do |r| + %W"svn log -r#{range} #{url}") do |r| open(path, 'w') do |w| IO.copy_stream(r, w) end @@ -390,14 +391,16 @@ class VCS end def export_changelog(from, to, path) - from = IO.pread(%W"git log -n1 --format=format:%H" + - ["--grep=^ *git-svn-id: .*@#{from} "], - :chdir => @abs_srcdir) - to &&= IO.pread(%W"git log -n1 --format=format:%H" + - ["--grep=^ *git-svn-id: .*@#{to} "], - :chdir => @abs_srcdir) + range = [from, to].map do |rev| + rev or next + rev = IO.pread({'LANG' => 'C', 'LC_ALL' => 'C'}, + %W"git log -n1 --format=format:%H" << + "--grep=^ *git-svn-id: .*@#{rev} ", + :chdir => @abs_srcdir) + rev unless rev.empty? + end.join('..') IO.popen({'TZ' => 'JST-9', 'LANG' => 'C', 'LC_ALL' => 'C'}, - %W"git log --date=iso-local --topo-order #{from}..#{to}", + %W"git svn log --date=iso-local --topo-order #{range}", :chdir => @abs_srcdir) do |r| open(path, 'w') do |w| IO.copy_stream(r, w) |