Received: (from majordom@localhost) by hyperreal.org (8.8.5/8.8.5) id MAA13611; Tue, 5 Aug 1997 12:09:41 -0700 (PDT) Received: from valis.worldgate.com (marcs@valis.worldgate.com [198.161.84.2]) by hyperreal.org (8.8.5/8.8.5) with ESMTP id MAA13595 for ; Tue, 5 Aug 1997 12:09:36 -0700 (PDT) Received: from localhost (marcs@localhost) by valis.worldgate.com (8.8.5/8.8.5) with SMTP id NAA28598 for ; Tue, 5 Aug 1997 13:09:34 -0600 (MDT) Date: Tue, 5 Aug 1997 13:09:34 -0600 (MDT) From: Marc Slemko To: Apache Developer ML Subject: Re: [PATCH] log_accum.pl for branch commits fixed In-Reply-To: <199708010841.KAA10095@en1.engelschall.com> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: new-httpd-owner@apache.org Precedence: bulk Reply-To: new-httpd@apache.org You can test it yourself by making a copy of the whole repository on taz, editing it (and changing the address it sends mail to; only one place it needs to be changed in if I recall...), checking out that repository then committing it. Brian has to commit it, since it needs someone with root. On Fri, 1 Aug 1997, Ralf S. Engelschall wrote: > > Ok, now I've spended some time and jumped into the depths of CVS and > discovered why we always receive such ugly CVS log mails when comitting > something to a branch. > > |Modified: htdocs/manual/mod Tag: APACHE_1_2_X mod_rewrite.html > | Log: > | Merge in documentation update from HEAD. > | > | Revision Changes Path > | No revision > | > | > | No revision > | > | > | 1.9.2.3 +120 -58 apache/htdocs/manual/mod/mod_rewrite.html > | > | Index: mod_rewrite.html > | =================================================================== > | RCS file: /export/home/cvs/apache/htdocs/manual/mod/mod_rewrite.html,v > > The problem which caused the two ugly "No\s+revision" lines is this: When > log_accum.pl parses the commit message it does not skip the "Tag: > APACHE_1_2_X" line. Instead it thinks these are two filenames and later (when > generating the table it does... > > | :> cvs -Qn status Tag: > | =================================================================== > | File: no file Tag: Status: Unknown > | > | Working revision: No entry for Tag: > | Repository revision: No revision control file > | :> > > ...and instead of grepping out a number and the rcsfile after "Repository > revision:" it greps out "No" and "revision". And this is displayed in the > table :-(. The correct fix is not to detect such cases on "cvs status". > Instead the generation of the file list has to be fixed prior. And the fix is > to skip "Tag: ..." lines there. I've double-checked this approach with > FreeBSD's log_accum.pl. They've changed their log_accum.pl in a similar way > (but very different because their log_accum.pl is more advanced for branches). > > Here is the patch: > > --- log_accum.pl.old Fri Aug 1 10:28:46 1997 > +++ log_accum.pl Fri Aug 1 10:28:09 1997 > @@ -353,6 +353,7 @@ > push (@branch_lines, split); > next; > } > + next if (/^[ \t]+Tag:/); > if (/^Modified Files/) { $state = $STATE_CHANGED; next; } > if (/^Added Files/) { $state = $STATE_ADDED; next; } > if (/^Removed Files/) { $state = $STATE_REMOVED; next; } > > Could someone which is in the "cvsadmin" group (Alexei?, Roy?, Brian?) be so > kind and commit this or add me to the group? I really think it is correct, but > cannot test it myself easily. If it is not, we can back it out immediately. > So, no problem. > > Greetings, > Ralf S. Engelschall > rse@engelschall.com > www.engelschall.com >