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

bookmarks: fix _bookmarks/lookup() reentrancy issue (issue2016)...

bookmarks: fix _bookmarks/lookup() reentrancy issue (issue2016) _bookmarks is loaded lazily and calls super.lookup(). Unfortunately, branch and tags caches initializations also recurse in lookup() and end up trying to access _bookmarks again. Massive confusion ensues. I considered fixing all branches and tags cache loading to avoid recursing in lookup() but it would add complexity to otherwise working code provided lookups are performed on nodes or revnums.

Dan Villiom Podlaski Christiansen - - Load All Authors

File last commit:

r9999:f91e5630 default


                r12392:74129048

stable

Download file

             filediff.tmpl
        
                    73 lines
            
             | 2.0 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / paper / filediff.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      {header}

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

      </head>

      <body>

      <div class="container">

      <div class="menu">

      <div class="logo">

      <a href="http://mercurial.selenic.com/">

      <img src="{staticurl}hglogo.png" alt="mercurial" /></a>

      </div>

      <ul>

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

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

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

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

      </ul>

      <ul>

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

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

      </ul>

      <ul>

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

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

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

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

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

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

      </ul>

      </div>

      <div class="main">

      <h2><a href="{url}{sessionvars%urlparameter}">{repo|escape}</a></h2>

      <h3>diff {file|escape} @ {rev}:{node|short}</h3>

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

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

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

      <div id="hint">find changesets by author, revision,

      files, or words in the commit message</div>

      </form>

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

      <table id="changesetEntry">

      <tr>

       <th>author</th>

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

      </tr>

      <tr>

       <th>date</th>

       <td>{date|date} ({date|age})</td>

      </tr>

      <tr>

       <th>parents</th>

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

      </tr>

      <tr>

       <th>children</th>

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

      </tr>

      {changesettag}

      </table>

      <div class="overflow">

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

      {diff}

      </div>

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

				{header}
				<title>{repo\|escape}: {file\|escape} diff</title>
				</head>
				<body>

				<div class="container">
				<div class="menu">
				<div class="logo">
				<a href="http://mercurial.selenic.com/">
				<img src="{staticurl}hglogo.png" alt="mercurial" /></a>
				</div>
				<ul>
				<li><a href="{url}shortlog/{node\|short}{sessionvars%urlparameter}">log</a></li>
				<li><a href="{url}graph/{node\|short}{sessionvars%urlparameter}">graph</a></li>
				<li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
				<li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
				</ul>
				<ul>
				<li><a href="{url}rev/{node\|short}{sessionvars%urlparameter}">changeset</a></li>
				<li><a href="{url}file/{node\|short}{path\|urlescape}{sessionvars%urlparameter}">browse</a></li>
				</ul>
				<ul>
				<li><a href="{url}file/{node\|short}/{file\|urlescape}{sessionvars%urlparameter}">file</a></li>
				<li><a href="{url}file/tip/{file\|urlescape}{sessionvars%urlparameter}">latest</a></li>
				<li class="active">diff</li>
				<li><a href="{url}annotate/{node\|short}/{file\|urlescape}{sessionvars%urlparameter}">annotate</a></li>
				<li><a href="{url}log/{node\|short}/{file\|urlescape}{sessionvars%urlparameter}">file log</a></li>
				<li><a href="{url}raw-file/{node\|short}/{file\|urlescape}">raw</a></li>
				</ul>
				</div>

				<div class="main">
				<h2><a href="{url}{sessionvars%urlparameter}">{repo\|escape}</a></h2>
				<h3>diff {file\|escape} @ {rev}:{node\|short}</h3>

				<form class="search" action="{url}log">
				<p>{sessionvars%hiddenformentry}</p>
				<p><input name="rev" id="search1" type="text" size="30" /></p>
				<div id="hint">find changesets by author, revision,
				files, or words in the commit message</div>
				</form>

				<div class="description">{desc\|strip\|escape\|addbreaks\|nonempty}</div>

				<table id="changesetEntry">
				<tr>
				<th>author</th>
				<td>{author\|obfuscate}</td>
				</tr>
				<tr>
				<th>date</th>
				<td>{date\|date} ({date\|age})</td>
				</tr>
				<tr>
				<th>parents</th>
				<td>{parent%filerevparent}</td>
				</tr>
				<tr>
				<th>children</th>
				<td>{child%filerevchild}</td>
				</tr>
				{changesettag}
				</table>

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

				{diff}
				</div>
				</div>
				</div>

				{footer}