From owner-freebsd-cvsweb@FreeBSD.ORG Sun Jun 22 12:23:29 2003 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 A80AC37B401; Sun, 22 Jun 2003 12:23:29 -0700 (PDT) Received: from amsfep11-int.chello.nl (amsfep11-int.chello.nl [213.46.243.20]) by mx1.FreeBSD.org (Postfix) with ESMTP id 38A7343F75; Sun, 22 Jun 2003 12:23:28 -0700 (PDT) (envelope-from paulgelderblom@bigfoot.com) Received: from ptok ([24.132.105.215]) by amsfep11-int.chello.nl (InterMail vM.5.01.05.17 201-253-122-126-117-20021021) with SMTP id <20030622192326.JEKR7516.amsfep11-int.chello.nl@ptok>; Sun, 22 Jun 2003 21:23:26 +0200 Message-ID: <001001c338f4$2f831000$0b00000a@a2000.nl> From: "Paul Gelderblom" To: Date: Sun, 22 Jun 2003 21:26:31 +0200 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_NextPart_000_000C_01C33904.F2EA4E40" X-Priority: 3 X-MSMail-Priority: Normal X-Mailer: Microsoft Outlook Express 5.50.4920.2300 X-MimeOLE: Produced By Microsoft MimeOLE V5.50.4920.2300 X-Content-Filtered-By: Mailman/MimeDel 2.1.1 cc: =?iso-8859-1?Q?Ville_Skytt=E4?= Subject: Contribution: show different icon for icon for binary (-kb) files and show keyword expansion mode on the log page X-BeenThere: freebsd-cvsweb@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Paul Gelderblom List-Id: CVS Web maintenance mailing list [restricted posting] List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Jun 2003 19:23:29 -0000 This is a multi-part message in MIME format. ------=_NextPart_000_000C_01C33904.F2EA4E40 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Hi all, Attached is a patch that makes cvsweb display a different icon for files = that are -according to the cvs server- binary files. Until now, cvsweb merely ignored keyword expansion lines in the (r)log, = but after this patch it uses them as follows: - in the directory page binary files get a different icon - in the log page, the keyword expansion type is shown, with an = additional note if it's a binary file. Of course, you need an icon for this; my 'artwork' is included (put it = in the cvsweb/icons folder) (based on the other icons already present = there; am I not infringing anyone's copyright?) For those who use the Apache icons ( in /icons by default on an apache = server) it will use the binary.gif already present there. The patch file included is a context diff against the current head = revision in the freebsd repository. Ville: It's a relatively small change so I hope it can be included there = .... Greetings, Paul Gelderblom paulgelderblom@bigfoot.com ------=_NextPart_000_000C_01C33904.F2EA4E40 Content-Type: application/octet-stream; name="binicon.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="binicon.patch" Index: cvsweb.cgi=0A= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A= RCS file: /home/ncvs/projects/cvsweb/cvsweb.cgi,v=0A= retrieving revision 1.149=0A= diff -c -r1.149 cvsweb.cgi=0A= *** cvsweb.cgi 4 May 2003 10:42:20 -0000 1.149=0A= --- cvsweb.cgi 22 Jun 2003 08:00:03 -0000=0A= ***************=0A= *** 62,68 ****=0A= %MIRRORS %DEFAULTVALUE %ICONS %MTYPES=0A= @DIFFTYPES %DIFFTYPES @LOGSORTKEYS %LOGSORTKEYS=0A= %alltags %fileinfo %tags @branchnames %nameprinted=0A= ! %symrev %revsym @allrevisions %date %author @revdisplayorder=0A= @revisions %state %difflines %log %branchpoint @revorder=0A= $prcgi @prcategories $re_prcategories $prkeyword $re_prkeyword = $mancgi=0A= $checkoutMagic $doCheckout $scriptname $scriptwhere=0A= --- 62,68 ----=0A= %MIRRORS %DEFAULTVALUE %ICONS %MTYPES=0A= @DIFFTYPES %DIFFTYPES @LOGSORTKEYS %LOGSORTKEYS=0A= %alltags %fileinfo %tags @branchnames %nameprinted=0A= ! %symrev %revsym @allrevisions %date %author @revdisplayorder = $keywordsubstitution=0A= @revisions %state %difflines %log %branchpoint @revorder=0A= $prcgi @prcategories $re_prcategories $prkeyword $re_prkeyword = $mancgi=0A= $checkoutMagic $doCheckout $scriptname $scriptwhere=0A= ***************=0A= *** 72,78 ****=0A= %input $query $barequery $sortby $bydate $byrev $byauthor=0A= $bylog $byfile $defaultDiffType $logsort $cvstree $cvsroot=0A= $mimetype $charset $output_filter $defaultTextPlain $defaultViewable=0A= ! $command_path %CMD $allow_compress $backicon $diricon $fileicon = $graphicon=0A= $fullname $newname $cvstreedefault $logo $defaulttitle $address=0A= $long_intro $short_instruction $shortLogLen $show_author=0A= $tablepadding $hr_breakable $showfunc $hr_ignwhite $hr_ignkeysubst=0A= --- 72,78 ----=0A= %input $query $barequery $sortby $bydate $byrev $byauthor=0A= $bylog $byfile $defaultDiffType $logsort $cvstree $cvsroot=0A= $mimetype $charset $output_filter $defaultTextPlain $defaultViewable=0A= ! $command_path %CMD $allow_compress $backicon $diricon $fileicon = $graphicon $binfileicon=0A= $fullname $newname $cvstreedefault $logo $defaulttitle $address=0A= $long_intro $short_instruction $shortLogLen $show_author=0A= $tablepadding $hr_breakable $showfunc $hr_ignwhite $hr_ignkeysubst=0A= ***************=0A= *** 793,799 ****=0A= =0A= if ($file eq '..' || -d "$fullname/$file") {=0A= next if ($file eq '..' && $where eq '/');=0A= ! my ($rev, $date, $log, $author, $filename) =3D = @{$fileinfo{$file}}=0A= if (defined($fileinfo{$file}));=0A= printf "\n",=0A= ($dirrow % 2) ? 'even' : 'odd';=0A= --- 793,799 ----=0A= =0A= if ($file eq '..' || -d "$fullname/$file") {=0A= next if ($file eq '..' && $where eq '/');=0A= ! my ($rev, $date, $log, $author, $filename, $keywordsubst) =3D = @{$fileinfo{$file}}=0A= if (defined($fileinfo{$file}));=0A= printf "\n",=0A= ($dirrow % 2) ? 'even' : 'odd';=0A= ***************=0A= *** 878,892 ****=0A= $url =3D './' . $fileurl . $query;=0A= $filesexists++;=0A= next if (!defined($fileinfo{$file}));=0A= ! my ($rev, $date, $log, $author) =3D @{$fileinfo{$file}};=0A= $filesfound++;=0A= printf "\n", ($dirrow % 2) ? 'even' : = 'odd';=0A= printf '', $allow_cvsgraph ? '' : ' colspan=3D"2"';=0A= =0A= if ($nofilelinks) {=0A= ! print $fileicon;=0A= } else {=0A= ! print &link($fileicon, $url);=0A= }=0A= print ' ', &link(htmlquote($file), $url), $attic;=0A= if ($allow_cvsgraph) {=0A= --- 878,893 ----=0A= $url =3D './' . $fileurl . $query;=0A= $filesexists++;=0A= next if (!defined($fileinfo{$file}));=0A= ! my ($rev, $date, $log, $author, $filename, $keywordsubst) =3D = @{$fileinfo{$file}};=0A= $filesfound++;=0A= printf "\n", ($dirrow % 2) ? 'even' : = 'odd';=0A= printf '', $allow_cvsgraph ? '' : ' colspan=3D"2"';=0A= =0A= + my $icon=3D($keywordsubst eq "b" ? $binfileicon:$fileicon);=0A= if ($nofilelinks) {=0A= ! print $icon;=0A= } else {=0A= ! print &link($icon, $url);=0A= }=0A= print ' ', &link(htmlquote($file), $url), $attic;=0A= if ($allow_cvsgraph) {=0A= ***************=0A= *** 2149,2154 ****=0A= --- 2150,2156 ----=0A= my $state =3D 'start';=0A= my ($date, $branchpoint, $branch, $log, @filetags);=0A= my ($rev, $revision, $revwanted, $filename, $head, $author);=0A= + my ($keywordsubst);=0A= =0A= while (<$fh>) {=0A= if ($state eq "start") {=0A= ***************=0A= *** 2163,2168 ****=0A= --- 2165,2171 ----=0A= $revision =3D '';=0A= %symrev =3D ();=0A= @filetags =3D ();=0A= + $keywordsubst=3D '';=0A= =0A= #jump to head state=0A= $state =3D "head";=0A= ***************=0A= *** 2180,2185 ****=0A= --- 2183,2190 ----=0A= $head =3D $1;=0A= } elsif (/^branch: (.+)$/) {=0A= $branch =3D $1;=0A= + } elsif (/^keyword substitution: (.+)$/) {=0A= + $keywordsubst =3D $1;=0A= } elsif (/^symbolic names:/) {=0A= $state =3D "tags";=0A= ($branch =3D $head) =3D~ s/\.\d+$//=0A= ***************=0A= *** 2250,2256 ****=0A= : 0=0A= && ($rev eq $head))=0A= { # Don't think head is needed here..=0A= ! my @finfo =3D ($rev, $date, $log, $author, $filename);=0A= my ($name);=0A= ($name =3D $filename) =3D~ s%/.*%%;=0A= $fileinfo{$name} =3D [@finfo];=0A= --- 2255,2261 ----=0A= : 0=0A= && ($rev eq $head))=0A= { # Don't think head is needed here..=0A= ! my @finfo =3D ($rev, $date, $log, $author, $filename, = $keywordsubst);=0A= my ($name);=0A= ($name =3D $filename) =3D~ s%/.*%%;=0A= $fileinfo{$name} =3D [@finfo];=0A= ***************=0A= *** 2313,2318 ****=0A= --- 2318,2324 ----=0A= undef %state;=0A= undef %difflines;=0A= undef %log;=0A= + $keywordsubstitution=3D"";=0A= =0A= if (!open($fh, "-|")) { # child=0A= if ($revision ne '') {=0A= ***************=0A= *** 2331,2342 ****=0A= } else {=0A= $symnames =3D 0;=0A= }=0A= ! } elsif (/^head:\s+([\d\.]+)/) {=0A= $head =3D $1;=0A= } elsif (/^branch:\s+([\d\.]+)/) {=0A= $curbranch =3D $1;=0A= } elsif (/^symbolic names/) {=0A= $symnames =3D 1;=0A= } elsif (/^-----/) {=0A= last;=0A= }=0A= --- 2337,2351 ----=0A= } else {=0A= $symnames =3D 0;=0A= }=0A= ! }=0A= ! if (/^head:\s+([\d\.]+)/) {=0A= $head =3D $1;=0A= } elsif (/^branch:\s+([\d\.]+)/) {=0A= $curbranch =3D $1;=0A= } elsif (/^symbolic names/) {=0A= $symnames =3D 1;=0A= + } elsif (/^keyword substitution: (.+)$/) {=0A= + $keywordsubstitution =3D $1;=0A= } elsif (/^-----/) {=0A= last;=0A= }=0A= ***************=0A= *** 2852,2857 ****=0A= --- 2861,2869 ----=0A= print "\n

\n
\n";=0A= =0A= print "

\n";=0A= + =0A= + my $explain=3D($keywordsubstitution =3D~ /b/) ? " (i.e.: CVS = considers this a binary file)":"";=0A= + print "Keyword substitution: $keywordsubstitution $explain
\n";=0A= print $curbranch=0A= ? ("Default branch: ", ($revsym{$curbranch} || $curbranch))=0A= : "No default branch";=0A= Index: cvsweb.conf=0A= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A= RCS file: /home/ncvs/projects/cvsweb/cvsweb.conf,v=0A= retrieving revision 1.49=0A= diff -c -r1.49 cvsweb.conf=0A= *** cvsweb.conf 4 May 2003 10:54:39 -0000 1.49=0A= --- cvsweb.conf 22 Jun 2003 08:00:05 -0000=0A= ***************=0A= *** 203,208 ****=0A= --- 203,209 ----=0A= back =3D> [('[BACK]', "$iconsdir/back.gif", 20, = 22)],=0A= dir =3D> [('[DIR]', "$iconsdir/dir.gif", 20, = 22)],=0A= file =3D> [('[TXT]', "$iconsdir/text.gif", 20, = 22)],=0A= + binfile =3D> [('[BINARY]',"$iconsdir/binary.gif", 20, = 22)],=0A= graph =3D> [('[GRAPH]', "$iconsdir/minigraph.png", 16, = 16)],=0A= );=0A= undef $iconsdir;=0A= ------=_NextPart_000_000C_01C33904.F2EA4E40-- From owner-freebsd-cvsweb@FreeBSD.ORG Sun Jun 22 12:42:47 2003 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 CA4A437B405 for ; Sun, 22 Jun 2003 12:42:47 -0700 (PDT) Received: from amsfep15-int.chello.nl (amsfep15-int.chello.nl [213.46.243.28]) by mx1.FreeBSD.org (Postfix) with ESMTP id B054043FE9 for ; Sun, 22 Jun 2003 12:42:41 -0700 (PDT) (envelope-from paulgelderblom@bigfoot.com) Received: from ptok ([24.132.105.215]) by amsfep15-int.chello.nl (InterMail vM.5.01.05.17 201-253-122-126-117-20021021) with SMTP id <20030622194240.TBMV1451.amsfep15-int.chello.nl@ptok> for ; Sun, 22 Jun 2003 21:42:40 +0200 Message-ID: <006a01c338f6$df566fc0$0b00000a@a2000.nl> From: "Paul Gelderblom" To: References: <001001c338f4$2f831000$0b00000a@a2000.nl> Date: Sun, 22 Jun 2003 21:45:45 +0200 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_NextPart_000_0067_01C33907.A2B60CE0" X-Priority: 3 X-MSMail-Priority: Normal X-Mailer: Microsoft Outlook Express 5.50.4920.2300 X-MimeOLE: Produced By Microsoft MimeOLE V5.50.4920.2300 X-Content-Filtered-By: Mailman/MimeDel 2.1.1 Subject: Re: Contribution: show different icon for binary (-kb) files -> the icon X-BeenThere: freebsd-cvsweb@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Paul Gelderblom List-Id: CVS Web maintenance mailing list [restricted posting] List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Jun 2003 19:42:48 -0000 This is a multi-part message in MIME format. ------=_NextPart_000_0067_01C33907.A2B60CE0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Apparently, the mail list ate my binary.gif icon attachment. Maybe it thought I was sending HTML mail :-)))) Here it is again, in a tar file... Paul ------=_NextPart_000_0067_01C33907.A2B60CE0-- From owner-freebsd-cvsweb@FreeBSD.ORG Mon Jun 23 12:07:06 2003 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 AE8A737B401 for ; Mon, 23 Jun 2003 12:07:06 -0700 (PDT) Received: from smtp2.pp.htv.fi (smtp2.pp.htv.fi [213.243.153.6]) by mx1.FreeBSD.org (Postfix) with ESMTP id 10AF743FBF for ; Mon, 23 Jun 2003 12:07:06 -0700 (PDT) (envelope-from scop@FreeBSD.org) Received: from posti.pp.htv.fi (posti.pp.htv.fi [212.90.64.50]) by smtp2.pp.htv.fi (Postfix) with ESMTP id E50F9296F06 for ; Mon, 23 Jun 2003 22:07:04 +0300 (EEST) Received: from cs78130147.pp.htv.fi (cs78130147.pp.htv.fi [62.78.130.147]) by posti.pp.htv.fi (8.11.1/8.11.1) with ESMTP id h5NJ9B927638 for ; Mon, 23 Jun 2003 22:09:11 +0300 (EETDST) From: Ville =?ISO-8859-1?Q?Skytt=E4?= To: freebsd-cvsweb@FreeBSD.org In-Reply-To: <3ECAB9B5.6060005@redhat.com> References: <3ECAA87C.7090406@softtek.com> <3ECAB9B5.6060005@redhat.com> Content-Type: text/plain; charset=ISO-8859-1 Organization: FreeBSD Message-Id: <1056395223.23164.153.camel@bobcat.ods.org> Mime-Version: 1.0 X-Mailer: Ximian Evolution 1.2.2 (1.2.2-5) Date: 23 Jun 2003 22:07:04 +0300 Content-Transfer-Encoding: 8bit Subject: Re: Error: Failed to spawn GNU rlog X-BeenThere: freebsd-cvsweb@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS Web maintenance mailing list [restricted posting] List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Jun 2003 19:07:07 -0000 On Wed, 2003-05-21 at 02:26, Bernd Groh wrote: > It's very simple, it only checks whether you've got write-permissions to > all the files you want to spawn rlog on, and if you don't, then it > doesn't spawn rlog on that particular file (as a result, rlog seems to > not complain anymore either). You can actually, given you can see the > files, check for read-permissions and output an according error-message, > this wouldn't require manual fixes in the script later on in order to > determine whether you've got the right permissions. Thanks for the patch, and sorry for the delay; I just committed a slightly modified version to the CVSweb development branch. -- \/ille Skyttä scop at FreeBSD.org From owner-freebsd-cvsweb@FreeBSD.ORG Mon Jun 23 14:37:11 2003 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 B1CB637B401 for ; Mon, 23 Jun 2003 14:37:11 -0700 (PDT) Received: from smtp1.pp.htv.fi (smtp1.pp.htv.fi [212.90.64.111]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1ACC643FDD for ; Mon, 23 Jun 2003 14:37:11 -0700 (PDT) (envelope-from scop@FreeBSD.org) Received: from posti.pp.htv.fi (posti.pp.htv.fi [212.90.64.50]) by smtp1.pp.htv.fi (Postfix) with ESMTP id 0551D7FEA6 for ; Tue, 24 Jun 2003 00:37:10 +0300 (EEST) Received: from cs78130147.pp.htv.fi (cs78130147.pp.htv.fi [62.78.130.147]) by posti.pp.htv.fi (8.11.1/8.11.1) with ESMTP id h5NLdH928842 for ; Tue, 24 Jun 2003 00:39:17 +0300 (EETDST) From: Ville =?ISO-8859-1?Q?Skytt=E4?= To: freebsd-cvsweb@FreeBSD.org In-Reply-To: <20030530174527.GA25625@bzz.taranis.org> References: <20030530174527.GA25625@bzz.taranis.org> Content-Type: text/plain; charset=ISO-8859-1 Organization: FreeBSD Message-Id: <1056404228.23164.173.camel@bobcat.ods.org> Mime-Version: 1.0 X-Mailer: Ximian Evolution 1.2.2 (1.2.2-5) Date: 24 Jun 2003 00:37:09 +0300 Content-Transfer-Encoding: 8bit Subject: Re: couple minor bugs [correct diff] X-BeenThere: freebsd-cvsweb@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS Web maintenance mailing list [restricted posting] List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Jun 2003 21:37:12 -0000 On Fri, 2003-05-30 at 20:45, Christophe Kalt wrote: > You need to set stdout to be automatically flushed to avoid > having a child (such as cvsgraph) flushing the same content > as the parent a second time. > > a "$| = 1;" well placed (may be in BEGIN) does the trick. Hmm, there are multiple places where $| is fiddled with in cvsweb.cgi, and placing that in BEGIN could have Side Effects... I'm thinking about reworking the opens and pipes in cvsweb.cgi anyway using IPC::Run so it would work with mod_perl 1.99+ as well. > The attached diff also fixes a small problem with DoGraphView. Applied, thanks. > Finally, having working annotations w/o read-write access is > awesome, finally, thanks! You may want to update the comments > for $allow_annotate. Done, thanks for the heads up. Cheers, -- \/ille Skyttä scop at FreeBSD.org From owner-freebsd-cvsweb@FreeBSD.ORG Mon Jun 23 14:41:50 2003 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 DA5AF37B404 for ; Mon, 23 Jun 2003 14:41:50 -0700 (PDT) Received: from smtp1.pp.htv.fi (smtp1.pp.htv.fi [212.90.64.111]) by mx1.FreeBSD.org (Postfix) with ESMTP id 03BFA44008 for ; Mon, 23 Jun 2003 14:41:48 -0700 (PDT) (envelope-from scop@FreeBSD.org) Received: from posti.pp.htv.fi (posti.pp.htv.fi [212.90.64.50]) by smtp1.pp.htv.fi (Postfix) with ESMTP id BFAE080014 for ; Tue, 24 Jun 2003 00:41:47 +0300 (EEST) Received: from cs78130147.pp.htv.fi (cs78130147.pp.htv.fi [62.78.130.147]) by posti.pp.htv.fi (8.11.1/8.11.1) with ESMTP id h5NLhs900269 for ; Tue, 24 Jun 2003 00:43:55 +0300 (EETDST) From: Ville =?ISO-8859-1?Q?Skytt=E4?= To: freebsd-cvsweb@FreeBSD.org In-Reply-To: <014c01c32b61$767ad790$9e31869f@okeeffecrh3fg7> References: <014c01c32b61$767ad790$9e31869f@okeeffecrh3fg7> Content-Type: text/plain; charset=ISO-8859-1 Organization: FreeBSD Message-Id: <1056404507.23164.179.camel@bobcat.ods.org> Mime-Version: 1.0 X-Mailer: Ximian Evolution 1.2.2 (1.2.2-5) Date: 24 Jun 2003 00:41:47 +0300 Content-Transfer-Encoding: 8bit Subject: Re: Unexpected output from cvs co X-BeenThere: freebsd-cvsweb@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS Web maintenance mailing list [restricted posting] List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Jun 2003 21:41:51 -0000 On Thu, 2003-06-05 at 15:53, Chris ;o) wrote: > Error: Unexpected output from cvs co: opendir(/home/glu/cvsroot//../..): Permission denied at /home/glu/cgi-bin/cvsweb-2.0.6/cvsweb.cgi line 1837 cvs checkout: CVSROOT is set but empty! Make sure that the cvs checkout: specification of CVSROOT is legal, either via the cvs checkout: `-d' option, the CVSROOT environment variable, or the cvs [checkout aborted]: CVS/Root file (if any). > This is where my cvsroot is is located > > echo $CVSROOT > /home/glu/cvsroot The $CVSROOT environment variable doesn't affect CVSweb, the roots are configured it's set in cvsweb.conf. Have you added /home/glu/cvsroot into @CVSrepositories there? HTH, -- \/ille Skyttä scop at FreeBSD.org From owner-freebsd-cvsweb@FreeBSD.ORG Mon Jun 23 14:46:48 2003 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 84C8737B401 for ; Mon, 23 Jun 2003 14:46:48 -0700 (PDT) Received: from smtp1.pp.htv.fi (smtp1.pp.htv.fi [212.90.64.111]) by mx1.FreeBSD.org (Postfix) with ESMTP id DC77B43F75 for ; Mon, 23 Jun 2003 14:46:47 -0700 (PDT) (envelope-from scop@FreeBSD.org) Received: from posti.pp.htv.fi (posti.pp.htv.fi [212.90.64.50]) by smtp1.pp.htv.fi (Postfix) with ESMTP id 3E5097FEA6 for ; Tue, 24 Jun 2003 00:46:47 +0300 (EEST) Received: from cs78130147.pp.htv.fi (cs78130147.pp.htv.fi [62.78.130.147]) by posti.pp.htv.fi (8.11.1/8.11.1) with ESMTP id h5NLms901801 for ; Tue, 24 Jun 2003 00:48:54 +0300 (EETDST) From: Ville =?ISO-8859-1?Q?Skytt=E4?= To: freebsd-cvsweb@FreeBSD.org In-Reply-To: <00c401c3344b$3e8793d0$34eda8c0@Reynolds> References: <00c401c3344b$3e8793d0$34eda8c0@Reynolds> Content-Type: text/plain; charset=ISO-8859-1 Organization: FreeBSD Message-Id: <1056404806.23164.185.camel@bobcat.ods.org> Mime-Version: 1.0 X-Mailer: Ximian Evolution 1.2.2 (1.2.2-5) Date: 24 Jun 2003 00:46:46 +0300 Content-Transfer-Encoding: 8bit Subject: Re: cvsweb - Error: Failed to spawn GNU rlog X-BeenThere: freebsd-cvsweb@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS Web maintenance mailing list [restricted posting] List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Jun 2003 21:46:48 -0000 On Tue, 2003-06-17 at 00:07, Yves Fournier wrote: > I'm not sure if I'm asking the right group of people for help but I > haven't found any discussion boards (newsgroups) to get help with my > problem. Yes, you're on the correct list. > I'm having trouble getting cvsweb to run. Everything is set up > properly (CVSROOT, .conf file, the path to rm, rlog, etc...) but I > keep on getting this error > > Error: Failed to spawn GNU rlog on "all my file names in cvs" > > Did you set the $command_path in your configuration file correctly ? > (Currently "/bin:/usr/bin:/usr/local/bin" > > I am able to run rlog from the command line but I can't get it to run > in the cvsweb.cgi script. > > The web server that I'm running is Apache, I'm not sure which modules > are running, my Perl version is 5.0.8 using mod_perl 2 Most likely that's the problem, mod_perl 2 has issues with the current cvsweb.cgi. These will be sorted out eventually. In the meantime, I'd say running without cvsweb.cgi without mod_perl 2 is a better bet. OTOH, mod_perl 1.2x should work. HTH, -- \/ille Skyttä scop at FreeBSD.org From owner-freebsd-cvsweb@FreeBSD.ORG Mon Jun 23 16:12:29 2003 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 2E2F437B401 for ; Mon, 23 Jun 2003 16:12:29 -0700 (PDT) Received: from smtp3.pp.htv.fi (smtp3.pp.htv.fi [213.243.153.135]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8D3CB43F93 for ; Mon, 23 Jun 2003 16:12:28 -0700 (PDT) (envelope-from scop@FreeBSD.org) Received: from posti.pp.htv.fi (posti.pp.htv.fi [212.90.64.50]) by smtp3.pp.htv.fi (Postfix) with ESMTP id A76AA27AC5B for ; Tue, 24 Jun 2003 02:12:27 +0300 (EEST) Received: from cs78130147.pp.htv.fi (cs78130147.pp.htv.fi [62.78.130.147]) by posti.pp.htv.fi (8.11.1/8.11.1) with ESMTP id h5NNEZ923129 for ; Tue, 24 Jun 2003 02:14:35 +0300 (EETDST) From: Ville =?ISO-8859-1?Q?Skytt=E4?= To: freebsd-cvsweb@FreeBSD.org In-Reply-To: References: Content-Type: text/plain; charset=ISO-8859-1 Organization: FreeBSD Message-Id: <1056409946.23164.214.camel@bobcat.ods.org> Mime-Version: 1.0 X-Mailer: Ximian Evolution 1.2.2 (1.2.2-5) Date: 24 Jun 2003 02:12:27 +0300 Content-Transfer-Encoding: 8bit Subject: Re: annotate error X-BeenThere: freebsd-cvsweb@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS Web maintenance mailing list [restricted posting] List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Jun 2003 23:12:29 -0000 On Wed, 2003-06-18 at 19:16, Edward Quick wrote: > Annotation of proxy/wte_logon_ldap/authcache.c, Revision 1.2 > Status: 500 Internal Error > Content-Type: text/html > > Error > Error: Error occured during annotate: error > > Could anyone help me out please? (I am a cvs newbie). The first thing to check would be your web server's error log, often eg. /var/log/httpd/error_log. It probably contains a more descriptive error message. Annotation problems are usually caused by missing configuration or file permissions. See the commentary near $allow_annotate in cvsweb.conf. The next FreeBSD-CVSweb version won't require any special permissions for annotate to work. HTH, -- \/ille Skyttä scop at FreeBSD.org From owner-freebsd-cvsweb@FreeBSD.ORG Tue Jun 24 02:12:05 2003 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 CC45837B401 for ; Tue, 24 Jun 2003 02:12:05 -0700 (PDT) Received: from smtp1.pp.htv.fi (smtp1.pp.htv.fi [212.90.64.111]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2DDEE43F3F for ; Tue, 24 Jun 2003 02:12:05 -0700 (PDT) (envelope-from scop@FreeBSD.org) Received: from posti.pp.htv.fi (posti.pp.htv.fi [212.90.64.50]) by smtp1.pp.htv.fi (Postfix) with ESMTP id 56E9280376 for ; Tue, 24 Jun 2003 12:12:04 +0300 (EEST) Received: from cs78130147.pp.htv.fi (cs78130147.pp.htv.fi [62.78.130.147]) by posti.pp.htv.fi (8.11.1/8.11.1) with ESMTP id h5O9EC901710 for ; Tue, 24 Jun 2003 12:14:12 +0300 (EETDST) From: Ville =?ISO-8859-1?Q?Skytt=E4?= To: freebsd-cvsweb@FreeBSD.org In-Reply-To: <001001c338f4$2f831000$0b00000a@a2000.nl> References: <001001c338f4$2f831000$0b00000a@a2000.nl> Content-Type: text/plain; charset=ISO-8859-1 Organization: FreeBSD Message-Id: <1056445923.23164.267.camel@bobcat.ods.org> Mime-Version: 1.0 X-Mailer: Ximian Evolution 1.2.2 (1.2.2-5) Date: 24 Jun 2003 12:12:03 +0300 Content-Transfer-Encoding: 8bit Subject: Re: Contribution: show different icon for icon for binary (-kb) files and show keyword expansion mode on the log page X-BeenThere: freebsd-cvsweb@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS Web maintenance mailing list [restricted posting] List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Jun 2003 09:12:06 -0000 On Sun, 2003-06-22 at 22:26, Paul Gelderblom wrote: > > The patch file included is a context diff against the current head > revision in the freebsd repository. Cool, unidiffs would be even better :) > Ville: It's a relatively small change so I hope it can be included > there .... Thanks, it looks mostly good, but a couple of remarks: - } elsif (/^head:\s+([\d\.]+)/) { + } + if (/^head:\s+([\d\.]+)/) { That hunk in readLog() would change the existing behaviour, I've changed it into: $symrev{$1} = $2; + next; } else { $symnames = 0; } - } elsif (/^head:\s+([\d\.]+)/) { + } + if (/^head:\s+([\d\.]+)/) { I also opened your .gif in Gimp and just saved it again to save almost 800 bytes :) BTW, it looks like the list ate some of your attachments but the Cc: to me worked just fine. Cheers, -- \/ille Skyttä scop at FreeBSD.org From owner-freebsd-cvsweb@FreeBSD.ORG Tue Jun 24 02:38:21 2003 Return-Path: Delivered-To: freebsd-cvsweb@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B3F8D37B401; Tue, 24 Jun 2003 02:38:21 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 508DC43F3F; Tue, 24 Jun 2003 02:38:21 -0700 (PDT) (envelope-from scop@FreeBSD.org) Received: from freefall.freebsd.org (scop@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h5O9cLUp021065; Tue, 24 Jun 2003 02:38:21 -0700 (PDT) (envelope-from scop@freefall.freebsd.org) Received: (from scop@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h5O9cKL6021061; Tue, 24 Jun 2003 02:38:20 -0700 (PDT) Date: Tue, 24 Jun 2003 02:38:20 -0700 (PDT) From: Ville Skyttä Message-Id: <200306240938.h5O9cKL6021061@freefall.freebsd.org> To: arc@a5r.highway.ne.jp, scop@FreeBSD.org, freebsd-cvsweb@FreeBSD.org Subject: Re: ports/53450: [patch] Cvsweb 2.0.6 or above cause an error with white-space inc X-BeenThere: freebsd-cvsweb@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS Web maintenance mailing list [restricted posting] List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Jun 2003 09:38:22 -0000 Synopsis: [patch] Cvsweb 2.0.6 or above cause an error with white-space inc State-Changed-From-To: open->closed State-Changed-By: scop State-Changed-When: Tue Jun 24 02:35:26 PDT 2003 State-Changed-Why: Thanks, but this has already been fixed in the development branch of CVSweb. http://www.freebsd.org/cgi/query-pr.cgi?pr=53450 From owner-freebsd-cvsweb@FreeBSD.ORG Wed Jun 25 07:11:06 2003 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 EF98E37B401 for ; Wed, 25 Jun 2003 07:11:06 -0700 (PDT) Received: from smtp2.pp.htv.fi (smtp2.pp.htv.fi [213.243.153.6]) by mx1.FreeBSD.org (Postfix) with ESMTP id 556064401F for ; Wed, 25 Jun 2003 07:11:06 -0700 (PDT) (envelope-from scop@FreeBSD.org) Received: from posti.pp.htv.fi (posti.pp.htv.fi [212.90.64.50]) by smtp2.pp.htv.fi (Postfix) with ESMTP id 4CFF2297B3A for ; Wed, 25 Jun 2003 17:11:05 +0300 (EEST) Received: from cs78130147.pp.htv.fi (cs78130147.pp.htv.fi [62.78.130.147]) by posti.pp.htv.fi (8.11.1/8.11.1) with ESMTP id h5PEB5505133 for ; Wed, 25 Jun 2003 17:11:05 +0300 (EETDST) From: Ville =?ISO-8859-1?Q?Skytt=E4?= To: freebsd-cvsweb@FreeBSD.org In-Reply-To: <20030528081945.DVGY29707.mf2@mf2.bredband.net> References: <20030528081945.DVGY29707.mf2@mf2.bredband.net> Content-Type: text/plain Organization: FreeBSD Message-Id: <1056550264.13159.4.camel@bobcat.ods.org> Mime-Version: 1.0 X-Mailer: Ximian Evolution 1.2.2 (1.2.2-5) Date: 25 Jun 2003 17:11:04 +0300 Content-Transfer-Encoding: 7bit Subject: Re: cvsweb and binary files X-BeenThere: freebsd-cvsweb@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS Web maintenance mailing list [restricted posting] List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Jun 2003 14:11:07 -0000 On Wed, 2003-05-28 at 11:19, daniel.wallner@bredband.net wrote: > We are using cvsweb to browse our cvs repository where we have both > text based design files and binary documents. > For text files cvsweb behaves acceptable but for binary documents > the default behavior is a bit weird. > This is mainly due to that the default mime type is text for nearly > all files, while this is fine for Internet Explorer that seems to > ignore the type, Netscape just displays garbage. > But there are also some bugs related to this. [...] Thanks for the walkthrough, Daniel. I've committed reworked MIME type handling to CVS HEAD, it should address most issues involved, probably not all though. Could you give it a try and let me know how it looks to you? Note that MIME::Types(3) will now be used in the type lookup if it's available. -- \/ From owner-freebsd-cvsweb@FreeBSD.ORG Thu Jun 26 10:33:03 2003 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 4D3F837B401; Thu, 26 Jun 2003 10:33:03 -0700 (PDT) Received: from mf1.bredband.net (mf1.bredband.net [195.54.106.36]) by mx1.FreeBSD.org (Postfix) with ESMTP id CA70843F3F; Thu, 26 Jun 2003 10:33:01 -0700 (PDT) (envelope-from daniel.wallner@bredband.net) Received: from mf1.bredband.net ([195.54.106.36]) by mf1.bredband.net with SMTP id <20030626173300.ULK8361.mf1@mf1.bredband.net>; Thu, 26 Jun 2003 19:33:00 +0200 From: To: Ville =?ISO-8859-1?Q?Skytt=E4=20?= Date: Thu, 26 Jun 2003 19:33:00 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Message-Id: <20030626173300.ULK8361.mf1@mf1.bredband.net> cc: cvsweb@FreeBSD.org Subject: Re: Re: cvsweb and binary files X-BeenThere: freebsd-cvsweb@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS Web maintenance mailing list [restricted posting] List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Jun 2003 17:33:03 -0000 > Could you give it a try and let me know how it looks to you? Note that > MIME::Types(3) will now be used in the type lookup if it's available. Seems to work almost perfectly, once I changed the path to mime.types. I didn't have MIME::Types installed so I didn't test that. It might be a good idea to mention MIME::Types and mime.types in INSTALL though. But I guess you have already thought of this. I changed my mind about the view and download links changing behaviour depending on if the file is viewable or not. I left that alone this time. Although the current behaviour apparently is confusing to some, it is probably more elegant the way it is done now. Opinions anyone? I did however change another thing to make it behave like I wanted it to: menubar should be added to line 3628. If it isn't, it's not obvious how to save the file you just downloaded. The behaviour is even more odd for html files, then you get the toolbar and the status bar, but not any menu. I also have a feature request. It would be nice with a search function in cvsweb. I did this as a separate cgi script but it would be more practical if it was integrated into cvsweb. Just run find -name from the current directory and parse the output to get links back into cvsweb. And a side note: The long intro in cvsweb.conf isn't correct. Selecting a revision number doesn't always download the file. Although more often now when the mime type is correct. Regards, Daniel Wallner From owner-freebsd-cvsweb@FreeBSD.ORG Fri Jun 27 09:06:50 2003 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 12AE137B401; Fri, 27 Jun 2003 09:06:50 -0700 (PDT) Received: from amsfep12-int.chello.nl (amsfep12-int.chello.nl [213.46.243.18]) by mx1.FreeBSD.org (Postfix) with ESMTP id B8CA043FCB; Fri, 27 Jun 2003 09:06:48 -0700 (PDT) (envelope-from ptok@iname.com) Received: from RDPAULG ([24.132.105.215]) by amsfep12-int.chello.nl (InterMail vM.5.01.05.17 201-253-122-126-117-20021021) with SMTP id <20030627160646.DDAI6336.amsfep12-int.chello.nl@RDPAULG>; Fri, 27 Jun 2003 18:06:46 +0200 Message-ID: <001401c33cc6$1b935f20$3201a8c0@medis.local> From: "paul gelderblom" To: , =?iso-8859-1?Q?Ville_Skytt=E4?= References: <20030626173300.ULK8361.mf1@mf1.bredband.net> Date: Fri, 27 Jun 2003 18:06:45 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit X-Priority: 3 X-MSMail-Priority: Normal X-Mailer: Microsoft Outlook Express 6.00.2800.1158 X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2800.1165 X-Mailman-Approved-At: Fri, 27 Jun 2003 09:41:58 -0700 cc: cvsweb@FreeBSD.org Subject: Re: Re: cvsweb and binary files X-BeenThere: freebsd-cvsweb@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS Web maintenance mailing list [restricted posting] List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Jun 2003 16:06:50 -0000 Daniel, others: Daniel wrote: > I also have a feature request. > It would be nice with a search function in cvsweb. > I did this as a separate cgi script but it would be more practical if it was > integrated into cvsweb. > Just run find -name from the current directory and parse the output to > get links back into cvsweb. I built that! Using File::find. It integrates with cvsweb (both ways: from cvsweb you can link to the search functionality, allowing searches starting in a certain directory, and from the search you get linked to the file in cvsweb) It also does: - content searches in RCS files or the latest revision (look for 'readme.*' files containing 'Known Bug') - regexes or just strings for the content match; - filename selection using wildcards patterns (*.cpp) or regexes - case sensitivity or not for both match types - selection based on edit status (watch on/off ; edited files) - selection based on file type (-kb -> binary ) and combinations of the above. However: - Due to the nature of it (blunt filesytem search) , it is a resource eater. Maintainers on public repositories may not want it installed! - I did not include taint checking (have only friendly users here). Thay may even be complex, due to the user-specified regexes. I do not think it should be integrated *in* CVSWEB since that is already complex enough: just integrate *with* cvswevb: crosslinks in both directions Anyhow, enough blabla: should I post it? Paul