Date: Mon, 23 Feb 2004 21:26:50 +0200 From: Ville =?ISO-8859-1?Q?Skytt=E4?= <scop@FreeBSD.org> To: freebsd-cvsweb@FreeBSD.org Subject: Re: "f" => "sc" gives diff error Message-ID: <1077564410.14512.74.camel@bobcat.mine.nu> In-Reply-To: <4039F04F.7030504@alumni.rice.edu> References: <4039F04F.7030504@alumni.rice.edu>
next in thread | previous in thread | raw e-mail | index | archive | help
--=-99CIFUAfevnjpF+M5rD0
Content-Type: text/plain
Content-Transfer-Encoding: 7bit
On Mon, 2004-02-23 at 14:21, Jon Noack wrote:
> Setting "f" => "sc" results in this error when attempting to view a
> preferred diff:
> /usr/bin/diff: conflicting specifications of output style
[...]
> diff - GNU diffutils version 2.7 (FreeBSD base system)
Yep, with Enscript colored side by side diffs, the -p option is
erroneously passed to rcsdiff (and thus to diff). And diff(1) from
diffutils < 2.8 does not like that, while at least 2.8.1 seems to ignore
it. A quick fix against CVSweb 2.9.3 is attached. Thanks for the
report!
--=-99CIFUAfevnjpF+M5rD0
Content-Disposition: inline; filename=cvsweb-sc.patch
Content-Type: text/x-patch; name=cvsweb-sc.patch; charset=iso-8859-1
Content-Transfer-Encoding: 7bit
--- cvsweb.cgi~ 2004-02-15 14:31:38.000000000 +0200
+++ cvsweb.cgi 2004-02-23 21:10:43.000000000 +0200
@@ -2314,7 +2314,7 @@
# apply special options
if ($showfunc) {
- push @difftype, '-p' if $f ne 's';
+ push @difftype, '-p' if $f !~ /^s/;
my ($re1, $re2);
--=-99CIFUAfevnjpF+M5rD0--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1077564410.14512.74.camel>