Mercurial > hg

diff mercurial/dirstate.py @ 32208:d74b0cff94a9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
osutil: proxy through util (and platform) modules (API) See the previous commit for why. Marked as API change since osutil.listdir() seems widely used in third-party extensions. The win32mbcs extension is updated to wrap both util. and windows. aliases.
author Yuya Nishihara <yuya@tcha.org>
date Wed, 26 Apr 2017 22:26:28 +0900
parents 8f1a2b848b52
children 73e67c4386ec
line wrap: on
line diff
--- a/mercurial/dirstate.py	Wed Apr 26 22:05:59 2017 +0900
+++ b/mercurial/dirstate.py	Wed Apr 26 22:26:28 2017 +0900
@@ -18,7 +18,6 @@
     encoding,
     error,
     match as matchmod,
-    osutil,
     parsers,
     pathutil,
     pycompat,
@@ -988,7 +987,7 @@
         matchalways = match.always()
         matchtdir = match.traversedir
         dmap = self._map
-        listdir = osutil.listdir
+        listdir = util.listdir
         lstat = os.lstat
         dirkind = stat.S_IFDIR
         regkind = stat.S_IFREG