Date: Thu, 28 Oct 2004 16:23:12 -0400 From: Tim Buck <tbuck@rrinc.com> To: freebsd-cvsweb@freebsd.org Subject: Re: Spaces being eaten in colored diffs Message-ID: <30C0EC42-291F-11D9-91B4-000393C83AC4@rrinc.com> In-Reply-To: <1098991135.27565.37.camel@bobcat.mine.nu> References: <B8A9C606-2861-11D9-8C61-000393C83AC4@rrinc.com> <1098991135.27565.37.camel@bobcat.mine.nu>
next in thread | previous in thread | raw e-mail | index | archive | help
--Apple-Mail-1-428708050 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=ISO-8859-1; format=flowed On Oct 28, 2004, at 3:18 PM, Ville Skytt=E4 wrote: > On Thu, 2004-10-28 at 00:46, Tim Buck wrote: >> I'm seeing some strange behavior in CVSweb, both v3.0.1 and 3.0.2. >> Spaces are being "eaten" in the colored (human-readable) diff output >> under certain circumstances. The output is correct for the unified >> and context diffs. > > Do you have String::Ediff installed? It has known whitespace related > limitations. Yes, I do have that module installed. Should I remove it? Should I have an alternate module installed instead? > >> Attached is the full HTML file that was output [...] > > Nope, that's not HTML ;) It was when I attached it -- apparently the list processing software mangled it. I'll try again, with a .txt extension appended to the filename. --Apple-Mail-1-428708050 Content-Transfer-Encoding: 7bit Content-Type: text/plain; x-unix-mode=0666; name="attredit_panel.cpp.html.txt" Content-Disposition: attachment; filename=attredit_panel.cpp.html.txt <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">; <html> <head> <title>systems/formworks/attrpanel/src.bcb_attrpanel/attredit_panel.cpp - diff - 1.63</title> <meta name="robots" content="nofollow" /> <meta name="generator" content="FreeBSD-CVSweb 3.0.2" /> <meta http-equiv="Content-Script-Type" content="text/javascript" /> <meta http-equiv="Content-Style-Type" content="text/css" /> <link rel="stylesheet" type="text/css" href="/css/cvsweb.css" /> </head> <body class="src"> <table class="navigate-header" width="100%" summary="Navigation"> <tr> <td> <a href="/cgi-bin/cvsweb-new/systems/formworks/attrpanel/src.bcb_attrpanel/attredit_panel.cpp#rev1.63"><img src="/icons/back.gif" alt="[BACK]" border="0" width="20" height="22" /></a><b>Return to <a href="/cgi-bin/cvsweb-new/systems/formworks/attrpanel/src.bcb_attrpanel/attredit_panel.cpp#rev1.63">attredit_panel.cpp</a> CVS log</b> <img src="/icons/text.gif" alt="[TXT]" border="0" width="20" height="22" /></td> <td style="text-align: right"><img src="/icons/dir.gif" alt="[DIR]" border="0" width="20" height="22" /> <b>Up to <a href="/cgi-bin/cvsweb-new/#dirlist">[Development]</a> / <a href="/cgi-bin/cvsweb-new/systems/#dirlist">systems</a> / <a href="/cgi-bin/cvsweb-new/systems/formworks/#dirlist">formworks</a> / <a href="/cgi-bin/cvsweb-new/systems/formworks/attrpanel/#dirlist">attrpanel</a> / <a href="/cgi-bin/cvsweb-new/systems/formworks/attrpanel/src.bcb_attrpanel/#dirlist">src.bcb_attrpanel</a></b></td> </tr> </table> <form method="get" action="%s"><div style="float: left"> <label for="f">Diff format:<br /> <input type="hidden" name="r1" value="1.62" /> <input type="hidden" name="r2" value="1.63" /> <select id="f" name="f" onchange="this.form.submit()"> <option value="h">Long colored</option> <option value="H" selected="selected">Colored</option> <option value="u">Unified</option> <option value="c">Context</option> <option value="s">Side by side</option> </select></label> <input type="submit" value="Show" /> </div> <table style="float: right; border: thin outset" cellspacing="0" cellpadding="1" title="Legend" summary="Legend"> <tr> <td align="center" class="diff-removed">Removed from v.1.62</td> <td class="diff-empty"> </td> </tr><tr class="diff-changed"> <td align="center" colspan="2">changed lines</td> </tr><tr> <td class="diff-empty"> </td> <td align="center" class="diff-added">Added in v.1.63</td> </tr> </table> </form> <h3 style="text-align: center">Diff for /systems/formworks/attrpanel/src.bcb_attrpanel/attredit_panel.cpp between versions 1.62 and 1.63</h3> <table border="0" cellspacing="0" cellpadding="0" width="100%" summary="Diff output"> <tr style="background-color: #ffffff"> <th style="text-align: center; vertical-align: top" width="50%"> <a href="attredit_panel.cpp;rev=1.62">version 1.62</a>, 2003/09/03 19:10:14 </th> <th style="text-align: center; vertical-align: top" width="50%"> <a href="attredit_panel.cpp;rev=1.63">version 1.63</a>, 2004/10/27 11:59:47 </th> </tr> <tr> <td width="50%" class="diff-heading"> <b><a href="attredit_panel.cpp;content-type=text%2Fx-cvsweb-markup;ln=1;rev=1.62#l7257">Line 7257</a></b> <span style="font-size: smaller"> RRISTAT TAttrPanel_Private::PutStringLis</span> </td> <td width="50%" class="diff-heading"> <b><a href="attredit_panel.cpp;content-type=text%2Fx-cvsweb-markup;ln=1;rev=1.63#l7257">Line 7257</a></b> <span style="font-size: smaller"> RRISTAT TAttrPanel_Private::PutStringLis</span> </td> </tr> <tr> <td class="diff diff-same"> }</td> <td class="diff diff-same"> }</td> </tr> <tr> <td class="diff diff-same"> }</td> <td class="diff diff-same"> }</td> </tr> <tr> <td class="diff diff-same"> </td> <td class="diff diff-same"> </td> </tr> <tr><td><span class="diff diff-changed"></span><span class="diff diff-unchanged"> delete</span><span class="diff diff-changed"></span><span class="diff diff-unchanged">string_list;</span><span class="diff diff-changed"></span></td><td><span class="diff diff-changed"></span><span class="diff diff-unchanged"> delete</span><span class="diff diff-changed">[]</span><span class="diff diff-unchanged"> string_list;</span><span class="diff diff-changed"></span></td></tr> <tr> <td class="diff diff-same"> }</td> <td class="diff diff-same"> }</td> </tr> <tr> <td class="diff diff-same"> else</td> <td class="diff diff-same"> else</td> </tr> <tr> <td class="diff diff-same"> {</td> <td class="diff diff-same"> {</td> </tr> <tr> <td width="50%" class="diff-heading"> <b><a href="attredit_panel.cpp;content-type=text%2Fx-cvsweb-markup;ln=1;rev=1.62#l7308">Line 7308</a></b> <span style="font-size: smaller"> RRISTAT TAttrPanel_Private::PutStringLis</span> </td> <td width="50%" class="diff-heading"> <b><a href="attredit_panel.cpp;content-type=text%2Fx-cvsweb-markup;ln=1;rev=1.63#l7308">Line 7308</a></b> <span style="font-size: smaller"> RRISTAT TAttrPanel_Private::PutStringLis</span> </td> </tr> <tr> <td class="diff diff-same"> }</td> <td class="diff diff-same"> }</td> </tr> <tr> <td class="diff diff-same"> }</td> <td class="diff diff-same"> }</td> </tr> <tr> <td class="diff diff-same"> </td> <td class="diff diff-same"> </td> </tr> <tr><td><span class="diff diff-changed"></span><span class="diff diff-unchanged"> delete</span><span class="diff diff-changed"></span><span class="diff diff-unchanged">list;</span><span class="diff diff-changed"></span></td><td><span class="diff diff-changed"></span><span class="diff diff-unchanged"> delete</span><span class="diff diff-changed">[]</span><span class="diff diff-unchanged"> list;</span><span class="diff diff-changed"></span></td></tr> <tr> <td class="diff diff-same"> }</td> <td class="diff diff-same"> }</td> </tr> <tr> <td class="diff diff-same"> else</td> <td class="diff diff-same"> else</td> </tr> <tr> <td class="diff diff-same"> {</td> <td class="diff diff-same"> {</td> </tr> <tr> <td width="50%" class="diff-heading"> <b><a href="attredit_panel.cpp;content-type=text%2Fx-cvsweb-markup;ln=1;rev=1.62#l7359">Line 7359</a></b> <span style="font-size: smaller"> RRISTAT TAttrPanel_Private::PutStringLis</span> </td> <td width="50%" class="diff-heading"> <b><a href="attredit_panel.cpp;content-type=text%2Fx-cvsweb-markup;ln=1;rev=1.63#l7359">Line 7359</a></b> <span style="font-size: smaller"> RRISTAT TAttrPanel_Private::PutStringLis</span> </td> </tr> <tr> <td class="diff diff-same"> }</td> <td class="diff diff-same"> }</td> </tr> <tr> <td class="diff diff-same"> }</td> <td class="diff diff-same"> }</td> </tr> <tr> <td class="diff diff-same"> </td> <td class="diff diff-same"> </td> </tr> <tr><td><span class="diff diff-changed"></span><span class="diff diff-unchanged"> delete</span><span class="diff diff-changed"></span><span class="diff diff-unchanged">list;</span><span class="diff diff-changed"></span></td><td><span class="diff diff-changed"></span><span class="diff diff-unchanged"> delete</span><span class="diff diff-changed">[]</span><span class="diff diff-unchanged"> list;</span><span class="diff diff-changed"></span></td></tr> <tr> <td class="diff diff-same"> }</td> <td class="diff diff-same"> }</td> </tr> <tr> <td class="diff diff-same"> else</td> <td class="diff diff-same"> else</td> </tr> <tr> <td class="diff diff-same"> {</td> <td class="diff diff-same"> {</td> </tr> <tr> <td width="50%" class="diff-heading"> <b><a href="attredit_panel.cpp;content-type=text%2Fx-cvsweb-markup;ln=1;rev=1.62#l7410">Line 7410</a></b> <span style="font-size: smaller"> RRISTAT TAttrPanel_Private::PutStringLis</span> </td> <td width="50%" class="diff-heading"> <b><a href="attredit_panel.cpp;content-type=text%2Fx-cvsweb-markup;ln=1;rev=1.63#l7410">Line 7410</a></b> <span style="font-size: smaller"> RRISTAT TAttrPanel_Private::PutStringLis</span> </td> </tr> <tr> <td class="diff diff-same"> }</td> <td class="diff diff-same"> }</td> </tr> <tr> <td class="diff diff-same"> }</td> <td class="diff diff-same"> }</td> </tr> <tr> <td class="diff diff-same"> </td> <td class="diff diff-same"> </td> </tr> <tr><td><span class="diff diff-changed"></span><span class="diff diff-unchanged"> delete</span><span class="diff diff-changed"></span><span class="diff diff-unchanged">list;</span><span class="diff diff-changed"></span></td><td><span class="diff diff-changed"></span><span class="diff diff-unchanged"> delete</span><span class="diff diff-changed">[]</span><span class="diff diff-unchanged"> list;</span><span class="diff diff-changed"></span></td></tr> <tr> <td class="diff diff-same"> }</td> <td class="diff diff-same"> }</td> </tr> <tr> <td class="diff diff-same"> else</td> <td class="diff diff-same"> else</td> </tr> <tr> <td class="diff diff-same"> {</td> <td class="diff diff-same"> {</td> </tr> </table> <hr style="width: 100%" /> <form method="get" action="/cgi-bin/cvsweb-new/systems/formworks/attrpanel/src.bcb_attrpanel/attredit_panel.cpp.diff"> <div style="float: left"> <label for="f">Diff format:<br /> <input type="hidden" name="r1" value="1.62" /> <input type="hidden" name="r2" value="1.63" /> <select id="f" name="f" onchange="this.form.submit()"> <option value="h">Long colored</option> <option value="H" selected="selected">Colored</option> <option value="u">Unified</option> <option value="c">Context</option> <option value="s">Side by side</option> </select></label> <input type="submit" value="Show" /> </div> <table style="float: right; border: thin outset" cellspacing="0" cellpadding="1" title="Legend" summary="Legend"> <tr> <td align="center" class="diff diff-removed">Removed from v.1.62</td> <td class="diff diff-empty"> </td> </tr><tr class="diff diff-changed"> <td align="center" colspan="2">changed lines</td> </tr><tr> <td class="diff diff-empty"> </td> <td align="center" class="diff diff-added">Added in v.1.63</td> </tr> </table> </form> <br clear="all" /> <hr /> <address><span style="font-size: smaller">Tim Buck <<a href="mailto:tbuck@rrinc.com">tbuck@rrinc.com</a>></span></address> </body> </html> --Apple-Mail-1-428708050 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII; format=flowed Tim Buck * Information Technology Manager * Recognition Research, Inc. PHONE +1 540 961-6500 * FAX +1 540 961-3568 * EMAIL tbuck@rrinc.com The only thing to do with good advice is to pass it on. -- Oscar Wilde --Apple-Mail-1-428708050--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?30C0EC42-291F-11D9-91B4-000393C83AC4>