( )⚙ D7767 cleanup: drop redundant character escapes outside of `[]`

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7767

cleanup: drop redundant character escapes outside of `[]`
ClosedPublic

Authored by mharbison72 on Dec 28 2019, 11:42 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGc1ccefb513e4: cleanup: drop redundant character escapes outside of `[]`
Summary

Flagged by PyCharm. @, :, <, >, and { aren't special characters.
(I'm a bit surprised that it doesn't also want to unescape } in schemes.py.)

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

mharbison72 created this revision.Dec 28 2019, 11:42 AM
mharbison72 added a commit: rHGc1ccefb513e4: cleanup: drop redundant character escapes outside of `[]`.Jan 8 2020, 2:50 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGc1ccefb513e4: cleanup: drop redundant character escapes outside of `[]` (authored by mharbison72). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 19096

hgext/convert/subversion.py

del self.commits[rev] del self.commits[rev]
return revcommit return revcommit
def checkrevformat(self, revstr, mapname=b'splicemap'): def checkrevformat(self, revstr, mapname=b'splicemap'):
""" fails if revision format does not match the correct format""" """ fails if revision format does not match the correct format"""
if not re.match( if not re.match(
r'svn:[0-9a-f]{8,8}-[0-9a-f]{4,4}-' r'svn:[0-9a-f]{8,8}-[0-9a-f]{4,4}-'
r'[0-9a-f]{4,4}-[0-9a-f]{4,4}-[0-9a-f]' r'[0-9a-f]{4,4}-[0-9a-f]{4,4}-[0-9a-f]'
r'{12,12}(.*)\@[0-9]+$', r'{12,12}(.*)@[0-9]+$',
revstr, revstr,
): ):
raise error.Abort( raise error.Abort(
_(b'%s entry %s is not a valid revision identifier') _(b'%s entry %s is not a valid revision identifier')
% (mapname, revstr) % (mapname, revstr)
) )
def numcommits(self): def numcommits(self):
self.wc = None self.wc = None
self.cwd = encoding.getcwd() self.cwd = encoding.getcwd()
created = False created = False
if os.path.isfile(os.path.join(path, b'.svn', b'entries')): if os.path.isfile(os.path.join(path, b'.svn', b'entries')):
self.wc = os.path.realpath(path) self.wc = os.path.realpath(path)
self.run0(b'update') self.run0(b'update')
else: else:
if not re.search(br'^(file|http|https|svn|svn\+ssh)\://', path): if not re.search(br'^(file|http|https|svn|svn\+ssh)://', path):
path = os.path.realpath(path) path = os.path.realpath(path)
if os.path.isdir(os.path.dirname(path)): if os.path.isdir(os.path.dirname(path)):
if not os.path.exists( if not os.path.exists(
os.path.join(path, b'db', b'fs-type') os.path.join(path, b'db', b'fs-type')
): ):
ui.status( ui.status(
_(b"initializing svn repository '%s'\n") _(b"initializing svn repository '%s'\n")
% os.path.basename(path) % os.path.basename(path)

hgext/schemes.py

cmdtable = {} cmdtable = {}
command = registrar.command(cmdtable) command = registrar.command(cmdtable)
# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
# extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
# be specifying the version(s) of Mercurial they are tested with, or # be specifying the version(s) of Mercurial they are tested with, or
# leave the attribute unspecified. # leave the attribute unspecified.
testedwith = b'ships-with-hg-core' testedwith = b'ships-with-hg-core'
_partre = re.compile(br'\{(\d+)\}') _partre = re.compile(br'{(\d+)\}')
class ShortRepository(object): class ShortRepository(object):
def __init__(self, url, scheme, templater): def __init__(self, url, scheme, templater):
self.scheme = scheme self.scheme = scheme
self.templater = templater self.templater = templater
self.url = url self.url = url
try: try:

mercurial/utils/stringutil.py

# Return the author field with proper values filled in # Return the author field with proper values filled in
return b'%s <%s>' % ( return b'%s <%s>' % (
proper.name if proper.name else commit.name, proper.name if proper.name else commit.name,
proper.email if proper.email else commit.email, proper.email if proper.email else commit.email,
) )
_correctauthorformat = remod.compile(br'^[^<]+\s\<[^<>]+@[^<>]+\>$') _correctauthorformat = remod.compile(br'^[^<]+\s<[^<>]+@[^<>]+>$')
def isauthorwellformed(author): def isauthorwellformed(author):
'''Return True if the author field is well formed '''Return True if the author field is well formed
(ie "Contributor Name <contrib@email.dom>") (ie "Contributor Name <contrib@email.dom>")
>>> isauthorwellformed(b'Good Author <good@author.com>') >>> isauthorwellformed(b'Good Author <good@author.com>')
True True