u/pc/rhodecode-enterprise-ce-fork-pc Files · rhodecode/templates/rst_templates/pull_request_update.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:

r1255:952cdf08 default


                r2784:e8c62649

default

Download file

             pull_request_update.mako
        
                    26 lines
            
             | 673 B
            
                | application/x-mako
            
             |
                MakoHtmlLexer
            
             / rhodecode / templates / rst_templates / pull_request_update.mako
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      ## -*- coding: utf-8 -*-

      Pull request updated. Auto status change to |under_review|

      .. role:: added

      .. role:: removed

      .. parsed-literal::

        Changed commits:

          * :added:`${len(added_commits)} added`

          * :removed:`${len(removed_commits)} removed`

        %if not changed_files:

        No file changes found

        %else:

        Changed files:

          %for file_name in added_files:

          * `A ${file_name} <#${'a_' + h.FID('', file_name)}>`_

          %endfor

          %for file_name in modified_files:

          * `M ${file_name} <#${'a_' + h.FID('', file_name)}>`_

          %endfor

          %for file_name in removed_files:

          * R ${file_name}

          %endfor

        %endif

      .. |under_review| replace:: *"${under_review_label}"*

	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

				## -- coding: utf-8 --
				Pull request updated. Auto status change to \|under_review\|

				.. role:: added
				.. role:: removed
				.. parsed-literal::

				Changed commits:
				* :added:`${len(added_commits)} added`
				* :removed:`${len(removed_commits)} removed`

				%if not changed_files:
				No file changes found
				%else:
				Changed files:
				%for file_name in added_files:
				* `A ${file_name} <#${'a_' + h.FID('', file_name)}>`_
				%endfor
				%for file_name in modified_files:
				* `M ${file_name} <#${'a_' + h.FID('', file_name)}>`_
				%endfor
				%for file_name in removed_files:
				* R ${file_name}
				%endfor
				%endif

				.. \|under_review\| replace:: "${under_review_label}"