diff -r 670eb4fa1b86 -r 8fb9985382be mercurial/vfs.py
--- a/mercurial/vfs.py	Sat May 05 18:41:51 2018 -0700
+++ b/mercurial/vfs.py	Sat May 05 18:35:16 2018 -0700
@@ -568,7 +568,7 @@
         ui.debug('starting %d threads for background file closing\n' %
                  threadcount)
 
-        self._queue = util.queue(maxsize=maxqueue)
+        self._queue = pycompat.queue.Queue(maxsize=maxqueue)
         self._running = True
 
         for i in range(threadcount):
@@ -600,7 +600,7 @@
                 except Exception as e:
                     # Stash so can re-raise from main thread later.
                     self._threadexception = e
-            except util.empty:
+            except pycompat.queue.Empty:
                 if not self._running:
                     break