Changeset - 4bf9d7f18253
Parent rev.
Child rev.
[Not reviewed]
default
0 2 0
Mads Kiilerich (mads) - 6 years ago 2020-06-18 14:25:23
mads@kiilerich.com
diff: fix ignorews/context link to use the right target as anchor

The value in url_fid might not be a valid anchor.

For changesets, url_fid would be like 'C--9c390eb52cd6' even though the actual
target included the changeset hash and were like 'C-1536d03b4869-9c390eb52cd6'.

For pullrequests and compare, it wouldn't link to anything at all, even though
there was a target like 'C--56535da5df40'.

Instead, pass id_fid as anchor value as a separate argument. That one is a
valid anchor.
2 files changed with 6 insertions and 6 deletions:
kallithea/controllers/changeset.py
4
4
kallithea/templates/changeset/diff_block.html
2
2
0 comments (0 inline, 0 general)
kallithea/controllers/changeset.py
➞
Show inline comments
 
@@ -25,183 +25,183 @@ Original author and date, and relevant c
 
:license: GPLv3, see LICENSE.md for more details.
 
"""
 

			




	
	
	
		
 
import binascii

			




	
	
	
		
 
import logging

			




	
	
	
		
 
import traceback

			




	
	
	
		
 
from collections import OrderedDict, defaultdict

			




	
	
	
		
 

			




	
	
	
		
 
from tg import request, response

			




	
	
	
		
 
from tg import tmpl_context as c

			




	
	
	
		
 
from tg.i18n import ugettext as _

			




	
	
	
		
 
from webob.exc import HTTPBadRequest, HTTPForbidden, HTTPNotFound

			




	
	
	
		
 

			




	
	
	
		
 
import kallithea.lib.helpers as h

			




	
	
	
		
 
from kallithea.lib import diffs

			




	
	
	
		
 
from kallithea.lib.auth import HasRepoPermissionLevelDecorator, LoginRequired

			




	
	
	
		
 
from kallithea.lib.base import BaseRepoController, jsonify, render

			




	
	
	
		
 
from kallithea.lib.graphmod import graph_data

			




	
	
	
		
 
from kallithea.lib.utils import action_logger

			




	
	
	
		
 
from kallithea.lib.utils2 import ascii_str, safe_str

			




	
	
	
		
 
from kallithea.lib.vcs.backends.base import EmptyChangeset

			




	
	
	
		
 
from kallithea.lib.vcs.exceptions import ChangesetDoesNotExistError, EmptyRepositoryError, RepositoryError

			




	
	
	
		
 
from kallithea.model.changeset_status import ChangesetStatusModel

			




	
	
	
		
 
from kallithea.model.comment import ChangesetCommentsModel

			




	
	
	
		
 
from kallithea.model.db import ChangesetComment, ChangesetStatus

			




	
	
	
		
 
from kallithea.model.meta import Session

			




	
	
	
		
 
from kallithea.model.pull_request import PullRequestModel

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
log = logging.getLogger(__name__)

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
def _update_with_GET(params, GET):

			




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

			




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

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
def get_ignore_ws(fid, GET):

			




	
	
	
		
 
    ig_ws_global = GET.get('ignorews')

			




	
	
	
		
 
    ig_ws = [k for k in GET.getall(fid) if k.startswith('WS')]

			




	
	
	
		
 
    if ig_ws:

			




	
	
	
		
 
        try:

			




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

			




	
	
	
		
 
        except ValueError:

			




	
	
	
		
 
            raise HTTPBadRequest()

			




	
	
	
		
 
    return ig_ws_global

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
def _ignorews_url(GET, fileid=None):

			




	
	
	
		
 
def _ignorews_url(GET, fileid=None, anchor=None):

			




	
	
	
		
 
    fileid = str(fileid) if fileid else None

			




	
	
	
		
 
    params = defaultdict(list)

			




	
	
	
		
 
    _update_with_GET(params, GET)

			




	
	
	
		
 
    lbl = _('Show whitespace')

			




	
	
	
		
 
    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 whitespace')

			




	
	
	
		
 
        ctx_key = 'context'

			




	
	
	
		
 
        ctx_val = ln_ctx

			




	
	
	
		
 
    # per file options

			




	
	
	
		
 
    else:

			




	
	
	
		
 
        if ig_ws is None:

			




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

			




	
	
	
		
 
            lbl = _('Ignore whitespace')

			




	
	
	
		
 

			




	
	
	
		
 
        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

			




	
	
	
		
 
    params['anchor'] = anchor

			




	
	
	
		
 
    icon = h.literal('<i class="icon-strike"></i>')

			




	
	
	
		
 
    return h.link_to(icon, h.url.current(**params), title=lbl, **{'data-toggle': 'tooltip'})

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
def get_line_ctx(fid, GET):

			




	
	
	
		
 
    ln_ctx_global = GET.get('context')

			




	
	
	
		
 
    if fid:

			




	
	
	
		
 
        ln_ctx = [k for k in GET.getall(fid) if k.startswith('C')]

			




	
	
	
		
 
    else:

			




	
	
	
		
 
        _ln_ctx = [k for k in GET if k.startswith('C')]

			




	
	
	
		
 
        ln_ctx = GET.get(_ln_ctx[0]) if _ln_ctx else ln_ctx_global

			




	
	
	
		
 
        if ln_ctx:

			




	
	
	
		
 
            ln_ctx = [ln_ctx]

			




	
	
	
		
 

			




	
	
	
		
 
    if ln_ctx:

			




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

			




	
	
	
		
 
    else:

			




	
	
	
		
 
        retval = ln_ctx_global

			




	
	
	
		
 

			




	
	
	
		
 
    try:

			




	
	
	
		
 
        return int(retval)

			




	
	
	
		
 
    except Exception:

			




	
	
	
		
 
        return 3

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
def _context_url(GET, fileid=None):

			




	
	
	
		
 
def _context_url(GET, fileid=None, anchor=None):

			




	
	
	
		
 
    """

			




	
	
	
		
 
    Generates url for context lines

			




	
	
	
		
 

			




	
	
	
		
 
    :param fileid:

			




	
	
	
		
 
    """

			




	
	
	
		
 

			




	
	
	
		
 
    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 = _('Increase diff context to %(num)s lines') % {'num': ln_ctx}

			




	
	
	
		
 

			




	
	
	
		
 
    params['anchor'] = fileid

			




	
	
	
		
 
    params['anchor'] = anchor

			




	
	
	
		
 
    icon = h.literal('<i class="icon-sort"></i>')

			




	
	
	
		
 
    return h.link_to(icon, h.url.current(**params), title=lbl, **{'data-toggle': 'tooltip'})

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
def create_cs_pr_comment(repo_name, revision=None, pull_request=None, allowed_to_change_status=True):

			




	
	
	
		
 
    """

			




	
	
	
		
 
    Add a comment to the specified changeset or pull request, using POST values

			




	
	
	
		
 
    from the request.

			




	
	
	
		
 

			




	
	
	
		
 
    Comments can be inline (when a file path and line number is specified in

			




	
	
	
		
 
    POST) or general comments.

			




	
	
	
		
 
    A comment can be accompanied by a review status change (accepted, rejected,

			




	
	
	
		
 
    etc.). Pull requests can be closed or deleted.

			




	
	
	
		
 

			




	
	
	
		
 
    Parameter 'allowed_to_change_status' is used for both status changes and

			




	
	
	
		
 
    closing of pull requests. For deleting of pull requests, more specific

			




	
	
	
		
 
    checks are done.

			




	
	
	
		
 
    """

			




	
	
	
		
 

			




	
	
	
		
 
    assert request.environ.get('HTTP_X_PARTIAL_XHR')

			




	
	
	
		
 
    if pull_request:

			




	
	
	
		
 
        pull_request_id = pull_request.pull_request_id

			




	
	
	
		
 
    else:

			




	
	
	
		
 
        pull_request_id = None

			




	
	
	
		
 

			




	
	
	
		
 
    status = request.POST.get('changeset_status')

			




	
	
	
		
 
    close_pr = request.POST.get('save_close')

			




	
	
	
		
 
    delete = request.POST.get('save_delete')

			




	
	
	
		
 
    f_path = request.POST.get('f_path')

			




	
	
	
		
 
    line_no = request.POST.get('line')

			




	
	
	
		
 

			




	
	
	
		
 
    if (status or close_pr or delete) and (f_path or line_no):

			




	
	
	
		
 
        # status votes and closing is only possible in general comments

			




	
	
	
		
 
        raise HTTPBadRequest()

			




	
	
	
		
 

			




	
	
	
		
 
    if not allowed_to_change_status:

			




	
	
	
		
 
        if status or close_pr:

			




	
	
	
		
 
            h.flash(_('No permission to change status'), 'error')

			




	
	
	
		
 
            raise HTTPForbidden()

			




	
	
	
		
 

			




	
	
	
		
 
    if pull_request and delete == "delete":

			




	
	
	
		
 
        if (pull_request.owner_id == request.authuser.user_id or

			




	
	
	
		
 
            h.HasPermissionAny('hg.admin')() or

			




	
	
	
		
 
            h.HasRepoPermissionLevel('admin')(pull_request.org_repo.repo_name) or

			




	
	
	
		
 
            h.HasRepoPermissionLevel('admin')(pull_request.other_repo.repo_name)

			




	
	
	
		
 
        ) and not pull_request.is_closed():

			




	
	
	
		
 
            PullRequestModel().delete(pull_request)

			




	
	
	
		
 
            Session().commit()

			




        

    


    
    

    

        

                

                    kallithea/templates/changeset/diff_block.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -20,98 +20,98 @@

			




	
	
	
		
 
>

			




	
	
	
		
 
    <div id="${id_fid}_target"></div>

			




	
	
	
		
 
    <div id="${id_fid}" class="panel panel-default ${cls}">

			




	
	
	
		
 
        <div class="panel-heading clearfix">

			




	
	
	
		
 
                <div class="pull-left">

			




	
	
	
		
 
                    ${cs_filename}

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div class="pull-left diff-actions">

			




	
	
	
		
 
                  <span>

			




	
	
	
		
 
                    %if op == 'A':

			




	
	
	
		
 
                      <span class="no-file" data-toggle="tooltip" title="${_('No file before')}">

			




	
	
	
		
 
                        <i class="icon-minus-circled"></i></span>

			




	
	
	
		
 
                    %else:

			




	
	
	
		
 
                      <a href="${h.url('files_home', repo_name=a_repo_name, f_path=a_filename, revision=a_rev)}" data-toggle="tooltip" title="${_('File before')}">

			




	
	
	
		
 
                        <i class="icon-doc"></i></a>

			




	
	
	
		
 
                    %endif

			




	
	
	
		
 

			




	
	
	
		
 
                    %if op == 'A':

			




	
	
	
		
 
                      <span class="arrow" data-toggle="tooltip" title="${_('Added')}">&#10142;</span>

			




	
	
	
		
 
                    %elif op == 'M':

			




	
	
	
		
 
                      <span class="arrow" data-toggle="tooltip" title="${_('Modified')}">&#10142;</span>

			




	
	
	
		
 
                    %elif op == 'D':

			




	
	
	
		
 
                      <span class="arrow" data-toggle="tooltip" title="${_('Deleted')}">&#10142;</span>

			




	
	
	
		
 
                    %elif op == 'R':

			




	
	
	
		
 
                      <span class="arrow" data-toggle="tooltip" title="${_('Renamed')}">&#10142;</span>

			




	
	
	
		
 
                    %elif op is None:

			




	
	
	
		
 
                      <span class="arrow" data-toggle="tooltip" title="${_('No change')}">&#10142;</span>

			




	
	
	
		
 
                    %else:

			




	
	
	
		
 
                      <span class="arrow" data-toggle="tooltip" title="${_('Unknown operation: %r') % op}">&#10142;</span>

			




	
	
	
		
 
                    %endif

			




	
	
	
		
 

			




	
	
	
		
 
                    %if op == 'D':

			




	
	
	
		
 
                      <span class="no-file" data-toggle="tooltip" title="${_('No file after')}">

			




	
	
	
		
 
                        <i class="icon-minus-circled"></i></span>

			




	
	
	
		
 
                    %else:

			




	
	
	
		
 
                      <a href="${h.url('files_home', repo_name=cs_repo_name, f_path=cs_filename, revision=cs_rev)}" data-toggle="tooltip" title="${_('File after')}">

			




	
	
	
		
 
                        <i class="icon-doc"></i></a>

			




	
	
	
		
 
                    %endif

			




	
	
	
		
 
                  </span>

			




	
	
	
		
 

			




	
	
	
		
 
                  <a href="${h.url('files_diff_home',repo_name=cs_repo_name,f_path=cs_filename,diff2=cs_rev,diff1=a_rev,diff='diff',fulldiff=1)}" data-toggle="tooltip" title="${_('Show full diff for this file')}">

			




	
	
	
		
 
                      <i class="icon-file-code"></i></a>

			




	
	
	
		
 
                  <a href="${h.url('files_diff_2way_home',repo_name=cs_repo_name,f_path=cs_filename,diff2=cs_rev,diff1=a_rev,diff='diff',fulldiff=1)}" data-toggle="tooltip" title="${_('Show full side-by-side diff for this file')}">

			




	
	
	
		
 
                      <i class="icon-docs"></i></a>

			




	
	
	
		
 
                  <a href="${h.url('files_diff_home',repo_name=cs_repo_name,f_path=cs_filename,diff2=cs_rev,diff1=a_rev,diff='raw')}" data-toggle="tooltip" title="${_('Raw diff for this file')}">

			




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

			




	
	
	
		
 
                  <a href="${h.url('files_diff_home',repo_name=cs_repo_name,f_path=cs_filename,diff2=cs_rev,diff1=a_rev,diff='download')}" data-toggle="tooltip" title="${_('Download diff for this file')}">

			




	
	
	
		
 
                      <i class="icon-floppy"></i></a>

			




	
	
	
		
 
                  ${c.ignorews_url(request.GET, url_fid)}

			




	
	
	
		
 
                  ${c.context_url(request.GET, url_fid)}

			




	
	
	
		
 
                  ${c.ignorews_url(request.GET, url_fid, id_fid)}

			




	
	
	
		
 
                  ${c.context_url(request.GET, url_fid, id_fid)}

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div class="pull-right">

			




	
	
	
		
 
                    ${_('Show inline comments')}

			




	
	
	
		
 
                    ${h.checkbox('checkbox-show-inline-' + id_fid, checked="checked",class_="show-inline-comments",**{'data-for':id_fid})}

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <div class="no-padding panel-body" data-f_path="${cs_filename}">

			




	
	
	
		
 
            ${diff|n}

			




	
	
	
		
 
            %if op and cs_filename.rsplit('.')[-1] in ['png', 'gif', 'jpg', 'bmp']:

			




	
	
	
		
 
              <div class="btn btn-image-diff-show">Show images</div>

			




	
	
	
		
 
              %if op == 'M':

			




	
	
	
		
 
                <div id="${id_fid}_image-diff" class="btn btn-image-diff-swap" style="display:none">Press to swap images</div>

			




	
	
	
		
 
              %endif

			




	
	
	
		
 
              <div>

			




	
	
	
		
 
                %if op in 'DM':

			




	
	
	
		
 
                  <img id="${id_fid}_image-diff-img-a" class="img-diff img-diff-swapable" style="display:none"

			




	
	
	
		
 
                      realsrc="${h.url('files_raw_home',repo_name=a_repo_name,revision=a_rev,f_path=a_filename)}" />

			




	
	
	
		
 
                %endif

			




	
	
	
		
 
                %if op in 'AM':

			




	
	
	
		
 
                  <img id="${id_fid}_image-diff-img-b" class="img-diff img-diff-swapable" style="display:none"

			




	
	
	
		
 
                      realsrc="${h.url('files_raw_home',repo_name=cs_repo_name,revision=cs_rev,f_path=cs_filename)}" />

			




	
	
	
		
 
                %endif

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="diff_block_js()">

			




	
	
	
		
 
<script>'use strict';

			




	
	
	
		
 
$(document).ready(function(){

			




	
	
	
		
 
    $('.btn-image-diff-show').click(function(){

			




	
	
	
		
 
        $('.btn-image-diff-show').hide();

			




	
	
	
		
 
        $('.btn-image-diff-swap').show();

			




	
	
	
		
 
        $('.img-diff-swapable')

			




	
	
	
		
 
            .each(function(i,e){

			




	
	
	
		
 
                    $(e).prop('src', $(e).attr('realsrc'));

			




	
	
	
		
 
                })

			




	
	
	
		
 
            .show();

			




	
	
	
		
 
        });

			




	
	
	
		
 

			




	
	
	
		
 
    $('.btn-image-diff-swap').mousedown(function(e){

			




	
	
	
		
 
        $('#'+e.currentTarget.id+'-img-a.img-diff-swapable')

			




	
	
	
		
 
          .before($('#'+e.currentTarget.id+'-img-b.img-diff-swapable'));

			




	
	
	
		
 
    });

			




	
	
	
		
 
    function reset(e){

			




	
	
	
		
 
        $('#'+e.currentTarget.id+'-img-a.img-diff-swapable')

			




	
	
	
		
 
          .after($('#'+e.currentTarget.id+'-img-b.img-diff-swapable'));

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: clio-28342
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.
            – Support