[PATCH v10 12/15] contrib: related: add mailmap support

[Felipe Contreras <felipe.contreras@gmail.com>]

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 contrib/related/git-related    | 37 +++++++++++++++++++++++++++++++++++++
 contrib/related/test-related.t | 14 ++++++++++++++
 2 files changed, 51 insertions(+)

diff --git a/contrib/related/git-related b/contrib/related/git-related
index f15e4e7..6ab74c7 100755
--- a/contrib/related/git-related
+++ b/contrib/related/git-related
@@ -8,6 +8,9 @@ $min_percent = 10
 $files = []
 $rev_args = []
 
+$mailmaps = {}
+$mailmaps_complex = {}
+
 git_dir = %x[git rev-parse --git-dir].chomp
 $base_dir = File.dirname(git_dir)
 $cur_dir = Dir.pwd
@@ -19,6 +22,29 @@ KNOWN_ROLES = {
   'Cc' => :cced,
 }
 
+def get_mailmap(filename)
+  return unless File.exists?(filename)
+  File.open(filename) do |f|
+    f.each do |line|
+      case line.gsub(/\s*#.*$/, '')
+      when /^([^<>]+)\s+<(\S+)>$/
+        $mailmaps[$2] = [ $1, nil ]
+      when /^<(\S+)>\s+<(\S+)>$/
+        $mailmaps[$2] = [ nil, $1 ]
+      when /^([^<>]+)\s+<(\S+)>\s+<(\S+)>$/
+        $mailmaps[$3] = [ $1, $2 ]
+      when /^([^<>]+)\s+<(\S+)>\s+([^<>]+)\s+<(\S+)>$/
+        $mailmaps_complex[[$3, $4]] = [ $1, $2 ]
+      end
+    end
+  end
+end
+
+get_aliases if $get_aliases
+get_mailmap(File.join($base_dir, '.mailmap'))
+mailmap_file = %x[git config mailmap.file].chomp
+get_mailmap(mailmap_file)
+
 class Person
 
   attr_reader :roles
@@ -60,6 +86,17 @@ class Persons
   end
 
   def self.get(name, email)
+
+    # fix with mailmap
+    person = [name, email]
+    new = nil
+    new = $mailmaps_complex[person] if not new and $mailmaps_complex.include?(person)
+    new = $mailmaps[email] if not new and $mailmaps.include?(email)
+    if new
+      name = new[0] if new[0]
+      email = new[1] if new[1]
+    end
+
     id = email.downcase
     person = @@index[id]
     if not person
diff --git a/contrib/related/test-related.t b/contrib/related/test-related.t
index a19ad32..fa8c1a7 100755
--- a/contrib/related/test-related.t
+++ b/contrib/related/test-related.t
@@ -80,4 +80,18 @@ test_expect_success "from single rev committish" "
 	test_cmp expected actual
 "
 
+test_expect_success "mailmap" "
+	test_when_finished 'rm -rf .mailmap' &&
+	cat > .mailmap <<-EOF &&
+	Jon McAvoy <jon@stewart.com>
+	John Poppins <john@poppins.com> <john@doe.com>
+	EOF
+	git related -1 master | sort > actual &&
+	cat > expected <<-EOF &&
+	John Poppins <john@poppins.com> (author: 66%)
+	Jon McAvoy <jon@stewart.com> (reviewer: 33%, author: 33%)
+	EOF
+	test_cmp expected actual
+"
+
 test_done
-- 
1.8.4-fc