[PATCH] hgweb: render tabs to 8 spaces (v2)

Rocco Rutte pdmef at gmx.net
Thu May 14 09:41:35 CDT 2009


Hi,

* Rocco Rutte wrote:
> Attached is another rebased to latest crew (plus documentation).

Sorry for the noise, I (again) forgot to update test output so here we go.

Rocco

diff --git a/mercurial/help.py b/mercurial/help.py
--- a/mercurial/help.py
+++ b/mercurial/help.py
@@ -334,6 +334,7 @@ PYTHONPATH::
           'user at example.com'.
     - escape: Any text. Replaces the special XML/XHTML characters "&",
           "<" and ">" with XML entities.
+    - expandtab: Any text. Replaces hard tab with 8 spaces.
     - fill68: Any text. Wraps the text to fit in 68 columns.
     - fill76: Any text. Wraps the text to fit in 76 columns.
     - firstline: Any text. Returns the first line of text.
diff --git a/mercurial/templatefilters.py b/mercurial/templatefilters.py
--- a/mercurial/templatefilters.py
+++ b/mercurial/templatefilters.py
@@ -174,6 +174,9 @@ def stripdir(text):
 def nonempty(str):
   return str or "(none)"
 
+def expandtab(str):
+  return str.replace('\t',' ' * 8)
+
 filters = {
     "addbreaks": nl2br,
     "basename": os.path.basename,
@@ -183,6 +186,7 @@ filters = {
     "domain": domain,
     "email": util.email,
     "escape": lambda x: cgi.escape(x, True),
+    "expandtab": expandtab,
     "fill68": lambda x: fill(x, width=68),
     "fill76": lambda x: fill(x, width=76),
     "firstline": firstline,
diff --git a/templates/coal/map b/templates/coal/map
--- a/templates/coal/map
+++ b/templates/coal/map
@@ -52,7 +52,7 @@ filerevision = ../paper/filerevision.tmp
 fileannotate = ../paper/fileannotate.tmpl
 filediff = ../paper/filediff.tmpl
 filelog = ../paper/filelog.tmpl
-fileline = '<div class="parity{parity} source"><a href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}</div>'
+fileline = '<div class="parity{parity} source"><a href="#{lineid}" id="{lineid}">{linenumber}</a> {line|expandtab|escape}</div>'
 filelogentry = ../paper/filelogentry.tmpl
 
 annotateline = '
@@ -61,14 +61,14 @@ annotateline = '
       <a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}#{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>
+    <td class="source"><a href="#{lineid}" id="{lineid}">{linenumber}</a> {line|expandtab|escape}</td>
   </tr>'
 
 diffblock = '<div class="source bottomline parity{parity}"><pre>{lines}</pre></div>'
-difflineplus = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> <span class="plusline">{line|escape}</span>'
-difflineminus = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> <span class="minusline">{line|escape}</span>'
-difflineat = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> <span class="atline">{line|escape}</span>'
-diffline = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}'
+difflineplus = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> <span class="plusline">{line|expandtab|escape}</span>'
+difflineminus = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> <span class="minusline">{line|expandtab|escape}</span>'
+difflineat = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> <span class="atline">{line|expandtab|escape}</span>'
+diffline = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> {line|expandtab|escape}'
 
 changelogparent = '
   <tr>
diff --git a/templates/gitweb/map b/templates/gitweb/map
--- a/templates/gitweb/map
+++ b/templates/gitweb/map
@@ -70,7 +70,7 @@ filerevision = filerevision.tmpl
 fileannotate = fileannotate.tmpl
 filediff = filediff.tmpl
 filelog = filelog.tmpl
-fileline = '<div style="font-family:monospace" class="parity#parity#"><pre><a class="linenr" href="##lineid#" id="#lineid#">#linenumber#</a> #line|escape#</pre></div>'
+fileline = '<div style="font-family:monospace" class="parity#parity#"><pre><a class="linenr" href="##lineid#" id="#lineid#">#linenumber#</a> #line|expandtab|escape#</pre></div>'
 annotateline = '
   <tr style="font-family:monospace" class="parity#parity#">
     <td class="linenr" style="text-align: right;">
@@ -78,12 +78,12 @@ annotateline = '
          title="{node|short}: {desc|escape|firstline}">#author|user#@#rev#</a>
     </td>
     <td><pre><a class="linenr" href="##lineid#" id="#lineid#">#linenumber#</a></pre></td>
-    <td><pre>#line|escape#</pre></td>
+    <td><pre>#line|expandtab|escape#</pre></td>
   </tr>'
-difflineplus = '<span style="color:#008800;"><a class="linenr" href="##lineid#" id="#lineid#">#linenumber#</a> #line|escape#</span>'
-difflineminus = '<span style="color:#cc0000;"><a class="linenr" href="##lineid#" id="#lineid#">#linenumber#</a> #line|escape#</span>'
-difflineat = '<span style="color:#990099;"><a class="linenr" href="##lineid#" id="#lineid#">#linenumber#</a> #line|escape#</span>'
-diffline = '<span><a class="linenr" href="##lineid#" id="#lineid#">#linenumber#</a> #line|escape#</span>'
+difflineplus = '<span style="color:#008800;"><a class="linenr" href="##lineid#" id="#lineid#">#linenumber#</a> #line|expandtab|escape#</span>'
+difflineminus = '<span style="color:#cc0000;"><a class="linenr" href="##lineid#" id="#lineid#">#linenumber#</a> #line|expandtab|escape#</span>'
+difflineat = '<span style="color:#990099;"><a class="linenr" href="##lineid#" id="#lineid#">#linenumber#</a> #line|expandtab|escape#</span>'
+diffline = '<span><a class="linenr" href="##lineid#" id="#lineid#">#linenumber#</a> #line|expandtab|escape#</span>'
 changelogparent = '
   <tr>
     <th class="parent">parent #rev#:</th>
diff --git a/templates/monoblue/map b/templates/monoblue/map
--- a/templates/monoblue/map
+++ b/templates/monoblue/map
@@ -61,7 +61,7 @@ filerevision = filerevision.tmpl
 fileannotate = fileannotate.tmpl
 filediff = filediff.tmpl
 filelog = filelog.tmpl
-fileline = '<div style="font-family:monospace" class="parity#parity#"><pre><a class="linenr" href="##lineid#" id="#lineid#">#linenumber#</a> #line|escape#</pre></div>'
+fileline = '<div style="font-family:monospace" class="parity#parity#"><pre><a class="linenr" href="##lineid#" id="#lineid#">#linenumber#</a> #line|expandtab|escape#</pre></div>'
 annotateline = '
   <tr class="parity{parity}">
     <td class="linenr">
@@ -71,12 +71,12 @@ annotateline = '
     <td class="lineno">
       <a href="#{lineid}" id="{lineid}">{linenumber}</a>
     </td>
-    <td class="source">{line|escape}</td>
+    <td class="source">{line|expandtab|escape}</td>
   </tr>'
-difflineplus = '<span style="color:#008800;"><a class="linenr" href="##lineid#" id="#lineid#">#linenumber#</a> #line|escape#</span>'
-difflineminus = '<span style="color:#cc0000;"><a class="linenr" href="##lineid#" id="#lineid#">#linenumber#</a> #line|escape#</span>'
-difflineat = '<span style="color:#990099;"><a class="linenr" href="##lineid#" id="#lineid#">#linenumber#</a> #line|escape#</span>'
-diffline = '<span><a class="linenr" href="##lineid#" id="#lineid#">#linenumber#</a> #line|escape#</span>'
+difflineplus = '<span style="color:#008800;"><a class="linenr" href="##lineid#" id="#lineid#">#linenumber#</a> #line|expandtab|escape#</span>'
+difflineminus = '<span style="color:#cc0000;"><a class="linenr" href="##lineid#" id="#lineid#">#linenumber#</a> #line|expandtab|escape#</span>'
+difflineat = '<span style="color:#990099;"><a class="linenr" href="##lineid#" id="#lineid#">#linenumber#</a> #line|expandtab|escape#</span>'
+diffline = '<span><a class="linenr" href="##lineid#" id="#lineid#">#linenumber#</a> #line|expandtab|escape#</span>'
 changelogparent = '
   <tr>
     <th class="parent">parent #rev#:</th>
diff --git a/templates/paper/map b/templates/paper/map
--- a/templates/paper/map
+++ b/templates/paper/map
@@ -52,7 +52,7 @@ filerevision = filerevision.tmpl
 fileannotate = fileannotate.tmpl
 filediff = filediff.tmpl
 filelog = filelog.tmpl
-fileline = '<div class="parity{parity} source"><a href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}</div>'
+fileline = '<div class="parity{parity} source"><a href="#{lineid}" id="{lineid}">{linenumber}</a> {line|expandtab|escape}</div>'
 filelogentry = filelogentry.tmpl
 
 annotateline = '
@@ -61,14 +61,14 @@ annotateline = '
       <a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}#{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>
+    <td class="source"><a href="#{lineid}" id="{lineid}">{linenumber}</a> {line|expandtab|escape}</td>
   </tr>'
 
 diffblock = '<div class="source bottomline parity{parity}"><pre>{lines}</pre></div>'
-difflineplus = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> <span class="plusline">{line|escape}</span>'
-difflineminus = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> <span class="minusline">{line|escape}</span>'
-difflineat = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> <span class="atline">{line|escape}</span>'
-diffline = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}'
+difflineplus = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> <span class="plusline">{line|expandtab|escape}</span>'
+difflineminus = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> <span class="minusline">{line|expandtab|escape}</span>'
+difflineat = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> <span class="atline">{line|expandtab|escape}</span>'
+diffline = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> {line|expandtab|escape}'
 
 changelogparent = '
   <tr>
diff --git a/templates/spartan/map b/templates/spartan/map
--- a/templates/spartan/map
+++ b/templates/spartan/map
@@ -42,7 +42,7 @@ filerevision = filerevision.tmpl
 fileannotate = fileannotate.tmpl
 filediff = filediff.tmpl
 filelog = filelog.tmpl
-fileline = '<div class="parity#parity#"><a class="lineno" href="##lineid#" id="#lineid#">#linenumber#</a>#line|escape#</div>'
+fileline = '<div class="parity#parity#"><a class="lineno" href="##lineid#" id="#lineid#">#linenumber#</a>#line|expandtab|escape#</div>'
 filelogentry = filelogentry.tmpl
 annotateline = '
   <tr class="parity#parity#">
@@ -53,12 +53,12 @@ annotateline = '
     <td>
       <a class="lineno" href="##lineid#" id="#lineid#">#linenumber#</a>
     </td>
-    <td><pre>#line|escape#</pre></td>
+    <td><pre>#line|expandtab|escape#</pre></td>
   </tr>'
-difflineplus = '<span class="plusline"><a class="lineno" href="##lineid#" id="#lineid#">#linenumber#</a>#line|escape#</span>'
-difflineminus = '<span class="minusline"><a class="lineno" href="##lineid#" id="#lineid#">#linenumber#</a>#line|escape#</span>'
-difflineat = '<span class="atline"><a class="lineno" href="##lineid#" id="#lineid#">#linenumber#</a>#line|escape#</span>'
-diffline = '<a class="lineno" href="##lineid#" id="#lineid#">#linenumber#</a>#line|escape#'
+difflineplus = '<span class="plusline"><a class="lineno" href="##lineid#" id="#lineid#">#linenumber#</a>#line|expandtab|escape#</span>'
+difflineminus = '<span class="minusline"><a class="lineno" href="##lineid#" id="#lineid#">#linenumber#</a>#line|expandtab|escape#</span>'
+difflineat = '<span class="atline"><a class="lineno" href="##lineid#" id="#lineid#">#linenumber#</a>#line|expandtab|escape#</span>'
+diffline = '<a class="lineno" href="##lineid#" id="#lineid#">#linenumber#</a>#line|expandtab|escape#'
 changelogparent = '
   <tr>
     <th class="parent">parent #rev#:</th>
diff --git a/tests/test-hgweb-commands.out b/tests/test-hgweb-commands.out
index d25fe897d40f628adc63cf9c5f0182f7db1d09a3..391cbedd339d95b8e461ee4c73719ae799330f06
GIT binary patch
literal 29126
zc%1D$36LDsbs`vpCW#{g1p$ZntJf>7v^&!?v-dUV*hROr*<BSDVp)2o|I9So(>>|#
z+12WBfx(nbh>;x|987>xxD4h<Y|6$MimPlALokOE3RB!5asUBap(qnO at BQE1)7{fE
zJG&AR$FAkwng8E^@BR1Qf7kpT8p#N?NU2DyJS7G#>Jdqn6)i_(NzCf*JA7G?j0q}}
zDczW00E$5~mTpWF$s}n*(lU8sT2fl2kw&sn&zVHhWRl5CT8^5LWIRqrGKNyLh+eXa
zB at 0lhsy<~#B7LXtD5zwT8m6La{X!xZ7YNldIuh;|Br~HZ!s)3<UzP%O0M*QXA#Yj5
z9#KprJ7aP9UqS@@?cz#HF9 at j!>02C)lGTi|s^>^FierkLs#w)0!YItCiZ%heSNjE%
zs#$^L4Vn!hA_4v=U=&3EB1yHVp-C34x{|N36icNki<(xMyFQVR!gQ%90}eTr=<bY1
z;|cgT8jts|f6eT7pXh)@0Gw);F%9b+yj%xmeBoPeur)%hXhKdVX-9iDp6sOUQoJMH
z-P+zsJLN9g*&gr8$jP+SE+ at 0pmXf{WDmygjq*yOPCJoXjm8`sO;7ih{Nd+#MK9Rj-
zgR~$iYHCSCBGJ(czvBt~ooMgnBYh&DM^s`N*Q~?{;Kfo}Rm^<t1!W*ylF>B_q))8r
zBJCG;<gJ1#aE at hVvZ{$Dy1TnY4=|86C_?v`MJWS_;H^oGNh-Ligb|Kc1jKx!Hf^*Q
z(XoIEQ&=g>a8 at iSN8mKUNi&G6b&{mnxRmK^>y{F2voIE^E!&->a<a9%E19P8_KtLS
zS9?;X?Q)iOb+%FoaAxCj{l-!+!g*tv!C2~7_FT;=Etzx{rs5?^+p_JQQoGcZOty8j
zN%8J at GSiXm%(k_4W$QMTdJ)c>%1nNRDY8B at i1djVaZ~f5dp>l}hwk~%Js-N~L-%~>
zo)6vCLwA^MIdK<Eu!s$XIfiX#c`z9FU}u8l6%!i~hcF(`pPKno6MAYE4{TXIx@~BX
zAbB#hb=AgotBDX5#WP!1i{ilO0Qth&(M=n{pC?3daI-)h_NS(%VpFX#-N=cf!<_p>
z0v9;1W3nZ~e)<?<|JFTgJ$q+6RwX>HREusMVT-8*8}OVi1vcuOF443kOUa1&9FE3{
zT28PfuN0&l71;n-R9}Hw5<%<f7YseETc$v4c>$;<(;Y2D)45Fe0?%o-rd101rB;wC
zn~4^sA~j+e({xB%bcZFf_adsmd$heNc6iFpQAow2s$_tOt}%zv41y6*-!=no?oSx9
zegQoeVU7($E)olFqb3c*G=n5y$VXv#WF(A$XzM4f%go@=$}_5Df~rx#lA=)q)#w>7
zP^}ag0zx_tNq!fCRsznHYDy-S(F<aM8kv%zNUDgyN+Cx~BjdFK#KWxswu_W(c;pov
z0rJbvOJ7N4!g1(J8B4*##q^^pY%b+;BjyaLnD-SFLW+$c&aefL|CmAwe^-OxNi{W{
z^qP7hMaG`Zqi0dDtPxVK$F4>vtEe=vCT+mMr=jGW*IY_|t$`}pc}#k+3$|ZIR4 at Uv
ztz3ri7nXym6rA-Ym5fXt6qB)7coxyP5U7~yQ#5o*_VJ{X0#RgVLBe~g1Y#;X;dN`A
zE3{}^5rXFx%@R^srQD&XmPyjnguDM1I0cgmW(F-0l!@6wz>cSMLpF(`vCj&?!U~E-
z3e+^gcQ}?J;wA#J(4<Kvhes&|NJ+AXlqF&UEepfDH{c1WruZ_HQWzlQ0U$=D$mbo&
zvyUAddTAxc-m{#<;-SpSyT+S?3C6LN4^FYY!z}w70w7b9g$0m{kn+5-LE(?VX*vsv
zlA&1Bae?EJeLNH-ZJJDj+Q61AIS661!VRWk+Q&#Oi+8F~Fgb{gnkynUjLt|%@y~4f
zM4ShadcojG+QPOcIVaWjnK+#L^wyxWDWqyhLZ(@%q*`_E_ONQze?E9t6W9q;7VJKh
zeK?s+&4>GF`u{|b4<7r#=|K(yL-Wbjha=ev?JWfomXA`tLi~}viaE3J>x6a^mdE(v
z19=RYIgufA%4A4Ly5-4ULJ%9$RJ77lz-U!gSh5pvEY*`8GIO?5N4it?%JCjAX%Z56
ze7@}Cog(=>Klkpw%m(>!nHa=!6_1D=mulxPA>pTb9{?i;4;U55WfmszcO_yzH<~Yz
z^`OIef;d$_!A<~y+8<svl|v(ua{4kxtqL)RQ;4+S2hHkRsmZbfl*ucq42Y_uA+>S~
z?>lbIHE1$ZK(kS42;25-jWa0ndp9U)-Y)aS+DdQ+>jHW?3k~@CBsH=aN&Ft#)JsN&
zW)%Yp)f7~<5Mn5im25Wbv~yqrp$f`q2I(e5*oZ0bu0e&s%+DTsg_sEjYtF3qz!wy)
zWFjsh6^%xTD1#QXlByE>r?zcHY(L?noOCHCUCPNy%0<;7+}zwu(zg5$f^Mrzx7DTF
zT1i*3IMo#^NHpF82oo&{vSLLj$~G5en~Soo=2q~&mV=44zqlgnQDdS~jY(IHNmq@@
z!=lEdtHz|O#$-KeJQy7&T^%M}9VQP>he=n5Nmqx-x#_SRfdjeqY*On;16jMqQzI26
zE0c%8ttRFDDtJ8rUY*2A9A0kLWlGi!ka|D(gC#@EbrWA+S*w*DskelSM0}>Ta0c~q
zbBN`0n3l~198_d;z1$<ukw_ys0~|D at VJbGoYsnvVTT4Btf)#Q0=>}F!HDP6AYKIZU
ze?*odQ3LY8DE=dD?Zn=<Z`4LQUwC~u3NP=OA}o at J7hfN#>Z?le<xi}9#aCGE<p)1f
zJ!C%@_4SawYs8v$RY;+S7{V}PLgvTJGewrCg)<{*nhpx2A<LYpYD<IqvQtgqjnq&a
zmZ6mrU`u_q=pksGPbzeZef+zEBzpWw`X{JbtiSX5$*3r2Dh3Z%Nm=7VC4L;dBNf%#
z!IW<-m*+!{6?tIoTFnL!e1(QnW;jI#V~eMu6?pi1cx?%(&}Q%4dcJc>?tsHtCw5L^
z)kwC0OwpAb?q^gE)umPz`DT5qwY<uki}3jA-l8!}g at R;E^J}l at V%&>1&P>F;e8MlD
zY;v*!GO~J;eFMdFr{rMo<*=4u`C86wHav%GHKDhDKn%0L?{m0s(y(a7rS$<{539dY
z08*BrWGsKdP?oG)FL=s at sL7VpC>la<1y$4x<cJp#v#TF+iZw;k)e8uJ1+mJ_XAjk7
z8Ri{o+?F}`%Q8L+mA7SPxGYlyJ&fZtFMy<Khu%}vIJ7pE>lP;KegOii1X47VT;A#x
z$}Ws$o8=mYd%V;6BCeovR!T(TR288~En`@dCcWHNL1~XNth*zXMN|;n9<G3|1kIEm
zTnNCj(kcM$mRmkZ)LT#ncF_fJjtqQDD)OJedb?MS6=d2F!;1o at JjgS(v{~$R5)Av+
z2US(P_s1MloaOXkAJqpxsP9u!{`3)?wUhhd2NRN8KP#r^lsc7cjs5hc1G!x~<@wkE
zemOTT?Du6t+Jw(O-2A*2HD5g%G=P~GhFQZb6z0#BE3bnbVySzpyh^G2Yrvq?-P;}Y
zi at gT9+G3w^VO6o$SXo8vp at jnTH<0666&)ha%s5XIxDTsH at WD%u2YW~EJ;xNdY|e`0
z3mj|?1BS07ls0(V%P9<IaRuZsr6FN`%UR_ibv7?Q-igSF6S at x5rQHwu&h9~FAvGGT
zA9yZe12{dfK-0@^cyS at +6<MZWa@>3vMuAL9Y6;%in3;`vOMl)=3n1bhGEWzclw-Nm
z#+o5Dvf2K~r9G8R<^Zg><9tMOBW!5#VCcQPDzmYYHlgWLTHsy=&cG-&T(~6-opILR
zOSr#VlklqpJAmDtY_QE8WT5e6U_l#$?eZ_^Xe+l6lW})0-pwEwig=d`!claW5i_`s
zWN*j at uuWz6Mcr+T=1VQuF2b%6>lC?tBi1tVV)2DoJcoYK&tR%{s=%|6!;rZuwkPlo
zMyh01!5hN?*1_uBE5vDd=l!G_Hp)MA3As;;_qQA;XWEysYu_{Wt|(t5b#8yLzY%Zl
z6Ug5nzD>cw^`$Dcw^luYJA&!&Y*kkyTSV2>|JlG?m1`%}A$O<es<Jud+;dEwkHl&7
z%029~vCDt;sUvV~Fgf;Lnw+Z+YVbIN4r;8NQ3om}Jwl4{sH0<qjHOMOsU{3iiN#`W
z*;mbbhdS>X5&j7F8)nc3wi;03fm*j}X**}-25(N!uBbiKR?%A3Dnhh4SBq!}UKE&b
zI?Xqo=9^Ac&ZqMvQw_&mK3Co&8Ej+Ccd_QXSVy*twT5>9K1MyP#nI??B}>)~jzI#+
zP1GZX^Q1|Mj|%=fe{@Gi(qJxj9%h~*he`D<-cB`H$&TT7bA2 at 1W30zh?xlRldSplZ
zV?%MK at WJHw;p~qEpWgGqF9Dfn^b$Cf1YSR-rWx at 5wHLKRN>|Vgc3Ug5n^Y{Tp5<0P
zH9O;yXfkw#r4)m5cAmJMRf90nr|I^A9%bMB%Wo(0qd{~{on~M3YmzC&%9HirB6w_z
zQVrv at O!$>n!-PogVv3aSLt<H3<Ojc`vJp*}X`0or{OTw7Eo_Pr6 at Zj%<@<$XvJKog
z#WN1EGTDtQIB*#mTY(tM_?&&s!oe{te(&b2=U$V*$*07|Xa}Q6WKuGSEJ3j9C)>9R
zz6b7G$o6;(NsPf?e8FDB8 at qD?(*kqK at VA_i;v%O@)<P_!L~%Lmf{n3Pz6;3JDAe2Q
zslkKO%qcU$=?9j(^x4KFlh%bYE2$>m7^XjCV`IHcj@;h*iAJY*;B8vg%l%8t%t$J2
zYVC#rdxXk43b5Id#+-H24&Y=O{=Xvuf8qa-ed at +CvMaJMve3#aCIlF3HI6m08IV>C
zMHcI52b>%tW9^8gX-?6GB#Y554;S=FI;z`5d^32%5@#4$-wb3}`UGWoB73-{z|msy
zy`L<_yWVyr8y^|nwsA1f(7~>}kXqUsan>~BqUxQ2 at y%NX2G<Sv9fA`*?MYUoj1LTs
ztahrCAbz`DG(Ng=%}8+0%blWSA&nj%SUEa~MN|vkZXVw{GC1r$q@*f{+*TH(yKwq^
z>H=}uN@}qmHiNe%pT;Wn!QcT+6@@0- at pq?RqY!&-YK9~$C6k?#O at J{rw2mw%Np9i3
zB at jteuD6A#wRFx=nA7{r*(@(5&GsvJu~cxk&6cS&Yr(=Mj#gJo1<eGo#4 at 1D#?rZQ
z?%M1H8q*!pD)O&dk0Od5f>anXpi$h>>)=-`S^!{MM=^sIRVhQ8L~c%Ei;WNWVT0ly
z58Tko;dP_i0B~t=H`Uj0LlT*;w#UZ~0U(;A4c1x%42{bMYpaC~EYb#RA1kX66A(0C
zkS&T265u8T=^Tqe)|rE-wtF`p=@<iM$zp)B-PKZ at vS$)w%b0yG^q>px%_0$(3SY?<
zx+^PARAoOM)lp`N*%w3W#o?QGPA`MnLnt^|f;=pCnIKD+knmm3#GaxZat1vTa`j-d
zfg!7j=?$NV;1KqdqfXLqk8iie7}4sy+r9A=@{22joG at 1QL;@H%1On_qD+)I^^pjw2
z_CmBbgIXm+Biqxt76v?KyMOKo4JenW(S#WThB8rv7@!w1wZQ+3f}LFOV#=RK)hYr$
zap`UKy8|DU22mr)NJS~FsEVc3{x4#vx;{}V+6i3F&`U+Ll*UA^q at _!m4ANP<CJ|qA
zRtx at F#s6&G+(@w4u8FwbZ+Qk at IS;jv#mUkMI=vKN-K(#MfOOpt43l`BKXn75hRPzZ
zwV54P-7~sr?beki-h0z~|NYF8MaM7y(N`|`yL+>*{p&qbKYd3!Y4EehZ*TneBe!36
z>AUy6`=v<R at f(Jcg>T)u{FcFERu28*f#g{yzIXIp=l#QXK7ZY&^*`8q-<99l5?}QE
z3HvVilZ(4^ukGG{)mxX+ZSU^eu;qy#ZaC?SXKVj)>)xr0Z~5CZzxMnc#@XB6>}cAz
z?0>)Y)1zKFb?5oRuTO0L_Wt4PzPn+?3yW9&VB*HD%L_*z`}8+Xd*Yw3JMDqjTCRVj
z`EzgGK9E!1y5+Rfet6~n?PvZrbJ=szNB95B&hOuS%99r?N at Y^VEfBtN`~w%Qcw+ym
z<r^0qHT0?B2Uq-fRs2_74Hx!YxG(>c{zsn~d2w6I#wV|R=caG2?|JR%3;yzj*X0`<
zUTS&#w&CS(kn4{+;iwz_DE)Hpy|=%=Vf#5#8(!Re``r_-uX_A9_aFQHTedIyzlp-+
zRA$u;*FCl7p at 9cZOx*hQMGKBwf5Ff9yt(kr<}-hM$@zPCKXvWDUHjDNb1(jV%i@>r
z{BGOJ`+s at Or~mBd($Uh;kFt+`>eTVGyWf7}m8)O9;qfP~Ir>KZw!LeA{oA*Gzqa+(
ziO3y$zwwp3P82 at f^}t`OSaA0x%br~N<?hH$=U+5JuD>UmJK@|{o_%obInTdz-{_{F
z{btpc$DX_G)!Q0AXKZTPaK*W2oN|(R%$k9_j=FzA^QF75Dc+y>pA#2cwf;+eFZ}5>
z_wW71frn2?4H-B8=a~l{y6y4zPkwCa38jC$`q8!8>d!oK?!(tE`QB&V-hJt!&p&kO
zzTz?GK6 at NF|Dk^$Hlp8Lv?%$8();V|+dEIX_*YNMukQcr1Ap_!JB$DHyYC%%=gHr_
zKQU##VO^g7rTXW8_~koKj$d~CMR#0w%C!p?jvsq!X5WKfJ!}8v?~z9~pOO3788=_j
zeC1V{@smG$^3`KITf6$MXuh*WXnFYI)6f3;?@x|>aqHz*9B6!QbKlnvT+z7yoX0l4
z at x^B at pLjN!y7&(+6fR$T!^=0D{n7vGeD#^je$oi>#-LJR9IUwJ2?hJlO5mO#Dmjh@
zpIiK^l44Mk3~d=1W$*CY0ovm2WD~XWx=c3f7FmfXs0=<KQY at MIDvKJ)2&=mZ>)O;}
zMIyThdhMu8GrGaLpFNtc(O$AA5(Cc;(^Gkfv{CkjuRZ)zY&MAx(Nv#hZDh=x&FV1D
z19H1aTFOkIE70U9D>r&bgUo(BaEWj@%6=Fe7K at sW^sv3rLptJ+&l3kwVn4mGb<K+6
z<E1^sEJ&(Kjot`xf0!&JRmo{i^OHE`0(;w&pass9{q+$*&ZdwvDAm}U`{f+vNrUpe
z at Gr6`j~7cuQMILQKPC*5Aw15^8F5%kmn=(%Y6x at -I}4Fn2m8To+ZcLCvS{IZ8-ghe
z-!n$CQbAFtffY$J-N7l!iKcZ`?u8UA=6u6lb+VaECX8k%4SP)*GQkN%4??9N9LO)L
zAn#&7VSA_)9O4s~lht~mplf8g7{PBf-bD(M0p)NHiK7(3oFG?W)O@{gB%o5s2;y=Y
zw<3Nq1^x#$@DVV`J`g>kVo&~-Z8H&%H*%wOrkvAe&$kDrp^Dn&m%OGMU>l)^fgJ%Q
zBdN|XWWhmfNUnwWM%ZJmws}_SIJn*m?PURL>0W0Wik7Evc$q*!N+WhJ+$S8fhIGs-
z;_0$Yy*zKp^~i at aS4})#Y%%^QrB@@IChlWY@@)YhRUEY6?jqPcin7!ic|cd{F)Y{k
znUQ%H#_ZSAvqMofK1^HLbBBy2|0Cysb5F%sb(0D|Uu9pK&1OUGE{sOZehNQi#&b6o
zIH{r)+#sGQ_AOb2eH8)j53%BiXM6sk4`O%73+tUC3s8GB*v)q=o{PGvu<%LPx6&w+
z;CvRA)dm1%y`j^vyYjx3Qrgtj61uI0JEJUw_K<e$o$19M5{<_?zyy6r0Z&P7up9n}
zD`+`z0!{3!Gb{4*;A76A(1{c{)^g_`?6HM-=%@;k%G+XX?S?R0xn{<VCA at UI+S%4-
z!F~vnB!-<+q%13DQI)1Kfan-N7J4FTC-{~s>f+oa_<kD6;PCL4;Sn;pdG(g9n at 0zS
I2L~em59B1$NdN!<

diff --git a/tests/test-hgweb-diffs.out b/tests/test-hgweb-diffs.out
--- a/tests/test-hgweb-diffs.out
+++ b/tests/test-hgweb-diffs.out
@@ -77,12 +77,12 @@ files, or words in the commit message</d
 <div class="overflow">
 <div class="sourcefirst">   line diff</div>
 
-<div class="source bottomline parity0"><pre><a href="#l1.1" id="l1.1">     1.1</a> <span class="minusline">--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-</span><a href="#l1.2" id="l1.2">     1.2</a> <span class="plusline">+++ b/a	Thu Jan 01 00:00:00 1970 +0000
+<div class="source bottomline parity0"><pre><a href="#l1.1" id="l1.1">     1.1</a> <span class="minusline">--- /dev/null        Thu Jan 01 00:00:00 1970 +0000
+</span><a href="#l1.2" id="l1.2">     1.2</a> <span class="plusline">+++ b/a        Thu Jan 01 00:00:00 1970 +0000
 </span><a href="#l1.3" id="l1.3">     1.3</a> <span class="atline">@@ -0,0 +1,1 @@
 </span><a href="#l1.4" id="l1.4">     1.4</a> <span class="plusline">+a
-</span></pre></div><div class="source bottomline parity1"><pre><a href="#l2.1" id="l2.1">     2.1</a> <span class="minusline">--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-</span><a href="#l2.2" id="l2.2">     2.2</a> <span class="plusline">+++ b/b	Thu Jan 01 00:00:00 1970 +0000
+</span></pre></div><div class="source bottomline parity1"><pre><a href="#l2.1" id="l2.1">     2.1</a> <span class="minusline">--- /dev/null        Thu Jan 01 00:00:00 1970 +0000
+</span><a href="#l2.2" id="l2.2">     2.2</a> <span class="plusline">+++ b/b        Thu Jan 01 00:00:00 1970 +0000
 </span><a href="#l2.3" id="l2.3">     2.3</a> <span class="atline">@@ -0,0 +1,1 @@
 </span><a href="#l2.4" id="l2.4">     2.4</a> <span class="plusline">+b
 </span></pre></div>
@@ -170,8 +170,8 @@ files, or words in the commit message</d
 <div class="overflow">
 <div class="sourcefirst">   line diff</div>
 
-<div class="source bottomline parity0"><pre><a href="#l1.1" id="l1.1">     1.1</a> <span class="minusline">--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-</span><a href="#l1.2" id="l1.2">     1.2</a> <span class="plusline">+++ b/a	Thu Jan 01 00:00:00 1970 +0000
+<div class="source bottomline parity0"><pre><a href="#l1.1" id="l1.1">     1.1</a> <span class="minusline">--- /dev/null        Thu Jan 01 00:00:00 1970 +0000
+</span><a href="#l1.2" id="l1.2">     1.2</a> <span class="plusline">+++ b/a        Thu Jan 01 00:00:00 1970 +0000
 </span><a href="#l1.3" id="l1.3">     1.3</a> <span class="atline">@@ -0,0 +1,1 @@
 </span><a href="#l1.4" id="l1.4">     1.4</a> <span class="plusline">+a
 </span></pre></div>
diff --git a/tests/test-hgweb-removed.out b/tests/test-hgweb-removed.out
--- a/tests/test-hgweb-removed.out
+++ b/tests/test-hgweb-removed.out
@@ -75,8 +75,8 @@ files, or words in the commit message</d
 <div class="overflow">
 <div class="sourcefirst">   line diff</div>
 
-<div class="source bottomline parity0"><pre><a href="#l1.1" id="l1.1">     1.1</a> <span class="minusline">--- a/a	Thu Jan 01 00:00:00 1970 +0000
-</span><a href="#l1.2" id="l1.2">     1.2</a> <span class="plusline">+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
+<div class="source bottomline parity0"><pre><a href="#l1.1" id="l1.1">     1.1</a> <span class="minusline">--- a/a        Thu Jan 01 00:00:00 1970 +0000
+</span><a href="#l1.2" id="l1.2">     1.2</a> <span class="plusline">+++ /dev/null        Thu Jan 01 00:00:00 1970 +0000
 </span><a href="#l1.3" id="l1.3">     1.3</a> <span class="atline">@@ -1,1 +0,0 @@
 </span><a href="#l1.4" id="l1.4">     1.4</a> <span class="minusline">-a
 </span></pre></div>
@@ -164,8 +164,8 @@ files, or words in the commit message</d
 <div class="overflow">
 <div class="sourcefirst">   line diff</div>
 
-<div class="source bottomline parity0"><pre><a href="#l1.1" id="l1.1">     1.1</a> <span class="minusline">--- a/a	Thu Jan 01 00:00:00 1970 +0000
-</span><a href="#l1.2" id="l1.2">     1.2</a> <span class="plusline">+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
+<div class="source bottomline parity0"><pre><a href="#l1.1" id="l1.1">     1.1</a> <span class="minusline">--- a/a        Thu Jan 01 00:00:00 1970 +0000
+</span><a href="#l1.2" id="l1.2">     1.2</a> <span class="plusline">+++ /dev/null        Thu Jan 01 00:00:00 1970 +0000
 </span><a href="#l1.3" id="l1.3">     1.3</a> <span class="atline">@@ -1,1 +0,0 @@
 </span><a href="#l1.4" id="l1.4">     1.4</a> <span class="minusline">-a
 </span></pre></div>


More information about the Mercurial-devel mailing list