diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-03-24 14:06:24 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-03-24 14:06:24 +0000 |
commit | 333345469d1bc2c1bd5b3e56e97de7231009cd4b (patch) | |
tree | d43b06014d59677fd05d54eacbdc957e10a738dc /tool | |
parent | 7e811007e22fd8074200e7f302e14542043718a7 (diff) |
merge revision(s) 58078:
export_changelog must specify the branch's url
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@58079 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'tool')
-rwxr-xr-x | tool/make-snapshot | 2 | ||||
-rw-r--r-- | tool/vcs.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tool/make-snapshot b/tool/make-snapshot index b650a35ec8..9497b47caf 100755 --- a/tool/make-snapshot +++ b/tool/make-snapshot @@ -225,7 +225,7 @@ def package(vcs, rev, destdir, tmp = nil) unless /\Ar(\d+) / =~ f.readline abort "#{File.basename $0}: Cannot find revision from '#{last_ChangeLog}'" end - vcs.export_changelog($1.to_i, revision.to_i, "#{v}/ChangeLog") + vcs.export_changelog(url, $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 7d1ecd4a88..00f408612a 100644 --- a/tool/vcs.rb +++ b/tool/vcs.rb @@ -307,7 +307,7 @@ class VCS FileUtils.rm_rf(dir+"/.svn") end - def export_changelog(from, to, path) + def export_changelog(url, 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#{range} #{url}") do |r| @@ -424,7 +424,7 @@ class VCS FileUtils.rm_rf("#{dir}/.git") end - def export_changelog(from, to, path) + def export_changelog(url, from, to, path) range = [from, to].map do |rev| rev or next rev = cmd_read({'LANG' => 'C', 'LC_ALL' => 'C'}, |