diff --git a/lib/redmine/scm/adapters/mercurial/hg-template-0.9.5.tmpl b/lib/redmine/scm/adapters/mercurial/hg-template-0.9.5.tmpl
deleted file mode 100644
index 3cf584a..0000000
--- a/lib/redmine/scm/adapters/mercurial/hg-template-0.9.5.tmpl
+++ /dev/null
@@ -1,12 +0,0 @@
-changeset = 'This template must be used with --debug option\n'
-changeset_quiet = 'This template must be used with --debug option\n'
-changeset_verbose = 'This template must be used with --debug option\n'
-changeset_debug = '\n{author|escape}\n{date|isodate}\n\n{files}{file_adds}{file_dels}{file_copies}\n{desc|escape}\n{tags}\n\n'
-
-file = '{file|urlescape}\n'
-file_add = '{file_add|urlescape}\n'
-file_del = '{file_del|urlescape}\n'
-file_copy = '{name|urlescape}\n'
-tag = '{tag|escape}\n'
-header='\n\n\n'
-# footer=""
\ No newline at end of file
diff --git a/lib/redmine/scm/adapters/mercurial_adapter.rb b/lib/redmine/scm/adapters/mercurial_adapter.rb
index 3d8ef61..53f2473 100644
--- a/lib/redmine/scm/adapters/mercurial_adapter.rb
+++ b/lib/redmine/scm/adapters/mercurial_adapter.rb
@@ -47,7 +47,7 @@ module Redmine
end
def client_available
- client_version_above?([0, 9, 5])
+ client_version_above?([1, 2])
end
def hgversion
@@ -72,12 +72,7 @@ module Redmine
end
def template_path_for(version)
- if ((version <=> [0,9,5]) > 0) || version.empty?
- ver = "1.0"
- else
- ver = "0.9.5"
- end
- "#{HELPERS_DIR}/#{TEMPLATE_NAME}-#{ver}.#{TEMPLATE_EXTENSION}"
+ "#{HELPERS_DIR}/#{TEMPLATE_NAME}-1.0.#{TEMPLATE_EXTENSION}"
end
end
diff --git a/test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb b/test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb
index 4c946ba..10a78c4 100644
--- a/test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb
+++ b/test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb
@@ -53,12 +53,14 @@ begin
end
def test_template_path
- to_test = { [0,9,5] => "0.9.5",
- [1,0] => "1.0",
+ to_test = {
+ [1,2] => "1.0",
[] => "1.0",
- [1,0,1] => "1.0",
+ [1,2,1] => "1.0",
[1,7] => "1.0",
- [1,7,1] => "1.0" }
+ [1,7,1] => "1.0",
+ [2,0] => "1.0",
+ }
to_test.each do |v, template|
test_template_path_for(v, template)
end