diff mercurial/url.py @ 50404:64cdd80d6909

branching: merge stable into default
author Raphaël Gomès <rgomes@octobus.net>
date Fri, 24 Mar 2023 10:43:47 +0100
parents 3bb7c56e8fe6
children ecaf00089461
line wrap: on
line diff
--- a/mercurial/url.py	Wed Mar 22 15:19:02 2023 +0100
+++ b/mercurial/url.py	Fri Mar 24 10:43:47 2023 +0100
@@ -327,7 +327,9 @@
             self.cert_file = cert_file
 
         def connect(self):
-            self.sock = socket.create_connection((self.host, self.port))
+            self.sock = socket.create_connection(
+                (self.host, self.port), self.timeout
+            )
 
             host = self.host
             realhostport = self.realhostport  # pytype: disable=attribute-error