u/ewong/rhodecode-enterprise-ce-fork Files · rhodecode/templates/changeset/patch_changeset.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:

r1282:90601d74 default


                r2784:e8c62649

default

Download file

             patch_changeset.mako
        
                    24 lines
            
             | 589 B
            
                | application/x-mako
            
             |
                MakoHtmlLexer
            
             / rhodecode / templates / changeset / patch_changeset.mako
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      %if h.is_hg(c.rhodecode_repo):

      # ${c.rhodecode_repo.alias.upper()} changeset patch

      # User ${c.commit.author |n}

      # Date ${c.commit.date}

      # Node ID ${c.commit.raw_id}

      ${c.parent_tmpl}

      ${c.commit.message |n}

      %elif h.is_git(c.rhodecode_repo):

      From ${c.commit.raw_id} ${c.commit.date}

      From: ${c.commit.author |n}

      Date: ${c.commit.date}

      Subject: [PATCH] ${c.commit.message |n}

      ---

      %elif h.is_svn(c.rhodecode_repo):

      # ${c.rhodecode_repo.alias.upper()} changeset patch

      # User ${c.commit.author |n}

      # Date ${c.commit.date}

      # Revision ${c.commit.raw_id}

      ${c.commit.message |n}

      %endif

      ${c.diff|n}

	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

				%if h.is_hg(c.rhodecode_repo):
				# ${c.rhodecode_repo.alias.upper()} changeset patch
				# User ${c.commit.author \|n}
				# Date ${c.commit.date}
				# Node ID ${c.commit.raw_id}
				${c.parent_tmpl}
				${c.commit.message \|n}

				%elif h.is_git(c.rhodecode_repo):
				From ${c.commit.raw_id} ${c.commit.date}
				From: ${c.commit.author \|n}
				Date: ${c.commit.date}
				Subject: [PATCH] ${c.commit.message \|n}
				---

				%elif h.is_svn(c.rhodecode_repo):
				# ${c.rhodecode_repo.alias.upper()} changeset patch
				# User ${c.commit.author \|n}
				# Date ${c.commit.date}
				# Revision ${c.commit.raw_id}

				${c.commit.message \|n}

				%endif
				${c.diff\|n}