diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2011-02-16 07:31:52 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2011-02-16 07:31:52 +0000 |
| commit | 08ed9cb5d5b48b44877de52da115eeba92857792 (patch) | |
| tree | d34926163063027e5092ad11e8991ea31d2352cf | |
| parent | 4fe8259017a3a10cca0b55d1896d8eee2ae1b5c6 (diff) | |
| download | redmine-08ed9cb5d5b48b44877de52da115eeba92857792.tar.gz redmine-08ed9cb5d5b48b44877de52da115eeba92857792.zip | |
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
| -rw-r--r-- | app/models/repository/mercurial.rb | 2 | ||||
| -rw-r--r-- | lib/redmine/scm/adapters/mercurial_adapter.rb | 4 | ||||
| -rw-r--r-- | test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/app/models/repository/mercurial.rb b/app/models/repository/mercurial.rb index 557b9a4dc..fe208e4d4 100644 --- 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 a1b9ca541..620184b28 100644 --- 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 3d0703456..dd8492725 100644 --- 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 |