Changeset - ed11764eb81a
Parent rev.
Child rev.
[Not reviewed]
beta
0 3 0
Mads Kiilerich - 13 years ago 2013-01-02 13:56:29
madski@unity3d.com
html templates: escape '>' as '>'
3 files changed with 14 insertions and 14 deletions:
rhodecode/templates/compare/compare_diff.html
2
2
rhodecode/tests/functional/test_compare.py
6
6
rhodecode/tests/functional/test_compare_local.py
6
6
0 comments (0 inline, 0 general)
rhodecode/templates/compare/compare_diff.html
➞
Show inline comments
 
## -*- coding: utf-8 -*-
 
<%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()">

			




	
	
	
		
 
    ${h.link_to(_(u'Home'),h.url('/'))}

			




	
	
	
		
 
    &raquo;

			




	
	
	
		
 
    ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))}

			




	
	
		
 
@@ -25,13 +25,13 @@

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <div class="table">

			




	
	
	
		
 
        <div id="body" class="diffblock">

			




	
	
	
		
 
            <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>

			




	
	
	
		
 
        <div id="changeset_compare_view_content">

			




	
	
	
		
 
            ##CS

			




	
	
	
		
 
            <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${ungettext('Showing %s commit','Showing %s commits', len(c.cs_ranges)) % len(c.cs_ranges)}</div>

			




        

    


    
    

    

        

                

                    rhodecode/tests/functional/test_compare.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -95,13 +95,13 @@ class TestCompareController(TestControll

			




	
	
	
		
 
                                    other_ref_type="branch",

			




	
	
	
		
 
                                    other_ref=rev2,

			




	
	
	
		
 
                                    repo=repo1.repo_name

			




	
	
	
		
 
                                    ))

			




	
	
	
		
 

			




	
	
	
		
 
        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""")

			




	
	
	
		
 

			




	
	
	
		
 
            response.mustcontain("""<div class="message tooltip" title="commit2" style="white-space:normal">commit2</div>""")

			




	
	
	
		
 
            response.mustcontain("""<div class="message tooltip" title="commit3" style="white-space:normal">commit3</div>""")

			




	
	
	
		
 

			




	
	
		
 
@@ -153,13 +153,13 @@ class TestCompareController(TestControll

			




	
	
	
		
 
                                    other_ref_type="branch",

			




	
	
	
		
 
                                    other_ref=rev2,

			




	
	
	
		
 
                                    repo=repo1.repo_name

			




	
	
	
		
 
                                    ))

			




	
	
	
		
 

			




	
	
	
		
 
        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""")

			




	
	
	
		
 

			




	
	
	
		
 
            response.mustcontain("""<div class="message tooltip" title="commit2" style="white-space:normal">commit2</div>""")

			




	
	
	
		
 
            response.mustcontain("""<div class="message tooltip" title="commit3" style="white-space:normal">commit3</div>""")

			




	
	
	
		
 

			




	
	
		
 
@@ -188,13 +188,13 @@ class TestCompareController(TestControll

			




	
	
	
		
 
#                                    other_ref=rev2,

			




	
	
	
		
 
#                                    repo=HG_FORK,

			




	
	
	
		
 
#                                    bundle=False,

			




	
	
	
		
 
#                                    ))

			




	
	
	
		
 
#

			




	
	
	
		
 
#        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))

			




	
	
	
		
 
#            response.mustcontain("""<a href="/%s/changeset/6fff84722075f1607a30f436523403845f84cd9e">r5:6fff84722075</a>""" % (HG_REPO))

			




	
	
	
		
 
#            response.mustcontain("""<a href="/%s/changeset/7d4bc8ec6be56c0f10425afb40b6fc315a4c25e7">r6:%s</a>""" % (HG_REPO, rev2))

			




	
	
	
		
 
#

			




	
	
		
 
@@ -223,13 +223,13 @@ class TestCompareController(TestControll

			




	
	
	
		
 
#                                    other_ref_type="rev",

			




	
	
	
		
 
#                                    other_ref=rev2,

			




	
	
	
		
 
#                                    repo=HG_FORK,

			




	
	
	
		
 
#                                    ))

			




	
	
	
		
 
#

			




	
	
	
		
 
#        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))

			




	
	
	
		
 
#            response.mustcontain("""<a href="/%s/changeset/6fff84722075f1607a30f436523403845f84cd9e">r5:6fff84722075</a>""" % (HG_REPO))

			




	
	
	
		
 
#            response.mustcontain("""<a href="/%s/changeset/7d4bc8ec6be56c0f10425afb40b6fc315a4c25e7">r6:%s</a>""" % (HG_REPO, rev2))

			




	
	
	
		
 
#

			




	
	
		
 
@@ -309,13 +309,13 @@ class TestCompareController(TestControll

			




	
	
	
		
 
#                                    other_ref=rev2,

			




	
	
	
		
 
#                                    repo=r1_name,

			




	
	
	
		
 
#                                    bundle=False,

			




	
	
	
		
 
#                                    ))

			




	
	
	
		
 
#

			




	
	
	
		
 
#        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(

			




	
	
	
		
 
#                repo=repo1.scm_instance, repo_name=r1_name,

			




	
	
	
		
 
#                cs=EmptyChangeset(alias='hg'), user=TEST_USER_ADMIN_LOGIN,

			




	
	
	
		
 
#                author=TEST_USER_ADMIN_LOGIN,

			




	
	
		
 
@@ -333,13 +333,13 @@ class TestCompareController(TestControll

			




	
	
	
		
 
#                                        other_ref_type="branch",

			




	
	
	
		
 
#                                        other_ref=rev2,

			




	
	
	
		
 
#                                        repo=r1_name,

			




	
	
	
		
 
#                                        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""")

			




	
	
	
		
 
#            self.assertFalse("""<a href="#">file2</a>""" in response.body)  # new commit from parent

			




	
	
	
		
 
#            self.assertFalse("""line1-from-new-parent"""  in response.body)

			




	
	
	
		
 
#        finally:

			




        

    


    
    

    

        

                

                    rhodecode/tests/functional/test_compare_local.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -16,13 +16,13 @@ class TestCompareController(TestControll

			




	
	
	
		
 
                                    repo_name=HG_REPO,

			




	
	
	
		
 
                                    org_ref_type="tag",

			




	
	
	
		
 
                                    org_ref=tag1,

			




	
	
	
		
 
                                    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)

			




	
	
	
		
 
        response.mustcontain('''<a href="/%s/changeset/9749bfbfc0d2eba208d7947de266303b67c87cda">r116:9749bfbfc0d2</a>''' % HG_REPO)

			




	
	
	
		
 
        response.mustcontain('''<a href="/%s/changeset/41fda979f02fda216374bf8edac4e83f69e7581c">r117:41fda979f02f</a>''' % HG_REPO)

			




	
	
	
		
 
        response.mustcontain('''<a href="/%s/changeset/bb1a3ab98cc45cb934a77dcabf87a5a598b59e97">r118:bb1a3ab98cc4</a>''' % HG_REPO)

			




	
	
		
 
@@ -53,13 +53,13 @@ class TestCompareController(TestControll

			




	
	
	
		
 
                                    org_ref_type="tag",

			




	
	
	
		
 
                                    org_ref=tag1,

			




	
	
	
		
 
                                    other_ref_type="tag",

			




	
	
	
		
 
                                    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)

			




	
	
	
		
 
        response.mustcontain('''<a href="/%s/changeset/e36d8c5025329bdd4212bd53d4ed8a70ff44985f">r115:e36d8c502532</a>''' % GIT_REPO)

			




	
	
	
		
 
        response.mustcontain('''<a href="/%s/changeset/5c9ff4f6d7508db0e72b1d2991c357d0d8e07af2">r116:5c9ff4f6d750</a>''' % GIT_REPO)

			




	
	
	
		
 
        response.mustcontain('''<a href="/%s/changeset/b7187fa2b8c1d773ec35e9dee12f01f74808c879">r117:b7187fa2b8c1</a>''' % GIT_REPO)

			




	
	
		
 
@@ -89,13 +89,13 @@ class TestCompareController(TestControll

			




	
	
	
		
 
                                    org_ref_type="branch",

			




	
	
	
		
 
                                    org_ref='default',

			




	
	
	
		
 
                                    other_ref_type="branch",

			




	
	
	
		
 
                                    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>')

			




	
	
	
		
 

			




	
	
	
		
 
    def test_index_branch_git(self):

			




	
	
	
		
 
        self.log_user()

			




	
	
		
 
@@ -104,13 +104,13 @@ class TestCompareController(TestControll

			




	
	
	
		
 
                                    org_ref_type="branch",

			




	
	
	
		
 
                                    org_ref='master',

			




	
	
	
		
 
                                    other_ref_type="branch",

			




	
	
	
		
 
                                    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>')

			




	
	
	
		
 

			




	
	
	
		
 
    def test_compare_revisions_hg(self):

			




	
	
	
		
 
        self.log_user()

			




	
	
		
 
@@ -121,13 +121,13 @@ class TestCompareController(TestControll

			




	
	
	
		
 
                                    repo_name=HG_REPO,

			




	
	
	
		
 
                                    org_ref_type="rev",

			




	
	
	
		
 
                                    org_ref=rev1,

			




	
	
	
		
 
                                    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))

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain('1 file changed with 7 insertions and 0 deletions')

			




	
	
	
		
 
        ## files

			




	
	
	
		
 
        response.mustcontain("""<a href="/%s/compare/rev@%s...rev@%s#C--c8e92ef85cd1">.hgignore</a>""" % (HG_REPO, rev1, rev2))

			




	
	
		
 
@@ -141,13 +141,13 @@ class TestCompareController(TestControll

			




	
	
	
		
 
                                    repo_name=GIT_REPO,

			




	
	
	
		
 
                                    org_ref_type="rev",

			




	
	
	
		
 
                                    org_ref=rev1,

			




	
	
	
		
 
                                    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')

			




	
	
	
		
 

			




	
	
	
		
 
        ## files

			




	
	
	
		
 
        response.mustcontain("""<a href="/%s/compare/rev@%s...rev@%s#C--c8e92ef85cd1">.hgignore</a>""" % (GIT_REPO, rev1, rev2))

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.