From owner-freebsd-cvsweb@FreeBSD.ORG Sun Oct 31 22:46:33 2004 Return-Path: Delivered-To: freebsd-cvsweb@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F3E0216A4CE for ; Sun, 31 Oct 2004 22:46:32 +0000 (GMT) Received: from smtp3.pp.htv.fi (smtp3.pp.htv.fi [213.243.153.36]) by mx1.FreeBSD.org (Postfix) with ESMTP id 811A643D64 for ; Sun, 31 Oct 2004 22:46:32 +0000 (GMT) (envelope-from scop@FreeBSD.org) Received: from [62.78.134.138] (cs78134138.pp.htv.fi [62.78.134.138]) by smtp3.pp.htv.fi (Postfix) with ESMTP id 0D38727AD86 for ; Mon, 1 Nov 2004 00:46:31 +0200 (EET) From: Ville =?ISO-8859-1?Q?Skytt=E4?= To: freebsd-cvsweb@freebsd.org In-Reply-To: <30C0EC42-291F-11D9-91B4-000393C83AC4@rrinc.com> References: <1098991135.27565.37.camel@bobcat.mine.nu> <30C0EC42-291F-11D9-91B4-000393C83AC4@rrinc.com> Content-Type: text/plain; charset=iso-8859-1 Organization: FreeBSD Message-Id: <1099262790.22042.165.camel@bobcat.mine.nu> Mime-Version: 1.0 X-Mailer: Ximian Evolution 1.4.6 (1.4.6-2) Date: Mon, 01 Nov 2004 00:46:30 +0200 Content-Transfer-Encoding: 8bit Subject: Re: Spaces being eaten in colored diffs X-BeenThere: freebsd-cvsweb@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS Web maintenance mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 Oct 2004 22:46:33 -0000 On Thu, 2004-10-28 at 23:23, Tim Buck wrote: > On Oct 28, 2004, at 3:18 PM, Ville Skyttä 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? String::Ediff will be used by CVSweb if it's found; if not, the internal colorization of CVSweb will be used in "human readable diffs" so you don't need to install any additional modules. String::Ediff provides enhanced diffs in the sense that it pinpoints the actual changes instead of marking whole rows changed, but as said, it has some issues with whitespace. If you don't like that behaviour, either remove the String::Ediff module or change the line (around line number 112) in cvsweb.cgi from: use constant HAS_EDIFF => eval { require String::Ediff; }; ...to: use constant HAS_EDIFF => 0; Hm, perhaps the choice to use String::Ediff or not (if it's available) should be made configurable in the UI on per-user basis. I've added that to the TODO list.