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

context: don't count deleted files as candidates for path conflicts in IMM...

context: don't count deleted files as candidates for path conflicts in IMM This patch makes sure we don't consider the deleted files in our IMM wctx as potential conflicts while calculating paths conflicts. This fixes the bug demonstrated in previous patch. Differential Revision: https://phab.mercurial-scm.org/D4543

av6 - - Load All Authors

File last commit:

r29439:c42a3fd5 default


                r39612:fa4d16da

default

Download file

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

       <entry>

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

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

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

        <author>

         <name>{author|person|escape}</name>

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

        </author>

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

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

        <content type="xhtml">

         <table xmlns="http://www.w3.org/1999/xhtml">

          <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;">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>

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

				<entry>
				<title>{inbranch%"{if(name, '[{name\|escape}] ')}"}{branches%"{if(name, '[{name\|escape}] ')}"}{desc\|strip\|firstline\|strip\|escape\|nonempty}</title>
				<id>{urlbase}{url\|urlescape}#changeset-{node}</id>
				<link href="{urlbase}{url\|urlescape}rev/{node\|short}"/>
				<author>
				<name>{author\|person\|escape}</name>
				<email>{author\|email\|obfuscate}</email>
				</author>
				<updated>{date\|rfc3339date}</updated>
				<published>{date\|rfc3339date}</published>
				<content type="xhtml">
				<table xmlns="http://www.w3.org/1999/xhtml">
				<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;">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>
				</content>
				</entry>