From fdd0a2ca9b72687d6a22849c62c2868def1b8322 Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Tue, 11 Jan 2011 16:03:45 +0000 Subject: [PATCH] scm: mercurial: use revision text mercurial style "2:400bb8672109" (#3724). Contributed by Yuya Nishihara. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4697 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/repository/mercurial.rb | 3 +-- test/unit/repository_mercurial_test.rb | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/app/models/repository/mercurial.rb b/app/models/repository/mercurial.rb index 2157f9d79..d9d0806d1 100644 --- a/app/models/repository/mercurial.rb +++ b/app/models/repository/mercurial.rb @@ -34,8 +34,7 @@ class Repository::Mercurial < Repository # Returns the readable identifier for the given mercurial changeset def self.format_changeset_identifier(changeset) - # "#{changeset.revision}:#{changeset.scmid}" - changeset.revision + "#{changeset.revision}:#{changeset.scmid}" end # Returns the identifier for the given Mercurial changeset diff --git a/test/unit/repository_mercurial_test.rb b/test/unit/repository_mercurial_test.rb index 09798edab..8921acb76 100644 --- a/test/unit/repository_mercurial_test.rb +++ b/test/unit/repository_mercurial_test.rb @@ -146,6 +146,23 @@ class RepositoryMercurialTest < ActiveSupport::TestCase c = @repository.changesets.find_by_revision('2') assert_equal c.scmid, c.identifier end + + def test_format_identifier + @repository.fetch_changesets + @repository.reload + c = @repository.changesets.find_by_revision('2') + assert_equal '2:400bb8672109', c.format_identifier + end + + def test_activities + c = Changeset.new(:repository => @repository, + :committed_on => Time.now, + :revision => '123', + :scmid => 'abc400bb8672', + :comments => 'test') + assert c.event_title.include?('123:abc400bb8672:') + assert_equal 'abc400bb8672', c.event_url[:rev] + end else puts "Mercurial test repository NOT FOUND. Skipping unit tests !!!" def test_fake; assert true end -- 2.39.5