From 489fd7ad0ce641d6793c36b39c3a3f402450850e Mon Sep 17 00:00:00 2001
From: Norman Walsh <ndw@nwalsh.com>
Date: Thu, 14 Mar 2002 14:57:34 +0000
Subject: [PATCH] Fix bug where some changes were improperly attributed

---
 cvstools/cvs2log | 38 ++++++++++++++++++++++++++------------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/cvstools/cvs2log b/cvstools/cvs2log
index 4b1cc8553..aff801760 100755
--- a/cvstools/cvs2log
+++ b/cvstools/cvs2log
@@ -67,7 +67,6 @@ foreach $dir (sort keys %{$log}) {
 
     $cutoff = $opt_c || "0000-00-00";
     if ($opt_w) {
-#	print "Writing $cl\n";
 	open (F, ">$cl");
     } else {
 	print "Would have written $cl\n";
@@ -82,12 +81,19 @@ foreach $dir (sort keys %{$log}) {
 
 	$msgs = {};
 	$author = "";
+	$lastauthor = "";
 
 	foreach $file (sort keys %{$log->{$dir}->{$date}}) {
 	    foreach $rev (sort keys %{$log->{$dir}->{$date}->{$file}}) {
 		$logmsg = $log->{$dir}->{$date}->{$file}->{$rev}->{'logmsg'};
 		$author = $log->{$dir}->{$date}->{$file}->{$rev}->{'author'};
 
+		if ($author ne $lastauthor && $lastauthor ne '') {
+		    &show_messages($date, $lastauthor, $msgs);
+		    $msgs = {};
+		}
+
+		$lastauthor = $author;
 
 		if (exists $msgs->{$logmsg}) {
 		    $msgsnew->{$logmsg} = $msgsnew->{$logmsg}
@@ -101,21 +107,29 @@ foreach $dir (sort keys %{$log}) {
 	    }
 	}
 
-	print F "$date  ", $authorName{$author}, "<$author\@users.sourceforge.net>\n\n";
+	&show_messages($date, $author, $msgs);
+    }
+    close (F);
+}
 
-	foreach $msg (sort fnsort keys %{$msgs}) {
-	    $files = $msgs->{$msg};
-	    print F "\t* $files: ";
-	    print F "\n\t" if (length($files) > 50);
+sub show_messages {
+    my $date = shift;
+    my $author = shift;
+    my $msgs = shift;
 
-	    if ($msgsnew->{$msg}) {
-		print F "New file.\n\n";
-	    } else {
-		print F "$msg\n";
-	    }
+    print F "$date  ", $authorName{$author}, "<$author\@users.sourceforge.net>\n\n";
+
+    foreach $msg (sort fnsort keys %{$msgs}) {
+	$files = $msgs->{$msg};
+	print F "\t* $files: ";
+	print F "\n\t" if (length($files) > 50);
+
+	if ($msgsnew->{$msg}) {
+	    print F "New file.\n\n";
+	} else {
+	    print F "$msg\n";
 	}
     }
-    close (F);
 }
 
 sub fnsort {
-- 
2.50.1