diff mercurial/subrepo.py @ 20033:f962870712da

pathutil: tease out a new library to break an import cycle from canonpath use

--- a/mercurial/subrepo.py	Wed Nov 06 14:38:34 2013 -0500
+++ b/mercurial/subrepo.py	Wed Nov 06 18:19:04 2013 -0500
@@ -9,7 +9,8 @@
 import xml.dom.minidom
 import stat, subprocess, tarfile
 from i18n import _
-import config, scmutil, util, node, error, cmdutil, bookmarks, match as matchmod
+import config, util, node, error, cmdutil, bookmarks, match as matchmod
+import pathutil
 hg = None
 propertycache = util.propertycache
 
@@ -332,7 +333,7 @@
     import hg as h
     hg = h
 
-    scmutil.pathauditor(ctx._repo.root)(path)
+    pathutil.pathauditor(ctx._repo.root)(path)
     state = ctx.substate[path]
     if state[2] not in types:
         raise util.Abort(_('unknown subrepo type %s') % state[2])