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

merge: don't auto-pick destination with `hg merge 'wdir()'`...

merge: don't auto-pick destination with `hg merge 'wdir()'` If the user doesn't specify a commit to merge with, we'll have `node==None` in `commands.merge()`. We'll then try to find a good commit to merge with. However, if the user, for some strange reason, runs `hg merge 'wdir()'`, we'll also have `node==None` and we'll do that same. That's clearly not the intent, so let's not do that. It turns out we'd instead crash on that command after this patch, so I added special handling of it too. Differential Revision: https://phab.mercurial-scm.org/D7996

av6 - - Load All Authors

File last commit:

r37042:7c18798f default


                r44638:1850066f

default

Download file

             changelogentry.tmpl
        
                    31 lines
            
             | 973 B
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / spartan / changelogentry.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      <table class="logEntry parity{parity}">

       <tr>

        <th class="label"><span class="age">{date|rfc822date}</span>:</th>

        <th class="firstline">{desc|strip|firstline|escape|nonempty}</th>

       </tr>

       <tr>

        <th class="revision">changeset {rev}:</th>

        <td class="node"><a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td>

       </tr>

       {parent%changelogparent}

       {child%changelogchild}

       {changelogtag}

       <tr>

        <th class="author">author:</th>

        <td class="author">{author|obfuscate}</td>

       </tr>

       <tr>

        <th class="date">date:</th>

        <td class="date">{date|rfc822date}</td>

       </tr>

       {ifeq(phase, 'public', '', '<tr>

        <th class="phase">phase:</th>

        <td class="phase">{phase|escape}</td>

       </tr>')}

       {if(obsolete, succsandmarkers%obsfateentry)}

       {if(instabilities, whyunstable%whyunstableentry)}

       <tr>

        <th class="files"><a href="{url|urlescape}file/{node|short}{sessionvars%urlparameter}">files</a>:</th>

        <td class="files">{files}</td>

       </tr>

      </table>

	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

				<table class="logEntry parity{parity}">
				<tr>
				<th class="label"><span class="age">{date\|rfc822date}</span>:</th>
				<th class="firstline">{desc\|strip\|firstline\|escape\|nonempty}</th>
				</tr>
				<tr>
				<th class="revision">changeset {rev}:</th>
				<td class="node"><a href="{url\|urlescape}rev/{node\|short}{sessionvars%urlparameter}">{node\|short}</a></td>
				</tr>
				{parent%changelogparent}
				{child%changelogchild}
				{changelogtag}
				<tr>
				<th class="author">author:</th>
				<td class="author">{author\|obfuscate}</td>
				</tr>
				<tr>
				<th class="date">date:</th>
				<td class="date">{date\|rfc822date}</td>
				</tr>
				{ifeq(phase, 'public', '', '<tr>
				<th class="phase">phase:</th>
				<td class="phase">{phase\|escape}</td>
				</tr>')}
				{if(obsolete, succsandmarkers%obsfateentry)}
				{if(instabilities, whyunstable%whyunstableentry)}
				<tr>
				<th class="files"><a href="{url\|urlescape}file/{node\|short}{sessionvars%urlparameter}">files</a>:</th>
				<td class="files">{files}</td>
				</tr>
				</table>