Changeset 368:39d742579105

Timestamp:

08/24/08 09:36:47 (3 months ago)

Author:

Christos Trochalakis <yatiohi@…>

Branch:

default

Message:

hg-shortlog.py respects .mailmap file + .mailmap

Files:

• .mailmap (added)
• devel-docs/hg-shortlog.py (modified) (1 diff)

devel-docs/hg-shortlog.py

@@ -2 +2 @@
 # Produces shortlog from hg log output.
 #
-# hg log --template "{author|person}\t{desc|firstline}\n"
+# hg log --template "{author|person}\t{author|email}\t{desc|firstline}\n"
 #
-# e.x. Dimitris Glezos<tab>Contributions by Silvio Pierro
+# e.x. 
+# Dimitris Glezos<tab>dimitris@glezos.com<tab>Contributions by Silvio Pierro
 #
 import re
 import sys
 from collections import defaultdict
+from optparse import OptionParser
 
-log_re = re.compile('^(?P<name>.*)\t(?P<msg>.*)$')
+log_re = re.compile('^(?P<name>.*)\t(?P<email>.*)\t(?P<msg>.*)$')
 
-commit_map = defaultdict(list)
 
-for line in sys.stdin.xreadlines():
-    m = log_re.match(line)
-    if m:
-        commit_map[m.group('name')].append(m.group('msg'))
+def read_mailmap(filename):
+    """
+    Reads mailmap file
+    Returns {<email>:<name>} dict
+    """
+    mailmap_re = re.compile('^(?P<name>.*) \<(?P<email>.*)\>')
+    mailmap = {}
 
-for person, commits in commit_map.iteritems():
-    print '%s (%s):' % (person, len(commits))
-    for commit in commits:
-        print '\t%s' % commit
+    f = open(filename,'r')
+    try:
+        for line in f:
+            if line.startswith('#'):
+                continue
+            m = mailmap_re.match(line)
+            if m:
+                mailmap[m.group('email')] = m.group('name')
+    finally:
+        f.close()
+    return mailmap
+
+def log():
+    """ Yields (name, email, msg) from stdin"""
+
+    for line in sys.stdin:
+        m = log_re.match(line)
+        if m:
+            g = m.group
+            yield g('name'), g('email'), g('msg')
+
+def get_commit_map(mailmap={}):
+    """
+    Returns {<Full Name> : [<msg1>, <msg2>]} dict
+    """
+    commit_map = defaultdict(list)
+    
+    for name, email, msg in log():
+        # search mailmap for the email. Use name if you don't find it
+        name = mailmap.get(email, name)
+        commit_map[name].append(msg)
+    return commit_map
+
+
+def main():
+    parser = OptionParser()
+
+    parser.add_option('-m', '--mailmap', default='.mailmap', dest='mailmap',
+        help="Use mailmap file")
+    parser.add_option('-n', '--no-mailmap', action='store_false', dest='mailmap',
+        help="Don't use mailmap")
+    (options, args) = parser.parse_args()
+
+    if options.mailmap:
+        options.mailmap = read_mailmap(options.mailmap)
+    commit_map = get_commit_map(mailmap=options.mailmap or {})
+
+    for person, commits in commit_map.iteritems():
+        print '%s (%s):' % (person, len(commits))
+        for commit in commits:
+            print '\t%s' % commit
+
+if __name__ == "__main__":
+    main()