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

equal deleted inserted replaced

-:3685a79ea51b
+:54b896f195d1
 # 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
+# names, emails hold the parsed emails and names for each line
 # name_builder holds the words in a persons name
-name, email = [], []
+names, emails = [], []
 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 "<>"
+emails.append(element[1:-1])  # Slice off the "<>"
 if namebuilder:
-name.append(' '.join(namebuilder))
+names.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:
+if len(emails) > 1:
 break
 else:
 # We have found another word in the committers name
 namebuilder.append(element)
 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(
-email=email[0],
+email=emails[0],
-name=name[0] if name else None,
+name=names[0] if names else None,
 )
 return mailmap
 def mapname(mailmap, author):