From owner-freebsd-cvsweb@FreeBSD.ORG  Thu Dec  6 17:09:58 2007
Return-Path: <owner-freebsd-cvsweb@FreeBSD.ORG>
Delivered-To: freebsd-cvsweb@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2168D16A41A
	for <freebsd-cvsweb@FreeBSD.org>; Thu,  6 Dec 2007 17:09:58 +0000 (UTC)
	(envelope-from hlh@restart.be)
Received: from tignes.restart.be (unknown [IPv6:2001:41d0:1:2ad2::1])
	by mx1.freebsd.org (Postfix) with ESMTP id AA7AA13C4EC
	for <freebsd-cvsweb@FreeBSD.org>; Thu,  6 Dec 2007 17:09:57 +0000 (UTC)
	(envelope-from hlh@restart.be)
Received: from restart.be (avoriaz.tunnel.bel [IPv6:2001:41d0:1:2ad2::fffe:0])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(Client CN "avoriaz.restart.be", Issuer "CA master" (verified OK))
	by tignes.restart.be (Postfix) with ESMTP id 763641BAC2E
	for <freebsd-cvsweb@FreeBSD.org>; Thu,  6 Dec 2007 18:09:56 +0100 (CET)
Received: from avoriaz.restart.bel (avoriaz.restart.bel [192.168.24.1])
	(authenticated bits=0)
	by restart.be (8.14.1/8.14.1) with ESMTP id lB6H9r78075385
	for <freebsd-cvsweb@FreeBSD.org>; Thu, 6 Dec 2007 18:09:54 +0100 (CET)
	(envelope-from hlh@restart.be)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=restart.be;
	s=avoriaz; t=1196960995; bh=UwCR/9sLZH4OuixMOxdoRPgwGaLHGwS/GNu/IBW
	TWqA=; h=DomainKey-Signature:Message-ID:Date:From:Organization:
	User-Agent:MIME-Version:To:Subject:Content-Type:
	Content-Transfer-Encoding:X-Scanned-By; b=aHsaA1wf4hT8dbpXZ8KoHQgP
	wmpg2e52RhZWY0AaDP7fovNOOQGKuHMorgZt3XFPzfq72ja6q78QQhLheFsJYQ==
DomainKey-Signature: a=rsa-sha1; s=avoriaz; d=restart.be; c=nofws; q=dns;
	h=message-id:date:from:organization:user-agent:mime-version:to:
	subject:content-type:content-transfer-encoding:x-scanned-by;
	b=TkIpRRLiDB7noyys1N6C5YVpsFVRg7jdtnvubTjSYYW04nZdnyPz+N53n9420YD7a
	vh4v4Lgpai3SSMTtF3dbg==
Message-ID: <47582CE1.4080905@restart.be>
Date: Thu, 06 Dec 2007 18:09:53 +0100
From: Henri Hennebert <hlh@restart.be>
Organization: RestartSoft
User-Agent: Thunderbird 2.0.0.9 (X11/20071120)
MIME-Version: 1.0
To: freebsd-cvsweb@FreeBSD.org
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
X-Scanned-By: MIMEDefang 2.63 on 192.168.24.1
Cc: 
Subject: Wrong revision when a log entry contains  LOG_FILESEPR
X-BeenThere: freebsd-cvsweb@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS Web maintenance mailing list <freebsd-cvsweb.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-cvsweb>, 
	<mailto:freebsd-cvsweb-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-cvsweb>
List-Post: <mailto:freebsd-cvsweb@freebsd.org>
List-Help: <mailto:freebsd-cvsweb-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-cvsweb>,
	<mailto:freebsd-cvsweb-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 06 Dec 2007 17:09:58 -0000

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).

I propose the following patch against cvsweb.cgi 2.0.6:

--- 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;
      }

Hope it help

Henri