Added a .mailmap that maps addresses in bzr to people's real, preferred

e-mail addresses. (I made a few guesses along the way, feel free to
adjust according to what is actually the preferred e-mail)

Added a couple of methods to nova.utils to parse said .mailmap and do
the appropriate (though highly naïve) replacement.

Apply mailmap replacement in changelog generation in setup.py.

Add a unit test that checks everyone is properly listed in Authors.

Add sleepsonthefloor to Authors. If anyone knows the real name, please
add it.

1 files changed, 6 insertions, 4 deletions

diff --git a/setup.py b/setup.py
index a333fbf64..da1e5f8c9 100644
--- a/setup.py
+++ b/setup.py
@@ -16,12 +16,13 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from setuptools import setup, find_packages
-from setuptools.command.sdist import sdist
-
 import os
 import subprocess
 
+from setuptools import setup, find_packages
+from setuptools.command.sdist import sdist
+
+from nova.util import parse_mailmap, str_dict_replace
 
 class local_sdist(sdist):
     """Customized sdist hook - builds the ChangeLog file from VC first"""
@@ -34,8 +35,9 @@ class local_sdist(sdist):
             log_cmd = subprocess.Popen(["bzr", "log", "--novalog"],
                                        stdout=subprocess.PIPE, env=env)
             changelog = log_cmd.communicate()[0]
+            mailmap = parse_mailmap()
             with open("ChangeLog", "w") as changelog_file:
-                changelog_file.write(changelog)
+                changelog_file.write(str_dict_replace(changelog, mailmap))
         sdist.run(self)
 
 setup(name='nova',