Changeset - 0dc8d578ff49
Parent rev.
Child rev.
[Not reviewed]
default
0 10 0
Marcin Kuzminski - 15 years ago 2011-04-09 18:38:18
marcin@python-works.com
merges for stable
10 files changed with 41 insertions and 27 deletions:
docs/changelog.rst
1
1
rhodecode/controllers/feed.py
1
1
rhodecode/controllers/files.py
5
3
rhodecode/controllers/home.py
1
1
rhodecode/templates/base/base.html
4
1
rhodecode/templates/changelog/changelog.html
2
3
rhodecode/templates/changeset/changeset.html
9
7
rhodecode/templates/files/files_annotate.html
9
5
rhodecode/templates/files/files_browser.html
2
2
rhodecode/templates/files/files_source.html
7
3
0 comments (0 inline, 0 general)
docs/changelog.rst
➞
Show inline comments
 
@@ -26,7 +26,7 @@ fixes
 
- windows fixes for os.kill #133
 
- fixes path splitting for windows issues #148
 
- fixed issue #143 wrong import on migration to 1.1.X
 

			




	
	
	
		
 
- fixed problems with displaying binary files, thanks to Thomas Waldmann

			




	
	
	
		
 
 

			




	
	
	
		
 
1.1.7 (**2011-03-23**)

			




	
	
	
		
 
======================

			




        

    


    
    

    

        

                

                    rhodecode/controllers/feed.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -7,7 +7,7 @@

			




	
	
	
		
 
    

			




	
	
	
		
 
    :created_on: Apr 23, 2010

			




	
	
	
		
 
    :author: marcink

			




	
	
	
		
 
    :copyright: (C) 2009-2010 Marcin Kuzminski <marcin@python-works.com>    

			




	
	
	
		
 
    :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>

			




	
	
	
		
 
    :license: GPLv3, see COPYING for more details.

			




	
	
	
		
 
"""

			




	
	
	
		
 
# This program is free software: you can redistribute it and/or modify

			




        

    


    
    

    

        

                

                    rhodecode/controllers/files.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -45,6 +45,7 @@ from vcs.utils import diffs as differ

			




	
	
	
		
 

			




	
	
	
		
 
log = logging.getLogger(__name__)

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
class FilesController(BaseController):

			




	
	
	
		
 

			




	
	
	
		
 
    @LoginRequired()

			




	
	
		
 
@@ -228,10 +229,11 @@ class FilesController(BaseController):

			




	
	
	
		
 
            return diff.raw_diff()

			




	
	
	
		
 

			




	
	
	
		
 
        elif c.action == 'diff':

			




	
	
	
		
 
            if node1.size > self.cut_off_limit or node2.size > self.cut_off_limit:

			




	
	
	
		
 
                c.cur_diff = _('Diff is to big to display')

			




	
	
	
		
 
            elif node1.is_binary or node2.is_binary:

			




	
	
	
		
 
            if  node1.is_binary or node2.is_binary:

			




	
	
	
		
 
                c.cur_diff = _('Binary file')

			




	
	
	
		
 
            elif node1.size > self.cut_off_limit or \

			




	
	
	
		
 
                    node2.size > self.cut_off_limit:

			




	
	
	
		
 
                c.cur_diff = _('Diff is too big to display')

			




	
	
	
		
 
            else:

			




	
	
	
		
 
                c.cur_diff = diff.as_html()

			




	
	
	
		
 
        else:

			




        

    


    
    

    

        

                

                    rhodecode/controllers/home.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -7,7 +7,7 @@

			




	
	
	
		
 
    

			




	
	
	
		
 
    :created_on: Feb 18, 2010

			




	
	
	
		
 
    :author: marcink

			




	
	
	
		
 
    :copyright: (C) 2009-2010 Marcin Kuzminski <marcin@python-works.com>    

			




	
	
	
		
 
    :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>

			




	
	
	
		
 
    :license: GPLv3, see COPYING for more details.

			




	
	
	
		
 
"""

			




	
	
	
		
 
# This program is free software: you can redistribute it and/or modify

			




        

    


    
    

    

        

                

                    rhodecode/templates/base/base.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -85,7 +85,10 @@

			




	
	
	
		
 
	   <div id="footer-inner" class="title bottom-left-rounded-corner bottom-right-rounded-corner">

			




	
	
	
		
 
	       <div>

			




	
	
	
		
 
	           <p class="footer-link">${h.link_to(_('Submit a bug'),h.url('bugtracker'))}</p>

			




	
	
	
		
 
		       <p class="footer-link-right"><a href="${h.url('rhodecode_official')}">RhodeCode</a> ${c.rhodecode_version} &copy; 2010-2011 by Marcin Kuzminski</p>

			




	
	
	
		
 
		       <p class="footer-link-right">

			




	
	
	
		
 
			       <a href="${h.url('rhodecode_official')}">RhodeCode</a> 

			




	
	
	
		
 
       	           ${c.rhodecode_version} &copy; 2010-${h.datetime.today().year} by Marcin Kuzminski		       

			




	
	
	
		
 
		       </p>

			




	
	
	
		
 
	       </div>

			




	
	
	
		
 
	   </div>

			




	
	
	
		
 
        <script type="text/javascript">

			




        

    


    
    

    

        

                

                    rhodecode/templates/changelog/changelog.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -32,16 +32,15 @@ ${c.repo_name} ${_('Changelog')} - ${c.r

			




	
	
	
		
 
				</div>

			




	
	
	
		
 
				<div id="graph_content">

			




	
	
	
		
 
					<div class="container_header">

			




	
	
	
		
 
						

			




	
	
	
		
 
        ${h.form(h.url.current(),method='get')}

			




	
	
	
		
 
        <div class="info_box">

			




	
	
	
		
 
          <span>${_('Show')}:</span>

			




	
	
	
		
 
          ${h.text('size',size=1,value=c.size)}

			




	
	
	
		
 
          <span>${_('revisions')}</span>

			




	
	
	
		
 
          ${h.submit('set',_('set'))}

			




	
	
	
		
 
				          

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        ${h.end_form()}

			




	
	
	
		
 
						

			




	
	
	
		
 
					</div>

			




	
	
	
		
 
				%for cnt,cs in enumerate(c.pagination):

			




	
	
	
		
 
					<div id="chg_${cnt+1}" class="container">

			




	
	
		
 
@@ -97,7 +96,7 @@ ${c.repo_name} ${_('Changelog')} - ${c.r

			




	
	
	
		
 
				</div>

			




	
	
	
		
 
			</div>

			




	
	
	
		
 
			

			




	
	
	
		
 
			<script type="text/javascript" src="${h.url("/js/graph.js")}"></script>

			




	
	
	
		
 
			<script type="text/javascript" src="${h.url('/js/graph.js')}"></script>

			




	
	
	
		
 
			<script type="text/javascript">

			




	
	
	
		
 
				YAHOO.util.Event.onDOMReady(function(){

			




	
	
	
		
 
					function set_canvas() {

			




        

    


    
    

    

        

                

                    rhodecode/templates/changeset/changeset.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



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

			




	
	
	
		
 

			




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

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="title()">

			




	
	
		
 
@@ -81,7 +83,7 @@

			




	
	
	
		
 
	        <span style="font-size:1.1em;font-weight: bold">${_('Files affected')}</span>

			




	
	
	
		
 
	        <div class="cs_files">

			




	
	
	
		
 
	                %for change,filenode,diff,cs1,cs2 in c.changes:

			




	
	
	
		
 
	                    <div class="cs_${change}">${h.link_to(filenode.path,h.url.current(anchor='CHANGE-%s'%filenode.path))}</div>

			




	
	
	
		
 
	                    <div class="cs_${change}">${h.link_to(h.safe_unicode(filenode.path),h.url.current(anchor=h.repo_name_slug('CHANGE-%s' % h.safe_unicode(filenode.path))))}</div>

			




	
	
	
		
 
	                %endfor

			




	
	
	
		
 
	        </div>         

			




	
	
	
		
 
	    </div>

			




	
	
		
 
@@ -92,19 +94,19 @@

			




	
	
	
		
 
		%if change !='removed':

			




	
	
	
		
 
		<div style="clear:both;height:10px"></div>

			




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

			




	
	
	
		
 
			<div id="${'CHANGE-%s'%filenode.path}" class="code-header">

			




	
	
	
		
 
			<div id="${h.repo_name_slug('CHANGE-%s' % h.safe_unicode(filenode.path))}" class="code-header">

			




	
	
	
		
 
				<div class="changeset_header">

			




	
	
	
		
 
					<span class="changeset_file">

			




	
	
	
		
 
						${h.link_to_if(change!='removed',filenode.path,h.url('files_home',repo_name=c.repo_name,

			




	
	
	
		
 
						revision=filenode.changeset.raw_id,f_path=filenode.path))}

			




	
	
	
		
 
						${h.link_to_if(change!='removed',h.safe_unicode(filenode.path),h.url('files_home',repo_name=c.repo_name,

			




	
	
	
		
 
						revision=filenode.changeset.raw_id,f_path=h.safe_unicode(filenode.path)))}

			




	
	
	
		
 
					</span>

			




	
	
	
		
 
					%if 1:

			




	
	
	
		
 
					&raquo; <span>${h.link_to(_('diff'),

			




	
	
	
		
 
					h.url('files_diff_home',repo_name=c.repo_name,f_path=filenode.path,diff2=cs2,diff1=cs1,diff='diff'))}</span>

			




	
	
	
		
 
					h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='diff'))}</span>

			




	
	
	
		
 
					&raquo; <span>${h.link_to(_('raw diff'),

			




	
	
	
		
 
					h.url('files_diff_home',repo_name=c.repo_name,f_path=filenode.path,diff2=cs2,diff1=cs1,diff='raw'))}</span>

			




	
	
	
		
 
					h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='raw'))}</span>

			




	
	
	
		
 
					&raquo; <span>${h.link_to(_('download diff'),

			




	
	
	
		
 
					h.url('files_diff_home',repo_name=c.repo_name,f_path=filenode.path,diff2=cs2,diff1=cs1,diff='download'))}</span>

			




	
	
	
		
 
					h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='download'))}</span>

			




	
	
	
		
 
					%endif

			




	
	
	
		
 
				</div>

			




	
	
	
		
 
			</div>

			




        

    


    
    

    

        

                

                    rhodecode/templates/files/files_annotate.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -51,8 +51,8 @@

			




	
	
	
		
 
			        ${h.form(h.url('files_diff_home',repo_name=c.repo_name,f_path=c.f_path),method='get')}

			




	
	
	
		
 
			        ${h.hidden('diff2',c.file.last_changeset.raw_id)}

			




	
	
	
		
 
			        ${h.select('diff1',c.file.last_changeset.raw_id,c.file_history)}

			




	
	
	
		
 
			        ${h.submit('diff','diff to revision',class_="ui-button ui-widget ui-state-default ui-corner-all")}

			




	
	
	
		
 
			        ${h.submit('show_rev','show at revision',class_="ui-button ui-widget ui-state-default ui-corner-all")}

			




	
	
	
		
 
			        ${h.submit('diff','diff to revision',class_="ui-button")}

			




	
	
	
		
 
			        ${h.submit('show_rev','show at revision',class_="ui-button")}

			




	
	
	
		
 
			        ${h.end_form()}

			




	
	
	
		
 
			        </div>

			




	
	
	
		
 
			    </dd>					

			




	
	
		
 
@@ -63,14 +63,15 @@

			




	
	
	
		
 
					<div class="commit">"${c.file.message}"</div>

			




	
	
	
		
 
				</div>

			




	
	
	
		
 
				<div class="code-body">

			




	
	
	
		
 
			       %if c.file.is_binary:

			




	
	
	
		
 
			           ${_('Binary file')}

			




	
	
	
		
 
			       %else:				

			




	
	
	
		
 
					% if c.file.size < c.cut_off_limit:

			




	
	
	
		
 
						${h.pygmentize_annotation(c.file,linenos=True,anchorlinenos=True,lineanchors='S',cssclass="code-highlight")}

			




	
	
	
		
 
						${h.pygmentize_annotation(c.file,linenos=True,anchorlinenos=True,lineanchors='L',cssclass="code-highlight")}

			




	
	
	
		
 
					%else:

			




	
	
	
		
 
						${_('File is to big to display')} ${h.link_to(_('show as raw'),

			




	
	
	
		
 
						h.url('files_raw_home',repo_name=c.repo_name,revision=c.cs.revision,f_path=c.f_path))}

			




	
	
	
		
 
					%endif				

			




	
	
	
		
 
				</div>

			




	
	
	
		
 
			</div>

			




	
	
	
		
 
			<script type="text/javascript">

			




	
	
	
		
 
			YAHOO.util.Event.onDOMReady(function(){

			




	
	
	
		
 
			    YAHOO.util.Event.addListener('show_rev','click',function(e){

			




	
	
		
 
@@ -81,6 +82,9 @@

			




	
	
	
		
 
			        });

			




	
	
	
		
 
			   });

			




	
	
	
		
 
			</script>			

			




	
	
	
		
 
				   %endif				

			




	
	
	
		
 
				</div>

			




	
	
	
		
 
			</div>

			




	
	
	
		
 
		</div>    

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
</div>    

			




        

    


    
    

    

        

                

                    rhodecode/templates/files/files_browser.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -49,7 +49,7 @@

			




	
	
	
		
 
		    %for cnt,node in enumerate(c.files_list):

			




	
	
	
		
 
				<tr class="parity${cnt%2}">

			




	
	
	
		
 
		             <td>

			




	
	
	
		
 
						${h.link_to(node.name,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=node.path),class_=file_class(node))}

			




	
	
	
		
 
						${h.link_to(node.name,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=h.safe_unicode(node.path)),class_=file_class(node))}

			




	
	
	
		
 
		             </td>

			




	
	
	
		
 
		             <td>

			




	
	
	
		
 
		             %if node.is_file():

			




	
	
		
 
@@ -64,7 +64,7 @@

			




	
	
	
		
 
		             <td>

			




	
	
	
		
 
		             	%if node.is_file():

			




	
	
	
		
 
		             		<span class="tooltip" title="${node.last_changeset.raw_id}">

			




	
	
	
		
 
		             		${node.last_changeset.revision}</span>

			




	
	
	
		
 
		             		${'r%s:%s' % (node.last_changeset.revision,node.last_changeset.short_id)}</span>

			




	
	
	
		
 
		             	%endif

			




	
	
	
		
 
		             </td>

			




	
	
	
		
 
		             <td>

			




        

    


    
    

    

        

                

                    rhodecode/templates/files/files_source.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -22,8 +22,8 @@

			




	
	
	
		
 
		${h.form(h.url('files_diff_home',repo_name=c.repo_name,f_path=c.f_path),method='get')}

			




	
	
	
		
 
		${h.hidden('diff2',c.files_list.last_changeset.raw_id)}

			




	
	
	
		
 
		${h.select('diff1',c.files_list.last_changeset.raw_id,c.file_history)}

			




	
	
	
		
 
		${h.submit('diff','diff to revision',class_="ui-button ui-widget ui-state-default ui-corner-all")}

			




	
	
	
		
 
		${h.submit('show_rev','show at revision',class_="ui-button ui-widget ui-state-default ui-corner-all")}

			




	
	
	
		
 
		${h.submit('diff','diff to revision',class_="ui-button")}

			




	
	
	
		
 
		${h.submit('show_rev','show at revision',class_="ui-button")}

			




	
	
	
		
 
		${h.end_form()}

			




	
	
	
		
 
		</div>

			




	
	
	
		
 
	</dd>

			




	
	
		
 
@@ -36,12 +36,16 @@

			




	
	
	
		
 
		<div class="commit">"${c.files_list.last_changeset.message}"</div>

			




	
	
	
		
 
	</div>

			




	
	
	
		
 
	<div class="code-body">

			




	
	
	
		
 
	   %if c.files_list.is_binary:

			




	
	
	
		
 
	       ${_('Binary file')}

			




	
	
	
		
 
	   %else:

			




	
	
	
		
 
		% if c.files_list.size < c.cut_off_limit:

			




	
	
	
		
 
			${h.pygmentize(c.files_list,linenos=True,anchorlinenos=True,lineanchors='S',cssclass="code-highlight")}

			




	
	
	
		
 
			${h.pygmentize(c.files_list,linenos=True,anchorlinenos=True,lineanchors='L',cssclass="code-highlight")}

			




	
	
	
		
 
		%else:

			




	
	
	
		
 
			${_('File is to big to display')} ${h.link_to(_('show as raw'),

			




	
	
	
		
 
			h.url('files_raw_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path))}

			




	
	
	
		
 
		%endif

			




	
	
	
		
 
	   %endif

			




	
	
	
		
 
	</div>

			




	
	
	
		
 
</div>

			




	
	
	
		
 

			




        

    



    


    



    



      

      





    
    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.