view mercurial/templates/paper/search.tmpl @ 23420:902554884335 stable 3.2.2

merge: before cd/dc prompt, check that changed side really changed Before, merging would in some cases ask "wrong" questions about "changed/deleted" conflicts ... and even do it before the resolve phase where they can be postponed, re"resolved" or answered in bulk operations. Instead, check that the content of the changed file really did change. Reading and comparing file content is expensive and should be avoided before the resolve phase. Prompting the user is however even more expensive. Checking the content here is thus better. The 'f in ancestors[0]' should not be necessary but is included to be extra safe.
author Mads Kiilerich <madski@unity3d.com>
date Mon, 01 Dec 2014 02:30:21 +0100
parents c00b156d6e76
children fdf7794be41d
line wrap: on
line source

{header}
<title>{repo|escape}: searching for {query|escape}</title>
</head>
<body>

<div class="container">
<div class="menu">
<div class="logo">
<a href="{logourl}">
<img src="{staticurl|urlescape}{logoimg}" width=75 height=90 border=0 alt="mercurial"></a>
</div>
<ul>
<li><a href="{url|urlescape}shortlog{sessionvars%urlparameter}">log</a></li>
<li><a href="{url|urlescape}graph{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}help{sessionvars%urlparameter}">help</a></li>
</ul>
</div>

<div class="main">
<h2 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb}</h2>
<h3>searching for '{query|escape}'</h3>

<p>
Assuming {modedesc}.
{if(showforcekw, '<a href="{url|urlescape}log?rev={query|urlescape}&forcekw=1">
Use {showforcekw}</a> instead.')}
{if(showunforcekw, '<a href="{url|urlescape}log?rev={query|urlescape}">
Use {showunforcekw}</a> instead.')}
</p>

<form class="search" action="{url|urlescape}log">
{sessionvars%hiddenformentry}
<p><input name="rev" id="search1" type="text" size="30" value="{query|escape}"></p>
<div id="hint">{searchhint}</div>
</form>

<div class="navigate">
<a href="{url|urlescape}log{lessvars%urlparameter}">less</a>
<a href="{url|urlescape}log{morevars%urlparameter}">more</a>
</div>

<table class="bigtable">
 <tr>
  <th class="age">age</th>
  <th class="author">author</th>
  <th class="description">description</th>
 </tr>
<tbody class="stripes2">
{entries}
</tbody>
</table>

<div class="navigate">
<a href="{url|urlescape}log{lessvars%urlparameter}">less</a>
<a href="{url|urlescape}log{morevars%urlparameter}">more</a>
</div>

</div>
</div>

{footer}