This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3002

stringutil: rename local email/names variables to their plural forms
ClosedPublic

Authored by sheehan on Mar 31 2018, 4:37 PM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHG54b896f195d1: stringutil: rename local email/names variables to their plural forms
Summary

email and name variables are renamed to emails and names (respectively).
This is because the email variable name shadows the email function
within the stringutil module. Since we are renaming email, we also rename
name for consistency.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

sheehan created this revision.Mar 31 2018, 4:37 PM
yuja accepted this revision.Mar 31 2018, 9:27 PM
This revision is now accepted and ready to land.Mar 31 2018, 9:27 PM
Closed by commit rHG54b896f195d1: stringutil: rename local email/names variables to their plural forms (authored by sheehan). · Explain WhyMar 31 2018, 9:59 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/utils/stringutil.py (18 lines)

Diff 7482

mercurial/utils/stringutil.py

for line in mailmapcontent.splitlines(): for line in mailmapcontent.splitlines():
# Don't bother checking the line if it is a comment or # Don't bother checking the line if it is a comment or
# is an improperly formed author field # is an improperly formed author field
if line.lstrip().startswith('#') or any(c not in line for c in '<>@'): if line.lstrip().startswith('#') or any(c not in line for c in '<>@'):
continue continue
# name, email hold the parsed emails and names for each line # names, emails hold the parsed emails and names for each line
# name_builder holds the words in a persons name # name_builder holds the words in a persons name
name, email = [], [] names, emails = [], []
namebuilder = [] namebuilder = []
for element in line.split(): for element in line.split():
if element.startswith('#'): if element.startswith('#'):
# If we reach a comment in the mailmap file, move on # If we reach a comment in the mailmap file, move on
break break
elif element.startswith('<') and element.endswith('>'): elif element.startswith('<') and element.endswith('>'):
# We have found an email. # We have found an email.
# Parse it, and finalize any names from earlier # Parse it, and finalize any names from earlier
email.append(element[1:-1]) # Slice off the "<>" emails.append(element[1:-1]) # Slice off the "<>"
if namebuilder: if namebuilder:
name.append(' '.join(namebuilder)) names.append(' '.join(namebuilder))
namebuilder = [] namebuilder = []
# Break if we have found a second email, any other # Break if we have found a second email, any other
# data does not fit the spec for .mailmap # data does not fit the spec for .mailmap
if len(email) > 1: if len(emails) > 1:
break break
else: else:
# We have found another word in the committers name # We have found another word in the committers name
namebuilder.append(element) namebuilder.append(element)
mailmapkey = mailmapping( mailmapkey = mailmapping(
email=email[-1], email=emails[-1],
name=name[-1] if len(name) == 2 else None, name=names[-1] if len(names) == 2 else None,
) )
mailmap[mailmapkey] = mailmapping( mailmap[mailmapkey] = mailmapping(
email=email[0], email=emails[0],
name=name[0] if name else None, name=names[0] if names else None,
) )
return mailmap return mailmap
def mapname(mailmap, author): def mapname(mailmap, author):
"""Returns the author field according to the mailmap cache, or """Returns the author field according to the mailmap cache, or
the original author field. the original author field.