u/ewong/rhodecode-enterprise-ce-fork Files · rhodecode/templates/branches/branches_data.mako

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.

marcink - - Load All Authors

File last commit:

r1927:e6df2b71 default


                r2784:e8c62649

default

Download file

             branches_data.mako
        
                    33 lines
            
             | 1.1 KiB
            
                | application/x-mako
            
             |
                MakoHtmlLexer
            
             / rhodecode / templates / branches / branches_data.mako
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

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

      <%def name="name(name, files_url, closed)">

           <span class="tag branchtag" title="${h.tooltip(_('Branch %s') % (name,))}">

           <a href="${files_url}"><i class="icon-code-fork"></i>${name}

              %if closed:

                  [closed]

              %endif

          </a>

           </span>

      </%def>

      <%def name="date(date)">

          ${h.age_component(date)}

      </%def>

      <%def name="author(author)">

          <span class="tooltip" title="${h.tooltip(author)}">${h.link_to_user(author)}</span>

      </%def>

      <%def name="commit(message, commit_id, commit_idx)">

          <div>

              <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>

          </div>

      </%def>

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

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

				<%def name="name(name, files_url, closed)">
				<span class="tag branchtag" title="${h.tooltip(_('Branch %s') % (name,))}">
				<a href="${files_url}"><i class="icon-code-fork"></i>${name}
				%if closed:
				[closed]
				%endif
				</a>
				</span>
				</%def>

				<%def name="date(date)">
				${h.age_component(date)}
				</%def>

				<%def name="author(author)">
				<span class="tooltip" title="${h.tooltip(author)}">${h.link_to_user(author)}</span>
				</%def>

				<%def name="commit(message, commit_id, commit_idx)">
				<div>
				<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>
				</div>
				</%def>