Simplify ALIASES and add email addresses to AUTHOR_HACKS in update_copyright.py.

Now that we're versioning with Git, we can use .mailmap instead of
ALIASES.  The adjustments to AUTHOR_HACKS avoid duplicated entries
(author vs. author and email).

diff --git a/update_copyright.py b/update_copyright.py
index d6d02d02290aeb3d8fe2f5215e334dd229f75e12..55aa1a5a01ee944a2981c51fbcb76eece2430ed1 100755 (executable)
--- a/update_copyright.py
+++ b/update_copyright.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 #
-# Copyright (C) 2010-2011 W. Trevor King <wking@drexel.edu>
+# Copyright (C) 2010-2012 W. Trevor King <wking@drexel.edu>
 #
 # This file is part of Hooke.
 #
@@ -63,27 +63,7 @@ COPY_RIGHT_TAG='-xyz-COPY' + '-RIGHT-zyx-' # unlikely to occur in the wild :p
 #     }
 # Git-based projects are encouraged to use .mailmap instead of
 # ALIASES.  See git-shortlog(1) for details.
-ALIASES = {
-    'A. Seeholzer':
-        ['A. Seeholzer'],
-    'Alberto Gomez-Casado':
-        ['albertogomcas'],
-    'Massimo Sandal <devicerandom@gmail.com>':
-        ['Massimo Sandal',
-         'devicerandom',
-         'unknown'],
-    'Fabrizio Benedetti':
-        ['fabrizio.benedetti.82'],
-    'Richard Naud <richard.naud@epfl.ch>':
-        ['Richard Naud'],
-    'Rolf Schmidt <rschmidt@alcor.concordia.ca>':
-        ['Rolf Schmidt',
-         'illysam'],
-    'Marco Brucale':
-        ['marcobrucale'],
-    'Pancaldi Paolo':
-        ['pancaldi.paolo'],
-    }
+ALIASES = {}
 
 # List of paths that should not be scanned for copyright updates.
 # IGNORED_PATHS = ['./.git/']
@@ -101,14 +81,22 @@ IGNORED_FILES = ['COPYING', 'COPYING.LESSER']
 #     ('path', 'to', 'module.py'):['John Doe'],
 #     }
 AUTHOR_HACKS = {
-    ('hooke','driver','hdf5.py'):['Massimo Sandal'],
+    ('hooke','driver','hdf5.py'):['Massimo Sandal <devicerandom@gmail.com>'],
     ('hooke','driver','mcs.py'):['Allen Chen'],
-    ('hooke','driver','mfp3d.py'):['A. Seeholzer','Richard Naud','Rolf Schmidt',
-                                   'Alberto Gomez-Casado'],
-    ('hooke','util','peak.py'):['Fabrizio Benedetti'],
-    ('hooke','plugin','showconvoluted.py'):['Rolf Schmidt'],
-    ('hooke','ui','gui','formatter.py'):['Francesco Musiani','Massimo Sandal'],
-    ('hooke','ui','gui','prettyformat.py'):['Rolf Schmidt'],
+    ('hooke','driver','mfp3d.py'):[
+        'A. Seeholzer',
+        'Richard Naud',
+        'Rolf Schmidt <rschmidt@alcor.concordia.ca>',
+        'Alberto Gomez-Casado <a.gomezcasado@tnw.utwente.nl>'],
+    ('hooke','util','peak.py'):[
+        'Fabrizio Benedetti <fabrizio.benedetti.82@gmail.com>'],
+    ('hooke','plugin','showconvoluted.py'):[
+        'Rolf Schmidt <rschmidt@alcor.concordia.ca>'],
+    ('hooke','ui','gui','formatter.py'):[
+        'Francesco Musiani',
+        'Massimo Sandal <devicerandom@gmail.com>'],
+    ('hooke','ui','gui','prettyformat.py'):[
+        'Rolf Schmidt <rschmidt@alcor.concordia.ca>'],
     }
 
 # Work around missing year holes in the VCS history.