Changeset - de5f6c9f50b0
Parent rev.
Child rev.
[Not reviewed]
default
2 6 0
Sean Farley - 11 years ago 2014-07-16 02:15:34
sean.michael.farley@gmail.com
arrow_refresh.png: use new icon-arrows-cw font
8 files changed with 7 insertions and 16 deletions:
kallithea/public/css/bootstrap.css
1
1
kallithea/public/css/contextbar.css
1
kallithea/public/css/style.css
8
kallithea/public/images/icons/arrow_refresh.png
bin+del
kallithea/public/images/icons/arrow_refresh_small.png
bin+del
kallithea/templates/compare/compare_diff.html
1
1
kallithea/templates/journal/journal.html
1
1
kallithea/tests/functional/test_compare.py
4
4
0 comments (0 inline, 0 general)
kallithea/public/css/bootstrap.css
➞
Show inline comments
 
@@ -2535,25 +2535,25 @@ input[type="button"].btn-block {
 
.glyphicon-inbox:before {
 
  content: "\e028";
 
}
 

			




	
	
	
		
 
.glyphicon-play-circle:before {

			




	
	
	
		
 
  content: "\e029";

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.glyphicon-repeat:before {

			




	
	
	
		
 
  content: "\e030";

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.glyphicon-refresh:before {

			




	
	
	
		
 
.glyphicon-arrows-cw:before {

			




	
	
	
		
 
  content: "\e031";

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.glyphicon-list-alt:before {

			




	
	
	
		
 
  content: "\e032";

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.glyphicon-flag:before {

			




	
	
	
		
 
  content: "\e034";

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.glyphicon-headphones:before {

			




        

    


    
    

    

        

                

                    kallithea/public/css/contextbar.css
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
/**

			




	
	
	
		
 
 * Stylesheets for the context bar

			




	
	
	
		
 
 */

			




	
	
	
		
 

			




	
	
	
		
 
i.icon-arrow-right { background-image: url('../images/icons/arrow_right.png');}

			




	
	
	
		
 
i.icon-bar-chart { background-image: url("../images/icons/chart_bar.png"); }

			




	
	
	
		
 
i.icon-code-merge { background-image: url("../images/icons/arrow_merge.png"); } /* unused! */

			




	
	
	
		
 
i.icon-ellipsis-horizontal:after { content: ' ...';}

			




	
	
	
		
 
i.icon-eye-open { background-image: url("../images/icons/eye.png"); }

			




	
	
	
		
 
i.icon-file-txt { background-image: url("../images/icons/note_error.png"); }

			




	
	
	
		
 
i.icon-git { background-image: url('../images/icons/giticon.png');}

			




	
	
	
		
 
i.icon-hg { background-image: url('../images/icons/hgicon.png');}

			




	
	
	
		
 
i.icon-refresh { background-image: url('../images/icons/arrow_refresh.png');}

			




	
	
	
		
 
i.icon-disabled { background-image: url('../images/icons/shading.png');} /* todo: use instead of minus sign */

			




	
	
	
		
 

			




	
	
	
		
 
i[class^='icon-'] {

			




	
	
	
		
 
    background-repeat: no-repeat;

			




	
	
	
		
 
    background-position: center;

			




	
	
	
		
 
    display: inline-block;

			




	
	
	
		
 
    min-width: 16px;

			




	
	
	
		
 
    min-height: 16px;

			




	
	
	
		
 
    margin: -2px 0 -4px 0;

			




	
	
	
		
 
    /* background-color: red; /* for debugging */

			




	
	
	
		
 

			




	
	
	
		
 
}

			




        

    


    
    

    

        

                

                    kallithea/public/css/style.css
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -3292,32 +3292,24 @@ table.code-browser i[class^='icon-'] {

			




	
	
	
		
 
.currently_following {

			




	
	
	
		
 
    padding-left: 10px;

			




	
	
	
		
 
    padding-bottom: 5px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.accept_icon {

			




	
	
	
		
 
    background: url("../images/icons/accept.png") no-repeat scroll 3px;

			




	
	
	
		
 
    padding-left: 20px;

			




	
	
	
		
 
    padding-top: 0px;

			




	
	
	
		
 
    text-align: left;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.refresh_icon {

			




	
	
	
		
 
    background: url("../images/icons/arrow_refresh.png") no-repeat scroll

			




	
	
	
		
 
        3px;

			




	
	
	
		
 
    padding-left: 20px;

			




	
	
	
		
 
    padding-top: 0px;

			




	
	
	
		
 
    text-align: left;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.pull_icon {

			




	
	
	
		
 
    background: url("../images/icons/connect.png") no-repeat scroll 3px;

			




	
	
	
		
 
    padding-left: 20px;

			




	
	
	
		
 
    padding-top: 0px;

			




	
	
	
		
 
    text-align: left;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.archive_icon {

			




	
	
	
		
 
    background: url("../images/icons/compress.png") no-repeat scroll 3px;

			




	
	
	
		
 
    padding-left: 20px;

			




	
	
	
		
 
    text-align: left;

			




	
	
	
		
 
    padding-top: 1px;

			




        

    


    
    

    

        

                

                    kallithea/public/images/icons/arrow_refresh.png
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
deleted file

			




	
	
		
 
binary diff not shown

			




              
Show images

              

              

        

    


    
    

    

        

                

                    kallithea/public/images/icons/arrow_refresh_small.png
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
deleted file

			




	
	
		
 
binary diff not shown

			




              
Show images

              

              

        

    


    
    

    

        

                

                    kallithea/templates/compare/compare_diff.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -24,25 +24,25 @@

			




	
	
	
		
 
${self.repo_context_bar('changelog')}

			




	
	
	
		
 
<div class="box">

			




	
	
	
		
 
    <!-- box / title -->

			




	
	
	
		
 
    <div class="title">

			




	
	
	
		
 
        ${self.breadcrumbs()}

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <div class="table">

			




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

			




	
	
	
		
 
            <div class="code-header">

			




	
	
	
		
 
                <div>

			




	
	
	
		
 
                    ${h.hidden('compare_org')} <i class="icon-arrow-right"></i> ${h.hidden('compare_other')}

			




	
	
	
		
 
                    %if not c.compare_home:

			




	
	
	
		
 
                        <a class="btn btn-small" href="${c.swap_url}"><i class="icon-refresh"></i> ${_('Swap')}</a>

			




	
	
	
		
 
                        <a class="btn btn-small" href="${c.swap_url}"><i class="icon-arrows-cw"></i> ${_('Swap')}</a>

			




	
	
	
		
 
                    %endif

			




	
	
	
		
 
                    <div id="compare_revs" class="btn btn-small"><i class="icon-git-compare"></i> ${_('Compare Revisions')}</div>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 

			




	
	
	
		
 
    %if c.compare_home:

			




	
	
	
		
 
        <div id="changeset_compare_view_content">

			




	
	
	
		
 
         <div style="color:#999;font-size: 18px">${_('Compare revisions, branches, bookmarks, or tags.')}</div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
    %else:

			




	
	
	
		
 
        <div id="changeset_compare_view_content">

			




        

    


    
    

    

        

                

                    kallithea/templates/journal/journal.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -23,25 +23,25 @@

			




	
	
	
		
 
<%def name="head_extra()">

			




	
	
	
		
 
<link href="${h.url('journal_atom', api_key=c.authuser.api_key)}" rel="alternate" title="${_('ATOM journal feed')}" type="application/atom+xml" />

			




	
	
	
		
 
<link href="${h.url('journal_rss', api_key=c.authuser.api_key)}" rel="alternate" title="${_('RSS journal feed')}" type="application/rss+xml" />

			




	
	
	
		
 
</%def>

			




	
	
	
		
 
<%def name="main()">

			




	
	
	
		
 

			




	
	
	
		
 
    <div class="box box-left">

			




	
	
	
		
 
        <!-- box / title -->

			




	
	
	
		
 
        <div class="title">

			




	
	
	
		
 
         ${self.breadcrumbs()}

			




	
	
	
		
 
         <ul class="links icon-only-links">

			




	
	
	
		
 
           <li>

			




	
	
	
		
 
             <span><a id="refresh" href="${h.url('journal')}"><i class="icon-refresh"></i></a></span>

			




	
	
	
		
 
             <span><a id="refresh" href="${h.url('journal')}"><i class="icon-arrows-cw"></i></a></span>

			




	
	
	
		
 
           </li>

			




	
	
	
		
 
           <li>

			




	
	
	
		
 
             <span><a href="${h.url('journal_atom', api_key=c.authuser.api_key)}"><i class="icon-rss-squared"></i></a></span>

			




	
	
	
		
 
           </li>

			




	
	
	
		
 
         </ul>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <div id="journal">${c.journal_data}</div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <div class="box box-right">

			




	
	
	
		
 
        <!-- box / title -->

			




	
	
	
		
 

			




	
	
	
		
 
        <div class="title">

			




        

    


    
    

    

        

                

                    kallithea/tests/functional/test_compare.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -96,25 +96,25 @@ class TestCompareController(TestControll

			




	
	
	
		
 
        response.mustcontain('%s@%s' % (repo2.repo_name, rev1))

			




	
	
	
		
 
        response.mustcontain("""Showing 2 commits""")

			




	
	
	
		
 
        response.mustcontain("""1 file changed with 2 insertions and 0 deletions""")

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain(_commit_div(cs1.raw_id, 'commit2'))

			




	
	
	
		
 
        response.mustcontain(_commit_div(cs2.raw_id, 'commit3'))

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain("""<a href="/%s/changeset/%s">r1:%s</a>""" % (repo2.repo_name, cs1.raw_id, cs1.short_id))

			




	
	
	
		
 
        response.mustcontain("""<a href="/%s/changeset/%s">r2:%s</a>""" % (repo2.repo_name, cs2.raw_id, cs2.short_id))

			




	
	
	
		
 
        ## files

			




	
	
	
		
 
        response.mustcontain("""<a href="#C--826e8142e6ba">file1</a>""")

			




	
	
	
		
 
        #swap

			




	
	
	
		
 
        response.mustcontain("""<a class="btn btn-small" href="/%s/compare/branch@%s...branch@%s?other_repo=%s&amp;merge=True"><i class="icon-refresh"></i> Swap</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name))

			




	
	
	
		
 
        response.mustcontain("""<a class="btn btn-small" href="/%s/compare/branch@%s...branch@%s?other_repo=%s&amp;merge=True"><i class="icon-arrows-cw"></i> Swap</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name))

			




	
	
	
		
 

			




	
	
	
		
 
    def test_compare_forks_on_branch_extra_commits_git(self):

			




	
	
	
		
 
        self.log_user()

			




	
	
	
		
 
        repo1 = fixture.create_repo('one-git', repo_type='git',

			




	
	
	
		
 
                                    repo_description='diff-test',

			




	
	
	
		
 
                                    cur_user=TEST_USER_ADMIN_LOGIN)

			




	
	
	
		
 
        self.r1_id = repo1.repo_id

			




	
	
	
		
 
        #commit something !

			




	
	
	
		
 
        cs0 = _commit_change(repo1.repo_name, filename='file1', content='line1\n',

			




	
	
	
		
 
                             message='commit1', vcs_type='git', parent=None, newfile=True)

			




	
	
	
		
 

			




	
	
	
		
 
        #fork this repo

			




	
	
		
 
@@ -144,25 +144,25 @@ class TestCompareController(TestControll

			




	
	
	
		
 
        response.mustcontain('%s@%s' % (repo2.repo_name, rev1))

			




	
	
	
		
 
        response.mustcontain("""Showing 2 commits""")

			




	
	
	
		
 
        response.mustcontain("""1 file changed with 2 insertions and 0 deletions""")

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain(_commit_div(cs1.raw_id, 'commit2'))

			




	
	
	
		
 
        response.mustcontain(_commit_div(cs2.raw_id, 'commit3'))

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain("""<a href="/%s/changeset/%s">r1:%s</a>""" % (repo2.repo_name, cs1.raw_id, cs1.short_id))

			




	
	
	
		
 
        response.mustcontain("""<a href="/%s/changeset/%s">r2:%s</a>""" % (repo2.repo_name, cs2.raw_id, cs2.short_id))

			




	
	
	
		
 
        ## files

			




	
	
	
		
 
        response.mustcontain("""<a href="#C--826e8142e6ba">file1</a>""")

			




	
	
	
		
 
        #swap

			




	
	
	
		
 
        response.mustcontain("""<a class="btn btn-small" href="/%s/compare/branch@%s...branch@%s?other_repo=%s&amp;merge=True"><i class="icon-refresh"></i> Swap</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name))

			




	
	
	
		
 
        response.mustcontain("""<a class="btn btn-small" href="/%s/compare/branch@%s...branch@%s?other_repo=%s&amp;merge=True"><i class="icon-arrows-cw"></i> Swap</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name))

			




	
	
	
		
 

			




	
	
	
		
 
    def test_compare_forks_on_branch_extra_commits_origin_has_incomming_hg(self):

			




	
	
	
		
 
        self.log_user()

			




	
	
	
		
 

			




	
	
	
		
 
        repo1 = fixture.create_repo('one', repo_type='hg',

			




	
	
	
		
 
                                    repo_description='diff-test',

			




	
	
	
		
 
                                    cur_user=TEST_USER_ADMIN_LOGIN)

			




	
	
	
		
 

			




	
	
	
		
 
        self.r1_id = repo1.repo_id

			




	
	
	
		
 

			




	
	
	
		
 
        #commit something !

			




	
	
	
		
 
        cs0 = _commit_change(repo1.repo_name, filename='file1', content='line1\n',

			




	
	
		
 
@@ -199,25 +199,25 @@ class TestCompareController(TestControll

			




	
	
	
		
 
        response.mustcontain('%s@%s' % (repo2.repo_name, rev1))

			




	
	
	
		
 
        response.mustcontain("""Showing 2 commits""")

			




	
	
	
		
 
        response.mustcontain("""1 file changed with 2 insertions and 0 deletions""")

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain(_commit_div(cs1.raw_id, 'commit2'))

			




	
	
	
		
 
        response.mustcontain(_commit_div(cs2.raw_id, 'commit3'))

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain("""<a href="/%s/changeset/%s">r1:%s</a>""" % (repo2.repo_name, cs1.raw_id, cs1.short_id))

			




	
	
	
		
 
        response.mustcontain("""<a href="/%s/changeset/%s">r2:%s</a>""" % (repo2.repo_name, cs2.raw_id, cs2.short_id))

			




	
	
	
		
 
        ## files

			




	
	
	
		
 
        response.mustcontain("""<a href="#C--826e8142e6ba">file1</a>""")

			




	
	
	
		
 
        #swap

			




	
	
	
		
 
        response.mustcontain("""<a class="btn btn-small" href="/%s/compare/branch@%s...branch@%s?other_repo=%s&amp;merge=True"><i class="icon-refresh"></i> Swap</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name))

			




	
	
	
		
 
        response.mustcontain("""<a class="btn btn-small" href="/%s/compare/branch@%s...branch@%s?other_repo=%s&amp;merge=True"><i class="icon-arrows-cw"></i> Swap</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name))

			




	
	
	
		
 

			




	
	
	
		
 
    def test_compare_forks_on_branch_extra_commits_origin_has_incomming_git(self):

			




	
	
	
		
 
        self.log_user()

			




	
	
	
		
 

			




	
	
	
		
 
        repo1 = fixture.create_repo('one-git', repo_type='git',

			




	
	
	
		
 
                                    repo_description='diff-test',

			




	
	
	
		
 
                                    cur_user=TEST_USER_ADMIN_LOGIN)

			




	
	
	
		
 

			




	
	
	
		
 
        self.r1_id = repo1.repo_id

			




	
	
	
		
 

			




	
	
	
		
 
        #commit something !

			




	
	
	
		
 
        cs0 = _commit_change(repo1.repo_name, filename='file1', content='line1\n',

			




	
	
		
 
@@ -254,25 +254,25 @@ class TestCompareController(TestControll

			




	
	
	
		
 
        response.mustcontain('%s@%s' % (repo2.repo_name, rev1))

			




	
	
	
		
 
        response.mustcontain("""Showing 2 commits""")

			




	
	
	
		
 
        response.mustcontain("""1 file changed with 2 insertions and 0 deletions""")

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain(_commit_div(cs1.raw_id, 'commit2'))

			




	
	
	
		
 
        response.mustcontain(_commit_div(cs2.raw_id, 'commit3'))

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain("""<a href="/%s/changeset/%s">r1:%s</a>""" % (repo2.repo_name, cs1.raw_id, cs1.short_id))

			




	
	
	
		
 
        response.mustcontain("""<a href="/%s/changeset/%s">r2:%s</a>""" % (repo2.repo_name, cs2.raw_id, cs2.short_id))

			




	
	
	
		
 
        ## files

			




	
	
	
		
 
        response.mustcontain("""<a href="#C--826e8142e6ba">file1</a>""")

			




	
	
	
		
 
        #swap

			




	
	
	
		
 
        response.mustcontain("""<a class="btn btn-small" href="/%s/compare/branch@%s...branch@%s?other_repo=%s&amp;merge=True"><i class="icon-refresh"></i> Swap</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name))

			




	
	
	
		
 
        response.mustcontain("""<a class="btn btn-small" href="/%s/compare/branch@%s...branch@%s?other_repo=%s&amp;merge=True"><i class="icon-arrows-cw"></i> Swap</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name))

			




	
	
	
		
 

			




	
	
	
		
 
    def test_compare_cherry_pick_changesets_from_bottom(self):

			




	
	
	
		
 

			




	
	
	
		
 
#        repo1:

			




	
	
	
		
 
#            cs0:

			




	
	
	
		
 
#            cs1:

			




	
	
	
		
 
#        repo1-fork- in which we will cherry pick bottom changesets

			




	
	
	
		
 
#            cs0:

			




	
	
	
		
 
#            cs1:

			




	
	
	
		
 
#            cs2: x

			




	
	
	
		
 
#            cs3: x

			




	
	
	
		
 
#            cs4: x

			




        

    



    


    



    



      

      





    
    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.