--- a/mercurial/commandserver.py	Fri Jul 15 10:18:24 2011 +0200
+++ b/mercurial/commandserver.py	Thu Jul 14 11:46:15 2011 +0300
@@ -132,7 +132,6 @@
     """
     def __init__(self, ui, repo, mode):
         self.cwd = os.getcwd()
-        self.ui = ui
 
         logpath = ui.config("cmdserver", "log", None)
         if logpath:
@@ -143,6 +142,9 @@
             else:
                 logfile = open(logpath, 'a')
 
+        # the ui here is really the repo ui so take its baseui so we don't end up
+        # with its local configuration
+        self.ui = repo.baseui
         self.repo = repo
         self.repoui = repo.ui