1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tool/vcs.rb: discard error messages

Browse Source 
* tool/vcs.rb (VCS#get_revisions): discard error messages for all
  VCS not only SVN.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45203 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-02-28 01:23:31 +00:00
parent 53e7ed077f
commit 68e6d3f1d5
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tool/vcs.rb
View File

@ -38,11 +38,27 @@ class VCS
super() super()
end end
NullDevice = defined?(IO::NULL) ? IO::NULL :
%w[/dev/null NUL NIL: NL:].find {|dev| File.exist?(dev)}
# return a pair of strings, the last revision and the last revision in which # return a pair of strings, the last revision and the last revision in which
# +path+ was modified. # +path+ was modified.
def get_revisions(path) def get_revisions(path)
path = relative_to(path) path = relative_to(path)
last, changed, modified, *rest = Dir.chdir(@srcdir) {self.class.get_revisions(path)} last, changed, modified, *rest = Dir.chdir(@srcdir) {
begin
if NullDevice
save_stderr = STDERR.dup
STDERR.reopen NullDevice, 'w'
end
self.class.get_revisions(path)
ensure
if save_stderr
STDERR.reopen save_stderr
save_stderr.close
end
end
}
last or raise VCS::NotFoundError, "last revision not found" last or raise VCS::NotFoundError, "last revision not found"
changed or raise VCS::NotFoundError, "changed revision not found" changed or raise VCS::NotFoundError, "changed revision not found"
modified &&= Time.parse(modified) modified &&= Time.parse(modified)
@ -73,19 +89,7 @@ class VCS
register(".svn") register(".svn")
def self.get_revisions(path) def self.get_revisions(path)
begin
nulldevice = %w[/dev/null NUL NIL: NL:].find {|dev| File.exist?(dev)}
if nulldevice
save_stderr = STDERR.dup
STDERR.reopen nulldevice, 'w'
end
info_xml = `svn info --xml "#{path}"` info_xml = `svn info --xml "#{path}"`
ensure
if save_stderr
STDERR.reopen save_stderr
save_stderr.close
end
end
_, last, _, changed, _ = info_xml.split(/revision="(\d+)"/) _, last, _, changed, _ = info_xml.split(/revision="(\d+)"/)
modified = info_xml[/<date>([^<>]*)/, 1] modified = info_xml[/<date>([^<>]*)/, 1]
[last, changed, modified] [last, changed, modified]