upstream/mercurial-mirror Files · mercurial/templates/gitweb/filecomparison.tmpl

pull: pre-filter remote phases before moving local ones...

pull: pre-filter remote phases before moving local ones We were relying on the phase internals to filter out redundant phase information from remove. However as we plan to integrate phase movement inside the transaction, we want to avoid useless transaction creation on no-op pulls. Therefore we filter out all the information that already matches the current repository state. This will let us create a transaction only when there is actual phase movement needed.

Thomas Arendsen Hein - - Load All Authors

File last commit:

r18526:9409aeaa stable


                r22068:d34058dd

default

Download file

             filecomparison.tmpl
        
                    72 lines
            
             | 2.6 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / gitweb / filecomparison.tmpl
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        wujek srujek
    
hgweb: side-by-side comparison functionality...

              r17202
            
      {header}

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

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

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

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

        wujek srujek
    
hgweb: side-by-side comparison functionality...

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

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

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

        wujek srujek
    
hgweb: side-by-side comparison functionality...

              r17202
            
      </head>

      <body>

      <div class="page_header">

        Angel Ezquerra <angel.ezquerra at gmail.com>
    
hgweb: add a "URL breadcrumb" to the index and repository pages...

              r18258
            
      <a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a>

      <a href="/">Mercurial</a> {pathdef%breadcrumb} / comparison

        wujek srujek
    
hgweb: side-by-side comparison functionality...

              r17202
            
      </div>

      <div class="page_nav">

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

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

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

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

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

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

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

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

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

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

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

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

        wujek srujek
    
hgweb: side-by-side comparison functionality...

              r17202
            
      comparison |

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

              r18526
            
      <a href="{url|urlescape}raw-diff/{node|short}/{file|urlescape}">raw</a> |

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

        wujek srujek
    
hgweb: side-by-side comparison functionality...

              r17202
            
      <br/>

      </div>

      <div class="title">{file|escape}</div>

      <table>

      {branch%filerevbranch}

      <tr>

       <td>changeset {rev}</td>

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

              r18526
            
       <td style="font-family:monospace"><a class="list" href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td></tr>

        wujek srujek
    
hgweb: side-by-side comparison functionality...

              r17202
            
      {parent%filecompparent}

      {child%filecompchild}

      </table>

      <div class="list_head"></div>

      <div class="page_body">

      <div class="legend">

        <span class="legendinfo equal">equal</span>

        <span class="legendinfo delete">deleted</span>

        <span class="legendinfo insert">inserted</span>

        <span class="legendinfo replace">replaced</span>

      </div>

      <div class="comparison">

        wujek srujek
    
hgweb: fixes traceback for invalid files by removing top-level template...

              r17302
            
        <table style="border-collapse:collapse;">

          <thead class="header">

            <tr>

              <th>{leftrev}:{leftnode|short}</th>

              <th>{rightrev}:{rightnode|short}</th>

            </tr>

          </thead>

          {comparison}

        </table>

        wujek srujek
    
hgweb: side-by-side comparison functionality...

              r17202
            
      </div>

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

wujek srujek hgweb: side-by-side comparison functionality...	r17202	{header}
		<title>{repo\|escape}: comparison {file\|escape}</title>
		<link rel="alternate" type="application/atom+xml"
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	href="{url\|urlescape}atom-log" title="Atom feed for {repo\|escape}"/>
wujek srujek hgweb: side-by-side comparison functionality...	r17202	<link rel="alternate" type="application/rss+xml"
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	href="{url\|urlescape}rss-log" title="RSS feed for {repo\|escape}"/>
wujek srujek hgweb: side-by-side comparison functionality...	r17202	</head>
		<body>

		<div class="page_header">
Angel Ezquerra <angel.ezquerra at gmail.com> hgweb: add a "URL breadcrumb" to the index and repository pages...	r18258	<a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a>
		<a href="/">Mercurial</a> {pathdef%breadcrumb} / comparison
wujek srujek hgweb: side-by-side comparison functionality...	r17202	</div>

		<div class="page_nav">
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<a href="{url\|urlescape}summary{sessionvars%urlparameter}">summary</a> \|
		<a href="{url\|urlescape}shortlog{sessionvars%urlparameter}">shortlog</a> \|
		<a href="{url\|urlescape}log{sessionvars%urlparameter}">changelog</a> \|
		<a href="{url\|urlescape}graph{sessionvars%urlparameter}">graph</a> \|
		<a href="{url\|urlescape}tags{sessionvars%urlparameter}">tags</a> \|
		<a href="{url\|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a> \|
		<a href="{url\|urlescape}branches{sessionvars%urlparameter}">branches</a> \|
		<a href="{url\|urlescape}file/{node\|short}{path\|urlescape}{sessionvars%urlparameter}">files</a> \|
		<a href="{url\|urlescape}rev/{node\|short}{sessionvars%urlparameter}">changeset</a> \|
		<a href="{url\|urlescape}file/{node\|short}/{file\|urlescape}{sessionvars%urlparameter}">file</a> \|
		<a href="{url\|urlescape}file/tip/{file\|urlescape}{sessionvars%urlparameter}">latest</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}diff/{node\|short}/{file\|urlescape}{sessionvars%urlparameter}">diff</a> \|
wujek srujek hgweb: side-by-side comparison functionality...	r17202	comparison \|
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<a href="{url\|urlescape}raw-diff/{node\|short}/{file\|urlescape}">raw</a> \|
		<a href="{url\|urlescape}help{sessionvars%urlparameter}">help</a>
wujek srujek hgweb: side-by-side comparison functionality...	r17202	<br/>
		</div>

		<div class="title">{file\|escape}</div>

		<table>
		{branch%filerevbranch}
		<tr>
		<td>changeset {rev}</td>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<td style="font-family:monospace"><a class="list" href="{url\|urlescape}rev/{node\|short}{sessionvars%urlparameter}">{node\|short}</a></td></tr>
wujek srujek hgweb: side-by-side comparison functionality...	r17202	{parent%filecompparent}
		{child%filecompchild}
		</table>

		<div class="list_head"></div>

		<div class="page_body">

		<div class="legend">
		<span class="legendinfo equal">equal</span>
		<span class="legendinfo delete">deleted</span>
		<span class="legendinfo insert">inserted</span>
		<span class="legendinfo replace">replaced</span>
		</div>

		<div class="comparison">
wujek srujek hgweb: fixes traceback for invalid files by removing top-level template...	r17302	<table style="border-collapse:collapse;">
		<thead class="header">
		<tr>
		<th>{leftrev}:{leftnode\|short}</th>
		<th>{rightrev}:{rightnode\|short}</th>
		</tr>
		</thead>
		{comparison}
		</table>
wujek srujek hgweb: side-by-side comparison functionality...	r17202	</div>

		</div>

		{footer}