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

hgweb: allow viewing diffs against p1 or p2 for merge commits (issue3904)...

hgweb: allow viewing diffs against p1 or p2 for merge commits (issue3904) This adds UI portion of the feature that has resided in mercurial since 2012. Back then the interface was added together with the code, but was shortly backed out because it was deemed "not ready". Code, however, stayed. For the original feature and its implementation, see issue2810 and d605a82cf189. In short, the backed-out interface had two outstanding issues: 1. it was introducing an entirely new term (baseline) and 2. it was present on every changeset's page, even for changesets with 1 parent (or no parents), which didn't make sense This patch implements a hopefully better interface because: 1. it uses the usual terms (diff) and 2. it only shows up when there actually are 2 parents.

Thomas Arendsen Hein - - Load All Authors

File last commit:

r18526:9409aeaa stable


                r23740:9e1f4c65

default

Download file

             branchentry.tmpl
        
                    8 lines
            
             | 337 B
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / atom / branchentry.tmpl
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Angel Ezquerra
    
hgweb: add branches RSS and Atom feeds...

              r18045
            
       <entry>

        <title>{branch|escape}</title>

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

              r18526
            
        <link rel="alternate" href="{urlbase}{url|urlescape}rev/{node|short}"/>

        <id>{urlbase}{url|urlescape}#branch-{node}</id>

        Angel Ezquerra
    
hgweb: add branches RSS and Atom feeds...

              r18045
            
        <updated>{date|rfc3339date}</updated>

        <published>{date|rfc3339date}</published>

        <content type="text"><![CDATA[{branch|strip|escape|addbreaks}]]></content>

       </entry>

	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

Angel Ezquerra hgweb: add branches RSS and Atom feeds...	r18045	<entry>
		<title>{branch\|escape}</title>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<link rel="alternate" href="{urlbase}{url\|urlescape}rev/{node\|short}"/>
		<id>{urlbase}{url\|urlescape}#branch-{node}</id>
Angel Ezquerra hgweb: add branches RSS and Atom feeds...	r18045	<updated>{date\|rfc3339date}</updated>
		<published>{date\|rfc3339date}</published>
		<content type="text"><![CDATA[{branch\|strip\|escape\|addbreaks}]]></content>
		</entry>