diff -r ce96be208ea4 -r c21aca51b392 mercurial/dirstate.py
--- a/mercurial/dirstate.py	Wed Oct 23 12:15:42 2019 -0700
+++ b/mercurial/dirstate.py	Wed Nov 06 14:13:19 2019 +0100
@@ -1514,11 +1514,11 @@
 
     @propertycache
     def _dirs(self):
-        return util.dirs(self._map, b'r')
+        return pathutil.dirs(self._map, b'r')
 
     @propertycache
     def _alldirs(self):
-        return util.dirs(self._map)
+        return pathutil.dirs(self._map)
 
     def _opendirstatefile(self):
         fp, mode = txnutil.trypending(self._root, self._opener, self._filename)