upstream/mercurial-mirror Files · mercurial/templates/spartan/fileannotate.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

Gregory Szorc - - Load All Authors

File last commit:

r30708:011122b3 default


                r44638:1850066f

default

Download file

             fileannotate.tmpl
        
                    51 lines
            
             | 1.7 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / spartan / fileannotate.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      {header}

      <title>{repo|escape}: {file|escape} annotate</title>

      </head>

      <body>

      <div class="buttons">

      <a href="{url|urlescape}log/{symrev}{sessionvars%urlparameter}">changelog</a>

      <a href="{url|urlescape}shortlog/{symrev}{sessionvars%urlparameter}">shortlog</a>

      <a href="{url|urlescape}graph/{symrev}{sessionvars%urlparameter}">graph</a>

      <a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a>

      <a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a>

      <a href="{url|urlescape}rev/{symrev}{sessionvars%urlparameter}">changeset</a>

      <a href="{url|urlescape}file/{symrev}{path|urlescape}{sessionvars%urlparameter}">files</a>

      <a href="{url|urlescape}file/{symrev}/{file|urlescape}{sessionvars%urlparameter}">file</a>

      <a href="{url|urlescape}log/{symrev}/{file|urlescape}{sessionvars%urlparameter}">revisions</a>

      <a href="{url|urlescape}raw-file/{symrev}/{file|urlescape}">raw</a>

      <a href="{url|urlescape}help{sessionvars%urlparameter}">help</a>

      </div>

      <h2><a href="/">Mercurial</a> {pathdef%breadcrumb} / annotate {file|escape}</h2>

      <table>

      <tr>

       <td class="metatag">changeset {rev}:</td>

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

      </tr>

      {parent%fileannotateparent}

      {child%fileannotatechild}

      <tr>

       <td class="metatag">author:</td>

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

      </tr>

      <tr>

       <td class="metatag">date:</td>

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

      </tr>

      <tr>

       <td class="metatag">permissions:</td>

       <td>{permissions|permissions}</td>

      </tr>

      <tr>

        <td class="metatag">description:</td>

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

      </tr>

      </table>

      <table cellspacing="0" cellpadding="0">

      {annotate%annotateline}

      </table>

      {footer}

	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

				{header}
				<title>{repo\|escape}: {file\|escape} annotate</title>
				</head>
				<body>

				<div class="buttons">
				<a href="{url\|urlescape}log/{symrev}{sessionvars%urlparameter}">changelog</a>
				<a href="{url\|urlescape}shortlog/{symrev}{sessionvars%urlparameter}">shortlog</a>
				<a href="{url\|urlescape}graph/{symrev}{sessionvars%urlparameter}">graph</a>
				<a href="{url\|urlescape}tags{sessionvars%urlparameter}">tags</a>
				<a href="{url\|urlescape}branches{sessionvars%urlparameter}">branches</a>
				<a href="{url\|urlescape}rev/{symrev}{sessionvars%urlparameter}">changeset</a>
				<a href="{url\|urlescape}file/{symrev}{path\|urlescape}{sessionvars%urlparameter}">files</a>
				<a href="{url\|urlescape}file/{symrev}/{file\|urlescape}{sessionvars%urlparameter}">file</a>
				<a href="{url\|urlescape}log/{symrev}/{file\|urlescape}{sessionvars%urlparameter}">revisions</a>
				<a href="{url\|urlescape}raw-file/{symrev}/{file\|urlescape}">raw</a>
				<a href="{url\|urlescape}help{sessionvars%urlparameter}">help</a>
				</div>

				<h2><a href="/">Mercurial</a> {pathdef%breadcrumb} / annotate {file\|escape}</h2>

				<table>
				<tr>
				<td class="metatag">changeset {rev}:</td>
				<td><a href="{url\|urlescape}rev/{node\|short}{sessionvars%urlparameter}">{node\|short}</a></td>
				</tr>
				{parent%fileannotateparent}
				{child%fileannotatechild}
				<tr>
				<td class="metatag">author:</td>
				<td>{author\|obfuscate}</td>
				</tr>
				<tr>
				<td class="metatag">date:</td>
				<td class="date age">{date\|rfc822date}</td>
				</tr>
				<tr>
				<td class="metatag">permissions:</td>
				<td>{permissions\|permissions}</td>
				</tr>
				<tr>
				<td class="metatag">description:</td>
				<td>{desc\|strip\|escape\|websub\|addbreaks\|nonempty}</td>
				</tr>
				</table>

				<table cellspacing="0" cellpadding="0">
				{annotate%annotateline}
				</table>

				{footer}