Changeset - c8bd0e6cc3da
Parent rev.
Child rev.
[Not reviewed]
beta
0 5 0
Marcin Kuzminski - 15 years ago 2010-11-02 23:28:37
marcin@python-works.com
some changes for #45.
Added warning messages for browsing wrong cs/paths
Cleanup of codes
5 files changed with 35 insertions and 21 deletions:
rhodecode/controllers/changeset.py
3
1
rhodecode/controllers/files.py
12
7
rhodecode/templates/files/files.html
9
2
rhodecode/templates/files/files_browser.html
7
7
rhodecode/templates/files/files_source.html
4
4
0 comments (0 inline, 0 general)
rhodecode/controllers/changeset.py
➞
Show inline comments
 
@@ -18,24 +18,25 @@
 
# MA  02110-1301, USA.
 
from rhodecode.lib.utils import EmptyChangeset
 
"""
 
Created on April 25, 2010
 
changeset controller for pylons
 
@author: marcink
 
"""
 
from pylons import tmpl_context as c, url, request, response
 
from pylons.i18n.translation import _
 
from pylons.controllers.util import redirect
 
from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
 
from rhodecode.lib.base import BaseController, render
 
import rhodecode.lib.helpers as h
 
from rhodecode.model.hg import HgModel
 
from vcs.exceptions import RepositoryError, ChangesetError
 
from vcs.nodes import FileNode
 
from vcs.utils import diffs as differ
 
import logging
 
import traceback
 

			




	
	
	
		
 
log = logging.getLogger(__name__)

			




	
	
	
		
 

			




	
	
	
		
 
class ChangesetController(BaseController):

			




	
	
	
		
 

			




	
	
	
		
 
    @LoginRequired()

			




	
	
		
 
@@ -50,26 +51,27 @@ class ChangesetController(BaseController

			




	
	
	
		
 

			




	
	
	
		
 
        def wrap_to_table(str):

			




	
	
	
		
 

			




	
	
	
		
 
            return '''<table class="code-difftable">

			




	
	
	
		
 
                        <tr class="line">

			




	
	
	
		
 
                        <td class="lineno new"></td>

			




	
	
	
		
 
                        <td class="code"><pre>%s</pre></td>

			




	
	
	
		
 
                        </tr>

			




	
	
	
		
 
                      </table>''' % str

			




	
	
	
		
 

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            c.changeset = hg_model.get_repo(c.repo_name).get_changeset(revision)

			




	
	
	
		
 
        except RepositoryError:

			




	
	
	
		
 
        except RepositoryError, e:

			




	
	
	
		
 
            log.error(traceback.format_exc())

			




	
	
	
		
 
            h.flash(str(e), category='warning')

			




	
	
	
		
 
            return redirect(url('home'))

			




	
	
	
		
 
        else:

			




	
	
	
		
 
            try:

			




	
	
	
		
 
                c.changeset_old = c.changeset.parents[0]

			




	
	
	
		
 
            except IndexError:

			




	
	
	
		
 
                c.changeset_old = None

			




	
	
	
		
 
            c.changes = []

			




	
	
	
		
 

			




	
	
	
		
 
            #===================================================================

			




	
	
	
		
 
            # ADDED FILES

			




	
	
	
		
 
            #===================================================================

			




	
	
	
		
 
            c.sum_added = 0

			




        

    


    
    

    

        

                

                    rhodecode/controllers/files.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -59,42 +59,47 @@ class FilesController(BaseController):

			




	
	
	
		
 
            if r > max_rev:

			




	
	
	
		
 
                r = max_rev

			




	
	
	
		
 
            return r

			




	
	
	
		
 

			




	
	
	
		
 
        def get_prev_rev(cur):

			




	
	
	
		
 
            r = cur - 1

			




	
	
	
		
 
            return r

			




	
	
	
		
 

			




	
	
	
		
 
        c.f_path = f_path

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            cur_rev = repo.get_changeset(revision).revision

			




	
	
	
		
 
            c.changeset = repo.get_changeset(revision)

			




	
	
	
		
 
            cur_rev = c.changeset.revision

			




	
	
	
		
 
            prev_rev = repo.get_changeset(get_prev_rev(cur_rev)).raw_id

			




	
	
	
		
 
            next_rev = repo.get_changeset(get_next_rev(cur_rev)).raw_id

			




	
	
	
		
 

			




	
	
	
		
 
            c.url_prev = url('files_home', repo_name=c.repo_name,

			




	
	
	
		
 
                             revision=prev_rev, f_path=f_path)

			




	
	
	
		
 
            c.url_next = url('files_home', repo_name=c.repo_name,

			




	
	
	
		
 
                             revision=next_rev, f_path=f_path)

			




	
	
	
		
 

			




	
	
	
		
 
            c.changeset = repo.get_changeset(revision)

			




	
	
	
		
 

			




	
	
	
		
 
            c.cur_rev = c.changeset.raw_id

			




	
	
	
		
 
            c.rev_nr = c.changeset.revision

			




	
	
	
		
 
            try:

			




	
	
	
		
 
            c.files_list = c.changeset.get_node(f_path)

			




	
	
	
		
 
            c.file_history = self._get_history(repo, c.files_list, f_path)

			




	
	
	
		
 

			




	
	
	
		
 
        except (RepositoryError, ChangesetError):

			




	
	
	
		
 
            c.files_list = None

			




	
	
	
		
 
            except RepositoryError, e:

			




	
	
	
		
 
                h.flash(str(e), category='warning')

			




	
	
	
		
 
                redirect(h.url('files_home', repo_name=repo_name, revision=revision))

			




	
	
	
		
 

			




	
	
	
		
 
        except RepositoryError, e:

			




	
	
	
		
 
            h.flash(str(e), category='warning')

			




	
	
	
		
 
            redirect(h.url('files_home', repo_name=repo_name, revision='tip'))

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
        return render('files/files.html')

			




	
	
	
		
 

			




	
	
	
		
 
    def rawfile(self, repo_name, revision, f_path):

			




	
	
	
		
 
        hg_model = HgModel()

			




	
	
	
		
 
        c.repo = hg_model.get_repo(c.repo_name)

			




	
	
	
		
 
        file_node = c.repo.get_changeset(revision).get_node(f_path)

			




	
	
	
		
 
        response.content_type = file_node.mimetype

			




	
	
	
		
 
        response.content_disposition = 'attachment; filename=%s' \

			




	
	
	
		
 
                                                    % f_path.split('/')[-1]

			




	
	
	
		
 
        return file_node.content

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    rhodecode/templates/files/files.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -2,42 +2,49 @@

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="title()">

			




	
	
	
		
 
    ${c.repo_name} ${_('Files')} - ${c.rhodecode_name}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="breadcrumbs_links()">

			




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

			




	
	
	
		
 
    &raquo;

			




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

			




	
	
	
		
 
    &raquo;

			




	
	
	
		
 
    ${_('files')}

			




	
	
	
		
 
    %if c.files_list:

			




	
	
	
		
 
        @ R${c.rev_nr}:${h.short_id(c.cur_rev)}

			




	
	
	
		
 
        @ r${c.changeset.revision}:${h.short_id(c.changeset.raw_id)}

			




	
	
	
		
 
    %endif        

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="page_nav()">

			




	
	
	
		
 
    ${self.menu('files')}     

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="main()">

			




	
	
	
		
 
<div class="box">

			




	
	
	
		
 
    <!-- box / title -->

			




	
	
	
		
 
    <div class="title">

			




	
	
	
		
 
        ${self.breadcrumbs()}     

			




	
	
	
		
 
	    <ul class="links">

			




	
	
	
		
 
		    <li>

			




	
	
	
		
 
		      <span style="text-transform: uppercase;"><a href="#">${_('branch')}: ${c.changeset.branch}</a></span>

			




	
	
	
		
 
	        </li>          

			




	
	
	
		
 
	    </ul>             

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <div class="table">

			




	
	
	
		
 
		<div id="files_data">

			




	
	
	
		
 
			%if c.files_list:

			




	
	
	
		
 
				<h3 class="files_location">${_('Location')}: ${h.files_breadcrumbs(c.repo_name,c.cur_rev,c.files_list.path)}</h3>

			




	
	
	
		
 
				<h3 class="files_location">

			




	
	
	
		
 
				    ${_('Location')}: ${h.files_breadcrumbs(c.repo_name,c.changeset.raw_id,c.files_list.path)}

			




	
	
	
		
 
				</h3>

			




	
	
	
		
 
					%if c.files_list.is_dir():

			




	
	
	
		
 
						<%include file='files_browser.html'/>

			




	
	
	
		
 
					%else:

			




	
	
	
		
 
						<%include file='files_source.html'/>			

			




	
	
	
		
 
					%endif	

			




	
	
	
		
 
			%else:

			




	
	
	
		
 
				<h2>

			




	
	
	
		
 
					<a href="#" onClick="javascript:parent.history.back();" target="main">${_('Go back')}</a> 

			




	
	
	
		
 
					${_('No files at given path')}: "${c.f_path or "/"}" 

			




	
	
	
		
 
				</h2>

			




	
	
	
		
 
			%endif

			




	
	
	
		
 
		

			




        

    


    
    

    

        

                

                    rhodecode/templates/files/files_browser.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
<%def name="file_class(node)">

			




	
	
	
		
 
	%if node.is_file():

			




	
	
	
		
 
		<%return "browser-file" %>

			




	
	
	
		
 
	%else:

			




	
	
	
		
 
		<%return "browser-dir"%>

			




	
	
	
		
 
	%endif

			




	
	
	
		
 
</%def>

			




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

			




	
	
	
		
 
	<div class="browser-header">

			




	
	
	
		
 
		${h.form(h.url.current())}

			




	
	
	
		
 
		<div class="info_box">

			




	
	
	
		
 
          <span >${_('view')}@rev</span> 

			




	
	
	
		
 
          <a href="${c.url_prev}">&laquo;</a>

			




	
	
	
		
 
          ${h.text('at_rev',value=c.rev_nr,size=3)}

			




	
	
	
		
 
          <a href="${c.url_next}">&raquo;</a>

			




	
	
	
		
 
          <a href="${c.url_prev}" title="${_('previous revision')}">&laquo;</a>

			




	
	
	
		
 
          ${h.text('at_rev',value=c.changeset.revision,size=3)}

			




	
	
	
		
 
          <a href="${c.url_next}" title="${_('next revision')}">&raquo;</a>

			




	
	
	
		
 
          ${h.submit('view','view')}

			




	
	
	
		
 
	    </div>           

			




	
	
	
		
 
		${h.end_form()}

			




	
	
	
		
 
	</div>

			




	
	
	
		
 
	<div class="browser-body">

			




	
	
	
		
 
		<table class="code-browser">

			




	
	
	
		
 
		         <thead>

			




	
	
	
		
 
		             <tr>

			




	
	
	
		
 
		                 <th>${_('Name')}</th>

			




	
	
	
		
 
		                 <th>${_('Size')}</th>

			




	
	
	
		
 
		                 <th>${_('Mimetype')}</th>

			




	
	
	
		
 
		                 <th>${_('Revision')}</th>

			




	
	
	
		
 
		                 <th>${_('Last modified')}</th>

			




	
	
	
		
 
		                 <th>${_('Last commiter')}</th>

			




	
	
	
		
 
		             </tr>

			




	
	
	
		
 
		         </thead>

			




	
	
	
		
 

			




	
	
	
		
 
          		%if c.files_list.parent:

			




	
	
	
		
 
         		<tr class="parity0">

			




	
	
	
		
 
	          		<td>		          		

			




	
	
	
		
 
	          			${h.link_to('..',h.url('files_home',repo_name=c.repo_name,revision=c.cur_rev,f_path=c.files_list.parent.path),class_="browser-dir")}

			




	
	
	
		
 
	          			${h.link_to('..',h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.files_list.parent.path),class_="browser-dir")}

			




	
	
	
		
 
	          		</td>

			




	
	
	
		
 
	          		<td></td>

			




	
	
	
		
 
	          		<td></td>

			




	
	
	
		
 
	          		<td></td>

			




	
	
	
		
 
	          		<td></td>

			




	
	
	
		
 
	          		<td></td>

			




	
	
	
		
 
				</tr>

			




	
	
	
		
 
          		%endif

			




	
	
	
		
 
		         	

			




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

			




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

			




	
	
	
		
 
		             <td>

			




	
	
	
		
 
						${h.link_to(node.name,h.url('files_home',repo_name=c.repo_name,revision=c.cur_rev,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=node.path),class_=file_class(node))}

			




	
	
	
		
 
		             </td>

			




	
	
	
		
 
		             <td>

			




	
	
	
		
 
		             %if node.is_file():

			




	
	
	
		
 
		             	${h.format_byte_size(node.size,binary=True)}

			




	
	
	
		
 
		             %endif	

			




	
	
	
		
 
		             </td>

			




	
	
	
		
 
		             <td>

			




	
	
	
		
 
		              %if node.is_file():

			




	
	
	
		
 
		                  ${node.mimetype}

			




	
	
	
		
 
		              %endif

			




	
	
	
		
 
		             </td>

			




	
	
	
		
 
		             <td>

			




	
	
	
		
 
		             	%if node.is_file():

			




	
	
	
		
 
		             		${node.last_changeset.revision}

			




	
	
	
		
 
		             		<span class="tooltip" tooltip_title="${node.last_changeset.raw_id}">${node.last_changeset.revision}</span>

			




	
	
	
		
 
		             	%endif

			




	
	
	
		
 
		             </td>

			




	
	
	
		
 
		             <td>

			




	
	
	
		
 
		             	%if node.is_file():

			




	
	
	
		
 
		             		${h.age(node.last_changeset.date)} - ${node.last_changeset.date}

			




	
	
	
		
 
		             		${node.last_changeset.date} - ${h.age(node.last_changeset.date)} ${_('ago')} 

			




	
	
	
		
 
		             	%endif

			




	
	
	
		
 
		             </td>

			




	
	
	
		
 
		             <td>

			




	
	
	
		
 
		             	%if node.is_file():

			




	
	
	
		
 
		             		${node.last_changeset.author}

			




	
	
	
		
 
		             	%endif                    

			




	
	
	
		
 
		             </td>

			




	
	
	
		
 
				</tr>

			




	
	
	
		
 
			%endfor

			




	
	
	
		
 
		</table>

			




	
	
	
		
 
	</div>

			




	
	
	
		
 
</div>

			




	
	
		
 
\ No newline at end of file

			




        

    


    
    

    

        

                

                    rhodecode/templates/files/files_source.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
<dl>

			




	
	
	
		
 
	<dt>${_('Last revision')}</dt>

			




	
	
	
		
 
	<dd>

			




	
	
	
		
 
		${h.link_to("r%s:%s" % (c.files_list.last_changeset.revision,h.short_id(c.files_list.last_changeset.raw_id)),

			




	
	
	
		
 
						h.url('files_home',repo_name=c.repo_name,revision=c.files_list.last_changeset.raw_id,f_path=c.f_path))} 

			




	
	
	
		
 
	</dd>

			




	
	
	
		
 
	<dt>${_('Size')}</dt>

			




	
	
	
		
 
	<dd>${h.format_byte_size(c.files_list.size,binary=True)}</dd>

			




	
	
	
		
 
	<dt>${_('Mimetype')}</dt>

			




	
	
	
		
 
	<dd>${c.files_list.mimetype}</dd>

			




	
	
	
		
 
	<dt>${_('Options')}</dt>

			




	
	
	
		
 
	<dd>${h.link_to(_('show annotation'),

			




	
	
	
		
 
			h.url('files_annotate_home',repo_name=c.repo_name,revision=c.cur_rev,f_path=c.f_path))}

			




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

			




	
	
	
		
 
		 / ${h.link_to(_('show as raw'),

			




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

			




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

			




	
	
	
		
 
		 / ${h.link_to(_('download as raw'),

			




	
	
	
		
 
			h.url('files_rawfile_home',repo_name=c.repo_name,revision=c.cur_rev,f_path=c.f_path))}

			




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

			




	
	
	
		
 
	</dd>

			




	
	
	
		
 
	<dt>${_('History')}</dt>

			




	
	
	
		
 
	<dd>

			




	
	
	
		
 
		<div>

			




	
	
	
		
 
		${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.end_form()}

			




	
	
	
		
 
		</div>

			




	
	
	
		
 
	</dd>

			




	
	
		
 
@@ -31,25 +31,25 @@

			




	
	
	
		
 

			




	
	
	
		
 
	

			




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

			




	
	
	
		
 
	<div class="code-header">

			




	
	
	
		
 
		<div class="revision">${c.files_list.name}@r${c.files_list.last_changeset.revision}:${h.short_id(c.files_list.last_changeset.raw_id)}</div>

			




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

			




	
	
	
		
 
	</div>

			




	
	
	
		
 
	<div class="code-body">

			




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

			




	
	
	
		
 
			${h.pygmentize(c.files_list,linenos=True,anchorlinenos=True,lineanchors='S',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.cur_rev,f_path=c.f_path))}

			




	
	
	
		
 
			h.url('files_raw_home',repo_name=c.repo_name,revision=c.changeset.raw_id,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){

			




	
	
	
		
 
    	YAHOO.util.Event.preventDefault(e);

			




	
	
	
		
 
        var cs = YAHOO.util.Dom.get('diff1').value;

			




	
	
	
		
 
        var url = "${h.url('files_home',repo_name=c.repo_name,revision='__CS__',f_path=c.f_path)}".replace('__CS__',cs);

			




	
	
	
		
 
        window.location = url;

			




	
	
	
		
 
        });

			




        

    



    


    



    



      

      





    
    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.