Remove crawl-ref-cia, add mailmap.

4 files changed, 142 insertions, 332 deletions

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000000..4834e16416
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,139 @@
+# Developers and former developers
+sorear <stefanor@cox.net>
+sorear <stefan@localhost.localdomain>
+haranp <haranp@glaucus.(none)>
+haranp <haranp@users.sourceforge.net>
+haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>
+dpeg <dploog@users.sourceforge.net>
+dpeg <dploog@c06c8d41-db1a-0410-9941-cceddc491573>
+jpeg <j-p-e-g@sourceforge.net>
+jpeg <j-p-e-g@users.sourceforge.net>
+jpeg <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>
+due <bookofjude@gmail.com>
+due <bookofjude@users.sourceforge.com>
+due <bookofjude@users.sourceforge.net>
+Matthew_Cline <zelgadis@sourceforge.net>
+Matthew_Cline <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573>
+greensnark <dshaligram@users.sourceforge.net>
+greensnark <scintilla@gmail.com>
+greensnark <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>
+by <rvollmert@gmx.net>
+by <vollmert@a12.mi.fu-berlin.de>
+pointless_ <ottochar@gmail.com>
+pointless_ <caotto@.(none)>
+Enne <enne.walker@gmail.com>
+Enne <ennewalker@users.sourceforge.net>
+Enne <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573>
+neunon <steven@uplinklabs.net>
+Cryp71c <burnhamrobertp@gmail.com>
+Cryp71c <rburnham@Optiplex-760-Dev1.(none)>
+Cryp71c <rburnham@optiplex-crunch.(none)>
+Cryp71c <rburnham@760-C2N.AHA>
+felirx <felirx@gmail.com>
+Mu <muuuuu@gmail.com>
+Mu <muuuuu@users.sourceforge.net>
+galehar <raphael.langella@gmail.com>
+galehar <Raphael@.(none)>
+elliptic <hyperelliptical@gmail.com>
+edlothiol <flodiebold@gmail.com>
+MarvinPA <chriscampbell89@gmail.com>
+SamB <naesten@gmail.com>
+|amethyst <neil@s-z.org>
+dolorous <dolorous@users.sourceforge.net>
+kilobyte <kilobyte@angband.pl>
+doy <doy@tozt.net>
+evilmike <evilmike@gmail.com>
+Keskitalo <eino.keskitalo@gmail.com>
+Keskitalo <evktalo@users.sourceforge.net>
+Keskitalo <evktalo@c06c8d41-db1a-0410-9941-cceddc491573>
+zaba <zaba@wybt.net>
+zaba <zaba@thorium.homeunix.org>
+Grunt <smelenchuk@gmail.com>
+ontoclasm <yokomeshi@gmail.com>
+frogbotherer <therealchriswest@hotmail.com>
+bh <brendan@bhickey.net>
+DracoOmega <draco_omega@live.com>
+DracoOmega <a@a.com>
+mumra <pete@downplay.co.uk>
+mumra <pete@streamuniverse.tv>
+Medar <pekka.lampila@iki.fi>
+tenofswords <mwclaws@gmail.com>
+Sage <Immotian@yahoo.com>
+Sage <SageBasilMint@gmail.com>
+gammafunk <gammafunk@gmail.com>
+wheals <shm.mark@gmail.com>
+reaverb <address.auto@gmail.com>
+reaverb <reaverb.Crawl@gmail.com>
+N78291 <N78291@gmail.com>
+PleasingFungus <pleasingfung@gmail.com>
+
+# Other regular contributors
+Napkin <napkin@develz.org>
+atomjack <atomjack@users.sourceforge.net>
+atomjack <mark@swallowtail.org>
+Twinge <homelesspete@gmail.com>
+yobbo <yobbobandana@yahoo.co.nz>
+valrus <thevalrus@hotmail.com>
+GreatZebu <akbecker@gmail.com>
+Eronarn <eronarn@gmail.com>
+Wensley <ben.striegel@gmail.com>
+Wensley <bstriegs@yahoo.com>
+ldierk <lothar.dierkes@googlemail.com>
+nfogravity <sbalady@gmail.com>
+Thann <thann@linux.com>
+Thann <thann@i-wish-i-were-dead-laptop.(none)>
+CommanderC <policarpocp@gmail.com>
+ghallberg <ghallberg@gmail.com>
+st_ <clouded@users.sourceforge.net>
+tholmes <thomas@devminded.com>
+Glenstorm <BurtonMatthewA@gmail.com>
+nrook <nrook@nrook-laptop-linux.(none)>
+nrook <nrook@nrook.com>
+nrook <nrook@wesleyan.edu>
+ncdulo <nick.cardullo@gmail.com>
+ncdulo <kofrad@gmail.com>
+tswett <swettt@mail.gvsu.edu>
+rriegs <rriegs@gmail.com>
+toidinamai <frank@benkstein.net>
+tmhedberg <t@tmh.cc>
+scummos <svenbrauch@googlemail.com>
+jvj24601 <drcraven1906@gmail.com>
+dtsund <dtsund@email.arizona.edu>
+ChrisOelmueller <chris.oelmueller@gmail.com>
+rriegs <rriegs@gmail.com>
+rriegs <ryan@skytreecorp.com>
+heftig <jan.steffens@gmail.com>
+faze <chrishoney@gmail.com>
+faze <chrishoney@roarlabs.com>
+mrwooster <guy@guyht@me.com>
+mrwooster <guyht@me.com>
+rwbarton <rwbarton@gmail.com>
+Moredread <code@andre-bubel.de>
+mursu <mtvepsal@gmail.com>
+jilles <jilles@stack.nl>
+Goncyn <wjrogers@gmail.com>
+AriaB <ariasayshi@gmail.com>
+alefury <chrischm@gmx.net>
+Alexx999 <alexx999@gmail.com>
+CKyle <kylejfox@gmail.com>
+CKyle <kylefox2@illinois.edu>
+HenryFlower <arien.malec@gmail.com>
+qoala <ed.gonzalez3@gmail.com>
+rchandra <mathie_uw@yahoo.ca>
+hhkb <james.ravn@gmail.com>
+badplayer <roblund@gmail.com>
+Siegurt <keanan.smith@gmail.com>
+Bodrick <bodricklight@gmail.com>
+nonethousand <wizardosiris@gmail.com>
+AreBrandon <rbrandonkime@gmail.com>
+KennySheep <hail_to_the_squid@hotmail.com>
+Lasty <corin@buchananhowland.net>
+minmay <a@cowmuffins.net>
+Miron <mike.boutin@gmail.com> 
+blabber <tobias.rehbein@web.de>
+floatingatoll <rsoderberg@gmail.com>
+johlstei <jeff@ohlste.in>
+johnny0 <john.olender@gmail.com>
+ChangeAj <aj.k.adamson@gmail.com>
+nrook <nrook@google.com>
+ais523 <ais523@bham.ac.uk>
diff --git a/crawl-ref/git-hooks/crawl-ref-cia b/crawl-ref/git-hooks/crawl-ref-cia
deleted file mode 100755
index 89fbee4027..0000000000
--- a/crawl-ref/git-hooks/crawl-ref-cia
+++ /dev/null
@@ -1,330 +0,0 @@
-#!/usr/bin/perl -w
-#
-# ciabot -- Mail a git log message to a given address, for the purposes of CIA
-#
-# Loosely based on cvslog by Russ Allbery <rra@stanford.edu>
-# Copyright 1998  Board of Trustees, Leland Stanford Jr. University
-#
-# Copyright 2001, 2003, 2004, 2005  Petr Baudis <pasky@ucw.cz>
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2, as published by the
-# Free Software Foundation.
-#
-# The master location of this file is in the Cogito repository
-# (see http://www.kernel.org/git/).
-#
-# This program is designed to run as the .git/hooks/post-commit hook. It takes
-# the commit information, massages it and mails it to the address given below.
-#
-# The calling convention of the post-commit hook is:
-#
-#	.git/hooks/post-commit $commit_sha1 $branch_name
-#
-# If it does not work, try to disable $xml_rpc in the configuration section
-# below. Also, remember to make the hook file executable.
-#
-#
-# Note that you can (and it might be actually more desirable) also use this
-# script as the GIT update hook:
-#
-#	refname=${1#refs/heads/}
-#	[ "$refname" = "master" ] && refname=
-#	oldhead=$2
-#	newhead=$3
-#	for merged in $(git rev-list $newhead ^$oldhead | tac); do
-#		/path/to/ciabot.pl $merged $refname
-#	done
-#
-# This is useful when you use a remote repository that you only push to. The
-# update hook will be triggered each time you push into that repository, and
-# the pushed commits will be reported through CIA.
-
-use strict;
-use vars qw ($project $from_email $dest_email $noisy $rpc_uri $sendmail
-		$xml_rpc $ignore_regexp $alt_local_message_target);
-
-
-
-
-### Configuration
-
-# Project name (as known to CIA).
-$project = 'crawl-ref';
-
-# The from address in generated mails.
-$from_email = 'dshaligram@users.sourceforge.net';
-
-# Mail all reports to this address.
-$dest_email = 'cia@cia.vc';
-
-# If using XML-RPC, connect to this URI.
-$rpc_uri = 'http://cia.vc/RPC2';
-
-# Path to your USCD sendmail compatible binary (your mailer daemon created this
-# program somewhere).
-$sendmail = '/usr/sbin/sendmail';
-
-# If set, the script will send CIA the full commit message. If unset, only the
-# first line of the commit message will be sent.
-$noisy = 0;
-
-# This script can communicate with CIA either by mail or by an XML-RPC
-# interface. The XML-RPC interface is faster and more efficient, however you
-# need to have RPC::XML perl module installed, and some large CVS hosting sites
-# (like Savannah or Sourceforge) might not allow outgoing HTTP connections
-# while they allow outgoing mail. Also, this script will hang and eventually
-# not deliver the event at all if CIA server happens to be down, which is
-# unfortunately not an uncommon condition.
-$xml_rpc = 0;
-
-# This variable should contain a regexp, against which each file will be
-# checked, and if the regexp is matched, the file is ignored. This can be
-# useful if you do not want auto-updated files, such as e.g. ChangeLog, to
-# appear via CIA.
-#
-# The following example will make the script ignore all changes in two specific
-# files in two different modules, and everything concerning module 'admin':
-#
-# $ignore_regexp = "^(gentoo/Manifest|elinks/src/bfu/inphist.c|admin/)";
-$ignore_regexp = "";
-
-# It can be useful to also grab the generated XML message by some other
-# programs and e.g. autogenerate some content based on it. Here you can specify
-# a file to which it will be appended.
-$alt_local_message_target = "";
-
-
-
-
-### The code itself
-
-use vars qw ($commit $tree @parent $author $committer);
-use vars qw ($user $branch $rev @files $logmsg $message);
-my $line;
-
-
-
-### Input data loading
-
-
-# The commit stuff
-$commit = $ARGV[0];
-$branch = $ARGV[1];
-
-open COMMIT, "git cat-file commit $commit|" or die "git cat-file commit $commit: $!";
-my $state = 0;
-$logmsg = '';
-while (defined ($line = <COMMIT>)) {
-  if ($state == 1) {
-    $logmsg .= $line;
-    $noisy or $state++;
-    next;
-  } elsif ($state > 1) {
-    next;
-  }
-
-  chomp $line;
-  unless ($line) {
-    $state = 1;
-    next;
-  }
-
-  my ($key, $value) = split(/ /, $line, 2);
-  if ($key eq 'tree') {
-    $tree = $value;
-  } elsif ($key eq 'parent') {
-    push(@parent, $value);
-  } elsif ($key eq 'author') {
-    $author = $value;
-  } elsif ($key eq 'committer') {
-    $committer = $value;
-  }
-}
-close COMMIT;
-
-open DIFF, "git diff-tree -r $parent[0] $tree|" or die "git diff-tree $parent[0] $tree: $!";
-while (defined ($line = <DIFF>)) {
-  chomp $line;
-  my @f;
-  (undef, @f) = split(/\t/, $line, 2);
-  push (@files, @f);
-}
-close DIFF;
-
-
-# Figure out who is doing the update.
-# XXX: Too trivial this way?
-($user) = $author =~ /<(.*?)@/;
-
-# HACK to convert CIA's idea of committeers names to match the IRC handles
-# Developers:
-$user =~ s/stefanor/sorear/;
-$user =~ s/eino.keskitalo/Keskitalo/;
-$user =~ s/dploog/dpeg/;
-$user =~ s/bookofjude/due/;
-$user =~ s/zelgadis/Matthew_Cline/;
-$user =~ s/dshaligram/greensnark/;
-$user =~ s/rvollmert/by/;
-$user =~ s/ottochar/pointless_/;
-$user =~ s/enne\.?walker/Enne/;
-$user =~ s/steven/neunon/;
-$user =~ s/scintilla/greensnark/;
-$user =~ s/burnhamrobertp/Cryp71c/;
-$user =~ s/^muu+$/Mu/i;
-$user =~ s/raphael.langella/galehar/;
-$user =~ s/hyperelliptical/elliptic/;
-$user =~ s/flodiebold/edlothiol/;
-$user =~ s/chriscampbell89/MarvinPA/;
-$user =~ s/naesten/SamB/;
-$user =~ s/neil/|amethyst/;
-$user =~ s/smelenchuk/Grunt/;
-$user =~ s/yokomeshi/ontoclasm/;
-$user =~ s/therealchriswest/frogbotherer/;
-
-# Other regular contributors:
-$user =~ s/homelesspete/Twinge/;
-$user =~ s/yobbobandana/yobbo/;
-$user =~ s/thevalrus/valrus/;
-$user =~ s/akbecker/GreatZebu/;
-$user =~ s/pete/mumra/;
-$user =~ s/bstriegs/Wensley/;
-$user =~ s/lothar.dierkes/ldierk/;
-$user =~ s/brendan/bh/;
-$user =~ s/sbalady/nfogravity/;
-$user =~ s/ben\.striegel/Wensley/;
-$user =~ s/thann/Thann/;
-$user =~ s/policarpocp/CommanderC/;
-$user =~ s/mclaws/HangedMan/;
-
-# Infrastructure:
-$user =~ s/crawl-ref-discuss/translators/; # make tx-commit
-
-$rev = substr($commit, 0, 12);
-
-
-
-
-### Remove to-be-ignored files
-
-@files = grep { $_ !~ m/$ignore_regexp/; } @files
-  if ($ignore_regexp);
-exit unless @files;
-
-
-
-### Compose the mail message
-
-
-my ($VERSION) = '1.0';
-my $ts = time;
-
-$message = <<EM
-<message>
-   <generator>
-       <name>CIA Perl client for Git</name>
-       <version>$VERSION</version>
-   </generator>
-   <source>
-       <project>$project</project>
-EM
-;
-$message .= "       <branch>$branch</branch>" if ($branch);
-$message .= <<EM
-   </source>
-   <timestamp>
-       $ts
-   </timestamp>
-   <body>
-       <commit>
-           <author>$user</author>
-           <revision>$rev</revision>
-           <files>
-EM
-;
-
-foreach (@files) {
-  s/&/&amp;/g;
-  s/</&lt;/g;
-  s/>/&gt;/g;
-  $message .= "  <file>$_</file>\n";
-}
-
-$logmsg =~ s/&/&amp;/g;
-$logmsg =~ s/</&lt;/g;
-$logmsg =~ s/>/&gt;/g;
-
-$message .= <<EM
-           </files>
-           <log>
-$logmsg
-           </log>
-       </commit>
-   </body>
-</message>
-EM
-;
-
-
-
-### Write the message to an alt-target
-
-if ($alt_local_message_target and open (ALT, ">>$alt_local_message_target")) {
-  print ALT $message;
-  close ALT;
-}
-
-
-
-### Send out the XML-RPC message
-
-
-if ($xml_rpc) {
-  # We gotta be careful from now on. We silence all the warnings because
-  # RPC::XML code is crappy and works with undefs etc.
-  $^W = 0;
-  $RPC::XML::ERROR if (0); # silence perl's compile-time warning
-
-  require RPC::XML;
-  require RPC::XML::Client;
-
-  my $rpc_client = new RPC::XML::Client $rpc_uri;
-  my $rpc_request = RPC::XML::request->new('hub.deliver', $message);
-  my $rpc_response = $rpc_client->send_request($rpc_request);
-
-  unless (ref $rpc_response) {
-    die "XML-RPC Error: $RPC::XML::ERROR\n";
-  }
-  exit;
-}
-
-
-
-### Send out the mail
-
-
-# Open our mail program
-
-open (MAIL, "| $sendmail -t -oi -oem") or die "Cannot execute $sendmail : " . ($?>>8);
-
-
-# The mail header
-
-print MAIL <<EOM;
-From: $from_email
-To: $dest_email
-Content-Type: text/xml; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-Subject: DeliverXML
-
-EOM
-
-print MAIL $message;
-
-
-# Close the mail
-
-close MAIL;
-die "$0: sendmail exit status " . ($? >> 8) . "\n" unless ($? == 0);
-
-# vi: set sw=2:
diff --git a/crawl-ref/git-hooks/post-receive b/crawl-ref/git-hooks/post-receive
index 5125e73991..5a7d44db94 100755
--- a/crawl-ref/git-hooks/post-receive
+++ b/crawl-ref/git-hooks/post-receive
@@ -7,7 +7,6 @@ if [ -z "$GIT_DIR" ]; then
 fi
 
 $GIT_DIR/hooks/crawl-ref-email "$@"
-#$GIT_DIR/hooks/crawl-ref-cia "$@"
 
 # BuildBot
 #$GIT_DIR/hooks/git_buildbot.py "$@"
diff --git a/crawl-ref/git-hooks/update b/crawl-ref/git-hooks/update
index 6e6dbcc37d..20154dad1d 100755
--- a/crawl-ref/git-hooks/update
+++ b/crawl-ref/git-hooks/update
@@ -15,5 +15,7 @@ branchname=${1#refs/heads/}
 oldhead=$2
 newhead=$3
 for merged in $(git-rev-parse --symbolic-full-name --not --branches | egrep -v "^\^$1$" | git-rev-list --stdin $oldhead..$newhead | tac); do
-  $GIT_DIR/hooks/crawl-ref-cia $merged $branchname
+  # Call your favorite announcement bot here
+  # $GIT_DIR/hooks/announce $merged $branchname
+  :
 done