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

Thomas Arendsen Hein - - Load All Authors

File last commit:

r18526:9409aeaa stable


                r22302:9472284d

stable

Download file

             filelog.tmpl
        
                    29 lines
            
             | 1.4 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / spartan / filelog.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      {header}

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

      <link rel="alternate" type="application/atom+xml"

         href="{url|urlescape}atom-log/tip/{file|urlescape}" title="Atom feed for {repo|escape}:{file}">

      <link rel="alternate" type="application/rss+xml"

         href="{url|urlescape}rss-log/tip/{file|urlescape}" title="RSS feed for {repo|escape}:{file}">

      </head>

      <body>

      <div class="buttons">

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

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

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

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

      <a type="application/rss+xml" href="{url|urlescape}rss-log/tip/{file|urlescape}">rss</a>

      <a type="application/atom+xml" href="{url|urlescape}atom-log/tip/{file|urlescape}" title="Atom feed for {repo|escape}:{file}">atom</a>

      </div>

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

      <p>navigate: <small class="navigate">{nav%filenav}</small></p>

      {entries%filelogentry}

      {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} history</title>
				<link rel="alternate" type="application/atom+xml"
				href="{url\|urlescape}atom-log/tip/{file\|urlescape}" title="Atom feed for {repo\|escape}:{file}">
				<link rel="alternate" type="application/rss+xml"
				href="{url\|urlescape}rss-log/tip/{file\|urlescape}" title="RSS feed for {repo\|escape}:{file}">
				</head>
				<body>

				<div class="buttons">
				<a href="{url\|urlescape}log{sessionvars%urlparameter}">changelog</a>
				<a href="{url\|urlescape}shortlog{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}file/{node\|short}/{file\|urlescape}{sessionvars%urlparameter}">file</a>
				<a href="{url\|urlescape}annotate/{node\|short}/{file\|urlescape}{sessionvars%urlparameter}">annotate</a>
				<a href="{url\|urlescape}help{sessionvars%urlparameter}">help</a>
				<a type="application/rss+xml" href="{url\|urlescape}rss-log/tip/{file\|urlescape}">rss</a>
				<a type="application/atom+xml" href="{url\|urlescape}atom-log/tip/{file\|urlescape}" title="Atom feed for {repo\|escape}:{file}">atom</a>
				</div>

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

				<p>navigate: <small class="navigate">{nav%filenav}</small></p>

				{entries%filelogentry}

				{footer}