u/ewong/rhodecode-enterprise-ce-fork Files · rhodecode/templates/search/search_path.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

             search_path.mako
        
                    33 lines
            
             | 1.5 KiB
            
                | application/x-mako
            
             |
                MakoHtmlLexer
            
             / rhodecode / templates / search / search_path.mako
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      <table class="rctable search-results">

          <tr>

              <th>${_('Repository')}</th>

              <th>${_('File')}</th>

              ##TODO: add 'Last Change' and 'Author' here

          </tr>

          %for entry in c.formatted_results:

              ## search results are additionally filtered, and this check is just a safe gate

              % if h.HasRepoPermissionAny('repository.write','repository.read','repository.admin')(entry['repository'], 'search results path check'):

                  <tr class="body">

                      <td class="td-componentname">

                          %if h.get_repo_type_by_name(entry.get('repository')) == 'hg':

                              <i class="icon-hg"></i>

                          %elif h.get_repo_type_by_name(entry.get('repository')) == 'git':

                              <i class="icon-git"></i>

                          %elif h.get_repo_type_by_name(entry.get('repository')) == 'svn':

                              <i class="icon-svn"></i>

                          %endif

                          ${h.link_to(entry['repository'], h.route_path('repo_summary',repo_name=entry['repository']))}

                      </td>

                      <td class="td-componentname">

                          ${h.link_to(h.literal(entry['f_path']),

                              h.route_path('repo_files',repo_name=entry['repository'],commit_id='tip',f_path=entry['f_path']))}

                      </td>

                  </tr>

              % endif

          %endfor

      </table>

      %if c.cur_query and c.formatted_results:

      <div class="pagination-wh pagination-left">

          ${c.formatted_results.pager('$link_previous ~2~ $link_next')}

      </div>

      %endif

	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

				<table class="rctable search-results">
				<tr>
				<th>${_('Repository')}</th>
				<th>${_('File')}</th>
				##TODO: add 'Last Change' and 'Author' here
				</tr>
				%for entry in c.formatted_results:
				## search results are additionally filtered, and this check is just a safe gate
				% if h.HasRepoPermissionAny('repository.write','repository.read','repository.admin')(entry['repository'], 'search results path check'):
				<tr class="body">
				<td class="td-componentname">
				%if h.get_repo_type_by_name(entry.get('repository')) == 'hg':
				<i class="icon-hg"></i>
				%elif h.get_repo_type_by_name(entry.get('repository')) == 'git':
				<i class="icon-git"></i>
				%elif h.get_repo_type_by_name(entry.get('repository')) == 'svn':
				<i class="icon-svn"></i>
				%endif
				${h.link_to(entry['repository'], h.route_path('repo_summary',repo_name=entry['repository']))}
				</td>
				<td class="td-componentname">
				${h.link_to(h.literal(entry['f_path']),
				h.route_path('repo_files',repo_name=entry['repository'],commit_id='tip',f_path=entry['f_path']))}
				</td>
				</tr>
				% endif
				%endfor
				</table>

				%if c.cur_query and c.formatted_results:
				<div class="pagination-wh pagination-left">
				${c.formatted_results.pager('$link_previous ~2~ $link_next')}
				</div>
				%endif