[PATCH 0/3] Add support for git's mailmap.

[PATCH 0/3] Add support for git's mailmap.

[smithj4]

Sorry, I was using imap-send and used attachments to keep my
thunderbird mail client from line-wrapping the patches.

Jason A. Smith (1):
  Add support for git's mailmap.

John Keeping (2):
  filter: introduce cgit_open_email_filter() wrapper
  Remove angle brackets from {author,committer}_email

 cgit.h      |  5 +++++
 filter.c    | 13 +++++++++++++
 parsing.c   | 27 ++++++++++++++++++++++-----
 ui-atom.c   | 31 ++++++++++++++-----------------
 ui-commit.c | 28 ++++++++++++++++++++--------
 ui-log.c    | 11 +++++++++--
 ui-refs.c   | 32 ++++++++++++++++++++++++++------
 ui-stats.c  | 13 ++++++++++---
 ui-tag.c    | 17 ++++++++++++-----
 9 files changed, 131 insertions(+), 46 deletions(-)

-- 
2.9.3

[PATCH 1/3] filter: introduce cgit_open_email_filter() wrapper

[smithj4]

From: John Keeping <john at keeping.me.uk>

We provide email addresses to the email filter surrounded by angle
brackets, but we will soon remove these in our internal representation.
Introduce a wrapper so that we only have to add them in one place.

Signed-off-by: John Keeping <john at keeping.me.uk>
Signed-off-by: Jason A. Smith <smithj4 at bnl.gov>
---
 cgit.h      | 2 ++
 filter.c    | 5 +++++
 ui-commit.c | 4 ++--
 ui-log.c    | 2 +-
 ui-refs.c   | 6 +++---
 ui-tag.c    | 2 +-
 6 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/cgit.h b/cgit.h
index fbc6c6a..204e59e 100644
--- a/cgit.h
+++ b/cgit.h
@@ -382,6 +382,8 @@ extern struct cgit_filter *cgit_new_filter(const char *cmd, filter_type filterty
 extern void cgit_cleanup_filters(void);
 extern void cgit_init_filters(void);
 
+extern void cgit_open_email_filter(const char *email, const char *origin);
+
 extern void cgit_prepare_repo_env(struct cgit_repo * repo);
 
 extern int readfile(const char *path, char **buf, size_t *size);
diff --git a/filter.c b/filter.c
index 949c931..88098ba 100644
--- a/filter.c
+++ b/filter.c
@@ -454,3 +454,8 @@ struct cgit_filter *cgit_new_filter(const char *cmd, filter_type filtertype)
 
 	die("Invalid filter type: %.*s", (int) len, cmd);
 }
+
+void cgit_open_email_filter(const char *email, const char *origin)
+{
+	cgit_open_filter(ctx.repo->email_filter, email, origin);
+}
diff --git a/ui-commit.c b/ui-commit.c
index db69d54..04f0411 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -47,7 +47,7 @@ void cgit_print_commit(char *hex, const char *prefix)
 	cgit_print_diff_ctrls();
 	html("<table summary='commit info' class='commit-info'>\n");
 	html("<tr><th>author</th><td>");
-	cgit_open_filter(ctx.repo->email_filter, info->author_email, "commit");
+	cgit_open_email_filter(info->author_email, "commit");
 	html_txt(info->author);
 	if (!ctx.cfg.noplainemail) {
 		html(" ");
@@ -59,7 +59,7 @@ void cgit_print_commit(char *hex, const char *prefix)
 				cgit_date_mode(DATE_ISO8601)));
 	html("</td></tr>\n");
 	html("<tr><th>committer</th><td>");
-	cgit_open_filter(ctx.repo->email_filter, info->committer_email, "commit");
+	cgit_open_email_filter(info->committer_email, "commit");
 	html_txt(info->committer);
 	if (!ctx.cfg.noplainemail) {
 		html(" ");
diff --git a/ui-log.c b/ui-log.c
index 3220fd9..b78f56f 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -238,7 +238,7 @@ static void print_commit(struct commit *commit, struct rev_info *revs)
 			 oid_to_hex(&commit->object.oid), ctx.qry.vpath);
 	show_commit_decorations(commit);
 	html("</td><td>");
-	cgit_open_filter(ctx.repo->email_filter, info->author_email, "log");
+	cgit_open_email_filter(info->author_email, "log");
 	html_txt(info->author);
 	cgit_close_filter(ctx.repo->email_filter);
 
diff --git a/ui-refs.c b/ui-refs.c
index 75f2789..0c4eef9 100644
--- a/ui-refs.c
+++ b/ui-refs.c
@@ -69,7 +69,7 @@ static int print_branch(struct refinfo *ref)
 	if (ref->object->type == OBJ_COMMIT) {
 		cgit_commit_link(info->subject, NULL, NULL, name, NULL, NULL);
 		html("</td><td>");
-		cgit_open_filter(ctx.repo->email_filter, info->author_email, "refs");
+		cgit_open_email_filter(info->author_email, "refs");
 		html_txt(info->author);
 		cgit_close_filter(ctx.repo->email_filter);
 		html("</td><td colspan='2'>");
@@ -143,12 +143,12 @@ static int print_tag(struct refinfo *ref)
 	html("</td><td>");
 	if (info) {
 		if (info->tagger) {
-			cgit_open_filter(ctx.repo->email_filter, info->tagger_email, "refs");
+			cgit_open_email_filter(info->tagger_email, "refs");
 			html_txt(info->tagger);
 			cgit_close_filter(ctx.repo->email_filter);
 		}
 	} else if (ref->object->type == OBJ_COMMIT) {
-		cgit_open_filter(ctx.repo->email_filter, ref->commit->author_email, "refs");
+		cgit_open_email_filter(ref->commit->author_email, "refs");
 		html_txt(ref->commit->author);
 		cgit_close_filter(ctx.repo->email_filter);
 	}
diff --git a/ui-tag.c b/ui-tag.c
index afd7d61..d1e5db9 100644
--- a/ui-tag.c
+++ b/ui-tag.c
@@ -83,7 +83,7 @@ void cgit_print_tag(char *revname)
 		}
 		if (info->tagger) {
 			html("<tr><td>tagged by</td><td>");
-			cgit_open_filter(ctx.repo->email_filter, info->tagger_email, "tag");
+			cgit_open_email_filter(info->tagger_email, "tag");
 			html_txt(info->tagger);
 			if (info->tagger_email && !ctx.cfg.noplainemail) {
 				html(" ");
-- 
2.9.3

[PATCH 2/3] Remove angle brackets from {author,committer}_email

[smithj4]

From: John Keeping <john at keeping.me.uk>

This matches the internal representation in libgit.a, so it will make it
much easier to use Git's mailmap code.

The change in ui-atom.c isn't strictly necessary since the code copes
with email addresses both with and without angle brackets, but it's a
nice simplification since we know that the email address will always be
provided in the correct form.

Signed-off-by: John Keeping <john at keeping.me.uk>
Signed-off-by: Jason A. Smith <smithj4 at bnl.gov>
---
 filter.c    | 10 +++++++++-
 parsing.c   |  6 +-----
 ui-atom.c   | 13 +------------
 ui-commit.c |  6 ++++--
 ui-tag.c    |  3 ++-
 5 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/filter.c b/filter.c
index 88098ba..ba9000a 100644
--- a/filter.c
+++ b/filter.c
@@ -457,5 +457,13 @@ struct cgit_filter *cgit_new_filter(const char *cmd, filter_type filtertype)
 
 void cgit_open_email_filter(const char *email, const char *origin)
 {
-	cgit_open_filter(ctx.repo->email_filter, email, origin);
+	struct strbuf sb = STRBUF_INIT;
+
+	/* Don't bother allocating any memory if we don't have a filter. */
+	if (!ctx.repo->email_filter)
+		return;
+
+	strbuf_addf(&sb, "<%s>", email);
+	cgit_open_filter(ctx.repo->email_filter, sb.buf, origin);
+	strbuf_release(&sb);
 }
diff --git a/parsing.c b/parsing.c
index 9dacb16..352338d 100644
--- a/parsing.c
+++ b/parsing.c
@@ -72,14 +72,10 @@ static char *substr(const char *head, const char *tail)
 static void parse_user(const char *t, char **name, char **email, unsigned long *date, int *tz)
 {
 	struct ident_split ident;
-	unsigned email_len;
 
 	if (!split_ident_line(&ident, t, strchrnul(t, '\n') - t)) {
 		*name = substr(ident.name_begin, ident.name_end);
-
-		email_len = ident.mail_end - ident.mail_begin;
-		*email = xmalloc(strlen("<") + email_len + strlen(">") + 1);
-		sprintf(*email, "<%.*s>", email_len, ident.mail_begin);
+		*email = substr(ident.mail_begin, ident.mail_end);
 
 		if (ident.date_begin)
 			*date = strtoul(ident.date_begin, NULL, 10);
diff --git a/ui-atom.c b/ui-atom.c
index 41838d3..7c17d6a 100644
--- a/ui-atom.c
+++ b/ui-atom.c
@@ -15,7 +15,6 @@ static void add_entry(struct commit *commit, const char *host)
 {
 	char delim = '&';
 	char *hex;
-	char *mail, *t, *t2;
 	struct commitinfo *info;
 
 	info = cgit_parse_commit(commit);
@@ -35,19 +34,9 @@ static void add_entry(struct commit *commit, const char *host)
 		html("</name>\n");
 	}
 	if (info->author_email && !ctx.cfg.noplainemail) {
-		mail = xstrdup(info->author_email);
-		t = strchr(mail, '<');
-		if (t)
-			t++;
-		else
-			t = mail;
-		t2 = strchr(t, '>');
-		if (t2)
-			*t2 = '\0';
 		html("<email>");
-		html_txt(t);
+		html_txt(info->author_email);
 		html("</email>\n");
-		free(mail);
 	}
 	html("</author>\n");
 	html("<published>");
diff --git a/ui-commit.c b/ui-commit.c
index 04f0411..dccb5f3 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -50,8 +50,9 @@ void cgit_print_commit(char *hex, const char *prefix)
 	cgit_open_email_filter(info->author_email, "commit");
 	html_txt(info->author);
 	if (!ctx.cfg.noplainemail) {
-		html(" ");
+		html(" &lt;");
 		html_txt(info->author_email);
+		html("&gt;");
 	}
 	cgit_close_filter(ctx.repo->email_filter);
 	html("</td><td class='right'>");
@@ -62,8 +63,9 @@ void cgit_print_commit(char *hex, const char *prefix)
 	cgit_open_email_filter(info->committer_email, "commit");
 	html_txt(info->committer);
 	if (!ctx.cfg.noplainemail) {
-		html(" ");
+		html(" &lt;");
 		html_txt(info->committer_email);
+		html("&gt;");
 	}
 	cgit_close_filter(ctx.repo->email_filter);
 	html("</td><td class='right'>");
diff --git a/ui-tag.c b/ui-tag.c
index d1e5db9..ad7854e 100644
--- a/ui-tag.c
+++ b/ui-tag.c
@@ -86,8 +86,9 @@ void cgit_print_tag(char *revname)
 			cgit_open_email_filter(info->tagger_email, "tag");
 			html_txt(info->tagger);
 			if (info->tagger_email && !ctx.cfg.noplainemail) {
-				html(" ");
+				html(" &lt;");
 				html_txt(info->tagger_email);
+				html("&gt;");
 			}
 			cgit_close_filter(ctx.repo->email_filter);
 			html("</td></tr>\n");
-- 
2.9.3

[PATCH 3/3] Add support for git's mailmap.

[smithj4]

If a mailmap file is present in the repo, it will be used to coalesce
commits by the same person, just like git does. When no mailmap file is
found then it functions as before.

Signed-off-by: Jason A. Smith <smithj4 at bnl.gov>
---
 cgit.h      |  3 +++
 parsing.c   | 21 +++++++++++++++++++++
 ui-atom.c   | 20 ++++++++++++++------
 ui-commit.c | 22 ++++++++++++++++------
 ui-log.c    | 11 +++++++++--
 ui-refs.c   | 32 ++++++++++++++++++++++++++------
 ui-stats.c  | 13 ++++++++++---
 ui-tag.c    | 14 ++++++++++----
 8 files changed, 109 insertions(+), 27 deletions(-)

diff --git a/cgit.h b/cgit.h
index 204e59e..e4e070f 100644
--- a/cgit.h
+++ b/cgit.h
@@ -24,6 +24,7 @@
 #include <utf8.h>
 #include <notes.h>
 #include <graph.h>
+#include <mailmap.h>
 
 /* Add isgraph(x) to Git's sane ctype support (see git-compat-util.h) */
 #undef isgraph
@@ -369,6 +370,8 @@ extern char *fmtalloc(const char *format,...);
 extern struct commitinfo *cgit_parse_commit(struct commit *commit);
 extern struct taginfo *cgit_parse_tag(struct tag *tag);
 extern void cgit_parse_url(const char *url);
+extern int cgit_read_mailmap(struct string_list *map);
+extern int cgit_map_user(struct string_list *map, const char **email, const char **name);
 
 extern const char *cgit_repobasename(const char *reponame);
 
diff --git a/parsing.c b/parsing.c
index 352338d..c9619a0 100644
--- a/parsing.c
+++ b/parsing.c
@@ -84,6 +84,27 @@ static void parse_user(const char *t, char **name, char **email, unsigned long *
 	}
 }
 
+int cgit_read_mailmap(struct string_list *map)
+{
+	int ret;
+
+	ret = read_mailmap(map, NULL);
+	if (ret)
+		fprintf(stderr, "Error reading mailmap: read_mailmap() returned: %d\n", ret);
+	return ret;
+}
+
+int cgit_map_user(struct string_list *map, const char **email, const char **name)
+{
+	size_t emaillen, namelen;
+	int ret;
+
+	emaillen = strlen(*email);
+	namelen = strlen(*name);
+	ret = map_user(map, email, &emaillen, name, &namelen);
+	return ret;
+}
+
 #ifdef NO_ICONV
 #define reencode(a, b, c)
 #else
diff --git a/ui-atom.c b/ui-atom.c
index 7c17d6a..9d541ba 100644
--- a/ui-atom.c
+++ b/ui-atom.c
@@ -11,13 +11,18 @@
 #include "html.h"
 #include "ui-shared.h"
 
-static void add_entry(struct commit *commit, const char *host)
+static void add_entry(struct commit *commit, const char *host,
+		      struct string_list *mailmap)
 {
 	char delim = '&';
 	char *hex;
 	struct commitinfo *info;
+	const char *author, *author_email;
 
 	info = cgit_parse_commit(commit);
+	author = info->author;
+	author_email = info->author_email;
+	cgit_map_user(mailmap, &author_email, &author);
 	hex = oid_to_hex(&commit->object.oid);
 	html("<entry>\n");
 	html("<title>");
@@ -28,14 +33,14 @@ static void add_entry(struct commit *commit, const char *host)
                     date_mode_from_type(DATE_ISO8601_STRICT)));
 	html("</updated>\n");
 	html("<author>\n");
-	if (info->author) {
+	if (author) {
 		html("<name>");
-		html_txt(info->author);
+		html_txt(author);
 		html("</name>\n");
 	}
-	if (info->author_email && !ctx.cfg.noplainemail) {
+	if (author_email && !ctx.cfg.noplainemail) {
 		html("<email>");
-		html_txt(info->author_email);
+		html_txt(author_email);
 		html("</email>\n");
 	}
 	html("</author>\n");
@@ -78,6 +83,7 @@ void cgit_print_atom(char *tip, char *path, int max_count)
 	const char *argv[] = {NULL, tip, NULL, NULL, NULL};
 	struct commit *commit;
 	struct rev_info rev;
+	struct string_list mailmap = STRING_LIST_INIT_NODUP;
 	int argc = 2;
 
 	if (ctx.qry.show_all)
@@ -97,6 +103,8 @@ void cgit_print_atom(char *tip, char *path, int max_count)
 	rev.show_root_diff = 0;
 	rev.max_count = max_count;
 	setup_revisions(argc, argv, &rev, NULL);
+	cgit_read_mailmap(&mailmap);
+	rev.mailmap = &mailmap;
 	prepare_revision_walk(&rev);
 
 	host = cgit_hosturl();
@@ -128,7 +136,7 @@ void cgit_print_atom(char *tip, char *path, int max_count)
 		free(repourl);
 	}
 	while ((commit = get_revision(&rev)) != NULL) {
-		add_entry(commit, host);
+		add_entry(commit, host, &mailmap);
 		free_commit_buffer(commit);
 		free_commit_list(commit->parents);
 		commit->parents = NULL;
diff --git a/ui-commit.c b/ui-commit.c
index dccb5f3..491d800 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -18,8 +18,11 @@ void cgit_print_commit(char *hex, const char *prefix)
 	struct commit *commit, *parent;
 	struct commitinfo *info, *parent_info;
 	struct commit_list *p;
+	struct string_list mailmap = STRING_LIST_INIT_NODUP;
 	struct strbuf notes = STRBUF_INIT;
 	struct object_id oid;
+	const char *author, *author_email;
+	const char *committer, *committer_email;
 	char *tmp, *tmp2;
 	int parents = 0;
 
@@ -38,6 +41,13 @@ void cgit_print_commit(char *hex, const char *prefix)
 		return;
 	}
 	info = cgit_parse_commit(commit);
+	cgit_read_mailmap(&mailmap);
+	author = info->author;
+	author_email = info->author_email;
+	cgit_map_user(&mailmap, &author_email, &author);
+	committer = info->committer;
+	committer_email = info->committer_email;
+	cgit_map_user(&mailmap, &committer_email, &committer);
 
 	format_display_notes(oid.hash, &notes, PAGE_ENCODING, 0);
 
@@ -47,11 +57,11 @@ void cgit_print_commit(char *hex, const char *prefix)
 	cgit_print_diff_ctrls();
 	html("<table summary='commit info' class='commit-info'>\n");
 	html("<tr><th>author</th><td>");
-	cgit_open_email_filter(info->author_email, "commit");
-	html_txt(info->author);
+	cgit_open_email_filter(author_email, "commit");
+	html_txt(author);
 	if (!ctx.cfg.noplainemail) {
 		html(" &lt;");
-		html_txt(info->author_email);
+		html_txt(author_email);
 		html("&gt;");
 	}
 	cgit_close_filter(ctx.repo->email_filter);
@@ -60,11 +70,11 @@ void cgit_print_commit(char *hex, const char *prefix)
 				cgit_date_mode(DATE_ISO8601)));
 	html("</td></tr>\n");
 	html("<tr><th>committer</th><td>");
-	cgit_open_email_filter(info->committer_email, "commit");
-	html_txt(info->committer);
+	cgit_open_email_filter(committer_email, "commit");
+	html_txt(committer);
 	if (!ctx.cfg.noplainemail) {
 		html(" &lt;");
-		html_txt(info->committer_email);
+		html_txt(committer_email);
 		html("&gt;");
 	}
 	cgit_close_filter(ctx.repo->email_filter);
diff --git a/ui-log.c b/ui-log.c
index b78f56f..21a3497 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -171,6 +171,7 @@ static int show_commit(struct commit *commit, struct rev_info *revs)
 static void print_commit(struct commit *commit, struct rev_info *revs)
 {
 	struct commitinfo *info;
+	const char *author, *author_email;
 	int columns = revs->graph ? 4 : 3;
 	struct strbuf graphbuf = STRBUF_INIT;
 	struct strbuf msgbuf = STRBUF_INIT;
@@ -238,8 +239,11 @@ static void print_commit(struct commit *commit, struct rev_info *revs)
 			 oid_to_hex(&commit->object.oid), ctx.qry.vpath);
 	show_commit_decorations(commit);
 	html("</td><td>");
-	cgit_open_email_filter(info->author_email, "log");
-	html_txt(info->author);
+	author = info->author;
+	author_email = info->author_email;
+	cgit_map_user(revs->mailmap, &author_email, &author);
+	cgit_open_email_filter(author_email, "log");
+	html_txt(author);
 	cgit_close_filter(ctx.repo->email_filter);
 
 	if (revs->graph) {
@@ -361,6 +365,7 @@ static char *next_token(char **src)
 void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern,
 		    char *path, int pager, int commit_graph, int commit_sort)
 {
+	struct string_list mailmap = STRING_LIST_INIT_NODUP;
 	struct rev_info rev;
 	struct commit *commit;
 	struct argv_array rev_argv = ARGV_ARRAY_INIT;
@@ -444,6 +449,8 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
 		DIFF_XDL_SET(&rev.diffopt, IGNORE_WHITESPACE);
 
 	compile_grep_patterns(&rev.grep_filter);
+	cgit_read_mailmap(&mailmap);
+	rev.mailmap = &mailmap;
 	prepare_revision_walk(&rev);
 
 	if (pager) {
diff --git a/ui-refs.c b/ui-refs.c
index 0c4eef9..f645d7d 100644
--- a/ui-refs.c
+++ b/ui-refs.c
@@ -11,6 +11,8 @@
 #include "html.h"
 #include "ui-shared.h"
 
+static struct string_list mailmap = STRING_LIST_INIT_DUP;
+
 static inline int cmp_age(int age1, int age2)
 {
 	/* age1 and age2 are assumed to be non-negative */
@@ -57,6 +59,7 @@ static int cmp_tag_age(const void *a, const void *b)
 static int print_branch(struct refinfo *ref)
 {
 	struct commitinfo *info = ref->commit;
+	const char *author, *author_email;
 	char *name = (char *)ref->refname;
 
 	if (!info)
@@ -67,10 +70,13 @@ static int print_branch(struct refinfo *ref)
 	html("</td><td>");
 
 	if (ref->object->type == OBJ_COMMIT) {
+		author = info->author;
+		author_email = info->author_email;
+		cgit_map_user(&mailmap, &author_email, &author);
 		cgit_commit_link(info->subject, NULL, NULL, name, NULL, NULL);
 		html("</td><td>");
-		cgit_open_email_filter(info->author_email, "refs");
-		html_txt(info->author);
+		cgit_open_email_filter(author_email, "refs");
+		html_txt(author);
 		cgit_close_filter(ctx.repo->email_filter);
 		html("</td><td colspan='2'>");
 		cgit_print_age(info->committer_date, info->committer_tz, -1);
@@ -122,6 +128,8 @@ static int print_tag(struct refinfo *ref)
 {
 	struct tag *tag = NULL;
 	struct taginfo *info = NULL;
+	const char *tagger, *tagger_email;
+	const char *author, *author_email;
 	char *name = (char *)ref->refname;
 	struct object *obj = ref->object;
 
@@ -143,13 +151,19 @@ static int print_tag(struct refinfo *ref)
 	html("</td><td>");
 	if (info) {
 		if (info->tagger) {
-			cgit_open_email_filter(info->tagger_email, "refs");
-			html_txt(info->tagger);
+			tagger = info->tagger;
+			tagger_email = info->tagger_email;
+			cgit_map_user(&mailmap, &tagger_email, &tagger);
+			cgit_open_email_filter(tagger_email, "refs");
+			html_txt(tagger);
 			cgit_close_filter(ctx.repo->email_filter);
 		}
 	} else if (ref->object->type == OBJ_COMMIT) {
-		cgit_open_email_filter(ref->commit->author_email, "refs");
-		html_txt(ref->commit->author);
+		author = ref->commit->author;
+		author_email = ref->commit->author_email;
+		cgit_map_user(&mailmap, &author_email, &author);
+		cgit_open_email_filter(author_email, "refs");
+		html_txt(author);
 		cgit_close_filter(ctx.repo->email_filter);
 	}
 	html("</td><td colspan='2'>");
@@ -194,6 +208,9 @@ void cgit_print_branches(int maxcount)
 	if (ctx.repo->branch_sort == 0)
 		qsort(list.refs, maxcount, sizeof(*list.refs), cmp_ref_name);
 
+	if (!mailmap.items) {
+		cgit_read_mailmap(&mailmap);
+	}
 	for (i = 0; i < maxcount; i++)
 		print_branch(list.refs[i]);
 
@@ -219,6 +236,9 @@ void cgit_print_tags(int maxcount)
 	else if (maxcount > list.count)
 		maxcount = list.count;
 	print_tag_header();
+	if (!mailmap.items) {
+		cgit_read_mailmap(&mailmap);
+	}
 	for (i = 0; i < maxcount; i++)
 		print_tag(list.refs[i]);
 
diff --git a/ui-stats.c b/ui-stats.c
index 7acd358..12eedee 100644
--- a/ui-stats.c
+++ b/ui-stats.c
@@ -159,9 +159,10 @@ const char *cgit_find_stats_periodname(int idx)
 }
 
 static void add_commit(struct string_list *authors, struct commit *commit,
-	const struct cgit_period *period)
+	const struct cgit_period *period, struct string_list *mailmap)
 {
 	struct commitinfo *info;
+	const char *author_name, *author_email;
 	struct string_list_item *author, *item;
 	struct authorstat *authorstat;
 	struct string_list *items;
@@ -171,7 +172,10 @@ static void add_commit(struct string_list *authors, struct commit *commit,
 	uintptr_t *counter;
 
 	info = cgit_parse_commit(commit);
-	tmp = xstrdup(info->author);
+	author_name = info->author;
+	author_email = info->author_email;
+	cgit_map_user(mailmap, &author_email, &author_name);
+	tmp = xstrdup(author_name);
 	author = string_list_insert(authors, tmp);
 	if (!author->util)
 		author->util = xcalloc(1, sizeof(struct authorstat));
@@ -209,6 +213,7 @@ static int cmp_total_commits(const void *a1, const void *a2)
 static struct string_list collect_stats(const struct cgit_period *period)
 {
 	struct string_list authors;
+	struct string_list mailmap = STRING_LIST_INIT_NODUP;
 	struct rev_info rev;
 	struct commit *commit;
 	const char *argv[] = {NULL, ctx.qry.head, NULL, NULL, NULL, NULL};
@@ -237,10 +242,12 @@ static struct string_list collect_stats(const struct cgit_period *period)
 	rev.verbose_header = 1;
 	rev.show_root_diff = 0;
 	setup_revisions(argc, argv, &rev, NULL);
+	cgit_read_mailmap(&mailmap);
+	rev.mailmap = &mailmap;
 	prepare_revision_walk(&rev);
 	memset(&authors, 0, sizeof(authors));
 	while ((commit = get_revision(&rev)) != NULL) {
-		add_commit(&authors, commit, period);
+		add_commit(&authors, commit, period, &mailmap);
 		free_commit_buffer(commit);
 		free_commit_list(commit->parents);
 		commit->parents = NULL;
diff --git a/ui-tag.c b/ui-tag.c
index ad7854e..cccfc53 100644
--- a/ui-tag.c
+++ b/ui-tag.c
@@ -44,6 +44,8 @@ void cgit_print_tag(char *revname)
 	struct strbuf fullref = STRBUF_INIT;
 	struct object_id oid;
 	struct object *obj;
+	struct string_list mailmap = STRING_LIST_INIT_NODUP;
+	const char *tagger, *tagger_email;
 
 	if (!revname)
 		revname = ctx.qry.head;
@@ -82,12 +84,16 @@ void cgit_print_tag(char *revname)
 			html("</td></tr>\n");
 		}
 		if (info->tagger) {
+			cgit_read_mailmap(&mailmap);
+			tagger = info->tagger;
+			tagger_email = info->tagger_email;
+			cgit_map_user(&mailmap, &tagger_email, &tagger);
 			html("<tr><td>tagged by</td><td>");
-			cgit_open_email_filter(info->tagger_email, "tag");
-			html_txt(info->tagger);
-			if (info->tagger_email && !ctx.cfg.noplainemail) {
+			cgit_open_email_filter(tagger_email, "tag");
+			html_txt(tagger);
+			if (tagger_email && !ctx.cfg.noplainemail) {
 				html(" &lt;");
-				html_txt(info->tagger_email);
+				html_txt(tagger_email);
 				html("&gt;");
 			}
 			cgit_close_filter(ctx.repo->email_filter);
-- 
2.9.3

[PATCH 3/3] Add support for git's mailmap.

[smithj4]

If a mailmap file is present in the repo, it will be used to coalesce
commits by the same person, just like git does. When no mailmap file is
found then it functions as before.

Signed-off-by: Jason A. Smith <smithj4 at bnl.gov>
---
  cgit.h      |  3 +++
  parsing.c   | 21 +++++++++++++++++++++
  ui-atom.c   | 20 ++++++++++++++------
  ui-commit.c | 22 ++++++++++++++++------
  ui-log.c    | 11 +++++++++--
  ui-refs.c   | 32 ++++++++++++++++++++++++++------
  ui-stats.c  | 13 ++++++++++---
  ui-tag.c    | 14 ++++++++++----
  8 files changed, 109 insertions(+), 27 deletions(-)


-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0003-Add-support-for-git-s-mailmap.patch
Type: text/x-patch
Size: 13085 bytes
Desc: not available
URL: <http://lists.zx2c4.com/pipermail/cgit/attachments/20170224/1c560ad6/attachment-0001.bin>

[PATCH 3/3] Add support for git's mailmap.

[Jason]

I like this series; thanks for polishing it. I'll review and merge shortly.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.zx2c4.com/pipermail/cgit/attachments/20160830/cdca0a8a/attachment.html>

[PATCH 3/3] Add support for git's mailmap.

[smithj4]

If a mailmap file is present in the repo, it will be used to coalesce
commits by the same person, just like git does. When no mailmap file is
found then it functions as before.

Signed-off-by: Jason A. Smith <smithj4 at bnl.gov>
---
  cgit.h      |  3 +++
  parsing.c   | 21 +++++++++++++++++++++
  ui-atom.c   | 20 ++++++++++++++------
  ui-commit.c | 22 ++++++++++++++++------
  ui-log.c    | 11 +++++++++--
  ui-refs.c   | 32 ++++++++++++++++++++++++++------
  ui-stats.c  | 13 ++++++++++---
  ui-tag.c    | 14 ++++++++++----
  8 files changed, 109 insertions(+), 27 deletions(-)


-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0003-Add-support-for-git-s-mailmap.patch
Type: text/x-patch
Size: 13063 bytes
Desc: not available
URL: <http://lists.zx2c4.com/pipermail/cgit/attachments/20160829/d69b576f/attachment-0001.bin>

[PATCH 3/3] Add support for git's mailmap.

[john]

On Mon, Aug 29, 2016 at 11:18:16AM -0400, Jason A. Smith wrote:
> On 08/26/2016 07:13 PM, John Keeping wrote:
> > On Fri, Aug 26, 2016 at 05:30:32PM -0400, Jason A. Smith wrote:
> >>
> >> Sorry for the extra email noise, but while fixing these I found two more
> >> cgit_open_filter() function calls that should probably be changed to
> >> cgit_open_email_filter() in the first patch:
> >>
> >> ui-refs.c:146
> >> ui-tag.c:85
> >
> > Those both use tagger_email, so that makes sense, I completely forgot
> > about that one and only converted author_email and committer_email.
> >
> > The reference in ui-tag.c also needs angle brackets inserted in the
> > output in the !noplainemail case.  Feel free to squash that into the
> > first patch, and take ownership if you want.
> 
> I fixed both of these and squashed them into your commits since they 
> were very minor changes.
> 
> > I also noticed that we don't check the return value of read_mailmap(),
> > I'm not entirely sure what we should do if it fails, but it does look
> > like "missing mailmap" is not a failure case, so we probably should be
> > doing something if it returns an error.
> 
> I am going to update the 3rd mailmap commit now. What would you suggest 
> doing if there is an error reading the mailmap file? Should it call 
> cgit_print_error_page() or is that too much and instead just log an 
> error message to stderr so it goes into the web server's error logs?
> 
> I looked at the git sources and didn't see any examples of any other 
> code checking for errors returned by read_mailmap()

Printing to stderr seems reasonable.  As a user there's nothing more
annoying than observing the something isn't working (for example, the
mailmap isn't being applied) and having no way of telling where the
error is, so printing a warning if read_mailmap() fails seems like the
right thing to do.

[PATCH 3/3] Add support for git's mailmap.

[smithj4]

On 08/26/2016 07:13 PM, John Keeping wrote:
> On Fri, Aug 26, 2016 at 05:30:32PM -0400, Jason A. Smith wrote:
>>
>> Sorry for the extra email noise, but while fixing these I found two more
>> cgit_open_filter() function calls that should probably be changed to
>> cgit_open_email_filter() in the first patch:
>>
>> ui-refs.c:146
>> ui-tag.c:85
>
> Those both use tagger_email, so that makes sense, I completely forgot
> about that one and only converted author_email and committer_email.
>
> The reference in ui-tag.c also needs angle brackets inserted in the
> output in the !noplainemail case.  Feel free to squash that into the
> first patch, and take ownership if you want.

I fixed both of these and squashed them into your commits since they 
were very minor changes.

> I also noticed that we don't check the return value of read_mailmap(),
> I'm not entirely sure what we should do if it fails, but it does look
> like "missing mailmap" is not a failure case, so we probably should be
> doing something if it returns an error.

I am going to update the 3rd mailmap commit now. What would you suggest 
doing if there is an error reading the mailmap file? Should it call 
cgit_print_error_page() or is that too much and instead just log an 
error message to stderr so it goes into the web server's error logs?

I looked at the git sources and didn't see any examples of any other 
code checking for errors returned by read_mailmap()

~Jason

[PATCH 3/3] Add support for git's mailmap.

[john]

On Fri, Aug 26, 2016 at 05:30:32PM -0400, Jason A. Smith wrote:
> On 08/26/2016 05:10 PM, Jason A. Smith wrote:
> > On 08/26/2016 04:12 PM, Jason A. Smith wrote:
> >>
> >> If a mailmap file is present in the repo, it will be used to coalesce
> >> commits by the same person, just like git does. When no mailmap file is
> >> found then it functions as before.
> >>
> >> Signed-off-by: Jason A. Smith <smithj4 at bnl.gov>
> >> ---
> >>  cgit.h      |  2 ++
> >>  parsing.c   | 11 +++++++++++
> >>  ui-atom.c   | 20 ++++++++++++++------
> >>  ui-commit.c | 22 ++++++++++++++++------
> >>  ui-log.c    | 11 +++++++++--
> >>  ui-refs.c   | 27 +++++++++++++++++++++------
> >>  ui-stats.c  | 13 ++++++++++---
> >>  7 files changed, 83 insertions(+), 23 deletions(-)
> >
> > Sorry, I forgot the --thread flag. I also just noticed that the branch
> > and thread lists on the summary page still do not honor the mailmap
> > because there is no general init type function in ui-refs to put the
> > read_mailmap() call, and I noticed that ui-tag also has tagger name &
> > email so that should be patched as well. I will have to fix these and
> > resend the patches, probably on Monday.
> >
> > ~Jason
> 
> Sorry for the extra email noise, but while fixing these I found two more 
> cgit_open_filter() function calls that should probably be changed to 
> cgit_open_email_filter() in the first patch:
> 
> ui-refs.c:146
> ui-tag.c:85

Those both use tagger_email, so that makes sense, I completely forgot
about that one and only converted author_email and committer_email.

The reference in ui-tag.c also needs angle brackets inserted in the
output in the !noplainemail case.  Feel free to squash that into the
first patch, and take ownership if you want.

I also noticed that we don't check the return value of read_mailmap(),
I'm not entirely sure what we should do if it fails, but it does look
like "missing mailmap" is not a failure case, so we probably should be
doing something if it returns an error.

[PATCH 3/3] Add support for git's mailmap.

[smithj4]

On 08/26/2016 05:10 PM, Jason A. Smith wrote:
> On 08/26/2016 04:12 PM, Jason A. Smith wrote:
>>
>> If a mailmap file is present in the repo, it will be used to coalesce
>> commits by the same person, just like git does. When no mailmap file is
>> found then it functions as before.
>>
>> Signed-off-by: Jason A. Smith <smithj4 at bnl.gov>
>> ---
>>  cgit.h      |  2 ++
>>  parsing.c   | 11 +++++++++++
>>  ui-atom.c   | 20 ++++++++++++++------
>>  ui-commit.c | 22 ++++++++++++++++------
>>  ui-log.c    | 11 +++++++++--
>>  ui-refs.c   | 27 +++++++++++++++++++++------
>>  ui-stats.c  | 13 ++++++++++---
>>  7 files changed, 83 insertions(+), 23 deletions(-)
>
> Sorry, I forgot the --thread flag. I also just noticed that the branch
> and thread lists on the summary page still do not honor the mailmap
> because there is no general init type function in ui-refs to put the
> read_mailmap() call, and I noticed that ui-tag also has tagger name &
> email so that should be patched as well. I will have to fix these and
> resend the patches, probably on Monday.
>
> ~Jason

Sorry for the extra email noise, but while fixing these I found two more 
cgit_open_filter() function calls that should probably be changed to 
cgit_open_email_filter() in the first patch:

ui-refs.c:146
ui-tag.c:85

~Jason

[PATCH 3/3] Add support for git's mailmap.

[smithj4]

On 08/26/2016 04:12 PM, Jason A. Smith wrote:
>
> If a mailmap file is present in the repo, it will be used to coalesce
> commits by the same person, just like git does. When no mailmap file is
> found then it functions as before.
>
> Signed-off-by: Jason A. Smith <smithj4 at bnl.gov>
> ---
>  cgit.h      |  2 ++
>  parsing.c   | 11 +++++++++++
>  ui-atom.c   | 20 ++++++++++++++------
>  ui-commit.c | 22 ++++++++++++++++------
>  ui-log.c    | 11 +++++++++--
>  ui-refs.c   | 27 +++++++++++++++++++++------
>  ui-stats.c  | 13 ++++++++++---
>  7 files changed, 83 insertions(+), 23 deletions(-)

Sorry, I forgot the --thread flag. I also just noticed that the branch 
and thread lists on the summary page still do not honor the mailmap 
because there is no general init type function in ui-refs to put the 
read_mailmap() call, and I noticed that ui-tag also has tagger name & 
email so that should be patched as well. I will have to fix these and 
resend the patches, probably on Monday.

~Jason

[PATCH 3/3] Add support for git's mailmap.

[smithj4]

If a mailmap file is present in the repo, it will be used to coalesce
commits by the same person, just like git does. When no mailmap file is
found then it functions as before.

Signed-off-by: Jason A. Smith <smithj4 at bnl.gov>
---
  cgit.h      |  2 ++
  parsing.c   | 11 +++++++++++
  ui-atom.c   | 20 ++++++++++++++------
  ui-commit.c | 22 ++++++++++++++++------
  ui-log.c    | 11 +++++++++--
  ui-refs.c   | 27 +++++++++++++++++++++------
  ui-stats.c  | 13 ++++++++++---
  7 files changed, 83 insertions(+), 23 deletions(-)


-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0003-Add-support-for-git-s-mailmap.patch
Type: text/x-patch
Size: 11467 bytes
Desc: not available
URL: <http://lists.zx2c4.com/pipermail/cgit/attachments/20160826/04bef3f3/attachment-0001.bin>