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

graft: fix collision detection with origin revisions that are missing...

graft: fix collision detection with origin revisions that are missing When grafting something with a matching origin, it would normally be skipped: skipping already grafted revision 123 (23 also has origin 12) But after stripping a graft origin, graft could fail with a reference to the origin that no longer exists: abort: unknown revision '5c095ad7e90f871700f02dd1fa5012cb4498a2d4'! Instead, detect that the origin is unknown and skip it anyway, like: skipping already grafted revision 8 (2 also has unknown origin 5c095ad7e90f871700f02dd1fa5012cb4498a2d4)

Angel Ezquerra - - Load All Authors

File last commit:

r18628:52305554 default


                r22302:9472284d

stable

Download file

             filerevision.tmpl
        
                    47 lines
            
             | 1.6 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / spartan / filerevision.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      {header}

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

      </head>

      <body>

      <div class="buttons">

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

      </div>

      <h2><a href="/">Mercurial</a> {pathdef%breadcrumb} / {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%filerevparent}

      {child%filerevchild}

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

      <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

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

				<div class="buttons">
				<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>
				</div>

				<h2><a href="/">Mercurial</a> {pathdef%breadcrumb} / {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%filerevparent}
				{child%filerevchild}
				<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>

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

				{footer}