diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2011-02-16 04:40:42 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2011-02-16 04:40:42 +0000 |
| commit | 2c4836cbaeb8b4c98b58be2351a3dd9d6100ba69 (patch) | |
| tree | ca3e74f29c5fcfb78b57b7cce7e4fa427f816c36 /lib | |
| parent | 202ebe1d120fec227a47bd8895cbd07243015511 (diff) | |
| download | redmine-2c4836cbaeb8b4c98b58be2351a3dd9d6100ba69.tar.gz redmine-2c4836cbaeb8b4c98b58be2351a3dd9d6100ba69.zip | |
scm: mercurial: switch root_url or url in "hg" method (#4455).
"info" sets root_url from url.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4844 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/redmine/scm/adapters/mercurial_adapter.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/redmine/scm/adapters/mercurial_adapter.rb b/lib/redmine/scm/adapters/mercurial_adapter.rb index 4aa3024d3..0cfcf4c88 100644 --- a/lib/redmine/scm/adapters/mercurial_adapter.rb +++ b/lib/redmine/scm/adapters/mercurial_adapter.rb @@ -224,7 +224,8 @@ module Redmine # Runs 'hg' command with the given args def hg(*args, &block) - full_args = [HG_BIN, '-R', root_url, '--encoding', 'utf-8'] + repo_path = root_url || url + full_args = [HG_BIN, '-R', repo_path, '--encoding', 'utf-8'] full_args << '--config' << "extensions.redminehelper=#{HG_HELPER_EXT}" full_args << '--config' << 'diff.git=false' full_args += args |