diff options
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 |