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/merger.rb (default_merge_branch): use IO.popen to invoke pager.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35132 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2012-03-26 03:57:03 +00:00
parent 764d54788a
commit 1b2a60759b
1 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
tool/merger.rb
View file

@ -185,18 +185,13 @@ else
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]