upstream/mercurial-mirror Files · mercurial/templates/atom/error.tmpl

filemerge: when not keeping premerge, don't write markers to context...

filemerge: when not keeping premerge, don't write markers to context When premerge is enabled (as it is for non-binary inputs by default) and the markers are not kept, we currently still write it to the output context and then restore the previous content right after. With the refactoring in the previous patch, we can easily avoid that step and instead write the output in the opposite case (i.e. when it's successful or when the markers are supposed to be kept). Differential Revision: https://phab.mercurial-scm.org/D12149

Matt Mackall - - Load All Authors

File last commit:

r26421:4b0fc75f default


                r49600:86e4b86d

default

Download file

             error.tmpl
        
                    17 lines
            
             | 484 B
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / atom / error.tmpl
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
      {header}

       <!-- Error -->

        Thomas Arendsen Hein
    
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...

              r18526
            
       <id>{urlbase}{url|urlescape}</id>

       <link rel="self" href="{urlbase}{url|urlescape}atom-log"/>

       <link rel="alternate" href="{urlbase}{url|urlescape}"/>

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
       <title>Error</title>

       <updated>1970-01-01T00:00:00+00:00</updated>

       <entry>

        <title>Error</title>

        Matt Mackall
    
urls: bulk-change primary website URLs

              r26421
            
        <id>https://mercurial-scm.org/#error</id>

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
        <author>

          <name>mercurial</name>

        </author>

        <updated>1970-01-01T00:00:00+00:00</updated>

        <content type="text">{error|escape}</content>

       </entry>

      </feed>

	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

Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	{header}
		<!-- Error -->
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<id>{urlbase}{url\|urlescape}</id>
		<link rel="self" href="{urlbase}{url\|urlescape}atom-log"/>
		<link rel="alternate" href="{urlbase}{url\|urlescape}"/>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	<title>Error</title>
		<updated>1970-01-01T00:00:00+00:00</updated>
		<entry>
		<title>Error</title>
Matt Mackall urls: bulk-change primary website URLs	r26421	<id>https://mercurial-scm.org/#error</id>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	<author>
		<name>mercurial</name>
		</author>
		<updated>1970-01-01T00:00:00+00:00</updated>
		<content type="text">{error\|escape}</content>
		</entry>
		</feed>