##// END OF EJS Templates
merge: make 'nothing to merge' aborts consistent...
merge: make 'nothing to merge' aborts consistent Makes the 'nothing to merge' abort messages in commands.py consistent with those in merge.py. Also makes commands.merge() and merge.update() use hints. The tests show the changes.

File last commit:

r13964:616ad3f6 default
r15619:6c8573dd default
Show More
summary.tmpl
66 lines | 2.3 KiB | application/x-cheetah | CheetahLexer
{header}
<title>{repo|escape}: Summary</title>
<link rel="alternate" type="application/atom+xml"
href="{url}atom-log" title="Atom feed for {repo|escape}"/>
<link rel="alternate" type="application/rss+xml"
href="{url}rss-log" title="RSS feed for {repo|escape}"/>
</head>
<body>
<div class="page_header">
<a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / summary
<form action="{url}log">
{sessionvars%hiddenformentry}
<div class="search">
<input type="text" name="rev" />
</div>
</form>
</div>
<div class="page_nav">
summary |
<a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a> |
<a href="{url}log{sessionvars%urlparameter}">changelog</a> |
<a href="{url}graph{sessionvars%urlparameter}">graph</a> |
<a href="{url}tags{sessionvars%urlparameter}">tags</a> |
<a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a> |
<a href="{url}branches{sessionvars%urlparameter}">branches</a> |
<a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>{archives%archiveentry} |
<a href="{url}help{sessionvars%urlparameter}">help</a>
<br/>
</div>
<div class="title">&nbsp;</div>
<table cellspacing="0">
<tr><td>description</td><td>{desc}</td></tr>
<tr><td>owner</td><td>{owner|obfuscate}</td></tr>
<tr><td>last change</td><td>{lastchange|rfc822date}</td></tr>
</table>
<div><a class="title" href="{url}shortlog{sessionvars%urlparameter}">changes</a></div>
<table cellspacing="0">
{shortlog}
<tr class="light"><td colspan="4"><a class="list" href="{url}shortlog{sessionvars%urlparameter}">...</a></td></tr>
</table>
<div><a class="title" href="{url}tags{sessionvars%urlparameter}">tags</a></div>
<table cellspacing="0">
{tags}
<tr class="light"><td colspan="3"><a class="list" href="{url}tags{sessionvars%urlparameter}">...</a></td></tr>
</table>
<div><a class="title" href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></div>
<table cellspacing="0">
{bookmarks%bookmarkentry}
<tr class="light"><td colspan="3"><a class="list" href="{url}bookmarks{sessionvars%urlparameter}">...</a></td></tr>
</table>
<div><a class="title" href="#">branches</a></div>
<table cellspacing="0">
{branches%branchentry}
<tr class="light">
<td colspan="4"><a class="list" href="#">...</a></td>
</tr>
</table>
{footer}