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

status: change + back out == clean (API)...

status: change + back out == clean (API) After backing out a change, so the file contents is equal to a previous revision of itself, we currently report the status between the two equal revisions as modified. This is because context._buildstatus() reports any file whose new nodeid is not equal to _newnode as modified. That magic nodeid is given only to files added or modified in the working directory, so any file whose nodeid has changed between two revisions will be reported as modified. Fix by simply comparing the file contents for all cases where the nodeid changed, whether they are in the working copy or committed. Marking with (API) as it subtly changes the semantics of the method.

av6 - - Load All Authors

File last commit:

r25794:90214844 default


                r27720:89f49813

default

Download file

             filediff.tmpl
        
                    37 lines
            
             | 1.3 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / spartan / filediff.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} diff</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}/{file|urlescape}{sessionvars%urlparameter}">file</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-diff/{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 id="filediffEntry">

      <tr>

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

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

              r18526
            
       <td class="revision"><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>

      {parent%filediffparent}

      {child%filediffchild}

      </table>

      <div id="fileDiff">

      {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}: {file\|escape} diff</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}/{file\|urlescape}{sessionvars%urlparameter}">file</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-diff/{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 id="filediffEntry">
		<tr>
		<th class="revision">revision {rev}:</th>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<td class="revision"><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>
		{parent%filediffparent}
		{child%filediffchild}
		</table>

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

		{footer}