diff options
Diffstat (limited to 'lib/redmine/scm')
| -rw-r--r-- | lib/redmine/scm/adapters/abstract_adapter.rb | 4 | ||||
| -rw-r--r-- | lib/redmine/scm/adapters/bazaar_adapter.rb | 8 | ||||
| -rw-r--r-- | lib/redmine/scm/adapters/cvs_adapter.rb | 6 | ||||
| -rw-r--r-- | lib/redmine/scm/adapters/git_adapter.rb | 4 | ||||
| -rw-r--r-- | lib/redmine/scm/adapters/mercurial_adapter.rb | 4 |
5 files changed, 13 insertions, 13 deletions
diff --git a/lib/redmine/scm/adapters/abstract_adapter.rb b/lib/redmine/scm/adapters/abstract_adapter.rb index f28137ed5..15e719414 100644 --- a/lib/redmine/scm/adapters/abstract_adapter.rb +++ b/lib/redmine/scm/adapters/abstract_adapter.rb @@ -206,8 +206,8 @@ module Redmine self.class.logger end - def shellout(cmd, options = {}, &block) - self.class.shellout(cmd, options, &block) + def shellout(cmd, options = {}, &) + self.class.shellout(cmd, options, &) end # Path to the file where scm stderr output is logged diff --git a/lib/redmine/scm/adapters/bazaar_adapter.rb b/lib/redmine/scm/adapters/bazaar_adapter.rb index 559063c37..8b8cbb2bf 100644 --- a/lib/redmine/scm/adapters/bazaar_adapter.rb +++ b/lib/redmine/scm/adapters/bazaar_adapter.rb @@ -297,7 +297,7 @@ module Redmine @aro end - def scm_cmd(*args, &block) + def scm_cmd(*args, &) full_args = [] full_args += args full_args_locale = [] @@ -308,7 +308,7 @@ module Redmine shellout( self.class.sq_bin + ' ' + full_args_locale.map {|e| shell_quote e.to_s}.join(' '), - &block + & ) if $? && $?.exitstatus != 0 raise ScmCommandAborted, "bzr exited with non-zero status: #{$?.exitstatus}" @@ -318,7 +318,7 @@ module Redmine end private :scm_cmd - def scm_cmd_no_raise(*args, &block) + def scm_cmd_no_raise(*args, &) full_args = [] full_args += args full_args_locale = [] @@ -329,7 +329,7 @@ module Redmine shellout( self.class.sq_bin + ' ' + full_args_locale.map {|e| shell_quote e.to_s}.join(' '), - &block + & ) ret end diff --git a/lib/redmine/scm/adapters/cvs_adapter.rb b/lib/redmine/scm/adapters/cvs_adapter.rb index b8cc97001..07e882826 100644 --- a/lib/redmine/scm/adapters/cvs_adapter.rb +++ b/lib/redmine/scm/adapters/cvs_adapter.rb @@ -152,7 +152,7 @@ module Redmine # Returns all revisions found between identifier_from and identifier_to # in the repository. both identifier have to be dates or nil. # these method returns nothing but yield every result in block - def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={}, &block) + def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={}, &) path_with_project_utf8 = path_with_proj(path) path_with_project_locale = scm_iconv(@path_encoding, 'UTF-8', path_with_project_utf8) logger.debug "<cvs> revisions path:" + @@ -381,7 +381,7 @@ module Redmine end end - def scm_cmd(*args, &block) + def scm_cmd(*args, &) full_args = ['-d', root_url] full_args += args full_args_locale = [] @@ -392,7 +392,7 @@ module Redmine shellout( self.class.sq_bin + ' ' + full_args_locale.map {|e| shell_quote e.to_s}.join(' '), - &block + & ) if $? && $?.exitstatus != 0 raise ScmCommandAborted, "cvs exited with non-zero status: #{$?.exitstatus}" diff --git a/lib/redmine/scm/adapters/git_adapter.rb b/lib/redmine/scm/adapters/git_adapter.rb index f946d2866..c7a5c6b66 100644 --- a/lib/redmine/scm/adapters/git_adapter.rb +++ b/lib/redmine/scm/adapters/git_adapter.rb @@ -440,7 +440,7 @@ module Redmine private - def git_cmd(args, options = {}, &block) + def git_cmd(args, options = {}, &) repo_path = root_url || url full_args = ['--git-dir', repo_path] if self.class.client_version_above?([1, 7, 2]) @@ -452,7 +452,7 @@ module Redmine shellout( self.class.sq_bin + ' ' + full_args.map {|e| shell_quote e.to_s}.join(' '), options, - &block + & ) if $? && $?.exitstatus != 0 raise ScmCommandAborted, "git exited with non-zero status: #{$?.exitstatus}" diff --git a/lib/redmine/scm/adapters/mercurial_adapter.rb b/lib/redmine/scm/adapters/mercurial_adapter.rb index c9a6dd22e..921c9fcc3 100644 --- a/lib/redmine/scm/adapters/mercurial_adapter.rb +++ b/lib/redmine/scm/adapters/mercurial_adapter.rb @@ -313,7 +313,7 @@ module Redmine private_constant :HG_EARLY_BOOL_ARG, :HG_EARLY_LIST_ARG # Runs 'hg' command with the given args - def hg(*args, &block) + def hg(*args, &) # as of hg 4.4.1, early parsing of bool options is not terminated at '--' if args.any? {|s| HG_EARLY_BOOL_ARG.match?(s)} raise HgCommandArgumentError, "malicious command argument detected" @@ -331,7 +331,7 @@ module Redmine ret = shellout( self.class.sq_bin + ' ' + full_args.map {|e| shell_quote e.to_s}.join(' '), - &block + & ) if $? && $?.exitstatus != 0 raise HgCommandAborted, "hg exited with non-zero status: #{$?.exitstatus}" |