Fixes: Mercurial adapter loses seconds of commit times (#6656).

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

Fixes: Mercurial adapter loses seconds of commit times (#6656).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4561 e93f8b46-1217-0410-a6f0-8f06a7374b81
759048e7 · Jean-Philippe Lang · 3b53ec20 · 759048e7 · 759048e7
Commit 759048e7 authored Dec 23, 2010 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 2 deletions

hg-template-1.0.tmpl lib/redmine/scm/adapters/mercurial/hg-template-1.0.tmpl +1 -1

repository_mercurial_test.rb test/unit/repository_mercurial_test.rb +9 -1

No files found.
--- a/lib/redmine/scm/adapters/mercurial/hg-template-1.0.tmpl
+++ b/lib/redmine/scm/adapters/mercurial/hg-template-1.0.tmpl
 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{file_mods}{file_adds}{file_dels}{file_copies}</paths>\n<msg>{desc|escape}</msg>\n{tags}</logentry>\n\n'
+changeset_debug = '<logentry revision="{rev}" node="{node|short}">\n<author>{author|escape}</author>\n<date>{date|isodatesec}</date>\n<paths>\n{file_mods}{file_adds}{file_dels}{file_copies}</paths>\n<msg>{desc|escape}</msg>\n{tags}</logentry>\n\n'

 file_mod = '<path action="M">{file_mod|escape}</path>\n'
 file_add = '<path action="A">{file_add|escape}</path>\n'

--- a/test/unit/repository_mercurial_test.rb
+++ b/test/unit/repository_mercurial_test.rb
@@ -62,12 +62,20 @@ class RepositoryMercurialTest < ActiveSupport::TestCase
      assert_equal 2, @repository.entries("images", 2).size
    end

-
    def test_cat
      assert @repository.scm.cat("sources/welcome_controller.rb", 2)
      assert_nil @repository.scm.cat("sources/welcome_controller.rb")
    end

+    def test_isodatesec
+      # Template keyword 'isodatesec' supported in Mercurial 1.0 and higher
+      if @repository.scm.class.client_version_above?([1, 0])
+        @repository.fetch_changesets
+        @repository.reload
+        rev0_committed_on = Time.gm(2007, 12, 14, 9, 22, 52)
+        assert_equal @repository.changesets.find_by_revision('0').committed_on, rev0_committed_on
+      end
+    end
  else
    puts "Mercurial test repository NOT FOUND. Skipping unit tests !!!"
    def test_fake; assert true end