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

r37042:7c18798f default


                r47570:c52c3c4c

default

Download file

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

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

              r9999
            
      {header}

      <title>{repo|escape}: changeset {node|short}</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}file/{symrev}{sessionvars%urlparameter}">files</a>

      <a href="{url|urlescape}raw-rev/{symrev}">raw</a>

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

              r9999
            
      {archives%archiveentry}

        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} / changeset: {desc|strip|escape|firstline|nonempty}</h2>

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

              r9999
            
      <table id="changesetEntry">

      <tr>

       <th class="changeset">changeset {rev}:</th>

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

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

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

              r9999
            
      </tr>

        Anton Shestakov
    
hgweb: allow viewing diffs against p1 or p2 for merge commits (issue3904)...

              r23740
            
      {ifeq(count(parent), '2', parent%changesetparentdiff, parent%changesetparent)}

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

              r9999
            
      {child%changesetchild}

      {changesettag}

      <tr>

       <th class="author">author:</th>

       <td class="author">{author|obfuscate}</td>

      </tr>

      <tr>

       <th class="date">date:</th>

        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>

        av6
    
hgweb: show commit phase if it's not public...

              r35064
            
      {ifeq(phase, 'public', '', '<tr>

       <th class="phase">phase:</th>

       <td class="phase">{phase|escape}</td>

      </tr>')}

        av6
    
hgweb: show each obsfateentry on its own line...

              r36340
            
      {if(obsolete, succsandmarkers%obsfateentry)}

        av6
    
hgweb: explain instabilities of unstable changesets (the rest of the themes)

              r37042
            
      {if(instabilities, whyunstable%whyunstableentry)}

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

              r9999
            
      <tr>

       <th class="files">files:</th>

       <td class="files">{files}</td>

      </tr>

      <tr>

       <th class="description">description:</th>

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

              r18628
            
       <td class="description">{desc|strip|escape|websub|addbreaks|nonempty}</td>

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

              r9999
            
      </tr>

      </table>

      <div id="changesetDiff">

      {diff}

      </div>

      {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}: changeset {node\|short}</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}file/{symrev}{sessionvars%urlparameter}">files</a>
		<a href="{url\|urlescape}raw-rev/{symrev}">raw</a>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	{archives%archiveentry}
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} / changeset: {desc\|strip\|escape\|firstline\|nonempty}</h2>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999
		<table id="changesetEntry">
		<tr>
		<th class="changeset">changeset {rev}:</th>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<td class="changeset"><a href="{url\|urlescape}rev/{node\|short}{sessionvars%urlparameter}">{node\|short}</a></td>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</tr>
Anton Shestakov hgweb: allow viewing diffs against p1 or p2 for merge commits (issue3904)...	r23740	{ifeq(count(parent), '2', parent%changesetparentdiff, parent%changesetparent)}
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	{child%changesetchild}
		{changesettag}
		<tr>
		<th class="author">author:</th>
		<td class="author">{author\|obfuscate}</td>
		</tr>
		<tr>
		<th class="date">date:</th>
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>
av6 hgweb: show commit phase if it's not public...	r35064	{ifeq(phase, 'public', '', '<tr>
		<th class="phase">phase:</th>
		<td class="phase">{phase\|escape}</td>
		</tr>')}
av6 hgweb: show each obsfateentry on its own line...	r36340	{if(obsolete, succsandmarkers%obsfateentry)}
av6 hgweb: explain instabilities of unstable changesets (the rest of the themes)	r37042	{if(instabilities, whyunstable%whyunstableentry)}
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	<tr>
		<th class="files">files:</th>
		<td class="files">{files}</td>
		</tr>
		<tr>
		<th class="description">description:</th>
Angel Ezquerra hgweb: apply the websub filter to revision descriptions...	r18628	<td class="description">{desc\|strip\|escape\|websub\|addbreaks\|nonempty}</td>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</tr>
		</table>

		<div id="changesetDiff">
		{diff}
		</div>

		{footer}