Mercurial > hg
view mercurial/templates/monoblue/filecomparison.tmpl @ 34031:52bd006b4f49
filemerge: extract _maketemp and _makebackup
These functions will be modified by in-memory merge, so let's extract them first and add some comments.
This also shortens `_filemerge` a bit.
Differential Revision: https://phab.mercurial-scm.org/D388
author | Phil Cohen <phillco@fb.com> |
---|---|
date | Thu, 31 Aug 2017 11:05:19 -0700 |
parents | 265196cd7d7f |
children |
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> {searchform} <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}