##// END OF EJS Templates
import: wrap a transaction around the whole command...
import: wrap a transaction around the whole command Now 'rollback' after 'import' is less surprising: it rolls back all of the imported changesets, not just the last one. As an extra added benefit, you don't need 'rollback -f' after 'import --bypass', which was an undesired side effect of fixing issue2998 (59e8bc22506e).. Note that this is a different take on issue963, which complained that rollback after importing multiple patches returned the working dir parent to the starting point, not to the second-last patch applied. Since we now rollback the entire import, returning the working dir to the starting point is entirely logical. So this change also undoes a732eebf1958, the fix to issue963, and updates its tests accordingly. Bottom line: rollback after import was weird before issue963, understandable since the fix for issue963, and even better now.

File last commit:

r14913:44382887 default
r15198:62dc0e7a default
Show More
filelog.tmpl
73 lines | 2.5 KiB | application/x-cheetah | CheetahLexer
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 {header}
<title>{repo|escape}: {file|escape} history</title>
<link rel="alternate" type="application/atom+xml"
href="{url}atom-log/tip/{file|urlescape}" title="Atom feed for {repo|escape}:{file}" />
<link rel="alternate" type="application/rss+xml"
href="{url}rss-log/tip/{file|urlescape}" title="RSS feed for {repo|escape}:{file}" />
</head>
<body>
<div class="container">
<div class="menu">
<div class="logo">
Steven Stallion
hgweb: support alternate logo url...
r13964 <a href="{logourl}">
Angel Ezquerra
hgweb: add a "web/logoimg" setting to customize the web logo image...
r14913 <img src="{staticurl}{logoimg}" alt="mercurial" /></a>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </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>
Alexander Solovyov
hgweb: add separate page with bookmarks listing
r13597 <li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <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}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a></li>
<li><a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">annotate</a></li>
<li class="active">file log</li>
<li><a href="{url}raw-file/{node|short}/{file|urlescape}">raw</a></li>
</ul>
Augie Fackler
hgweb: add help link to templates missed in ead4e21f49f1
r12680 <ul>
<li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
</ul>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </div>
<div class="main">
<h2><a href="{url}{sessionvars%urlparameter}">{repo|escape}</a></h2>
<h3>log {file|escape}</h3>
<form class="search" action="{url}log">
{sessionvars%hiddenformentry}
<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>
Dirkjan Ochtman
hgweb: add less/more links to shortlog/filelog nav
r10246 <div class="navigate">
<a href="{url}log/{node|short}/{file|urlescape}{lessvars%urlparameter}">less</a>
<a href="{url}log/{node|short}/{file|urlescape}{morevars%urlparameter}">more</a>
Nicolas Dumazet
hgweb: changenav: separate pages before and after the current position...
r10254 | {nav%filenav}</div>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999
<table class="bigtable">
<tr>
<th class="age">age</th>
<th class="author">author</th>
<th class="description">description</th>
</tr>
{entries%filelogentry}
</table>
Dirkjan Ochtman
hgweb: add less/more links to shortlog/filelog nav
r10246 <div class="navigate">
<a href="{url}log/{node|short}/{file|urlescape}{lessvars%urlparameter}">less</a>
<a href="{url}log/{node|short}/{file|urlescape}{morevars%urlparameter}">more</a>
Nicolas Dumazet
hgweb: changenav: separate pages before and after the current position...
r10254 | {nav%filenav}
Dirkjan Ochtman
hgweb: add less/more links to shortlog/filelog nav
r10246 </div>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </div>
</div>
{footer}