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

phases: really fix native phase computation...

phases: really fix native phase computation For some reason (probably rebase issue, leprechaun or badly resolved .rej) contains only half of the emailed patches and do not fix the bug. This patch adds the other half and enable the sweet native computation for real. As expected this provide massive speedup along the board. revset : not public() plain first 0) 0.011960 0.010523 1) 0.000465 3% 0.000492 4% revset : (tip~1000::) - public() plain first 0) 0.025700 0.025169 1) 0.002864 11% 0.001899 7% revset : not public() and branch("default") plain first 0) 0.022842 0.020863 1) 0.011418 49% 0.010948 52% However, it has a less impact (even bad) on first result time in simple situation. This comes from the overhead of building the set and filtering it. This is especially true on my Mercurial repository (used here) where about 1/3 of the changesets are non public and hidden. This could be mitigated by a caching of the set and a better usage of smartset in '_notpublic'. (But this won't happen in this patch because the win is massive everywhere else). revset : not public() last 0) 0.000081 1) 0.000493 x6.1 <-- bad impact revset : (tip~1000::) - public() last 0) 0.013966 1) 0.002737 19% revset : not public() and branch("default") last 0) 0.011021 1) 0.011038 The effect mostly disappear when the number of non-public changesets is small and/or the repo get bigger. Result for Mozilla central: Mozilla revset : not public() plain first last 0) 0.092787 0.084094 0.000080 1) 0.000054 0% 0.000083 0% 0.000083 revset : (tip~1000::) - public() plain first last 0) 0.215607 0.183996 0.124962 1) 0.031620 14% 0.006616 3% 0.031168 24% revset : not public() and branch("default") plain first last 0) 0.092626 0.082687 0.000162 1) 0.000139 0% 0.000165 0% 0.000167

Anton Shestakov - - Load All Authors

File last commit:

r25134:339e3cc0 default


                r25527:262e6ad9

default

Download file

             filediff.tmpl
        
                    78 lines
            
             | 2.6 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / paper / 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="container">

      <div class="menu">

      <div class="logo">

        Steven Stallion
    
hgweb: support alternate logo url...

              r13964
            
      <a href="{logourl}">

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

              r18526
            
      <img src="{staticurl|urlescape}{logoimg}" alt="mercurial" /></a>

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

              r9999
            
      </div>

      <ul>

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

              r18526
            
      <li><a href="{url|urlescape}shortlog/{node|short}{sessionvars%urlparameter}">log</a></li>

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

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

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

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

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

              r9999
            
      </ul>

      <ul>

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

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

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

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

              r9999
            
      </ul>

      <ul>

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

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

      <li><a href="{url|urlescape}file/tip/{file|urlescape}{sessionvars%urlparameter}">latest</a></li>

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

              r9999
            
      <li class="active">diff</li>

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

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

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

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

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

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

              r9999
            
      </ul>

        Augie Fackler
    
hgweb: add help link to templates missed in ead4e21f49f1

              r12680
            
      <ul>

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

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

        Augie Fackler
    
hgweb: add help link to templates missed in ead4e21f49f1

              r12680
            
      </ul>

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

              r9999
            
      </div>

      <div class="main">

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

              r18258
            
      <h2 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb}</h2>

        Anton Shestakov
    
paper: show branch/tags/bookmarks when diffing (issue3559)

              r25134
            
      <h3>diff {file|escape} @ {rev}:{node|short} {branch%changelogbranchname}{tags%changelogtag}{bookmarks%changelogtag}</h3>

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

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

              r18526
            
      <form class="search" action="{url|urlescape}log">

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

              r9999
            
      <p>{sessionvars%hiddenformentry}</p>

      <p><input name="rev" id="search1" type="text" size="30" /></p>

        Alexander Plavin
    
paper: define searchhint message in map file and use it in other templates

              r19795
            
      <div id="hint">{searchhint}</div>

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

              r9999
            
      </form>

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

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

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

              r9999
            
      <table id="changesetEntry">

      <tr>

       <th>author</th>

       <td>{author|obfuscate}</td>

      </tr>

      <tr>

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

      <tr>

       <th>parents</th>

       <td>{parent%filerevparent}</td>

      </tr>

      <tr>

       <th>children</th>

       <td>{child%filerevchild}</td>

      </tr>

      </table>

      <div class="overflow">

        Alexander Plavin
    
hgweb: add line wrapping switch to file diff and changeset views

              r19433
            
      <div class="sourcefirst linewraptoggle">line wrap: <a class="linewraplink" href="javascript:toggleLinewrap()">on</a></div>

        Alexander Plavin
    
hgweb: file diff and changesets views behave like file source view...

              r19432
            
      <div class="sourcefirst"> line diff</div>

      <div class="stripes2 diffblocks">

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

              r9999
            
      {diff}

      </div>

      </div>

      </div>

        Alexander Plavin
    
hgweb: file diff and changesets views behave like file source view...

              r19432
            
      </div>

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

              r9999
            
      {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="container">
		<div class="menu">
		<div class="logo">
Steven Stallion hgweb: support alternate logo url...	r13964	<a href="{logourl}">
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<img src="{staticurl\|urlescape}{logoimg}" alt="mercurial" /></a>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</div>
		<ul>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<li><a href="{url\|urlescape}shortlog/{node\|short}{sessionvars%urlparameter}">log</a></li>
		<li><a href="{url\|urlescape}graph/{node\|short}{sessionvars%urlparameter}">graph</a></li>
		<li><a href="{url\|urlescape}tags{sessionvars%urlparameter}">tags</a></li>
		<li><a href="{url\|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
		<li><a href="{url\|urlescape}branches{sessionvars%urlparameter}">branches</a></li>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</ul>
		<ul>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<li><a href="{url\|urlescape}rev/{node\|short}{sessionvars%urlparameter}">changeset</a></li>
		<li><a href="{url\|urlescape}file/{node\|short}{path\|urlescape}{sessionvars%urlparameter}">browse</a></li>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</ul>
		<ul>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<li><a href="{url\|urlescape}file/{node\|short}/{file\|urlescape}{sessionvars%urlparameter}">file</a></li>
		<li><a href="{url\|urlescape}file/tip/{file\|urlescape}{sessionvars%urlparameter}">latest</a></li>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	<li class="active">diff</li>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<li><a href="{url\|urlescape}comparison/{node\|short}/{file\|urlescape}{sessionvars%urlparameter}">comparison</a></li>
		<li><a href="{url\|urlescape}annotate/{node\|short}/{file\|urlescape}{sessionvars%urlparameter}">annotate</a></li>
		<li><a href="{url\|urlescape}log/{node\|short}/{file\|urlescape}{sessionvars%urlparameter}">file log</a></li>
		<li><a href="{url\|urlescape}raw-file/{node\|short}/{file\|urlescape}">raw</a></li>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</ul>
Augie Fackler hgweb: add help link to templates missed in ead4e21f49f1	r12680	<ul>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<li><a href="{url\|urlescape}help{sessionvars%urlparameter}">help</a></li>
Augie Fackler hgweb: add help link to templates missed in ead4e21f49f1	r12680	</ul>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</div>

		<div class="main">
Angel Ezquerra <angel.ezquerra at gmail.com> hgweb: add a "URL breadcrumb" to the index and repository pages...	r18258	<h2 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb}</h2>
Anton Shestakov paper: show branch/tags/bookmarks when diffing (issue3559)	r25134	<h3>diff {file\|escape} @ {rev}:{node\|short} {branch%changelogbranchname}{tags%changelogtag}{bookmarks%changelogtag}</h3>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<form class="search" action="{url\|urlescape}log">
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	<p>{sessionvars%hiddenformentry}</p>
		<p><input name="rev" id="search1" type="text" size="30" /></p>
Alexander Plavin paper: define searchhint message in map file and use it in other templates	r19795	<div id="hint">{searchhint}</div>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</form>

Angel Ezquerra hgweb: apply the websub filter to revision descriptions...	r18628	<div class="description">{desc\|strip\|escape\|websub\|nonempty}</div>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999
		<table id="changesetEntry">
		<tr>
		<th>author</th>
		<td>{author\|obfuscate}</td>
		</tr>
		<tr>
		<th>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>
		<tr>
		<th>parents</th>
		<td>{parent%filerevparent}</td>
		</tr>
		<tr>
		<th>children</th>
		<td>{child%filerevchild}</td>
		</tr>
		</table>

		<div class="overflow">
Alexander Plavin hgweb: add line wrapping switch to file diff and changeset views	r19433	<div class="sourcefirst linewraptoggle">line wrap: <a class="linewraplink" href="javascript:toggleLinewrap()">on</a></div>
Alexander Plavin hgweb: file diff and changesets views behave like file source view...	r19432	<div class="sourcefirst"> line diff</div>
		<div class="stripes2 diffblocks">
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	{diff}
		</div>
		</div>
		</div>
Alexander Plavin hgweb: file diff and changesets views behave like file source view...	r19432	</div>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999
		{footer}