diff -r 144d64cf456e -r af60153b5e3b mercurial/ui.py --- a/mercurial/ui.py Thu Apr 21 15:11:28 2011 -0500 +++ b/mercurial/ui.py Thu Apr 21 20:14:29 2011 +0200 @@ -7,7 +7,7 @@ from i18n import _ import errno, getpass, os, socket, sys, tempfile, traceback -import config, util, error, url +import config, scmutil, util, error, url class ui(object): def __init__(self, src=None): @@ -32,7 +32,7 @@ # shared read-only environment self.environ = os.environ # we always trust global config files - for f in util.rcpath(): + for f in scmutil.rcpath(): self.readconfig(f, trust=True) def copy(self):