Skip to content
Snippets Groups Projects
Commit 006c837f authored by Kevin Bullock's avatar Kevin Bullock
Browse files

gitdirstate: use util.listdir if available

Since hg 4.3, the upstream osutil module has been moved to
mercurial.cext.osutil, but the util module also now re-exports
everything in osutil.

Thanks to Durham Goode and Yuya Nishihara for reporting and finding the
right fix for this.
parent 17f64b9b
No related branches found
No related tags found
No related merge requests found
......@@ -156,7 +156,10 @@
matchalways = match.always()
matchtdir = match.traversedir
dmap = self._map
listdir = osutil.listdir
try:
listdir = util.listdir
except AttributeError:
listdir = osutil.listdir
lstat = os.lstat
dirkind = stat.S_IFDIR
regkind = stat.S_IFREG
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment