--- a/mercurial/hgweb/hgwebdir_mod.py Thu Apr 21 13:18:52 2011 +0200
+++ b/mercurial/hgweb/hgwebdir_mod.py Thu Apr 21 16:06:19 2011 +0200
@@ -8,7 +8,7 @@
import os, re, time
from mercurial.i18n import _
-from mercurial import ui, hg, util, templater
+from mercurial import ui, hg, scmutil, util, templater
from mercurial import error, encoding, url
from common import ErrorResponse, get_mtime, staticfile, paritygen, \
get_contact, HTTP_OK, HTTP_NOT_FOUND, HTTP_SERVER_ERROR
@@ -33,7 +33,7 @@
repos.append((prefix, root))
continue
roothead = os.path.normpath(os.path.abspath(roothead))
- paths = util.walkrepos(roothead, followsym=True, recurse=recurse)
+ paths = scmutil.walkrepos(roothead, followsym=True, recurse=recurse)
repos.extend(urlrepos(prefix, roothead, paths))
return repos
@@ -89,7 +89,7 @@
repos = findrepos(paths)
for prefix, root in u.configitems('collections'):
prefix = util.pconvert(prefix)
- for path in util.walkrepos(root, followsym=True):
+ for path in scmutil.walkrepos(root, followsym=True):
repo = os.path.normpath(path)
name = util.pconvert(repo)
if name.startswith(prefix):