--- a/mercurial/cmdutil.py	Sun Apr 26 16:50:43 2009 -0500
+++ b/mercurial/cmdutil.py	Sun Apr 26 16:50:43 2009 -0500
@@ -100,10 +100,10 @@
 
 def remoteui(src, opts):
     'build a remote ui from ui or repo and opts'
-    if hasattr(src, 'ui'): # looks like a repository
-        dst = src.ui.parentui # drop repo-specific config
+    if hasattr(src, 'baseui'): # looks like a repository
+        dst = src.baseui # drop repo-specific config
         src = src.ui # copy target options from repo
-    else: # assume it's a ui object
+    else: # assume it's a global ui object
         dst = src # keep all global options
 
     # copy ssh-specific options