Skip to content
Browse files

Merged r6279 from trunk.

scm: mercurial: use self.class.sq_bin for command name at adpter scm_cmd().

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6291 e93f8b46-1217-0410-a6f0-8f06a7374b81
  • Loading branch information...
1 parent b6c46aa commit b882993d6ab375b6abee150c3a498bde84efa1c7 @marutosi marutosi committed Jul 15, 2011
Showing with 5 additions and 2 deletions.
  1. +5 −2 lib/redmine/scm/adapters/mercurial_adapter.rb
View
7 lib/redmine/scm/adapters/mercurial_adapter.rb
@@ -294,11 +294,14 @@ def format_identifier
# Runs 'hg' command with the given args
def hg(*args, &block)
repo_path = root_url || url
- full_args = [HG_BIN, '-R', repo_path, '--encoding', 'utf-8']
+ full_args = ['-R', repo_path, '--encoding', 'utf-8']
full_args << '--config' << "extensions.redminehelper=#{HG_HELPER_EXT}"
full_args << '--config' << 'diff.git=false'
full_args += args
- ret = shellout(full_args.map { |e| shell_quote e.to_s }.join(' '), &block)
+ 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}"
end

0 comments on commit b882993

Please sign in to comment.
Something went wrong with that request. Please try again.