From owner-freebsd-cvsweb@FreeBSD.ORG  Fri Apr  1 18:35:19 2005
Return-Path: <owner-freebsd-cvsweb@FreeBSD.ORG>
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 2B34F16A4CE
	for <freebsd-cvsweb@freebsd.org>;
	Fri,  1 Apr 2005 18:35:19 +0000 (GMT)
Received: from rproxy.gmail.com (rproxy.gmail.com [64.233.170.197])
	by mx1.FreeBSD.org (Postfix) with ESMTP id BBBD943D46
	for <freebsd-cvsweb@freebsd.org>;
	Fri,  1 Apr 2005 18:35:18 +0000 (GMT)
	(envelope-from jpnairn@gmail.com)
Received: by rproxy.gmail.com with SMTP id a41so723195rng
	for <freebsd-cvsweb@freebsd.org>;
	Fri, 01 Apr 2005 10:35:18 -0800 (PST)
DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws;
	s=beta; d=gmail.com;
	h=received:message-id:date:from:reply-to:to:subject:mime-version:content-type:content-transfer-encoding;
	b=IXd3meSrT/bdn4Qwc0KV6HCDN2J8YAQObrrWo1+BClXJ6fiXp2a8KfzjExFcd5B6I2jQkmJ8mUkE2qz4bFGXTGIEC4LL9csaj/42i7XoyHCA3R7dZ0ulzvCukLpZBUyCLLN1eMPUFHt39j/zGqullC71UGtTCtbqMK923YvDN2c=
Received: by 10.38.151.1 with SMTP id y1mr3060184rnd;
        Fri, 01 Apr 2005 10:35:18 -0800 (PST)
Received: by 10.39.1.31 with HTTP; Fri, 1 Apr 2005 10:35:18 -0800 (PST)
Message-ID: <3bccd73d050401103575526b2c@mail.gmail.com>
Date: Fri, 1 Apr 2005 11:35:18 -0700
From: Jerry Nairn <jpnairn@gmail.com>
To: freebsd-cvsweb@freebsd.org
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Subject: [BUG] unknown-left unknown-right on diff of identical revisions
X-BeenThere: freebsd-cvsweb@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
Reply-To: Jerry Nairn <jpnairn@gmail.com>
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: Fri, 01 Apr 2005 18:35:19 -0000

Hi,
When you do a human readable colored or long colored diff of revisions 
which happen to be identical, like you might get by merging two branches, 
the revisions shown in the page are 'unknown-left' and 'unknown-right'. 
Maybe this is because of a difference in the way rcsdiff works on 
different platforms. I don't know.
In the human_readable_diff subroutine, rcsdiff output is parsed to get 
revision numbers. (Seems kind of goofy when you already have the revision 
numbers.) When there is no output from rcsdiff, this doesn't work, and 
these lines set the revisions to 'unknown-left' and 'unknown-right':

  $rev1  = 'unknown-left'  unless defined($rev1);
  $rev2  = 'unknown-right' unless defined($rev2);

I added these lines before those two lines above to fix this problem. I'm 
sure there's a nicer way to do this.

  $rev1  = $input{tr1} unless defined($rev1);
  $rev2  = $input{tr2} unless defined($rev2);

Sorry if you get this twice. I sent this yesterday, but got no bounced 
mail and did not see it on the list.
Cheers,

Jerry Nairn