From owner-freebsd-cvsweb@FreeBSD.ORG Thu Jan 12 20:30:10 2006 Return-Path: X-Original-To: freebsd-cvsweb@freebsd.org 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 B49E216A41F; Thu, 12 Jan 2006 20:30:10 +0000 (GMT) (envelope-from jrousell@ptc.com) Received: from relay2.ptc.com (relay2.ptc.com [12.11.148.122]) by mx1.FreeBSD.org (Postfix) with ESMTP id 25B3C43D45; Thu, 12 Jan 2006 20:30:10 +0000 (GMT) (envelope-from jrousell@ptc.com) Received: from hq-ex3fe2.ptcnet.ptc.com ([132.253.201.63]) by relay2.ptc.com with ESMTP; 12 Jan 2006 15:30:08 -0500 X-IronPort-AV: i="3.99,360,1131339600"; d="scan'208"; a="117747523:sNHT24694388" Received: from HQ-MAIL3.ptcnet.ptc.com ([132.253.202.90]) by HQ-EX3FE2.ptcnet.ptc.com with Microsoft SMTPSVC(6.0.3790.1830); Thu, 12 Jan 2006 15:30:07 -0500 X-MimeOLE: Produced By Microsoft Exchange V6.5 Content-class: urn:content-classes:message MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Date: Thu, 12 Jan 2006 15:30:06 -0500 Message-ID: <88CB0762D6EE6A4DAEA3A343AA39B2FD016A73A5@HQ-MAIL3.ptcnet.ptc.com> X-MS-Has-Attach: X-MS-TNEF-Correlator: Thread-Topic: Unable to get any DIffs to work Thread-Index: AcYXoxwOHYGN6q2YRuOezSZz2zVZbgAE64hA From: "Rousell, Jeff" To: X-OriginalArrivalTime: 12 Jan 2006 20:30:07.0324 (UTC) FILETIME=[FA0C61C0:01C617B6] Cc: freebsd-cvsweb@FreeBSD.org Subject: RE: Unable to get any DIffs to work X-BeenThere: freebsd-cvsweb@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS Web maintenance mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Jan 2006 20:30:10 -0000 Solaris 8. Adding GNU diffutils is an easy enough thing, but learning that you need to wasn't all that simple, I can imagine a quick mention of that in the INSTALL doc might help some. Thanks again for your time! Jeff -----Original Message----- From: Jonathan Noack [mailto:noackjr@alumni.rice.edu]=20 Sent: Thursday, January 12, 2006 1:08 PM To: Rousell, Jeff Cc: freebsd-cvsweb@FreeBSD.org; scop@freebsd.org Subject: Re: Unable to get any DIffs to work Jonathan Noack wrote: > Rousell, Jeff wrote: >> I am unable to get any diff outputs to work with a new CVSWeb=20 >> installation. >> =20 >> I am NOT a newbie who is posting here without first trying to solve=20 >> this myself. >> =20 >> The installation works perfectly for browsing and doing annotation=20 >> outputs but not for any diffs. rcsdiff and rlog ( 5.7) is installed=20 >> and has been confirmed to work fine from the command line. >> I am not getting not getting any 500 errors nor server error log info >> about the problem. >> =20 >> For the human readable diff I basically get a blank diff -- the page=20 >> looks fine with all eth header and footer prettiness- but the actual=20 >> "meat" of the page says: " - No viewable change - " >> =20 >> If I try a unified or side-by-side I get something like below printed >> to the browser( no header or footer prettiness): >> /bin/diff: illegal option -- - >> usage: diff [-bitw] [-c | -e | -f | -h | -n] file1 file2 >> diff [-bitw] [-C number] file1 file2 >> diff [-bitw] [-D string] file1 file2 >> diff [-bitw] [-c | -e | -f | -h | -n] [-l] [-r] [-s] [-S name] >> directory1 directory2 >> rcsdiff: /web-content/cvsroot/SCM/bin/jadd: diff failed >> I am able to use rcsdiff from the command line just fine. And it=20 >> appears as though cvsweb.cgi has the access to run rcsdiff and=20 >> knows where it is etc... >> Is there a debug flag that I cna sue so that it prints out the full diff >> command that it is trying to perform so thhat I could verify that fomr >> teh command line? >=20 > Which OS? Which version of CVSweb? Can you post of a diff between > cvsweb.conf.dist and your cvsweb.conf? >=20 > Uncommenting '$DEBUG =3D 1;' in cvsweb.conf will cause STDERR to be = sent > to your web server error log instead of /dev/null. However, for the=20 > rcsdiff command STDERR is sent to STDOUT by default so you are already > seeing any errors in your web browser. >=20 > Attached is a patch for CVSweb 3.0.6 which will print out the rcsdiff > command used. It should print out at the top of the diff output. >=20 > One final note: > When testing from the command-line be sure to run the command as the=20 > web > server user (i.e., 'sudo -u www rcsdiff ...'). Jeff sent me a message off-list that said he found that the problem was=20 with an older Solaris version of diff (rcsdiff runs diff to perform the=20 actual comparison). Everything worked fine once he started using the=20 GNU diffutils. Jeff, What version of Solaris are you running? Ville, Should we make a recommendation/requirement to use the GNU diffutils? -Jonathan