Summary

Add a .mailmap file

Review Request #875 — Created Aug. 4, 2021 and submitted Aug. 7, 2021, 6:56 a.m.

Information

Owner

grim

Repository

pidgin/pidgin

Branch

default

Bugs

Depends On

Commit

59cc6465c3a6

Reviewers

Groups

pidgin

People

Description

Add a .mailmap file that can be used via the mailmap functio in mercurial templates to map author names/email addresses.

Some of these aren't matching right yet, but at least we have the dupes now and don't have to search for them again.

Also, I did a lot of guess work here on proper emails and usually deferred to gmail over a custom domain.

Testing Done

Lots of shell magic involving hg log -T '{mailmap(author)}\n' and without the mailmap.

Issues

Description	From	Last Updated
The first line's "empty email" mapping and the fourth line's "no email" seem like invalid values.	jrchamp	Aug. 5, 2021, 4:54 p.m.
It doesn't look like Mercurial's mapping parser will allow fixing this "missing end angle bracket" value because it fails the …	jrchamp	Aug. 5, 2021, 4:56 p.m.

jrchamp Aug. 4, 2021, 3:28 p.m.

Here's the source of the parser: https://www.mercurial-scm.org/repo/hg/file/tip/mercurial/utils/stringutil.py#l529

.mailmap (Diff revision 1)

The issue has been resolved. Show all issues

The first line's "empty email" mapping and the fourth line's "no email" seem like invalid values.

grim Aug. 5, 2021, 5:50 a.m.

Yep, see the following from the description

| Some of these aren't matching right yet, but at least we have the dupes now and don't have to search for them again.

.mailmap (Diff revision 1)

The issue has been resolved. Show all issues

It doesn't look like Mercurial's mapping parser will allow fixing this "missing end angle bracket" value because it fails the "isauthorwellformed()" test.

Instead, this dedpulication should work:
dequis dx@dxzone.com.ar dx dx@dxzone.com.ar

grim Aug. 5, 2021, 5:50 a.m.

are you including <>'s here? If so can you mark them as code so I can see exactly what you're suggesting?

jrchamp Aug. 5, 2021, 4:56 p.m.

I was going for this:

dequis <dx@dxzone.com.ar> dx <dx@dxzone.com.ar>
It looks like you've already included that line in the latest revision.

Commit:

459e3331df10

59cc6465c3a6

Diff:

Revision 2 (+28)

Show changes

.mailmap

Ship it!

This is a good set of changes for now. Unfortunately, either the "official" mailmap format - or Mercurial's implementation of it - is not flexible enough to fully address the needs of the existing author entries in the repository. On a positive note, we're forward compatible if Mercurial loosens the requirements a bit.

Status:: Completed