fix: Change regex order.

python-poetry · Nov 7, 2022 · 98b45de · 98b45de
1 parent 1231e5d
commit 98b45de
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/src/poetry/core/vcs/git.py b/src/poetry/core/vcs/git.py
@@ -29,11 +29,11 @@
         rf"(?P<pathname>[:/\\]({PATH}[/\\])?"
         rf"((?P<name>{NAME}?)(\.git|[/\\])?)?)"
         r"(?:"
-        r"#egg=?.+"
-        r"|"
         rf"#(?:egg=.+?&subdirectory=|subdirectory=)(?P<subdirectory>{SUBDIR})"
         r"|"
-        rf"[@#](?P<rev>{REV})(?:[&#](?:egg=.+?|(?:egg=.+?&subdirectory=|subdirectory=)(?P<rev_subdirectory>{SUBDIR})))?"
+        r"#egg=?.+"
+        r"|"
+        rf"[@#](?P<rev>{REV})(?:[&#](?:(?:egg=.+?&subdirectory=|subdirectory=)(?P<rev_subdirectory>{SUBDIR})|egg=.+?))?"
         r")?"
         r"$"
     ),
@@ -46,11 +46,11 @@
         rf"(?P<pathname>({PATH})"
         rf"(?P<name>{NAME})(\.git|/)?)"
         r"(?:"
-        r"#egg=?.+"
-        r"|"
         rf"#(?:egg=.+?&subdirectory=|subdirectory=)(?P<subdirectory>{SUBDIR})"
         r"|"
-        rf"[@#](?P<rev>{REV})(?:[&#](?:egg=.+?|(?:egg=.+?&subdirectory=|subdirectory=)(?P<rev_subdirectory>{SUBDIR})))?"
+        r"#egg=?.+"
+        r"|"
+        rf"[@#](?P<rev>{REV})(?:[&#](?:(?:egg=.+?&subdirectory=|subdirectory=)(?P<rev_subdirectory>{SUBDIR})|egg=.+?))?"
         r")?"
         r"$"
     ),
@@ -61,11 +61,11 @@
         rf"(?P<pathname>([:/]{PATH}/)"
         rf"(?P<name>{NAME})(\.git|/)?)"
         r"(?:"
-        r"#egg=.+?"
-        r"|"
         rf"#(?:egg=.+?&subdirectory=|subdirectory=)(?P<subdirectory>{SUBDIR})"
         r"|"
-        rf"[@#](?P<rev>{REV})(?:[&#](?:egg=.+?&subdirectory=|subdirectory=)(?P<rev_subdirectory>{SUBDIR}))?"
+        r"#egg=?.+"
+        r"|"
+        rf"[@#](?P<rev>{REV})(?:[&#](?:(?:egg=.+?&subdirectory=|subdirectory=)(?P<rev_subdirectory>{SUBDIR})|egg=.+?))?"
         r")?"
         r"$"
     ),
@@ -76,11 +76,11 @@
         rf"(?P<pathname>({PATH})"
         rf"(?P<name>{NAME})(\.git|/)?)"
         r"(?:"
-        r"#egg=?.+"
-        r"|"
         rf"#(?:egg=.+?&subdirectory=|subdirectory=)(?P<subdirectory>{SUBDIR})"
         r"|"
-        rf"[@#](?P<rev>{REV})(?:[&#](?:egg=.+?|(?:egg=.+?&subdirectory=|subdirectory=)(?P<rev_subdirectory>{SUBDIR})))?"
+        r"#egg=?.+"
+        r"|"
+        rf"[@#](?P<rev>{REV})(?:[&#](?:(?:egg=.+?&subdirectory=|subdirectory=)(?P<rev_subdirectory>{SUBDIR})|egg=.+?))?"
         r")?"
         r"$"
     ),