Files
@ 07f026cdf7ac
Branch filter:
Location: kallithea/kallithea/templates/changeset/changeset.html
07f026cdf7ac
15.3 KiB
text/html
vcs: catch MemoryErrors when calling Git diff
Binary diffs can make the diffs VERY big and cause MemoryError exceptions.
Before giving MemoryError, the system might start swapping, any process might
fail when allocating memory, random processes might get killed, and our process
might fail in other places. The proper fix would be to avoid the problem by not
trying to process more data than we can handle - for example by not processing
more than a certain amount of Git output.
Before, memory errors were shown to the user as a 500 Internal Server Error
page.
Now, as long as we have no better/safer way get the diff, catch the MemoryError
and show the page with a flash error message and no diff.
The error handling is placed in the diffs module to avoid leaking flash
messages into the vcs lib.
Binary diffs can make the diffs VERY big and cause MemoryError exceptions.
Before giving MemoryError, the system might start swapping, any process might
fail when allocating memory, random processes might get killed, and our process
might fail in other places. The proper fix would be to avoid the problem by not
trying to process more data than we can handle - for example by not processing
more than a certain amount of Git output.
Before, memory errors were shown to the user as a 500 Internal Server Error
page.
Now, as long as we have no better/safer way get the diff, catch the MemoryError
and show the page with a flash error message and no diff.
The error handling is placed in the diffs module to avoid leaking flash
messages into the vcs lib.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 | ## -*- coding: utf-8 -*-
<%inherit file="/base/base.html"/>
<%namespace name="comment" file="/changeset/changeset_file_comment.html"/>
<%block name="title">
${_('%s Changeset') % c.repo_name} - ${h.show_id(c.changeset)}
</%block>
<%def name="breadcrumbs_links()">
${_('Changeset')} - <span class='changeset_hash'>${h.show_id(c.changeset)}</span>
</%def>
<%block name="header_menu">
${self.menu('repositories')}
</%block>
<%def name="main()">
${self.repo_context_bar('changelog', c.changeset.raw_id)}
<div class="panel panel-primary">
<div class="panel-heading clearfix">
${self.breadcrumbs()}
</div>
<script>
var _USERS_AC_DATA = ${h.js(c.users_array)};
var _GROUPS_AC_DATA = ${h.js(c.user_groups_array)};
AJAX_COMMENT_URL = ${h.js(url('changeset_comment',repo_name=c.repo_name,revision=c.changeset.raw_id))};
AJAX_COMMENT_DELETE_URL = ${h.js(url('changeset_comment_delete',repo_name=c.repo_name,comment_id='__COMMENT_ID__'))};
</script>
<div class="panel-body">
<div class="panel panel-default">
<div class="panel-heading clearfix">
<div class="parents pull-left">
<div id="parent_link">
<i class="icon-left-open"></i> <a href="#">${_('Parent rev.')}</a>
</div>
</div>
<div class="pull-right children">
<div id="child_link">
<a href="#">${_('Child rev.')}</a> <i class="icon-right-open"></i>
</div>
</div>
<div class="pull-left">
<div class="pull-left" title="${_('Changeset status')}">
%if c.statuses:
<i class="icon-circle changeset-status-${c.statuses[0]}"></i>
[${h.changeset_status_lbl(c.statuses[0])}]
%endif
</div>
<div class="diff-actions pull-left">
<a href="${h.url('changeset_raw_home',repo_name=c.repo_name,revision=c.changeset.raw_id)}" data-toggle="tooltip" title="${_('Raw diff')}">
<i class="icon-diff"></i>
</a>
<a href="${h.url('changeset_patch_home',repo_name=c.repo_name,revision=c.changeset.raw_id)}" data-toggle="tooltip" title="${_('Patch diff')}">
<i class="icon-file-powerpoint"></i>
</a>
<a href="${h.url('changeset_download_home',repo_name=c.repo_name,revision=c.changeset.raw_id,diff='download')}" data-toggle="tooltip" title="${_('Download diff')}">
<i class="icon-floppy"></i>
</a>
${c.ignorews_url(request.GET)}
${c.context_url(request.GET)}
</div>
</div>
</div>
<div class="panel-body">
<div class="form-group changeset_content_header clearfix">
<div class="pull-right">
<span class="logtags">
%if len(c.changeset.parents)>1:
<span class="mergetag">${_('Merge')}</span>
%endif
%for book in c.changeset.bookmarks:
<span class="booktag" title="${_('Bookmark %s') % book}">
${h.link_to(book,h.url('changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}
</span>
%endfor
%for tag in c.changeset.tags:
<span class="tagtag" title="${_('Tag %s') % tag}">
${h.link_to(tag,h.url('changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}</span>
%endfor
%if c.changeset.branch:
<span class="branchtag" title="${_('Branch %s') % c.changeset.branch}">
${h.link_to(c.changeset.branch,h.url('changelog_home',repo_name=c.repo_name,branch=c.changeset.branch))}
</span>
%endif
</span>
<div class="changes">
% if (len(c.changeset.affected_files) <= c.affected_files_cut_off) or c.fulldiff:
<span class="label deleted" title="${_('Removed')}">${len(c.changeset.removed)}</span>
<span class="label changed" title="${_('Changed')}">${len(c.changeset.changed)}</span>
<span class="label added" title="${_('Added')}">${len(c.changeset.added)}</span>
% else:
<span class="label deleted" title="${_('Affected %s files') % len(c.changeset.affected_files)}">!</span>
<span class="label changed" title="${_('Affected %s files') % len(c.changeset.affected_files)}">!</span>
<span class="label added" title="${_('Affected %s files') % len(c.changeset.affected_files)}">!</span>
% endif
</div>
</div>
<div class="pull-left">
<div class="author">
${h.gravatar_div(h.email_or_none(c.changeset.author), size=20)}
<span><b>${h.person(c.changeset.author,'full_name_and_username')}</b> - ${h.age(c.changeset.date,True)} ${h.fmt_date(c.changeset.date)}</span><br/>
<span>${h.email_or_none(c.changeset.author)}</span><br/>
</div>
<% rev = c.changeset.extra.get('source') %>
%if rev:
<div>
${_('Grafted from:')} ${h.link_to(h.short_id(rev),h.url('changeset_home',repo_name=c.repo_name,revision=rev), class_="changeset_hash")}
</div>
%endif
<% rev = c.changeset.extra.get('transplant_source', '').encode('hex') %>
%if rev:
<div>
${_('Transplanted from:')} ${h.link_to(h.short_id(rev),h.url('changeset_home',repo_name=c.repo_name,revision=rev), class_="changeset_hash")}
</div>
%endif
% if hasattr(c.changeset, 'successors') and c.changeset.successors:
<div class='successors'>
<span class='successors_header'>${_('Replaced by:')} </span>
% for i, s in enumerate(c.changeset.successors):
<%
comma = ""
if i != len(c.changeset.successors)-1:
comma = ", "
%>
<a class='successors_hash' href="${h.url('changeset_home',repo_name=c.repo_name, revision=s)}">${s}</a>${comma}
% endfor
</div>
% endif
% if hasattr(c.changeset, 'precursors') and c.changeset.precursors:
<div class='precursors'>
<span class='precursors_header'>${_('Preceded by:')} </span>
% for i, s in enumerate(c.changeset.precursors):
<%
comma = ""
if i != len(c.changeset.precursors)-1:
comma = ", "
%>
<a class="precursors_hash" href="${h.url('changeset_home',repo_name=c.repo_name, revision=s)}">${s}</a>${comma}
% endfor
</div>
% endif
</div>
</div>
<div class="form-group">${h.urlify_text(c.changeset.message, c.repo_name)}</div>
<div>
<% a_rev, cs_rev, file_diff_data = c.changes[c.changeset.raw_id] %>
% if c.limited_diff:
${ungettext('%s file changed', '%s files changed', len(file_diff_data)) % len(file_diff_data)}:
% else:
${ungettext('%s file changed with %s insertions and %s deletions', '%s files changed with %s insertions and %s deletions', len(file_diff_data)) % (len(file_diff_data), c.lines_added, c.lines_deleted)}:
%endif
</div>
<div class="cs_files">
%for fid, url_fid, op, a_path, path, diff, stats in file_diff_data:
<div class="cs_${op} clearfix">
<div class="node pull-left">
<i class="icon-diff-${op}"></i>
${h.link_to(h.safe_unicode(path), '#%s' % fid)}
</div>
<div class="changes pull-right">${h.fancy_file_stats(stats)}</div>
</div>
%endfor
%if c.limited_diff:
<h5>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}">${_('Show full diff anyway')}</a></h5>
%endif
</div>
<div class="comments-number">
${comment.comment_count(c.inline_cnt, len(c.comments))}
</div>
</div>
</div>
## diff block
<div class="commentable-diff">
<%namespace name="diff_block" file="/changeset/diff_block.html"/>
${diff_block.diff_block_js()}
<% a_rev, cs_rev, file_diff_data = c.changes[c.changeset.raw_id] %>
${diff_block.diff_block(c.repo_name, 'rev', a_rev, a_rev,
c.repo_name, 'rev', cs_rev, cs_rev, file_diff_data)}
% if c.limited_diff:
<h4>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}">${_('Show full diff anyway')}</a></h4>
% endif
</div>
## template for inline comment form
${comment.comment_inline_form()}
## render comments and inlines
${comment.generate_comments()}
## main comment form and it status
${comment.comments()}
</div>
## FORM FOR MAKING JS ACTION AS CHANGESET COMMENTS
<script type="text/javascript">
$(document).ready(function(){
$('.code-difftable').on('click', '.add-bubble', function(e){
show_comment_form($(this));
});
move_comments($(".comments .comments-list-chunk"));
pyroutes.register('changeset_home',
${h.js(h.url('changeset_home', repo_name='%(repo_name)s', revision='%(revision)s'))},
['repo_name', 'revision']);
//next links
$('#child_link').on('click', function(e){
//fetch via ajax what is going to be the next link, if we have
//>1 links show them to user to choose
if(!$('#child_link').hasClass('disabled')){
$.ajax({
url: ${h.js(h.url('changeset_children',repo_name=c.repo_name, revision=c.changeset.raw_id))},
success: function(data) {
if(data.results.length === 0){
$('#child_link').addClass('disabled');
$('#child_link').html(${h.jshtml(_('No revisions'))});
}
if(data.results.length === 1){
var commit = data.results[0];
window.location = pyroutes.url('changeset_home', {'repo_name': ${h.js(c.repo_name)},'revision': commit.raw_id});
}
else if(data.results.length === 2){
$('#child_link').addClass('disabled');
$('#child_link').addClass('double');
var _html = '';
_html +='<a title="__title__" href="__url__">__rev__</a> <i class="icon-right-open"></i>'
.replace('__rev__','r{0}:{1}'.format(data.results[0].revision, data.results[0].raw_id.substr(0,6)))
.replace('__title__', data.results[0].message)
.replace('__url__', pyroutes.url('changeset_home', {'repo_name': ${h.js(c.repo_name)},'revision': data.results[0].raw_id}));
_html +='<br/>'
_html +='<a title="__title__" href="__url__">__rev__</a> <i class="icon-right-open"></i>'
.replace('__rev__','r{0}:{1}'.format(data.results[1].revision, data.results[1].raw_id.substr(0,6)))
.replace('__title__', data.results[1].message)
.replace('__url__', pyroutes.url('changeset_home', {'repo_name': ${h.js(c.repo_name)},'revision': data.results[1].raw_id}));
$('#child_link').html(_html);
}
}
});
e.preventDefault();
}
});
//prev links
$('#parent_link').on('click', function(e){
//fetch via ajax what is going to be the next link, if we have
//>1 links show them to user to choose
if(!$('#parent_link').hasClass('disabled')){
$.ajax({
url: ${h.js(h.url('changeset_parents',repo_name=c.repo_name, revision=c.changeset.raw_id))},
success: function(data) {
if(data.results.length === 0){
$('#parent_link').addClass('disabled');
$('#parent_link').html(${h.jshtml(_('No revisions'))});
}
if(data.results.length === 1){
var commit = data.results[0];
window.location = pyroutes.url('changeset_home', {'repo_name': ${h.js(c.repo_name)},'revision': commit.raw_id});
}
else if(data.results.length === 2){
$('#parent_link').addClass('disabled');
$('#parent_link').addClass('double');
var _html = '';
_html +='<i class="icon-left-open"></i> <a title="__title__" href="__url__">__rev__</a>'
.replace('__rev__','r{0}:{1}'.format(data.results[0].revision, data.results[0].raw_id.substr(0,6)))
.replace('__title__', data.results[0].message)
.replace('__url__', pyroutes.url('changeset_home', {'repo_name': ${h.js(c.repo_name)},'revision': data.results[0].raw_id}));
_html +='<br/>'
_html +='<i class="icon-left-open"></i> <a title="__title__" href="__url__">__rev__</a>'
.replace('__rev__','r{0}:{1}'.format(data.results[1].revision, data.results[1].raw_id.substr(0,6)))
.replace('__title__', data.results[1].message)
.replace('__url__', pyroutes.url('changeset_home', {'repo_name': ${h.js(c.repo_name)},'revision': data.results[1].raw_id}));
$('#parent_link').html(_html);
}
}
});
e.preventDefault();
}
});
// hack: re-navigate to target after JS is done ... if a target is set and setting href thus won't reload
if (window.location.hash != "") {
window.location.href = window.location.href;
}
});
</script>
</div>
</%def>
|