scm: change key name of configurable command name (#7517, #6159, #7047).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4797 e93f8b46-1217-0410-a6f0-8f06a7374b81

scm: change key name of configurable command name (#7517, #6159, #7047).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4797 e93f8b46-1217-0410-a6f0-8f06a7374b81
d449ac51 · Toshi MARUYAMA · Eric Davis · 21585064 · d449ac51 · d449ac51
Commit d449ac51 authored Feb 04, 2011 by Toshi MARUYAMA Committed by Eric Davis Feb 10, 2011
7 changed files
--- a/config/configuration.yml.example
+++ b/config/configuration.yml.example
@@ -110,11 +110,11 @@ default:
  # Configuration of SCM executable command.
  # Absolute path (e.g. /usr/local/bin/hg) or command name (e.g. hg.exe, bzr.exe)
  # On Windows, *.cmd, *.bat (e.g. hg.cmd, bzr.bat) does not work.
-  scm_command_subversion: svn                                       # (default: svn)
-  scm_command_mercurial:  "\"C:\Program Files\TortoiseHg\hg.exe\""  # (default: hg)
-  scm_command_git:        /usr/local/bin/git                        # (default: git)
-  scm_command_bazaar:     bzr.exe                                   # (default: bzr)
-  scm_command_darcs:      darcs-1.0.9-i386-linux                    # (default: darcs)
+  scm_subversion_command: svn                                       # (default: svn)
+  scm_mercurial_command:  "\"C:\Program Files\TortoiseHg\hg.exe\""  # (default: hg)
+  scm_git_command:        /usr/local/bin/git                        # (default: git)
+  scm_bazaar_command:     bzr.exe                                   # (default: bzr)
+  scm_darcs_command:      darcs-1.0.9-i386-linux                    # (default: darcs)
  
 # specific configuration options for production environment
 # that overrides the default ones

--- a/lib/redmine/scm/adapters/bazaar_adapter.rb
+++ b/lib/redmine/scm/adapters/bazaar_adapter.rb
@@ -23,7 +23,7 @@ module Redmine
      class BazaarAdapter < AbstractAdapter
      
        # Bazaar executable name
-        BZR_BIN = Redmine::Configuration['scm_command_bazaar'] || "bzr"
+        BZR_BIN = Redmine::Configuration['scm_bazaar_command'] || "bzr"
        
        # Get info about the repository
        def info

--- a/lib/redmine/scm/adapters/cvs_adapter.rb
+++ b/lib/redmine/scm/adapters/cvs_adapter.rb
@@ -23,7 +23,7 @@ module Redmine
      class CvsAdapter < AbstractAdapter

        # CVS executable name
-        CVS_BIN = Redmine::Configuration['scm_command_cvs'] || "cvs"
+        CVS_BIN = Redmine::Configuration['scm_cvs_command'] || "cvs"
    
        # Guidelines for the input:
        #  url -> the project-path, relative to the cvsroot (eg. module name)

--- a/lib/redmine/scm/adapters/darcs_adapter.rb
+++ b/lib/redmine/scm/adapters/darcs_adapter.rb
@@ -23,7 +23,7 @@ module Redmine
    module Adapters    
      class DarcsAdapter < AbstractAdapter      
        # Darcs executable name
-        DARCS_BIN = Redmine::Configuration['scm_command_darcs'] || "darcs"
+        DARCS_BIN = Redmine::Configuration['scm_darcs_command'] || "darcs"
        
        class << self
          def client_version

--- a/lib/redmine/scm/adapters/git_adapter.rb
+++ b/lib/redmine/scm/adapters/git_adapter.rb
@@ -22,7 +22,7 @@ module Redmine
    module Adapters    
      class GitAdapter < AbstractAdapter
        # Git executable name
-        GIT_BIN = Redmine::Configuration['scm_command_git'] || "git"
+        GIT_BIN = Redmine::Configuration['scm_git_command'] || "git"

        def info
          begin

--- a/lib/redmine/scm/adapters/mercurial_adapter.rb
+++ b/lib/redmine/scm/adapters/mercurial_adapter.rb
@@ -24,7 +24,7 @@ module Redmine
      class MercurialAdapter < AbstractAdapter

        # Mercurial executable name
-        HG_BIN = Redmine::Configuration['scm_command_mercurial'] || "hg"
+        HG_BIN = Redmine::Configuration['scm_mercurial_command'] || "hg"
        TEMPLATES_DIR = File.dirname(__FILE__) + "/mercurial"
        TEMPLATE_NAME = "hg-template"
        TEMPLATE_EXTENSION = "tmpl"

--- a/lib/redmine/scm/adapters/subversion_adapter.rb
+++ b/lib/redmine/scm/adapters/subversion_adapter.rb
@@ -24,7 +24,7 @@ module Redmine
      class SubversionAdapter < AbstractAdapter
      
        # SVN executable name
-        SVN_BIN = Redmine::Configuration['scm_command_subversion'] || "svn"
+        SVN_BIN = Redmine::Configuration['scm_subversion_command'] || "svn"
        
        class << self
          def client_version