X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Porting%2FcheckAUTHORS.pl;h=9e3f26437a9c0274dcc398517e93ed237b62442e;hb=102b13d314016f7ec14c00406088a88475fe52db;hp=4468667dde2f36e4e706324f8e2f39beab3a9520;hpb=2b90724c7ae6c26175f0c0b181c388413a96937d;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/Porting/checkAUTHORS.pl b/Porting/checkAUTHORS.pl
index 4468667..9e3f264 100644
--- a/Porting/checkAUTHORS.pl
+++ b/Porting/checkAUTHORS.pl
@@ -5,16 +5,24 @@ $Text::Wrap::columns = 80;
 my ($committer, $patch, $log);
 use Getopt::Long;
 
-my ($rank, $ta, @authors, %authors, %untraced, %patchers, %committers);
+my ($rank, $percentage, $cumulative, $reverse, $ta, @authors, %authors,
+    %untraced, %patchers, %committers);
 my $result = GetOptions ("rank" => \$rank,		    # rank authors
 			 "thanks-applied" => \$ta,	    # ranks committers
-			 "acknowledged=s"   => \@authors);  # authors files
+			 "acknowledged=s"   => \@authors ,  # authors files
+			 "percentage" => \$percentage,      # show as %age
+			 "cumulative" => \$cumulative,
+			 "reverse" => \$reverse,
+			);
 
 if (!$result or (($rank||0) + ($ta||0) + (@authors ? 1 : 0) != 1) or !@ARGV) {
   die <<"EOS";
 $0 --rank Changelogs                        # rank authors by patches
 $0 --acknowledged <authors file> Changelogs # Display unacknowledged authors
 $0 --thanks-applied Changelogs		    # ranks committers
+$0 --percentage ...                         # show rankings as percentages
+$0 --cumulative ...                         # show rankings cumulatively
+$0 --reverse ...                            # show rankings in reverse
 Specify stdin as - if needs be. Remember that option names can be abbreviated.
 EOS
 }
@@ -98,7 +106,7 @@ my %map = reverse (
 		   "whatever\100davidnicol.com" => "davidnicol\100gmail.com",
 		   "rmgiroux\100acm.org" => "rmgiroux\100hotmail.com",
 		   "smcc\100mit.edu" => "smcc\100ocf.berkeley.edu",
-		   "steven\100accognoscere.org" => "schubiger\100cpan.org",
+		   "schubiger\100cpan.org" => "steven\100accognoscere.org",
 		   "richard.foley\100ubsw.com"
 		   => "richard.foley\100t-online.de",
 		   "damian\100cs.monash.edu.au" => "damian\100conway.org",
@@ -107,6 +115,7 @@ my %map = reverse (
 		   "paul.green\100stratus.com"
 		   => "paul_greenvos\100vos.stratus.com",
 		   "alian\100cpan.org" => "alian\100alianwebserver.com",
+		   "david.dyck\100fluke.com" => "dcd\100tc.fluke.com",
 		   # Maybe we should special case this to get real names out?
 		   "perlbug\100perl.org" => "perlbug-followup\100perl.org",
 		  );
@@ -115,7 +124,7 @@ my %map = reverse (
 
 $map{"autrijus\100egb.elixus.org"} = $map{"autrijus\100geb.elixus.org"}
   = $map{"autrijus\100gmail.com"} = $map{"autrijus\100ossf.iis.sinica.edu.tw"}
-  = "autrijus\100autrijus.org";
+  = $map{"autrijus\100autrijus.org"} = "cpan\100audreyt.org";
 $map{"ilya\100math.ohio-state.edu"} = $map{"ilya\100math.berkeley.edu"}
   = $map{"ilya\100math.berkeley.edu"} = "nospam-abuse\100ilyaz.org";
 $map{"philip.newton\100gmx.net"} = $map{"philip.newton\100datenrevision.de"}
@@ -144,7 +153,7 @@ $map{"rs\100crystalflame.net"} = "p5-authors\100crystalflame.net";
 $map{"(srezic\100iconmobile.com)"} = "slaven\100rezic.de";
 $map{"perl\100dellah.anu.edu.au"} = "spoon\100cpan.org";
 $map{"rjk-perl-p5p\100tamias.net"} = "rjk\100linguist.dartmouth.edu";
-$map{"sts\100accognoscere.org"} = "steven\100accognoscere.org";
+$map{"sts\100accognoscere.org"} = "schubiger\100cpan.org";
 $map{"s.payrard\100wanadoo.fr"} = "stef\100mongueurs.net";
 $map{"richard.foley\100ubs.com"} = "richard.foley\100ubsw.com";
 # I assume that Ton Hopsel's lack of e-mail address in AUTHORS is deliberate
@@ -171,6 +180,7 @@ $map{"beau\100beaucox.com"} = "?";
 
 $map{"rgarciasuarez\100mandrakesoft.com"}
   = $map{"rgarciasuarez\100mandriva.com"}
+  = $map{"rgarciasuarez\100gmail.com"}
   = $map{"raphel.garcia-suarez\100hexaflux.com"} = "rgs";
 $map{"jhietaniemi\100gmail.com"} = $map{"jhi\100kosh.hut.fi"}
   = $map{"jhi\100cc.hut.fi"} = $map{"jarkko.hietaniemi\100nokia.com"} = "jhi";
@@ -189,6 +199,7 @@ $map{"h.m.brand\100hccnet.nl"} = $map{"merijn\100l1.procura.nl"} = "merijn";
 $map{"nik\100tiuk.ti.com"} = $map{"nick.ing-simmons\100elixent.com"} = "nick";
 $map{"hv\100crypt.org"} = "hv";
 $map{"gisle\100aas.no"} = "gisle";
+$map{"gsar\100cpan.org"} = "gsar";
 
 if (@authors) {
   my %raw;
@@ -232,6 +243,7 @@ while (<>) {
     my $prefix = " " x length $1;
     LOG: while (<>) {
       next if /^$/;
+      s/^\t/        /;
       if (s/^$prefix//) {
 	$log .= $_;
       } elsif (/^\s+Branch:/) {
@@ -268,15 +280,27 @@ if ($rank) {
 sub display_ordered {
   my $what = shift;
   my @sorted;
+  my $total;
   while (my ($name, $count) = each %$what) {
     push @{$sorted[$count]}, $name;
+    $total += $count;
   }
 
   my $i = @sorted;
-  return unless $i;
-  while (--$i) {
+  return unless @sorted;
+  my $sum = 0;
+  foreach my $i ($reverse ? 0 .. $#sorted : reverse 0 .. $#sorted) {
     next unless $sorted[$i];
-    print wrap ("$i:\t", "\t", join (" ", sort @{$sorted[$i]}), "\n");
+    my $prefix;
+    $sum += $i * @{$sorted[$i]};
+    # Value to display is either this one, or the cumulative sum.
+    my $value = $cumulative ? $sum : $i;
+    if ($percentage) {
+	$prefix = sprintf "%6.2f:\t", 100 * $value / $total;
+    } else {
+	$prefix = "$value:\t";
+    }
+    print wrap ($prefix, "\t", join (" ", sort @{$sorted[$i]}), "\n");
   }
 }