diff mercurial/hgweb/webutil.py @ 20033:f962870712da

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

--- a/mercurial/hgweb/webutil.py	Wed Nov 06 14:38:34 2013 -0500
+++ b/mercurial/hgweb/webutil.py	Wed Nov 06 18:19:04 2013 -0500
@@ -7,7 +7,7 @@
 # GNU General Public License version 2 or any later version.
 
 import os, copy
-from mercurial import match, patch, scmutil, error, ui, util
+from mercurial import match, patch, error, ui, util, pathutil
 from mercurial.i18n import _
 from mercurial.node import hex, nullid
 from common import ErrorResponse
@@ -196,7 +196,7 @@
 
 def cleanpath(repo, path):
     path = path.lstrip('/')
-    return scmutil.canonpath(repo.root, '', path)
+    return pathutil.canonpath(repo.root, '', path)
 
 def changeidctx (repo, changeid):
     try: