summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/models/changeset.rb3
-rw-r--r--test/unit/changeset_test.rb11
2 files changed, 14 insertions, 0 deletions
diff --git a/app/models/changeset.rb b/app/models/changeset.rb
index a026790b2..645745206 100644
--- a/app/models/changeset.rb
+++ b/app/models/changeset.rb
@@ -157,6 +157,9 @@ class Changeset < ActiveRecord::Base
else
"r#{revision}"
end
+ if repository && repository.identifier.present?
+ tag = "#{repository.identifier}|#{tag}"
+ end
if ref_project && project && ref_project != project
tag = "#{project.identifier}:#{tag}"
end
diff --git a/test/unit/changeset_test.rb b/test/unit/changeset_test.rb
index a06b1f809..7014eabb7 100644
--- a/test/unit/changeset_test.rb
+++ b/test/unit/changeset_test.rb
@@ -255,6 +255,17 @@ class ChangesetTest < ActiveSupport::TestCase
assert_equal 'ecookbook:r520', c.text_tag(Project.find(2))
end
+ def test_text_tag_revision_with_repository_identifier
+ r = Repository::Subversion.create!(
+ :project_id => 1,
+ :url => 'svn://localhost/test',
+ :identifier => 'documents')
+
+ c = Changeset.new(:revision => '520', :repository => r)
+ assert_equal 'documents|r520', c.text_tag
+ assert_equal 'ecookbook:documents|r520', c.text_tag(Project.find(2))
+ end
+
def test_text_tag_hash
c = Changeset.new(
:scmid => '7234cb2750b63f47bff735edc50a1c0a433c2518',