From ad130d3670bc9ef423ccf93c2b6988f988359b29 Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 14 Mar 2010 19:18:49 +0000 Subject: [PATCH] * tool/file2lastrev.rb (VCS::{SVN,GIT}#get_revisions): use block argument 'path' to get the path given by super. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26925 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ tool/file2lastrev.rb | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0d29fec7f2..e97f836499 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Mar 15 04:18:31 2010 Nobuyoshi Nakada + + * tool/file2lastrev.rb (VCS::{SVN,GIT}#get_revisions): + use block argument 'path' to get the path given by super. + Mon Mar 15 02:43:59 2010 Tanaka Akira * tool/transcode-tblgen.rb (Action#hash): defined. diff --git a/tool/file2lastrev.rb b/tool/file2lastrev.rb index 7eb918930f..057ea80fdd 100755 --- a/tool/file2lastrev.rb +++ b/tool/file2lastrev.rb @@ -43,8 +43,8 @@ class VCS class SVN < self register(".svn") - def get_revisions(path) - super do + def get_revisions(*) + super do |path| info_xml = `svn info --xml "#{path}"` _, last, _, changed, _ = info_xml.split(/revision="(\d+)"/) [last, changed] @@ -55,7 +55,7 @@ class VCS class GIT_SVN < self register(".git/svn") - def get_revisions(path) + def get_revisions(*) super do |path| info = `git svn info "#{path}"` [info[/^Revision: (\d+)/, 1], info[/^Last Changed Rev: (\d+)/, 1]] @@ -66,10 +66,10 @@ class VCS class GIT < self register(".git") - def get_revisions(path) + def get_revisions(*) logcmd = %Q[git log -n1 --grep="^ *git-svn-id: .*@[0-9][0-9]* "] idpat = /git-svn-id: .*?@(\d+) \S+\Z/ - super do + super do |path| last = `#{logcmd}`[idpat, 1] changed = path ? `#{logcmd} "#{path}"`[idpat, 1] : last [last, changed]