engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

issue-tracker: cache active patterns in the template so we can re-use them when rendering comments.

Browse source 
- before each render call fetched settings and patterns to process
- in case of lots of commits/large pull-requests this took a loot of time.
This commit is contained in:
Bartlomiej Wolynczyk 2020-01-20 14:53:23 +01:00
parent eb8c355a4d
commit 2b460ba73c
3 changed files with 40 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

14
rhodecode/lib/helpers.py
View file

@ -1522,7 +1522,10 @@ def process_patterns(text_string, repo_name, link_format='html', active_entries=
raise ValueError('Link format can be only one of:{} got {}'.format(
allowed_formats, link_format))
active_entries = active_entries or get_active_pattern_entries(repo_name)
if active_entries is None:
log.debug('Fetch active patterns for repo: %s', repo_name)
active_entries = get_active_pattern_entries(repo_name)
issues_data = []
new_text = text_string
@ -1580,6 +1583,7 @@ def urlify_commit_message(commit_text, repository=None, active_pattern_entries=N
Parses given text message and makes proper links.
issues are linked to given issue-server, and rest is a commit link
"""
def escaper(_text):
return _text.replace('<', '&lt;').replace('>', '&gt;')
@ -1636,7 +1640,7 @@ def renderer_from_filename(filename, exclude=None):
def render(source, renderer='rst', mentions=False, relative_urls=None,
repo_name=None):
repo_name=None, active_pattern_entries=None):
def maybe_convert_relative_links(html_source):
if relative_urls:
@ -1651,7 +1655,8 @@ def render(source, renderer='rst', mentions=False, relative_urls=None,
if repo_name:
# process patterns on comments if we pass in repo name
source, issues = process_patterns(
source, repo_name, link_format='rst')
source, repo_name, link_format='rst',
active_entries=active_pattern_entries)
return literal(
'<div class="rst-block">%s</div>' %
@ -1662,7 +1667,8 @@ def render(source, renderer='rst', mentions=False, relative_urls=None,
if repo_name:
# process patterns on comments if we pass in repo name
source, issues = process_patterns(
source, repo_name, link_format='markdown')
source, repo_name, link_format='markdown',
active_entries=active_pattern_entries)
return literal(
'<div class="markdown-block">%s</div>' %

10
rhodecode/templates/changeset/changeset_file_comment.mako
View file

@ -5,7 +5,7 @@
##
<%namespace name="base" file="/base/base.mako"/>
<%def name="comment_block(comment, inline=False)">
<%def name="comment_block(comment, inline=False, active_pattern_entries=None)">
<% pr_index_ver = comment.get_index_version(getattr(c, 'versions', [])) %>
<% latest_ver = len(getattr(c, 'versions', [])) %>
% if inline:
@ -156,7 +156,7 @@
</div>
</div>
<div class="text">
${h.render(comment.text, renderer=comment.renderer, mentions=True, repo_name=getattr(c, 'repo_name', None))}
${h.render(comment.text, renderer=comment.renderer, mentions=True, repo_name=getattr(c, 'repo_name', None), active_pattern_entries=active_pattern_entries)}
</div>
</div>
@ -164,13 +164,17 @@
## generate main comments
<%def name="generate_comments(comments, include_pull_request=False, is_pull_request=False)">
<%
active_pattern_entries = h.get_active_pattern_entries(getattr(c, 'repo_name', None))
%>
<div class="general-comments" id="comments">
%for comment in comments:
<div id="comment-tr-${comment.comment_id}">
## only render comments that are not from pull request, or from
## pull request and a status change
%if not comment.pull_request or (comment.pull_request and comment.status_change) or include_pull_request:
${comment_block(comment)}
${comment_block(comment, active_pattern_entries=active_pattern_entries)}
%endif
</div>
%endfor

41
rhodecode/templates/codeblocks/diffs.mako
View file

@ -60,12 +60,16 @@ return '%s_%s_%i' % (h.md5_safe(commit+filename), type, line)
<%
diffset_container_id = h.md5(diffset.target_ref)
collapse_all = len(diffset.files) > collapse_when_files_over
active_pattern_entries = h.get_active_pattern_entries(getattr(c, 'repo_name', None))
%>
%if use_comments:
## Template for injecting comments
<div id="cb-comments-inline-container-template" class="js-template">
${inline_comments_container([], inline_comments)}
${inline_comments_container([])}
</div>
<div class="js-template" id="cb-comment-inline-form-template">
<div class="comment-inline-form ac">
@ -259,7 +263,7 @@ return '%s_%s_%i' % (h.md5_safe(commit+filename), type, line)
## new/deleted/empty content case
% if not filediff.hunks:
## Comment container, on "fakes" hunk that contains all data to render comments
${render_hunk_lines(filediff, c.user_session_attrs["diffmode"], filediff.hunk_ops, use_comments=use_comments, inline_comments=inline_comments)}
${render_hunk_lines(filediff, c.user_session_attrs["diffmode"], filediff.hunk_ops, use_comments=use_comments, inline_comments=inline_comments, active_pattern_entries=active_pattern_entries)}
% endif
%if filediff.limited_diff:
@ -299,7 +303,7 @@ return '%s_%s_%i' % (h.md5_safe(commit+filename), type, line)
${hunk.section_header}
</td>
</tr>
${render_hunk_lines(filediff, c.user_session_attrs["diffmode"], hunk, use_comments=use_comments, inline_comments=inline_comments)}
${render_hunk_lines(filediff, c.user_session_attrs["diffmode"], hunk, use_comments=use_comments, inline_comments=inline_comments, active_pattern_entries=active_pattern_entries)}
% endfor
<% unmatched_comments = (inline_comments or {}).get(filediff.patch['filename'], {}) %>
@ -323,7 +327,7 @@ return '%s_%s_%i' % (h.md5_safe(commit+filename), type, line)
<td class="cb-lineno cb-context"></td>
<td class="cb-lineno cb-context"></td>
<td class="cb-content cb-context">
${inline_comments_container(comments, inline_comments)}
${inline_comments_container(comments, active_pattern_entries=active_pattern_entries)}
</td>
</tr>
%elif c.user_session_attrs["diffmode"] == 'sideside':
@ -348,7 +352,7 @@ return '%s_%s_%i' % (h.md5_safe(commit+filename), type, line)
<td class="cb-lineno cb-context"></td>
<td class="cb-content cb-context">
% if lineno.startswith('o'):
${inline_comments_container(comments, inline_comments)}
${inline_comments_container(comments, active_pattern_entries=active_pattern_entries)}
% endif
</td>
@ -356,7 +360,7 @@ return '%s_%s_%i' % (h.md5_safe(commit+filename), type, line)
<td class="cb-lineno cb-context"></td>
<td class="cb-content cb-context">
% if lineno.startswith('n'):
${inline_comments_container(comments, inline_comments)}
${inline_comments_container(comments, active_pattern_entries=active_pattern_entries)}
% endif
</td>
</tr>
@ -415,7 +419,7 @@ return '%s_%s_%i' % (h.md5_safe(commit+filename), type, line)
<td class="cb-lineno cb-context"></td>
<td class="cb-lineno cb-context"></td>
<td class="cb-content cb-context">
${inline_comments_container(comments_dict['comments'], inline_comments)}
${inline_comments_container(comments_dict['comments'], active_pattern_entries=active_pattern_entries)}
</td>
</tr>
%elif c.user_session_attrs["diffmode"] == 'sideside':
@ -427,7 +431,7 @@ return '%s_%s_%i' % (h.md5_safe(commit+filename), type, line)
<td class="cb-data cb-context"></td>
<td class="cb-lineno cb-context"></td>
<td class="cb-content cb-context">
${inline_comments_container(comments_dict['comments'], inline_comments)}
${inline_comments_container(comments_dict['comments'], active_pattern_entries=active_pattern_entries)}
</td>
</tr>
%endif
@ -584,10 +588,11 @@ from rhodecode.lib.diffs import NEW_FILENODE, DEL_FILENODE, \
</%def>
<%def name="inline_comments_container(comments, inline_comments)">
<%def name="inline_comments_container(comments, active_pattern_entries=None)">
<div class="inline-comments">
%for comment in comments:
${commentblock.comment_block(comment, inline=True)}
${commentblock.comment_block(comment, inline=True, active_pattern_entries=active_pattern_entries)}
%endfor
% if comments and comments[-1].outdated:
<span class="btn btn-secondary cb-comment-add-button comment-outdated}" style="display: none;}">
@ -619,7 +624,7 @@ def get_comments_for(diff_type, comments, filename, line_version, line_number):
return data
%>
<%def name="render_hunk_lines_sideside(filediff, hunk, use_comments=False, inline_comments=None)">
<%def name="render_hunk_lines_sideside(filediff, hunk, use_comments=False, inline_comments=None, active_pattern_entries=None)">
%for i, line in enumerate(hunk.sideside):
<%
old_line_anchor, new_line_anchor = None, None
@ -669,7 +674,7 @@ def get_comments_for(diff_type, comments, filename, line_version, line_number):
<span class="cb-code"><span class="cb-action ${action_class(line.original.action)}"></span>${line.original.content or '' | n}</span>
%if use_comments and line.original.lineno and line_old_comments:
${inline_comments_container(line_old_comments, inline_comments)}
${inline_comments_container(line_old_comments, active_pattern_entries=active_pattern_entries)}
%endif
</td>
@ -711,7 +716,7 @@ def get_comments_for(diff_type, comments, filename, line_version, line_number):
%endif
<span class="cb-code"><span class="cb-action ${action_class(line.modified.action)}"></span>${line.modified.content or '' | n}</span>
%if use_comments and line.modified.lineno and line_new_comments:
${inline_comments_container(line_new_comments, inline_comments)}
${inline_comments_container(line_new_comments, active_pattern_entries=active_pattern_entries)}
%endif
</td>
</tr>
@ -719,7 +724,7 @@ def get_comments_for(diff_type, comments, filename, line_version, line_number):
</%def>
<%def name="render_hunk_lines_unified(filediff, hunk, use_comments=False, inline_comments=None)">
<%def name="render_hunk_lines_unified(filediff, hunk, use_comments=False, inline_comments=None, active_pattern_entries=None)">
%for old_line_no, new_line_no, action, content, comments_args in hunk.unified:
<%
@ -777,7 +782,7 @@ def get_comments_for(diff_type, comments, filename, line_version, line_number):
%endif
<span class="cb-code"><span class="cb-action ${action_class(action)}"></span> ${content or '' | n}</span>
%if use_comments and comments:
${inline_comments_container(comments, inline_comments)}
${inline_comments_container(comments, active_pattern_entries=active_pattern_entries)}
%endif
</td>
</tr>
@ -785,11 +790,11 @@ def get_comments_for(diff_type, comments, filename, line_version, line_number):
</%def>
<%def name="render_hunk_lines(filediff, diff_mode, hunk, use_comments, inline_comments)">
<%def name="render_hunk_lines(filediff, diff_mode, hunk, use_comments, inline_comments, active_pattern_entries)">
% if diff_mode == 'unified':
${render_hunk_lines_unified(filediff, hunk, use_comments=use_comments, inline_comments=inline_comments)}
${render_hunk_lines_unified(filediff, hunk, use_comments=use_comments, inline_comments=inline_comments, active_pattern_entries=active_pattern_entries)}
% elif diff_mode == 'sideside':
${render_hunk_lines_sideside(filediff, hunk, use_comments=use_comments, inline_comments=inline_comments)}
${render_hunk_lines_sideside(filediff, hunk, use_comments=use_comments, inline_comments=inline_comments, active_pattern_entries=active_pattern_entries)}
% else:
<tr class="cb-line">
<td>unknown diff mode</td>