diff --git a/mercurial/pycompat.py b/mercurial/pycompat.py --- a/mercurial/pycompat.py +++ b/mercurial/pycompat.py @@ -26,7 +26,10 @@ import Queue as _queue import SocketServer as socketserver import xmlrpclib + + from .thirdparty.concurrent import futures else: + import concurrent.futures as futures import http.cookiejar as cookielib import http.client as httplib import pickle