Changeset - dbf7341d10b1
Parent rev.
Child rev.
[Not reviewed]
default
3 7 0
Sean Farley - 11 years ago 2014-11-15 20:21:48
sean.michael.farley@gmail.com
file_status: replace with icon-{modified,added,removed}
10 files changed with 65 insertions and 22 deletions:
kallithea/public/css/contextbar.css
22
kallithea/public/css/style.css
9
kallithea/public/images/icons/page_white_add.png
bin+del
kallithea/public/images/icons/page_white_delete.png
bin+del
kallithea/public/images/icons/page_white_edit.png
bin+del
kallithea/templates/changeset/changeset.html
1
kallithea/templates/changeset/changeset_range.html
1
kallithea/templates/compare/compare_diff.html
4
1
kallithea/templates/pullrequests/pullrequest_show.html
4
1
kallithea/tests/functional/test_compare_local.py
33
11
0 comments (0 inline, 0 general)
kallithea/public/css/contextbar.css
➞
Show inline comments
 
@@ -15,24 +15,46 @@ i.icon-disabled { background-image: url(
 

			




	
	
	
		
 
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;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#content #context-bar {

			




	
	
	
		
 
    position: relative;

			




	
	
	
		
 
    overflow: visible;

			




	
	
	
		
 
    background-color: #577632;

			




	
	
	
		
 
    padding: 0 5px;

			




	
	
	
		
 
    min-height: 36px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#content #context-bar h2 {

			




	
	
	
		
 
    display: inline-block;

			




	
	
	
		
 
    color: #FFF;

			




	
	
	
		
 
}

			




        

    


    
    

    

        

                

                    kallithea/public/css/style.css
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -2442,48 +2442,39 @@ BIN_FILENODE = 6

			




	
	
	
		
 
/*rename file*/

			




	
	
	
		
 
.cs_files .changes .bin.bin4 {

			




	
	
	
		
 
    background-color: #6D99FF;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
/*chmod file*/

			




	
	
	
		
 
.cs_files .changes .bin.bin5 {

			




	
	
	
		
 
    background-color: #6D99FF;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.cs_files .cs_added,

			




	
	
	
		
 
.cs_files .cs_A {

			




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

			




	
	
	
		
 
        3px;

			




	
	
	
		
 
    height: 16px;

			




	
	
	
		
 
    padding-left: 20px;

			




	
	
	
		
 
    margin-top: 7px;

			




	
	
	
		
 
    text-align: left;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.cs_files .cs_changed,

			




	
	
	
		
 
.cs_files .cs_M {

			




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

			




	
	
	
		
 
        3px;

			




	
	
	
		
 
    height: 16px;

			




	
	
	
		
 
    padding-left: 20px;

			




	
	
	
		
 
    margin-top: 7px;

			




	
	
	
		
 
    text-align: left;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.cs_files .cs_removed,

			




	
	
	
		
 
.cs_files .cs_D {

			




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

			




	
	
	
		
 
        scroll 3px;

			




	
	
	
		
 
    height: 16px;

			




	
	
	
		
 
    padding-left: 20px;

			




	
	
	
		
 
    margin-top: 7px;

			




	
	
	
		
 
    text-align: left;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.table {

			




	
	
	
		
 
    position: relative;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph {

			




	
	
	
		
 
    position: relative;

			




	
	
	
		
 
    overflow: hidden;

			




	
	
	
		
 
}

			




        

    


    
    

    

        

                

                    kallithea/public/images/icons/page_white_add.png
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
deleted file

			




	
	
		
 
binary diff not shown

			




              
Show images

              

              

        

    


    
    

    

        

                

                    kallithea/public/images/icons/page_white_delete.png
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
deleted file

			




	
	
		
 
binary diff not shown

			




              
Show images

              

              

        

    


    
    

    

        

                

                    kallithea/public/images/icons/page_white_edit.png
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
deleted file

			




	
	
		
 
binary diff not shown

			




              
Show images

              

              

        

    


    
    

    

        

                

                    kallithea/templates/changeset/changeset.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -133,24 +133,25 @@ ${self.repo_context_bar('changelog', c.c

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div class="changes_txt">

			




	
	
	
		
 
            % if c.limited_diff:

			




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

			




	
	
	
		
 
            % else:

			




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

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div class="cs_files">

			




	
	
	
		
 
              %for FID, (cs1, cs2, change, path, diff, stats) in c.changes[c.changeset.raw_id].iteritems():

			




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

			




	
	
	
		
 
                        <div class="node">

			




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

			




	
	
	
		
 
                            <a href="#${FID}">${h.safe_unicode(path)}</a>

			




	
	
	
		
 
                        </div>

			




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

			




	
	
	
		
 
                  </div>

			




	
	
	
		
 
              %endfor

			




	
	
	
		
 
              % 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 anyway')}</a></h5>

			




	
	
	
		
 
              % endif

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 

			




	
	
	
		
 
    </div>

			




        

    


    
    

    

        

                

                    kallithea/templates/changeset/changeset_range.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -54,24 +54,25 @@ ${self.repo_context_bar('changelog')}

			




	
	
	
		
 
                <td><div class="message">${h.urlify_commit(h.wrap_paragraphs(cs.message),c.repo_name)}</div></td>

			




	
	
	
		
 
                </tr>

			




	
	
	
		
 
            %endfor

			




	
	
	
		
 
            </table>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${_('Files affected')}</div>

			




	
	
	
		
 
            <div class="cs_files">

			




	
	
	
		
 
                %for cs in c.cs_ranges:

			




	
	
	
		
 
                    <div class="cur_cs">${h.link_to(h.show_id(cs),h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id))}</div>

			




	
	
	
		
 
                    %for FID, (cs1, cs2, change, path, diff, stats) in c.changes[cs.raw_id].iteritems():

			




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

			




	
	
	
		
 
                            <div class="node">

			




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

			




	
	
	
		
 
                                ${h.link_to(h.safe_unicode(path),h.url.current(anchor=FID))}

			




	
	
	
		
 
                            </div>

			




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

			




	
	
	
		
 
                        </div>

			




	
	
	
		
 
                    %endfor

			




	
	
	
		
 
                %endfor

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <%namespace name="comment" file="/changeset/changeset_file_comment.html"/>

			




	
	
	
		
 
    <%namespace name="diff_block" file="/changeset/diff_block.html"/>

			




        

    


    
    

    

        

                

                    kallithea/templates/compare/compare_diff.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -60,25 +60,28 @@ ${self.repo_context_bar('changelog')}

			




	
	
	
		
 
                %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">${h.link_to(h.safe_unicode(f), '#' + fid)}</div>

			




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

			




	
	
	
		
 

			




	
	
	
		
 
        ## diff block

			




	
	
	
		
 
        <%namespace name="diff_block" file="/changeset/diff_block.html"/>

			




	
	
	
		
 
        ${diff_block.diff_block_js()}

			




        

    


    
    

    

        

                

                    kallithea/templates/pullrequests/pullrequest_show.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -271,25 +271,28 @@ ${self.repo_context_bar('showpullrequest

			




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

			




	
	
	
		
 

			




	
	
	
		
 
              </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">${h.link_to(h.safe_unicode(f),'#' + fid)}</div>

			




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

			




	
	
	
		
 
              <div class="comments-number pr-comments-number">${ungettext("%d comment", "%d comments", len(c.comments)) % len(c.comments)} ${ungettext("(%d inline)", "(%d inline)", c.inline_cnt) % c.inline_cnt} <span class="firstlink"></span> </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 anyway')}</a></h5>

			




	
	
	
		
 
              % endif

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <script>

			




        

    


    
    

    

        

                

                    kallithea/tests/functional/test_compare_local.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -20,35 +20,57 @@ class TestCompareController(TestControll

			




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

			




	
	
	
		
 
        response.mustcontain('''<a href="/%s/changeset/36e0fc9d2808c5022a24f49d6658330383ed8666">r119:36e0fc9d2808</a>''' % HG_REPO)

			




	
	
	
		
 
        response.mustcontain('''<a href="/%s/changeset/17544fbfcd33ffb439e2b728b5d526b1ef30bfcf">r120:17544fbfcd33</a>''' % HG_REPO)

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain('11 files changed with 94 insertions and 64 deletions')

			




	
	
	
		
 

			




	
	
	
		
 
        ## files diff

			




	
	
	
		
 
        response.mustcontain('''<div class="node"><a href="#C--1c5cf9e91c12">docs/api/utils/index.rst</a></div>''')

			




	
	
	
		
 
        response.mustcontain('''<div class="node"><a href="#C--e3305437df55">test_and_report.sh</a></div>''')

			




	
	
	
		
 
        response.mustcontain('''<div class="node"><a href="#C--c8e92ef85cd1">.hgignore</a></div>''')

			




	
	
	
		
 
        response.mustcontain('''<div class="node"><a href="#C--6e08b694d687">.hgtags</a></div>''')

			




	
	
	
		
 
        response.mustcontain('''<div class="node"><a href="#C--2c14b00f3393">docs/api/index.rst</a></div>''')

			




	
	
	
		
 
        response.mustcontain('''<div class="node"><a href="#C--430ccbc82bdf">vcs/__init__.py</a></div>''')

			




	
	
	
		
 
        response.mustcontain('''<div class="node"><a href="#C--9c390eb52cd6">vcs/backends/hg.py</a></div>''')

			




	
	
	
		
 
        response.mustcontain('''<div class="node"><a href="#C--ebb592c595c0">vcs/utils/__init__.py</a></div>''')

			




	
	
	
		
 
        response.mustcontain('''<div class="node"><a href="#C--7abc741b5052">vcs/utils/annotate.py</a></div>''')

			




	
	
	
		
 
        response.mustcontain('''<div class="node"><a href="#C--2ef0ef106c56">vcs/utils/diffs.py</a></div>''')

			




	
	
	
		
 
        response.mustcontain('''<div class="node"><a href="#C--3150cb87d4b7">vcs/utils/lazy.py</a></div>''')

			




	
	
	
		
 
        response.mustcontain('''<div class="node">

			




	
	
	
		
 
                             <i class="icon-diff-A"></i>

			




	
	
	
		
 
                             <a href="#C--1c5cf9e91c12">docs/api/utils/index.rst</a>''')

			




	
	
	
		
 
        response.mustcontain('''<div class="node">

			




	
	
	
		
 
                             <i class="icon-diff-A"></i>

			




	
	
	
		
 
                             <a href="#C--e3305437df55">test_and_report.sh</a>''')

			




	
	
	
		
 
        response.mustcontain('''<div class="node">

			




	
	
	
		
 
                             <i class="icon-diff-M"></i>

			




	
	
	
		
 
                             <a href="#C--c8e92ef85cd1">.hgignore</a>''')

			




	
	
	
		
 
        response.mustcontain('''<div class="node">

			




	
	
	
		
 
                             <i class="icon-diff-M"></i>

			




	
	
	
		
 
                             <a href="#C--6e08b694d687">.hgtags</a>''')

			




	
	
	
		
 
        response.mustcontain('''<div class="node">

			




	
	
	
		
 
                             <i class="icon-diff-M"></i>

			




	
	
	
		
 
                             <a href="#C--2c14b00f3393">docs/api/index.rst</a>''')

			




	
	
	
		
 
        response.mustcontain('''<div class="node">

			




	
	
	
		
 
                             <i class="icon-diff-M"></i>

			




	
	
	
		
 
                             <a href="#C--430ccbc82bdf">vcs/__init__.py</a>''')

			




	
	
	
		
 
        response.mustcontain('''<div class="node">

			




	
	
	
		
 
                             <i class="icon-diff-M"></i>

			




	
	
	
		
 
                             <a href="#C--9c390eb52cd6">vcs/backends/hg.py</a>''')

			




	
	
	
		
 
        response.mustcontain('''<div class="node">

			




	
	
	
		
 
                             <i class="icon-diff-M"></i>

			




	
	
	
		
 
                             <a href="#C--ebb592c595c0">vcs/utils/__init__.py</a>''')

			




	
	
	
		
 
        response.mustcontain('''<div class="node">

			




	
	
	
		
 
                             <i class="icon-diff-M"></i>

			




	
	
	
		
 
                             <a href="#C--7abc741b5052">vcs/utils/annotate.py</a>''')

			




	
	
	
		
 
        response.mustcontain('''<div class="node">

			




	
	
	
		
 
                             <i class="icon-diff-M"></i>

			




	
	
	
		
 
                             <a href="#C--2ef0ef106c56">vcs/utils/diffs.py</a>''')

			




	
	
	
		
 
        response.mustcontain('''<div class="node">

			




	
	
	
		
 
                             <i class="icon-diff-M"></i>

			




	
	
	
		
 
                             <a href="#C--3150cb87d4b7">vcs/utils/lazy.py</a>''')

			




	
	
	
		
 

			




	
	
	
		
 
    def test_compare_tag_git(self):

			




	
	
	
		
 
        self.log_user()

			




	
	
	
		
 
        tag1 = 'v0.1.2'

			




	
	
	
		
 
        tag2 = 'v0.1.3'

			




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

			




	
	
	
		
 
                                    repo_name=GIT_REPO,

			




	
	
	
		
 
                                    org_ref_type="tag",

			




	
	
	
		
 
                                    org_ref_name=tag1,

			




	
	
	
		
 
                                    other_ref_type="tag",

			




	
	
	
		
 
                                    other_ref_name=tag2,

			




	
	
	
		
 
                                    ), status=200)

			




        

    



    


    



    



      

      





    
    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.