tests/test-highlight.t

filemerge: add support for partial conflict resolution by external tool

A common class of merge conflicts is in imports/#includes/etc. It's
relatively easy to write a tool that can resolve these conflicts,
perhaps by naively just unioning the statements and leaving any
cleanup to other tools to do later [1]. Such specialized tools cannot
generally resolve all conflicts in a file, of course. Let's therefore
call them "partial merge tools". Note that the internal simplemerge
algorithm is such a partial merge tool - one that only resolves
trivial "conflicts" where one side is unchanged or both sides change
in the same way.

One can also imagine having smarter language-aware partial tools that
merge the AST. It may be useful for such tools to interactively let
the user resolve any conflicts it can't resolve itself. However,
having the option of implementing it as a partial merge tool means
that the developer doesn't *need* to create a UI for it. Instead, the
user can resolve any remaining conflicts with their regular merge tool
(e.g. `:merge3` or `meld).

We don't currently have a way to let the user define such partial
merge tools. That's what this patch addresses. It lets the user
configure partial merge tools to run. Each tool can be configured to
run only on files matching certain patterns (e.g. "*.py"). The tool
takes three inputs (local, base, other) and resolves conflicts by
updating these in place. For example, let's say the inputs are these:


base:
```
import sys

def main():
  print('Hello')
```

local:
```
import os
import sys

def main():
  print('Hi')
```

other:
```
import re
import sys

def main():
  print('Howdy')
```

A partial merge tool could now resolve the conflicting imports by
replacing the import statements in *all* files by the following
snippet, while leaving the remainder of the files unchanged.

```
import os
import re
import sys
```

As a result, simplemerge and any regular merge tool that runs after
the partial merge tool(s) will consider the imports to be
non-conflicting and will only present the conflict in `main()` to the
user.

Differential Revision: https://phab.mercurial-scm.org/D12356

#require pygments serve

  $ cat <<EOF >> $HGRCPATH
  > [extensions]
  > highlight =
  > [web]
  > pygments_style = friendly
  > highlightfiles = **.py and size('<100KB')
  > EOF
  $ hg init test
  $ cd test

  $ filterhtml () {
  >   sed -e "s/class=\"k\"/class=\"kn\"/g" \
  >       -e "s/class=\"mf\"/class=\"mi\"/g" \
  >       -e "s/class=\"vm\"/class=\"n\"/g" \
  >       -e "s/class=\"\([cs]\)[h12]\"/class=\"\1\"/g"
  > }

create random Python file to exercise Pygments

  $ cat <<NO_CHECK_EOF > primes.py
  > """Fun with generators. Corresponding Haskell implementation:
  > 
  > primes = 2 : sieve [3, 5..]
  >     where sieve (p:ns) = p : sieve [n | n <- ns, mod n p /= 0]
  > """
  > 
  > import itertools
  > 
  > def primes():
  >     """Generate all primes."""
  >     def sieve(ns):
  >         p = ns.next()
  >         # It is important to yield *here* in order to stop the
  >         # infinite recursion.
  >         yield p
  >         ns = itertools.ifilter(lambda n: n % p != 0, ns)
  >         for n in sieve(ns):
  >             yield n
  > 
  >     odds = itertools.ifilter(lambda i: i % 2 == 1, itertools.count())
  >     dropwhile = itertools.dropwhile
  >     return itertools.chain([2], sieve(dropwhile(lambda n: n < 3, odds)))
  > 
  > if __name__ == "__main__":
  >     import sys
  >     try:
  >         n = int(sys.argv[1])
  >     except (ValueError, IndexError):
  >         n = 10
  >     p = primes()
  >     print("The first %d primes: %s" % (n, list(itertools.islice(p, n))))
  > NO_CHECK_EOF
  $ echo >> primes.py  # to test html markup with an empty line just before EOF
  $ hg ci -Ama
  adding primes.py

hg serve

  $ hg serve -p $HGPORT -d -n test --pid-file=hg.pid -A access.log -E errors.log
  $ cat hg.pid >> $DAEMON_PIDS

hgweb filerevision, html

  $ (get-with-headers.py localhost:$HGPORT 'file/tip/primes.py') | filterhtml
  200 Script output follows
  
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
  <head>
  <link rel="icon" href="/static/hgicon.png" type="image/png" />
  <meta name="robots" content="index, nofollow" />
  <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
  <script type="text/javascript" src="/static/mercurial.js"></script>
  
  <link rel="stylesheet" href="/highlightcss" type="text/css" />
  <title>test: 687f2d169546 primes.py</title>
  </head>
  <body>
  
  <div class="container">
  <div class="menu">
  <div class="logo">
  <a href="https://mercurial-scm.org/">
  <img src="/static/hglogo.png" alt="mercurial" /></a>
  </div>
  <ul>
  <li><a href="/shortlog/tip">log</a></li>
  <li><a href="/graph/tip">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/tip">changeset</a></li>
  <li><a href="/file/tip/">browse</a></li>
  </ul>
  <ul>
  <li class="active">file</li>
  <li><a href="/file/tip/primes.py">latest</a></li>
  <li><a href="/diff/tip/primes.py">diff</a></li>
  <li><a href="/comparison/tip/primes.py">comparison</a></li>
  <li><a href="/annotate/tip/primes.py">annotate</a></li>
  <li><a href="/log/tip/primes.py">file log</a></li>
  <li><a href="/raw-file/tip/primes.py">raw</a></li>
  </ul>
  <ul>
  <li><a href="/help">help</a></li>
  </ul>
  </div>
  
  <div class="main">
  <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
  <h3>
   view primes.py @ 0:<a href="/rev/687f2d169546">687f2d169546</a>
   <span class="phase">draft</span> <span class="branchhead">default</span> <span class="tag">tip</span> 
  </h3>
  
  
  <form class="search" action="/log">
  
  <p><input name="rev" id="search1" type="text" size="30" value="" /></p>
  <div id="hint">Find changesets by keywords (author, files, the commit message), revision
  number or hash, or <a href="/help/revsets">revset expression</a>.</div>
  </form>
  
  <div class="description">a</div>
  
  <table id="changesetEntry">
  <tr>
   <th class="author">author</th>
   <td class="author">&#116;&#101;&#115;&#116;</td>
  </tr>
  <tr>
   <th class="date">date</th>
   <td class="date age">Thu, 01 Jan 1970 00:00:00 +0000</td>
  </tr>
  <tr>
   <th class="author">parents</th>
   <td class="author"></td>
  </tr>
  <tr>
   <th class="author">children</th>
   <td class="author"></td>
  </tr>
  </table>
  
  <div class="overflow">
  <div class="sourcefirst linewraptoggle">line wrap: <a class="linewraplink" href="#">on</a></div>
  <div class="sourcefirst"> line source</div>
  <pre class="sourcelines stripes4 wrap bottomline"
       data-logurl="/log/tip/primes.py"
       data-selectabletag="SPAN"
       data-ishead="1">
  
  <span id="l1"><span class="sd">&quot;&quot;&quot;Fun with generators. Corresponding Haskell implementation:</span></span><a href="#l1"></a>
  <span id="l2"></span><a href="#l2"></a>
  <span id="l3"><span class="sd">primes = 2 : sieve [3, 5..]</span></span><a href="#l3"></a>
  <span id="l4"><span class="sd">    where sieve (p:ns) = p : sieve [n | n &lt;- ns, mod n p /= 0]</span></span><a href="#l4"></a>
  <span id="l5"><span class="sd">&quot;&quot;&quot;</span></span><a href="#l5"></a>
  <span id="l6"></span><a href="#l6"></a>
  <span id="l7"><span class="kn">import</span> <span class="nn">itertools</span></span><a href="#l7"></a>
  <span id="l8"></span><a href="#l8"></a>
  <span id="l9"><span class="kn">def</span> <span class="nf">primes</span><span class="p">():</span></span><a href="#l9"></a>
  <span id="l10">    <span class="sd">&quot;&quot;&quot;Generate all primes.&quot;&quot;&quot;</span></span><a href="#l10"></a>
  <span id="l11">    <span class="kn">def</span> <span class="nf">sieve</span><span class="p">(</span><span class="n">ns</span><span class="p">):</span></span><a href="#l11"></a>
  <span id="l12">        <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></span><a href="#l12"></a>
  <span id="l13">        <span class="c"># It is important to yield *here* in order to stop the</span></span><a href="#l13"></a>
  <span id="l14">        <span class="c"># infinite recursion.</span></span><a href="#l14"></a>
  <span id="l15">        <span class="kn">yield</span> <span class="n">p</span></span><a href="#l15"></a>
  <span id="l16">        <span class="n">ns</span> <span class="o">=</span> <span class="n">itertools</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="mi">0</span><span class="p">,</span> <span class="n">ns</span><span class="p">)</span></span><a href="#l16"></a>
  <span id="l17">        <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></span><a href="#l17"></a>
  <span id="l18">            <span class="kn">yield</span> <span class="n">n</span></span><a href="#l18"></a>
  <span id="l19"></span><a href="#l19"></a>
  <span id="l20">    <span class="n">odds</span> <span class="o">=</span> <span class="n">itertools</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="mi">2</span> <span class="o">==</span> <span class="mi">1</span><span class="p">,</span> <span class="n">itertools</span><span class="o">.</span><span class="n">count</span><span class="p">())</span></span><a href="#l20"></a>
  <span id="l21">    <span class="n">dropwhile</span> <span class="o">=</span> <span class="n">itertools</span><span class="o">.</span><span class="n">dropwhile</span></span><a href="#l21"></a>
  <span id="l22">    <span class="kn">return</span> <span class="n">itertools</span><span class="o">.</span><span class="n">chain</span><span class="p">([</span><span class="mi">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="mi">3</span><span class="p">,</span> <span class="n">odds</span><span class="p">)))</span></span><a href="#l22"></a>
  <span id="l23"></span><a href="#l23"></a>
  <span id="l24"><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></span><a href="#l24"></a>
  <span id="l25">    <span class="kn">import</span> <span class="nn">sys</span></span><a href="#l25"></a>
  <span id="l26">    <span class="kn">try</span><span class="p">:</span></span><a href="#l26"></a>
  <span id="l27">        <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="mi">1</span><span class="p">])</span></span><a href="#l27"></a>
  <span id="l28">    <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></span><a href="#l28"></a>
  <span id="l29">        <span class="n">n</span> <span class="o">=</span> <span class="mi">10</span></span><a href="#l29"></a>
  <span id="l30">    <span class="n">p</span> <span class="o">=</span> <span class="n">primes</span><span class="p">()</span></span><a href="#l30"></a>
  <span id="l31">    <span class="nb">print</span><span class="p">(</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">itertools</span><span class="o">.</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></span><a href="#l31"></a> (pygments25 !)
  <span id="l31">    <span class="kn">print</span><span class="p">(</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">itertools</span><span class="o">.</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></span><a href="#l31"></a> (no-pygments25 !)
  <span id="l32"></span><a href="#l32"></a>
  </pre>
  </div>
  
  <script type="text/javascript" src="/static/followlines.js"></script>
  
  </div>
  </div>
  
  
  
  </body>
  </html>
  

hgweb fileannotate, html

  $ (get-with-headers.py localhost:$HGPORT 'annotate/tip/primes.py') | filterhtml
  200 Script output follows
  
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
  <head>
  <link rel="icon" href="/static/hgicon.png" type="image/png" />
  <meta name="robots" content="index, nofollow" />
  <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
  <script type="text/javascript" src="/static/mercurial.js"></script>
  
  <link rel="stylesheet" href="/highlightcss" type="text/css" />
  <title>test: primes.py annotate</title>
  </head>
  <body>
  
  <div class="container">
  <div class="menu">
  <div class="logo">
  <a href="https://mercurial-scm.org/">
  <img src="/static/hglogo.png" alt="mercurial" /></a>
  </div>
  <ul>
  <li><a href="/shortlog/tip">log</a></li>
  <li><a href="/graph/tip">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/tip">changeset</a></li>
  <li><a href="/file/tip/">browse</a></li>
  </ul>
  <ul>
  <li><a href="/file/tip/primes.py">file</a></li>
  <li><a href="/file/tip/primes.py">latest</a></li>
  <li><a href="/diff/tip/primes.py">diff</a></li>
  <li><a href="/comparison/tip/primes.py">comparison</a></li>
  <li class="active">annotate</li>
  <li><a href="/log/tip/primes.py">file log</a></li>
  <li><a href="/raw-file/tip/primes.py">raw</a></li>
  </ul>
  <ul>
  <li><a href="/help">help</a></li>
  </ul>
  </div>
  
  <div class="main">
  <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
  <h3>
   annotate primes.py @ 0:<a href="/rev/687f2d169546">687f2d169546</a>
   <span class="phase">draft</span> <span class="branchhead">default</span> <span class="tag">tip</span> 
  </h3>
  
  
  <form class="search" action="/log">
  
  <p><input name="rev" id="search1" type="text" size="30" value="" /></p>
  <div id="hint">Find changesets by keywords (author, files, the commit message), revision
  number or hash, or <a href="/help/revsets">revset expression</a>.</div>
  </form>
  
  <div class="description">a</div>
  
  <table id="changesetEntry">
  <tr>
   <th class="author">author</th>
   <td class="author">&#116;&#101;&#115;&#116;</td>
  </tr>
  <tr>
   <th class="date">date</th>
   <td class="date age">Thu, 01 Jan 1970 00:00:00 +0000</td>
  </tr>
  <tr>
   <th class="author">parents</th>
   <td class="author"></td>
  </tr>
  <tr>
   <th class="author">children</th>
   <td class="author"></td>
  </tr>
  </table>
  
  
  <form id="diffopts-form"
  data-ignorews="0"
  data-ignorewsamount="0"
  data-ignorewseol="0"
  data-ignoreblanklines="0">
  <span>Ignore whitespace changes - </span>
  <span>Everywhere:</span>
  <input id="ignorews-checkbox" type="checkbox" />
  <span>Within whitespace:</span>
  <input id="ignorewsamount-checkbox" type="checkbox" />
  <span>At end of lines:</span>
  <input id="ignorewseol-checkbox" type="checkbox" />
  </form>
  
  <script type="text/javascript">
      renderDiffOptsForm();
  </script>
  
  <div class="overflow">
  <table class="bigtable">
  <thead>
  <tr>
   <th class="annotate">rev</th>
   <th class="line">&nbsp;&nbsp;line source</th>
  </tr>
  </thead>
  <tbody class="stripes2 sourcelines"
         data-logurl="/log/tip/primes.py"
         data-selectabletag="TR"
         data-ishead="1">
    
  <tr id="l1" class="thisrev">
  <td class="annotate parity0">
  <a href="/annotate/687f2d169546/primes.py#l1">
  0
  </a>
  <div class="annotate-info">
  <div>
  <a href="/annotate/687f2d169546/primes.py#l1">
  687f2d169546</a>
  a
  </div>
  <div><em>&#116;&#101;&#115;&#116;</em></div>
  <div>parents: </div>
  <a href="/diff/687f2d169546/primes.py">diff</a>
  <a href="/rev/687f2d169546">changeset</a>
  </div>
  </td>
  <td class="source followlines-btn-parent"><a href="#l1">     1</a> <span class="sd">&quot;&quot;&quot;Fun with generators. Corresponding Haskell implementation:</span></td>
  </tr>
  <tr id="l2" class="thisrev">
  <td class="annotate parity0">
  
  <div class="annotate-info">
  <div>
  <a href="/annotate/687f2d169546/primes.py#l2">
  687f2d169546</a>
  a
  </div>
  <div><em>&#116;&#101;&#115;&#116;</em></div>
  <div>parents: </div>
  <a href="/diff/687f2d169546/primes.py">diff</a>
  <a href="/rev/687f2d169546">changeset</a>
  </div>
  </td>
  <td class="source followlines-btn-parent"><a href="#l2">     2</a> </td>
  </tr>
  <tr id="l3" class="thisrev">
  <td class="annotate parity0">
  
  <div class="annotate-info">
  <div>
  <a href="/annotate/687f2d169546/primes.py#l3">
  687f2d169546</a>
  a
  </div>
  <div><em>&#116;&#101;&#115;&#116;</em></div>
  <div>parents: </div>
  <a href="/diff/687f2d169546/primes.py">diff</a>
  <a href="/rev/687f2d169546">changeset</a>
  </div>
  </td>
  <td class="source followlines-btn-parent"><a href="#l3">     3</a> <span class="sd">primes = 2 : sieve [3, 5..]</span></td>
  </tr>
  <tr id="l4" class="thisrev">
  <td class="annotate parity0">
  
  <div class="annotate-info">
  <div>
  <a href="/annotate/687f2d169546/primes.py#l4">
  687f2d169546</a>
  a
  </div>
  <div><em>&#116;&#101;&#115;&#116;</em></div>
  <div>parents: </div>
  <a href="/diff/687f2d169546/primes.py">diff</a>
  <a href="/rev/687f2d169546">changeset</a>
  </div>
  </td>
  <td class="source followlines-btn-parent"><a href="#l4">     4</a> <span class="sd">    where sieve (p:ns) = p : sieve [n | n &lt;- ns, mod n p /= 0]</span></td>
  </tr>
  <tr id="l5" class="thisrev">
  <td class="annotate parity0">
  
  <div class="annotate-info">
  <div>
  <a href="/annotate/687f2d169546/primes.py#l5">
  687f2d169546</a>
  a
  </div>
  <div><em>&#116;&#101;&#115;&#116;</em></div>
  <div>parents: </div>
  <a href="/diff/687f2d169546/primes.py">diff</a>
  <a href="/rev/687f2d169546">changeset</a>
  </div>
  </td>
  <td class="source followlines-btn-parent"><a href="#l5">     5</a> <span class="sd">&quot;&quot;&quot;</span></td>
  </tr>
  <tr id="l6" class="thisrev">
  <td class="annotate parity0">
  
  <div class="annotate-info">
  <div>
  <a href="/annotate/687f2d169546/primes.py#l6">
  687f2d169546</a>
  a
  </div>
  <div><em>&#116;&#101;&#115;&#116;</em></div>
  <div>parents: </div>
  <a href="/diff/687f2d169546/primes.py">diff</a>
  <a href="/rev/687f2d169546">changeset</a>
  </div>
  </td>
  <td class="source followlines-btn-parent"><a href="#l6">     6</a> </td>
  </tr>
  <tr id="l7" class="thisrev">
  <td class="annotate parity0">
  
  <div class="annotate-info">
  <div>
  <a href="/annotate/687f2d169546/primes.py#l7">
  687f2d169546</a>
  a
  </div>
  <div><em>&#116;&#101;&#115;&#116;</em></div>
  <div>parents: </div>
  <a href="/diff/687f2d169546/primes.py">diff</a>
  <a href="/rev/687f2d169546">changeset</a>
  </div>
  </td>
  <td class="source followlines-btn-parent"><a href="#l7">     7</a> <span class="kn">import</span> <span class="nn">itertools</span></td>
  </tr>
  <tr id="l8" class="thisrev">
  <td class="annotate parity0">
  
  <div class="annotate-info">
  <div>
  <a href="/annotate/687f2d169546/primes.py#l8">
  687f2d169546</a>
  a
  </div>
  <div><em>&#116;&#101;&#115;&#116;</em></div>
  <div>parents: </div>
  <a href="/diff/687f2d169546/primes.py">diff</a>
  <a href="/rev/687f2d169546">changeset</a>
  </div>
  </td>
  <td class="source followlines-btn-parent"><a href="#l8">     8</a> </td>
  </tr>
  <tr id="l9" class="thisrev">
  <td class="annotate parity0">
  
  <div class="annotate-info">
  <div>
  <a href="/annotate/687f2d169546/primes.py#l9">
  687f2d169546</a>
  a
  </div>
  <div><em>&#116;&#101;&#115;&#116;</em></div>
  <div>parents: </div>
  <a href="/diff/687f2d169546/primes.py">diff</a>
  <a href="/rev/687f2d169546">changeset</a>
  </div>
  </td>
  <td class="source followlines-btn-parent"><a href="#l9">     9</a> <span class="kn">def</span> <span class="nf">primes</span><span class="p">():</span></td>
  </tr>
  <tr id="l10" class="thisrev">
  <td class="annotate parity0">
  
  <div class="annotate-info">
  <div>
  <a href="/annotate/687f2d169546/primes.py#l10">
  687f2d169546</a>
  a
  </div>
  <div><em>&#116;&#101;&#115;&#116;</em></div>
  <div>parents: </div>
  <a href="/diff/687f2d169546/primes.py">diff</a>
  <a href="/rev/687f2d169546">changeset</a>
  </div>
  </td>
  <td class="source followlines-btn-parent"><a href="#l10">    10</a>     <span class="sd">&quot;&quot;&quot;Generate all primes.&quot;&quot;&quot;</span></td>
  </tr>
  <tr id="l11" class="thisrev">
  <td class="annotate parity0">
  
  <div class="annotate-info">
  <div>
  <a href="/annotate/687f2d169546/primes.py#l11">
  687f2d169546</a>
  a
  </div>
  <div><em>&#116;&#101;&#115;&#116;</em></div>
  <div>parents: </div>
  <a href="/diff/687f2d169546/primes.py">diff</a>
  <a href="/rev/687f2d169546">changeset</a>
  </div>
  </td>
  <td class="source followlines-btn-parent"><a href="#l11">    11</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="l12" class="thisrev">
  <td class="annotate parity0">
  
  <div class="annotate-info">
  <div>
  <a href="/annotate/687f2d169546/primes.py#l12">
  687f2d169546</a>
  a
  </div>
  <div><em>&#116;&#101;&#115;&#116;</em></div>
  <div>parents: </div>
  <a href="/diff/687f2d169546/primes.py">diff</a>
  <a href="/rev/687f2d169546">changeset</a>
  </div>
  </td>
  <td class="source followlines-btn-parent"><a href="#l12">    12</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="l13" class="thisrev">
  <td class="annotate parity0">
  
  <div class="annotate-info">
  <div>
  <a href="/annotate/687f2d169546/primes.py#l13">
  687f2d169546</a>
  a
  </div>
  <div><em>&#116;&#101;&#115;&#116;</em></div>
  <div>parents: </div>
  <a href="/diff/687f2d169546/primes.py">diff</a>
  <a href="/rev/687f2d169546">changeset</a>
  </div>
  </td>
  <td class="source followlines-btn-parent"><a href="#l13">    13</a>         <span class="c"># It is important to yield *here* in order to stop the</span></td>
  </tr>
  <tr id="l14" class="thisrev">
  <td class="annotate parity0">
  
  <div class="annotate-info">
  <div>
  <a href="/annotate/687f2d169546/primes.py#l14">
  687f2d169546</a>
  a
  </div>
  <div><em>&#116;&#101;&#115;&#116;</em></div>
  <div>parents: </div>
  <a href="/diff/687f2d169546/primes.py">diff</a>
  <a href="/rev/687f2d169546">changeset</a>
  </div>
  </td>
  <td class="source followlines-btn-parent"><a href="#l14">    14</a>         <span class="c"># infinite recursion.</span></td>
  </tr>
  <tr id="l15" class="thisrev">
  <td class="annotate parity0">
  
  <div class="annotate-info">
  <div>
  <a href="/annotate/687f2d169546/primes.py#l15">
  687f2d169546</a>
  a
  </div>
  <div><em>&#116;&#101;&#115;&#116;</em></div>
  <div>parents: </div>
  <a href="/diff/687f2d169546/primes.py">diff</a>
  <a href="/rev/687f2d169546">changeset</a>
  </div>
  </td>
  <td class="source followlines-btn-parent"><a href="#l15">    15</a>         <span class="kn">yield</span> <span class="n">p</span></td>
  </tr>
  <tr id="l16" class="thisrev">
  <td class="annotate parity0">
  
  <div class="annotate-info">
  <div>
  <a href="/annotate/687f2d169546/primes.py#l16">
  687f2d169546</a>
  a
  </div>
  <div><em>&#116;&#101;&#115;&#116;</em></div>
  <div>parents: </div>
  <a href="/diff/687f2d169546/primes.py">diff</a>
  <a href="/rev/687f2d169546">changeset</a>
  </div>
  </td>
  <td class="source followlines-btn-parent"><a href="#l16">    16</a>         <span class="n">ns</span> <span class="o">=</span> <span class="n">itertools</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="mi">0</span><span class="p">,</span> <span class="n">ns</span><span class="p">)</span></td>
  </tr>
  <tr id="l17" class="thisrev">
  <td class="annotate parity0">
  
  <div class="annotate-info">
  <div>
  <a href="/annotate/687f2d169546/primes.py#l17">
  687f2d169546</a>
  a
  </div>
  <div><em>&#116;&#101;&#115;&#116;</em></div>
  <div>parents: </div>
  <a href="/diff/687f2d169546/primes.py">diff</a>
  <a href="/rev/687f2d169546">changeset</a>
  </div>
  </td>
  <td class="source followlines-btn-parent"><a href="#l17">    17</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="l18" class="thisrev">
  <td class="annotate parity0">
  
  <div class="annotate-info">
  <div>
  <a href="/annotate/687f2d169546/primes.py#l18">
  687f2d169546</a>
  a
  </div>
  <div><em>&#116;&#101;&#115;&#116;</em></div>
  <div>parents: </div>
  <a href="/diff/687f2d169546/primes.py">diff</a>
  <a href="/rev/687f2d169546">changeset</a>
  </div>
  </td>
  <td class="source followlines-btn-parent"><a href="#l18">    18</a>             <span class="kn">yield</span> <span class="n">n</span></td>
  </tr>
  <tr id="l19" class="thisrev">
  <td class="annotate parity0">
  
  <div class="annotate-info">
  <div>
  <a href="/annotate/687f2d169546/primes.py#l19">
  687f2d169546</a>
  a
  </div>
  <div><em>&#116;&#101;&#115;&#116;</em></div>
  <div>parents: </div>
  <a href="/diff/687f2d169546/primes.py">diff</a>
  <a href="/rev/687f2d169546">changeset</a>
  </div>
  </td>
  <td class="source followlines-btn-parent"><a href="#l19">    19</a> </td>
  </tr>
  <tr id="l20" class="thisrev">
  <td class="annotate parity0">
  
  <div class="annotate-info">
  <div>
  <a href="/annotate/687f2d169546/primes.py#l20">
  687f2d169546</a>
  a
  </div>
  <div><em>&#116;&#101;&#115;&#116;</em></div>
  <div>parents: </div>
  <a href="/diff/687f2d169546/primes.py">diff</a>
  <a href="/rev/687f2d169546">changeset</a>
  </div>
  </td>
  <td class="source followlines-btn-parent"><a href="#l20">    20</a>     <span class="n">odds</span> <span class="o">=</span> <span class="n">itertools</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="mi">2</span> <span class="o">==</span> <span class="mi">1</span><span class="p">,</span> <span class="n">itertools</span><span class="o">.</span><span class="n">count</span><span class="p">())</span></td>
  </tr>
  <tr id="l21" class="thisrev">
  <td class="annotate parity0">
  
  <div class="annotate-info">
  <div>
  <a href="/annotate/687f2d169546/primes.py#l21">
  687f2d169546</a>
  a
  </div>
  <div><em>&#116;&#101;&#115;&#116;</em></div>
  <div>parents: </div>
  <a href="/diff/687f2d169546/primes.py">diff</a>
  <a href="/rev/687f2d169546">changeset</a>
  </div>
  </td>
  <td class="source followlines-btn-parent"><a href="#l21">    21</a>     <span class="n">dropwhile</span> <span class="o">=</span> <span class="n">itertools</span><span class="o">.</span><span class="n">dropwhile</span></td>
  </tr>
  <tr id="l22" class="thisrev">
  <td class="annotate parity0">
  
  <div class="annotate-info">
  <div>
  <a href="/annotate/687f2d169546/primes.py#l22">
  687f2d169546</a>
  a
  </div>
  <div><em>&#116;&#101;&#115;&#116;</em></div>
  <div>parents: </div>
  <a href="/diff/687f2d169546/primes.py">diff</a>
  <a href="/rev/687f2d169546">changeset</a>
  </div>
  </td>
  <td class="source followlines-btn-parent"><a href="#l22">    22</a>     <span class="kn">return</span> <span class="n">itertools</span><span class="o">.</span><span class="n">chain</span><span class="p">([</span><span class="mi">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="mi">3</span><span class="p">,</span> <span class="n">odds</span><span class="p">)))</span></td>
  </tr>
  <tr id="l23" class="thisrev">
  <td class="annotate parity0">
  
  <div class="annotate-info">
  <div>
  <a href="/annotate/687f2d169546/primes.py#l23">
  687f2d169546</a>
  a
  </div>
  <div><em>&#116;&#101;&#115;&#116;</em></div>
  <div>parents: </div>
  <a href="/diff/687f2d169546/primes.py">diff</a>
  <a href="/rev/687f2d169546">changeset</a>
  </div>
  </td>
  <td class="source followlines-btn-parent"><a href="#l23">    23</a> </td>
  </tr>
  <tr id="l24" class="thisrev">
  <td class="annotate parity0">
  
  <div class="annotate-info">
  <div>
  <a href="/annotate/687f2d169546/primes.py#l24">
  687f2d169546</a>
  a
  </div>
  <div><em>&#116;&#101;&#115;&#116;</em></div>
  <div>parents: </div>
  <a href="/diff/687f2d169546/primes.py">diff</a>
  <a href="/rev/687f2d169546">changeset</a>
  </div>
  </td>
  <td class="source followlines-btn-parent"><a href="#l24">    24</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 id="l25" class="thisrev">
  <td class="annotate parity0">
  
  <div class="annotate-info">
  <div>
  <a href="/annotate/687f2d169546/primes.py#l25">
  687f2d169546</a>
  a
  </div>
  <div><em>&#116;&#101;&#115;&#116;</em></div>
  <div>parents: </div>
  <a href="/diff/687f2d169546/primes.py">diff</a>
  <a href="/rev/687f2d169546">changeset</a>
  </div>
  </td>
  <td class="source followlines-btn-parent"><a href="#l25">    25</a>     <span class="kn">import</span> <span class="nn">sys</span></td>
  </tr>
  <tr id="l26" class="thisrev">
  <td class="annotate parity0">
  
  <div class="annotate-info">
  <div>
  <a href="/annotate/687f2d169546/primes.py#l26">
  687f2d169546</a>
  a
  </div>
  <div><em>&#116;&#101;&#115;&#116;</em></div>
  <div>parents: </div>
  <a href="/diff/687f2d169546/primes.py">diff</a>
  <a href="/rev/687f2d169546">changeset</a>
  </div>
  </td>
  <td class="source followlines-btn-parent"><a href="#l26">    26</a>     <span class="kn">try</span><span class="p">:</span></td>
  </tr>
  <tr id="l27" class="thisrev">
  <td class="annotate parity0">
  
  <div class="annotate-info">
  <div>
  <a href="/annotate/687f2d169546/primes.py#l27">
  687f2d169546</a>
  a
  </div>
  <div><em>&#116;&#101;&#115;&#116;</em></div>
  <div>parents: </div>
  <a href="/diff/687f2d169546/primes.py">diff</a>
  <a href="/rev/687f2d169546">changeset</a>
  </div>
  </td>
  <td class="source followlines-btn-parent"><a href="#l27">    27</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="mi">1</span><span class="p">])</span></td>
  </tr>
  <tr id="l28" class="thisrev">
  <td class="annotate parity0">
  
  <div class="annotate-info">
  <div>
  <a href="/annotate/687f2d169546/primes.py#l28">
  687f2d169546</a>
  a
  </div>
  <div><em>&#116;&#101;&#115;&#116;</em></div>
  <div>parents: </div>
  <a href="/diff/687f2d169546/primes.py">diff</a>
  <a href="/rev/687f2d169546">changeset</a>
  </div>
  </td>
  <td class="source followlines-btn-parent"><a href="#l28">    28</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="l29" class="thisrev">
  <td class="annotate parity0">
  
  <div class="annotate-info">
  <div>
  <a href="/annotate/687f2d169546/primes.py#l29">
  687f2d169546</a>
  a
  </div>
  <div><em>&#116;&#101;&#115;&#116;</em></div>
  <div>parents: </div>
  <a href="/diff/687f2d169546/primes.py">diff</a>
  <a href="/rev/687f2d169546">changeset</a>
  </div>
  </td>
  <td class="source followlines-btn-parent"><a href="#l29">    29</a>         <span class="n">n</span> <span class="o">=</span> <span class="mi">10</span></td>
  </tr>
  <tr id="l30" class="thisrev">
  <td class="annotate parity0">
  
  <div class="annotate-info">
  <div>
  <a href="/annotate/687f2d169546/primes.py#l30">
  687f2d169546</a>
  a
  </div>
  <div><em>&#116;&#101;&#115;&#116;</em></div>
  <div>parents: </div>
  <a href="/diff/687f2d169546/primes.py">diff</a>
  <a href="/rev/687f2d169546">changeset</a>
  </div>
  </td>
  <td class="source followlines-btn-parent"><a href="#l30">    30</a>     <span class="n">p</span> <span class="o">=</span> <span class="n">primes</span><span class="p">()</span></td>
  </tr>
  <tr id="l31" class="thisrev">
  <td class="annotate parity0">
  
  <div class="annotate-info">
  <div>
  <a href="/annotate/687f2d169546/primes.py#l31">
  687f2d169546</a>
  a
  </div>
  <div><em>&#116;&#101;&#115;&#116;</em></div>
  <div>parents: </div>
  <a href="/diff/687f2d169546/primes.py">diff</a>
  <a href="/rev/687f2d169546">changeset</a>
  </div>
  </td>
  <td class="source followlines-btn-parent"><a href="#l31">    31</a>     <span class="nb">print</span><span class="p">(</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">itertools</span><span class="o">.</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> (pygments25 !)
  <td class="source followlines-btn-parent"><a href="#l31">    31</a>     <span class="kn">print</span><span class="p">(</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">itertools</span><span class="o">.</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> (no-pygments25 !)
  </tr>
  <tr id="l32" class="thisrev">
  <td class="annotate parity0">
  
  <div class="annotate-info">
  <div>
  <a href="/annotate/687f2d169546/primes.py#l32">
  687f2d169546</a>
  a
  </div>
  <div><em>&#116;&#101;&#115;&#116;</em></div>
  <div>parents: </div>
  <a href="/diff/687f2d169546/primes.py">diff</a>
  <a href="/rev/687f2d169546">changeset</a>
  </div>
  </td>
  <td class="source followlines-btn-parent"><a href="#l32">    32</a> </td>
  </tr>
  </tbody>
  </table>
  </div>
  </div>
  </div>
  
  <script type="text/javascript" src="/static/followlines.js"></script>
  
  
  
  </body>
  </html>
  

hgweb fileannotate, raw

  $ (get-with-headers.py localhost:$HGPORT 'annotate/tip/primes.py?style=raw') \
  >     | sed "s/test@//" > a
  $ echo "200 Script output follows" > b
  $ echo "" >> b
  $ echo "" >> b
  $ hg annotate "primes.py" >> b
  $ echo "" >> b
  $ echo "" >> b
  $ echo "" >> b
  $ echo "" >> b
  $ cmp b a || diff -u b a

hgweb filerevision, raw

  $ (get-with-headers.py localhost:$HGPORT 'file/tip/primes.py?style=raw') \
  >     > a
  $ echo "200 Script output follows" > b
  $ echo "" >> b
  $ hg cat primes.py >> b
  $ cmp b a || diff -u b a

hgweb highlightcss friendly

  $ get-with-headers.py localhost:$HGPORT 'highlightcss' > out
  $ head -n 4 out
  200 Script output follows
  
  /* pygments_style = friendly */
  
  $ rm out

errors encountered

  $ cat errors.log
  $ killdaemons.py

Change the pygments style

  $ cat > .hg/hgrc <<EOF
  > [web]
  > pygments_style = fruity
  > EOF

hg serve again

  $ hg serve -p $HGPORT -d -n test --pid-file=hg.pid -A access.log -E errors.log
  $ cat hg.pid >> $DAEMON_PIDS

hgweb highlightcss fruity

  $ get-with-headers.py localhost:$HGPORT 'highlightcss' > out
  $ head -n 4 out
  200 Script output follows
  
  /* pygments_style = fruity */
  
  $ rm out

errors encountered

  $ cat errors.log
  $ killdaemons.py

only highlight C source files

  $ cat > .hg/hgrc <<EOF
  > [web]
  > highlightfiles = **.c
  > EOF

hg serve again

  $ hg serve -p $HGPORT -d -n test --pid-file=hg.pid -A access.log -E errors.log
  $ cat hg.pid >> $DAEMON_PIDS

test that fileset in highlightfiles works and primes.py is not highlighted

  $ get-with-headers.py localhost:$HGPORT 'file/tip/primes.py' | grep 'id="l11"'
  <span id="l11">    def sieve(ns):</span><a href="#l11"></a>

errors encountered

  $ cat errors.log
  $ cd ..
  $ hg init eucjp
  $ cd eucjp
  >>> with open('eucjp.txt', 'wb') as fh:
  ...     # Japanese kanji "Kyo"
  ...     fh.write(u'\265\376'.encode('utf-8')) and None
  $ hg ci -Ama
  adding eucjp.txt
  $ hgserveget () {
  >     killdaemons.py
  >     echo % HGENCODING="$1" hg serve
  >     HGENCODING="$1" hg serve -p $HGPORT -d -n test --pid-file=hg.pid -E errors.log
  >     cat hg.pid >> $DAEMON_PIDS
  > 
  >     echo % hgweb filerevision, html
  >     get-with-headers.py localhost:$HGPORT "file/tip/$2" \
  >         | grep '<div class="parity0 source">'
  >     echo % errors encountered
  >     cat errors.log
  > }
  $ hgserveget euc-jp eucjp.txt
  % HGENCODING=euc-jp hg serve
  % hgweb filerevision, html
  % errors encountered
  $ hgserveget utf-8 eucjp.txt
  % HGENCODING=utf-8 hg serve
  % hgweb filerevision, html
  % errors encountered
  $ hgserveget us-ascii eucjp.txt
  % HGENCODING=us-ascii hg serve
  % hgweb filerevision, html
  % errors encountered

We attempt to highlight unknown files by default

  $ killdaemons.py

  $ cat > .hg/hgrc << EOF
  > [web]
  > highlightfiles = **
  > EOF

  $ cat > unknownfile << EOF
  > #!$PYTHON
  > def foo():
  >    pass
  > EOF

  $ hg add unknownfile
  $ hg commit -m unknown unknownfile

  $ hg serve -p $HGPORT -d -n test --pid-file=hg.pid
  $ cat hg.pid >> $DAEMON_PIDS

  $ get-with-headers.py localhost:$HGPORT 'file/tip/unknownfile' | grep l2
  <span id="l2"><span class="k">def</span> <span class="nf">foo</span><span class="p">():</span></span><a href="#l2"></a>

We can prevent Pygments from falling back to a non filename-based
detection mode

  $ cat > .hg/hgrc << EOF
  > [web]
  > highlightfiles = **
  > highlightonlymatchfilename = true
  > EOF

  $ killdaemons.py
  $ hg serve -p $HGPORT -d -n test --pid-file=hg.pid
  $ cat hg.pid >> $DAEMON_PIDS
  $ get-with-headers.py localhost:$HGPORT 'file/tip/unknownfile' | grep l2
  <span id="l2">def foo():</span><a href="#l2"></a>

  $ cd ..