D7767: cleanup: drop redundant character escapes outside of `[]`
mharbison72 (Matt Harbison)
phabricator at mercurial-scm.org
Sat Dec 28 16:42:47 UTC 2019
mharbison72 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION 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.)
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D7767
AFFECTED FILES
hgext/convert/subversion.py
hgext/schemes.py
mercurial/utils/stringutil.py
CHANGE DETAILS
diff --git a/mercurial/utils/stringutil.py b/mercurial/utils/stringutil.py
--- a/mercurial/utils/stringutil.py
+++ b/mercurial/utils/stringutil.py
@@ -593,7 +593,7 @@
)
-_correctauthorformat = remod.compile(br'^[^<]+\s\<[^<>]+@[^<>]+\>$')
+_correctauthorformat = remod.compile(br'^[^<]+\s<[^<>]+@[^<>]+>$')
def isauthorwellformed(author):
diff --git a/hgext/schemes.py b/hgext/schemes.py
--- a/hgext/schemes.py
+++ b/hgext/schemes.py
@@ -63,7 +63,7 @@
# leave the attribute unspecified.
testedwith = b'ships-with-hg-core'
-_partre = re.compile(br'\{(\d+)\}')
+_partre = re.compile(br'{(\d+)\}')
class ShortRepository(object):
diff --git a/hgext/convert/subversion.py b/hgext/convert/subversion.py
--- a/hgext/convert/subversion.py
+++ b/hgext/convert/subversion.py
@@ -643,7 +643,7 @@
if not re.match(
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'{12,12}(.*)\@[0-9]+$',
+ r'{12,12}(.*)@[0-9]+$',
revstr,
):
raise error.Abort(
@@ -1303,7 +1303,7 @@
self.wc = os.path.realpath(path)
self.run0(b'update')
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)
if os.path.isdir(os.path.dirname(path)):
if not os.path.exists(
To: mharbison72, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list