##// END OF EJS Templates
merge: don't auto-pick destination with `hg merge 'wdir()'`...
merge: don't auto-pick destination with `hg merge 'wdir()'` If the user doesn't specify a commit to merge with, we'll have `node==None` in `commands.merge()`. We'll then try to find a good commit to merge with. However, if the user, for some strange reason, runs `hg merge 'wdir()'`, we'll also have `node==None` and we'll do that same. That's clearly not the intent, so let's not do that. It turns out we'd instead crash on that command after this patch, so I added special handling of it too. Differential Revision: https://phab.mercurial-scm.org/D7996

File last commit:

r25794:90214844 default
r44638:1850066f default
Show More
shortlog.tmpl
44 lines | 1.5 KiB | application/x-cheetah | CheetahLexer
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 {header}
<title>{repo|escape}: shortlog</title>
<link rel="alternate" type="application/atom+xml"
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 href="{url|urlescape}atom-log" title="Atom feed for {repo|escape}">
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <link rel="alternate" type="application/rss+xml"
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 href="{url|urlescape}rss-log" title="RSS feed for {repo|escape}">
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </head>
<body>
<div class="buttons">
av6
hgweb: don't dereference symbolic revision in spartan style...
r25603 <a href="{url|urlescape}log/{symrev}{sessionvars%urlparameter}">changelog</a>
av6
spartan: don't drop current revision in log/graph links...
r25794 <a href="{url|urlescape}graph/{symrev}{sessionvars%urlparameter}">graph</a>
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a>
<a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a>
av6
hgweb: don't dereference symbolic revision in spartan style...
r25603 <a href="{url|urlescape}file/{symrev}/{sessionvars%urlparameter}">files</a>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 {archives%archiveentry}
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <a href="{url|urlescape}help{sessionvars%urlparameter}">help</a>
<a type="application/rss+xml" href="{url|urlescape}rss-log">rss</a>
<a type="application/rss+xml" href="{url|urlescape}atom-log" title="Atom feed for {repo|escape}">atom</a>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </div>
Angel Ezquerra <angel.ezquerra at gmail.com>
hgweb, spartan: add "URL breadcrumbs"...
r18259 <h2><a href="/">Mercurial</a> {pathdef%breadcrumb} / shortlog</h2>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <form action="{url|urlescape}log">
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 {sessionvars%hiddenformentry}
<p>
<label for="search1">search:</label>
<input name="rev" id="search1" type="text" size="30">
Nicolas Dumazet
hgweb: changenav: separate pages before and after the current position...
r10254 navigate: <small class="navigate">{changenav%navshort}</small>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </p>
</form>
{entries%shortlogentry}
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <form action="{url|urlescape}log">
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 {sessionvars%hiddenformentry}
<p>
<label for="search2">search:</label>
<input name="rev" id="search2" type="text" size="30">
Nicolas Dumazet
hgweb: changenav: separate pages before and after the current position...
r10254 navigate: <small class="navigate">{changenav%navshort}</small>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </p>
</form>
{footer}