aboutsummaryrefslogtreecommitdiffstats
path: root/tool
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-03-24 14:05:50 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-03-24 14:05:50 +0000
commitff48ce5467a98dbd691827cdbefa84317f66fd76 (patch)
tree653759627358d878557fb193e4adcefa788dc523 /tool
parentf34e8df1f19076b02dd6f79119f76954252b4263 (diff)
downloadruby-ff48ce5467a98dbd691827cdbefa84317f66fd76.tar.gz
export_changelog must specify the branch's url
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58078 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'tool')
-rwxr-xr-xtool/make-snapshot2
-rw-r--r--tool/vcs.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/tool/make-snapshot b/tool/make-snapshot
index b235282350..d8e635af40 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'},