Start teaching gitlog about the database.

2 files changed, 12 insertions, 10 deletions

diff --git a/changelogs b/changelogs
index 9f775aa..1077a03 100755
--- a/changelogs
+++ b/changelogs
@@ -51,25 +51,25 @@ EmptyCLPatches = { }
 NoSOBPatches = { }
 
 def LogSSPatch(p):
-    LogSSCulprit(p.author)
+    LogSSCulprit(p.author.name)
     try:
-        SSPatches[p.author].append(p)
+        SSPatches[p.author.name].append(p)
     except KeyError:
-        SSPatches[p.author] = [p]
+        SSPatches[p.author.name] = [p]
 
 def LogECLPatch(p):
-    LogEmptyCulprit(p.author)
+    LogEmptyCulprit(p.author.name)
     try:
-        EmptyCLPatches[p.author].append(p)
+        EmptyCLPatches[p.author.name].append(p)
     except KeyError:
-        EmptyCLPatches[p.author] = [p]
+        EmptyCLPatches[p.author.name] = [p]
 
 def LogNoSOB(p):
-    LogNoSOBCulprit(p.author)
+    LogNoSOBCulprit(p.author.name)
     try:
-        NoSOBPatches[p.author].append(p)
+        NoSOBPatches[p.author.name].append(p)
     except KeyError:
-        NoSOBPatches[p.author] = [p]
+        NoSOBPatches[p.author.name] = [p]
 
 LinusURL = 'http://git.kernel.org/linus/'
 def WritePatches(names, patches, file):
diff --git a/gitlog.py b/gitlog.py
index 4ce8a3b..afe022c 100644
--- a/gitlog.py
+++ b/gitlog.py
@@ -4,6 +4,7 @@
 # Someday this will be the only version of grabpatch, honest.
 #
 from patterns import patterns
+import database
 import re
 
 
@@ -63,7 +64,8 @@ def get_header(patch, line, input):
         return S_DESC
     m = patterns['author'].match(line)
     if m:
-        patch.author = m.group(1)
+        patch.email = database.RemapEmail(m.group(2))
+        patch.author = database.LookupStoreHacker(m.group(1), patch.email)
     return S_HEADER
 
 def get_desc(patch, line, input):