ruby-changes:23082
From: nobu <ko1@a...>
Date: Mon, 26 Mar 2012 12:57:12 +0900 (JST)
Subject: [ruby-changes:23082] nobu:r35132 (trunk): * tool/merger.rb (default_merge_branch): use IO.popen to invoke pager.
nobu 2012-03-26 12:57:03 +0900 (Mon, 26 Mar 2012) New Revision: 35132 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=35132 Log: * tool/merger.rb (default_merge_branch): use IO.popen to invoke pager. Modified files: trunk/tool/merger.rb Index: tool/merger.rb =================================================================== --- tool/merger.rb (revision 35131) +++ tool/merger.rb (revision 35132) @@ -185,18 +185,13 @@ interactive 'conflicts resolved? (y:yes, a:abort, r:retry, otherwise abort)' do f.rewind - IO.popen('-', 'wb') do |g| - if g - g << `svn stat` - g << "\n\n" - g << f.read - g << "\n\n" - g << `svn diff --diff-cmd=diff -x -upw` - else - exec 'less' - end + IO.popen(ENV["PAGER"] || "less", "w") do |g| + g << `svn stat` + g << "\n\n" + g << f.read + g << "\n\n" + g << `svn diff --diff-cmd=diff -x -upw` end - Process.waitall end if system *%w'svn ci -F' + [f.path] -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/