You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sv...@apache.org on 2020/04/08 04:00:46 UTC
svn commit: r1876265 - in /subversion/branches/1.14.x: ./ STATUS
subversion/bindings/swig/ruby/svn/client.rb
subversion/bindings/swig/ruby/svn/core.rb
Author: svn-role
Date: Wed Apr 8 04:00:46 2020
New Revision: 1876265
URL: http://svn.apache.org/viewvc?rev=1876265&view=rev
Log:
Merge r1876020 from trunk:
* r1876020
Fix Proc.new warnings in Ruby bindings with Ruby >= 2.7
Justification:
Tests should pass cleanly against latest upstream
Votes:
+1: jamessan, stsp, cmpilato
Modified:
subversion/branches/1.14.x/ (props changed)
subversion/branches/1.14.x/STATUS
subversion/branches/1.14.x/subversion/bindings/swig/ruby/svn/client.rb
subversion/branches/1.14.x/subversion/bindings/swig/ruby/svn/core.rb
Propchange: subversion/branches/1.14.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1876020
Modified: subversion/branches/1.14.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1876265&r1=1876264&r2=1876265&view=diff
==============================================================================
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Wed Apr 8 04:00:46 2020
@@ -21,13 +21,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1876020
- Fix Proc.new warnings in Ruby bindings with Ruby >= 2.7
- Justification:
- Tests should pass cleanly against latest upstream
- Votes:
- +1: jamessan, stsp, cmpilato
-
* r1876054
Fix undefined behavior when constructing ID for txn_node_cache in fsfs.
Justification:
Modified: subversion/branches/1.14.x/subversion/bindings/swig/ruby/svn/client.rb
URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/bindings/swig/ruby/svn/client.rb?rev=1876265&r1=1876264&r2=1876265&view=diff
==============================================================================
--- subversion/branches/1.14.x/subversion/bindings/swig/ruby/svn/client.rb (original)
+++ subversion/branches/1.14.x/subversion/bindings/swig/ruby/svn/client.rb Wed Apr 8 04:00:46 2020
@@ -637,25 +637,25 @@ module Svn
ignore_externals, allow_unver_obstruction, self)
end
- def set_log_msg_func(callback=Proc.new)
+ def set_log_msg_func(&callback)
callback_wrapper = Proc.new do |items|
items = items.collect do |item|
item_wrapper = CommitItemWrapper.new(item)
end
callback.call(items)
end
- set_log_msg_func2(callback_wrapper)
+ set_log_msg_func2(&callback_wrapper)
end
- def set_log_msg_func2(callback=Proc.new)
+ def set_log_msg_func2(&callback)
@log_msg_baton = Client.set_log_msg_func3(self, callback)
end
- def set_notify_func(callback=Proc.new)
+ def set_notify_func(&callback)
@notify_baton = Client.set_notify_func2(self, callback)
end
- def set_cancel_func(callback=Proc.new)
+ def set_cancel_func(&callback)
@cancel_baton = Client.set_cancel_func(self, callback)
end
@@ -707,9 +707,9 @@ module Svn
private
def init_callbacks
- set_log_msg_func(nil)
- set_notify_func(nil)
- set_cancel_func(nil)
+ set_log_msg_func
+ set_notify_func
+ set_cancel_func
end
%w(log_msg notify cancel).each do |type|
private "#{type}_func", "#{type}_baton"
Modified: subversion/branches/1.14.x/subversion/bindings/swig/ruby/svn/core.rb
URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/bindings/swig/ruby/svn/core.rb?rev=1876265&r1=1876264&r2=1876265&view=diff
==============================================================================
--- subversion/branches/1.14.x/subversion/bindings/swig/ruby/svn/core.rb (original)
+++ subversion/branches/1.14.x/subversion/bindings/swig/ruby/svn/core.rb Wed Apr 8 04:00:46 2020
@@ -249,31 +249,31 @@ module Svn
end
end
- def add_simple_prompt_provider(retry_limit, prompt=Proc.new)
+ def add_simple_prompt_provider(retry_limit, &prompt)
args = [retry_limit]
klass = AuthCredSimple
add_prompt_provider("simple", args, prompt, klass)
end
- def add_username_prompt_provider(retry_limit, prompt=Proc.new)
+ def add_username_prompt_provider(retry_limit, &prompt)
args = [retry_limit]
klass = AuthCredUsername
add_prompt_provider("username", args, prompt, klass)
end
- def add_ssl_server_trust_prompt_provider(prompt=Proc.new)
+ def add_ssl_server_trust_prompt_provider(&prompt)
args = []
klass = AuthCredSSLServerTrust
add_prompt_provider("ssl_server_trust", args, prompt, klass)
end
- def add_ssl_client_cert_prompt_provider(retry_limit, prompt=Proc.new)
+ def add_ssl_client_cert_prompt_provider(retry_limit, &prompt)
args = [retry_limit]
klass = AuthCredSSLClientCert
add_prompt_provider("ssl_client_cert", args, prompt, klass)
end
- def add_ssl_client_cert_pw_prompt_provider(retry_limit, prompt=Proc.new)
+ def add_ssl_client_cert_pw_prompt_provider(retry_limit, &prompt)
args = [retry_limit]
klass = AuthCredSSLClientCertPw
add_prompt_provider("ssl_client_cert_pw", args, prompt, klass)