Mercurial > public > mercurial-scm > hg-stable

diff mercurial/scmposix.py @ 32248: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 bf5e13e38390
children dacfcdd8b94e
line wrap: on
line diff
--- a/mercurial/scmposix.py	Wed Apr 26 22:05:59 2017 +0900
+++ b/mercurial/scmposix.py	Wed Apr 26 22:26:28 2017 +0900
@@ -8,8 +8,8 @@
 
 from . import (
     encoding,
-    osutil,
     pycompat,
+    util,
 )
 
 # BSD 'more' escapes ANSI color sequences by default. This can be disabled by
@@ -23,7 +23,7 @@
     rcdir = os.path.join(path, 'hgrc.d')
     try:
         rcs.extend([os.path.join(rcdir, f)
-                    for f, kind in osutil.listdir(rcdir)
+                    for f, kind in util.listdir(rcdir)
                     if f.endswith(".rc")])
     except OSError:
         pass