##// END OF EJS Templates
merge: skip syntactic path checks in [_checkunknownfile]...
merge: skip syntactic path checks in [_checkunknownfile] We don't need to check the paths syntactically, since they are coming from diffing the revisions, so hopefully already checked on the way in. We still need to check what's on the filesystem, to avoid traversing the symlinks or subdirs, which we can't know about statically. Also, we use the directory audit to elide [isfileorlink], this removing ~all lstat calls from hg updates from-empty.

File last commit:

r32759:265196cd default
r50804:b7cf91ef default
Show More
filecomparison.tmpl
67 lines | 3.0 KiB | application/x-cheetah | CheetahLexer
wujek srujek
hgweb: side-by-side comparison functionality...
r17202 {header}
<title>{repo|escape}: comparison {file|escape}</title>
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <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}"/>
wujek srujek
hgweb: side-by-side comparison functionality...
r17202 </head>
<body>
<div id="container">
<div class="page-header">
Angel Ezquerra <angel.ezquerra at gmail.com>
hgweb: add a "URL breadcrumb" to the index and repository pages...
r18258 <h1 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb} / file comparison</h1>
wujek srujek
hgweb: side-by-side comparison functionality...
r17202
Gregory Szorc
hgweb: consolidate search form for monoblue...
r32759 {searchform}
wujek srujek
hgweb: side-by-side comparison functionality...
r17202
<ul class="page-nav">
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <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>
av6
hgweb: don't dereference symbolic revision in monoblue style...
r25604 <li><a href="{url|urlescape}graph/{symrev}{sessionvars%urlparameter}">graph</a></li>
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <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>
av6
hgweb: don't dereference symbolic revision in monoblue style...
r25604 <li><a href="{url|urlescape}file/{symrev}{path|urlescape}{sessionvars%urlparameter}">files</a></li>
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>
wujek srujek
hgweb: side-by-side comparison functionality...
r17202 </ul>
</div>
<ul class="submenu">
av6
hgweb: don't dereference symbolic revision in monoblue style...
r25604 <li><a href="{url|urlescape}file/{symrev}/{file|urlescape}{sessionvars%urlparameter}">file</a></li>
av6
monoblue: add a link to the latest file revision...
r26598 <li><a href="{url|urlescape}file/tip/{file|urlescape}{sessionvars%urlparameter}">latest</a></li>
av6
hgweb: don't dereference symbolic revision in monoblue style...
r25604 <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>
wujek srujek
hgweb: side-by-side comparison functionality...
r17202 <li class="current">comparison</li>
av6
hgweb: don't dereference symbolic revision in monoblue style...
r25604 <li><a href="{url|urlescape}raw-diff/{symrev}/{file|urlescape}">raw</a></li>
wujek srujek
hgweb: side-by-side comparison functionality...
r17202 </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>
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <dd><a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></dd>
wujek srujek
hgweb: side-by-side comparison functionality...
r17202 {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">
wujek srujek
hgweb: fixes traceback for invalid files by removing top-level template...
r17302 <table class="bigtable">
<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>
{footer}