Re: cvs commit: src/test/test baaz

[YONETANI Tomokazu <qhwt+dfly@xxxxxxxxxx>]

On Sun, Apr 30, 2006 at 09:16:39AM -0700, Matthew Dillon wrote:
> 
> :Matt, do you have the following line in cvsweb.conf?
> :
> :  @rcsdiff_options = qw(-q);
> :
> :I believe this should prevent rcsdiff from complaining about the commitid.
> :
> :The relavant changes to cvsweb:
> :  http://docs.FreeBSD.org/cgi/mid.cgi?200308032035.h73KZ58o039826
> :
> :Cheers.
> 
>     That's not in there.  But the rev we are running is 1.119.2.6.  I
>     dunno if it has that feature or not.

It doesn't, but the change is trivial(attached), or even easier:
# cd /path/to/cvsweb_directory
# sed -i.orig 's/{rcsdiff}, /&"-q", /' cvsweb.cgi

Cheers.

Index: cvsweb.cgi
===================================================================
RCS file: /home/ncvs/projects/cvsweb/cvsweb.cgi,v
retrieving revision 1.119.2.6
diff -u -p -r1.119.2.6 cvsweb.cgi
--- cvsweb.cgi	26 Sep 2002 20:56:05 -0000	1.119.2.6
+++ cvsweb.cgi	1 May 2006 04:57:00 -0000
@@ -93,7 +93,7 @@ use vars qw (
     $module $use_descriptions %descriptions @mytz $dwhere $moddate
     $use_moddate $has_zlib $gzip_open
     $allow_tar @tar_options @gzip_options @zip_options @cvs_options
-    @annotate_options $LOG_FILESEPARATOR $LOG_REVSEPARATOR
+    @annotate_options @rcsdiff_options $LOG_FILESEPARATOR $LOG_REVSEPARATOR
     $tmpdir $HTML_DOCTYPE $HTML_META
 );
 
@@ -2040,7 +2040,8 @@ sub doDiff($$$$$$) {
 	if (!open($fh, "-|")) {    # child
 		open(STDERR, ">&STDOUT");    # Redirect stderr to stdout
 		openOutputFilter();
-		exec($CMD{rcsdiff}, @difftype, "-r$rev1", "-r$rev2", $fullname) or exit -1;
+		exec($CMD{rcsdiff}, @rcsdiff_options, @difftype,
+		     "-r$rev1", "-r$rev2", $fullname) or exit -1;
 	}
 	if ($human_readable) {
 		http_header();
Index: cvsweb.conf
===================================================================
RCS file: /home/ncvs/projects/cvsweb/cvsweb.conf,v
retrieving revision 1.36.2.3
diff -u -p -r1.36.2.3 cvsweb.conf
--- cvsweb.conf	23 Sep 2002 05:30:17 -0000	1.36.2.3
+++ cvsweb.conf	1 May 2006 04:57:00 -0000
@@ -511,6 +511,10 @@ push @cvs_options, '-u' if ($uname eq 'N
 #      To make annotate work against a read only repository, add -n, e.g.:
 #      @annotate_options = (@cvs_options, '-n');
 
+# Options to pass to rcsdiff(1).
+# Probably the only useful one here is -q (suppress diagnostic output).
+@rcsdiff_options = qw(-q);
+
 1;
 
 #EOF