upstream/mercurial-mirror Files · mercurial/templates/paper/filelogentry.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:

r35055:9acc0360 default


                r44638:1850066f

default

Download file

             filelogentry.tmpl
        
                    9 lines
            
             | 333 B
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / paper / filelogentry.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

       <tr>

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

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

        <td class="description">

         <a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{desc|strip|firstline|escape|nonempty}</a>

         {alltags}{rename%filelogrename}

        </td>

       </tr>

       {if(patch, '<tr><td colspan="3">{diff}</td></tr>')}

	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

				<tr>
				<td class="age">{date\|rfc822date}</td>
				<td class="author">{author\|person}</td>
				<td class="description">
				<a href="{url\|urlescape}rev/{node\|short}{sessionvars%urlparameter}">{desc\|strip\|firstline\|escape\|nonempty}</a>
				{alltags}{rename%filelogrename}
				</td>
				</tr>
				{if(patch, '<tr><td colspan="3">{diff}</td></tr>')}