summaryrefslogtreecommitdiff
path: root/tool/vcs.rb
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-11-07 02:54:28 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-11-07 02:54:28 +0000
commit4201000a7ceeed6285a0c9b712cf64515cb86fe8 (patch)
tree646d49a0a84002ecb46595d827c8f480786f1004 /tool/vcs.rb
parent8b97d66913a12463b98c306f80dc5b48e3981187 (diff)
vcs.rb: unnecessary arguments
* tool/make-snapshot: $srcdir is optional. * tool/vcs.rb (export_changelog): remove unnecessary arguments. VCS should know srcdir and url. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56655 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'tool/vcs.rb')
-rw-r--r--tool/vcs.rb11
1 files changed, 6 insertions, 5 deletions
diff --git a/tool/vcs.rb b/tool/vcs.rb
index 140dcb72ec..fd56b42eca 100644
--- a/tool/vcs.rb
+++ b/tool/vcs.rb
@@ -117,6 +117,7 @@ class VCS
def initialize(path)
@srcdir = path
+ @abs_srcdir = File.realpath(path)
super()
end
@@ -304,7 +305,7 @@ class VCS
FileUtils.rm_rf(dir+"/.svn")
end
- def export_changelog(srcdir, url, from, to, path)
+ def export_changelog(from, to, path)
IO.popen({'TZ' => 'JST-9', 'LANG' => 'C', 'LC_ALL' => 'C'},
%W"svn log -r#{to}:#{from} #{url}") do |r|
open(path, 'w') do |w|
@@ -388,16 +389,16 @@ class VCS
FileUtils.rm_rf("#{dir}/.git")
end
- def export_changelog(srcdir, url, from, to, path)
+ def export_changelog(from, to, path)
from = IO.pread(%W"git log -n1 --format=format:%H" +
["--grep=^ *git-svn-id: .*@#{from} "],
- :chdir => srcdir)
+ :chdir => @abs_srcdir)
to &&= IO.pread(%W"git log -n1 --format=format:%H" +
["--grep=^ *git-svn-id: .*@#{to} "],
- :chdir => srcdir)
+ :chdir => @abs_srcdir)
IO.popen({'TZ' => 'JST-9', 'LANG' => 'C', 'LC_ALL' => 'C'},
%W"git log --date=iso-local --topo-order #{from}..#{to}",
- :chdir => srcdir) do |r|
+ :chdir => @abs_srcdir) do |r|
open(path, 'w') do |w|
IO.copy_stream(r, w)
end