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

mergestate: handle additional record types specially...

mergestate: handle additional record types specially This works around a bug in older Mercurial versions' handling of the v2 merge state. We also add a bunch of tests that make sure that (1) we correctly abort when the merge state has an unsupported record type (2) aborting the merge, rebase or histedit continues to work and clears out the merge state.

av6 - - Load All Authors

File last commit:

r25794:90214844 default


                r27027:a01ecbcf

default

Download file

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

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

              r9999
            
      {header}

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

      </head>

      <body>

      <div class="buttons">

        av6
    
hgweb: don't dereference symbolic revision in spartan style...

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

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

        av6
    
spartan: don't drop current revision in log/graph links...

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

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

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

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

        av6
    
hgweb: don't dereference symbolic revision in spartan style...

              r25603
            
      <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-annotate/{symrev}/{file|urlescape}">raw</a>

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

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

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

              r9999
            
      </div>

        Angel Ezquerra <angel.ezquerra at gmail.com>
    
hgweb, spartan: add "URL breadcrumbs"...

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

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

              r9999
            
      <table>

      <tr>

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

        Anton Shestakov
    
hgweb: clearly outline <tr> block in gitweb and spartan styles...

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

      </tr>

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

              r9999
            
      {parent%fileannotateparent}

      {child%fileannotatechild}

      <tr>

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

        Anton Shestakov
    
hgweb: clearly outline <tr> block in gitweb and spartan styles...

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

      </tr>

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

              r9999
            
      <tr>

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

        Brodie Rao
    
hgweb: fix dynamic date calculation not working under Safari...

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

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

              r9999
            
      </tr>

      <tr>

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

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

      </tr>

      <tr>

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

        Angel Ezquerra
    
hgweb: apply the websub filter to revision descriptions...

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

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

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

Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	{header}
		<title>{repo\|escape}: {file\|escape} annotate</title>
		</head>
		<body>

		<div class="buttons">
av6 hgweb: don't dereference symbolic revision in spartan style...	r25603	<a href="{url\|urlescape}log/{symrev}{sessionvars%urlparameter}">changelog</a>
		<a href="{url\|urlescape}shortlog/{symrev}{sessionvars%urlparameter}">shortlog</a>
av6 spartan: don't drop current revision in log/graph links...	r25794	<a href="{url\|urlescape}graph/{symrev}{sessionvars%urlparameter}">graph</a>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<a href="{url\|urlescape}tags{sessionvars%urlparameter}">tags</a>
		<a href="{url\|urlescape}branches{sessionvars%urlparameter}">branches</a>
av6 hgweb: don't dereference symbolic revision in spartan style...	r25603	<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-annotate/{symrev}/{file\|urlescape}">raw</a>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<a href="{url\|urlescape}help{sessionvars%urlparameter}">help</a>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</div>

Angel Ezquerra <angel.ezquerra at gmail.com> hgweb, spartan: add "URL breadcrumbs"...	r18259	<h2><a href="/">Mercurial</a> {pathdef%breadcrumb} / annotate {file\|escape}</h2>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999
		<table>
		<tr>
		<td class="metatag">changeset {rev}:</td>
Anton Shestakov hgweb: clearly outline <tr> block in gitweb and spartan styles...	r24999	<td><a href="{url\|urlescape}rev/{node\|short}{sessionvars%urlparameter}">{node\|short}</a></td>
		</tr>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	{parent%fileannotateparent}
		{child%fileannotatechild}
		<tr>
		<td class="metatag">author:</td>
Anton Shestakov hgweb: clearly outline <tr> block in gitweb and spartan styles...	r24999	<td>{author\|obfuscate}</td>
		</tr>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	<tr>
		<td class="metatag">date:</td>
Brodie Rao hgweb: fix dynamic date calculation not working under Safari...	r15375	<td class="date age">{date\|rfc822date}</td>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</tr>
		<tr>
		<td class="metatag">permissions:</td>
		<td>{permissions\|permissions}</td>
		</tr>
		<tr>
		<td class="metatag">description:</td>
Angel Ezquerra hgweb: apply the websub filter to revision descriptions...	r18628	<td>{desc\|strip\|escape\|websub\|addbreaks\|nonempty}</td>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</tr>
		</table>

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

		{footer}