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
 
@@ -2499,97 +2499,97 @@ input[type="button"].btn-block {
 
.glyphicon-cog:before {
 
  content: "\e019";
 
}
 

			




	
	
	
		
 
.glyphicon-trash:before {

			




	
	
	
		
 
  content: "\e020";

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.glyphicon-home:before {

			




	
	
	
		
 
  content: "\e021";

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.glyphicon-file:before {

			




	
	
	
		
 
  content: "\e022";

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.glyphicon-time:before {

			




	
	
	
		
 
  content: "\e023";

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.glyphicon-road:before {

			




	
	
	
		
 
  content: "\e024";

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.glyphicon-download-alt:before {

			




	
	
	
		
 
  content: "\e025";

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.glyphicon-download:before {

			




	
	
	
		
 
  content: "\e026";

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.glyphicon-upload:before {

			




	
	
	
		
 
  content: "\e027";

			




	
	
	
		
 
}

			




	
	
	
		
 

			




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

			




	
	
	
		
 
  content: "\e035";

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.glyphicon-volume-off:before {

			




	
	
	
		
 
  content: "\e036";

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.glyphicon-volume-down:before {

			




	
	
	
		
 
  content: "\e037";

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.glyphicon-volume-up:before {

			




	
	
	
		
 
  content: "\e038";

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.glyphicon-qrcode:before {

			




	
	
	
		
 
  content: "\e039";

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.glyphicon-barcode:before {

			




	
	
	
		
 
  content: "\e040";

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.glyphicon-tag:before {

			




	
	
	
		
 
  content: "\e041";

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.glyphicon-tags:before {

			




	
	
	
		
 
  content: "\e042";

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.glyphicon-book:before {

			




	
	
	
		
 
  content: "\e043";

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.glyphicon-print: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 */

			




	
	
	
		
 

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
/* css classes for diff file status ... it'd be nice if css had a way to

			




	
	
	
		
 
   inherit from another class but alas, we must make sure this content is the

			




	
	
	
		
 
   same from the icon font file */

			




	
	
	
		
 

			




	
	
	
		
 
.icon-diff-M:before {

			




	
	
	
		
 
    font-family: 'kallithea';

			




	
	
	
		
 
    content: '\e805';

			




	
	
	
		
 
    color: #d0b44c;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.icon-diff-D:before {

			




	
	
	
		
 
    font-family: 'kallithea';

			




	
	
	
		
 
    content: '\e807';

			




	
	
	
		
 
    color: #bd2c00;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.icon-diff-A:before {

			




	
	
	
		
 
    font-family: 'kallithea';

			




	
	
	
		
 
    content: '\e806';

			




	
	
	
		
 
    color: #6cc644;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.icon-diff-R:before {

			




	
	
	
		
 
    font-family: 'kallithea';

			




	
	
	
		
 
    content: '\e81f';

			




	
	
	
		
 
    color: #677a85;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#content #context-bar {

			




	
	
	
		
 
    position: relative;

			




	
	
	
		
 
    overflow: visible;

			




	
	
	
		
 
    background-color: #577632;

			




	
	
	
		
 
    padding: 0 5px;

			




	
	
	
		
 
    min-height: 36px;

			




	
	
	
		
 
}

			




        

    


    
    

    

        

                

                    kallithea/public/css/style.css
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -3256,104 +3256,96 @@ table.code-browser i[class^='icon-'] {

			




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

			




	
	
	
		
 
    height: 16px;

			




	
	
	
		
 
    width: 20px;

			




	
	
	
		
 
    cursor: pointer;

			




	
	
	
		
 
    display: block;

			




	
	
	
		
 
    float: right;

			




	
	
	
		
 
    margin-top: 2px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#repo_size {

			




	
	
	
		
 
    display: block;

			




	
	
	
		
 
    margin-top: 4px;

			




	
	
	
		
 
    color: #666;

			




	
	
	
		
 
    float: right;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.locking_locked {

			




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

			




	
	
	
		
 
    height: 16px;

			




	
	
	
		
 
    width: 20px;

			




	
	
	
		
 
    cursor: pointer;

			




	
	
	
		
 
    display: block;

			




	
	
	
		
 
    float: right;

			




	
	
	
		
 
    margin-top: 2px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.locking_unlocked {

			




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

			




	
	
	
		
 
    height: 16px;

			




	
	
	
		
 
    width: 20px;

			




	
	
	
		
 
    cursor: pointer;

			




	
	
	
		
 
    display: block;

			




	
	
	
		
 
    float: right;

			




	
	
	
		
 
    margin-top: 2px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




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

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.start_following_icon {

			




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

			




	
	
	
		
 
    padding-left: 20px;

			




	
	
	
		
 
    text-align: left;

			




	
	
	
		
 
    padding-top: 0px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.action_button {

			




	
	
	
		
 
    border: 0;

			




	
	
	
		
 
    display: inline;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.action_button:hover {

			




	
	
	
		
 
    border: 0;

			




	
	
	
		
 
    text-decoration: underline;

			




	
	
	
		
 
    cursor: pointer;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#switch_repos {

			




	
	
	
		
 
    position: absolute;

			




	
	
	
		
 
    height: 25px;

			




	
	
	
		
 
    z-index: 1;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#switch_repos select {

			




	
	
	
		
 
    min-width: 150px;

			




	
	
	
		
 
    max-height: 250px;

			




	
	
	
		
 
    z-index: 1;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.breadcrumbs {

			




	
	
	
		
 
    border: medium none;

			




	
	
	
		
 
    color: #FFF;

			




	
	
	
		
 
    float: left;

			




        

    


    
    

    

        

                

                    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
                    
                

        

        

            



	
	
	
		
 
## -*- coding: utf-8 -*-

			




	
	
	
		
 
<%inherit file="/base/base.html"/>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="title()">

			




	
	
	
		
 
    %if c.compare_home:

			




	
	
	
		
 
        ${_('%s Compare') % c.repo_name}

			




	
	
	
		
 
    %else:

			




	
	
	
		
 
        ${_('%s Compare') % c.repo_name} - ${'%s@%s' % (c.a_repo.repo_name, c.a_ref_name)} &gt; ${'%s@%s' % (c.cs_repo.repo_name, c.cs_ref_name)}

			




	
	
	
		
 
    %endif

			




	
	
	
		
 
    %if c.site_name:

			




	
	
	
		
 
        &middot; ${c.site_name}

			




	
	
	
		
 
    %endif

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="breadcrumbs_links()">

			




	
	
	
		
 
  ${_('Compare Revisions')}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="page_nav()">

			




	
	
	
		
 
    ${self.menu('repositories')}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="main()">

			




	
	
	
		
 
${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">

			




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

			




	
	
	
		
 
                <%include file="compare_cs.html" />

			




	
	
	
		
 

			




	
	
	
		
 
                ## FILES

			




	
	
	
		
 
                <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">

			




	
	
	
		
 

			




	
	
	
		
 
                % if c.limited_diff:

			




	
	
	
		
 
                    ${ungettext('%s file changed', '%s files changed', len(c.files)) % len(c.files)}

			




	
	
	
		
 
                % else:

			




	
	
	
		
 
                    ${ungettext('%s file changed with %s insertions and %s deletions','%s files changed with %s insertions and %s deletions', len(c.files)) % (len(c.files),c.lines_added,c.lines_deleted)}:

			




	
	
	
		
 
                %endif

			




	
	
	
		
 

			




	
	
	
		
 
                ${c.ignorews_url(request.GET)}

			




	
	
	
		
 
                ${c.context_url(request.GET)}

			




	
	
	
		
 

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div class="cs_files">

			




	
	
	
		
 
                  %if not c.files:

			




	
	
	
		
 
                     <span class="empty_data">${_('No files')}</span>

			




	
	
	
		
 
                  %endif

			




	
	
	
		
 
                  %for fid, change, f, stat in c.files:

			




	
	
	
		
 
                     <div class="cs_${change}">

			




	
	
	
		
 
                         <div class="node">

			




	
	
	
		
 
                             <i class="icon-diff-${change}"></i>

			




	
	
	
		
 
                             ${h.link_to(h.safe_unicode(f), '#' + fid)}

			




	
	
	
		
 
                         </div>

			




	
	
	
		
 
                         <div class="changes">${h.fancy_file_stats(stat)}</div>

			




	
	
	
		
 
                     </div>

			




	
	
	
		
 
                  %endfor

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                % if c.limited_diff:

			




	
	
	
		
 
                  <h5>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}">${_('Show full diff')}</a></h5>

			




	
	
	
		
 
                % endif

			




	
	
	
		
 
         </div>

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    kallithea/templates/journal/journal.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
## -*- coding: utf-8 -*-

			




	
	
	
		
 
<%inherit file="/base/base.html"/>

			




	
	
	
		
 
<%def name="title()">

			




	
	
	
		
 
    ${_('Journal')}

			




	
	
	
		
 
    %if c.site_name:

			




	
	
	
		
 
        &middot; ${c.site_name}

			




	
	
	
		
 
    %endif

			




	
	
	
		
 
</%def>

			




	
	
	
		
 
<%def name="breadcrumbs()">

			




	
	
	
		
 
    <h5>

			




	
	
	
		
 
    <form id="filter_form">

			




	
	
	
		
 
    <input class="q_filter_box ${'' if c.search_term else 'initial'}" id="j_filter" size="15" type="text" name="filter" value="${c.search_term or _('quick filter...')}"/>

			




	
	
	
		
 
    <span class="tooltip" title="${h.tooltip(h.journal_filter_help())}">?</span>

			




	
	
	
		
 
    <input type='submit' value="${_('Filter')}" class="btn btn-small" style="padding:0px 2px 0px 2px;margin:0px"/>

			




	
	
	
		
 
    ${_('Journal')} - ${ungettext('%s Entry', '%s Entries', c.journal_pager.item_count) % (c.journal_pager.item_count)}

			




	
	
	
		
 
    </form>

			




	
	
	
		
 
    ${h.end_form()}

			




	
	
	
		
 
    </h5>

			




	
	
	
		
 
</%def>

			




	
	
	
		
 
<%def name="page_nav()">

			




	
	
	
		
 
    ${self.menu('journal')}

			




	
	
	
		
 
</%def>

			




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

			




	
	
	
		
 
            <h5>

			




	
	
	
		
 
            <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value="" style="display: none"/>

			




	
	
	
		
 
            <input class="q_filter_box" id="q_filter_watched" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value="" style="display: none"/>

			




	
	
	
		
 
            </h5>

			




	
	
	
		
 
            <ul class="links nav nav-tabs">

			




	
	
	
		
 
                <li class="active" id="show_watched_li">

			




	
	
	
		
 
                    <a id="show_watched" href="#watched"><i class="icon-eye-open"></i> ${_('Watched')}</a>

			




	
	
	
		
 
                </li>

			




	
	
	
		
 
                <li id="show_my_li">

			




	
	
	
		
 
                    <a id="show_my" href="#my"><i class="icon-database"></i> ${_('My Repos')}</a>

			




	
	
	
		
 
               </li>

			




	
	
	
		
 
            </ul>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 

			




	
	
	
		
 
        <!-- end box / title -->

			




	
	
	
		
 
        <div id="my_container" style="display:none">

			




	
	
	
		
 
            <div class="table-grid table yui-skin-sam" id="repos_list_wrap"></div>

			




	
	
	
		
 
            <div id="user-paginator" style="padding: 0px 0px 0px 20px"></div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 

			




	
	
	
		
 
        <div id="watched_container">

			




	
	
	
		
 
            <div class="table-grid table yui-skin-sam" id="watched_repos_list_wrap"></div>

			




	
	
	
		
 
            <div id="watched-user-paginator" style="padding: 0px 0px 0px 20px"></div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 

			




	
	
	
		
 
    <script type="text/javascript">

			




	
	
	
		
 

			




	
	
	
		
 
    $('#j_filter').click(function(){

			




	
	
	
		
 
        var $jfilter = $('#j_filter');

			




	
	
	
		
 
        if($jfilter.hasClass('initial')){

			




	
	
	
		
 
            $jfilter.val('');

			




	
	
	
		
 
        }

			




	
	
	
		
 
    });

			




	
	
	
		
 
    var fix_j_filter_width = function(len){

			




	
	
	
		
 
        $('#j_filter').css('width', Math.max(80, len*6.50)+'px');

			




        

    


    
    

    

        

                

                    kallithea/tests/functional/test_compare.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -60,255 +60,255 @@ class TestCompareController(TestControll

			




	
	
	
		
 
        Session.remove()

			




	
	
	
		
 

			




	
	
	
		
 
    def test_compare_forks_on_branch_extra_commits_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',

			




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

			




	
	
	
		
 

			




	
	
	
		
 
        #fork this repo

			




	
	
	
		
 
        repo2 = fixture.create_fork('one', 'one-fork')

			




	
	
	
		
 
        self.r2_id = repo2.repo_id

			




	
	
	
		
 

			




	
	
	
		
 
        #add two extra commit into fork

			




	
	
	
		
 
        cs1 = _commit_change(repo2.repo_name, filename='file1', content='line1\nline2\n',

			




	
	
	
		
 
                             message='commit2', vcs_type='hg', parent=cs0)

			




	
	
	
		
 

			




	
	
	
		
 
        cs2 = _commit_change(repo2.repo_name, filename='file1', content='line1\nline2\nline3\n',

			




	
	
	
		
 
                             message='commit3', vcs_type='hg', parent=cs1)

			




	
	
	
		
 

			




	
	
	
		
 
        rev1 = 'default'

			




	
	
	
		
 
        rev2 = 'default'

			




	
	
	
		
 

			




	
	
	
		
 
        response = self.app.get(url('compare_url',

			




	
	
	
		
 
                                    repo_name=repo1.repo_name,

			




	
	
	
		
 
                                    org_ref_type="branch",

			




	
	
	
		
 
                                    org_ref_name=rev2,

			




	
	
	
		
 
                                    other_repo=repo2.repo_name,

			




	
	
	
		
 
                                    other_ref_type="branch",

			




	
	
	
		
 
                                    other_ref_name=rev1,

			




	
	
	
		
 
                                    merge='1',))

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain('%s@%s' % (repo1.repo_name, rev2))

			




	
	
	
		
 
        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

			




	
	
	
		
 
        repo2 = fixture.create_fork('one-git', 'one-git-fork')

			




	
	
	
		
 
        self.r2_id = repo2.repo_id

			




	
	
	
		
 

			




	
	
	
		
 
        #add two extra commit into fork

			




	
	
	
		
 
        cs1 = _commit_change(repo2.repo_name, filename='file1', content='line1\nline2\n',

			




	
	
	
		
 
                             message='commit2', vcs_type='git', parent=cs0)

			




	
	
	
		
 

			




	
	
	
		
 
        cs2 = _commit_change(repo2.repo_name, filename='file1', content='line1\nline2\nline3\n',

			




	
	
	
		
 
                             message='commit3', vcs_type='git', parent=cs1)

			




	
	
	
		
 

			




	
	
	
		
 
        rev1 = 'master'

			




	
	
	
		
 
        rev2 = 'master'

			




	
	
	
		
 

			




	
	
	
		
 
        response = self.app.get(url('compare_url',

			




	
	
	
		
 
                                    repo_name=repo1.repo_name,

			




	
	
	
		
 
                                    org_ref_type="branch",

			




	
	
	
		
 
                                    org_ref_name=rev2,

			




	
	
	
		
 
                                    other_repo=repo2.repo_name,

			




	
	
	
		
 
                                    other_ref_type="branch",

			




	
	
	
		
 
                                    other_ref_name=rev1,

			




	
	
	
		
 
                                    merge='1',))

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain('%s@%s' % (repo1.repo_name, rev2))

			




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

			




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

			




	
	
	
		
 

			




	
	
	
		
 
        #fork this repo

			




	
	
	
		
 
        repo2 = fixture.create_fork('one', 'one-fork')

			




	
	
	
		
 
        self.r2_id = repo2.repo_id

			




	
	
	
		
 

			




	
	
	
		
 
        #now commit something to origin repo

			




	
	
	
		
 
        cs1_prim = _commit_change(repo1.repo_name, filename='file2', content='line1file2\n',

			




	
	
	
		
 
                                  message='commit2', vcs_type='hg', parent=cs0, newfile=True)

			




	
	
	
		
 

			




	
	
	
		
 
        #add two extra commit into fork

			




	
	
	
		
 
        cs1 = _commit_change(repo2.repo_name, filename='file1', content='line1\nline2\n',

			




	
	
	
		
 
                             message='commit2', vcs_type='hg', parent=cs0)

			




	
	
	
		
 

			




	
	
	
		
 
        cs2 = _commit_change(repo2.repo_name, filename='file1', content='line1\nline2\nline3\n',

			




	
	
	
		
 
                             message='commit3', vcs_type='hg', parent=cs1)

			




	
	
	
		
 

			




	
	
	
		
 
        rev1 = 'default'

			




	
	
	
		
 
        rev2 = 'default'

			




	
	
	
		
 

			




	
	
	
		
 
        response = self.app.get(url('compare_url',

			




	
	
	
		
 
                                    repo_name=repo1.repo_name,

			




	
	
	
		
 
                                    org_ref_type="branch",

			




	
	
	
		
 
                                    org_ref_name=rev2,

			




	
	
	
		
 
                                    other_repo=repo2.repo_name,

			




	
	
	
		
 
                                    other_ref_type="branch",

			




	
	
	
		
 
                                    other_ref_name=rev1,

			




	
	
	
		
 
                                    merge='1',))

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain('%s@%s' % (repo1.repo_name, rev2))

			




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

			




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

			




	
	
	
		
 

			




	
	
	
		
 
        #fork this repo

			




	
	
	
		
 
        repo2 = fixture.create_fork('one-git', 'one-git-fork')

			




	
	
	
		
 
        self.r2_id = repo2.repo_id

			




	
	
	
		
 

			




	
	
	
		
 
        #now commit something to origin repo

			




	
	
	
		
 
        cs1_prim = _commit_change(repo1.repo_name, filename='file2', content='line1file2\n',

			




	
	
	
		
 
                                  message='commit2', vcs_type='git', parent=cs0, newfile=True)

			




	
	
	
		
 

			




	
	
	
		
 
        #add two extra commit into fork

			




	
	
	
		
 
        cs1 = _commit_change(repo2.repo_name, filename='file1', content='line1\nline2\n',

			




	
	
	
		
 
                             message='commit2', vcs_type='git', parent=cs0)

			




	
	
	
		
 

			




	
	
	
		
 
        cs2 = _commit_change(repo2.repo_name, filename='file1', content='line1\nline2\nline3\n',

			




	
	
	
		
 
                             message='commit3', vcs_type='git', parent=cs1)

			




	
	
	
		
 

			




	
	
	
		
 
        rev1 = 'master'

			




	
	
	
		
 
        rev2 = 'master'

			




	
	
	
		
 

			




	
	
	
		
 
        response = self.app.get(url('compare_url',

			




	
	
	
		
 
                                    repo_name=repo1.repo_name,

			




	
	
	
		
 
                                    org_ref_type="branch",

			




	
	
	
		
 
                                    org_ref_name=rev2,

			




	
	
	
		
 
                                    other_repo=repo2.repo_name,

			




	
	
	
		
 
                                    other_ref_type="branch",

			




	
	
	
		
 
                                    other_ref_name=rev1,

			




	
	
	
		
 
                                    merge='1',))

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain('%s@%s' % (repo1.repo_name, rev2))

			




	
	
	
		
 
        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

			




	
	
	
		
 
#            cs5:

			




	
	
	
		
 
        #make repo1, and cs1+cs2

			




	
	
	
		
 
        self.log_user()

			




	
	
	
		
 

			




	
	
	
		
 
        repo1 = fixture.create_repo('repo1', 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',

			




	
	
	
		
 
                             message='commit1', vcs_type='hg', parent=None,

			




	
	
	
		
 
                             newfile=True)

			




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

			




	
	
	
		
 
                             message='commit2', vcs_type='hg', parent=cs0)

			




	
	
	
		
 
        #fork this repo

			




	
	
	
		
 
        repo2 = fixture.create_fork('repo1', 'repo1-fork')

			




	
	
	
		
 
        self.r2_id = repo2.repo_id

			




	
	
	
		
 
        #now make cs3-6

			




	
	
	
		
 
        cs2 = _commit_change(repo1.repo_name, filename='file1', content='line1\nline2\nline3\n',

			




	
	
	
		
 
                             message='commit3', vcs_type='hg', parent=cs1)

			




	
	
	
		
 
        cs3 = _commit_change(repo1.repo_name, filename='file1', content='line1\nline2\nline3\nline4\n',

			




	
	
	
		
 
                             message='commit4', vcs_type='hg', parent=cs2)

			




	
	
	
		
 
        cs4 = _commit_change(repo1.repo_name, filename='file1', content='line1\nline2\nline3\nline4\nline5\n',

			




	
	
	
		
 
                             message='commit5', vcs_type='hg', parent=cs3)

			




	
	
	
		
 
        cs5 = _commit_change(repo1.repo_name, filename='file1', content='line1\nline2\nline3\nline4\nline5\nline6\n',

			




	
	
	
		
 
                             message='commit6', vcs_type='hg', parent=cs4)

			




	
	
	
		
 

			




	
	
	
		
 
        response = self.app.get(url('compare_url',

			




	
	
	
		
 
                                    repo_name=repo2.repo_name,

			




	
	
	
		
 
                                    org_ref_type="rev",

			




	
	
	
		
 
                                    org_ref_name=cs1.short_id,  # parent of cs2, in repo2

			




	
	
	
		
 
                                    other_repo=repo1.repo_name,

			




	
	
	
		
 
                                    other_ref_type="rev",

			




	
	
	
		
 
                                    other_ref_name=cs4.short_id,

			




	
	
	
		
 
                                    merge='True',

			




        

    



    


    



    



      

      





    
    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.