##// 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:

r1927:e6df2b71 default
r2784:e8c62649 default
Show More
branches_data.mako
33 lines | 1.1 KiB | application/x-mako | MakoHtmlLexer
templating: use .mako as extensions for template files.
r1282 ## DATA TABLE RE USABLE ELEMENTS FOR BRANCHES
## usage:
## <%namespace name="branch" file="/branches/branches_data.mako"/>
## branch.<func_name>(arg,arg2)
<%def name="compare(commit_id)">
<input class="compare-radio-button" type="radio" name="compare_source" value="${commit_id}"/>
<input class="compare-radio-button" type="radio" name="compare_target" value="${commit_id}"/>
</%def>
refs: refactored references code to remove any pylons elements....
r1898 <%def name="name(name, files_url, closed)">
dan
tooltip: use consistent h.tooltip usage to set tooltips.
r1843 <span class="tag branchtag" title="${h.tooltip(_('Branch %s') % (name,))}">
templating: use .mako as extensions for template files.
r1282 <a href="${files_url}"><i class="icon-code-fork"></i>${name}
refs: refactored references code to remove any pylons elements....
r1898 %if closed:
templating: use .mako as extensions for template files.
r1282 [closed]
%endif
</a>
</span>
</%def>
<%def name="date(date)">
${h.age_component(date)}
</%def>
<%def name="author(author)">
dan
tooltip: use consistent h.tooltip usage to set tooltips.
r1843 <span class="tooltip" title="${h.tooltip(author)}">${h.link_to_user(author)}</span>
templating: use .mako as extensions for template files.
r1282 </%def>
<%def name="commit(message, commit_id, commit_idx)">
<div>
files: ported repository files controllers to pyramid views.
r1927 <pre><a title="${h.tooltip(message)}" href="${h.route_path('repo_files:default_path',repo_name=c.repo_name,commit_id=commit_id)}">r${commit_idx}:${h.short_id(commit_id)}</a></pre>
templating: use .mako as extensions for template files.
r1282 </div>
</%def>