convert: turn the last str regex into bytes in cvs.py (issue6789) stable
authorAnton Shestakov <av6@dwimlabs.net>
Thu, 12 Jan 2023 19:59:01 +0400
branchstable
changeset 49633 9282930f8b52
parent 49632 05b329cbd23d
child 49634 8f9fbc665928
convert: turn the last str regex into bytes in cvs.py (issue6789) Since root is bytes, the regular expression should also be bytes.
hgext/convert/cvs.py
--- a/hgext/convert/cvs.py	Fri Jan 06 12:16:04 2023 -0500
+++ b/hgext/convert/cvs.py	Thu Jan 12 19:59:01 2023 +0400
@@ -142,7 +142,9 @@
 
         if root.startswith(b":pserver:"):
             root = root[9:]
-            m = re.match(r'(?:(.*?)(?::(.*?))?@)?([^:/]*)(?::(\d*))?(.*)', root)
+            m = re.match(
+                br'(?:(.*?)(?::(.*?))?@)?([^:/]*)(?::(\d*))?(.*)', root
+            )
             if m:
                 conntype = b"pserver"
                 user, passw, serv, port, root = m.groups()