diff options
author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2011-07-15 16:31:27 +0000 |
---|---|---|
committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2011-07-15 16:31:27 +0000 |
commit | eacffe03615e12fb7e530843a04836d06c118856 (patch) | |
tree | e44a5fbcac635efa0df2c88fb94624842f95ec04 /lib | |
parent | 50f4087aa7e65d57ff5a250d2af00deebc8418c7 (diff) | |
download | redmine-eacffe03615e12fb7e530843a04836d06c118856.tar.gz redmine-eacffe03615e12fb7e530843a04836d06c118856.zip |
scm: mercurial: use self.class.sq_bin for command name at adpter scm_cmd() (#8825).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6279 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib')
-rw-r--r-- | lib/redmine/scm/adapters/mercurial_adapter.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/redmine/scm/adapters/mercurial_adapter.rb b/lib/redmine/scm/adapters/mercurial_adapter.rb index d52d863e5..3d8ef617a 100644 --- a/lib/redmine/scm/adapters/mercurial_adapter.rb +++ b/lib/redmine/scm/adapters/mercurial_adapter.rb @@ -294,11 +294,14 @@ module Redmine # 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 |