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

copies: detect files as `touched/salvaged` if they only existed on one side...

copies: detect files as `touched/salvaged` if they only existed on one side The file cannot be merged if there was content to merge on the other side. So the previous record was wrong. In the general case, the file existed only on one side and got touched during the merge. So it should detected as touched. They are a special case where the merge manually prevent the file to be deleted. In this case the file is marked as `salvaged`. The result of this `salvaged` recording, copy-tracing-wise, is the same as recording it as `merged`. This is probably why they were recorded as `merged` in the first place. Differential Revision: https://phab.mercurial-scm.org/D10219

av6 - - Load All Authors

File last commit:

r25794:90214844 default


                r47570:c52c3c4c

default

Download file

             filerevision.tmpl
        
                    51 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">

        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}log/{symrev}/{file|urlescape}{sessionvars%urlparameter}">revisions</a>

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

      <a href="{url|urlescape}raw-file/{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} / {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%filerevparent}

      {child%filerevchild}

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

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

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

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

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

      </tr>

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

              r9999
            
      <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">
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}log/{symrev}/{file\|urlescape}{sessionvars%urlparameter}">revisions</a>
		<a href="{url\|urlescape}annotate/{symrev}/{file\|urlescape}{sessionvars%urlparameter}">annotate</a>
		<a href="{url\|urlescape}raw-file/{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} / {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%filerevparent}
		{child%filerevchild}
		<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>
Anton Shestakov hgweb: clearly outline <tr> block in gitweb and spartan styles...	r24999	<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>
Anton Shestakov hgweb: clearly outline <tr> block in gitweb and spartan styles...	r24999	<td>{permissions\|permissions}</td>
		</tr>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	<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}