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

rebase: clarify comment about merge ancestor when rebasing merges...

rebase: clarify comment about merge ancestor when rebasing merges The code for picking a merge ancestor when rebasing merges had a long and incorrect comment. The comment would perhaps have been fine as commit message but does not make the code more readable or maintainable and is a bad substitute for correct and readable code. The correct essense of the comment is quite trivial: a merge of an ancestor of the rebase destination and an 'outside' revision can be rebased as if it was a linear change, using 'destination ancestor parent' as base and pretty much ignoring the 'outside' revision. The code path where the comment is placed is however also used for other kinds of merge rebases. The comment is thus not really correct and not helpful. I think it would be better to drop the comment and rewrite the code.

Angel Ezquerra - - Load All Authors

File last commit:

r18628:52305554 default


                r23732:c51d6c04

default

Download file

             filerevision.tmpl
        
                    47 lines
            
             | 1.6 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / spartan / filerevision.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}</title>

      </head>

      <body>

      <div class="buttons">

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

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

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

      <a href="{url|urlescape}graph{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/{node|short}{sessionvars%urlparameter}">changeset</a>

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

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

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

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

      <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} / {file|escape}</h2>

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

              r9999
            
      <table>

      <tr>

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

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

              r18526
            
       <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%filerevparent}

      {child%filerevchild}

      <tr>

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

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

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

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

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

      <pre>

      {text%fileline}

      </pre>

      {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}</title>
		</head>
		<body>

		<div class="buttons">
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<a href="{url\|urlescape}log/{rev}{sessionvars%urlparameter}">changelog</a>
		<a href="{url\|urlescape}shortlog/{rev}{sessionvars%urlparameter}">shortlog</a>
		<a href="{url\|urlescape}graph{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/{node\|short}{sessionvars%urlparameter}">changeset</a>
		<a href="{url\|urlescape}file/{node\|short}{path\|urlescape}{sessionvars%urlparameter}">files</a>
		<a href="{url\|urlescape}log/{node\|short}/{file\|urlescape}{sessionvars%urlparameter}">revisions</a>
		<a href="{url\|urlescape}annotate/{node\|short}/{file\|urlescape}{sessionvars%urlparameter}">annotate</a>
		<a href="{url\|urlescape}raw-file/{node\|short}/{file\|urlescape}">raw</a>
		<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} / {file\|escape}</h2>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999
		<table>
		<tr>
		<td class="metatag">changeset {rev}:</td>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<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%filerevparent}
		{child%filerevchild}
		<tr>
		<td class="metatag">author:</td>
		<td>{author\|obfuscate}</td></tr>
		<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></tr>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	<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>

		<pre>
		{text%fileline}
		</pre>

		{footer}