Mercurial > hg
view mercurial/templates/monoblue/filecomparison.tmpl @ 30068:a76d5ba7ac43
pull: grab wlock during pull
because pull might move bookmarks and bookmark are protected by wlock, we have
to grab wlock for pull :-(
This required a small upgrade of the 'lockdelay' extension used by
'test-clone.t' because the delay must apply to a single lock only.
author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
---|---|
date | Tue, 23 Aug 2016 23:47:59 +0200 |
parents | 264e88901c44 |
children | 265196cd7d7f |
line wrap: on
line source
{header} <title>{repo|escape}: comparison {file|escape}</title> <link rel="alternate" type="application/atom+xml" href="{url|urlescape}atom-log" title="Atom feed for {repo|escape}"/> <link rel="alternate" type="application/rss+xml" href="{url|urlescape}rss-log" title="RSS feed for {repo|escape}"/> </head> <body> <div id="container"> <div class="page-header"> <h1 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb} / file comparison</h1> <form action="{url|urlescape}log"> {sessionvars%hiddenformentry} <dl class="search"> <dt><label>Search: </label></dt> <dd><input type="text" name="rev" /></dd> </dl> </form> <ul class="page-nav"> <li><a href="{url|urlescape}summary{sessionvars%urlparameter}">summary</a></li> <li><a href="{url|urlescape}shortlog{sessionvars%urlparameter}">shortlog</a></li> <li><a href="{url|urlescape}log{sessionvars%urlparameter}">changelog</a></li> <li><a href="{url|urlescape}graph/{symrev}{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> <li><a href="{url|urlescape}file/{symrev}{path|urlescape}{sessionvars%urlparameter}">files</a></li> <li><a href="{url|urlescape}help{sessionvars%urlparameter}">help</a></li> </ul> </div> <ul class="submenu"> <li><a href="{url|urlescape}file/{symrev}/{file|urlescape}{sessionvars%urlparameter}">file</a></li> <li><a href="{url|urlescape}file/tip/{file|urlescape}{sessionvars%urlparameter}">latest</a></li> <li><a href="{url|urlescape}log/{symrev}/{file|urlescape}{sessionvars%urlparameter}">revisions</a></li> <li><a href="{url|urlescape}annotate/{symrev}/{file|urlescape}{sessionvars%urlparameter}">annotate</a></li> <li><a href="{url|urlescape}diff/{symrev}/{file|urlescape}{sessionvars%urlparameter}">diff</a></li> <li class="current">comparison</li> <li><a href="{url|urlescape}raw-diff/{symrev}/{file|urlescape}">raw</a></li> </ul> <h2 class="no-link no-border">comparison: {file|escape}</h2> <h3 class="changeset">{file|escape}</h3> <dl class="overview"> {branch%filerevbranch} <dt>changeset {rev}</dt> <dd><a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></dd> {parent%filecompparent} {child%filecompchild} </dl> <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"> <table class="bigtable"> <thead class="header"> <tr> <th>{leftrev}:{leftnode|short}</th> <th>{rightrev}:{rightnode|short}</th> </tr> </thead> {comparison} </table> </div> {footer}