Changeset - e8c016815ab9
Parent rev.
Child rev.
[Not reviewed]
beta
0 4 0
Marcin Kuzminski - 14 years ago 2012-03-23 22:52:12
marcin@python-works.com
added hidden fulldiff GET param for disabling big diff cut off limit.
fixed context toggle options on single file diff
3 files changed with 29 insertions and 21 deletions:
rhodecode/controllers/changeset.py
23
15
rhodecode/templates/changeset/changeset.html
4
4
rhodecode/templates/changeset/diff_block.html
2
2
0 comments (0 inline, 0 general)
rhodecode/controllers/changeset.py
➞
Show inline comments
 
@@ -30,161 +30,169 @@ from webob.exc import HTTPForbidden
 

			




	
	
	
		
 
from pylons import tmpl_context as c, url, request, response

			




	
	
	
		
 
from pylons.i18n.translation import _

			




	
	
	
		
 
from pylons.controllers.util import redirect

			




	
	
	
		
 
from pylons.decorators import jsonify

			




	
	
	
		
 

			




	
	
	
		
 
from rhodecode.lib.vcs.exceptions import RepositoryError, ChangesetError, \

			




	
	
	
		
 
    ChangesetDoesNotExistError

			




	
	
	
		
 
from rhodecode.lib.vcs.nodes import FileNode

			




	
	
	
		
 

			




	
	
	
		
 
import rhodecode.lib.helpers as h

			




	
	
	
		
 
from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator

			




	
	
	
		
 
from rhodecode.lib.base import BaseRepoController, render

			




	
	
	
		
 
from rhodecode.lib.utils import EmptyChangeset

			




	
	
	
		
 
from rhodecode.lib.compat import OrderedDict

			




	
	
	
		
 
from rhodecode.lib import diffs

			




	
	
	
		
 
from rhodecode.model.db import ChangesetComment

			




	
	
	
		
 
from rhodecode.model.comment import ChangesetCommentsModel

			




	
	
	
		
 
from rhodecode.model.meta import Session

			




	
	
	
		
 
from rhodecode.lib.diffs import wrapped_diff

			




	
	
	
		
 

			




	
	
	
		
 
log = logging.getLogger(__name__)

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
def anchor_url(revision, path):

			




	
	
	
		
 
def _update_with_GET(params, GET):

			




	
	
	
		
 
    for k in ['diff1', 'diff2', 'diff']:

			




	
	
	
		
 
        params[k] += GET.getall(k)

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
def anchor_url(revision, path, GET):

			




	
	
	
		
 
    fid = h.FID(revision, path)

			




	
	
	
		
 
    return h.url.current(anchor=fid, **dict(request.GET))

			




	
	
	
		
 
    return h.url.current(anchor=fid, **dict(GET))

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
def get_ignore_ws(fid, GET):

			




	
	
	
		
 
    ig_ws_global = request.GET.get('ignorews')

			




	
	
	
		
 
    ig_ws_global = GET.get('ignorews')

			




	
	
	
		
 
    ig_ws = filter(lambda k: k.startswith('WS'), GET.getall(fid))

			




	
	
	
		
 
    if ig_ws:

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            return int(ig_ws[0].split(':')[-1])

			




	
	
	
		
 
        except:

			




	
	
	
		
 
            pass

			




	
	
	
		
 
    return ig_ws_global

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
def _ignorews_url(fileid=None):

			




	
	
	
		
 
    fileid = str(fileid)

			




	
	
	
		
 
def _ignorews_url(GET, fileid=None):

			




	
	
	
		
 
    fileid = str(fileid) if fileid else None

			




	
	
	
		
 
    params = defaultdict(list)

			




	
	
	
		
 
    _update_with_GET(params, GET)

			




	
	
	
		
 
    lbl = _('show white space')

			




	
	
	
		
 
    ig_ws = get_ignore_ws(fileid, request.GET)

			




	
	
	
		
 
    ln_ctx = get_line_ctx(fileid, request.GET)

			




	
	
	
		
 
    ig_ws = get_ignore_ws(fileid, GET)

			




	
	
	
		
 
    ln_ctx = get_line_ctx(fileid, GET)

			




	
	
	
		
 
    # global option

			




	
	
	
		
 
    if fileid is None:

			




	
	
	
		
 
        if ig_ws is None:

			




	
	
	
		
 
            params['ignorews'] += [1]

			




	
	
	
		
 
            lbl = _('ignore white space')

			




	
	
	
		
 
        ctx_key = 'context'

			




	
	
	
		
 
        ctx_val = ln_ctx

			




	
	
	
		
 
    # per file options

			




	
	
	
		
 
    else:

			




	
	
	
		
 
        if ig_ws is None:

			




	
	
	
		
 
            params[fileid] += ['WS:1']

			




	
	
	
		
 
            lbl = _('ignore white space')

			




	
	
	
		
 

			




	
	
	
		
 
        ctx_key = fileid

			




	
	
	
		
 
        ctx_val = 'C:%s' % ln_ctx

			




	
	
	
		
 
    # if we have passed in ln_ctx pass it along to our params

			




	
	
	
		
 
    if ln_ctx:

			




	
	
	
		
 
        params[ctx_key] += [ctx_val]

			




	
	
	
		
 

			




	
	
	
		
 
    params['anchor'] = fileid

			




	
	
	
		
 
    img = h.image(h.url('/images/icons/text_strikethrough.png'), lbl, class_='icon')

			




	
	
	
		
 
    return h.link_to(img, h.url.current(**params), title=lbl, class_='tooltip')

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
def get_line_ctx(fid, GET):

			




	
	
	
		
 
    ln_ctx_global = request.GET.get('context')

			




	
	
	
		
 
    ln_ctx_global = GET.get('context')

			




	
	
	
		
 
    ln_ctx = filter(lambda k: k.startswith('C'), GET.getall(fid))

			




	
	
	
		
 

			




	
	
	
		
 
    if ln_ctx:

			




	
	
	
		
 
        retval = ln_ctx[0].split(':')[-1]

			




	
	
	
		
 
    else:

			




	
	
	
		
 
        retval = ln_ctx_global

			




	
	
	
		
 

			




	
	
	
		
 
    try:

			




	
	
	
		
 
        return int(retval)

			




	
	
	
		
 
    except:

			




	
	
	
		
 
        return

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
def _context_url(fileid=None):

			




	
	
	
		
 
def _context_url(GET, fileid=None):

			




	
	
	
		
 
    """

			




	
	
	
		
 
    Generates url for context lines

			




	
	
	
		
 

			




	
	
	
		
 
    :param fileid:

			




	
	
	
		
 
    """

			




	
	
	
		
 
    fileid = str(fileid)

			




	
	
	
		
 
    ig_ws = get_ignore_ws(fileid, request.GET)

			




	
	
	
		
 
    ln_ctx = (get_line_ctx(fileid, request.GET) or 3) * 2

			




	
	
	
		
 

			




	
	
	
		
 
    fileid = str(fileid) if fileid else None

			




	
	
	
		
 
    ig_ws = get_ignore_ws(fileid, GET)

			




	
	
	
		
 
    ln_ctx = (get_line_ctx(fileid, GET) or 3) * 2

			




	
	
	
		
 

			




	
	
	
		
 
    params = defaultdict(list)

			




	
	
	
		
 
    _update_with_GET(params, GET)

			




	
	
	
		
 

			




	
	
	
		
 
    # global option

			




	
	
	
		
 
    if fileid is None:

			




	
	
	
		
 
        if ln_ctx > 0:

			




	
	
	
		
 
            params['context'] += [ln_ctx]

			




	
	
	
		
 

			




	
	
	
		
 
        if ig_ws:

			




	
	
	
		
 
            ig_ws_key = 'ignorews'

			




	
	
	
		
 
            ig_ws_val = 1

			




	
	
	
		
 

			




	
	
	
		
 
    # per file option

			




	
	
	
		
 
    else:

			




	
	
	
		
 
        params[fileid] += ['C:%s' % ln_ctx]

			




	
	
	
		
 
        ig_ws_key = fileid

			




	
	
	
		
 
        ig_ws_val = 'WS:%s' % 1

			




	
	
	
		
 

			




	
	
	
		
 
    if ig_ws:

			




	
	
	
		
 
        params[ig_ws_key] += [ig_ws_val]

			




	
	
	
		
 

			




	
	
	
		
 
    lbl = _('%s line context') % ln_ctx

			




	
	
	
		
 

			




	
	
	
		
 
    params['anchor'] = fileid

			




	
	
	
		
 
    img = h.image(h.url('/images/icons/table_add.png'), lbl, class_='icon')

			




	
	
	
		
 
    return h.link_to(img, h.url.current(**params), title=lbl, class_='tooltip')

			




	
	
	
		
 

			




	
	
	
		
 

			




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

			




	
	
	
		
 

			




	
	
	
		
 
        c.anchor_url = anchor_url

			




	
	
	
		
 
        c.ignorews_url = _ignorews_url

			




	
	
	
		
 
        c.context_url = _context_url

			




	
	
	
		
 

			




	
	
	
		
 
        limit_off = request.GET.get('fulldiff')

			




	
	
	
		
 
        #get ranges of revisions if preset

			




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

			




	
	
	
		
 
        enable_comments = True

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            if len(rev_range) == 2:

			




	
	
	
		
 
                enable_comments = False

			




	
	
	
		
 
                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)

			




	
	
	
		
 
            if not c.cs_ranges:

			




	
	
	
		
 
                raise RepositoryError('Changeset range returned empty result')

			




	
	
	
		
 

			




	
	
	
		
 
        except (RepositoryError, ChangesetDoesNotExistError, Exception), e:

			




	
	
	
		
 
            log.error(traceback.format_exc())

			




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

			




	
	
	
		
 
            return redirect(url('home'))

			




	
	
	
		
 

			




	
	
	
		
 
        c.changes = OrderedDict()

			




	
	
	
		
 

			




	
	
		
 
@@ -200,80 +208,80 @@ class ChangesetController(BaseRepoContro

			




	
	
	
		
 
        # Iterate over ranges (default changeset view is always one changeset)

			




	
	
	
		
 
        for changeset in c.cs_ranges:

			




	
	
	
		
 
            c.comments.extend(ChangesetCommentsModel()\

			




	
	
	
		
 
                              .get_comments(c.rhodecode_db_repo.repo_id,

			




	
	
	
		
 
                                            changeset.raw_id))

			




	
	
	
		
 
            inlines = ChangesetCommentsModel()\

			




	
	
	
		
 
                        .get_inline_comments(c.rhodecode_db_repo.repo_id,

			




	
	
	
		
 
                                             changeset.raw_id)

			




	
	
	
		
 
            c.inline_comments.extend(inlines)

			




	
	
	
		
 
            c.changes[changeset.raw_id] = []

			




	
	
	
		
 
            try:

			




	
	
	
		
 
                changeset_parent = changeset.parents[0]

			




	
	
	
		
 
            except IndexError:

			




	
	
	
		
 
                changeset_parent = None

			




	
	
	
		
 

			




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

			




	
	
	
		
 
            # ADDED FILES

			




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

			




	
	
	
		
 
            for node in changeset.added:

			




	
	
	
		
 
                fid = h.FID(revision, node.path)

			




	
	
	
		
 
                line_context_lcl = get_line_ctx(fid, request.GET)

			




	
	
	
		
 
                ign_whitespace_lcl = get_ignore_ws(fid, request.GET)

			




	
	
	
		
 
                lim = self.cut_off_limit

			




	
	
	
		
 
                if cumulative_diff > self.cut_off_limit:

			




	
	
	
		
 
                    lim = -1

			




	
	
	
		
 
                    lim = -1 if limit_off is None else None

			




	
	
	
		
 
                size, cs1, cs2, diff, st = wrapped_diff(

			




	
	
	
		
 
                    filenode_old=None,

			




	
	
	
		
 
                    filenode_new=node,

			




	
	
	
		
 
                    cut_off_limit=lim,

			




	
	
	
		
 
                    ignore_whitespace=ign_whitespace_lcl,

			




	
	
	
		
 
                    line_context=line_context_lcl,

			




	
	
	
		
 
                    enable_comments=enable_comments

			




	
	
	
		
 
                )

			




	
	
	
		
 
                cumulative_diff += size

			




	
	
	
		
 
                c.lines_added += st[0]

			




	
	
	
		
 
                c.lines_deleted += st[1]

			




	
	
	
		
 
                c.changes[changeset.raw_id].append(

			




	
	
	
		
 
                    ('added', node, diff, cs1, cs2, st)

			




	
	
	
		
 
                )

			




	
	
	
		
 

			




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

			




	
	
	
		
 
            # CHANGED FILES

			




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

			




	
	
	
		
 
            for node in changeset.changed:

			




	
	
	
		
 
                try:

			




	
	
	
		
 
                    filenode_old = changeset_parent.get_node(node.path)

			




	
	
	
		
 
                except ChangesetError:

			




	
	
	
		
 
                    log.warning('Unable to fetch parent node for diff')

			




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

			




	
	
	
		
 

			




	
	
	
		
 
                fid = h.FID(revision, node.path)

			




	
	
	
		
 
                line_context_lcl = get_line_ctx(fid, request.GET)

			




	
	
	
		
 
                ign_whitespace_lcl = get_ignore_ws(fid, request.GET)

			




	
	
	
		
 
                lim = self.cut_off_limit

			




	
	
	
		
 
                if cumulative_diff > self.cut_off_limit:

			




	
	
	
		
 
                    lim = -1

			




	
	
	
		
 
                    lim = -1 if limit_off is None else None

			




	
	
	
		
 
                size, cs1, cs2, diff, st = wrapped_diff(

			




	
	
	
		
 
                    filenode_old=filenode_old,

			




	
	
	
		
 
                    filenode_new=node,

			




	
	
	
		
 
                    cut_off_limit=lim,

			




	
	
	
		
 
                    ignore_whitespace=ign_whitespace_lcl,

			




	
	
	
		
 
                    line_context=line_context_lcl,

			




	
	
	
		
 
                    enable_comments=enable_comments

			




	
	
	
		
 
                )

			




	
	
	
		
 
                cumulative_diff += size

			




	
	
	
		
 
                c.lines_added += st[0]

			




	
	
	
		
 
                c.lines_deleted += st[1]

			




	
	
	
		
 
                c.changes[changeset.raw_id].append(

			




	
	
	
		
 
                    ('changed', node, diff, cs1, cs2, st)

			




	
	
	
		
 
                )

			




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

			




	
	
	
		
 
            # REMOVED FILES

			




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

			




	
	
	
		
 
            for node in changeset.removed:

			




	
	
	
		
 
                c.changes[changeset.raw_id].append(

			




	
	
	
		
 
                    ('removed', node, None, None, None, (0, 0))

			




	
	
	
		
 
                )

			




	
	
	
		
 

			




	
	
	
		
 
        # count inline comments

			




	
	
	
		
 
        for path, lines in c.inline_comments:

			




        

    


    
    

    

        

                

                    rhodecode/templates/changeset/changeset.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -15,50 +15,50 @@

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="page_nav()">

			




	
	
	
		
 
    ${self.menu('changelog')}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="main()">

			




	
	
	
		
 
<div class="box">

			




	
	
	
		
 
    <!-- box / title -->

			




	
	
	
		
 
    <div class="title">

			




	
	
	
		
 
        ${self.breadcrumbs()}

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <div class="table">

			




	
	
	
		
 
		<div class="diffblock">

			




	
	
	
		
 
			<div class="code-header">

			




	
	
	
		
 
                <div class="hash">

			




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

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div class="date">

			




	
	
	
		
 
                  ${c.changeset.date}

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div class="diff-actions">

			




	
	
	
		
 
                  <a href="${h.url('raw_changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id,diff='show')}" title="${_('raw diff')}" class="tooltip"><img class="icon" src="${h.url('/images/icons/page_white.png')}"/></a>

			




	
	
	
		
 
                  <a href="${h.url('raw_changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id,diff='download')}" title="${_('download diff')}" class="tooltip"><img class="icon" src="${h.url('/images/icons/page_white_get.png')}"/></a>

			




	
	
	
		
 
                  ${c.ignorews_url()}

			




	
	
	
		
 
                  ${c.context_url()}

			




	
	
	
		
 
                  ${c.ignorews_url(request.GET)}

			




	
	
	
		
 
                  ${c.context_url(request.GET)}

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div class="comments-number" style="float:right;padding-right:5px">${len(c.comments)} comment(s) (${c.inline_cnt} ${_('inline')})</div>

			




	
	
	
		
 
			</div>

			




	
	
	
		
 
		</div>

			




	
	
	
		
 
	    <div id="changeset_content">

			




	
	
	
		
 
			<div class="container">

			




	
	
	
		
 
	             <div class="left">

			




	
	
	
		
 
	                 <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.urlify_commit(h.wrap_paragraphs(c.changeset.message),c.repo_name)}</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>

			




	
	
		
 
@@ -70,56 +70,56 @@

			




	
	
	
		
 
		            %if c.changeset.parents:

			




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

			




	
	
	
		
 
		                 <div class="parent">${_('Parent')}

			




	
	
	
		
 
                     <span class="changeset_id">${p_cs.revision}:<span class="changeset_hash">${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)}</span></span>

			




	
	
	
		
 
		                 </div>

			




	
	
	
		
 
		             %endfor

			




	
	
	
		
 
                    %else:

			




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

			




	
	
	
		
 
                    %endif

			




	
	
	
		
 
		         <span class="logtags">

			




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

			




	
	
	
		
 
                 <span class="merge">${_('merge')}</span>

			




	
	
	
		
 
                 %endif

			




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

			




	
	
	
		
 
	        ${_('%s files affected with %s additions and %s deletions:') % (len(c.changeset.affected_files),c.lines_added,c.lines_deleted)}

			




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

			




	
	
	
		
 
	        </span>

			




	
	
	
		
 
	        <div class="cs_files">

			




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

			




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

			




	
	
	
		
 
                            <div class="node">

			




	
	
	
		
 
                            %if change != 'removed':

			




	
	
	
		
 
                                ${h.link_to(h.safe_unicode(filenode.path),c.anchor_url(filenode.changeset.raw_id,filenode.path)+"_target")}

			




	
	
	
		
 
                                ${h.link_to(h.safe_unicode(filenode.path),c.anchor_url(filenode.changeset.raw_id,filenode.path,request.GET)+"_target")}

			




	
	
	
		
 
                            %else:

			




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

			




	
	
	
		
 
                            %endif

			




	
	
	
		
 
                            </div>

			




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

			




	
	
	
		
 
	                    </div>

			




	
	
	
		
 
	                %endfor

			




	
	
	
		
 
	                % if c.cut_off:

			




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

			




	
	
	
		
 
	                % endif

			




	
	
	
		
 
	        </div>

			




	
	
	
		
 
	    </div>

			




	
	
	
		
 

			




	
	
	
		
 
    </div>

			




	
	
	
		
 

			




	
	
	
		
 
    ## diff block

			




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

			




	
	
	
		
 
    ${diff_block.diff_block(c.changes)}

			




	
	
	
		
 

			




	
	
	
		
 
    ## template for inline comment form

			




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

			




	
	
	
		
 
    ${comment.comment_inline_form(c.changeset)}

			




	
	
	
		
 

			




	
	
	
		
 
    ${comment.comments(c.changeset)}

			




        

    


    
    

    

        

                

                    rhodecode/templates/changeset/diff_block.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



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

			




	
	
	
		
 
##usage:

			




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

			




	
	
	
		
 
## ${diff_block.diff_block(changes)}

			




	
	
	
		
 
##

			




	
	
	
		
 
<%def name="diff_block(changes)">

			




	
	
	
		
 

			




	
	
	
		
 
%for change,filenode,diff,cs1,cs2,stat in changes:

			




	
	
	
		
 
    %if change !='removed':

			




	
	
	
		
 
    <div id="${h.FID(filenode.changeset.raw_id,filenode.path)}_target" style="clear:both;height:90px;margin-top:-60px"></div>

			




	
	
	
		
 
    <div id="${h.FID(filenode.changeset.raw_id,filenode.path)}" class="diffblock  margined comm">

			




	
	
	
		
 
        <div class="code-header">

			




	
	
	
		
 
            <div class="changeset_header">

			




	
	
	
		
 
                <div class="changeset_file">

			




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

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div class="diff-actions">

			




	
	
	
		
 
                  <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='diff',fulldiff=1)}" title="${_('diff')}" class="tooltip"><img class="icon" src="${h.url('/images/icons/page_white_go.png')}"/></a>

			




	
	
	
		
 
                  <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='raw')}" title="${_('raw diff')}" class="tooltip"><img class="icon" src="${h.url('/images/icons/page_white.png')}"/></a>

			




	
	
	
		
 
                  <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='download')}" title="${_('download diff')}" class="tooltip"><img class="icon" src="${h.url('/images/icons/page_white_get.png')}"/></a>

			




	
	
	
		
 
                  ${c.ignorews_url(h.FID(filenode.changeset.raw_id,filenode.path))}

			




	
	
	
		
 
                  ${c.context_url(h.FID(filenode.changeset.raw_id,filenode.path))}

			




	
	
	
		
 
                  ${c.ignorews_url(request.GET, h.FID(filenode.changeset.raw_id,filenode.path))}

			




	
	
	
		
 
                  ${c.context_url(request.GET, h.FID(filenode.changeset.raw_id,filenode.path))}

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <span style="float:right;margin-top:-3px">

			




	
	
	
		
 
                  <label>

			




	
	
	
		
 
                  ${_('show inline comments')}

			




	
	
	
		
 
                  ${h.checkbox('',checked="checked",class_="show-inline-comments",id_for=h.FID(filenode.changeset.raw_id,filenode.path))}

			




	
	
	
		
 
                  </label>

			




	
	
	
		
 
                </span>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <div class="code-body">

			




	
	
	
		
 
            <div class="full_f_path" path="${h.safe_unicode(filenode.path)}"></div>

			




	
	
	
		
 
            ${diff|n}

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    %endif

			




	
	
	
		
 
%endfor

			




	
	
	
		
 

			




	
	
	
		
 
</%def>

			




        

    



    


    



    



      

      





    
    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.