diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rwxr-xr-x | tool/file2lastrev.rb | 34 |
2 files changed, 20 insertions, 19 deletions
@@ -1,3 +1,8 @@ +Tue Mar 30 13:01:10 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * tool/file2lastrev.rb (VCS#get_revisions): particular commands do + not depend on instance. + Tue Mar 30 08:55:50 2010 Aaron Patterson <aaron@tenderlovemaking.com> * ext/psych/extconf.rb: Making library detection more agnostic. diff --git a/tool/file2lastrev.rb b/tool/file2lastrev.rb index 057ea80fdd..7ab0fb7bc5 100755 --- a/tool/file2lastrev.rb +++ b/tool/file2lastrev.rb @@ -24,16 +24,17 @@ class VCS def initialize(path) @srcdir = path + super() end # return a pair of strings, the last revision and the last revision in which # +path+ was modified. def get_revisions(path) path = relative_to(path) - last, changed = Dir.chdir(@srcdir) {yield path} + last, changed, *rest = Dir.chdir(@srcdir) {self.class.get_revisions(path)} last or raise "last revision not found" changed or raise "changed revision not found" - return last, changed + return last, changed, *rest end def relative_to(path) @@ -43,37 +44,32 @@ class VCS class SVN < self register(".svn") - def get_revisions(*) - super do |path| - info_xml = `svn info --xml "#{path}"` - _, last, _, changed, _ = info_xml.split(/revision="(\d+)"/) - [last, changed] - end + def self.get_revisions(path) + info_xml = `svn info --xml "#{path}"` + _, last, _, changed, _ = info_xml.split(/revision="(\d+)"/) + [last, changed] end end class GIT_SVN < self register(".git/svn") - def get_revisions(*) - super do |path| - info = `git svn info "#{path}"` - [info[/^Revision: (\d+)/, 1], info[/^Last Changed Rev: (\d+)/, 1]] - end + def self.get_revisions(path) + lastlog = `git log -n1` + info = `git svn info "#{path}"` + [info[/^Revision: (\d+)/, 1], info[/^Last Changed Rev: (\d+)/, 1]] end end class GIT < self register(".git") - def get_revisions(*) + def self.get_revisions(path) logcmd = %Q[git log -n1 --grep="^ *git-svn-id: .*@[0-9][0-9]* "] idpat = /git-svn-id: .*?@(\d+) \S+\Z/ - super do |path| - last = `#{logcmd}`[idpat, 1] - changed = path ? `#{logcmd} "#{path}"`[idpat, 1] : last - [last, changed] - end + last = `#{logcmd}`[idpat, 1] + changed = path ? `#{logcmd} "#{path}"`[idpat, 1] : last + [last, changed] end end end |