##// END OF EJS Templates
git: use force fetch and update for target ref. This solves a case...
git: use force fetch and update for target ref. This solves a case when in PRs a target is force updated and is out of sync. Before we used a pull which --ff-only fails obviosly because two are out of sync. This change uses new logic that resets the target branch according to the source target branch allowing smooth merge simulation.

File last commit:

r2104:d5420119 default
r2784:e8c62649 default
Show More
diff_block.mako
64 lines | 3.2 KiB | application/x-mako | MakoHtmlLexer
templating: use .mako as extensions for template files.
r1282 ## -*- coding: utf-8 -*-
##usage:
## <%namespace name="diff_block" file="/changeset/diff_block.mako"/>
## ${diff_block.diff_block_changeset_table(change)}
##
<%def name="changeset_message()">
routing: remove usage of url.current from pylons.
r2104 <h5>${_('The requested commit is too big and content was truncated.')} <a href="${h.current_route_path(request, fulldiff=1)}" onclick="return confirm('${_("Showing a big diff might take some time and resources, continue?")}')">${_('Show full diff')}</a></h5>
templating: use .mako as extensions for template files.
r1282 </%def>
<%def name="file_message()">
routing: remove usage of url.current from pylons.
r2104 <h5>${_('The requested file is too big and its content is not shown.')} <a href="${h.current_route_path(request, fulldiff=1)}" onclick="return confirm('${_("Showing a big diff might take some time and resources, continue?")}')">${_('Show full diff')}</a></h5>
templating: use .mako as extensions for template files.
r1282 </%def>
<%def name="diff_block_changeset_table(change)">
<div class="diff-container" id="${'diff-container-%s' % (id(change))}">
html: fixed found syntax problems
r1283 %for FID,(cs1, cs2, change, filenode_path, diff, stats, file_data) in change.iteritems():
templating: use .mako as extensions for template files.
r1282 <div id="${h.FID('',filenode_path)}_target" ></div>
<div id="${h.FID('',filenode_path)}" class="diffblock margined comm">
<div class="code-body">
<div class="full_f_path" path="${h.safe_unicode(filenode_path)}" style="display: none"></div>
${diff|n}
html: fixed found syntax problems
r1283 % if file_data["is_limited_diff"]:
% if file_data["exceeds_limit"]:
templating: use .mako as extensions for template files.
r1282 ${self.file_message()}
% else:
routing: remove usage of url.current from pylons.
r2104 <h5>${_('Diff was truncated. File content available only in full diff.')} <a href="${h.current_route_path(request, fulldiff=1)}" onclick="return confirm('${_("Showing a big diff might take some time and resources, continue?")}')">${_('Show full diff')}</a></h5>
templating: use .mako as extensions for template files.
r1282 % endif
% endif
</div>
</div>
%endfor
</div>
</%def>
<%def name="diff_block_simple(change)">
<div class="diff-container" id="${'diff-container-%s' % (id(change))}">
html: fixed found syntax problems
r1283 %for op,filenode_path,diff,file_data in change:
templating: use .mako as extensions for template files.
r1282 <div id="${h.FID('',filenode_path)}_target" ></div>
<div id="${h.FID('',filenode_path)}" class="diffblock margined comm" >
<div class="code-body">
<div class="full_f_path" path="${h.safe_unicode(filenode_path)}" style="display: none;"></div>
${diff|n}
html: fixed found syntax problems
r1283 % if file_data["is_limited_diff"]:
% if file_data["exceeds_limit"]:
templating: use .mako as extensions for template files.
r1282 ${self.file_message()}
% else:
routing: remove usage of url.current from pylons.
r2104 <h5>${_('Diff was truncated. File content available only in full diff.')} <a href="${h.current_route_path(request, fulldiff=1)}" onclick="return confirm('${_("Showing a big diff might take some time and resources, continue?")}')">${_('Show full diff')}</a></h5>
templating: use .mako as extensions for template files.
r1282 % endif
% endif
</div>
</div>
%endfor
</div>
</%def>
<%def name="diff_summary_text(changed_files, lines_added, lines_deleted, limited_diff=False)">
% if limited_diff:
translation: unified usage of pluralize function ungettext....
r1945 ${_ungettext('%(num)s file changed', '%(num)s files changed', changed_files) % {'num': changed_files}}
templating: use .mako as extensions for template files.
r1282 % else:
translation: unified usage of pluralize function ungettext....
r1945 ${_ungettext('%(num)s file changed: %(linesadd)s inserted, ''%(linesdel)s deleted',
templating: use .mako as extensions for template files.
r1282 '%(num)s files changed: %(linesadd)s inserted, %(linesdel)s deleted', changed_files) % {'num': changed_files, 'linesadd': lines_added, 'linesdel': lines_deleted}}
%endif
</%def>