Changeset - 1cecc7db3106
Parent rev.
Child rev.
[Not reviewed]
beta
0 4 0
Marcin Kuzminski - 15 years ago 2011-03-13 13:38:07
marcin@python-works.com
fixed some limits in changesets and changelogs
4 files changed with 28 insertions and 8 deletions:
rhodecode/controllers/changelog.py
1
rhodecode/controllers/changeset.py
11
5
rhodecode/templates/changelog/changelog.html
4
2
rhodecode/templates/changeset/changeset.html
12
1
0 comments (0 inline, 0 general)
rhodecode/controllers/changelog.py
➞
Show inline comments
 
@@ -40,24 +40,25 @@ from rhodecode.lib.auth import LoginRequ
 
from rhodecode.lib.base import BaseRepoController, render
 
from rhodecode.lib.helpers import RepoPage
 

			




	
	
	
		
 
log = logging.getLogger(__name__)

			




	
	
	
		
 

			




	
	
	
		
 
class ChangelogController(BaseRepoController):

			




	
	
	
		
 

			




	
	
	
		
 
    @LoginRequired()

			




	
	
	
		
 
    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',

			




	
	
	
		
 
                                   'repository.admin')

			




	
	
	
		
 
    def __before__(self):

			




	
	
	
		
 
        super(ChangelogController, self).__before__()

			




	
	
	
		
 
        c.affected_files_cut_off = 60

			




	
	
	
		
 

			




	
	
	
		
 
    def index(self):

			




	
	
	
		
 
        limit = 100

			




	
	
	
		
 
        default = 20

			




	
	
	
		
 
        if request.params.get('size'):

			




	
	
	
		
 
            try:

			




	
	
	
		
 
                int_size = int(request.params.get('size'))

			




	
	
	
		
 
            except ValueError:

			




	
	
	
		
 
                int_size = default

			




	
	
	
		
 
            int_size = int_size if int_size <= limit else limit

			




	
	
	
		
 
            c.size = int_size

			




	
	
	
		
 
            session['changelog_size'] = c.size

			




        

    


    
    

    

        

                

                    rhodecode/controllers/changeset.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -43,59 +43,60 @@ from vcs.nodes import FileNode

			




	
	
	
		
 
from vcs.utils import diffs as differ

			




	
	
	
		
 
from vcs.utils.ordered_dict import OrderedDict

			




	
	
	
		
 

			




	
	
	
		
 
log = logging.getLogger(__name__)

			




	
	
	
		
 

			




	
	
	
		
 
class ChangesetController(BaseRepoController):

			




	
	
	
		
 

			




	
	
	
		
 
    @LoginRequired()

			




	
	
	
		
 
    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',

			




	
	
	
		
 
                                   'repository.admin')

			




	
	
	
		
 
    def __before__(self):

			




	
	
	
		
 
        super(ChangesetController, self).__before__()

			




	
	
	
		
 
        c.affected_files_cut_off = 60

			




	
	
	
		
 

			




	
	
	
		
 
    def index(self, revision):

			




	
	
	
		
 

			




	
	
	
		
 
        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

			




	
	
	
		
 

			




	
	
	
		
 
        #get ranges of revisions if preset

			




	
	
	
		
 
        rev_range = revision.split('...')[:2]

			




	
	
	
		
 
        range_limit = 50

			




	
	
	
		
 

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            if len(rev_range) == 2:

			




	
	
	
		
 
                rev_start = rev_range[0]

			




	
	
	
		
 
                rev_end = rev_range[1]

			




	
	
	
		
 
                rev_ranges = c.rhodecode_repo.get_changesets(start=rev_start,

			




	
	
	
		
 
                                                            end=rev_end)

			




	
	
	
		
 
            else:

			




	
	
	
		
 
                rev_ranges = [c.rhodecode_repo.get_changeset(revision)]

			




	
	
	
		
 

			




	
	
	
		
 
            c.cs_ranges = list(rev_ranges)

			




	
	
	
		
 

			




	
	
	
		
 
        except (RepositoryError, ChangesetDoesNotExistError, Exception), e:

			




	
	
	
		
 
            log.error(traceback.format_exc())

			




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

			




	
	
	
		
 
            return redirect(url('home'))

			




	
	
	
		
 

			




	
	
	
		
 
        c.changes = OrderedDict()

			




	
	
	
		
 
        c.sum_added = 0

			




	
	
	
		
 
        c.sum_removed = 0

			




	
	
	
		
 

			




	
	
	
		
 
        c.cut_off = False

			




	
	
	
		
 

			




	
	
	
		
 
        for changeset in c.cs_ranges:

			




	
	
	
		
 
            c.changes[changeset.raw_id] = []

			




	
	
	
		
 
            try:

			




	
	
	
		
 
                changeset_parent = changeset.parents[0]

			




	
	
	
		
 
            except IndexError:

			




	
	
	
		
 
                changeset_parent = None

			




	
	
	
		
 

			




	
	
	
		
 

			




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

			




	
	
	
		
 
            # ADDED FILES

			




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

			




	
	
		
 
@@ -103,59 +104,64 @@ class ChangesetController(BaseRepoContro

			




	
	
	
		
 
                filenode_old = FileNode(node.path, '', EmptyChangeset())

			




	
	
	
		
 
                if filenode_old.is_binary or node.is_binary:

			




	
	
	
		
 
                    diff = wrap_to_table(_('binary file'))

			




	
	
	
		
 
                else:

			




	
	
	
		
 
                    c.sum_added += node.size

			




	
	
	
		
 
                    if c.sum_added < self.cut_off_limit:

			




	
	
	
		
 
                        f_gitdiff = differ.get_gitdiff(filenode_old, node)

			




	
	
	
		
 
                        diff = differ.DiffProcessor(f_gitdiff, format='gitdiff').as_html()

			




	
	
	
		
 

			




	
	
	
		
 
                    else:

			




	
	
	
		
 
                        diff = wrap_to_table(_('Changeset is to big and was cut'

			




	
	
	
		
 
                                            ' off, see raw changeset instead'))

			




	
	
	
		
 
                        c.cut_off = True

			




	
	
	
		
 
                        break

			




	
	
	
		
 

			




	
	
	
		
 
                cs1 = None

			




	
	
	
		
 
                cs2 = node.last_changeset.raw_id

			




	
	
	
		
 
                c.changes[changeset.raw_id].append(('added', node, diff, cs1, cs2))

			




	
	
	
		
 

			




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

			




	
	
	
		
 
            # CHANGED FILES

			




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

			




	
	
	
		
 
            if not c.cut_off:

			




	
	
	
		
 
            for node in changeset.changed:

			




	
	
	
		
 
                try:

			




	
	
	
		
 
                    filenode_old = changeset_parent.get_node(node.path)

			




	
	
	
		
 
                except ChangesetError:

			




	
	
	
		
 
                    filenode_old = FileNode(node.path, '', EmptyChangeset())

			




	
	
	
		
 

			




	
	
	
		
 
                if filenode_old.is_binary or node.is_binary:

			




	
	
	
		
 
                    diff = wrap_to_table(_('binary file'))

			




	
	
	
		
 
                else:

			




	
	
	
		
 

			




	
	
	
		
 
                    if c.sum_removed < self.cut_off_limit:

			




	
	
	
		
 
                        f_gitdiff = differ.get_gitdiff(filenode_old, node)

			




	
	
	
		
 
                        diff = differ.DiffProcessor(f_gitdiff, format='gitdiff').as_html()

			




	
	
	
		
 
                        if diff:

			




	
	
	
		
 
                            c.sum_removed += len(diff)

			




	
	
	
		
 
                    else:

			




	
	
	
		
 
                        diff = wrap_to_table(_('Changeset is to big and was cut'

			




	
	
	
		
 
                                            ' off, see raw changeset instead'))

			




	
	
	
		
 

			




	
	
	
		
 
                            c.cut_off = True

			




	
	
	
		
 
                            break

			




	
	
	
		
 

			




	
	
	
		
 
                cs1 = filenode_old.last_changeset.raw_id

			




	
	
	
		
 
                cs2 = node.last_changeset.raw_id

			




	
	
	
		
 
                c.changes[changeset.raw_id].append(('changed', node, diff, cs1, cs2))

			




	
	
	
		
 

			




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

			




	
	
	
		
 
            # REMOVED FILES    

			




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

			




	
	
	
		
 
            if not c.cut_off:

			




	
	
	
		
 
            for node in changeset.removed:

			




	
	
	
		
 
                c.changes[changeset.raw_id].append(('removed', node, None, None, None))

			




	
	
	
		
 

			




	
	
	
		
 
        if len(c.cs_ranges) == 1:

			




	
	
	
		
 
            c.changeset = c.cs_ranges[0]

			




	
	
	
		
 
            c.changes = c.changes[c.changeset.raw_id]

			




	
	
	
		
 

			




	
	
	
		
 
            return render('changeset/changeset.html')

			




	
	
	
		
 
        else:

			




	
	
	
		
 
            return render('changeset/changeset_range.html')

			




	
	
	
		
 

			




	
	
	
		
 
    def raw_changeset(self, revision):

			




	
	
		
 
@@ -171,37 +177,37 @@ class ChangesetController(BaseRepoContro

			




	
	
	
		
 
            try:

			




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

			




	
	
	
		
 
            except IndexError:

			




	
	
	
		
 
                c.changeset_parent = None

			




	
	
	
		
 
            c.changes = []

			




	
	
	
		
 

			




	
	
	
		
 
            for node in c.changeset.added:

			




	
	
	
		
 
                filenode_old = FileNode(node.path, '')

			




	
	
	
		
 
                if filenode_old.is_binary or node.is_binary:

			




	
	
	
		
 
                    diff = _('binary file') + '\n'

			




	
	
	
		
 
                else:

			




	
	
	
		
 
                    f_gitdiff = differ.get_gitdiff(filenode_old, node)

			




	
	
	
		
 
                    diff = differ.DiffProcessor(f_gitdiff).raw_diff()

			




	
	
	
		
 
                    diff = differ.DiffProcessor(f_gitdiff, format='gitdiff').raw_diff()

			




	
	
	
		
 

			




	
	
	
		
 
                cs1 = None

			




	
	
	
		
 
                cs2 = node.last_changeset.raw_id

			




	
	
	
		
 
                c.changes.append(('added', node, diff, cs1, cs2))

			




	
	
	
		
 

			




	
	
	
		
 
            for node in c.changeset.changed:

			




	
	
	
		
 
                filenode_old = c.changeset_parent.get_node(node.path)

			




	
	
	
		
 
                if filenode_old.is_binary or node.is_binary:

			




	
	
	
		
 
                    diff = _('binary file')

			




	
	
	
		
 
                else:

			




	
	
	
		
 
                    f_gitdiff = differ.get_gitdiff(filenode_old, node)

			




	
	
	
		
 
                    diff = differ.DiffProcessor(f_gitdiff).raw_diff()

			




	
	
	
		
 
                    diff = differ.DiffProcessor(f_gitdiff, format='gitdiff').raw_diff()

			




	
	
	
		
 

			




	
	
	
		
 
                cs1 = filenode_old.last_changeset.raw_id

			




	
	
	
		
 
                cs2 = node.last_changeset.raw_id

			




	
	
	
		
 
                c.changes.append(('changed', node, diff, cs1, cs2))

			




	
	
	
		
 

			




	
	
	
		
 
        response.content_type = 'text/plain'

			




	
	
	
		
 

			




	
	
	
		
 
        if method == 'download':

			




	
	
	
		
 
            response.content_disposition = 'attachment; filename=%s.patch' % revision

			




	
	
	
		
 

			




	
	
	
		
 
        parent = True if len(c.changeset.parents) > 0 else False

			




	
	
	
		
 
        c.parent_tmpl = 'Parent  %s' % c.changeset.parents[0].raw_id if parent else ''

			




        

    


    
    

    

        

                

                    rhodecode/templates/changelog/changelog.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



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

			




	
	
	
		
 
							</div>

			




	
	
	
		
 
							<div class="author">

			




	
	
	
		
 
								<div class="gravatar">

			




	
	
	
		
 
									<img alt="gravatar" src="${h.gravatar_url(h.email(cs.author),20)}"/>

			




	
	
	
		
 
								</div>

			




	
	
	
		
 
								<span>${h.person(cs.author)}</span><br/>

			




	
	
	
		
 
								<span><a href="mailto:${h.email_or_none(cs.author)}">${h.email_or_none(cs.author)}</a></span><br/>

			




	
	
	
		
 
							</div>

			




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

			




	
	
	
		
 
						</div>	

			




	
	
	
		
 
						<div class="right">

			




	
	
	
		
 
									<div class="changes">

			




	
	
	
		
 
									   % if len(cs.affected_files) <= 30:								

			




	
	
	
		
 
									   % if len(cs.affected_files) <= c.affected_files_cut_off:						

			




	
	
	
		
 
										<span class="removed tooltip" title="<b>${_('removed')}</b>${h.changed_tooltip(cs.removed)}">${len(cs.removed)}</span>

			




	
	
	
		
 
										<span class="changed tooltip" title="<b>${_('changed')}</b>${h.changed_tooltip(cs.changed)}">${len(cs.changed)}</span>

			




	
	
	
		
 
										<span class="added tooltip" title="<b>${_('added')}</b>${h.changed_tooltip(cs.added)}">${len(cs.added)}</span>

			




	
	
	
		
 
									   % else:

			




	
	
	
		
 
									     <span class="large tooltip" title="${_('affected %s files') % len(cs.affected_files)}">${len(cs.affected_files)}</span>

			




	
	
	
		
 
				                         <span class="removed tooltip" title="${_('affected %s files') % len(cs.affected_files)}">!</span>

			




	
	
	
		
 
				                         <span class="changed tooltip" title="${_('affected %s files') % len(cs.affected_files)}">!</span>

			




	
	
	
		
 
				                         <span class="added tooltip"   title="${_('affected %s files') % len(cs.affected_files)}">!</span>  									   

			




	
	
	
		
 
									   % endif

			




	
	
	
		
 
									</div>					

			




	
	
	
		
 
										%if len(cs.parents)>1:

			




	
	
	
		
 
										<div class="merge">

			




	
	
	
		
 
											${_('merge')}<img alt="merge" src="${h.url("/images/icons/arrow_join.png")}"/>

			




	
	
	
		
 
										</div>

			




	
	
	
		
 
										%endif

			




	
	
	
		
 
								   %if cs.parents:							

			




	
	
	
		
 
									%for p_cs in reversed(cs.parents):

			




	
	
	
		
 
										<div class="parent">${_('Parent')} ${p_cs.revision}: ${h.link_to(h.short_id(p_cs.raw_id),

			




	
	
	
		
 
											h.url('changeset_home',repo_name=c.repo_name,revision=p_cs.raw_id),title=p_cs.message)}

			




	
	
	
		
 
										</div>

			




        

    


    
    

    

        

                

                    rhodecode/templates/changeset/changeset.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



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

			




	
	
	
		
 

			




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

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="title()">

			




	
	
	
		
 
    ${c.repo_name} ${_('Changeset')} - r${c.changeset.revision}:${h.short_id(c.changeset.raw_id)} - ${c.rhodecode_name}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="breadcrumbs_links()">

			




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

			




	
	
	
		
 
    &raquo;

			




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

			




	
	
	
		
 
    &raquo;

			




	
	
	
		
 
    ${_('Changeset')} - r${c.changeset.revision}:${h.short_id(c.changeset.raw_id)}

			




	
	
		
 
@@ -40,27 +42,33 @@

			




	
	
	
		
 
	                 <div class="date">${_('commit')} ${c.changeset.revision}: ${h.short_id(c.changeset.raw_id)}@${c.changeset.date}</div>

			




	
	
	
		
 
	                 <div class="author">

			




	
	
	
		
 
	                     <div class="gravatar">

			




	
	
	
		
 
	                         <img alt="gravatar" src="${h.gravatar_url(h.email(c.changeset.author),20)}"/>

			




	
	
	
		
 
	                     </div>

			




	
	
	
		
 
	                     <span>${h.person(c.changeset.author)}</span><br/>

			




	
	
	
		
 
	                     <span><a href="mailto:${h.email_or_none(c.changeset.author)}">${h.email_or_none(c.changeset.author)}</a></span><br/>

			




	
	
	
		
 
	                 </div>

			




	
	
	
		
 
	                 <div class="message">${h.link_to(h.wrap_paragraphs(c.changeset.message),h.url('changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}</div>

			




	
	
	
		
 
	             </div>

			




	
	
	
		
 
	             <div class="right">

			




	
	
	
		
 
		             <div class="changes">

			




	
	
	
		
 
                        % if len(c.changeset.affected_files) <= c.affected_files_cut_off:	             

			




	
	
	
		
 
		                 <span class="removed" title="${_('removed')}">${len(c.changeset.removed)}</span>

			




	
	
	
		
 
		                 <span class="changed" title="${_('changed')}">${len(c.changeset.changed)}</span>

			




	
	
	
		
 
		                 <span class="added" title="${_('added')}">${len(c.changeset.added)}</span>

			




	
	
	
		
 
	                    % else:

			




	
	
	
		
 
                         <span class="removed" title="${_('affected %s files') % len(c.changeset.affected_files)}">!</span>

			




	
	
	
		
 
                         <span class="changed" title="${_('affected %s files') % len(c.changeset.affected_files)}">!</span>

			




	
	
	
		
 
                         <span class="added"   title="${_('affected %s files') % len(c.changeset.affected_files)}">!</span>	                    

			




	
	
	
		
 
	                    % endif		                 

			




	
	
	
		
 
		             </div>                  

			




	
	
	
		
 
		                 %if len(c.changeset.parents)>1:

			




	
	
	
		
 
		                 <div class="merge">

			




	
	
	
		
 
		                     ${_('merge')}<img alt="merge" src="${h.url("/images/icons/arrow_join.png")}"/>

			




	
	
	
		
 
		                 </div>

			




	
	
	
		
 
		                 %endif

			




	
	
	
		
 
		                 

			




	
	
	
		
 
		            %if c.changeset.parents:

			




	
	
	
		
 
		             %for p_cs in reversed(c.changeset.parents):

			




	
	
	
		
 
		                 <div class="parent">${_('Parent')} ${p_cs.revision}: ${h.link_to(h.short_id(p_cs.raw_id),

			




	
	
	
		
 
		                     h.url('changeset_home',repo_name=c.repo_name,revision=p_cs.raw_id),title=p_cs.message)}

			




	
	
	
		
 
		                 </div>

			




	
	
		
 
@@ -69,29 +77,32 @@

			




	
	
	
		
 
                        <div class="parent">${_('No parents')}</div>   

			




	
	
	
		
 
                    %endif		             

			




	
	
	
		
 
		         <span class="logtags">

			




	
	
	
		
 
		             <span class="branchtag" title="${'%s %s' % (_('branch'),c.changeset.branch)}">

			




	
	
	
		
 
		             ${h.link_to(c.changeset.branch,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}</span>

			




	
	
	
		
 
		             %for tag in c.changeset.tags:

			




	
	
	
		
 
		                 <span class="tagtag"  title="${'%s %s' % (_('tag'),tag)}">

			




	
	
	
		
 
		                 ${h.link_to(tag,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}</span>

			




	
	
	
		
 
		             %endfor

			




	
	
	
		
 
		         </span>                                                                 

			




	
	
	
		
 
	                </div>              

			




	
	
	
		
 
	        </div>

			




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

			




	
	
	
		
 
	        <span style="font-size:1.1em;font-weight: bold">${_('Files affected (%s)' % len(c.changeset.affected_files))}</span>

			




	
	
	
		
 
	        <div class="cs_files">

			




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

			




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

			




	
	
	
		
 
	                %endfor

			




	
	
	
		
 
	                % if c.cut_off:

			




	
	
	
		
 
	                  ${_('Changeset was to big and was cut off...')}

			




	
	
	
		
 
	                % endif

			




	
	
	
		
 
	        </div>         

			




	
	
	
		
 
	    </div>

			




	
	
	
		
 
	    

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    	

			




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

			




	
	
	
		
 
		%if change !='removed':

			




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

			




	
	
	
		
 
		<div class="diffblock">

			




	
	
	
		
 
			<div id="${h.repo_name_slug('C%s' % filenode.path.decode('utf-8','replace'))}" class="code-header">

			




	
	
	
		
 
				<div class="changeset_header">

			




	
	
	
		
 
					<span class="changeset_file">

			




        

    



    


    



    



      

      





    
    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.