Mercurial > public > mercurial-scm > hg-stable

diff mercurial/commandserver.py @ 14882:bb2cffe81a94 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cmdserver: take repo.baseui as our ui The ui passed to server() is really repo.ui, that is it contains its local configuration as well. When running commands that use a different repo than the servers cached repo, we don't want to use that ui as the baseui for the new repo.
author Idan Kamara <idankk86@gmail.com>
date Thu, 14 Jul 2011 11:46:15 +0300
parents 1b872599f39f
children b4c06b97dfe0
line wrap: on
line diff
--- 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