equal
deleted
inserted
replaced
40 user_email = stringutil.email(mapped_user) |
40 user_email = stringutil.email(mapped_user) |
41 if GIT_EMAIL_PROHIBITED.match(user_email) or GIT_PERSON_PROHIBITED.match( |
41 if GIT_EMAIL_PROHIBITED.match(user_email) or GIT_PERSON_PROHIBITED.match( |
42 user_person |
42 user_person |
43 ): |
43 ): |
44 raise error.Abort( |
44 raise error.Abort( |
45 _(b"Unable to parse user into person and email for revision " + rev) |
45 _(b"Unable to parse user into person and email for revision %s") |
|
46 % rev |
46 ) |
47 ) |
47 if user_person: |
48 if user_person: |
48 return b'"' + user_person + b'" <' + user_email + b'>' |
49 return b'"' + user_person + b'" <' + user_email + b'>' |
49 else: |
50 else: |
50 return b"<" + user_email + b">" |
51 return b"<" + user_email + b">" |