# HG changeset patch # User Kevin Bullock # Date 1502030735 18000 # Node ID e3dab807e38cc489f541c4a62997bb9b4f72c4a8 # Parent da62ef0569bb7053352ac3f37929dac34c79ff72 compat: delay importing osutil until we know we need it Since 006c837f9181 we don't need osutil on hg >= 4.3. When demandimport is enabled, this extra import doesn't hurt anything, but it breaks doctests. diff --git a/hggit/gitdirstate.py b/hggit/gitdirstate.py --- a/hggit/gitdirstate.py +++ b/hggit/gitdirstate.py @@ -6,7 +6,6 @@ from mercurial import ( dirstate, match as matchmod, - osutil, scmutil, util, ) @@ -156,9 +155,11 @@ matchalways = match.always() matchtdir = match.traversedir dmap = self._map + # osutil moved in hg 4.3, but util re-exports listdir try: listdir = util.listdir except AttributeError: + from mercurial import osutil listdir = osutil.listdir lstat = os.lstat dirkind = stat.S_IFDIR