Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cleanup: drop redundant character escapes outside of `[]`
authorMatt Harbison <matt_harbison@yahoo.com>
Sat, 28 Dec 2019 01:51:17 -0500
changeset 44022 c1ccefb513e4
parent 44021 6d3b67a837a6
child 44023 3216cabffd4a
cleanup: drop redundant character escapes outside of `[]` Flagged by PyCharm. `@`, `:`, `<`, `>`, and `{` aren't special characters. (I'm a bit surprised that it doesn't also want to unescape `}` in schemes.py.) Differential Revision: https://phab.mercurial-scm.org/D7767
hgext/convert/subversion.py file | annotate | diff | comparison | revisions
hgext/schemes.py file | annotate | diff | comparison | revisions
mercurial/utils/stringutil.py file | annotate | diff | comparison | revisions 
--- a/hgext/convert/subversion.py	Sat Dec 28 01:35:05 2019 -0500
+++ b/hgext/convert/subversion.py	Sat Dec 28 01:51:17 2019 -0500
@@ -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(
--- a/hgext/schemes.py	Sat Dec 28 01:35:05 2019 -0500
+++ b/hgext/schemes.py	Sat Dec 28 01:51:17 2019 -0500
@@ -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):
--- a/mercurial/utils/stringutil.py	Sat Dec 28 01:35:05 2019 -0500
+++ b/mercurial/utils/stringutil.py	Sat Dec 28 01:51:17 2019 -0500
@@ -593,7 +593,7 @@
     )
 
 
-_correctauthorformat = remod.compile(br'^[^<]+\s\<[^<>]+@[^<>]+\>$')
+_correctauthorformat = remod.compile(br'^[^<]+\s<[^<>]+@[^<>]+>$')
 
 
 def isauthorwellformed(author):
mercurial