aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMads Kiilerich <madski@unity3d.com>2013-01-02 13:56:29 +0100
committerMads Kiilerich <madski@unity3d.com>2013-01-02 13:56:29 +0100
commitf9e7925c26b4a1771cac978bb3a19bc12abe079e (patch)
tree747a2deca48aa0738231645835a3c884adf65266
parentb29644f5befae1011c32d140d59da3f1cf6d4cec (diff)
html templates: escape '>' as '&gt;'
--HG-- branch : beta
-rw-r--r--rhodecode/templates/compare/compare_diff.html4
-rw-r--r--rhodecode/tests/functional/test_compare.py12
-rw-r--r--rhodecode/tests/functional/test_compare_local.py12
3 files changed, 14 insertions, 14 deletions
diff --git a/rhodecode/templates/compare/compare_diff.html b/rhodecode/templates/compare/compare_diff.html
index fbb478b9..77eb968c 100644
--- a/rhodecode/templates/compare/compare_diff.html
+++ b/rhodecode/templates/compare/compare_diff.html
@@ -2,7 +2,7 @@
<%inherit file="/base/base.html"/>
<%def name="title()">
- ${c.repo_name} ${_('Compare')} ${'%s@%s' % (c.org_repo.repo_name, c.org_ref)} -> ${'%s@%s' % (c.other_repo.repo_name, c.other_ref)}
+ ${c.repo_name} ${_('Compare')} ${'%s@%s' % (c.org_repo.repo_name, c.org_ref)} -&gt; ${'%s@%s' % (c.other_repo.repo_name, c.other_ref)}
</%def>
<%def name="breadcrumbs_links()">
@@ -28,7 +28,7 @@
<div class="code-header cv">
<h3 class="code-header-title">${_('Compare View')}</h3>
<div>
- ${'%s@%s' % (c.org_repo.repo_name, c.org_ref)} -> ${'%s@%s' % (c.other_repo.repo_name, c.other_ref)} <a href="${c.swap_url}">[swap]</a>
+ ${'%s@%s' % (c.org_repo.repo_name, c.org_ref)} -&gt; ${'%s@%s' % (c.other_repo.repo_name, c.other_ref)} <a href="${c.swap_url}">[swap]</a>
</div>
</div>
</div>
diff --git a/rhodecode/tests/functional/test_compare.py b/rhodecode/tests/functional/test_compare.py
index 20861594..09ba4762 100644
--- a/rhodecode/tests/functional/test_compare.py
+++ b/rhodecode/tests/functional/test_compare.py
@@ -98,7 +98,7 @@ class TestCompareController(TestController):
))
try:
- response.mustcontain('%s@%s -> %s@%s' % (repo2.repo_name, rev1, repo1.repo_name, rev2))
+ response.mustcontain('%s@%s -&gt; %s@%s' % (repo2.repo_name, rev1, repo1.repo_name, rev2))
response.mustcontain("""Showing 2 commits""")
response.mustcontain("""1 file changed with 2 insertions and 0 deletions""")
@@ -156,7 +156,7 @@ class TestCompareController(TestController):
))
try:
- response.mustcontain('%s@%s -> %s@%s' % (repo2.repo_name, rev1, repo1.repo_name, rev2))
+ response.mustcontain('%s@%s -&gt; %s@%s' % (repo2.repo_name, rev1, repo1.repo_name, rev2))
response.mustcontain("""Showing 2 commits""")
response.mustcontain("""1 file changed with 2 insertions and 0 deletions""")
@@ -191,7 +191,7 @@ class TestCompareController(TestController):
# ))
#
# try:
-# response.mustcontain('%s@%s -> %s@%s' % (HG_REPO, rev1, HG_FORK, rev2))
+# response.mustcontain('%s@%s -&gt; %s@%s' % (HG_REPO, rev1, HG_FORK, rev2))
# ## outgoing changesets between those revisions
#
# response.mustcontain("""<a href="/%s/changeset/2dda4e345facb0ccff1a191052dd1606dba6781d">r4:2dda4e345fac</a>""" % (HG_REPO))
@@ -226,7 +226,7 @@ class TestCompareController(TestController):
# ))
#
# try:
-# response.mustcontain('%s@%s -> %s@%s' % (HG_REPO, rev1, HG_FORK, rev2))
+# response.mustcontain('%s@%s -&gt; %s@%s' % (HG_REPO, rev1, HG_FORK, rev2))
# ## outgoing changesets between those revisions
#
# response.mustcontain("""<a href="/%s/changeset/2dda4e345facb0ccff1a191052dd1606dba6781d">r4:2dda4e345fac</a>""" % (HG_REPO))
@@ -312,7 +312,7 @@ class TestCompareController(TestController):
# ))
#
# try:
-# #response.mustcontain('%s@%s -> %s@%s' % (r2_name, rev1, r1_name, rev2))
+# #response.mustcontain('%s@%s -&gt; %s@%s' % (r2_name, rev1, r1_name, rev2))
#
# #add new commit into parent !
# cs0 = ScmModel().create_node(
@@ -336,7 +336,7 @@ class TestCompareController(TestController):
# bundle=False
# ))
#
-# response.mustcontain('%s@%s -> %s@%s' % (r2_name, rev1, r1_name, rev2))
+# response.mustcontain('%s@%s -&gt; %s@%s' % (r2_name, rev1, r1_name, rev2))
# response.mustcontain("""file1-line1-from-fork""")
# response.mustcontain("""file2-line1-from-fork""")
# response.mustcontain("""file3-line1-from-fork""")
diff --git a/rhodecode/tests/functional/test_compare_local.py b/rhodecode/tests/functional/test_compare_local.py
index 0ff8d284..349b3dfe 100644
--- a/rhodecode/tests/functional/test_compare_local.py
+++ b/rhodecode/tests/functional/test_compare_local.py
@@ -19,7 +19,7 @@ class TestCompareController(TestController):
other_ref_type="tag",
other_ref=tag2,
))
- response.mustcontain('%s@%s -> %s@%s' % (HG_REPO, tag1, HG_REPO, tag2))
+ response.mustcontain('%s@%s -&gt; %s@%s' % (HG_REPO, tag1, HG_REPO, tag2))
## outgoing changesets between tags
response.mustcontain('''<a href="/%s/changeset/c5ddebc06eaaba3010c2d66ea6ec9d074eb0f678">r112:c5ddebc06eaa</a>''' % HG_REPO)
response.mustcontain('''<a href="/%s/changeset/70d4cef8a37657ee4cf5aabb3bd9f68879769816">r115:70d4cef8a376</a>''' % HG_REPO)
@@ -56,7 +56,7 @@ class TestCompareController(TestController):
other_ref=tag2,
bundle=False
))
- response.mustcontain('%s@%s -> %s@%s' % (GIT_REPO, tag1, GIT_REPO, tag2))
+ response.mustcontain('%s@%s -&gt; %s@%s' % (GIT_REPO, tag1, GIT_REPO, tag2))
## outgoing changesets between tags
response.mustcontain('''<a href="/%s/changeset/794bbdd31545c199f74912709ea350dedcd189a2">r113:794bbdd31545</a>''' % GIT_REPO)
@@ -92,7 +92,7 @@ class TestCompareController(TestController):
other_ref='default',
))
- response.mustcontain('%s@default -> %s@default' % (HG_REPO, HG_REPO))
+ response.mustcontain('%s@default -&gt; %s@default' % (HG_REPO, HG_REPO))
# branch are equal
response.mustcontain('<span class="empty_data">No files</span>')
response.mustcontain('<span class="empty_data">No changesets</span>')
@@ -107,7 +107,7 @@ class TestCompareController(TestController):
other_ref='master',
))
- response.mustcontain('%s@master -> %s@master' % (GIT_REPO, GIT_REPO))
+ response.mustcontain('%s@master -&gt; %s@master' % (GIT_REPO, GIT_REPO))
# branch are equal
response.mustcontain('<span class="empty_data">No files</span>')
response.mustcontain('<span class="empty_data">No changesets</span>')
@@ -124,7 +124,7 @@ class TestCompareController(TestController):
other_ref_type="rev",
other_ref=rev2,
))
- response.mustcontain('%s@%s -> %s@%s' % (HG_REPO, rev1, HG_REPO, rev2))
+ response.mustcontain('%s@%s -&gt; %s@%s' % (HG_REPO, rev1, HG_REPO, rev2))
## outgoing changesets between those revisions
response.mustcontain("""<a href="/%s/changeset/3d8f361e72ab303da48d799ff1ac40d5ac37c67e">r1:%s</a>""" % (HG_REPO, rev2))
@@ -144,7 +144,7 @@ class TestCompareController(TestController):
other_ref_type="rev",
other_ref=rev2,
))
- response.mustcontain('%s@%s -> %s@%s' % (GIT_REPO, rev1, GIT_REPO, rev2))
+ response.mustcontain('%s@%s -&gt; %s@%s' % (GIT_REPO, rev1, GIT_REPO, rev2))
## outgoing changesets between those revisions
response.mustcontain("""<a href="/%s/changeset/38b5fe81f109cb111f549bfe9bb6b267e10bc557">r1:%s</a>""" % (GIT_REPO, rev2[:12]))
response.mustcontain('1 file changed with 7 insertions and 0 deletions')