upstream/mercurial-mirror Files · mercurial/templates/rss/changelogentry.tmpl

merge: branch code into {n1 and n2, n1, n2} top-level cases...

merge: branch code into {n1 and n2, n1, n2} top-level cases There are three high-level cases that are of interest in manifestmerge(): 1) The file exists on both sides, 2) The file exists only on the local side, and 3) The file exists only on the remote side. Let's make this clearer in the code. The 'if f in copied' case will be broken up into the two applicable branches in the next patch.

Steven Brown - - Load All Authors

File last commit:

r21486:16352b34 default


                r23473:922b10c8

default

Download file

             changelogentry.tmpl
        
                    40 lines
            
             | 1.3 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / rss / changelogentry.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      <item>

          <title>{inbranch%"{if(name, '[{name|escape}] ')}"}{branches%"{if(name, '[{name|escape}] ')}"}{desc|strip|firstline|strip|escape}</title>

          <guid isPermaLink="true">{urlbase}{url|urlescape}rev/{node|short}</guid>

                   <link>{urlbase}{url|urlescape}rev/{node|short}</link>

          <description>

                    <![CDATA[

      	<table>

      	<tr>

      		<th style="text-align:left;">changeset</th>

      		<td>{node|short}</td>

                    </tr>

                    <tr>

                                    <th style="text-align:left;">branch</th>

                                    <td>{inbranch%"{name|escape}"}{branches%"{name|escape}"}</td>

                    </tr>

                    <tr>

                                    <th style="text-align:left;">bookmark</th>

      		<td>{bookmarks%"{name|escape}"}</td>

      	</tr>

      	<tr>

      		<th style="text-align:left;">tag</th>

      		<td>{tags%"{name|escape}"}</td>

      	</tr>

      	<tr>

      		<th style="text-align:left;vertical-align:top;">user</th>

      		<td>{author|obfuscate}</td>

      	</tr>

      	<tr>

      		<th style="text-align:left;vertical-align:top;">description</th>

      		<td>{desc|strip|escape|websub|addbreaks|nonempty}</td>

      	</tr>

      	<tr>

      		<th style="text-align:left;vertical-align:top;">files</th>

      		<td>{files}</td>

      	</tr>

      	</table>

      	]]></description>

          <author>{author|obfuscate}</author>

          <pubDate>{date|rfc822date}</pubDate>

      </item>

	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

				<item>
				<title>{inbranch%"{if(name, '[{name\|escape}] ')}"}{branches%"{if(name, '[{name\|escape}] ')}"}{desc\|strip\|firstline\|strip\|escape}</title>
				<guid isPermaLink="true">{urlbase}{url\|urlescape}rev/{node\|short}</guid>
				<link>{urlbase}{url\|urlescape}rev/{node\|short}</link>
				<description>
				<![CDATA[
				<table>
				<tr>
				<th style="text-align:left;">changeset</th>
				<td>{node\|short}</td>
				</tr>
				<tr>
				<th style="text-align:left;">branch</th>
				<td>{inbranch%"{name\|escape}"}{branches%"{name\|escape}"}</td>
				</tr>
				<tr>
				<th style="text-align:left;">bookmark</th>
				<td>{bookmarks%"{name\|escape}"}</td>
				</tr>
				<tr>
				<th style="text-align:left;">tag</th>
				<td>{tags%"{name\|escape}"}</td>
				</tr>
				<tr>
				<th style="text-align:left;vertical-align:top;">user</th>
				<td>{author\|obfuscate}</td>
				</tr>
				<tr>
				<th style="text-align:left;vertical-align:top;">description</th>
				<td>{desc\|strip\|escape\|websub\|addbreaks\|nonempty}</td>
				</tr>
				<tr>
				<th style="text-align:left;vertical-align:top;">files</th>
				<td>{files}</td>
				</tr>
				</table>
				]]></description>
				<author>{author\|obfuscate}</author>
				<pubDate>{date\|rfc822date}</pubDate>
				</item>