From 9f59d30daa0d2fba5c98a9b6148b935baaae67da Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Wed, 4 Sep 2019 23:54:41 +0900
Subject: Separate VCS::DEBUG_OUT

---
 tool/lib/vcs.rb | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'tool/lib')

diff --git a/tool/lib/vcs.rb b/tool/lib/vcs.rb
index 65eb774d38..d04ce28905 100644
--- a/tool/lib/vcs.rb
+++ b/tool/lib/vcs.rb
@@ -7,6 +7,10 @@ require 'optparse'
 
 ENV.delete('PWD')
 
+class VCS
+  DEBUG_OUT = STDERR.dup
+end
+
 unless File.respond_to? :realpath
   require 'pathname'
   def File.realpath(arg)
@@ -15,7 +19,7 @@ unless File.respond_to? :realpath
 end
 
 def IO.pread(*args)
-  STDERR.puts(args.inspect) if $DEBUG
+  VCS::DEBUG_OUT.puts(args.inspect) if $DEBUG
   popen(*args) {|f|f.read}
 end
 
@@ -85,7 +89,7 @@ else
     verbose, $VERBOSE = $VERBOSE, nil if RUBY_VERSION < "2.1"
     refine IO.singleton_class do
       def popen(*args)
-        STDERR.puts args.inspect if $DEBUG
+        VCS::DEBUG_OUT.puts args.inspect if $DEBUG
         super
       end
     end
@@ -95,7 +99,7 @@ else
   using DebugPOpen
   module DebugSystem
     def system(*args)
-      STDERR.puts args.inspect if $DEBUG
+      VCS::DEBUG_OUT.puts args.inspect if $DEBUG
       exception = false
       opts = Hash.try_convert(args[-1])
       if RUBY_VERSION >= "2.6"
@@ -417,7 +421,7 @@ class VCS
     def commit
       args = %W"#{COMMAND} commit"
       if dryrun?
-        STDERR.puts(args.inspect)
+        VCS::DEBUG_OUT.puts(args.inspect)
         return true
       end
       system(*args)
@@ -434,7 +438,7 @@ class VCS
       if srcdir and self.class.local_path?(srcdir)
         opts[:chdir] ||= srcdir
       end
-      STDERR.puts cmds.inspect if debug?
+      VCS::DEBUG_OUT.puts cmds.inspect if debug?
       cmds
     end
 
@@ -649,7 +653,7 @@ class VCS
       branches = %W[refs/notes/commits:refs/notes/commits HEAD:#{branch}]
       if dryrun?
         branches.each do |b|
-          STDERR.puts((args + [b]).inspect)
+          VCS::DEBUG_OUT.puts((args + [b]).inspect)
         end
         return true
       end
-- 
cgit v1.2.3