summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/redmine/scm/adapters/mercurial/hg-template-0.9.5.tmpl12
-rw-r--r--lib/redmine/scm/adapters/mercurial_adapter.rb9
2 files changed, 2 insertions, 19 deletions
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 3cf584aed..000000000
--- 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 = '<logentry revision="{rev}" node="{node|short}">\n<author>{author|escape}</author>\n<date>{date|isodate}</date>\n<paths>\n{files}{file_adds}{file_dels}{file_copies}</paths>\n<msg>{desc|escape}</msg>\n{tags}</logentry>\n\n'
-
-file = '<path action="M">{file|urlescape}</path>\n'
-file_add = '<path action="A">{file_add|urlescape}</path>\n'
-file_del = '<path action="D">{file_del|urlescape}</path>\n'
-file_copy = '<path-copied copyfrom-path="{source|urlescape}">{name|urlescape}</path-copied>\n'
-tag = '<tag>{tag|escape}</tag>\n'
-header='<?xml version="1.0" encoding="UTF-8" ?>\n<log>\n\n'
-# footer="</log>" \ 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 3d8ef617a..53f24735c 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