merge with stable

merge with stable

--- a/mercurial/templates/monoblue/map	Thu May 03 21:32:57 2012 -0400
+++ b/mercurial/templates/monoblue/map	Fri May 04 12:21:56 2012 +0200
@@ -82,7 +82,7 @@
 annotateline = '
   <tr class="parity{parity}">
     <td class="linenr">
-      <a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}#{targetline}"
+      <a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}#l{targetline}"
 	 title="{node|short}: {desc|escape|firstline}">{author|user}@{rev}</a>
     </td>
     <td class="lineno">

--- a/mercurial/templates/paper/map	Thu May 03 21:32:57 2012 -0400
+++ b/mercurial/templates/paper/map	Fri May 04 12:21:56 2012 +0200
@@ -70,7 +70,7 @@
 annotateline = '
   <tr class="parity{parity}">
     <td class="annotate">
-      <a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}#{targetline}"
+      <a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}#l{targetline}"
          title="{node|short}: {desc|escape|firstline}">{author|user}@{rev}</a>
     </td>
     <td class="source"><a href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}</td>

--- a/tests/test-highlight.t	Thu May 03 21:32:57 2012 -0400
+++ b/tests/test-highlight.t	Fri May 04 12:21:56 2012 +0200
@@ -273,224 +273,224 @@
   
   <tr class="parity0">
   <td class="annotate">
-  <a href="/annotate/853dcd4de2a6/primes.py#1"
+  <a href="/annotate/853dcd4de2a6/primes.py#l1"
   title="853dcd4de2a6: a">test@0</a>
   </td>
   <td class="source"><a href="#l1" id="l1">     1</a> <span class="c">#!/usr/bin/env python</span></td>
   </tr>
   <tr class="parity1">
   <td class="annotate">
-  <a href="/annotate/853dcd4de2a6/primes.py#2"
+  <a href="/annotate/853dcd4de2a6/primes.py#l2"
   title="853dcd4de2a6: a">test@0</a>
   </td>
   <td class="source"><a href="#l2" id="l2">     2</a> </td>
   </tr>
   <tr class="parity0">
   <td class="annotate">
-  <a href="/annotate/853dcd4de2a6/primes.py#3"
+  <a href="/annotate/853dcd4de2a6/primes.py#l3"
   title="853dcd4de2a6: a">test@0</a>
   </td>
   <td class="source"><a href="#l3" id="l3">     3</a> <span class="sd">&quot;&quot;&quot;Fun with generators. Corresponding Haskell implementation:</span></td>
   </tr>
   <tr class="parity1">
   <td class="annotate">
-  <a href="/annotate/853dcd4de2a6/primes.py#4"
+  <a href="/annotate/853dcd4de2a6/primes.py#l4"
   title="853dcd4de2a6: a">test@0</a>
   </td>
   <td class="source"><a href="#l4" id="l4">     4</a> </td>
   </tr>
   <tr class="parity0">
   <td class="annotate">
-  <a href="/annotate/853dcd4de2a6/primes.py#5"
+  <a href="/annotate/853dcd4de2a6/primes.py#l5"
   title="853dcd4de2a6: a">test@0</a>
   </td>
   <td class="source"><a href="#l5" id="l5">     5</a> <span class="sd">primes = 2 : sieve [3, 5..]</span></td>
   </tr>
   <tr class="parity1">
   <td class="annotate">
-  <a href="/annotate/853dcd4de2a6/primes.py#6"
+  <a href="/annotate/853dcd4de2a6/primes.py#l6"
   title="853dcd4de2a6: a">test@0</a>
   </td>
   <td class="source"><a href="#l6" id="l6">     6</a> <span class="sd">    where sieve (p:ns) = p : sieve [n | n &lt;- ns, mod n p /= 0]</span></td>
   </tr>
   <tr class="parity0">
   <td class="annotate">
-  <a href="/annotate/853dcd4de2a6/primes.py#7"
+  <a href="/annotate/853dcd4de2a6/primes.py#l7"
   title="853dcd4de2a6: a">test@0</a>
   </td>
   <td class="source"><a href="#l7" id="l7">     7</a> <span class="sd">&quot;&quot;&quot;</span></td>
   </tr>
   <tr class="parity1">
   <td class="annotate">
-  <a href="/annotate/853dcd4de2a6/primes.py#8"
+  <a href="/annotate/853dcd4de2a6/primes.py#l8"
   title="853dcd4de2a6: a">test@0</a>
   </td>
   <td class="source"><a href="#l8" id="l8">     8</a> </td>
   </tr>
   <tr class="parity0">
   <td class="annotate">
-  <a href="/annotate/853dcd4de2a6/primes.py#9"
+  <a href="/annotate/853dcd4de2a6/primes.py#l9"
   title="853dcd4de2a6: a">test@0</a>
   </td>
   <td class="source"><a href="#l9" id="l9">     9</a> <span class="kn">from</span> <span class="nn">itertools</span> <span class="kn">import</span> <span class="n">dropwhile</span><span class="p">,</span> <span class="n">ifilter</span><span class="p">,</span> <span class="n">islice</span><span class="p">,</span> <span class="n">count</span><span class="p">,</span> <span class="n">chain</span></td>
   </tr>
   <tr class="parity1">
   <td class="annotate">
-  <a href="/annotate/853dcd4de2a6/primes.py#10"
+  <a href="/annotate/853dcd4de2a6/primes.py#l10"
   title="853dcd4de2a6: a">test@0</a>
   </td>
   <td class="source"><a href="#l10" id="l10">    10</a> </td>
   </tr>
   <tr class="parity0">
   <td class="annotate">
-  <a href="/annotate/853dcd4de2a6/primes.py#11"
+  <a href="/annotate/853dcd4de2a6/primes.py#l11"
   title="853dcd4de2a6: a">test@0</a>
   </td>
   <td class="source"><a href="#l11" id="l11">    11</a> <span class="kn">def</span> <span class="nf">primes</span><span class="p">():</span></td>
   </tr>
   <tr class="parity1">
   <td class="annotate">
-  <a href="/annotate/853dcd4de2a6/primes.py#12"
+  <a href="/annotate/853dcd4de2a6/primes.py#l12"
   title="853dcd4de2a6: a">test@0</a>
   </td>
   <td class="source"><a href="#l12" id="l12">    12</a>     <span class="sd">&quot;&quot;&quot;Generate all primes.&quot;&quot;&quot;</span></td>
   </tr>
   <tr class="parity0">
   <td class="annotate">
-  <a href="/annotate/853dcd4de2a6/primes.py#13"
+  <a href="/annotate/853dcd4de2a6/primes.py#l13"
   title="853dcd4de2a6: a">test@0</a>
   </td>
   <td class="source"><a href="#l13" id="l13">    13</a>     <span class="kn">def</span> <span class="nf">sieve</span><span class="p">(</span><span class="n">ns</span><span class="p">):</span></td>
   </tr>
   <tr class="parity1">
   <td class="annotate">
-  <a href="/annotate/853dcd4de2a6/primes.py#14"
+  <a href="/annotate/853dcd4de2a6/primes.py#l14"
   title="853dcd4de2a6: a">test@0</a>
   </td>
   <td class="source"><a href="#l14" id="l14">    14</a>         <span class="n">p</span> <span class="o">=</span> <span class="n">ns</span><span class="o">.</span><span class="n">next</span><span class="p">()</span></td>
   </tr>
   <tr class="parity0">
   <td class="annotate">
-  <a href="/annotate/853dcd4de2a6/primes.py#15"
+  <a href="/annotate/853dcd4de2a6/primes.py#l15"
   title="853dcd4de2a6: a">test@0</a>
   </td>
   <td class="source"><a href="#l15" id="l15">    15</a>         <span class="c"># It is important to yield *here* in order to stop the</span></td>
   </tr>
   <tr class="parity1">
   <td class="annotate">
-  <a href="/annotate/853dcd4de2a6/primes.py#16"
+  <a href="/annotate/853dcd4de2a6/primes.py#l16"
   title="853dcd4de2a6: a">test@0</a>
   </td>
   <td class="source"><a href="#l16" id="l16">    16</a>         <span class="c"># infinite recursion.</span></td>
   </tr>
   <tr class="parity0">
   <td class="annotate">
-  <a href="/annotate/853dcd4de2a6/primes.py#17"
+  <a href="/annotate/853dcd4de2a6/primes.py#l17"
   title="853dcd4de2a6: a">test@0</a>
   </td>
   <td class="source"><a href="#l17" id="l17">    17</a>         <span class="kn">yield</span> <span class="n">p</span></td>
   </tr>
   <tr class="parity1">
   <td class="annotate">
-  <a href="/annotate/853dcd4de2a6/primes.py#18"
+  <a href="/annotate/853dcd4de2a6/primes.py#l18"
   title="853dcd4de2a6: a">test@0</a>
   </td>
   <td class="source"><a href="#l18" id="l18">    18</a>         <span class="n">ns</span> <span class="o">=</span> <span class="n">ifilter</span><span class="p">(</span><span class="kn">lambda</span> <span class="n">n</span><span class="p">:</span> <span class="n">n</span> <span class="o">%</span> <span class="n">p</span> <span class="o">!=</span> <span class="mf">0</span><span class="p">,</span> <span class="n">ns</span><span class="p">)</span></td>
   </tr>
   <tr class="parity0">
   <td class="annotate">
-  <a href="/annotate/853dcd4de2a6/primes.py#19"
+  <a href="/annotate/853dcd4de2a6/primes.py#l19"
   title="853dcd4de2a6: a">test@0</a>
   </td>
   <td class="source"><a href="#l19" id="l19">    19</a>         <span class="kn">for</span> <span class="n">n</span> <span class="ow">in</span> <span class="n">sieve</span><span class="p">(</span><span class="n">ns</span><span class="p">):</span></td>
   </tr>
   <tr class="parity1">
   <td class="annotate">
-  <a href="/annotate/853dcd4de2a6/primes.py#20"
+  <a href="/annotate/853dcd4de2a6/primes.py#l20"
   title="853dcd4de2a6: a">test@0</a>
   </td>
   <td class="source"><a href="#l20" id="l20">    20</a>             <span class="kn">yield</span> <span class="n">n</span></td>
   </tr>
   <tr class="parity0">
   <td class="annotate">
-  <a href="/annotate/853dcd4de2a6/primes.py#21"
+  <a href="/annotate/853dcd4de2a6/primes.py#l21"
   title="853dcd4de2a6: a">test@0</a>
   </td>
   <td class="source"><a href="#l21" id="l21">    21</a> </td>
   </tr>
   <tr class="parity1">
   <td class="annotate">
-  <a href="/annotate/853dcd4de2a6/primes.py#22"
+  <a href="/annotate/853dcd4de2a6/primes.py#l22"
   title="853dcd4de2a6: a">test@0</a>
   </td>
   <td class="source"><a href="#l22" id="l22">    22</a>     <span class="n">odds</span> <span class="o">=</span> <span class="n">ifilter</span><span class="p">(</span><span class="kn">lambda</span> <span class="n">i</span><span class="p">:</span> <span class="n">i</span> <span class="o">%</span> <span class="mf">2</span> <span class="o">==</span> <span class="mf">1</span><span class="p">,</span> <span class="n">count</span><span class="p">())</span></td>
   </tr>
   <tr class="parity0">
   <td class="annotate">
-  <a href="/annotate/853dcd4de2a6/primes.py#23"
+  <a href="/annotate/853dcd4de2a6/primes.py#l23"
   title="853dcd4de2a6: a">test@0</a>
   </td>
   <td class="source"><a href="#l23" id="l23">    23</a>     <span class="kn">return</span> <span class="n">chain</span><span class="p">([</span><span class="mf">2</span><span class="p">],</span> <span class="n">sieve</span><span class="p">(</span><span class="n">dropwhile</span><span class="p">(</span><span class="kn">lambda</span> <span class="n">n</span><span class="p">:</span> <span class="n">n</span> <span class="o">&lt;</span> <span class="mf">3</span><span class="p">,</span> <span class="n">odds</span><span class="p">)))</span></td>
   </tr>
   <tr class="parity1">
   <td class="annotate">
-  <a href="/annotate/853dcd4de2a6/primes.py#24"
+  <a href="/annotate/853dcd4de2a6/primes.py#l24"
   title="853dcd4de2a6: a">test@0</a>
   </td>
   <td class="source"><a href="#l24" id="l24">    24</a> </td>
   </tr>
   <tr class="parity0">
   <td class="annotate">
-  <a href="/annotate/853dcd4de2a6/primes.py#25"
+  <a href="/annotate/853dcd4de2a6/primes.py#l25"
   title="853dcd4de2a6: a">test@0</a>
   </td>
   <td class="source"><a href="#l25" id="l25">    25</a> <span class="kn">if</span> <span class="n">__name__</span> <span class="o">==</span> <span class="s">&quot;__main__&quot;</span><span class="p">:</span></td>
   </tr>
   <tr class="parity1">
   <td class="annotate">
-  <a href="/annotate/853dcd4de2a6/primes.py#26"
+  <a href="/annotate/853dcd4de2a6/primes.py#l26"
   title="853dcd4de2a6: a">test@0</a>
   </td>
   <td class="source"><a href="#l26" id="l26">    26</a>     <span class="kn">import</span> <span class="nn">sys</span></td>
   </tr>
   <tr class="parity0">
   <td class="annotate">
-  <a href="/annotate/853dcd4de2a6/primes.py#27"
+  <a href="/annotate/853dcd4de2a6/primes.py#l27"
   title="853dcd4de2a6: a">test@0</a>
   </td>
   <td class="source"><a href="#l27" id="l27">    27</a>     <span class="kn">try</span><span class="p">:</span></td>
   </tr>
   <tr class="parity1">
   <td class="annotate">
-  <a href="/annotate/853dcd4de2a6/primes.py#28"
+  <a href="/annotate/853dcd4de2a6/primes.py#l28"
   title="853dcd4de2a6: a">test@0</a>
   </td>
   <td class="source"><a href="#l28" id="l28">    28</a>         <span class="n">n</span> <span class="o">=</span> <span class="nb">int</span><span class="p">(</span><span class="n">sys</span><span class="o">.</span><span class="n">argv</span><span class="p">[</span><span class="mf">1</span><span class="p">])</span></td>
   </tr>
   <tr class="parity0">
   <td class="annotate">
-  <a href="/annotate/853dcd4de2a6/primes.py#29"
+  <a href="/annotate/853dcd4de2a6/primes.py#l29"
   title="853dcd4de2a6: a">test@0</a>
   </td>
   <td class="source"><a href="#l29" id="l29">    29</a>     <span class="kn">except</span> <span class="p">(</span><span class="ne">ValueError</span><span class="p">,</span> <span class="ne">IndexError</span><span class="p">):</span></td>
   </tr>
   <tr class="parity1">
   <td class="annotate">
-  <a href="/annotate/853dcd4de2a6/primes.py#30"
+  <a href="/annotate/853dcd4de2a6/primes.py#l30"
   title="853dcd4de2a6: a">test@0</a>
   </td>
   <td class="source"><a href="#l30" id="l30">    30</a>         <span class="n">n</span> <span class="o">=</span> <span class="mf">10</span></td>
   </tr>
   <tr class="parity0">
   <td class="annotate">
-  <a href="/annotate/853dcd4de2a6/primes.py#31"
+  <a href="/annotate/853dcd4de2a6/primes.py#l31"
   title="853dcd4de2a6: a">test@0</a>
   </td>
   <td class="source"><a href="#l31" id="l31">    31</a>     <span class="n">p</span> <span class="o">=</span> <span class="n">primes</span><span class="p">()</span></td>
   </tr>
   <tr class="parity1">
   <td class="annotate">
-  <a href="/annotate/853dcd4de2a6/primes.py#32"
+  <a href="/annotate/853dcd4de2a6/primes.py#l32"
   title="853dcd4de2a6: a">test@0</a>
   </td>
   <td class="source"><a href="#l32" id="l32">    32</a>     <span class="kn">print</span> <span class="s">&quot;The first </span><span class="si">%d</span><span class="s"> primes: </span><span class="si">%s</span><span class="s">&quot;</span> <span class="o">%</span> <span class="p">(</span><span class="n">n</span><span class="p">,</span> <span class="nb">list</span><span class="p">(</span><span class="n">islice</span><span class="p">(</span><span class="n">p</span><span class="p">,</span> <span class="n">n</span><span class="p">)))</span></td>