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

filemerge: call premerge directly from main merge function...

filemerge: call premerge directly from main merge function The merge code currently does (in pseudocode): for f in tomerge: premerge f merge f We'd like to change this to look more like: for f in tomerge: premerge f for f in tomerge: merge f This makes sure as many files are resolved as possible before prompting for the others. This restructuring is also necessary for custom merge drivers. This function separates out the premerge step from the merge step. In future patches we'll actually turn these into separate steps in the merge driver. The 'if r:' occurrences will be cleaned up in subsequent patches.

Steven Brown - - Load All Authors

File last commit:

r21486:16352b34 default


                r26567:f18646cf

default

Download file

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

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

              r9999
            
      <item>

        Aaron Jensen
    
hgweb: adding branch names from inbranch template to rss feed

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

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

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

        Aaron Jensen
    
hgweb: adding article link to rss feed

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

        Aaron Jensen
    
hgweb: adding branch, tags, bookmarks, user, and file list to rss feed entries

              r21057
            
          <description>

        Aaron Jensen
    
hgweb: adding branch names from inbranch template to rss feed

              r21118
            
                    <![CDATA[

        Aaron Jensen
    
hgweb: adding branch, tags, bookmarks, user, and file list to rss feed entries

              r21057
            
      	<table>

      	<tr>

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

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

        Aaron Jensen
    
hgweb: adding branch names from inbranch template to rss feed

              r21118
            
                    </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>

        Aaron Jensen
    
hgweb: adding branch, tags, bookmarks, user, and file list to rss feed entries

              r21057
            
      		<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>

        Steven Brown
    
hgweb: apply websub filter to the changeset description in rss and atom feeds...

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

        Aaron Jensen
    
hgweb: adding branch, tags, bookmarks, user, and file list to rss feed entries

              r21057
            
      	</tr>

      	<tr>

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

      		<td>{files}</td>

      	</tr>

      	</table>

      	]]></description>

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

              r9999
            
          <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

Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	<item>
Aaron Jensen hgweb: adding branch names from inbranch template to rss feed	r21118	<title>{inbranch%"{if(name, '[{name\|escape}] ')}"}{branches%"{if(name, '[{name\|escape}] ')}"}{desc\|strip\|firstline\|strip\|escape}</title>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<guid isPermaLink="true">{urlbase}{url\|urlescape}rev/{node\|short}</guid>
Aaron Jensen hgweb: adding article link to rss feed	r21119	<link>{urlbase}{url\|urlescape}rev/{node\|short}</link>
Aaron Jensen hgweb: adding branch, tags, bookmarks, user, and file list to rss feed entries	r21057	<description>
Aaron Jensen hgweb: adding branch names from inbranch template to rss feed	r21118	<![CDATA[
Aaron Jensen hgweb: adding branch, tags, bookmarks, user, and file list to rss feed entries	r21057	<table>
		<tr>
		<th style="text-align:left;">changeset</th>
		<td>{node\|short}</td>
Aaron Jensen hgweb: adding branch names from inbranch template to rss feed	r21118	</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>
Aaron Jensen hgweb: adding branch, tags, bookmarks, user, and file list to rss feed entries	r21057	<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>
Steven Brown hgweb: apply websub filter to the changeset description in rss and atom feeds...	r21486	<td>{desc\|strip\|escape\|websub\|addbreaks\|nonempty}</td>
Aaron Jensen hgweb: adding branch, tags, bookmarks, user, and file list to rss feed entries	r21057	</tr>
		<tr>
		<th style="text-align:left;vertical-align:top;">files</th>
		<td>{files}</td>
		</tr>
		</table>
		]]></description>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	<author>{author\|obfuscate}</author>
		<pubDate>{date\|rfc822date}</pubDate>
		</item>