mercurial-scm/hg-stable: mercurial/utils/stringutil.py comparison

comparison mercurial/utils/stringutil.py @ 37212:2a2ce93e12f4

templatefuncs: add mailmap template function This commit adds a template function to support the .mailmap file in Mercurial repositories. The .mailmap file comes from git, and can be used to map new emails and names for old commits. The general use case is that someone may change their name or author commits under different emails and aliases, which would make these commits appear as though they came from different persons. The file allows you to specify the correct name that should be used in place of the author field specified in the commit. The mailmap file has 4 possible formats used to map old "commit" names to new "proper" names: 1. <proper@email.com> <commit@email.com> 2. Proper Name <commit@email.com> 3. Proper Name <proper@email.com> <commit@email.com> 4. Proper Name <proper@email.com> Commit Name <commit@email.com> Essentially there is a commit email present in each mailmap entry, that maps to either an updated name, email, or both. The final possible format allows commits authored by a person who used both an old name and an old email to map to a new name and email. To parse the file, we split by spaces and build a name out of every element that does not start with "<". Once we find an element that does start with "<" we concatenate all the name elements that preceded and add that as a parsed name. We then add the email as the first parsed email. We repeat the process until the end of the line, or a comment is found. We will be left with all parsed names in a list, and all parsed emails in a list, with the 0 index being the proper values and the 1 index being the commit values (if they were specified in the entry). The commit values are added as the keys to a dict, and with the proper fields as the values. The mapname function takes the mapping object and the commit author field and attempts to look for a corresponding entry. To do so we try (commit name, commit email) first, and if no results are returned then (None, commit email) is also looked up. This is due to format 4 from above, where someone may have a mailmap entry with both name and email, and if they don't it is possible they have an entry that uses only the commit email. Differential Revision: https://phab.mercurial-scm.org/D2904

author	Connor Sheehan <sheehan@mozilla.com>
date	Mon, 19 Mar 2018 11:16:21 -0400
parents	fb7140f1d09d
children	54b896f195d1

comparison

equal deleted inserted replaced

-:2208149c4b8e
+:2a2ce93e12f4
 import codecs
 import re as remod
 import textwrap
 from ..i18n import _
+from ..thirdparty import attr
 from .. import (
 encoding,
 error,
 pycompat,
 f = author.find('<')
 if f != -1:
 return author[:f].strip(' "').replace('\\"', '"')
 f = author.find('@')
 return author[:f].replace('.', ' ')
+@attr.s(hash=True)
+class mailmapping(object):
+'''Represents a username/email key or value in
+a mailmap file'''
+email = attr.ib()
+name = attr.ib(default=None)
+def parsemailmap(mailmapcontent):
+"""Parses data in the .mailmap format
+>>> mmdata = b"\\n".join([
+... b'# Comment',
+... b'Name <commit1@email.xx>',
+... b'<name@email.xx> <commit2@email.xx>',
+... b'Name <proper@email.xx> <commit3@email.xx>',
+... b'Name <proper@email.xx> Commit <commit4@email.xx>',
+... ])
+>>> mm = parsemailmap(mmdata)
+>>> for key in sorted(mm.keys()):
+...     print(key)
+mailmapping(email='commit1@email.xx', name=None)
+mailmapping(email='commit2@email.xx', name=None)
+mailmapping(email='commit3@email.xx', name=None)
+mailmapping(email='commit4@email.xx', name='Commit')
+>>> for val in sorted(mm.values()):
+...     print(val)
+mailmapping(email='commit1@email.xx', name='Name')
+mailmapping(email='name@email.xx', name=None)
+mailmapping(email='proper@email.xx', name='Name')
+mailmapping(email='proper@email.xx', name='Name')
+"""
+mailmap = {}
+if mailmapcontent is None:
+return mailmap
+for line in mailmapcontent.splitlines():
+# Don't bother checking the line if it is a comment or
+# is an improperly formed author field
+if line.lstrip().startswith('#') or any(c not in line for c in '<>@'):
+continue
+# name, email hold the parsed emails and names for each line
+# name_builder holds the words in a persons name
+name, email = [], []
+namebuilder = []
+for element in line.split():
+if element.startswith('#'):
+# If we reach a comment in the mailmap file, move on
+break
+elif element.startswith('<') and element.endswith('>'):
+# We have found an email.
+# Parse it, and finalize any names from earlier
+email.append(element[1:-1])  # Slice off the "<>"
+if namebuilder:
+name.append(' '.join(namebuilder))
+namebuilder = []
+# Break if we have found a second email, any other
+# data does not fit the spec for .mailmap
+if len(email) > 1:
+break
+else:
+# We have found another word in the committers name
+namebuilder.append(element)
+mailmapkey = mailmapping(
+email=email[-1],
+name=name[-1] if len(name) == 2 else None,
+)
+mailmap[mailmapkey] = mailmapping(
+email=email[0],
+name=name[0] if name else None,
+)
+return mailmap
+def mapname(mailmap, author):
+"""Returns the author field according to the mailmap cache, or
+the original author field.
+>>> mmdata = b"\\n".join([
+...     b'# Comment',
+...     b'Name <commit1@email.xx>',
+...     b'<name@email.xx> <commit2@email.xx>',
+...     b'Name <proper@email.xx> <commit3@email.xx>',
+...     b'Name <proper@email.xx> Commit <commit4@email.xx>',
+... ])
+>>> m = parsemailmap(mmdata)
+>>> mapname(m, b'Commit <commit1@email.xx>')
+'Name <commit1@email.xx>'
+>>> mapname(m, b'Name <commit2@email.xx>')
+'Name <name@email.xx>'
+>>> mapname(m, b'Commit <commit3@email.xx>')
+'Name <proper@email.xx>'
+>>> mapname(m, b'Commit <commit4@email.xx>')
+'Name <proper@email.xx>'
+>>> mapname(m, b'Unknown Name <unknown@email.com>')
+'Unknown Name <unknown@email.com>'
+"""
+# If the author field coming in isn't in the correct format,
+# or the mailmap is empty just return the original author field
+if not isauthorwellformed(author) or not mailmap:
+return author
+# Turn the user name into a mailmaptup
+commit = mailmapping(name=person(author), email=email(author))
+try:
+# Try and use both the commit email and name as the key
+proper = mailmap[commit]
+except KeyError:
+# If the lookup fails, use just the email as the key instead
+# We call this commit2 as not to erase original commit fields
+commit2 = mailmapping(email=commit.email)
+proper = mailmap.get(commit2, mailmapping(None, None))
+# Return the author field with proper values filled in
+return '%s <%s>' % (
+proper.name if proper.name else commit.name,
+proper.email if proper.email else commit.email,
+)
 _correctauthorformat = remod.compile(br'^[^<]+\s\<[^<>]+@[^<>]+\>$')
 def isauthorwellformed(author):
 '''Return True if the author field is well formed

Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/utils/stringutil.py @ 37212:2a2ce93e12f4