Show More
@@ -29,6 +29,9 b' def pygmentize(field, fctx, style, tmpl)' | |||||
29 | if util.binary(text): |
|
29 | if util.binary(text): | |
30 | return |
|
30 | return | |
31 |
|
31 | |||
|
32 | # avoid UnicodeDecodeError in pygments | |||
|
33 | text = util.tolocal(text) | |||
|
34 | ||||
32 | # To get multi-line strings right, we can't format line-by-line |
|
35 | # To get multi-line strings right, we can't format line-by-line | |
33 | try: |
|
36 | try: | |
34 | lexer = guess_lexer_for_filename(fctx.path(), text[:1024], |
|
37 | lexer = guess_lexer_for_filename(fctx.path(), text[:1024], |
@@ -12,6 +12,10 b' EOF' | |||||
12 | hg init test |
|
12 | hg init test | |
13 | cd test |
|
13 | cd test | |
14 | cp $TESTDIR/get-with-headers.py ./ |
|
14 | cp $TESTDIR/get-with-headers.py ./ | |
|
15 | ||||
|
16 | # check for UnicodeDecodeError with iso-8859-1 file contents | |||
|
17 | python -c 'fp = open("isolatin", "w"); fp.write("h\xFCbsch\n"); fp.close();' | |||
|
18 | ||||
15 | hg ci -Ama |
|
19 | hg ci -Ama | |
16 |
|
20 | |||
17 | echo % hg serve |
|
21 | echo % hg serve | |
@@ -22,6 +26,10 b' echo % hgweb filerevision, html' | |||||
22 | ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/get-with-headers.py') \ |
|
26 | ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/get-with-headers.py') \ | |
23 | | sed "s/[0-9]* years ago/long ago/g" | sed "s/class=\"k\"/class=\"kn\"/g" |
|
27 | | sed "s/[0-9]* years ago/long ago/g" | sed "s/class=\"k\"/class=\"kn\"/g" | |
24 |
|
28 | |||
|
29 | echo % hgweb filerevision, html | |||
|
30 | ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/isolatin') \ | |||
|
31 | | sed "s/[0-9]* years ago/long ago/g" | sed "s/class=\"k\"/class=\"kn\"/g" | |||
|
32 | ||||
25 | echo % hgweb fileannotate, html |
|
33 | echo % hgweb fileannotate, html | |
26 | ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/annotate/tip/get-with-headers.py') \ |
|
34 | ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/annotate/tip/get-with-headers.py') \ | |
27 | | sed "s/[0-9]* years ago/long ago/g" | sed "s/class=\"k\"/class=\"kn\"/g" |
|
35 | | sed "s/[0-9]* years ago/long ago/g" | sed "s/class=\"k\"/class=\"kn\"/g" |
@@ -1,4 +1,5 b'' | |||||
1 | adding get-with-headers.py |
|
1 | adding get-with-headers.py | |
|
2 | adding isolatin | |||
2 | % hg serve |
|
3 | % hg serve | |
3 | % hgweb filerevision, html |
|
4 | % hgweb filerevision, html | |
4 | 200 Script output follows |
|
5 | 200 Script output follows | |
@@ -20,11 +21,11 b' 200 Script output follows' | |||||
20 | <a href="/shortlog/0">shortlog</a> |
|
21 | <a href="/shortlog/0">shortlog</a> | |
21 | <a href="/graph">graph</a> |
|
22 | <a href="/graph">graph</a> | |
22 | <a href="/tags">tags</a> |
|
23 | <a href="/tags">tags</a> | |
23 |
<a href="/rev/ |
|
24 | <a href="/rev/7697c52ca9b0">changeset</a> | |
24 |
<a href="/file/ |
|
25 | <a href="/file/7697c52ca9b0/">files</a> | |
25 |
<a href="/log/ |
|
26 | <a href="/log/7697c52ca9b0/get-with-headers.py">revisions</a> | |
26 |
<a href="/annotate/ |
|
27 | <a href="/annotate/7697c52ca9b0/get-with-headers.py">annotate</a> | |
27 |
<a href="/raw-file/ |
|
28 | <a href="/raw-file/7697c52ca9b0/get-with-headers.py">raw</a> | |
28 | </div> |
|
29 | </div> | |
29 |
|
30 | |||
30 | <h2>get-with-headers.py</h2> |
|
31 | <h2>get-with-headers.py</h2> | |
@@ -32,7 +33,7 b' 200 Script output follows' | |||||
32 | <table> |
|
33 | <table> | |
33 | <tr> |
|
34 | <tr> | |
34 | <td class="metatag">changeset 0:</td> |
|
35 | <td class="metatag">changeset 0:</td> | |
35 |
<td><a href="/rev/ |
|
36 | <td><a href="/rev/7697c52ca9b0">7697c52ca9b0</a></td></tr> | |
36 |
|
37 | |||
37 |
|
38 | |||
38 | <tr> |
|
39 | <tr> | |
@@ -63,6 +64,69 b' 200 Script output follows' | |||||
63 | </body> |
|
64 | </body> | |
64 | </html> |
|
65 | </html> | |
65 |
|
66 | |||
|
67 | % hgweb filerevision, html | |||
|
68 | 200 Script output follows | |||
|
69 | ||||
|
70 | <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> | |||
|
71 | <html> | |||
|
72 | <head> | |||
|
73 | <link rel="icon" href="/static/hgicon.png" type="image/png"> | |||
|
74 | <meta name="robots" content="index, nofollow" /> | |||
|
75 | <link rel="stylesheet" href="/static/style.css" type="text/css" /> | |||
|
76 | ||||
|
77 | <link rel="stylesheet" href="/highlightcss" type="text/css" /> | |||
|
78 | <title>test:isolatin</title> | |||
|
79 | </head> | |||
|
80 | <body> | |||
|
81 | ||||
|
82 | <div class="buttons"> | |||
|
83 | <a href="/log/0">changelog</a> | |||
|
84 | <a href="/shortlog/0">shortlog</a> | |||
|
85 | <a href="/graph">graph</a> | |||
|
86 | <a href="/tags">tags</a> | |||
|
87 | <a href="/rev/7697c52ca9b0">changeset</a> | |||
|
88 | <a href="/file/7697c52ca9b0/">files</a> | |||
|
89 | <a href="/log/7697c52ca9b0/isolatin">revisions</a> | |||
|
90 | <a href="/annotate/7697c52ca9b0/isolatin">annotate</a> | |||
|
91 | <a href="/raw-file/7697c52ca9b0/isolatin">raw</a> | |||
|
92 | </div> | |||
|
93 | ||||
|
94 | <h2>isolatin</h2> | |||
|
95 | ||||
|
96 | <table> | |||
|
97 | <tr> | |||
|
98 | <td class="metatag">changeset 0:</td> | |||
|
99 | <td><a href="/rev/7697c52ca9b0">7697c52ca9b0</a></td></tr> | |||
|
100 | ||||
|
101 | ||||
|
102 | <tr> | |||
|
103 | <td class="metatag">author:</td> | |||
|
104 | <td>test</td></tr> | |||
|
105 | <tr> | |||
|
106 | <td class="metatag">date:</td> | |||
|
107 | <td>Thu Jan 01 00:00:00 1970 +0000 (long ago)</td></tr> | |||
|
108 | <tr> | |||
|
109 | <td class="metatag">permissions:</td> | |||
|
110 | <td>-rw-r--r--</td></tr> | |||
|
111 | <tr> | |||
|
112 | <td class="metatag">description:</td> | |||
|
113 | <td>a</td> | |||
|
114 | </tr> | |||
|
115 | </table> | |||
|
116 | ||||
|
117 | <pre> | |||
|
118 | <div class="parity0"><a class="lineno" href="#l1" id="l1"> 1</a>h?bsch</div> | |||
|
119 | </pre> | |||
|
120 | ||||
|
121 | ||||
|
122 | <div class="logo"> | |||
|
123 | <a href="http://www.selenic.com/mercurial/"> | |||
|
124 | <img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial"></a> | |||
|
125 | </div> | |||
|
126 | ||||
|
127 | </body> | |||
|
128 | </html> | |||
|
129 | ||||
66 | % hgweb fileannotate, html |
|
130 | % hgweb fileannotate, html | |
67 | 200 Script output follows |
|
131 | 200 Script output follows | |
68 |
|
132 | |||
@@ -83,11 +147,11 b' 200 Script output follows' | |||||
83 | <a href="/shortlog/0">shortlog</a> |
|
147 | <a href="/shortlog/0">shortlog</a> | |
84 | <a href="/graph">graph</a> |
|
148 | <a href="/graph">graph</a> | |
85 | <a href="/tags">tags</a> |
|
149 | <a href="/tags">tags</a> | |
86 |
<a href="/rev/ |
|
150 | <a href="/rev/7697c52ca9b0">changeset</a> | |
87 |
<a href="/file/ |
|
151 | <a href="/file/7697c52ca9b0/">files</a> | |
88 |
<a href="/file/ |
|
152 | <a href="/file/7697c52ca9b0/get-with-headers.py">file</a> | |
89 |
<a href="/log/ |
|
153 | <a href="/log/7697c52ca9b0/get-with-headers.py">revisions</a> | |
90 |
<a href="/raw-annotate/ |
|
154 | <a href="/raw-annotate/7697c52ca9b0/get-with-headers.py">raw</a> | |
91 | </div> |
|
155 | </div> | |
92 |
|
156 | |||
93 | <h2>Annotate get-with-headers.py</h2> |
|
157 | <h2>Annotate get-with-headers.py</h2> | |
@@ -95,7 +159,7 b' 200 Script output follows' | |||||
95 | <table> |
|
159 | <table> | |
96 | <tr> |
|
160 | <tr> | |
97 | <td class="metatag">changeset 0:</td> |
|
161 | <td class="metatag">changeset 0:</td> | |
98 |
<td><a href="/rev/ |
|
162 | <td><a href="/rev/7697c52ca9b0">7697c52ca9b0</a></td></tr> | |
99 |
|
163 | |||
100 |
|
164 | |||
101 | <tr> |
|
165 | <tr> | |
@@ -118,7 +182,7 b' 200 Script output follows' | |||||
118 | <br/> |
|
182 | <br/> | |
119 |
|
183 | |||
120 | <table cellspacing="0" cellpadding="0"> |
|
184 | <table cellspacing="0" cellpadding="0"> | |
121 |
<tr class="parity0"><td class="annotate"><a href="/annotate/ |
|
185 | <tr class="parity0"><td class="annotate"><a href="/annotate/7697c52ca9b0/get-with-headers.py#l1" title="7697c52ca9b0: a">test@0</a></td><td><a class="lineno" href="#l1" id="l1"> 1</a></td><td><pre><span class="c">#!/usr/bin/env python</span></pre></td></tr><tr class="parity1"><td class="annotate"><a href="/annotate/7697c52ca9b0/get-with-headers.py#l2" title="7697c52ca9b0: a">test@0</a></td><td><a class="lineno" href="#l2" id="l2"> 2</a></td><td><pre></pre></td></tr><tr class="parity0"><td class="annotate"><a href="/annotate/7697c52ca9b0/get-with-headers.py#l3" title="7697c52ca9b0: a">test@0</a></td><td><a class="lineno" href="#l3" id="l3"> 3</a></td><td><pre><span class="n">__doc__</span> <span class="o">=</span> <span class="s">"""This does HTTP get requests given a host:port and path and returns</span></pre></td></tr><tr class="parity1"><td class="annotate"><a href="/annotate/7697c52ca9b0/get-with-headers.py#l4" title="7697c52ca9b0: a">test@0</a></td><td><a class="lineno" href="#l4" id="l4"> 4</a></td><td><pre><span class="s">a subset of the headers plus the body of the result."""</span></pre></td></tr><tr class="parity0"><td class="annotate"><a href="/annotate/7697c52ca9b0/get-with-headers.py#l5" title="7697c52ca9b0: a">test@0</a></td><td><a class="lineno" href="#l5" id="l5"> 5</a></td><td><pre></pre></td></tr><tr class="parity1"><td class="annotate"><a href="/annotate/7697c52ca9b0/get-with-headers.py#l6" title="7697c52ca9b0: a">test@0</a></td><td><a class="lineno" href="#l6" id="l6"> 6</a></td><td><pre><span class="kn">import</span> <span class="nn">httplib</span><span class="o">,</span> <span class="nn">sys</span></pre></td></tr><tr class="parity0"><td class="annotate"><a href="/annotate/7697c52ca9b0/get-with-headers.py#l7" title="7697c52ca9b0: a">test@0</a></td><td><a class="lineno" href="#l7" id="l7"> 7</a></td><td><pre></pre></td></tr><tr class="parity1"><td class="annotate"><a href="/annotate/7697c52ca9b0/get-with-headers.py#l8" title="7697c52ca9b0: a">test@0</a></td><td><a class="lineno" href="#l8" id="l8"> 8</a></td><td><pre><span class="kn">try</span><span class="p">:</span></pre></td></tr><tr class="parity0"><td class="annotate"><a href="/annotate/7697c52ca9b0/get-with-headers.py#l9" title="7697c52ca9b0: a">test@0</a></td><td><a class="lineno" href="#l9" id="l9"> 9</a></td><td><pre> <span class="kn">import</span> <span class="nn">msvcrt</span><span class="o">,</span> <span class="nn">os</span></pre></td></tr><tr class="parity1"><td class="annotate"><a href="/annotate/7697c52ca9b0/get-with-headers.py#l10" title="7697c52ca9b0: a">test@0</a></td><td><a class="lineno" href="#l10" id="l10"> 10</a></td><td><pre> <span class="n">msvcrt</span><span class="o">.</span><span class="n">setmode</span><span class="p">(</span><span class="n">sys</span><span class="o">.</span><span class="n">stdout</span><span class="o">.</span><span class="n">fileno</span><span class="p">(),</span> <span class="n">os</span><span class="o">.</span><span class="n">O_BINARY</span><span class="p">)</span></pre></td></tr><tr class="parity0"><td class="annotate"><a href="/annotate/7697c52ca9b0/get-with-headers.py#l11" title="7697c52ca9b0: a">test@0</a></td><td><a class="lineno" href="#l11" id="l11"> 11</a></td><td><pre> <span class="n">msvcrt</span><span class="o">.</span><span class="n">setmode</span><span class="p">(</span><span class="n">sys</span><span class="o">.</span><span class="n">stderr</span><span class="o">.</span><span class="n">fileno</span><span class="p">(),</span> <span class="n">os</span><span class="o">.</span><span class="n">O_BINARY</span><span class="p">)</span></pre></td></tr><tr class="parity1"><td class="annotate"><a href="/annotate/7697c52ca9b0/get-with-headers.py#l12" title="7697c52ca9b0: a">test@0</a></td><td><a class="lineno" href="#l12" id="l12"> 12</a></td><td><pre><span class="kn">except</span> <span class="ne">ImportError</span><span class="p">:</span></pre></td></tr><tr class="parity0"><td class="annotate"><a href="/annotate/7697c52ca9b0/get-with-headers.py#l13" title="7697c52ca9b0: a">test@0</a></td><td><a class="lineno" href="#l13" id="l13"> 13</a></td><td><pre> <span class="kn">pass</span></pre></td></tr><tr class="parity1"><td class="annotate"><a href="/annotate/7697c52ca9b0/get-with-headers.py#l14" title="7697c52ca9b0: a">test@0</a></td><td><a class="lineno" href="#l14" id="l14"> 14</a></td><td><pre></pre></td></tr><tr class="parity0"><td class="annotate"><a href="/annotate/7697c52ca9b0/get-with-headers.py#l15" title="7697c52ca9b0: a">test@0</a></td><td><a class="lineno" href="#l15" id="l15"> 15</a></td><td><pre><span class="n">headers</span> <span class="o">=</span> <span class="p">[</span><span class="n">h</span><span class="o">.</span><span class="n">lower</span><span class="p">()</span> <span class="kn">for</span> <span class="n">h</span> <span class="ow">in</span> <span class="n">sys</span><span class="o">.</span><span class="n">argv</span><span class="p">[</span><span class="mf">3</span><span class="p">:]]</span></pre></td></tr><tr class="parity1"><td class="annotate"><a href="/annotate/7697c52ca9b0/get-with-headers.py#l16" title="7697c52ca9b0: a">test@0</a></td><td><a class="lineno" href="#l16" id="l16"> 16</a></td><td><pre><span class="n">conn</span> <span class="o">=</span> <span class="n">httplib</span><span class="o">.</span><span class="n">HTTPConnection</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></pre></td></tr><tr class="parity0"><td class="annotate"><a href="/annotate/7697c52ca9b0/get-with-headers.py#l17" title="7697c52ca9b0: a">test@0</a></td><td><a class="lineno" href="#l17" id="l17"> 17</a></td><td><pre><span class="n">conn</span><span class="o">.</span><span class="n">request</span><span class="p">(</span><span class="s">"GET"</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">2</span><span class="p">])</span></pre></td></tr><tr class="parity1"><td class="annotate"><a href="/annotate/7697c52ca9b0/get-with-headers.py#l18" title="7697c52ca9b0: a">test@0</a></td><td><a class="lineno" href="#l18" id="l18"> 18</a></td><td><pre><span class="n">response</span> <span class="o">=</span> <span class="n">conn</span><span class="o">.</span><span class="n">getresponse</span><span class="p">()</span></pre></td></tr><tr class="parity0"><td class="annotate"><a href="/annotate/7697c52ca9b0/get-with-headers.py#l19" title="7697c52ca9b0: a">test@0</a></td><td><a class="lineno" href="#l19" id="l19"> 19</a></td><td><pre><span class="kn">print</span> <span class="n">response</span><span class="o">.</span><span class="n">status</span><span class="p">,</span> <span class="n">response</span><span class="o">.</span><span class="n">reason</span></pre></td></tr><tr class="parity1"><td class="annotate"><a href="/annotate/7697c52ca9b0/get-with-headers.py#l20" title="7697c52ca9b0: a">test@0</a></td><td><a class="lineno" href="#l20" id="l20"> 20</a></td><td><pre><span class="kn">for</span> <span class="n">h</span> <span class="ow">in</span> <span class="n">headers</span><span class="p">:</span></pre></td></tr><tr class="parity0"><td class="annotate"><a href="/annotate/7697c52ca9b0/get-with-headers.py#l21" title="7697c52ca9b0: a">test@0</a></td><td><a class="lineno" href="#l21" id="l21"> 21</a></td><td><pre> <span class="kn">if</span> <span class="n">response</span><span class="o">.</span><span class="n">getheader</span><span class="p">(</span><span class="n">h</span><span class="p">,</span> <span class="bp">None</span><span class="p">)</span> <span class="ow">is</span> <span class="ow">not</span> <span class="bp">None</span><span class="p">:</span></pre></td></tr><tr class="parity1"><td class="annotate"><a href="/annotate/7697c52ca9b0/get-with-headers.py#l22" title="7697c52ca9b0: a">test@0</a></td><td><a class="lineno" href="#l22" id="l22"> 22</a></td><td><pre> <span class="kn">print</span> <span class="s">"</span><span class="si">%s</span><span class="s">: </span><span class="si">%s</span><span class="s">"</span> <span class="o">%</span> <span class="p">(</span><span class="n">h</span><span class="p">,</span> <span class="n">response</span><span class="o">.</span><span class="n">getheader</span><span class="p">(</span><span class="n">h</span><span class="p">))</span></pre></td></tr><tr class="parity0"><td class="annotate"><a href="/annotate/7697c52ca9b0/get-with-headers.py#l23" title="7697c52ca9b0: a">test@0</a></td><td><a class="lineno" href="#l23" id="l23"> 23</a></td><td><pre><span class="kn">print</span></pre></td></tr><tr class="parity1"><td class="annotate"><a href="/annotate/7697c52ca9b0/get-with-headers.py#l24" title="7697c52ca9b0: a">test@0</a></td><td><a class="lineno" href="#l24" id="l24"> 24</a></td><td><pre><span class="n">sys</span><span class="o">.</span><span class="n">stdout</span><span class="o">.</span><span class="n">write</span><span class="p">(</span><span class="n">response</span><span class="o">.</span><span class="n">read</span><span class="p">())</span></pre></td></tr><tr class="parity0"><td class="annotate"><a href="/annotate/7697c52ca9b0/get-with-headers.py#l25" title="7697c52ca9b0: a">test@0</a></td><td><a class="lineno" href="#l25" id="l25"> 25</a></td><td><pre></pre></td></tr><tr class="parity1"><td class="annotate"><a href="/annotate/7697c52ca9b0/get-with-headers.py#l26" title="7697c52ca9b0: a">test@0</a></td><td><a class="lineno" href="#l26" id="l26"> 26</a></td><td><pre><span class="kn">if</span> <span class="mf">200</span> <span class="o"><=</span> <span class="n">response</span><span class="o">.</span><span class="n">status</span> <span class="o"><=</span> <span class="mf">299</span><span class="p">:</span></pre></td></tr><tr class="parity0"><td class="annotate"><a href="/annotate/7697c52ca9b0/get-with-headers.py#l27" title="7697c52ca9b0: a">test@0</a></td><td><a class="lineno" href="#l27" id="l27"> 27</a></td><td><pre> <span class="n">sys</span><span class="o">.</span><span class="n">exit</span><span class="p">(</span><span class="mf">0</span><span class="p">)</span></pre></td></tr><tr class="parity1"><td class="annotate"><a href="/annotate/7697c52ca9b0/get-with-headers.py#l28" title="7697c52ca9b0: a">test@0</a></td><td><a class="lineno" href="#l28" id="l28"> 28</a></td><td><pre><span class="n">sys</span><span class="o">.</span><span class="n">exit</span><span class="p">(</span><span class="mf">1</span><span class="p">)</span></pre></td></tr> | |
122 | </table> |
|
186 | </table> | |
123 |
|
187 | |||
124 |
|
188 |
General Comments 0
You need to be logged in to leave comments.
Login now