ports/120185: devel/cvsweb - Wrong revision when a log entry contains LOG_FILESEPR

[Henri Hennebert]

>Number:         120185
>Category:       ports
>Synopsis:       devel/cvsweb - Wrong revision when a log entry contains  LOG_FILESEPR
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jan 31 14:00:07 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Henri Hennebert
>Release:        FreeBSD 7.0-RC1
>Organization:
>Environment:
FreeBSD morzine.restart.bel 7.0-RC1 FreeBSD 7.0-RC1 #0: Sun Jan  6 17:58:29 CET 2008     root at morzine.restart.bel:/usr/obj/usr/src/sys/MORZINE  i386
>Description:
Hello,

When I display /src directory for RELENG_7, cvsweb.cgi display the wrong revision for UPDATING.

It is due to a log entry containing a line matching `^={77}$'.

I find that, at least on FreeBSD, rlog always display a file matching LOG_REVSEPR before the file separator (LOG_FILESEPR).

Henri
>How-To-Repeat:
http://www.freebsd.org/cgi/cvsweb.cgi/src/?only_with_tag=RELENG_7

Wrong revision of UPDATING - 1.507 sould be 1.507.2.3

http://www.freebsd.org/cgi/cvsweb.cgi/src/?only_with_tag=RELENG_7_0

UPDATING is not in the list.
>Fix:
--- cvsweb.cgi.orig     2005-09-25 22:28:51.000000000 +0200
+++ cvsweb.cgi  2007-12-06 18:05:47.463195725 +0100
@@ -2570,7 +2570,7 @@
     }

     if ($state eq "log") {
-      if ($_ =~ LOG_REVSEPR || $_ =~ LOG_FILESEPR) {
+      if ($_ =~ LOG_REVSEPR) {

         # End of a log entry.
         my $revbranch = $rev;
@@ -2615,7 +2615,7 @@
       }
     }

-    if ($_ =~ LOG_FILESEPR) {
+    if ($_ =~ LOG_FILESEPR && $rev eq '') {
       $state = "start";
       next;
     }


Patch attached with submission follows:

--- cvsweb.cgi.orig	2008-01-16 17:15:05.735574856 +0100
+++ cvsweb.cgi	2008-01-16 17:15:41.081962113 +0100
@@ -2570,7 +2570,7 @@
     }
 
     if ($state eq "log") {
-      if ($_ =~ LOG_REVSEPR || $_ =~ LOG_FILESEPR) {
+      if ($_ =~ LOG_REVSEPR) {
 
         # End of a log entry.
         my $revbranch = $rev;
@@ -2615,7 +2615,7 @@
       }
     }
 
-    if ($_ =~ LOG_FILESEPR) {
+    if ($_ =~ LOG_FILESEPR && $rev eq '') {
       $state = "start";
       next;
     }


>Release-Note:
>Audit-Trail:
>Unformatted: