This is an automated email from the ASF dual-hosted git repository. sebb pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/whimsy.git
The following commit(s) were added to refs/heads/master by this push: new dc3f187 Simplify by using msg: and depth: dc3f187 is described below commit dc3f187aa12942ad123fa7ad16a0d179f4eeb452 Author: Sebb <s...@apache.org> AuthorDate: Fri Jun 12 14:14:22 2020 +0100 Simplify by using msg: and depth: --- www/committers/subscribe.cgi | 2 +- www/members/inactive.cgi | 4 ++-- www/members/mentor-update.cgi | 2 +- www/members/proxy.cgi | 2 +- www/officers/acreq.cgi | 2 +- www/officers/surveys.cgi | 4 ++-- www/treasurer/bill-upload.cgi | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/www/committers/subscribe.cgi b/www/committers/subscribe.cgi index eb85e31..1994b98 100755 --- a/www/committers/subscribe.cgi +++ b/www/committers/subscribe.cgi @@ -272,7 +272,7 @@ _html do message = "#{@list} -= #{$USER}" end - options = credentials.merge({args: ['--message', message]}) + options = credentials.merge({msg: message}) rc = ASF::SVN.svn_('commit', fn, _, options) end end diff --git a/www/members/inactive.cgi b/www/members/inactive.cgi index 624832c..b9a0977 100755 --- a/www/members/inactive.cgi +++ b/www/members/inactive.cgi @@ -114,7 +114,7 @@ _html do Dir.mktmpdir do |dir| _div_.transcript do work = ASF::SVN.getInfoItem(latest,'url') - ASF::SVN.svn_('checkout', [work, dir], _, {args: ['--depth', 'empty']}.merge(auth)) + ASF::SVN.svn_('checkout', [work, dir], _, {depth: 'empty'}.merge(auth)) json = File.join(dir, 'non-participants.json') ASF::SVN.svn_('update', json, _, auth) tracker = JSON.parse(IO.read(json)) @@ -122,7 +122,7 @@ _html do tracker[$USER]['status'] = @suggestions IO.write(json, JSON.pretty_generate(tracker)) ASF::SVN.svn_('diff', json, _, {verbose: true, sysopts: {hilite: [/"status":/]}}) - ASF::SVN.svn_('commit', json, _, {args: ['--message', @status]}.merge(auth)) + ASF::SVN.svn_('commit', json, _, {msg: @status}.merge(auth)) end end end diff --git a/www/members/mentor-update.cgi b/www/members/mentor-update.cgi index 8ee86cf..df43358 100755 --- a/www/members/mentor-update.cgi +++ b/www/members/mentor-update.cgi @@ -138,7 +138,7 @@ def send_form(formdata: {}) ASF::SVN.svn_('add', fn, _) message = "#{$USER} += mentoring volunteer (whimsy)" end - rc = ASF::SVN.svn_('commit', fn, _, {args: ['--message', message]}.merge(credentials)] + rc = ASF::SVN.svn_('commit', fn, _, {msg: message}.merge(credentials)] end end diff --git a/www/members/proxy.cgi b/www/members/proxy.cgi index 3037acd..288bf69 100755 --- a/www/members/proxy.cgi +++ b/www/members/proxy.cgi @@ -229,7 +229,7 @@ def emit_post(cur_mtg_dir, meeting) # commit ASF::SVN.svn_('commit',[filename, 'proxies'], _, - {args: ['--message', "assign #{@proxy} as my proxy"], user: $USER, password: $PASSWORD}) + {msg: "assign #{@proxy} as my proxy", user: $USER, password: $PASSWORD}) # TODO: send email to @proxy per WHIMSY-78 end end diff --git a/www/officers/acreq.cgi b/www/officers/acreq.cgi index 92d70a2..23a9b19 100755 --- a/www/officers/acreq.cgi +++ b/www/officers/acreq.cgi @@ -353,7 +353,7 @@ _html do # and commit the change ... _h2 'Commit messages' rc = ASF::SVN.svn_('commit', File.join(tmpdir, 'new-account-reqs.txt'), _, - {args: ['--message', "#{@user} account request by #{user.id} for #{requestor}"], env: env}) + {msg: "#{@user} account request by #{user.id} for #{requestor}", env: env}) if rc == 0 mail.deliver! diff --git a/www/officers/surveys.cgi b/www/officers/surveys.cgi index 4b338b1..44225a2 100755 --- a/www/officers/surveys.cgi +++ b/www/officers/surveys.cgi @@ -118,7 +118,7 @@ def submit_survey(formdata: {}) rc = 999 # Ensure it's a bogus value Dir.mktmpdir do |tmpdir| tmpdir.untaint - ASF::SVN.svn_('checkout',[get_survey_root(), tmpdir],_,{args: ['--depth', 'files'], user: $USER, password: $PASSWORD}) + ASF::SVN.svn_('checkout',[get_survey_root(), tmpdir],_,{depth: 'files', user: $USER, password: $PASSWORD}) survey_data = JSON.parse(File.read(filename), :symbolize_names => true) # Add user data (may overwrite existing entry!) @@ -128,7 +128,7 @@ def submit_survey(formdata: {}) File.write(filename, JSON.pretty_generate(survey_data)) Dir.chdir tmpdir do - # rc = ASF::SVN.svn_('commit', filename, _, {args: ['--message', "Survey submission (whimsy)"], user: $USER, password: $PASSWORD}) + # rc = ASF::SVN.svn_('commit', filename, _, {msg: "Survey submission (whimsy)", user: $USER, password: $PASSWORD}) end end if rc == 0 diff --git a/www/treasurer/bill-upload.cgi b/www/treasurer/bill-upload.cgi index 459d396..cc22687 100755 --- a/www/treasurer/bill-upload.cgi +++ b/www/treasurer/bill-upload.cgi @@ -106,7 +106,7 @@ _html do tmpdir.untaint ASF::SVN.svn_('checkout', [File.join(bills, @dest), tmpdir], _, - {args: '--depth=empty', user: $USER, password: $PASSWORD}) + {depth: 'empty', user: $USER, password: $PASSWORD}) Dir.chdir tmpdir do IO.binwrite(name, @file.read)