scm: mercurial: change identifier to revision in fetching revisions.

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

diff --git a/app/models/repository/mercurial.rb b/app/models/repository/mercurial.rb
index 557b9a4dc8ec07b8ba4d45ec25f8250655ac6c2f..fe208e4d4f2ec297a6a27158be91f987a049f7d4 100644 (file)
--- a/app/models/repository/mercurial.rb
+++ b/app/models/repository/mercurial.rb
@@ -112,7 +112,7 @@ class Repository::Mercurial < Repository
           transaction do
             revisions.each do |revision|
               changeset = Changeset.create(:repository => self,
-                                           :revision => revision.identifier,
+                                           :revision => revision.revision,
                                            :scmid => revision.scmid,
                                            :committer => revision.author, 
                                            :committed_on => revision.time,

diff --git a/lib/redmine/scm/adapters/mercurial_adapter.rb b/lib/redmine/scm/adapters/mercurial_adapter.rb
index a1b9ca541d6ff36588b05844935760de0ef9db35..620184b28588c6645c8be1a0c8feeef4c022b33b 100644 (file)
--- a/lib/redmine/scm/adapters/mercurial_adapter.rb
+++ b/lib/redmine/scm/adapters/mercurial_adapter.rb
@@ -150,12 +150,12 @@ module Redmine
                 end
                 paths.sort! { |x,y| x[:path] <=> y[:path] }
 
-                revisions << Revision.new({:identifier => logentry.attributes['revision'],
+                revisions << Revision.new({:revision => logentry.attributes['revision'],
                                             :scmid => logentry.attributes['node'],
                                             :author => (logentry.elements['author'] ? logentry.elements['author'].text : ""),
                                             :time => Time.parse(logentry.elements['date'].text).localtime,
                                             :message => logentry.elements['msg'].text,
-                                            :paths => paths
+                                            :paths => paths,
                                           })
               end
             rescue

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 3d07034561dddb0f88efd4d1272f0cb1a0256383..dd84927254351342c7fa8554d1b0127e32c94b1d 100644 (file)
--- a/test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb
+++ b/test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb
@@ -55,14 +55,14 @@ begin
       def test_revisions
         revisions = @adapter.revisions(nil, 2, 4)
         assert_equal 3, revisions.size
-        # assert_equal '2', revisions[0].revision
+        assert_equal '2', revisions[0].revision
         assert_equal '400bb8672109', revisions[0].scmid
-        # assert_equal '4', revisions[2].revision
+        assert_equal '4', revisions[2].revision
         assert_equal 'def6d2f1254a', revisions[2].scmid
 
         revisions = @adapter.revisions(nil, 2, 4, {:limit => 2})
         assert_equal 2, revisions.size
-        # assert_equal '2', revisions[0].revision
+        assert_equal '2', revisions[0].revision
         assert_equal '400bb8672109', revisions[0].scmid
       end