##// END OF EJS Templates
html templates: escape '>' as '>'
Mads Kiilerich -
r3138:ed11764e beta
parent child Browse files
Show More
@@ -2,7 +2,7 b''
2 <%inherit file="/base/base.html"/>
2 <%inherit file="/base/base.html"/>
3
3
4 <%def name="title()">
4 <%def name="title()">
5 ${c.repo_name} ${_('Compare')} ${'%s@%s' % (c.org_repo.repo_name, c.org_ref)} -> ${'%s@%s' % (c.other_repo.repo_name, c.other_ref)}
5 ${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)}
6 </%def>
6 </%def>
7
7
8 <%def name="breadcrumbs_links()">
8 <%def name="breadcrumbs_links()">
@@ -28,7 +28,7 b''
28 <div class="code-header cv">
28 <div class="code-header cv">
29 <h3 class="code-header-title">${_('Compare View')}</h3>
29 <h3 class="code-header-title">${_('Compare View')}</h3>
30 <div>
30 <div>
31 ${'%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>
31 ${'%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>
32 </div>
32 </div>
33 </div>
33 </div>
34 </div>
34 </div>
@@ -98,7 +98,7 b' class TestCompareController(TestControll'
98 ))
98 ))
99
99
100 try:
100 try:
101 response.mustcontain('%s@%s -> %s@%s' % (repo2.repo_name, rev1, repo1.repo_name, rev2))
101 response.mustcontain('%s@%s -&gt; %s@%s' % (repo2.repo_name, rev1, repo1.repo_name, rev2))
102 response.mustcontain("""Showing 2 commits""")
102 response.mustcontain("""Showing 2 commits""")
103 response.mustcontain("""1 file changed with 2 insertions and 0 deletions""")
103 response.mustcontain("""1 file changed with 2 insertions and 0 deletions""")
104
104
@@ -156,7 +156,7 b' class TestCompareController(TestControll'
156 ))
156 ))
157
157
158 try:
158 try:
159 response.mustcontain('%s@%s -> %s@%s' % (repo2.repo_name, rev1, repo1.repo_name, rev2))
159 response.mustcontain('%s@%s -&gt; %s@%s' % (repo2.repo_name, rev1, repo1.repo_name, rev2))
160 response.mustcontain("""Showing 2 commits""")
160 response.mustcontain("""Showing 2 commits""")
161 response.mustcontain("""1 file changed with 2 insertions and 0 deletions""")
161 response.mustcontain("""1 file changed with 2 insertions and 0 deletions""")
162
162
@@ -191,7 +191,7 b' class TestCompareController(TestControll'
191 # ))
191 # ))
192 #
192 #
193 # try:
193 # try:
194 # response.mustcontain('%s@%s -> %s@%s' % (HG_REPO, rev1, HG_FORK, rev2))
194 # response.mustcontain('%s@%s -&gt; %s@%s' % (HG_REPO, rev1, HG_FORK, rev2))
195 # ## outgoing changesets between those revisions
195 # ## outgoing changesets between those revisions
196 #
196 #
197 # response.mustcontain("""<a href="/%s/changeset/2dda4e345facb0ccff1a191052dd1606dba6781d">r4:2dda4e345fac</a>""" % (HG_REPO))
197 # response.mustcontain("""<a href="/%s/changeset/2dda4e345facb0ccff1a191052dd1606dba6781d">r4:2dda4e345fac</a>""" % (HG_REPO))
@@ -226,7 +226,7 b' class TestCompareController(TestControll'
226 # ))
226 # ))
227 #
227 #
228 # try:
228 # try:
229 # response.mustcontain('%s@%s -> %s@%s' % (HG_REPO, rev1, HG_FORK, rev2))
229 # response.mustcontain('%s@%s -&gt; %s@%s' % (HG_REPO, rev1, HG_FORK, rev2))
230 # ## outgoing changesets between those revisions
230 # ## outgoing changesets between those revisions
231 #
231 #
232 # response.mustcontain("""<a href="/%s/changeset/2dda4e345facb0ccff1a191052dd1606dba6781d">r4:2dda4e345fac</a>""" % (HG_REPO))
232 # response.mustcontain("""<a href="/%s/changeset/2dda4e345facb0ccff1a191052dd1606dba6781d">r4:2dda4e345fac</a>""" % (HG_REPO))
@@ -312,7 +312,7 b' class TestCompareController(TestControll'
312 # ))
312 # ))
313 #
313 #
314 # try:
314 # try:
315 # #response.mustcontain('%s@%s -> %s@%s' % (r2_name, rev1, r1_name, rev2))
315 # #response.mustcontain('%s@%s -&gt; %s@%s' % (r2_name, rev1, r1_name, rev2))
316 #
316 #
317 # #add new commit into parent !
317 # #add new commit into parent !
318 # cs0 = ScmModel().create_node(
318 # cs0 = ScmModel().create_node(
@@ -336,7 +336,7 b' class TestCompareController(TestControll'
336 # bundle=False
336 # bundle=False
337 # ))
337 # ))
338 #
338 #
339 # response.mustcontain('%s@%s -> %s@%s' % (r2_name, rev1, r1_name, rev2))
339 # response.mustcontain('%s@%s -&gt; %s@%s' % (r2_name, rev1, r1_name, rev2))
340 # response.mustcontain("""file1-line1-from-fork""")
340 # response.mustcontain("""file1-line1-from-fork""")
341 # response.mustcontain("""file2-line1-from-fork""")
341 # response.mustcontain("""file2-line1-from-fork""")
342 # response.mustcontain("""file3-line1-from-fork""")
342 # response.mustcontain("""file3-line1-from-fork""")
@@ -19,7 +19,7 b' class TestCompareController(TestControll'
19 other_ref_type="tag",
19 other_ref_type="tag",
20 other_ref=tag2,
20 other_ref=tag2,
21 ))
21 ))
22 response.mustcontain('%s@%s -> %s@%s' % (HG_REPO, tag1, HG_REPO, tag2))
22 response.mustcontain('%s@%s -&gt; %s@%s' % (HG_REPO, tag1, HG_REPO, tag2))
23 ## outgoing changesets between tags
23 ## outgoing changesets between tags
24 response.mustcontain('''<a href="/%s/changeset/c5ddebc06eaaba3010c2d66ea6ec9d074eb0f678">r112:c5ddebc06eaa</a>''' % HG_REPO)
24 response.mustcontain('''<a href="/%s/changeset/c5ddebc06eaaba3010c2d66ea6ec9d074eb0f678">r112:c5ddebc06eaa</a>''' % HG_REPO)
25 response.mustcontain('''<a href="/%s/changeset/70d4cef8a37657ee4cf5aabb3bd9f68879769816">r115:70d4cef8a376</a>''' % HG_REPO)
25 response.mustcontain('''<a href="/%s/changeset/70d4cef8a37657ee4cf5aabb3bd9f68879769816">r115:70d4cef8a376</a>''' % HG_REPO)
@@ -56,7 +56,7 b' class TestCompareController(TestControll'
56 other_ref=tag2,
56 other_ref=tag2,
57 bundle=False
57 bundle=False
58 ))
58 ))
59 response.mustcontain('%s@%s -> %s@%s' % (GIT_REPO, tag1, GIT_REPO, tag2))
59 response.mustcontain('%s@%s -&gt; %s@%s' % (GIT_REPO, tag1, GIT_REPO, tag2))
60
60
61 ## outgoing changesets between tags
61 ## outgoing changesets between tags
62 response.mustcontain('''<a href="/%s/changeset/794bbdd31545c199f74912709ea350dedcd189a2">r113:794bbdd31545</a>''' % GIT_REPO)
62 response.mustcontain('''<a href="/%s/changeset/794bbdd31545c199f74912709ea350dedcd189a2">r113:794bbdd31545</a>''' % GIT_REPO)
@@ -92,7 +92,7 b' class TestCompareController(TestControll'
92 other_ref='default',
92 other_ref='default',
93 ))
93 ))
94
94
95 response.mustcontain('%s@default -> %s@default' % (HG_REPO, HG_REPO))
95 response.mustcontain('%s@default -&gt; %s@default' % (HG_REPO, HG_REPO))
96 # branch are equal
96 # branch are equal
97 response.mustcontain('<span class="empty_data">No files</span>')
97 response.mustcontain('<span class="empty_data">No files</span>')
98 response.mustcontain('<span class="empty_data">No changesets</span>')
98 response.mustcontain('<span class="empty_data">No changesets</span>')
@@ -107,7 +107,7 b' class TestCompareController(TestControll'
107 other_ref='master',
107 other_ref='master',
108 ))
108 ))
109
109
110 response.mustcontain('%s@master -> %s@master' % (GIT_REPO, GIT_REPO))
110 response.mustcontain('%s@master -&gt; %s@master' % (GIT_REPO, GIT_REPO))
111 # branch are equal
111 # branch are equal
112 response.mustcontain('<span class="empty_data">No files</span>')
112 response.mustcontain('<span class="empty_data">No files</span>')
113 response.mustcontain('<span class="empty_data">No changesets</span>')
113 response.mustcontain('<span class="empty_data">No changesets</span>')
@@ -124,7 +124,7 b' class TestCompareController(TestControll'
124 other_ref_type="rev",
124 other_ref_type="rev",
125 other_ref=rev2,
125 other_ref=rev2,
126 ))
126 ))
127 response.mustcontain('%s@%s -> %s@%s' % (HG_REPO, rev1, HG_REPO, rev2))
127 response.mustcontain('%s@%s -&gt; %s@%s' % (HG_REPO, rev1, HG_REPO, rev2))
128 ## outgoing changesets between those revisions
128 ## outgoing changesets between those revisions
129 response.mustcontain("""<a href="/%s/changeset/3d8f361e72ab303da48d799ff1ac40d5ac37c67e">r1:%s</a>""" % (HG_REPO, rev2))
129 response.mustcontain("""<a href="/%s/changeset/3d8f361e72ab303da48d799ff1ac40d5ac37c67e">r1:%s</a>""" % (HG_REPO, rev2))
130
130
@@ -144,7 +144,7 b' class TestCompareController(TestControll'
144 other_ref_type="rev",
144 other_ref_type="rev",
145 other_ref=rev2,
145 other_ref=rev2,
146 ))
146 ))
147 response.mustcontain('%s@%s -> %s@%s' % (GIT_REPO, rev1, GIT_REPO, rev2))
147 response.mustcontain('%s@%s -&gt; %s@%s' % (GIT_REPO, rev1, GIT_REPO, rev2))
148 ## outgoing changesets between those revisions
148 ## outgoing changesets between those revisions
149 response.mustcontain("""<a href="/%s/changeset/38b5fe81f109cb111f549bfe9bb6b267e10bc557">r1:%s</a>""" % (GIT_REPO, rev2[:12]))
149 response.mustcontain("""<a href="/%s/changeset/38b5fe81f109cb111f549bfe9bb6b267e10bc557">r1:%s</a>""" % (GIT_REPO, rev2[:12]))
150 response.mustcontain('1 file changed with 7 insertions and 0 deletions')
150 response.mustcontain('1 file changed with 7 insertions and 0 deletions')
General Comments 0
You need to be logged in to leave comments. Login now