kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

tool/vcs.rb: no time.rb

Browse source 
* common.mk (Doxyfile): revert r43888, not to require preinstalled
  ruby.  [ruby-core:64488] [Bug #10161]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47248 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-08-22 06:36:46 +00:00
parent 3229456d40
commit f024d46f11
4 changed files with 19 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
tool/vcs.rb
View file

@ -1,7 +1,5 @@
# vcs
require 'time'
ENV.delete('PWD')
unless File.respond_to? :realpath
@ -61,7 +59,11 @@ class VCS
}
last or raise VCS::NotFoundError, "last revision not found"
changed or raise VCS::NotFoundError, "changed revision not found"
modified &&= Time.parse(modified)
if modified
/\A(\d+)-(\d+)-(\d+)\D(\d+):(\d+):(\d+(?:\.\d+)?)\s*(?:Z|([-+]\d\d)(\d\d))\z/ =~ modified or
raise "unknown time format - #{modified}"
modified = Time.mktime(*($~[1..6] + [$7 ? "#{$7}:#{$8}" : "+00:00"]))
end
return last, changed, modified, *rest
end
@ -100,16 +102,16 @@ class VCS
register(".git")
def self.get_revisions(path)
logcmd = %Q[git log -n1 --grep="^ *git-svn-id: .*@[0-9][0-9]* "]
logcmd = %Q[git log -n1 --date=iso --grep="^ *git-svn-id: .*@[0-9][0-9]* "]
idpat = /git-svn-id: .*?@(\d+) \S+\Z/
last = `#{logcmd}`[idpat, 1]
if path
log = `#{logcmd} "#{path}"`
changed = log[idpat, 1]
modified = `git log --format=%ai -- #{path}`
else
changed = last
end
modified = log[/^Date:\s+(.*)/, 1]
[last, changed, modified]
end
end