This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2960

stringutil: move person function from templatefilters
ClosedPublic

Authored by sheehan on Mar 27 2018, 12:04 PM.

Details

Reviewers
av6
yuja
Group Reviewers
hg-reviewers
Commits
rHGfb7140f1d09d: stringutil: move person function from templatefilters
Summary

Move the person function from template filters to the stringutil
module, so it can be reused in the mailmap template function.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

sheehan created this revision.Mar 27 2018, 12:04 PM
av6 requested changes to this revision.Mar 28 2018, 1:10 AM
av6 added a subscriber: av6.
av6 added inline comments.
mercurial/templatefilters.py
293–294

Don't remove this docstring (at least not completely), its first paragraph goes to hg help templates.

This revision now requires changes to proceed.Mar 28 2018, 1:10 AM
sheehan marked an inline comment as done.Mar 29 2018, 10:10 AM
sheehan updated this revision to Diff 7360.
yuja accepted this revision.Mar 30 2018, 8:35 AM
yuja added a comment.Mar 30 2018, 8:36 AM

Queued, thanks. I've adjusted the location of codes so the author-related
functions are grouped.

Closed by commit rHGfb7140f1d09d: stringutil: move person function from templatefilters (authored by sheehan). · Explain WhyMar 30 2018, 8:56 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 7360

mercurial/templatefilters.py

if "l" in flags: if "l" in flags:
return "lrwxrwxrwx" return "lrwxrwxrwx"
if "x" in flags: if "x" in flags:
return "-rwxr-xr-x" return "-rwxr-xr-x"
return "-rw-r--r--" return "-rw-r--r--"
@templatefilter('person') @templatefilter('person')
def person(author): def person(author):
"""Any text. Returns the name before an email address, """Any text. Returns the name before an email address,
interpreting it as per RFC 5322. interpreting it as per RFC 5322.
av6Unsubmitted
Done

Don't remove this docstring (at least not completely), its first paragraph goes to hg help templates.

av6: Don't remove this docstring (at least not completely), its first paragraph goes to `hg help…
>>> person(b'foo@bar')
'foo'
>>> person(b'Foo Bar <foo@bar>')
'Foo Bar'
>>> person(b'"Foo Bar" <foo@bar>')
'Foo Bar'
>>> person(b'"Foo \"buz\" Bar" <foo@bar>')
'Foo "buz" Bar'
>>> # The following are invalid, but do exist in real-life
...
>>> person(b'Foo "buz" Bar <foo@bar>')
'Foo "buz" Bar'
>>> person(b'"Foo Bar <foo@bar>')
'Foo Bar'
""" """
if '@' not in author: return stringutil.person(author)
return author
f = author.find('<')
if f != -1:
return author[:f].strip(' "').replace('\\"', '"')
f = author.find('@')
return author[:f].replace('.', ' ')
@templatefilter('revescape') @templatefilter('revescape')
def revescape(text): def revescape(text):
"""Any text. Escapes all "special" characters, except @. """Any text. Escapes all "special" characters, except @.
Forward slashes are escaped twice to prevent web servers from prematurely Forward slashes are escaped twice to prevent web servers from prematurely
unescaping them. For example, "@foo bar/baz" becomes "@foo%20bar%252Fbaz". unescaping them. For example, "@foo bar/baz" becomes "@foo%20bar%252Fbaz".
""" """
return urlreq.quote(text, safe='/@').replace('/', '%252F') return urlreq.quote(text, safe='/@').replace('/', '%252F')

mercurial/utils/stringutil.py

>>> isauthorwellformed(b'Bad Author author@author.com') >>> isauthorwellformed(b'Bad Author author@author.com')
False False
>>> isauthorwellformed(b'<author@author.com>') >>> isauthorwellformed(b'<author@author.com>')
False False
>>> isauthorwellformed(b'Bad Author <author>') >>> isauthorwellformed(b'Bad Author <author>')
False False
''' '''
return _correctauthorformat.match(author) is not None return _correctauthorformat.match(author) is not None
def person(author):
"""Any text. Returns the name before an email address,
interpreting it as per RFC 5322.
>>> person(b'foo@bar')
'foo'
>>> person(b'Foo Bar <foo@bar>')
'Foo Bar'
>>> person(b'"Foo Bar" <foo@bar>')
'Foo Bar'
>>> person(b'"Foo \"buz\" Bar" <foo@bar>')
'Foo "buz" Bar'
>>> # The following are invalid, but do exist in real-life
...
>>> person(b'Foo "buz" Bar <foo@bar>')
'Foo "buz" Bar'
>>> person(b'"Foo Bar <foo@bar>')
'Foo Bar'
"""
if '@' not in author:
return author
f = author.find('<')
if f != -1:
return author[:f].strip(' "').replace('\\"', '"')
f = author.find('@')
return author[:f].replace('.', ' ')