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

r1957:00f3a509 default
r2784:e8c62649 default
Show More
changeset_range.mako
131 lines | 4.7 KiB | application/x-mako | MakoHtmlLexer
## -*- coding: utf-8 -*-
<%inherit file="/base/base.mako"/>
<%def name="title()">
${_('%s Commits') % c.repo_name} -
r${c.commit_ranges[0].revision}:${h.short_id(c.commit_ranges[0].raw_id)}
...
r${c.commit_ranges[-1].revision}:${h.short_id(c.commit_ranges[-1].raw_id)}
${_ungettext('(%s commit)','(%s commits)', len(c.commit_ranges)) % len(c.commit_ranges)}
%if c.rhodecode_name:
&middot; ${h.branding(c.rhodecode_name)}
%endif
</%def>
<%def name="breadcrumbs_links()">
${_('Commits')} -
r${c.commit_ranges[0].revision}:${h.short_id(c.commit_ranges[0].raw_id)}
...
r${c.commit_ranges[-1].revision}:${h.short_id(c.commit_ranges[-1].raw_id)}
${_ungettext('(%s commit)','(%s commits)', len(c.commit_ranges)) % len(c.commit_ranges)}
</%def>
<%def name="menu_bar_nav()">
${self.menu_items(active='repositories')}
</%def>
<%def name="menu_bar_subnav()">
${self.repo_menu(active='changelog')}
</%def>
<%def name="main()">
<div class="summary-header">
<div class="title">
${self.repo_page_title(c.rhodecode_db_repo)}
</div>
</div>
<div class="summary changeset">
<div class="summary-detail">
<div class="summary-detail-header">
<span class="breadcrumbs files_location">
<h4>
${_('Commit Range')}
<code>
r${c.commit_ranges[0].revision}:${h.short_id(c.commit_ranges[0].raw_id)}...r${c.commit_ranges[-1].revision}:${h.short_id(c.commit_ranges[-1].raw_id)}
</code>
</h4>
</span>
</div>
<div class="fieldset">
<div class="left-label">
${_('Diff option')}:
</div>
<div class="right-content">
<div class="header-buttons">
<a href="${h.route_path('repo_compare',
repo_name=c.repo_name,
source_ref_type='rev',
source_ref=getattr(c.commit_ranges[0].parents[0] if c.commit_ranges[0].parents else h.EmptyCommit(), 'raw_id'),
target_ref_type='rev',
target_ref=c.commit_ranges[-1].raw_id)}"
>
${_('Show combined compare')}
</a>
</div>
</div>
</div>
<%doc>
##TODO(marcink): implement this and diff menus
<div class="fieldset">
<div class="left-label">
${_('Diff options')}:
</div>
<div class="right-content">
<div class="diff-actions">
<a href="${h.route_path('repo_commit_raw',repo_name=c.repo_name,commit_id='?')}" class="tooltip" title="${h.tooltip(_('Raw diff'))}">
${_('Raw Diff')}
</a>
|
<a href="${h.route_path('repo_commit_patch',repo_name=c.repo_name,commit_id='?')}" class="tooltip" title="${h.tooltip(_('Patch diff'))}">
${_('Patch Diff')}
</a>
|
<a href="${h.route_path('repo_commit_download',repo_name=c.repo_name,commit_id='?',_query=dict(diff='download'))}" class="tooltip" title="${h.tooltip(_('Download diff'))}">
${_('Download Diff')}
</a>
</div>
</div>
</div>
</%doc>
</div> <!-- end summary-detail -->
</div> <!-- end summary -->
<div id="changeset_compare_view_content">
<div class="pull-left">
<div class="btn-group">
<a
class="btn"
href="#"
onclick="$('.compare_select').show();$('.compare_select_hidden').hide(); return false">
${_ungettext('Expand %s commit','Expand %s commits', len(c.commit_ranges)) % len(c.commit_ranges)}
</a>
<a
class="btn"
href="#"
onclick="$('.compare_select').hide();$('.compare_select_hidden').show(); return false">
${_ungettext('Collapse %s commit','Collapse %s commits', len(c.commit_ranges)) % len(c.commit_ranges)}
</a>
</div>
</div>
## Commit range generated below
<%include file="../compare/compare_commits.mako"/>
<div class="cs_files">
<%namespace name="cbdiffs" file="/codeblocks/diffs.mako"/>
<%namespace name="comment" file="/changeset/changeset_file_comment.mako"/>
<%namespace name="diff_block" file="/changeset/diff_block.mako"/>
${cbdiffs.render_diffset_menu()}
%for commit in c.commit_ranges:
${cbdiffs.render_diffset(
diffset=c.changes[commit.raw_id],
collapse_when_files_over=5,
commit=commit,
)}
%endfor
</div>
</div>
</%def>