[PATCH 1 of 3 highlight] test-highlight: add a file containing a formfeed
Augie Fackler
raf at durin42.com
Wed Dec 17 01:46:58 UTC 2014
# HG changeset patch
# User Augie Fackler <raf at durin42.com>
# Date 1418764775 18000
# Tue Dec 16 16:19:35 2014 -0500
# Node ID 4f724b91a9ddf395bd756988584f40af6de0cd88
# Parent ebfad9c3ad01862219a326a04a062ea2c25e26d3
test-highlight: add a file containing a formfeed
This will be used in a following patch, but is done as a standalone to
make the output changes more obvious.
diff --git a/tests/test-highlight.t b/tests/test-highlight.t
--- a/tests/test-highlight.t
+++ b/tests/test-highlight.t
@@ -45,8 +45,12 @@ create random Python file to exercise Py
> p = primes()
> print "The first %d primes: %s" % (n, list(islice(p, n)))
> EOF
+ >>> f = open('with-ff.py', 'w')
+ >>> f.write('x = 1\nx=2\x0cx="three"')
+ >>> f.close()
$ hg ci -Ama
adding primes.py
+ adding with-ff.py
hg serve
@@ -68,7 +72,7 @@ hgweb filerevision, html
<script type="text/javascript" src="/static/mercurial.js"></script>
<link rel="stylesheet" href="/highlightcss" type="text/css" />
- <title>test: 853dcd4de2a6 primes.py</title>
+ <title>test: 561b8b6483ac primes.py</title>
</head>
<body>
@@ -79,24 +83,24 @@ hgweb filerevision, html
<img src="/static/hglogo.png" alt="mercurial" /></a>
</div>
<ul>
- <li><a href="/shortlog/853dcd4de2a6">log</a></li>
- <li><a href="/graph/853dcd4de2a6">graph</a></li>
+ <li><a href="/shortlog/561b8b6483ac">log</a></li>
+ <li><a href="/graph/561b8b6483ac">graph</a></li>
<li><a href="/tags">tags</a></li>
<li><a href="/bookmarks">bookmarks</a></li>
<li><a href="/branches">branches</a></li>
</ul>
<ul>
- <li><a href="/rev/853dcd4de2a6">changeset</a></li>
- <li><a href="/file/853dcd4de2a6/">browse</a></li>
+ <li><a href="/rev/561b8b6483ac">changeset</a></li>
+ <li><a href="/file/561b8b6483ac/">browse</a></li>
</ul>
<ul>
<li class="active">file</li>
<li><a href="/file/tip/primes.py">latest</a></li>
- <li><a href="/diff/853dcd4de2a6/primes.py">diff</a></li>
- <li><a href="/comparison/853dcd4de2a6/primes.py">comparison</a></li>
- <li><a href="/annotate/853dcd4de2a6/primes.py">annotate</a></li>
- <li><a href="/log/853dcd4de2a6/primes.py">file log</a></li>
- <li><a href="/raw-file/853dcd4de2a6/primes.py">raw</a></li>
+ <li><a href="/diff/561b8b6483ac/primes.py">diff</a></li>
+ <li><a href="/comparison/561b8b6483ac/primes.py">comparison</a></li>
+ <li><a href="/annotate/561b8b6483ac/primes.py">annotate</a></li>
+ <li><a href="/log/561b8b6483ac/primes.py">file log</a></li>
+ <li><a href="/raw-file/561b8b6483ac/primes.py">raw</a></li>
</ul>
<ul>
<li><a href="/help">help</a></li>
@@ -105,7 +109,7 @@ hgweb filerevision, html
<div class="main">
<h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
- <h3>view primes.py @ 0:853dcd4de2a6</h3>
+ <h3>view primes.py @ 0:561b8b6483ac</h3>
<form class="search" action="/log">
@@ -182,7 +186,6 @@ hgweb filerevision, html
</body>
</html>
-
hgweb fileannotate, html
$ ("$TESTDIR/get-with-headers.py" localhost:$HGPORT 'annotate/tip/primes.py') \
@@ -209,25 +212,25 @@ hgweb fileannotate, html
<img src="/static/hglogo.png" alt="mercurial" /></a>
</div>
<ul>
- <li><a href="/shortlog/853dcd4de2a6">log</a></li>
- <li><a href="/graph/853dcd4de2a6">graph</a></li>
+ <li><a href="/shortlog/561b8b6483ac">log</a></li>
+ <li><a href="/graph/561b8b6483ac">graph</a></li>
<li><a href="/tags">tags</a></li>
<li><a href="/bookmarks">bookmarks</a></li>
<li><a href="/branches">branches</a></li>
</ul>
<ul>
- <li><a href="/rev/853dcd4de2a6">changeset</a></li>
- <li><a href="/file/853dcd4de2a6/">browse</a></li>
+ <li><a href="/rev/561b8b6483ac">changeset</a></li>
+ <li><a href="/file/561b8b6483ac/">browse</a></li>
</ul>
<ul>
- <li><a href="/file/853dcd4de2a6/primes.py">file</a></li>
+ <li><a href="/file/561b8b6483ac/primes.py">file</a></li>
<li><a href="/file/tip/primes.py">latest</a></li>
- <li><a href="/diff/853dcd4de2a6/primes.py">diff</a></li>
- <li><a href="/comparison/853dcd4de2a6/primes.py">comparison</a></li>
+ <li><a href="/diff/561b8b6483ac/primes.py">diff</a></li>
+ <li><a href="/comparison/561b8b6483ac/primes.py">comparison</a></li>
<li class="active">annotate</li>
- <li><a href="/log/853dcd4de2a6/primes.py">file log</a></li>
- <li><a href="/raw-annotate/853dcd4de2a6/primes.py">raw</a></li>
+ <li><a href="/log/561b8b6483ac/primes.py">file log</a></li>
+ <li><a href="/raw-annotate/561b8b6483ac/primes.py">raw</a></li>
</ul>
<ul>
<li><a href="/help">help</a></li>
@@ -236,7 +239,7 @@ hgweb fileannotate, html
<div class="main">
<h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
- <h3>annotate primes.py @ 0:853dcd4de2a6</h3>
+ <h3>annotate primes.py @ 0:561b8b6483ac</h3>
<form class="search" action="/log">
@@ -276,225 +279,225 @@ hgweb fileannotate, html
<tr id="l1">
<td class="annotate">
- <a href="/annotate/853dcd4de2a6/primes.py#l1"
- title="853dcd4de2a6: a">test at 0</a>
+ <a href="/annotate/561b8b6483ac/primes.py#l1"
+ title="561b8b6483ac: a">test at 0</a>
</td>
<td class="source"><a href="#l1"> 1</a> <span class="c">#!/usr/bin/env python</span></td>
</tr>
<tr id="l2">
<td class="annotate">
- <a href="/annotate/853dcd4de2a6/primes.py#l2"
- title="853dcd4de2a6: a">test at 0</a>
+ <a href="/annotate/561b8b6483ac/primes.py#l2"
+ title="561b8b6483ac: a">test at 0</a>
</td>
<td class="source"><a href="#l2"> 2</a> </td>
</tr>
<tr id="l3">
<td class="annotate">
- <a href="/annotate/853dcd4de2a6/primes.py#l3"
- title="853dcd4de2a6: a">test at 0</a>
+ <a href="/annotate/561b8b6483ac/primes.py#l3"
+ title="561b8b6483ac: a">test at 0</a>
</td>
<td class="source"><a href="#l3"> 3</a> <span class="sd">"""Fun with generators. Corresponding Haskell implementation:</span></td>
</tr>
<tr id="l4">
<td class="annotate">
- <a href="/annotate/853dcd4de2a6/primes.py#l4"
- title="853dcd4de2a6: a">test at 0</a>
+ <a href="/annotate/561b8b6483ac/primes.py#l4"
+ title="561b8b6483ac: a">test at 0</a>
</td>
<td class="source"><a href="#l4"> 4</a> </td>
</tr>
<tr id="l5">
<td class="annotate">
- <a href="/annotate/853dcd4de2a6/primes.py#l5"
- title="853dcd4de2a6: a">test at 0</a>
+ <a href="/annotate/561b8b6483ac/primes.py#l5"
+ title="561b8b6483ac: a">test at 0</a>
</td>
<td class="source"><a href="#l5"> 5</a> <span class="sd">primes = 2 : sieve [3, 5..]</span></td>
</tr>
<tr id="l6">
<td class="annotate">
- <a href="/annotate/853dcd4de2a6/primes.py#l6"
- title="853dcd4de2a6: a">test at 0</a>
+ <a href="/annotate/561b8b6483ac/primes.py#l6"
+ title="561b8b6483ac: a">test at 0</a>
</td>
<td class="source"><a href="#l6"> 6</a> <span class="sd"> where sieve (p:ns) = p : sieve [n | n <- ns, mod n p /= 0]</span></td>
</tr>
<tr id="l7">
<td class="annotate">
- <a href="/annotate/853dcd4de2a6/primes.py#l7"
- title="853dcd4de2a6: a">test at 0</a>
+ <a href="/annotate/561b8b6483ac/primes.py#l7"
+ title="561b8b6483ac: a">test at 0</a>
</td>
<td class="source"><a href="#l7"> 7</a> <span class="sd">"""</span></td>
</tr>
<tr id="l8">
<td class="annotate">
- <a href="/annotate/853dcd4de2a6/primes.py#l8"
- title="853dcd4de2a6: a">test at 0</a>
+ <a href="/annotate/561b8b6483ac/primes.py#l8"
+ title="561b8b6483ac: a">test at 0</a>
</td>
<td class="source"><a href="#l8"> 8</a> </td>
</tr>
<tr id="l9">
<td class="annotate">
- <a href="/annotate/853dcd4de2a6/primes.py#l9"
- title="853dcd4de2a6: a">test at 0</a>
+ <a href="/annotate/561b8b6483ac/primes.py#l9"
+ title="561b8b6483ac: a">test at 0</a>
</td>
<td class="source"><a href="#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 id="l10">
<td class="annotate">
- <a href="/annotate/853dcd4de2a6/primes.py#l10"
- title="853dcd4de2a6: a">test at 0</a>
+ <a href="/annotate/561b8b6483ac/primes.py#l10"
+ title="561b8b6483ac: a">test at 0</a>
</td>
<td class="source"><a href="#l10"> 10</a> </td>
</tr>
<tr id="l11">
<td class="annotate">
- <a href="/annotate/853dcd4de2a6/primes.py#l11"
- title="853dcd4de2a6: a">test at 0</a>
+ <a href="/annotate/561b8b6483ac/primes.py#l11"
+ title="561b8b6483ac: a">test at 0</a>
</td>
<td class="source"><a href="#l11"> 11</a> <span class="kn">def</span> <span class="nf">primes</span><span class="p">():</span></td>
</tr>
<tr id="l12">
<td class="annotate">
- <a href="/annotate/853dcd4de2a6/primes.py#l12"
- title="853dcd4de2a6: a">test at 0</a>
+ <a href="/annotate/561b8b6483ac/primes.py#l12"
+ title="561b8b6483ac: a">test at 0</a>
</td>
<td class="source"><a href="#l12"> 12</a> <span class="sd">"""Generate all primes."""</span></td>
</tr>
<tr id="l13">
<td class="annotate">
- <a href="/annotate/853dcd4de2a6/primes.py#l13"
- title="853dcd4de2a6: a">test at 0</a>
+ <a href="/annotate/561b8b6483ac/primes.py#l13"
+ title="561b8b6483ac: a">test at 0</a>
</td>
<td class="source"><a href="#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 id="l14">
<td class="annotate">
- <a href="/annotate/853dcd4de2a6/primes.py#l14"
- title="853dcd4de2a6: a">test at 0</a>
+ <a href="/annotate/561b8b6483ac/primes.py#l14"
+ title="561b8b6483ac: a">test at 0</a>
</td>
<td class="source"><a href="#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 id="l15">
<td class="annotate">
- <a href="/annotate/853dcd4de2a6/primes.py#l15"
- title="853dcd4de2a6: a">test at 0</a>
+ <a href="/annotate/561b8b6483ac/primes.py#l15"
+ title="561b8b6483ac: a">test at 0</a>
</td>
<td class="source"><a href="#l15"> 15</a> <span class="c"># It is important to yield *here* in order to stop the</span></td>
</tr>
<tr id="l16">
<td class="annotate">
- <a href="/annotate/853dcd4de2a6/primes.py#l16"
- title="853dcd4de2a6: a">test at 0</a>
+ <a href="/annotate/561b8b6483ac/primes.py#l16"
+ title="561b8b6483ac: a">test at 0</a>
</td>
<td class="source"><a href="#l16"> 16</a> <span class="c"># infinite recursion.</span></td>
</tr>
<tr id="l17">
<td class="annotate">
- <a href="/annotate/853dcd4de2a6/primes.py#l17"
- title="853dcd4de2a6: a">test at 0</a>
+ <a href="/annotate/561b8b6483ac/primes.py#l17"
+ title="561b8b6483ac: a">test at 0</a>
</td>
<td class="source"><a href="#l17"> 17</a> <span class="kn">yield</span> <span class="n">p</span></td>
</tr>
<tr id="l18">
<td class="annotate">
- <a href="/annotate/853dcd4de2a6/primes.py#l18"
- title="853dcd4de2a6: a">test at 0</a>
+ <a href="/annotate/561b8b6483ac/primes.py#l18"
+ title="561b8b6483ac: a">test at 0</a>
</td>
<td class="source"><a href="#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 id="l19">
<td class="annotate">
- <a href="/annotate/853dcd4de2a6/primes.py#l19"
- title="853dcd4de2a6: a">test at 0</a>
+ <a href="/annotate/561b8b6483ac/primes.py#l19"
+ title="561b8b6483ac: a">test at 0</a>
</td>
<td class="source"><a href="#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 id="l20">
<td class="annotate">
- <a href="/annotate/853dcd4de2a6/primes.py#l20"
- title="853dcd4de2a6: a">test at 0</a>
+ <a href="/annotate/561b8b6483ac/primes.py#l20"
+ title="561b8b6483ac: a">test at 0</a>
</td>
<td class="source"><a href="#l20"> 20</a> <span class="kn">yield</span> <span class="n">n</span></td>
</tr>
<tr id="l21">
<td class="annotate">
- <a href="/annotate/853dcd4de2a6/primes.py#l21"
- title="853dcd4de2a6: a">test at 0</a>
+ <a href="/annotate/561b8b6483ac/primes.py#l21"
+ title="561b8b6483ac: a">test at 0</a>
</td>
<td class="source"><a href="#l21"> 21</a> </td>
</tr>
<tr id="l22">
<td class="annotate">
- <a href="/annotate/853dcd4de2a6/primes.py#l22"
- title="853dcd4de2a6: a">test at 0</a>
+ <a href="/annotate/561b8b6483ac/primes.py#l22"
+ title="561b8b6483ac: a">test at 0</a>
</td>
<td class="source"><a href="#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 id="l23">
<td class="annotate">
- <a href="/annotate/853dcd4de2a6/primes.py#l23"
- title="853dcd4de2a6: a">test at 0</a>
+ <a href="/annotate/561b8b6483ac/primes.py#l23"
+ title="561b8b6483ac: a">test at 0</a>
</td>
<td class="source"><a href="#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"><</span> <span class="mf">3</span><span class="p">,</span> <span class="n">odds</span><span class="p">)))</span></td>
</tr>
<tr id="l24">
<td class="annotate">
- <a href="/annotate/853dcd4de2a6/primes.py#l24"
- title="853dcd4de2a6: a">test at 0</a>
+ <a href="/annotate/561b8b6483ac/primes.py#l24"
+ title="561b8b6483ac: a">test at 0</a>
</td>
<td class="source"><a href="#l24"> 24</a> </td>
</tr>
<tr id="l25">
<td class="annotate">
- <a href="/annotate/853dcd4de2a6/primes.py#l25"
- title="853dcd4de2a6: a">test at 0</a>
+ <a href="/annotate/561b8b6483ac/primes.py#l25"
+ title="561b8b6483ac: a">test at 0</a>
</td>
<td class="source"><a href="#l25"> 25</a> <span class="kn">if</span> <span class="n">__name__</span> <span class="o">==</span> <span class="s">"__main__"</span><span class="p">:</span></td>
</tr>
<tr id="l26">
<td class="annotate">
- <a href="/annotate/853dcd4de2a6/primes.py#l26"
- title="853dcd4de2a6: a">test at 0</a>
+ <a href="/annotate/561b8b6483ac/primes.py#l26"
+ title="561b8b6483ac: a">test at 0</a>
</td>
<td class="source"><a href="#l26"> 26</a> <span class="kn">import</span> <span class="nn">sys</span></td>
</tr>
<tr id="l27">
<td class="annotate">
- <a href="/annotate/853dcd4de2a6/primes.py#l27"
- title="853dcd4de2a6: a">test at 0</a>
+ <a href="/annotate/561b8b6483ac/primes.py#l27"
+ title="561b8b6483ac: a">test at 0</a>
</td>
<td class="source"><a href="#l27"> 27</a> <span class="kn">try</span><span class="p">:</span></td>
</tr>
<tr id="l28">
<td class="annotate">
- <a href="/annotate/853dcd4de2a6/primes.py#l28"
- title="853dcd4de2a6: a">test at 0</a>
+ <a href="/annotate/561b8b6483ac/primes.py#l28"
+ title="561b8b6483ac: a">test at 0</a>
</td>
<td class="source"><a href="#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 id="l29">
<td class="annotate">
- <a href="/annotate/853dcd4de2a6/primes.py#l29"
- title="853dcd4de2a6: a">test at 0</a>
+ <a href="/annotate/561b8b6483ac/primes.py#l29"
+ title="561b8b6483ac: a">test at 0</a>
</td>
<td class="source"><a href="#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 id="l30">
<td class="annotate">
- <a href="/annotate/853dcd4de2a6/primes.py#l30"
- title="853dcd4de2a6: a">test at 0</a>
+ <a href="/annotate/561b8b6483ac/primes.py#l30"
+ title="561b8b6483ac: a">test at 0</a>
</td>
<td class="source"><a href="#l30"> 30</a> <span class="n">n</span> <span class="o">=</span> <span class="mf">10</span></td>
</tr>
<tr id="l31">
<td class="annotate">
- <a href="/annotate/853dcd4de2a6/primes.py#l31"
- title="853dcd4de2a6: a">test at 0</a>
+ <a href="/annotate/561b8b6483ac/primes.py#l31"
+ title="561b8b6483ac: a">test at 0</a>
</td>
<td class="source"><a href="#l31"> 31</a> <span class="n">p</span> <span class="o">=</span> <span class="n">primes</span><span class="p">()</span></td>
</tr>
<tr id="l32">
<td class="annotate">
- <a href="/annotate/853dcd4de2a6/primes.py#l32"
- title="853dcd4de2a6: a">test at 0</a>
+ <a href="/annotate/561b8b6483ac/primes.py#l32"
+ title="561b8b6483ac: a">test at 0</a>
</td>
<td class="source"><a href="#l32"> 32</a> <span class="kn">print</span> <span class="s">"The first </span><span class="si">%d</span><span class="s"> primes: </span><span class="si">%s</span><span class="s">"</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>
</tr>
More information about the Mercurial-devel
mailing list