# HG changeset patch
# User Idan Kamara <idankk86@gmail.com>
# Date 2011-06-24 16:44:17
# Node ID 712954a67be3f84527ded1c95008b549d02cba27
# Parent  f5f97a0f983fdc8ad0b0a7535b9b14fc7fbd28ee

cmdserver: assign repo.baseui before running commands

There are places in the code that use localrepository.baseui (see hg.remoteui),
we need the ui descriptors (and possibly other things) to be set
correctly on it, so output written to the remoteui descriptors ends up at the
right place.

Before this change, tests such as 'test-bookmarks-pushpull.t' didn't work.

diff --git a/mercurial/commandserver.py b/mercurial/commandserver.py
--- a/mercurial/commandserver.py
+++ b/mercurial/commandserver.py
@@ -179,8 +179,11 @@ class server(object):
 
         # copy the uis so changes (e.g. --config or --verbose) don't
         # persist between requests
+        copiedui = self.ui.copy()
+        self.repo.baseui = copiedui
         self.repo.ui = self.repo.dirstate._ui = self.repoui.copy()
-        req = dispatch.request(args, self.ui.copy(), self.repo, self.cin,
+
+        req = dispatch.request(args, copiedui, self.repo, self.cin,
                                self.cout, self.cerr)
 
         ret = dispatch.dispatch(req) or 0 # might return None