From ee6f91ed97a7d94febdf9e6cd985a4c225be06b8 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Fri, 23 Sep 2011 17:43:46 -0400
Subject: [PATCH] Port Authors test to git.

Change-Id: I27bb6b3951422ad32e5e0225765b1056c5b3ffc5
---
 .mailmap                       |  1 +
 Authors                        |  1 +
 glance/tests/unit/test_misc.py | 53 ++++++++++++++--------------------
 3 files changed, 23 insertions(+), 32 deletions(-)

diff --git a/.mailmap b/.mailmap
index 0293555591..f4b460681a 100644
--- a/.mailmap
+++ b/.mailmap
@@ -9,3 +9,4 @@
 <rick@openstack.org> <rclark@chat-blanc>
 <soren.hansen@rackspace.com> <soren@linux2go.dk>
 <soren.hansen@rackspace.com> <soren@openstack.org>
+<james.blair@rackspace.com> <corvus@gnu.org>
diff --git a/Authors b/Authors
index 673e8a37c9..4f0801b2f7 100644
--- a/Authors
+++ b/Authors
@@ -12,6 +12,7 @@ Ewan Mellor <ewan.mellor@citrix.com>
 Isaku Yamahata <yamahata@valinux.co.jp>
 Jason Koelker <jason@koelker.net>
 Jay Pipes <jaypipes@gmail.com>
+James E. Blair <james.blair@rackspace.com>
 Jinwoo 'Joseph' Suh <jsuh@isi.edu>
 Johannes Erdfelt <johannes.erdfelt@rackspace.com>
 Josh Kearney <josh@jk0.org>
diff --git a/glance/tests/unit/test_misc.py b/glance/tests/unit/test_misc.py
index 0f9153b5f4..4a089a0d5b 100644
--- a/glance/tests/unit/test_misc.py
+++ b/glance/tests/unit/test_misc.py
@@ -16,6 +16,7 @@
 #    under the License.
 
 import os
+import commands
 import unittest
 
 
@@ -39,39 +40,27 @@ def str_dict_replace(s, mapping):
 
 class AuthorsTestCase(unittest.TestCase):
     def test_authors_up_to_date(self):
-        topdir = os.path.normpath(os.path.dirname(__file__) + '/../../')
-        if os.path.exists(os.path.join(topdir, '.bzr')):
-            contributors = set()
 
+        topdir = os.path.normpath(os.path.dirname(__file__) + '/../../..')
+        contributors = set()
+        missing = set()
+        authors_file = open(os.path.join(topdir, 'Authors'), 'r').read()
+
+        if os.path.exists(os.path.join(topdir, '.git')):
             mailmap = parse_mailmap(os.path.join(topdir, '.mailmap'))
+            for email in commands.getoutput('git log --format=%ae').split():
+                if not email:
+                    continue
+                if "jenkins" in email and "openstack.org" in email:
+                    continue
+                email = '<' + email + '>'
+                contributors.add(str_dict_replace(email, mailmap))
 
-            import bzrlib.workingtree
-            tree = bzrlib.workingtree.WorkingTree.open(topdir)
-            tree.lock_read()
-            try:
-                parents = tree.get_parent_ids()
-                g = tree.branch.repository.get_graph()
-                for p in parents:
-                    rev_ids = [r for r, _ in g.iter_ancestry(parents)
-                               if r != "null:"]
-                    revs = tree.branch.repository.get_revisions(rev_ids)
-                    for r in revs:
-                        for author in r.get_apparent_authors():
-                            email = author.split(' ')[-1]
-                            mailmapped = str_dict_replace(email, mailmap)
-                            contributors.add(mailmapped)
+        for contributor in contributors:
+            if contributor == 'glance-core':
+                continue
+            if not contributor in authors_file:
+                missing.add(contributor)
 
-                authors_file = open(os.path.join(topdir, 'Authors'),
-                                    'r').read()
-
-                missing = set()
-                for contributor in contributors:
-                    if contributor == 'glance-core':
-                        continue
-                    if not contributor in authors_file:
-                        missing.add(contributor)
-
-                self.assertTrue(len(missing) == 0,
-                                '%r not listed in Authors' % missing)
-            finally:
-                tree.unlock()
+        self.assertTrue(len(missing) == 0,
+                        '%r not listed in Authors' % missing)